Skip to content

Commit 2f432d4

Browse files
linawolfjaapio
linawolf
authored and
jaapio
committed
[BUGFIX] Reset section stack for the next document
Resolves #1093
1 parent e5dd738 commit 2f432d4

File tree

5 files changed

+205
-7
lines changed

5 files changed

+205
-7
lines changed

‎packages/guides/src/Compiler/NodeTransformers/SectionCreationTransformer.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,10 @@ final class SectionCreationTransformer implements NodeTransformer
3434

3535
public function enterNode(Node $node, CompilerContextInterface $compilerContext): Node
3636
{
37+
if ($node instanceof DocumentNode) {
38+
$this->sectionStack = [];
39+
}
40+
3741
if (!$compilerContext->getShadowTree()->getParent()?->getNode() instanceof DocumentNode) {
3842
return $node;
3943
}

‎tests/Integration/tests-full/markdown-full/default-menu-md/expected/anotherPage.html

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
<!DOCTYPE html>
2+
<html class="no-js" lang="en">
3+
<head>
4+
<title>Another Page</title>
5+
<!-- Required meta tags -->
6+
<meta charset="utf-8">
7+
<meta name="viewport" content="width=device-width, initial-scale=1">
8+
9+
<link href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-EVSTQN3/azprG1Anm3QDgpJLIm9Nao0Yz1ztcQTwFspd3yD65VohhpuuCOmLASjC" crossorigin="anonymous">
10+
</head>
11+
<body>
12+
<header class="">
13+
14+
<nav class="navbar navbar-expand-lg navbar-dark bg-primary">
15+
<div class="container">
16+
17+
<a class="navbar-brand" href="#">Navbar</a>
18+
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
19+
<span class="navbar-toggler-icon"></span>
20+
</button>
21+
<div class="collapse navbar-collapse" id="navbarSupportedContent">
22+
23+
</div>
24+
</div>
25+
</nav>
26+
</header>
27+
<main id="main-content">
28+
<div class="container">
29+
<div class="container">
30+
<div class="row">
31+
<div class="col-lg-3">
32+
33+
</div>
34+
<div class="col-lg-9">
35+
36+
<nav aria-label="breadcrumb">
37+
<ol class="breadcrumb">
38+
<li class="breadcrumb-item"><a href="index.html">Document Title</a></li>
39+
<li class="breadcrumb-item"><a href="#">Another Page</a></li>
40+
</ol>
41+
</nav>
42+
<!-- content start -->
43+
<div class="section" id="another-page">
44+
<h1>Another Page</h1>
45+
46+
<p>Lorem Ipsum Dolor.</p>
47+
48+
</div>
49+
<!-- content end -->
50+
</div>
51+
</div>
52+
</div>
53+
</div>
54+
</main>
55+
56+
<!-- Optional JavaScript; choose one of the two! -->
57+
58+
<!-- Option 1: Bootstrap Bundle with Popper -->
59+
<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.bundle.min.js" integrity="sha384-MrcW6ZMFYlzcLA8Nl+NtUVF0sA7MsXsP1UyJoMp4YLEuNSfAP+JcXn/tWtIaxVXM" crossorigin="anonymous"></script>
60+
61+
<!-- Option 2: Separate Popper and Bootstrap JS -->
62+
<!--
63+
<script src="https://cdn.jsdelivr.net/npm/@popperjs/[email protected]/dist/umd/popper.min.js" integrity="sha384-IQsoLXl5PILFhosVNubq5LC7Qb9DXgDA9i+tQ8Zj3iwWAwPtgFTxbJ8NT4GN1R8p" crossorigin="anonymous"></script>
64+
<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.min.js" integrity="sha384-cVKIPhGWiC2Al4u+LWgxfKTRIcfu0JTxR+EQDz/bgldoEyl4H0zUF0QKbrJ0EcQF" crossorigin="anonymous"></script>
65+
-->
66+
</body>
67+
</html>

‎tests/Integration/tests-full/markdown-full/default-menu-md/expected/index.html

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
<!DOCTYPE html>
2+
<html class="no-js" lang="en">
3+
<head>
4+
<title>Document Title</title>
5+
<!-- Required meta tags -->
6+
<meta charset="utf-8">
7+
<meta name="viewport" content="width=device-width, initial-scale=1">
8+
9+
<link href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-EVSTQN3/azprG1Anm3QDgpJLIm9Nao0Yz1ztcQTwFspd3yD65VohhpuuCOmLASjC" crossorigin="anonymous">
10+
</head>
11+
<body>
12+
<header class="">
13+
14+
<nav class="navbar navbar-expand-lg navbar-dark bg-primary">
15+
<div class="container">
16+
17+
<a class="navbar-brand" href="#">Navbar</a>
18+
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
19+
<span class="navbar-toggler-icon"></span>
20+
</button>
21+
<div class="collapse navbar-collapse" id="navbarSupportedContent">
22+
23+
</div>
24+
</div>
25+
</nav>
26+
</header>
27+
<main id="main-content">
28+
<div class="container">
29+
<div class="container">
30+
<div class="row">
31+
<div class="col-lg-3">
32+
33+
</div>
34+
<div class="col-lg-9">
35+
36+
<nav aria-label="breadcrumb">
37+
<ol class="breadcrumb">
38+
<li class="breadcrumb-item"><a href="#">Document Title</a></li>
39+
</ol>
40+
</nav>
41+
<!-- content start -->
42+
<div class="section" id="document-title">
43+
<h1>Document Title</h1>
44+
45+
<p>Lorem Ipsum Dolor.</p>
46+
47+
</div>
48+
<!-- content end -->
49+
</div>
50+
</div>
51+
</div>
52+
</div>
53+
</main>
54+
55+
<!-- Optional JavaScript; choose one of the two! -->
56+
57+
<!-- Option 1: Bootstrap Bundle with Popper -->
58+
<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.bundle.min.js" integrity="sha384-MrcW6ZMFYlzcLA8Nl+NtUVF0sA7MsXsP1UyJoMp4YLEuNSfAP+JcXn/tWtIaxVXM" crossorigin="anonymous"></script>
59+
60+
<!-- Option 2: Separate Popper and Bootstrap JS -->
61+
<!--
62+
<script src="https://cdn.jsdelivr.net/npm/@popperjs/[email protected]/dist/umd/popper.min.js" integrity="sha384-IQsoLXl5PILFhosVNubq5LC7Qb9DXgDA9i+tQ8Zj3iwWAwPtgFTxbJ8NT4GN1R8p" crossorigin="anonymous"></script>
63+
<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.min.js" integrity="sha384-cVKIPhGWiC2Al4u+LWgxfKTRIcfu0JTxR+EQDz/bgldoEyl4H0zUF0QKbrJ0EcQF" crossorigin="anonymous"></script>
64+
-->
65+
</body>
66+
</html>

‎tests/Integration/tests-full/markdown-full/default-menu-md/expected/somePage.html

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
<!DOCTYPE html>
2+
<html class="no-js" lang="en">
3+
<head>
4+
<title>Some Page</title>
5+
<!-- Required meta tags -->
6+
<meta charset="utf-8">
7+
<meta name="viewport" content="width=device-width, initial-scale=1">
8+
9+
<link href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-EVSTQN3/azprG1Anm3QDgpJLIm9Nao0Yz1ztcQTwFspd3yD65VohhpuuCOmLASjC" crossorigin="anonymous">
10+
</head>
11+
<body>
12+
<header class="">
13+
14+
<nav class="navbar navbar-expand-lg navbar-dark bg-primary">
15+
<div class="container">
16+
17+
<a class="navbar-brand" href="#">Navbar</a>
18+
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
19+
<span class="navbar-toggler-icon"></span>
20+
</button>
21+
<div class="collapse navbar-collapse" id="navbarSupportedContent">
22+
23+
</div>
24+
</div>
25+
</nav>
26+
</header>
27+
<main id="main-content">
28+
<div class="container">
29+
<div class="container">
30+
<div class="row">
31+
<div class="col-lg-3">
32+
33+
</div>
34+
<div class="col-lg-9">
35+
36+
<nav aria-label="breadcrumb">
37+
<ol class="breadcrumb">
38+
<li class="breadcrumb-item"><a href="index.html">Document Title</a></li>
39+
<li class="breadcrumb-item"><a href="#">Some Page</a></li>
40+
</ol>
41+
</nav>
42+
<!-- content start -->
43+
<div class="section" id="some-page">
44+
<h1>Some Page</h1>
45+
46+
<p>Lorem Ipsum <code>Dolor</code>.</p>
47+
48+
</div>
49+
<!-- content end -->
50+
</div>
51+
</div>
52+
</div>
53+
</div>
54+
</main>
55+
56+
<!-- Optional JavaScript; choose one of the two! -->
57+
58+
<!-- Option 1: Bootstrap Bundle with Popper -->
59+
<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.bundle.min.js" integrity="sha384-MrcW6ZMFYlzcLA8Nl+NtUVF0sA7MsXsP1UyJoMp4YLEuNSfAP+JcXn/tWtIaxVXM" crossorigin="anonymous"></script>
60+
61+
<!-- Option 2: Separate Popper and Bootstrap JS -->
62+
<!--
63+
<script src="https://cdn.jsdelivr.net/npm/@popperjs/[email protected]/dist/umd/popper.min.js" integrity="sha384-IQsoLXl5PILFhosVNubq5LC7Qb9DXgDA9i+tQ8Zj3iwWAwPtgFTxbJ8NT4GN1R8p" crossorigin="anonymous"></script>
64+
<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.min.js" integrity="sha384-cVKIPhGWiC2Al4u+LWgxfKTRIcfu0JTxR+EQDz/bgldoEyl4H0zUF0QKbrJ0EcQF" crossorigin="anonymous"></script>
65+
-->
66+
</body>
67+
</html>

‎tests/Integration/tests/markdown/link-page-md/expected/subpages/index.html

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,5 @@
11
<!-- content start -->
2-
<div class="section" id="page-1">
3-
<h1>Page 1</h1>
4-
5-
<p>This is a Markdown document with some basic formatting.</p>
6-
7-
</div>
8-
<div class="section" id="markdown-with-links">
2+
<div class="section" id="markdown-with-links">
93
<h1>Markdown with links</h1>
104

115
<p>This is a Markdown document with some basic formatting.</p>

0 commit comments

Comments
 (0)