Merge pull request #659 from hydephp/improve-the-documentation-headin…

…g-permalinks Improve the documentation heading permalinks feature
hydephp · Jul 8, 2024 · cec5228 · cec5228
2 parents 16e6458 + 3ab1344
commit cec5228
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 10 deletions.
diff --git a/src/Framework/Services/AssetService.php b/src/Framework/Services/AssetService.php
@@ -31,7 +31,7 @@
 class AssetService
 {
     /** @var string The default HydeFront SemVer tag to load. This constant is set to match the styles used for the installed framework version. */
-    final public const HYDEFRONT_VERSION = 'v3.3';
+    final public const HYDEFRONT_VERSION = 'v3.4';
 
     /** @var string The default HydeFront CDN path pattern. The Blade-style placeholders are replaced with the proper values. */
     final public const HYDEFRONT_CDN_URL = 'https://cdn.jsdelivr.net/npm/hydefront@{{ $version }}/dist/{{ $file }}';

diff --git a/src/Framework/Services/MarkdownService.php b/src/Framework/Services/MarkdownService.php
@@ -206,9 +206,10 @@ protected function configurePermalinksExtension(): void
             'heading_permalink' => [
                 'id_prefix' => '',
                 'fragment_prefix' => '',
-                'symbol' => '#',
+                'symbol' => '',
                 'insert' => 'after',
                 'min_heading_level' => 2,
+                'aria_hidden' => false,
             ],
         ], $this->config);
     }

diff --git a/tests/Feature/MarkdownServiceTest.php b/tests/Feature/MarkdownServiceTest.php
@@ -33,8 +33,8 @@ public function testServiceCanParseMarkdownToHtmlWithPermalinks()
 
         $this->assertIsString($html);
         $this->assertSame(
-            '<h2>Hello World!<a id="hello-world" href="#hello-world" class="heading-permalink" aria-hidden="true" '.
-            'title="Permalink">#</a></h2>'."\n",
+            '<h2>Hello World!<a id="hello-world" href="#hello-world" class="heading-permalink" '.
+            'title="Permalink"></a></h2>'."\n",
             $html
         );
     }

diff --git a/tests/Feature/StaticSiteBuilderDocumentationModuleTest.php b/tests/Feature/StaticSiteBuilderDocumentationModuleTest.php
@@ -44,7 +44,7 @@ public function testPageContainsExpectedContent()
     {
         $this->inspectHtml([
             'Adventures in Wonderland',
-            '<h2>CHAPTER I. DOWN THE RABBIT-HOLE.<a id="chapter-i-down-the-rabbit-hole" href="#chapter-i-down-the-rabbit-hole" class="heading-permalink" aria-hidden="true" title="Permalink">#</a></h2>',
+            '<h2>CHAPTER I. DOWN THE RABBIT-HOLE.<a id="chapter-i-down-the-rabbit-hole" href="#chapter-i-down-the-rabbit-hole" class="heading-permalink" title="Permalink"></a></h2>',
             '<p>So she was considering in her own mind, as well as she could',
         ]);
     }
@@ -55,7 +55,7 @@ public function testCanCompilePageToRootOutputDirectory()
 
         $this->inspectHtml([
             'Adventures in Wonderland',
-            '<h2>CHAPTER I. DOWN THE RABBIT-HOLE.<a id="chapter-i-down-the-rabbit-hole" href="#chapter-i-down-the-rabbit-hole" class="heading-permalink" aria-hidden="true" title="Permalink">#</a></h2>',
+            '<h2>CHAPTER I. DOWN THE RABBIT-HOLE.<a id="chapter-i-down-the-rabbit-hole" href="#chapter-i-down-the-rabbit-hole" class="heading-permalink" title="Permalink"></a></h2>',
             '<p>So she was considering in her own mind, as well as she could',
         ], '_site/test-page.html');
     }

diff --git a/tests/Unit/AssetServiceUnitTest.php b/tests/Unit/AssetServiceUnitTest.php
@@ -23,7 +23,7 @@ protected function setUp(): void
 
     public function testVersionStringConstant()
     {
-        $this->assertSame('v3.3', AssetService::HYDEFRONT_VERSION);
+        $this->assertSame('v3.4', AssetService::HYDEFRONT_VERSION);
     }
 
     public function testServiceHasVersionString()
@@ -56,7 +56,7 @@ public function testCanSetCustomCdnUrlInConfig()
     public function testCanUseCustomCdnUrlWithVersion()
     {
         self::mockConfig(['hyde.hydefront_url' => '{{ $version }}']);
-        $this->assertSame('v3.3', (new AssetService())->cdnLink(''));
+        $this->assertSame('v3.4', (new AssetService())->cdnLink(''));
     }
 
     public function testCanUseCustomCdnUrlWithFile()
@@ -68,7 +68,7 @@ public function testCanUseCustomCdnUrlWithFile()
     public function testCanUseCustomCdnUrlWithVersionAndFile()
     {
         self::mockConfig(['hyde.hydefront_url' => '{{ $version }}/{{ $file }}']);
-        $this->assertSame('v3.3/styles.css', (new AssetService())->cdnLink('styles.css'));
+        $this->assertSame('v3.4/styles.css', (new AssetService())->cdnLink('styles.css'));
     }
 
     public function testCanUseCustomCdnUrlWithCustomVersion()
@@ -83,7 +83,7 @@ public function testCanUseCustomCdnUrlWithCustomVersion()
     public function testCdnLinkHelper()
     {
         $this->assertSame(
-            'https://cdn.jsdelivr.net/npm/hydefront@v3.3/dist/styles.css',
+            'https://cdn.jsdelivr.net/npm/hydefront@v3.4/dist/styles.css',
             (new AssetService())->cdnLink('styles.css')
         );
     }