Updated page nav header shift logic to be accurate

Added tests to cover.
Fixes #542

diff --git a/app/Entities/Repos/PageRepo.php b/app/Entities/Repos/PageRepo.php
index e6cb309e7978a9d8eafacf617797eaba4c73de68..21fe820d029658f3df21e3be5afbde914d76e13a 100644 (file)
--- a/app/Entities/Repos/PageRepo.php
+++ b/app/Entities/Repos/PageRepo.php
@@ -438,10 +438,10 @@ class PageRepo extends EntityRepo
             return mb_strlen($header['text']) > 0;
         });
 
-        // Normalise headers if only smaller headers have been used
-        $minLevel = $tree->pluck('level')->min();
-        $tree = $tree->map(function ($header) use ($minLevel) {
-            $header['level'] -= ($minLevel - 2);
+        // Shift headers if only smaller headers have been used
+        $levelChange = ($tree->pluck('level')->min() - 1);
+        $tree = $tree->map(function ($header) use ($levelChange) {
+            $header['level'] -= ($levelChange);
             return $header;
         });
 

diff --git a/resources/assets/sass/_lists.scss b/resources/assets/sass/_lists.scss
index cafbfa78154ba6fb4625eda5ec9167eb4c4fd8ff..c413bcd8eecf6fd2c7e1bfae8b4b89777962286e 100644 (file)
--- a/resources/assets/sass/_lists.scss
+++ b/resources/assets/sass/_lists.scss
@@ -108,7 +108,7 @@
     padding-left: $nav-indent;
   }
   .h2 {
-    padding-left: $nav-indent;
+    padding-left: $nav-indent * 1.5;
   }
   .h3 {
     padding-left: $nav-indent * 2;

diff --git a/tests/Unit/PageRepoTest.php b/tests/Unit/PageRepoTest.php
index 36addcbe41c5a4b801a662f32605ce99b39177b8..41e7c2f78c538121bf537c3077a6ff43111dc8df 100644 (file)
--- a/tests/Unit/PageRepoTest.php
+++ b/tests/Unit/PageRepoTest.php
@@ -16,6 +16,32 @@ class PageRepoTest extends TestCase
         $this->pageRepo = app()->make(PageRepo::class);
     }
 
+    public function test_get_page_nav_sets_correct_properties()
+    {
+        $content = '<h1 id="testa">Hello</h1><h2 id="testb">There</h2><h3 id="testc">Donkey</h3>';
+        $navMap = $this->pageRepo->getPageNav($content);
+
+        $this->assertCount(3, $navMap);
+        $this->assertArraySubset([
+            'nodeName' => 'h1',
+            'link' => '#testa',
+            'text' => 'Hello',
+            'level' => 1,
+        ], $navMap[0]);
+        $this->assertArraySubset([
+            'nodeName' => 'h2',
+            'link' => '#testb',
+            'text' => 'There',
+            'level' => 2,
+        ], $navMap[1]);
+        $this->assertArraySubset([
+            'nodeName' => 'h3',
+            'link' => '#testc',
+            'text' => 'Donkey',
+            'level' => 3,
+        ], $navMap[2]);
+    }
+
     public function test_get_page_nav_does_not_show_empty_titles()
     {
         $content = '<h1 id="testa">Hello</h1><h2 id="testb">&nbsp;</h2><h3 id="testc"></h3>';
@@ -29,4 +55,24 @@ class PageRepoTest extends TestCase
         ], $navMap[0]);
     }
 
+    public function test_get_page_nav_shifts_headers_if_only_smaller_ones_are_used()
+    {
+        $content = '<h4 id="testa">Hello</h4><h5 id="testb">There</h5><h6 id="testc">Donkey</h6>';
+        $navMap = $this->pageRepo->getPageNav($content);
+
+        $this->assertCount(3, $navMap);
+        $this->assertArraySubset([
+            'nodeName' => 'h4',
+            'level' => 1,
+        ], $navMap[0]);
+        $this->assertArraySubset([
+            'nodeName' => 'h5',
+            'level' => 2,
+        ], $navMap[1]);
+        $this->assertArraySubset([
+            'nodeName' => 'h6',
+            'level' => 3,
+        ], $navMap[2]);
+    }
+
 }
\ No newline at end of file