From 193feff11a863ceed686e66b6a5e2ae74e845159 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 13 Feb 2024 15:49:25 +0100
Subject: [PATCH 0001/1422] Create NavigationMenus.php

---
 .../Framework/Features/Navigation/NavigationMenus.php  | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 packages/framework/src/Framework/Features/Navigation/NavigationMenus.php

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenus.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenus.php
new file mode 100644
index 00000000000..851e36bc5d6
--- /dev/null
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenus.php
@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Hyde\Framework\Features\Navigation;
+
+class NavigationMenus
+{
+    //
+}

From f7f96bada621e6ded9a64f3ca5c789f70d50b58c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 13 Feb 2024 15:50:35 +0100
Subject: [PATCH 0002/1422] Create NavigationMenusTest.php

---
 .../tests/Feature/NavigationMenusTest.php         | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 packages/framework/tests/Feature/NavigationMenusTest.php

diff --git a/packages/framework/tests/Feature/NavigationMenusTest.php b/packages/framework/tests/Feature/NavigationMenusTest.php
new file mode 100644
index 00000000000..7ccd5d5973f
--- /dev/null
+++ b/packages/framework/tests/Feature/NavigationMenusTest.php
@@ -0,0 +1,15 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Hyde\Framework\Testing\Feature;
+
+use Hyde\Testing\TestCase;
+
+/**
+ * @covers \Hyde\Framework\Features\Navigation\NavigationMenus
+ */
+class NavigationMenusTest extends TestCase
+{
+    //
+}

From 018aaa138fcb26c2a3e9b8c24375485186a6b1ea Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 13 Feb 2024 15:49:44 +0100
Subject: [PATCH 0003/1422] Add PHPDoc

---
 .../src/Framework/Features/Navigation/NavigationMenus.php      | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenus.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenus.php
index 851e36bc5d6..a04ccafb587 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenus.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenus.php
@@ -4,6 +4,9 @@
 
 namespace Hyde\Framework\Features\Navigation;
 
+/**
+ * Interact with the navigation menus for the project.
+ */
 class NavigationMenus
 {
     //

From bd638057ab21f2b73f971ccf8eec6a91054d5213 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 13 Feb 2024 16:00:58 +0100
Subject: [PATCH 0004/1422] Add menus array to the new navigation menus class

---
 .../src/Framework/Features/Navigation/NavigationMenus.php  | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenus.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenus.php
index a04ccafb587..53b36fceff1 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenus.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenus.php
@@ -9,5 +9,10 @@
  */
 class NavigationMenus
 {
-    //
+    /**
+     * The menus that are available for the project, keyed by their name identifier.
+     *
+     * @var array<string, \Hyde\Framework\Features\Navigation\BaseNavigationMenu>
+     */
+    protected array $menus = [];
 }

From 6a318c3a6f0a8dfb5c9e8e28cc813477b37d9cf1 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 13 Feb 2024 16:03:11 +0100
Subject: [PATCH 0005/1422] Sketch out base contract

---
 .../Features/Navigation/NavigationMenus.php      | 16 ++++++++++++++++
 .../tests/Feature/NavigationMenusTest.php        | 10 +++++++++-
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenus.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenus.php
index 53b36fceff1..31ffdb366d4 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenus.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenus.php
@@ -15,4 +15,20 @@ class NavigationMenus
      * @var array<string, \Hyde\Framework\Features\Navigation\BaseNavigationMenu>
      */
     protected array $menus = [];
+
+    /**
+     * Register a new menu for the project.
+     */
+    public function registerMenu(string $name, BaseNavigationMenu $menu): void
+    {
+        $this->menus[$name] = $menu;
+    }
+
+    /**
+     * Get a menu by its name.
+     */
+    public function getMenu(string $name): BaseNavigationMenu
+    {
+        return $this->menus[$name];
+    }
 }
diff --git a/packages/framework/tests/Feature/NavigationMenusTest.php b/packages/framework/tests/Feature/NavigationMenusTest.php
index 7ccd5d5973f..90612248389 100644
--- a/packages/framework/tests/Feature/NavigationMenusTest.php
+++ b/packages/framework/tests/Feature/NavigationMenusTest.php
@@ -11,5 +11,13 @@
  */
 class NavigationMenusTest extends TestCase
 {
-    //
+    public function testRegisterMenu()
+    {
+        // Todo
+    }
+
+    public function testGetMenu()
+    {
+        // Todo
+    }
 }

From 068df5fe966c231c4a5fc47da3884e71cc30ca6b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 13 Feb 2024 17:04:53 +0100
Subject: [PATCH 0006/1422] Rename class to NavigationManager

---
 .../Navigation/{NavigationMenus.php => NavigationManager.php} | 2 +-
 .../{NavigationMenusTest.php => NavigationManagerTest.php}    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename packages/framework/src/Framework/Features/Navigation/{NavigationMenus.php => NavigationManager.php} (96%)
 rename packages/framework/tests/Feature/{NavigationMenusTest.php => NavigationManagerTest.php} (69%)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenus.php b/packages/framework/src/Framework/Features/Navigation/NavigationManager.php
similarity index 96%
rename from packages/framework/src/Framework/Features/Navigation/NavigationMenus.php
rename to packages/framework/src/Framework/Features/Navigation/NavigationManager.php
index 31ffdb366d4..45485f32043 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenus.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationManager.php
@@ -7,7 +7,7 @@
 /**
  * Interact with the navigation menus for the project.
  */
-class NavigationMenus
+class NavigationManager
 {
     /**
      * The menus that are available for the project, keyed by their name identifier.
diff --git a/packages/framework/tests/Feature/NavigationMenusTest.php b/packages/framework/tests/Feature/NavigationManagerTest.php
similarity index 69%
rename from packages/framework/tests/Feature/NavigationMenusTest.php
rename to packages/framework/tests/Feature/NavigationManagerTest.php
index 90612248389..09baf01df1e 100644
--- a/packages/framework/tests/Feature/NavigationMenusTest.php
+++ b/packages/framework/tests/Feature/NavigationManagerTest.php
@@ -7,9 +7,9 @@
 use Hyde\Testing\TestCase;
 
 /**
- * @covers \Hyde\Framework\Features\Navigation\NavigationMenus
+ * @covers \Hyde\Framework\Features\Navigation\NavigationManager
  */
-class NavigationMenusTest extends TestCase
+class NavigationManagerTest extends TestCase
 {
     public function testRegisterMenu()
     {

From 6064b5ddb468f832d000a497974682368fae2365 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 13 Feb 2024 17:05:13 +0100
Subject: [PATCH 0007/1422] Update PHPDoc for renamed class

---
 .../src/Framework/Features/Navigation/NavigationManager.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationManager.php b/packages/framework/src/Framework/Features/Navigation/NavigationManager.php
index 45485f32043..677a9264082 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationManager.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationManager.php
@@ -5,7 +5,7 @@
 namespace Hyde\Framework\Features\Navigation;
 
 /**
- * Interact with the navigation menus for the project.
+ * Manages the navigation menus for the project.
  */
 class NavigationManager
 {

From 79b82d506b129add9c28b36c96df48c950b8a499 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 13 Feb 2024 17:20:53 +0100
Subject: [PATCH 0008/1422] Copilot generate tests

---
 .../tests/Feature/NavigationManagerTest.php   | 38 ++++++++++++++++++-
 1 file changed, 36 insertions(+), 2 deletions(-)

diff --git a/packages/framework/tests/Feature/NavigationManagerTest.php b/packages/framework/tests/Feature/NavigationManagerTest.php
index 09baf01df1e..9380eefd8f1 100644
--- a/packages/framework/tests/Feature/NavigationManagerTest.php
+++ b/packages/framework/tests/Feature/NavigationManagerTest.php
@@ -4,6 +4,8 @@
 
 namespace Hyde\Framework\Testing\Feature;
 
+use Hyde\Framework\Features\Navigation\NavigationManager;
+use Hyde\Framework\Features\Navigation\BaseNavigationMenu;
 use Hyde\Testing\TestCase;
 
 /**
@@ -11,13 +13,45 @@
  */
 class NavigationManagerTest extends TestCase
 {
+    protected NavigationManager $navigationManager;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+        $this->navigationManager = new NavigationManager();
+    }
+
+    /** @author Copilot */
     public function testRegisterMenu()
     {
-        // Todo
+        $menu = $this->createMock(BaseNavigationMenu::class);
+        $this->navigationManager->registerMenu('test', $menu);
+
+        $reflection = new \ReflectionClass($this->navigationManager);
+        $property = $reflection->getProperty('menus');
+        $property->setAccessible(true);
+
+        $menus = $property->getValue($this->navigationManager);
+
+        $this->assertArrayHasKey('test', $menus);
+        $this->assertSame($menu, $menus['test']);
     }
 
+    /** @author Copilot */
     public function testGetMenu()
     {
-        // Todo
+        $menu = $this->createMock(BaseNavigationMenu::class);
+        $this->navigationManager->registerMenu('test', $menu);
+
+        $retrievedMenu = $this->navigationManager->getMenu('test');
+
+        $this->assertSame($menu, $retrievedMenu);
+    }
+
+    /** @author Copilot */
+    public function testGetMenuThrowsExceptionForNonExistentMenu()
+    {
+        $this->expectException(\Exception::class);
+        $this->navigationManager->getMenu('nonexistent');
     }
 }

From ae9859911e984bd28b30301481457bddd7dcdb3d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 13 Feb 2024 17:25:16 +0100
Subject: [PATCH 0009/1422] Clean up generated test

---
 .../tests/Feature/NavigationManagerTest.php   | 36 ++++++++-----------
 1 file changed, 15 insertions(+), 21 deletions(-)

diff --git a/packages/framework/tests/Feature/NavigationManagerTest.php b/packages/framework/tests/Feature/NavigationManagerTest.php
index 9380eefd8f1..6b622349cb8 100644
--- a/packages/framework/tests/Feature/NavigationManagerTest.php
+++ b/packages/framework/tests/Feature/NavigationManagerTest.php
@@ -13,45 +13,39 @@
  */
 class NavigationManagerTest extends TestCase
 {
-    protected NavigationManager $navigationManager;
-
-    protected function setUp(): void
+    public function testCanRegisterMenu()
     {
-        parent::setUp();
-        $this->navigationManager = new NavigationManager();
-    }
+        $manager = new NavigationManager();
 
-    /** @author Copilot */
-    public function testRegisterMenu()
-    {
         $menu = $this->createMock(BaseNavigationMenu::class);
-        $this->navigationManager->registerMenu('test', $menu);
+        $manager->registerMenu('foo', $menu);
 
-        $reflection = new \ReflectionClass($this->navigationManager);
+        $reflection = new \ReflectionClass($manager);
         $property = $reflection->getProperty('menus');
-        $property->setAccessible(true);
 
-        $menus = $property->getValue($this->navigationManager);
+        $menus = $property->getValue($manager);
 
-        $this->assertArrayHasKey('test', $menus);
-        $this->assertSame($menu, $menus['test']);
+        $this->assertArrayHasKey('foo', $menus);
+        $this->assertSame($menu, $menus['foo']);
     }
 
-    /** @author Copilot */
-    public function testGetMenu()
+    public function testCanGetMenu()
     {
+        $manager = new NavigationManager();
+
         $menu = $this->createMock(BaseNavigationMenu::class);
-        $this->navigationManager->registerMenu('test', $menu);
+        $manager->registerMenu('foo', $menu);
 
-        $retrievedMenu = $this->navigationManager->getMenu('test');
+        $retrievedMenu = $manager->getMenu('foo');
 
         $this->assertSame($menu, $retrievedMenu);
     }
 
-    /** @author Copilot */
     public function testGetMenuThrowsExceptionForNonExistentMenu()
     {
+        $manager = new NavigationManager();
+
         $this->expectException(\Exception::class);
-        $this->navigationManager->getMenu('nonexistent');
+        $manager->getMenu('foo');
     }
 }

From 7edcb821aecdb44ca858320fc3383c131f9b073d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 13 Feb 2024 18:42:22 +0100
Subject: [PATCH 0010/1422] Breaking: Rename class `NavigationMenu` to
 `MainNavigationMenu`

---
 docs/digging-deeper/navigation.md             |  4 +-
 .../views/layouts/navigation.blade.php        |  2 +-
 ...igationMenu.php => MainNavigationMenu.php} |  2 +-
 .../Framework/Features/Navigation/NavItem.php |  2 +-
 ...enuTest.php => MainNavigationMenuTest.php} | 64 +++++++++----------
 packages/framework/tests/Unit/NavItemTest.php |  2 +-
 .../Unit/Views/NavigationBrandViewTest.php    |  4 +-
 7 files changed, 40 insertions(+), 40 deletions(-)
 rename packages/framework/src/Framework/Features/Navigation/{NavigationMenu.php => MainNavigationMenu.php} (97%)
 rename packages/framework/tests/Feature/{NavigationMenuTest.php => MainNavigationMenuTest.php} (86%)

diff --git a/docs/digging-deeper/navigation.md b/docs/digging-deeper/navigation.md
index a9d865d45df..10d3ba73c90 100644
--- a/docs/digging-deeper/navigation.md
+++ b/docs/digging-deeper/navigation.md
@@ -296,11 +296,11 @@ For example: `_docs/getting-started/installation.md` will be placed in a group c
 While not required to know, you may find it interesting to learn more about how the navigation is handled internally.
 The best way to learn about this is to look at the source code, so here is a high-level overview with details on where to look in the source code.
 
-The main navigation menu is the `NavigationMenu` class, and the documentation sidebar is the `DocumentationSidebar` class.
+The main navigation menu is the `MainNavigationMenu` class, and the documentation sidebar is the `DocumentationSidebar` class.
 Both extend the same `BaseNavigationMenu` class:
 
 ```php
-use Hyde\Framework\Features\Navigation\NavigationMenu;
+use Hyde\Framework\Features\Navigation\MainNavigationMenu;
 use Hyde\Framework\Features\Navigation\DocumentationSidebar;
 use Hyde\Framework\Features\Navigation\BaseNavigationMenu;
 ```
diff --git a/packages/framework/resources/views/layouts/navigation.blade.php b/packages/framework/resources/views/layouts/navigation.blade.php
index 17707d5e10a..3324c3a79f2 100644
--- a/packages/framework/resources/views/layouts/navigation.blade.php
+++ b/packages/framework/resources/views/layouts/navigation.blade.php
@@ -1,5 +1,5 @@
 @php
-    $navigation = \Hyde\Framework\Features\Navigation\NavigationMenu::create();
+    $navigation = \Hyde\Framework\Features\Navigation\MainNavigationMenu::create();
 @endphp
 
 <nav aria-label="Main navigation" id="main-navigation" class="flex flex-wrap items-center justify-between p-4 shadow-lg sm:shadow-xl md:shadow-none dark:bg-gray-800">
diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/MainNavigationMenu.php
similarity index 97%
rename from packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
rename to packages/framework/src/Framework/Features/Navigation/MainNavigationMenu.php
index bcc844dca75..084cc2e19cd 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/MainNavigationMenu.php
@@ -9,7 +9,7 @@
 use Hyde\Pages\DocumentationPage;
 use BadMethodCallException;
 
-class NavigationMenu extends BaseNavigationMenu
+class MainNavigationMenu extends BaseNavigationMenu
 {
     protected function generate(): void
     {
diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 7a57b554282..d3b39db3dca 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -11,7 +11,7 @@
 use Stringable;
 
 /**
- * Abstraction for a navigation menu item. Used by the NavigationMenu and DocumentationSidebar classes.
+ * Abstraction for a navigation menu item. Used by the MainNavigationMenu and DocumentationSidebar classes.
  *
  * You have a few options to construct a navigation menu item:
  *   1. You can supply a Route directly and explicit properties to the constructor
diff --git a/packages/framework/tests/Feature/NavigationMenuTest.php b/packages/framework/tests/Feature/MainNavigationMenuTest.php
similarity index 86%
rename from packages/framework/tests/Feature/NavigationMenuTest.php
rename to packages/framework/tests/Feature/MainNavigationMenuTest.php
index a6c2a18501b..c7bb9bd1826 100644
--- a/packages/framework/tests/Feature/NavigationMenuTest.php
+++ b/packages/framework/tests/Feature/MainNavigationMenuTest.php
@@ -12,7 +12,7 @@
 
 use Hyde\Foundation\Facades\Routes;
 use Hyde\Framework\Features\Navigation\DropdownNavItem;
-use Hyde\Framework\Features\Navigation\NavigationMenu;
+use Hyde\Framework\Features\Navigation\MainNavigationMenu;
 use Hyde\Framework\Features\Navigation\NavItem;
 use Hyde\Pages\DocumentationPage;
 use Hyde\Pages\MarkdownPage;
@@ -21,24 +21,24 @@
 use Illuminate\Support\Collection;
 
 /**
- * @covers \Hyde\Framework\Features\Navigation\NavigationMenu
+ * @covers \Hyde\Framework\Features\Navigation\MainNavigationMenu
  * @covers \Hyde\Framework\Features\Navigation\BaseNavigationMenu
  */
-class NavigationMenuTest extends TestCase
+class MainNavigationMenuTest extends TestCase
 {
     public function testConstructor()
     {
-        $this->assertInstanceOf(NavigationMenu::class, NavigationMenu::create());
+        $this->assertInstanceOf(MainNavigationMenu::class, MainNavigationMenu::create());
     }
 
     public function testGenerateMethodCreatesCollectionOfNavItems()
     {
-        $this->assertInstanceOf(Collection::class, NavigationMenu::create()->items);
+        $this->assertInstanceOf(Collection::class, MainNavigationMenu::create()->items);
     }
 
     public function testGetItemsReturnsItems()
     {
-        $this->assertEquals(NavigationMenu::create()->items, NavigationMenu::create()->getItems());
+        $this->assertEquals(MainNavigationMenu::create()->items, MainNavigationMenu::create()->getItems());
     }
 
     public function testItemsAreSortedByPriority()
@@ -47,7 +47,7 @@ public function testItemsAreSortedByPriority()
         Routes::addRoute(new Route(new MarkdownPage('bar', ['navigation.priority' => 2])));
         Routes::addRoute(new Route(new MarkdownPage('baz', ['navigation.priority' => 3])));
 
-        $this->assertSame(['Home', 'Foo', 'Bar', 'Baz'], NavigationMenu::create()->items->pluck('label')->toArray());
+        $this->assertSame(['Home', 'Foo', 'Bar', 'Baz'], MainNavigationMenu::create()->items->pluck('label')->toArray());
     }
 
     public function testItemsWithHiddenPropertySetToTrueAreNotAdded()
@@ -55,7 +55,7 @@ public function testItemsWithHiddenPropertySetToTrueAreNotAdded()
         Routes::addRoute(new Route(new MarkdownPage('foo', ['navigation.hidden' => true])));
         Routes::addRoute(new Route(new MarkdownPage('bar', ['navigation.hidden' => false])));
 
-        $this->assertSame(['Home', 'Bar'], NavigationMenu::create()->items->pluck('label')->toArray());
+        $this->assertSame(['Home', 'Bar'], MainNavigationMenu::create()->items->pluck('label')->toArray());
     }
 
     public function testCreatedCollectionIsSortedByNavigationMenuPriority()
@@ -63,7 +63,7 @@ public function testCreatedCollectionIsSortedByNavigationMenuPriority()
         $this->file('_pages/foo.md');
         $this->file('_docs/index.md');
 
-        $menu = NavigationMenu::create();
+        $menu = MainNavigationMenu::create();
 
         $expected = collect([
             NavItem::fromRoute(Routes::get('index')),
@@ -79,7 +79,7 @@ public function testIsSortedAutomaticallyWhenUsingNavigationMenuCreate()
     {
         $this->file('_pages/foo.md');
 
-        $menu = NavigationMenu::create();
+        $menu = MainNavigationMenu::create();
 
         $expected = collect([
             NavItem::fromRoute(Routes::get('index')),
@@ -92,14 +92,14 @@ public function testIsSortedAutomaticallyWhenUsingNavigationMenuCreate()
 
     public function testCollectionOnlyContainsNavItems()
     {
-        $this->assertContainsOnlyInstancesOf(NavItem::class, NavigationMenu::create()->items);
+        $this->assertContainsOnlyInstancesOf(NavItem::class, MainNavigationMenu::create()->items);
     }
 
     public function testExternalLinkCanBeAddedInConfig()
     {
         config(['hyde.navigation.custom' => [NavItem::forLink('https://example.com', 'foo')]]);
 
-        $menu = NavigationMenu::create();
+        $menu = MainNavigationMenu::create();
 
         $expected = collect([
             NavItem::fromRoute(Routes::get('index')),
@@ -114,7 +114,7 @@ public function testPathLinkCanBeAddedInConfig()
     {
         config(['hyde.navigation.custom' => [NavItem::forLink('foo', 'foo')]]);
 
-        $menu = NavigationMenu::create();
+        $menu = MainNavigationMenu::create();
 
         $expected = collect([
             NavItem::fromRoute(Routes::get('index')),
@@ -132,7 +132,7 @@ public function testDuplicatesAreRemovedWhenAddingInConfig()
             NavItem::forLink('foo', 'foo'),
         ]]);
 
-        $menu = NavigationMenu::create();
+        $menu = MainNavigationMenu::create();
 
         $expected = collect([
             NavItem::fromRoute(Routes::get('index')),
@@ -150,7 +150,7 @@ public function testDuplicatesAreRemovedWhenAddingInConfigRegardlessOfDestinatio
             NavItem::forLink('bar', 'foo'),
         ]]);
 
-        $menu = NavigationMenu::create();
+        $menu = MainNavigationMenu::create();
 
         $expected = collect([
             NavItem::fromRoute(Routes::get('index')),
@@ -167,7 +167,7 @@ public function testConfigItemsTakePrecedenceOverGeneratedItems()
 
         config(['hyde.navigation.custom' => [NavItem::forLink('bar', 'Foo')]]);
 
-        $menu = NavigationMenu::create();
+        $menu = MainNavigationMenu::create();
 
         $expected = collect([
             NavItem::fromRoute(Routes::get('index')),
@@ -183,7 +183,7 @@ public function testDocumentationPagesThatAreNotIndexAreNotAddedToTheMenu()
         $this->file('_docs/foo.md');
         $this->file('_docs/index.md');
 
-        $menu = NavigationMenu::create();
+        $menu = MainNavigationMenu::create();
 
         $expected = collect([
             NavItem::fromRoute(Routes::get('index')),
@@ -199,7 +199,7 @@ public function testPagesInSubdirectoriesAreNotAddedToTheNavigationMenu()
         $this->directory('_pages/foo');
         $this->file('_pages/foo/bar.md');
 
-        $menu = NavigationMenu::create();
+        $menu = MainNavigationMenu::create();
         $expected = collect([NavItem::fromRoute(Routes::get('index'))]);
 
         $this->assertCount(count($expected), $menu->items);
@@ -212,7 +212,7 @@ public function testPagesInSubdirectoriesCanBeAddedToTheNavigationMenuWithConfig
         $this->directory('_pages/foo');
         $this->file('_pages/foo/bar.md');
 
-        $menu = NavigationMenu::create();
+        $menu = MainNavigationMenu::create();
         $expected = collect([
             NavItem::fromRoute(Routes::get('index')),
             NavItem::fromRoute(Routes::get('foo/bar')),
@@ -228,7 +228,7 @@ public function testPagesInSubdirectoriesAreNotAddedToTheNavigationMenuWithConfi
         $this->directory('_pages/foo');
         $this->file('_pages/foo/bar.md');
 
-        $menu = NavigationMenu::create();
+        $menu = MainNavigationMenu::create();
         $expected = collect([
             NavItem::fromRoute(Routes::get('index')),
             DropdownNavItem::fromArray('foo', [
@@ -243,7 +243,7 @@ public function testPagesInSubdirectoriesAreNotAddedToTheNavigationMenuWithConfi
     public function testHasDropdownsReturnsFalseWhenThereAreNoDropdowns()
     {
         config(['hyde.navigation.subdirectories' => 'dropdown']);
-        $menu = NavigationMenu::create();
+        $menu = MainNavigationMenu::create();
         $this->assertFalse($menu->hasDropdowns());
     }
 
@@ -251,20 +251,20 @@ public function testHasDropdownsReturnsTrueWhenThereAreDropdowns()
     {
         config(['hyde.navigation.subdirectories' => 'dropdown']);
         Routes::addRoute((new MarkdownPage('foo/bar'))->getRoute());
-        $menu = NavigationMenu::create();
+        $menu = MainNavigationMenu::create();
         $this->assertTrue($menu->hasDropdowns());
     }
 
     public function testHasDropdownsAlwaysReturnsFalseWhenDropdownsAreDisabled()
     {
         Routes::addRoute((new MarkdownPage('foo/bar'))->getRoute());
-        $this->assertFalse(NavigationMenu::create()->hasDropdowns());
+        $this->assertFalse(MainNavigationMenu::create()->hasDropdowns());
     }
 
     public function testGetDropdownsReturnsEmptyArrayThereAreNoDropdowns()
     {
         config(['hyde.navigation.subdirectories' => 'dropdown']);
-        $menu = NavigationMenu::create();
+        $menu = MainNavigationMenu::create();
         $this->assertCount(0, $menu->getDropdowns());
         $this->assertSame([], $menu->getDropdowns());
     }
@@ -273,7 +273,7 @@ public function testGetDropdownsReturnsCorrectArrayWhenThereAreDropdowns()
     {
         config(['hyde.navigation.subdirectories' => 'dropdown']);
         Routes::addRoute((new MarkdownPage('foo/bar'))->getRoute());
-        $menu = NavigationMenu::create();
+        $menu = MainNavigationMenu::create();
         $this->assertCount(1, $menu->getDropdowns());
 
         $this->assertEquals([
@@ -288,7 +288,7 @@ public function testGetDropdownsWithMultipleItems()
 
         Routes::addRoute((new MarkdownPage('foo/bar'))->getRoute());
         Routes::addRoute((new MarkdownPage('foo/baz'))->getRoute());
-        $menu = NavigationMenu::create();
+        $menu = MainNavigationMenu::create();
 
         $this->assertCount(1, $menu->getDropdowns());
 
@@ -308,7 +308,7 @@ public function testGetDropdownsWithMultipleDropdowns()
         Routes::addRoute((new MarkdownPage('foo/baz'))->getRoute());
         Routes::addRoute((new MarkdownPage('cat/hat'))->getRoute());
 
-        $menu = NavigationMenu::create();
+        $menu = MainNavigationMenu::create();
 
         $this->assertCount(2, $menu->getDropdowns());
 
@@ -328,7 +328,7 @@ public function testGetDropdownsThrowsExceptionWhenDisabled()
         $this->expectException(BadMethodCallException::class);
         $this->expectExceptionMessage('Dropdowns are not enabled. Enable it by setting `hyde.navigation.subdirectories` to `dropdown`.');
 
-        $menu = NavigationMenu::create();
+        $menu = MainNavigationMenu::create();
         $menu->getDropdowns();
     }
 
@@ -338,7 +338,7 @@ public function testDocumentationPagesDoNotGetAddedToDropdowns()
 
         Routes::addRoute((new DocumentationPage('foo'))->getRoute());
         Routes::addRoute((new DocumentationPage('bar/baz'))->getRoute());
-        $menu = NavigationMenu::create();
+        $menu = MainNavigationMenu::create();
 
         $this->assertFalse($menu->hasDropdowns());
         $this->assertCount(0, $menu->getDropdowns());
@@ -351,7 +351,7 @@ public function testBlogPostsDoNotGetAddedToDropdowns()
         Routes::addRoute((new MarkdownPost('foo'))->getRoute());
         Routes::addRoute((new MarkdownPost('bar/baz'))->getRoute());
 
-        $menu = NavigationMenu::create();
+        $menu = MainNavigationMenu::create();
         $this->assertFalse($menu->hasDropdowns());
         $this->assertCount(0, $menu->getDropdowns());
     }
@@ -362,7 +362,7 @@ public function testPagesInDropdownsDoNotGetAddedToTheMainNavigation()
 
         Routes::push((new MarkdownPage('foo'))->getRoute());
         Routes::push((new MarkdownPage('bar/baz'))->getRoute());
-        $menu = NavigationMenu::create();
+        $menu = MainNavigationMenu::create();
 
         $this->assertCount(3, $menu->items);
         $this->assertEquals([
@@ -382,7 +382,7 @@ public function testDropdownMenuItemsAreSortedByPriority()
         Routes::addRoute(new Route(new MarkdownPage('foo/bar', ['navigation.priority' => 2])));
         Routes::addRoute(new Route(new MarkdownPage('foo/baz', ['navigation.priority' => 3])));
 
-        $menu = NavigationMenu::create();
+        $menu = MainNavigationMenu::create();
         $dropdowns = $menu->getDropdowns();
 
         $this->assertSame(['Foo', 'Bar', 'Baz'], $dropdowns[0]->getItems()->pluck('label')->toArray());
diff --git a/packages/framework/tests/Unit/NavItemTest.php b/packages/framework/tests/Unit/NavItemTest.php
index 379fbf581eb..6ab0458ee1b 100644
--- a/packages/framework/tests/Unit/NavItemTest.php
+++ b/packages/framework/tests/Unit/NavItemTest.php
@@ -17,7 +17,7 @@
 
 /**
  * This unit test covers the basics of the NavItem class.
- * For the full feature test, see the NavigationMenuTest class.
+ * For the full feature test, see the MainNavigationMenuTest class.
  *
  * @covers \Hyde\Framework\Features\Navigation\NavItem
  *
diff --git a/packages/framework/tests/Unit/Views/NavigationBrandViewTest.php b/packages/framework/tests/Unit/Views/NavigationBrandViewTest.php
index 577295f5cf0..b34478273d6 100644
--- a/packages/framework/tests/Unit/Views/NavigationBrandViewTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationBrandViewTest.php
@@ -4,7 +4,7 @@
 
 namespace Hyde\Framework\Testing\Unit\Views;
 
-use Hyde\Framework\Features\Navigation\NavigationMenu;
+use Hyde\Framework\Features\Navigation\MainNavigationMenu;
 use Hyde\Testing\TestCase;
 
 /**
@@ -22,7 +22,7 @@ protected function setUp(): void
     protected function render(): string
     {
         return view('hyde::components.navigation.navigation-brand', [
-            'navigation' => NavigationMenu::create(),
+            'navigation' => MainNavigationMenu::create(),
         ])->render();
     }
 

From 0873f53dc8e404984ae8c1ab7b476c2c2c9b6f8f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 13 Feb 2024 18:43:38 +0100
Subject: [PATCH 0011/1422] Create NavigationMenu.php

---
 .../Framework/Features/Navigation/NavigationMenu.php   | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 packages/framework/src/Framework/Features/Navigation/NavigationMenu.php

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
new file mode 100644
index 00000000000..418a992bd4f
--- /dev/null
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Hyde\Framework\Features\Navigation;
+
+class NavigationMenu
+{
+    //
+}

From 64e14590e83c0a74fbc0a6cc76297dea44ce9b93 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 13 Feb 2024 18:45:21 +0100
Subject: [PATCH 0012/1422] Create NavigationMenuTest.php

---
 .../tests/Feature/NavigationMenuTest.php          | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 packages/framework/tests/Feature/NavigationMenuTest.php

diff --git a/packages/framework/tests/Feature/NavigationMenuTest.php b/packages/framework/tests/Feature/NavigationMenuTest.php
new file mode 100644
index 00000000000..b75fa735190
--- /dev/null
+++ b/packages/framework/tests/Feature/NavigationMenuTest.php
@@ -0,0 +1,15 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Hyde\Framework\Testing\Feature;
+
+use Hyde\Testing\TestCase;
+
+/**
+ * @covers \Hyde\Framework\Features\Navigation\NavigationMenu
+ */
+class NavigationMenuTest extends TestCase
+{
+    //
+}

From e658b6383eaf4535c17a9dd9fbe6973f9a9f453a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 13 Feb 2024 18:47:47 +0100
Subject: [PATCH 0013/1422] Add protected items collection

---
 .../src/Framework/Features/Navigation/NavigationMenu.php     | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
index 418a992bd4f..2667031b7a6 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
@@ -4,7 +4,10 @@
 
 namespace Hyde\Framework\Features\Navigation;
 
+use Illuminate\Support\Collection;
+
 class NavigationMenu
 {
-    //
+    /** @var \Illuminate\Support\Collection<string, \Hyde\Framework\Features\Navigation\NavItem> */
+    protected Collection $items;
 }

From 5f6458fcd05fb8eb344e22540d049cd8f3f20288 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 13 Feb 2024 19:07:37 +0100
Subject: [PATCH 0014/1422] Deprecate class `BaseNavigationMenu`

---
 .../src/Framework/Features/Navigation/BaseNavigationMenu.php     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/BaseNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/BaseNavigationMenu.php
index d802662c974..d8bf84ebfab 100644
--- a/packages/framework/src/Framework/Features/Navigation/BaseNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/BaseNavigationMenu.php
@@ -11,6 +11,7 @@
 
 use function collect;
 
+/** @deprecated Use the new NavigationMenu class instead */
 abstract class BaseNavigationMenu
 {
     /** @var \Illuminate\Support\Collection<string, \Hyde\Framework\Features\Navigation\NavItem> */

From ce71cab4e303ffea2714cf07a939a00c7f872def Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 13 Feb 2024 19:07:18 +0100
Subject: [PATCH 0015/1422] Deprecate class `MainNavigationMenu`

---
 .../src/Framework/Features/Navigation/MainNavigationMenu.php     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/MainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/MainNavigationMenu.php
index 084cc2e19cd..db72a3569bb 100644
--- a/packages/framework/src/Framework/Features/Navigation/MainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/MainNavigationMenu.php
@@ -9,6 +9,7 @@
 use Hyde\Pages\DocumentationPage;
 use BadMethodCallException;
 
+/** @deprecated Use the new NavigationMenu class instead */
 class MainNavigationMenu extends BaseNavigationMenu
 {
     protected function generate(): void

From a1ba9c2b85d25184c5f0a6a1a244029d39c95854 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 13 Feb 2024 19:07:32 +0100
Subject: [PATCH 0016/1422] Deprecate class `DocumentationSidebar`

---
 .../src/Framework/Features/Navigation/DocumentationSidebar.php   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 919b93434a6..ccfaacafbf9 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -15,6 +15,7 @@
 
 use function collect;
 
+/** @deprecated Use the new NavigationMenu class instead */
 class DocumentationSidebar extends BaseNavigationMenu
 {
     protected function generate(): void

From d3868f5931af9cd7cd6335a4c7b3359a31a3db3a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 13 Feb 2024 19:12:46 +0100
Subject: [PATCH 0017/1422] Scaffold new generation method

---
 .../Features/Navigation/NavigationManager.php         | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationManager.php b/packages/framework/src/Framework/Features/Navigation/NavigationManager.php
index 677a9264082..359de3f2830 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationManager.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationManager.php
@@ -31,4 +31,15 @@ public function getMenu(string $name): BaseNavigationMenu
     {
         return $this->menus[$name];
     }
+
+    /**
+     * Temporary logic moved from MainNavigationMenu.php
+     *
+     * @internal
+     * @experimental
+     */
+    public static function generateMainMenu(): NavigationMenu
+    {
+        //
+    }
 }

From 32b6b8a15f95021a73f03cc1d76e45bdeec5250c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 13 Feb 2024 19:12:49 +0100
Subject: [PATCH 0018/1422] Revert "Scaffold new generation method"

This reverts commit d3868f5931af9cd7cd6335a4c7b3359a31a3db3a.
---
 .../Features/Navigation/NavigationManager.php         | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationManager.php b/packages/framework/src/Framework/Features/Navigation/NavigationManager.php
index 359de3f2830..677a9264082 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationManager.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationManager.php
@@ -31,15 +31,4 @@ public function getMenu(string $name): BaseNavigationMenu
     {
         return $this->menus[$name];
     }
-
-    /**
-     * Temporary logic moved from MainNavigationMenu.php
-     *
-     * @internal
-     * @experimental
-     */
-    public static function generateMainMenu(): NavigationMenu
-    {
-        //
-    }
 }

From fdf4f3ac00853374ebe9a2d3e270324c932fe232 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 13 Feb 2024 19:15:37 +0100
Subject: [PATCH 0019/1422] Create NavigationServiceProvider.php

---
 .../Foundation/Providers/NavigationServiceProvider.php | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 packages/framework/src/Foundation/Providers/NavigationServiceProvider.php

diff --git a/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php b/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php
new file mode 100644
index 00000000000..40801e73cbb
--- /dev/null
+++ b/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php
@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Hyde\Foundation\Providers;
+
+class NavigationServiceProvider
+{
+    //
+}

From 765223e1c616808fc0c7aa067f39ba402960e4b4 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 13 Feb 2024 19:17:46 +0100
Subject: [PATCH 0020/1422] Register NavigationServiceProvider

---
 app/config.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/config.php b/app/config.php
index 9af0e0cdf05..627c80c2d13 100644
--- a/app/config.php
+++ b/app/config.php
@@ -73,6 +73,7 @@
         Hyde\Foundation\Providers\ConfigurationServiceProvider::class,
         Hyde\Framework\HydeServiceProvider::class,
         Hyde\Foundation\Providers\ViewServiceProvider::class,
+        Hyde\Foundation\Providers\NavigationServiceProvider::class,
         Hyde\Console\ConsoleServiceProvider::class,
     ],
 

From f433a7d4a27471ebc9eb5414bb31923dcab0a0bc Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 13 Feb 2024 19:17:50 +0100
Subject: [PATCH 0021/1422] Cover NavigationServiceProvider

---
 packages/framework/tests/Feature/HydeServiceProviderTest.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/tests/Feature/HydeServiceProviderTest.php b/packages/framework/tests/Feature/HydeServiceProviderTest.php
index e350de913c2..83e437c4acc 100644
--- a/packages/framework/tests/Feature/HydeServiceProviderTest.php
+++ b/packages/framework/tests/Feature/HydeServiceProviderTest.php
@@ -31,6 +31,7 @@
  * @covers \Hyde\Framework\HydeServiceProvider
  * @covers \Hyde\Framework\Concerns\RegistersFileLocations
  * @covers \Hyde\Foundation\Providers\ConfigurationServiceProvider
+ * @covers \Hyde\Foundation\Providers\NavigationServiceProvider
  * @covers \Hyde\Foundation\Providers\ViewServiceProvider
  */
 class HydeServiceProviderTest extends TestCase

From 233ecae531a3906c26d9ac31ee2a87f4928ac29e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 13 Feb 2024 19:18:31 +0100
Subject: [PATCH 0022/1422] Extend ServiceProvider

---
 .../src/Foundation/Providers/NavigationServiceProvider.php    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php b/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php
index 40801e73cbb..b6676237253 100644
--- a/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php
+++ b/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php
@@ -4,7 +4,9 @@
 
 namespace Hyde\Foundation\Providers;
 
-class NavigationServiceProvider
+use Illuminate\Support\ServiceProvider;
+
+class NavigationServiceProvider extends ServiceProvider
 {
     //
 }

From 786bdf68203340e588f6b6bcf4da3ed7e7930fa8 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 13 Feb 2024 19:21:01 +0100
Subject: [PATCH 0023/1422] Register NavigationManager as a singleton

---
 .../Foundation/Providers/NavigationServiceProvider.php   | 8 +++++++-
 .../framework/tests/Feature/HydeServiceProviderTest.php  | 9 +++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php b/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php
index b6676237253..c23e3762da8 100644
--- a/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php
+++ b/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php
@@ -5,8 +5,14 @@
 namespace Hyde\Foundation\Providers;
 
 use Illuminate\Support\ServiceProvider;
+use Hyde\Framework\Features\Navigation\NavigationManager;
 
 class NavigationServiceProvider extends ServiceProvider
 {
-    //
+    public function register(): void
+    {
+        $this->app->singleton(NavigationManager::class, function ($app) {
+            return new NavigationManager();
+        });
+    }
 }
diff --git a/packages/framework/tests/Feature/HydeServiceProviderTest.php b/packages/framework/tests/Feature/HydeServiceProviderTest.php
index 83e437c4acc..69f5b525ccc 100644
--- a/packages/framework/tests/Feature/HydeServiceProviderTest.php
+++ b/packages/framework/tests/Feature/HydeServiceProviderTest.php
@@ -4,6 +4,8 @@
 
 namespace Hyde\Framework\Testing\Feature;
 
+use Hyde\Framework\Features\Navigation\NavigationManager;
+
 use function app;
 use function array_map;
 use function basename;
@@ -327,4 +329,11 @@ public function testOutputDirectoriesCanBeSetUsingKebabCaseClassNames()
         $this->assertEquals('foo', MarkdownPost::outputDirectory());
         $this->assertEquals('foo', DocumentationPage::outputDirectory());
     }
+
+    public function testNavigationManagerIsRegisteredAsSingleton()
+    {
+        $this->assertTrue($this->app->bound(NavigationManager::class));
+        $this->assertInstanceOf(NavigationManager::class, $this->app->make(NavigationManager::class));
+        $this->assertSame($this->app->make(NavigationManager::class), $this->app->make(NavigationManager::class));
+    }
 }

From 4089cb568093f118f3196b66eca03d7065aa95cc Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 13 Feb 2024 19:23:37 +0100
Subject: [PATCH 0024/1422] Register navigation manager alias in container

---
 .../src/Foundation/Providers/NavigationServiceProvider.php | 2 ++
 .../framework/tests/Feature/HydeServiceProviderTest.php    | 7 +++++++
 2 files changed, 9 insertions(+)

diff --git a/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php b/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php
index c23e3762da8..849317ef3d4 100644
--- a/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php
+++ b/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php
@@ -14,5 +14,7 @@ public function register(): void
         $this->app->singleton(NavigationManager::class, function ($app) {
             return new NavigationManager();
         });
+
+        $this->app->alias(NavigationManager::class, 'navigation');
     }
 }
diff --git a/packages/framework/tests/Feature/HydeServiceProviderTest.php b/packages/framework/tests/Feature/HydeServiceProviderTest.php
index 69f5b525ccc..6ad340537de 100644
--- a/packages/framework/tests/Feature/HydeServiceProviderTest.php
+++ b/packages/framework/tests/Feature/HydeServiceProviderTest.php
@@ -336,4 +336,11 @@ public function testNavigationManagerIsRegisteredAsSingleton()
         $this->assertInstanceOf(NavigationManager::class, $this->app->make(NavigationManager::class));
         $this->assertSame($this->app->make(NavigationManager::class), $this->app->make(NavigationManager::class));
     }
+
+    public function testProviderRegistersNavigationManagerAlias()
+    {
+        $this->assertTrue($this->app->bound('navigation'));
+        $this->assertInstanceOf(NavigationManager::class, $this->app->make('navigation'));
+        $this->assertSame($this->app->make(NavigationManager::class), $this->app->make('navigation'));
+    }
 }

From c511af840ad2de40255f2b5f2c6faf64c991fe70 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 13 Feb 2024 19:26:11 +0100
Subject: [PATCH 0025/1422] Remove unused parameter

---
 .../src/Foundation/Providers/NavigationServiceProvider.php      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php b/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php
index 849317ef3d4..cd39be72fcc 100644
--- a/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php
+++ b/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php
@@ -11,7 +11,7 @@ class NavigationServiceProvider extends ServiceProvider
 {
     public function register(): void
     {
-        $this->app->singleton(NavigationManager::class, function ($app) {
+        $this->app->singleton(NavigationManager::class, function () {
             return new NavigationManager();
         });
 

From 6565a2e7e96e8ad7d263a6851c2e936d324f695c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 13 Feb 2024 19:26:54 +0100
Subject: [PATCH 0026/1422] Type hint new menu class

---
 .../src/Framework/Features/Navigation/NavigationManager.php | 6 +++---
 packages/framework/tests/Feature/NavigationManagerTest.php  | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationManager.php b/packages/framework/src/Framework/Features/Navigation/NavigationManager.php
index 677a9264082..3d65a8597f8 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationManager.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationManager.php
@@ -12,14 +12,14 @@ class NavigationManager
     /**
      * The menus that are available for the project, keyed by their name identifier.
      *
-     * @var array<string, \Hyde\Framework\Features\Navigation\BaseNavigationMenu>
+     * @var array<string, \Hyde\Framework\Features\Navigation\NavigationMenu>
      */
     protected array $menus = [];
 
     /**
      * Register a new menu for the project.
      */
-    public function registerMenu(string $name, BaseNavigationMenu $menu): void
+    public function registerMenu(string $name, NavigationMenu $menu): void
     {
         $this->menus[$name] = $menu;
     }
@@ -27,7 +27,7 @@ public function registerMenu(string $name, BaseNavigationMenu $menu): void
     /**
      * Get a menu by its name.
      */
-    public function getMenu(string $name): BaseNavigationMenu
+    public function getMenu(string $name): NavigationMenu
     {
         return $this->menus[$name];
     }
diff --git a/packages/framework/tests/Feature/NavigationManagerTest.php b/packages/framework/tests/Feature/NavigationManagerTest.php
index 6b622349cb8..97f2c1b83a9 100644
--- a/packages/framework/tests/Feature/NavigationManagerTest.php
+++ b/packages/framework/tests/Feature/NavigationManagerTest.php
@@ -5,7 +5,7 @@
 namespace Hyde\Framework\Testing\Feature;
 
 use Hyde\Framework\Features\Navigation\NavigationManager;
-use Hyde\Framework\Features\Navigation\BaseNavigationMenu;
+use Hyde\Framework\Features\Navigation\NavigationMenu;
 use Hyde\Testing\TestCase;
 
 /**
@@ -17,7 +17,7 @@ public function testCanRegisterMenu()
     {
         $manager = new NavigationManager();
 
-        $menu = $this->createMock(BaseNavigationMenu::class);
+        $menu = $this->createMock(NavigationMenu::class);
         $manager->registerMenu('foo', $menu);
 
         $reflection = new \ReflectionClass($manager);
@@ -33,7 +33,7 @@ public function testCanGetMenu()
     {
         $manager = new NavigationManager();
 
-        $menu = $this->createMock(BaseNavigationMenu::class);
+        $menu = $this->createMock(NavigationMenu::class);
         $manager->registerMenu('foo', $menu);
 
         $retrievedMenu = $manager->getMenu('foo');

From 9997235617aaae1c1a8e6b6542c1a8294a1deb81 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 13 Feb 2024 20:02:00 +0100
Subject: [PATCH 0027/1422] Add booted callback to register the navigation menu

---
 .../src/Foundation/Providers/NavigationServiceProvider.php  | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php b/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php
index cd39be72fcc..55b59aa704d 100644
--- a/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php
+++ b/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php
@@ -4,7 +4,9 @@
 
 namespace Hyde\Foundation\Providers;
 
+use Hyde\Foundation\HydeKernel;
 use Illuminate\Support\ServiceProvider;
+use Hyde\Framework\Features\Navigation\NavigationMenu;
 use Hyde\Framework\Features\Navigation\NavigationManager;
 
 class NavigationServiceProvider extends ServiceProvider
@@ -16,5 +18,9 @@ public function register(): void
         });
 
         $this->app->alias(NavigationManager::class, 'navigation');
+
+        $this->app->make(HydeKernel::class)->booted(function (HydeKernel $kernel) {
+            $this->app->make(NavigationManager::class)->registerMenu('main', new NavigationMenu());
+        });
     }
 }

From f007eb6d140e47662e97ebbe75012bbf9d84cd78 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 13 Feb 2024 20:03:18 +0100
Subject: [PATCH 0028/1422] Remove unused parameter

---
 .../src/Foundation/Providers/NavigationServiceProvider.php      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php b/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php
index 55b59aa704d..7eb3ada7949 100644
--- a/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php
+++ b/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php
@@ -19,7 +19,7 @@ public function register(): void
 
         $this->app->alias(NavigationManager::class, 'navigation');
 
-        $this->app->make(HydeKernel::class)->booted(function (HydeKernel $kernel) {
+        $this->app->make(HydeKernel::class)->booted(function () {
             $this->app->make(NavigationManager::class)->registerMenu('main', new NavigationMenu());
         });
     }

From 74e7901420cbbef24f407e515226bc411ab76889 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 13 Feb 2024 20:04:32 +0100
Subject: [PATCH 0029/1422] Add navigation menu constructor

---
 .../src/Framework/Features/Navigation/NavigationMenu.php     | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
index 2667031b7a6..77386e24cee 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
@@ -10,4 +10,9 @@ class NavigationMenu
 {
     /** @var \Illuminate\Support\Collection<string, \Hyde\Framework\Features\Navigation\NavItem> */
     protected Collection $items;
+
+    public function __construct(Collection $items)
+    {
+        $this->items = $items;
+    }
 }

From ed6796411e3c39b0c0d837a4e4a0504ab533d8f6 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 13 Feb 2024 20:06:35 +0100
Subject: [PATCH 0030/1422] Update constructor to support arrayables

---
 .../src/Framework/Features/Navigation/NavigationMenu.php     | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
index 77386e24cee..3bb7089c6fe 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
@@ -5,14 +5,15 @@
 namespace Hyde\Framework\Features\Navigation;
 
 use Illuminate\Support\Collection;
+use Illuminate\Contracts\Support\Arrayable;
 
 class NavigationMenu
 {
     /** @var \Illuminate\Support\Collection<string, \Hyde\Framework\Features\Navigation\NavItem> */
     protected Collection $items;
 
-    public function __construct(Collection $items)
+    public function __construct(Arrayable|array $items = [])
     {
-        $this->items = $items;
+        $this->items = new Collection($items);
     }
 }

From 7c0af951a78b6d7b5ad298258cf6f98931a3a046 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 13 Feb 2024 20:07:30 +0100
Subject: [PATCH 0031/1422] Change return type to new menu class

Breaking: Change `BaseNavigationMenu::create()` return type to new NavigationMenu
---
 .../src/Framework/Features/Navigation/BaseNavigationMenu.php  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/BaseNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/BaseNavigationMenu.php
index d8bf84ebfab..a69842b8af7 100644
--- a/packages/framework/src/Framework/Features/Navigation/BaseNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/BaseNavigationMenu.php
@@ -22,7 +22,7 @@ final protected function __construct()
         $this->items = new Collection();
     }
 
-    public static function create(): static
+    public static function create(): NavigationMenu
     {
         $menu = new static();
 
@@ -30,7 +30,7 @@ public static function create(): static
         $menu->sortByPriority();
         $menu->removeDuplicateItems();
 
-        return $menu;
+        return new NavigationMenu($menu->getItems());
     }
 
     protected function generate(): void

From 2683762b1a4d062efcde24e7596bd58caaca6c64 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 13 Feb 2024 20:08:04 +0100
Subject: [PATCH 0032/1422] Revert "Change return type to new menu class"

This reverts commit 7c0af951a78b6d7b5ad298258cf6f98931a3a046.
---
 .../src/Framework/Features/Navigation/BaseNavigationMenu.php  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/BaseNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/BaseNavigationMenu.php
index a69842b8af7..d8bf84ebfab 100644
--- a/packages/framework/src/Framework/Features/Navigation/BaseNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/BaseNavigationMenu.php
@@ -22,7 +22,7 @@ final protected function __construct()
         $this->items = new Collection();
     }
 
-    public static function create(): NavigationMenu
+    public static function create(): static
     {
         $menu = new static();
 
@@ -30,7 +30,7 @@ public static function create(): NavigationMenu
         $menu->sortByPriority();
         $menu->removeDuplicateItems();
 
-        return new NavigationMenu($menu->getItems());
+        return $menu;
     }
 
     protected function generate(): void

From 30e11f0fd4b0d896c0deef86e0e32d7ed628531e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 13 Feb 2024 20:08:41 +0100
Subject: [PATCH 0033/1422] Create GeneratesMainNavigationMenu.php

---
 .../Navigation/GeneratesMainNavigationMenu.php         | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
new file mode 100644
index 00000000000..0dea48b085f
--- /dev/null
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Hyde\Framework\Features\Navigation;
+
+class GeneratesMainNavigationMenu
+{
+    //
+}

From cc05a1ec5d71bc9f3fe0167900729f583462784e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 13 Feb 2024 20:09:11 +0100
Subject: [PATCH 0034/1422] Mark class as experimental

---
 .../Features/Navigation/GeneratesMainNavigationMenu.php        | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index 0dea48b085f..99e50dce6d5 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -4,6 +4,9 @@
 
 namespace Hyde\Framework\Features\Navigation;
 
+/**
+ * @experimental This class may change significantly before its release.
+ */
 class GeneratesMainNavigationMenu
 {
     //

From 72303ec98ab2b2598df7fd28d546885870f2f25d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 13 Feb 2024 20:10:22 +0100
Subject: [PATCH 0035/1422] Sketch out contract

---
 .../Features/Navigation/GeneratesMainNavigationMenu.php      | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index 99e50dce6d5..81a888de847 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -9,5 +9,8 @@
  */
 class GeneratesMainNavigationMenu
 {
-    //
+    public function execute(): NavigationMenu
+    {
+        //
+    }
 }

From c8e1cff4b02519ca425174875e5eb53ef13fe0dd Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 13 Feb 2024 20:11:00 +0100
Subject: [PATCH 0036/1422] Defer logic to new action

---
 .../src/Foundation/Providers/NavigationServiceProvider.php    | 4 ++--
 .../Features/Navigation/GeneratesMainNavigationMenu.php       | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php b/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php
index 7eb3ada7949..4dcbb297c99 100644
--- a/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php
+++ b/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php
@@ -6,8 +6,8 @@
 
 use Hyde\Foundation\HydeKernel;
 use Illuminate\Support\ServiceProvider;
-use Hyde\Framework\Features\Navigation\NavigationMenu;
 use Hyde\Framework\Features\Navigation\NavigationManager;
+use Hyde\Framework\Features\Navigation\GeneratesMainNavigationMenu;
 
 class NavigationServiceProvider extends ServiceProvider
 {
@@ -20,7 +20,7 @@ public function register(): void
         $this->app->alias(NavigationManager::class, 'navigation');
 
         $this->app->make(HydeKernel::class)->booted(function () {
-            $this->app->make(NavigationManager::class)->registerMenu('main', new NavigationMenu());
+            $this->app->make(NavigationManager::class)->registerMenu('main', (new GeneratesMainNavigationMenu())->execute());
         });
     }
 }
diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index 81a888de847..4523df0eba4 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -11,6 +11,6 @@ class GeneratesMainNavigationMenu
 {
     public function execute(): NavigationMenu
     {
-        //
+        return new NavigationMenu();
     }
 }

From 47df911f5d4ff41743acc7d8c317922ff6fc86a4 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 13 Feb 2024 20:14:33 +0100
Subject: [PATCH 0037/1422] Use the legacy entrypoint to create menu in the new
 action

---
 .../Features/Navigation/GeneratesMainNavigationMenu.php       | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index 4523df0eba4..3c0d081c9bb 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -11,6 +11,8 @@ class GeneratesMainNavigationMenu
 {
     public function execute(): NavigationMenu
     {
-        return new NavigationMenu();
+        $navigation = \Hyde\Framework\Features\Navigation\MainNavigationMenu::create();
+
+        return new NavigationMenu($navigation->items);
     }
 }

From b617d88c3d9ef7a9c181e94f971bc5d0a19fd373 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 13 Feb 2024 20:15:35 +0100
Subject: [PATCH 0038/1422] Add todo

---
 .../Features/Navigation/GeneratesMainNavigationMenu.php         | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index 3c0d081c9bb..1c0872a8b4e 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -6,6 +6,8 @@
 
 /**
  * @experimental This class may change significantly before its release.
+ *
+ * @todo Refactor to move logic to the new action
  */
 class GeneratesMainNavigationMenu
 {

From a944a276c59a4e23b47e615267ea4c83d448f12b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 13 Feb 2024 20:16:55 +0100
Subject: [PATCH 0039/1422] Refactor action entry point to be static

---
 .../src/Foundation/Providers/NavigationServiceProvider.php      | 2 +-
 .../Features/Navigation/GeneratesMainNavigationMenu.php         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php b/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php
index 4dcbb297c99..edb8ee9bf13 100644
--- a/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php
+++ b/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php
@@ -20,7 +20,7 @@ public function register(): void
         $this->app->alias(NavigationManager::class, 'navigation');
 
         $this->app->make(HydeKernel::class)->booted(function () {
-            $this->app->make(NavigationManager::class)->registerMenu('main', (new GeneratesMainNavigationMenu())->execute());
+            $this->app->make(NavigationManager::class)->registerMenu('main', GeneratesMainNavigationMenu::handle());
         });
     }
 }
diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index 1c0872a8b4e..c160f6d8723 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -11,7 +11,7 @@
  */
 class GeneratesMainNavigationMenu
 {
-    public function execute(): NavigationMenu
+    public static function handle(): NavigationMenu
     {
         $navigation = \Hyde\Framework\Features\Navigation\MainNavigationMenu::create();
 

From f2ca7616e96b1ceec508040531c85f36bb75060f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 13 Feb 2024 20:23:19 +0100
Subject: [PATCH 0040/1422] Ensure kernel is booted when trying to get a menu

---
 .../src/Framework/Features/Navigation/NavigationManager.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationManager.php b/packages/framework/src/Framework/Features/Navigation/NavigationManager.php
index 3d65a8597f8..4a44371ddb6 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationManager.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationManager.php
@@ -4,6 +4,8 @@
 
 namespace Hyde\Framework\Features\Navigation;
 
+use Hyde\Hyde;
+
 /**
  * Manages the navigation menus for the project.
  */
@@ -29,6 +31,10 @@ public function registerMenu(string $name, NavigationMenu $menu): void
      */
     public function getMenu(string $name): NavigationMenu
     {
+        if (! Hyde::isBooted()) {
+            Hyde::boot();
+        }
+
         return $this->menus[$name];
     }
 }

From 23edc36bc280110e626a076ef84feb6b68683e16 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 13 Feb 2024 20:23:24 +0100
Subject: [PATCH 0041/1422] Add todo

---
 .../src/Framework/Features/Navigation/NavigationManager.php      | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationManager.php b/packages/framework/src/Framework/Features/Navigation/NavigationManager.php
index 4a44371ddb6..7fc836be42c 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationManager.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationManager.php
@@ -32,6 +32,7 @@ public function registerMenu(string $name, NavigationMenu $menu): void
     public function getMenu(string $name): NavigationMenu
     {
         if (! Hyde::isBooted()) {
+            // Todo: This could be an anti-pattern so we may consider throwing an exception instead.
             Hyde::boot();
         }
 

From e18fbf9d357e92e57e33e5f966c6d9b52fe32b9e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 13 Feb 2024 20:24:24 +0100
Subject: [PATCH 0042/1422] Add items getter

---
 .../src/Framework/Features/Navigation/NavigationMenu.php    | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
index 3bb7089c6fe..4919ceb1bf1 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
@@ -16,4 +16,10 @@ public function __construct(Arrayable|array $items = [])
     {
         $this->items = new Collection($items);
     }
+
+    /** @return \Illuminate\Support\Collection<string, \Hyde\Framework\Features\Navigation\NavItem> */
+    public function getItems(): Collection
+    {
+        return $this->items;
+    }
 }

From 7a9aada2fe5fbc34ac4754e6fdce7b052021a34f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 13 Feb 2024 20:24:54 +0100
Subject: [PATCH 0043/1422] Update navigation view to use accessor

---
 packages/framework/resources/views/layouts/navigation.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/resources/views/layouts/navigation.blade.php b/packages/framework/resources/views/layouts/navigation.blade.php
index 3324c3a79f2..ef15fe3f127 100644
--- a/packages/framework/resources/views/layouts/navigation.blade.php
+++ b/packages/framework/resources/views/layouts/navigation.blade.php
@@ -33,7 +33,7 @@
     <div id="main-navigation-links" class="w-full x-uncloak-md md:flex flex-grow md:flex-grow-0 md:items-center md:w-auto px-6 -mx-4 border-t mt-3 pt-3 md:border-none md:mt-0 md:py-0 border-gray-200 dark:border-gray-700"
          :class="navigationOpen ? '' : 'hidden'" x-cloak>
         <ul aria-label="Navigation links" class="md:flex-grow md:flex justify-end">
-            @foreach ($navigation->items as $item)
+            @foreach ($navigation->getItems() as $item)
                 <li class="md:mx-2">
                     @if($item instanceof \Hyde\Framework\Features\Navigation\DropdownNavItem)
                         <x-hyde::navigation.dropdown :label="\Hyde\Hyde::makeTitle($item->label)" :items="$item->items"/>

From 94714ec0416c997a9a9713b64f14e30f8e8b695c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 13 Feb 2024 20:27:47 +0100
Subject: [PATCH 0044/1422] Update navigation component to use new menu class

---
 packages/framework/resources/views/layouts/navigation.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/resources/views/layouts/navigation.blade.php b/packages/framework/resources/views/layouts/navigation.blade.php
index ef15fe3f127..ba8c148b583 100644
--- a/packages/framework/resources/views/layouts/navigation.blade.php
+++ b/packages/framework/resources/views/layouts/navigation.blade.php
@@ -1,5 +1,5 @@
 @php
-    $navigation = \Hyde\Framework\Features\Navigation\MainNavigationMenu::create();
+    $navigation = app('navigation')->getMenu('main');
 @endphp
 
 <nav aria-label="Main navigation" id="main-navigation" class="flex flex-wrap items-center justify-between p-4 shadow-lg sm:shadow-xl md:shadow-none dark:bg-gray-800">

From 0c701d96da5121817360af943969565a54fd798b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 13 Feb 2024 21:04:08 +0100
Subject: [PATCH 0045/1422] Add back temporary compatibility with old system

Routes must be deferred first
---
 .../framework/resources/views/layouts/navigation.blade.php     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/framework/resources/views/layouts/navigation.blade.php b/packages/framework/resources/views/layouts/navigation.blade.php
index ba8c148b583..4831f46b9b2 100644
--- a/packages/framework/resources/views/layouts/navigation.blade.php
+++ b/packages/framework/resources/views/layouts/navigation.blade.php
@@ -1,5 +1,6 @@
 @php
-    $navigation = app('navigation')->getMenu('main');
+    // $navigation = app('navigation')->getMenu('main');
+    $navigation = \Hyde\Framework\Features\Navigation\MainNavigationMenu::create();
 @endphp
 
 <nav aria-label="Main navigation" id="main-navigation" class="flex flex-wrap items-center justify-between p-4 shadow-lg sm:shadow-xl md:shadow-none dark:bg-gray-800">

From 2e30221f7d3bad7898ef713495a786eb23088a28 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 13 Feb 2024 21:05:45 +0100
Subject: [PATCH 0046/1422] Create ExternalRoute.php

---
 .../framework/src/Support/Models/ExternalRoute.php     | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 packages/framework/src/Support/Models/ExternalRoute.php

diff --git a/packages/framework/src/Support/Models/ExternalRoute.php b/packages/framework/src/Support/Models/ExternalRoute.php
new file mode 100644
index 00000000000..62eccf78c8a
--- /dev/null
+++ b/packages/framework/src/Support/Models/ExternalRoute.php
@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Hyde\Support\Models;
+
+class ExternalRoute
+{
+    //
+}

From b17f2a3f6a5497cc1d349d35cd5ee1ea6961d737 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 13 Feb 2024 21:05:54 +0100
Subject: [PATCH 0047/1422] Class ExternalRoute extends Route

---
 packages/framework/src/Support/Models/ExternalRoute.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Support/Models/ExternalRoute.php b/packages/framework/src/Support/Models/ExternalRoute.php
index 62eccf78c8a..9f7ffcc036b 100644
--- a/packages/framework/src/Support/Models/ExternalRoute.php
+++ b/packages/framework/src/Support/Models/ExternalRoute.php
@@ -4,7 +4,7 @@
 
 namespace Hyde\Support\Models;
 
-class ExternalRoute
+class ExternalRoute extends Route
 {
     //
 }

From c2ae06f71e445b8d6a689d0359cbae359134e44f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 13 Feb 2024 21:06:08 +0100
Subject: [PATCH 0048/1422] Add class description

---
 packages/framework/src/Support/Models/ExternalRoute.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/framework/src/Support/Models/ExternalRoute.php b/packages/framework/src/Support/Models/ExternalRoute.php
index 9f7ffcc036b..33364dc5fdf 100644
--- a/packages/framework/src/Support/Models/ExternalRoute.php
+++ b/packages/framework/src/Support/Models/ExternalRoute.php
@@ -4,6 +4,9 @@
 
 namespace Hyde\Support\Models;
 
+/**
+ * A route that leads to an external URI.
+ */
 class ExternalRoute extends Route
 {
     //

From de56a661ae7b149ca8effb1a58806e6ac35b8017 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 13 Feb 2024 21:07:29 +0100
Subject: [PATCH 0049/1422] Add destination property

---
 packages/framework/src/Support/Models/ExternalRoute.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Support/Models/ExternalRoute.php b/packages/framework/src/Support/Models/ExternalRoute.php
index 33364dc5fdf..bcc7fd2172f 100644
--- a/packages/framework/src/Support/Models/ExternalRoute.php
+++ b/packages/framework/src/Support/Models/ExternalRoute.php
@@ -9,5 +9,5 @@
  */
 class ExternalRoute extends Route
 {
-    //
+    protected string $destination;
 }

From e5550d24cc5ac3e5d1533649065cef4a4be8be0b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 13 Feb 2024 21:07:53 +0100
Subject: [PATCH 0050/1422] Construct destination

---
 packages/framework/src/Support/Models/ExternalRoute.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/framework/src/Support/Models/ExternalRoute.php b/packages/framework/src/Support/Models/ExternalRoute.php
index bcc7fd2172f..b2f6769546f 100644
--- a/packages/framework/src/Support/Models/ExternalRoute.php
+++ b/packages/framework/src/Support/Models/ExternalRoute.php
@@ -10,4 +10,9 @@
 class ExternalRoute extends Route
 {
     protected string $destination;
+
+    public function __construct(string $destination)
+    {
+        $this->destination = $destination;
+    }
 }

From 26d1773cadee7a5d166d558ba64e3385d1ce19fb Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 13 Feb 2024 21:08:06 +0100
Subject: [PATCH 0051/1422] Add noinspection annotation

---
 packages/framework/src/Support/Models/ExternalRoute.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/src/Support/Models/ExternalRoute.php b/packages/framework/src/Support/Models/ExternalRoute.php
index b2f6769546f..ba26ab629a9 100644
--- a/packages/framework/src/Support/Models/ExternalRoute.php
+++ b/packages/framework/src/Support/Models/ExternalRoute.php
@@ -11,6 +11,7 @@ class ExternalRoute extends Route
 {
     protected string $destination;
 
+    /** @noinspection PhpMissingParentConstructorInspection */
     public function __construct(string $destination)
     {
         $this->destination = $destination;

From 7c1a5635e98e96fd51837fb00b228e362b0ae6b3 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 13 Feb 2024 21:08:45 +0100
Subject: [PATCH 0052/1422] Mark class as experimental

---
 packages/framework/src/Support/Models/ExternalRoute.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/src/Support/Models/ExternalRoute.php b/packages/framework/src/Support/Models/ExternalRoute.php
index ba26ab629a9..e3ed9d7d22c 100644
--- a/packages/framework/src/Support/Models/ExternalRoute.php
+++ b/packages/framework/src/Support/Models/ExternalRoute.php
@@ -6,6 +6,8 @@
 
 /**
  * A route that leads to an external URI.
+ *
+ * @experimental Take caution when using this class, as it may be subject to change.
  */
 class ExternalRoute extends Route
 {

From fdedbbd7c87e6e06cee0a9d4574264251d0838c0 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 13 Feb 2024 21:09:00 +0100
Subject: [PATCH 0053/1422] Override link resolver

---
 packages/framework/src/Support/Models/ExternalRoute.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/framework/src/Support/Models/ExternalRoute.php b/packages/framework/src/Support/Models/ExternalRoute.php
index e3ed9d7d22c..f6ad450b071 100644
--- a/packages/framework/src/Support/Models/ExternalRoute.php
+++ b/packages/framework/src/Support/Models/ExternalRoute.php
@@ -18,4 +18,9 @@ public function __construct(string $destination)
     {
         $this->destination = $destination;
     }
+
+    public function getLink(): string
+    {
+        return $this->destination;
+    }
 }

From d42a11b029f3a90f43f1525fc4c66ae375e28c81 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 13 Feb 2024 21:11:09 +0100
Subject: [PATCH 0054/1422] Turn NavItem links to ExternalRoutes when using
 forLink helper

---
 .../framework/src/Framework/Features/Navigation/NavItem.php    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index d3b39db3dca..f90cbc4a2bb 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -9,6 +9,7 @@
 use Hyde\Support\Models\Route;
 use Illuminate\Support\Str;
 use Stringable;
+use Hyde\Support\Models\ExternalRoute;
 
 /**
  * Abstraction for a navigation menu item. Used by the MainNavigationMenu and DocumentationSidebar classes.
@@ -54,7 +55,7 @@ public static function fromRoute(Route $route, ?string $label = null, ?int $prio
      */
     public static function forLink(string $href, string $label, int $priority = 500): static
     {
-        return new static($href, $label, $priority);
+        return new static(new ExternalRoute($href), $label, $priority);
     }
 
     /**

From f8dda2b779da89453033445284f07660bb8a7129 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 13 Feb 2024 21:12:08 +0100
Subject: [PATCH 0055/1422] Cast string to external route upon NavItem
 construct

---
 .../framework/src/Framework/Features/Navigation/NavItem.php   | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index f90cbc4a2bb..69bdad9fc27 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -31,6 +31,10 @@ class NavItem implements Stringable
      */
     public function __construct(Route|string $destination, string $label, int $priority = 500, ?string $group = null)
     {
+        if (is_string($destination)) {
+            $destination = new ExternalRoute($destination);
+        }
+
         $this->destination = (string) $destination;
         $this->label = $label;
         $this->priority = $priority;

From a2b4131071c73a761345777be6b6e7863ada9e20 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 13 Feb 2024 21:17:14 +0100
Subject: [PATCH 0056/1422] Revert "Turn NavItem links to ExternalRoutes when
 using forLink helper"

This reverts commit d42a11b029f3a90f43f1525fc4c66ae375e28c81.
---
 .../framework/src/Framework/Features/Navigation/NavItem.php    | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 69bdad9fc27..5bff052b649 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -9,7 +9,6 @@
 use Hyde\Support\Models\Route;
 use Illuminate\Support\Str;
 use Stringable;
-use Hyde\Support\Models\ExternalRoute;
 
 /**
  * Abstraction for a navigation menu item. Used by the MainNavigationMenu and DocumentationSidebar classes.
@@ -59,7 +58,7 @@ public static function fromRoute(Route $route, ?string $label = null, ?int $prio
      */
     public static function forLink(string $href, string $label, int $priority = 500): static
     {
-        return new static(new ExternalRoute($href), $label, $priority);
+        return new static($href, $label, $priority);
     }
 
     /**

From ff85c3ab19d3699c8324867cb792be38bfb13a45 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 13 Feb 2024 21:13:28 +0100
Subject: [PATCH 0057/1422] Breaking: `NavItem::$destination` is now a Route
 instead of string

This is necessary in order to defer route resolving to compile time
---
 .../framework/src/Framework/Features/Navigation/NavItem.php   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 5bff052b649..f7f9e34d917 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -20,7 +20,7 @@
  */
 class NavItem implements Stringable
 {
-    public readonly string $destination;
+    public readonly Route $destination;
     public readonly string $label;
     public readonly int $priority;
     public readonly ?string $group;
@@ -34,7 +34,7 @@ public function __construct(Route|string $destination, string $label, int $prior
             $destination = new ExternalRoute($destination);
         }
 
-        $this->destination = (string) $destination;
+        $this->destination = $destination;
         $this->label = $label;
         $this->priority = $priority;
         $this->group = $group;

From f21b91c532044a1761d09db40cec48463db7e393 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 13 Feb 2024 21:18:53 +0100
Subject: [PATCH 0058/1422] Update NavItemTest.php

---
 packages/framework/tests/Unit/NavItemTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/tests/Unit/NavItemTest.php b/packages/framework/tests/Unit/NavItemTest.php
index 6ab0458ee1b..17ccf81697a 100644
--- a/packages/framework/tests/Unit/NavItemTest.php
+++ b/packages/framework/tests/Unit/NavItemTest.php
@@ -43,7 +43,7 @@ public function testConstruct()
         $route = new Route(new MarkdownPage());
         $item = new NavItem($route, 'Test', 500);
 
-        $this->assertSame($route->getLink(), $item->destination);
+        $this->assertSame($route, $item->destination);
     }
 
     public function testGetDestination()

From 9ae32df0525ab2ae16d52e76736e3a377ae1ac52 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 8 Feb 2024 18:56:09 +0100
Subject: [PATCH 0059/1422] Add string cast to string resolver

---
 .../framework/src/Framework/Features/Navigation/NavItem.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index f7f9e34d917..fdb1e963bd7 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -79,7 +79,7 @@ public static function forRoute(Route|string $route, ?string $label = null, ?int
      */
     public function __toString(): string
     {
-        return $this->destination;
+        return (string) $this->destination;
     }
 
     /**

From a1fcbe980aa2477a07564df7b63bb272155fd512 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 13 Feb 2024 21:20:40 +0100
Subject: [PATCH 0060/1422] Import class

---
 packages/framework/src/Framework/Features/Navigation/NavItem.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index fdb1e963bd7..7af82b15ff5 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -9,6 +9,7 @@
 use Hyde\Support\Models\Route;
 use Illuminate\Support\Str;
 use Stringable;
+use Hyde\Support\Models\ExternalRoute;
 
 /**
  * Abstraction for a navigation menu item. Used by the MainNavigationMenu and DocumentationSidebar classes.

From 77a17155b5ebf83a70ae6b945137e0af47cec8fb Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 13 Feb 2024 21:20:54 +0100
Subject: [PATCH 0061/1422] Getter now returns Route object

---
 .../framework/src/Framework/Features/Navigation/NavItem.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 7af82b15ff5..0ee3bd1a779 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -89,7 +89,7 @@ public function __toString(): string
      * If the navigation item is an external link, this will return the link as is,
      * if it's for a route, a resolved relative link will be returned.
      */
-    public function getDestination(): string
+    public function getDestination(): Route
     {
         return $this->destination;
     }

From 8f0d41a186c985efd139a38565b7392cc2a7ec9b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 13 Feb 2024 21:27:24 +0100
Subject: [PATCH 0062/1422] Split getDestination method into new getLink method

---
 .../src/Framework/Features/Navigation/NavItem.php | 15 ++++++++++-----
 packages/framework/tests/Unit/NavItemTest.php     | 10 +++++++++-
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 0ee3bd1a779..a488911d1a0 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -80,20 +80,25 @@ public static function forRoute(Route|string $route, ?string $label = null, ?int
      */
     public function __toString(): string
     {
-        return (string) $this->destination;
+        return $this->getLink();
     }
 
     /**
-     * Get the destination link of the navigation item.
-     *
-     * If the navigation item is an external link, this will return the link as is,
-     * if it's for a route, a resolved relative link will be returned.
+     * Get the destination route of the navigation item.
      */
     public function getDestination(): Route
     {
         return $this->destination;
     }
 
+    /**
+     * Resolve the destination link of the navigation item.
+     */
+    public function getLink(): string
+    {
+        return (string) $this->destination;
+    }
+
     /**
      * Get the label of the navigation item.
      */
diff --git a/packages/framework/tests/Unit/NavItemTest.php b/packages/framework/tests/Unit/NavItemTest.php
index 17ccf81697a..230da11728e 100644
--- a/packages/framework/tests/Unit/NavItemTest.php
+++ b/packages/framework/tests/Unit/NavItemTest.php
@@ -47,9 +47,17 @@ public function testConstruct()
     }
 
     public function testGetDestination()
+    {
+        $route = new Route(new InMemoryPage('foo'));
+        $navItem = new NavItem($route, 'Page', 500);
+
+        $this->assertSame($route, $navItem->getDestination());
+    }
+
+    public function testGetLink()
     {
         $navItem = new NavItem(new Route(new InMemoryPage('foo')), 'Page', 500);
-        $this->assertSame('foo.html', $navItem->getDestination());
+        $this->assertSame('foo.html', $navItem->getLink());
     }
 
     public function testGetLabel()

From d653aac6863ca8cbdb39c3f648b32f7c985101fc Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 13 Feb 2024 21:27:29 +0100
Subject: [PATCH 0063/1422] Update NavItemTest.php

---
 packages/framework/tests/Unit/NavItemTest.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/packages/framework/tests/Unit/NavItemTest.php b/packages/framework/tests/Unit/NavItemTest.php
index 230da11728e..a9d4e227462 100644
--- a/packages/framework/tests/Unit/NavItemTest.php
+++ b/packages/framework/tests/Unit/NavItemTest.php
@@ -5,6 +5,7 @@
 namespace Hyde\Framework\Testing\Unit;
 
 use Hyde\Foundation\Facades\Routes;
+use Hyde\Support\Models\ExternalRoute;
 use Hyde\Framework\Exceptions\RouteNotFoundException;
 use Hyde\Framework\Features\Navigation\NavItem;
 use Hyde\Pages\InMemoryPage;
@@ -83,7 +84,7 @@ public function testFromRoute()
         $route = new Route(new MarkdownPage());
         $item = NavItem::fromRoute($route);
 
-        $this->assertSame($route->getLink(), $item->destination);
+        $this->assertSame($route, $item->destination);
     }
 
     public function testToString()
@@ -97,7 +98,7 @@ public function testForLink()
     {
         $item = NavItem::forLink('foo', 'bar');
 
-        $this->assertSame('foo', $item->destination);
+        $this->assertEquals(new ExternalRoute('foo'), $item->destination);
         $this->assertSame('bar', $item->label);
         $this->assertSame(500, $item->priority);
     }
@@ -112,7 +113,7 @@ public function testForRoute()
         $route = Routes::get('404');
         $item = NavItem::forRoute($route, 'foo');
 
-        $this->assertSame($route->getLink(), $item->destination);
+        $this->assertSame($route->getLink(), $item->destination->getLink());
         $this->assertSame('foo', $item->label);
         $this->assertSame(999, $item->priority);
     }
@@ -122,7 +123,7 @@ public function testForIndexRoute()
         $route = Routes::get('index');
         $item = NavItem::forRoute($route, 'foo');
 
-        $this->assertSame($route->getLink(), $item->destination);
+        $this->assertSame($route->getLink(), $item->destination->getLink());
         $this->assertSame('foo', $item->label);
         $this->assertSame(0, $item->priority);
     }

From 7fc22d9deea7747688469185525bd8d6100adf7b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 8 Feb 2024 18:58:53 +0100
Subject: [PATCH 0064/1422] Compare current state as string

---
 .../framework/src/Framework/Features/Navigation/NavItem.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index a488911d1a0..75836e2e3ad 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -130,7 +130,7 @@ public function getGroup(): ?string
      */
     public function isCurrent(): bool
     {
-        return Hyde::currentRoute()->getLink() === $this->destination;
+        return Hyde::currentRoute()->getLink() === (string) $this->destination;
     }
 
     protected static function getRouteGroup(Route $route): ?string

From 1fb6ec0990a73fe6cebb6c3193c11bb832d3dcd5 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 13 Feb 2024 21:29:11 +0100
Subject: [PATCH 0065/1422] Remove early route resolving

---
 .../framework/src/Framework/Features/Navigation/NavItem.php   | 2 +-
 packages/framework/tests/Unit/NavItemTest.php                 | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 75836e2e3ad..d5e09b898f3 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -47,7 +47,7 @@ public function __construct(Route|string $destination, string $label, int $prior
     public static function fromRoute(Route $route, ?string $label = null, ?int $priority = null, ?string $group = null): static
     {
         return new static(
-            $route->getLink(),
+            $route,
             $label ?? $route->getPage()->navigationMenuLabel(),
             $priority ?? $route->getPage()->navigationMenuPriority(),
             $group ?? static::getRouteGroup($route),
diff --git a/packages/framework/tests/Unit/NavItemTest.php b/packages/framework/tests/Unit/NavItemTest.php
index a9d4e227462..b7ccacf3622 100644
--- a/packages/framework/tests/Unit/NavItemTest.php
+++ b/packages/framework/tests/Unit/NavItemTest.php
@@ -113,7 +113,7 @@ public function testForRoute()
         $route = Routes::get('404');
         $item = NavItem::forRoute($route, 'foo');
 
-        $this->assertSame($route->getLink(), $item->destination->getLink());
+        $this->assertSame($route, $item->destination);
         $this->assertSame('foo', $item->label);
         $this->assertSame(999, $item->priority);
     }
@@ -123,7 +123,7 @@ public function testForIndexRoute()
         $route = Routes::get('index');
         $item = NavItem::forRoute($route, 'foo');
 
-        $this->assertSame($route->getLink(), $item->destination->getLink());
+        $this->assertSame($route, $item->destination);
         $this->assertSame('foo', $item->label);
         $this->assertSame(0, $item->priority);
     }

From 66dc3ded958eea4f85354120c2f89c2adb0cf8bf Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 13 Feb 2024 21:29:49 +0100
Subject: [PATCH 0066/1422] Add todo

---
 .../framework/src/Framework/Features/Navigation/NavItem.php     | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index d5e09b898f3..971450c970f 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -14,6 +14,8 @@
 /**
  * Abstraction for a navigation menu item. Used by the MainNavigationMenu and DocumentationSidebar classes.
  *
+ * @FIXME Before merge: Add release notes from https://github.com/hydephp/develop/pull/1539
+ *
  * You have a few options to construct a navigation menu item:
  *   1. You can supply a Route directly and explicit properties to the constructor
  *   2. You can use NavItem::fromRoute() to use data from the route

From 5ed58f4d20855ba6d7e27012f75edcb04f0c2f8b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 13 Feb 2024 21:58:07 +0100
Subject: [PATCH 0067/1422] Revert "Add todo"

This reverts commit 66dc3ded958eea4f85354120c2f89c2adb0cf8bf.
---
 .../framework/src/Framework/Features/Navigation/NavItem.php     | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 971450c970f..d5e09b898f3 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -14,8 +14,6 @@
 /**
  * Abstraction for a navigation menu item. Used by the MainNavigationMenu and DocumentationSidebar classes.
  *
- * @FIXME Before merge: Add release notes from https://github.com/hydephp/develop/pull/1539
- *
  * You have a few options to construct a navigation menu item:
  *   1. You can supply a Route directly and explicit properties to the constructor
  *   2. You can use NavItem::fromRoute() to use data from the route

From a2945fb0e1d40c05886923d8be9ed9e784bade93 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 13 Feb 2024 22:03:02 +0100
Subject: [PATCH 0068/1422] Revert "Add back temporary compatibility with old
 system"

This reverts commit 0c701d96da5121817360af943969565a54fd798b.
---
 .../framework/resources/views/layouts/navigation.blade.php     | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/framework/resources/views/layouts/navigation.blade.php b/packages/framework/resources/views/layouts/navigation.blade.php
index 4831f46b9b2..ba8c148b583 100644
--- a/packages/framework/resources/views/layouts/navigation.blade.php
+++ b/packages/framework/resources/views/layouts/navigation.blade.php
@@ -1,6 +1,5 @@
 @php
-    // $navigation = app('navigation')->getMenu('main');
-    $navigation = \Hyde\Framework\Features\Navigation\MainNavigationMenu::create();
+    $navigation = app('navigation')->getMenu('main');
 @endphp
 
 <nav aria-label="Main navigation" id="main-navigation" class="flex flex-wrap items-center justify-between p-4 shadow-lg sm:shadow-xl md:shadow-none dark:bg-gray-800">

From c133c82ca93a12b27954aff50a69970072edf6d0 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 13 Feb 2024 22:12:43 +0100
Subject: [PATCH 0069/1422] Merge pull request #1539 from
 hydephp/update-navitem-class-to-support-deferring-route-resolves

Update NavItem class to support deferring route resolves
---
 RELEASE_NOTES.md | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 2cc8b136fc6..c5fd968e74f 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -11,11 +11,14 @@ This serves two purposes:
 
 ### Added
 - Added a new `\Hyde\Framework\Actions\PreBuildTasks\TransferMediaAssets` build task handle media assets transfers for site builds.
+- Added a new `NavItem::getLink()` method contain the previous `NavItem::getDestination()` logic, to return the link URL.
 
 ### Changed
 - Changed how the documentation search is generated, to be an `InMemoryPage` instead of a post-build task.
 - Media asset files are now copied using the new build task instead of the deprecated `BuildService::transferMediaAssets()` method.
 - Minor: The documentation article component now supports disabling the semantic rendering using a falsy value in https://github.com/hydephp/develop/pull/1566
+- Breaking: The `NavItem` class now always stores the destination as a `Route` instance.
+- Breaking: The `NavItem::getDestination()` method now returns its `Route` instance.
 
 ### Deprecated
 - for soon-to-be removed features.
@@ -56,6 +59,14 @@ For more information, see https://github.com/hydephp/develop/pull/1498.
 
 ## Low impact
 
+### Navigation item changes
+
+The `NavItem::getDestination()` method now returns its `Route` instance. This allows for deferring the route evaluation.
+
+If you have previously used this method directly and expected a string to be returned, you may need to adapt your code to handle the new return type.
+
+If you want to retain the previous state where a string is always returned, you can use the new `NavItem::getLink()` method instead, which will resolve the route immediately.
+
 ### New documentation search implementation
 
 As the new documentation search implementation brings changes to their code API you may need to adapt your code

From 88fd2e7bdb8f2a753626868e2b4e1af1c979054c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 13 Feb 2024 22:13:12 +0100
Subject: [PATCH 0070/1422] Add ExternalRoute class to release notes

---
 RELEASE_NOTES.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index c5fd968e74f..3ff8919c416 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -11,6 +11,7 @@ This serves two purposes:
 
 ### Added
 - Added a new `\Hyde\Framework\Actions\PreBuildTasks\TransferMediaAssets` build task handle media assets transfers for site builds.
+- Added a new `ExternalRoute` class to represent external routes.
 - Added a new `NavItem::getLink()` method contain the previous `NavItem::getDestination()` logic, to return the link URL.
 
 ### Changed

From f9884c1d51654adcafe7bfd6eb774b84f7bed605 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 13:13:24 +0100
Subject: [PATCH 0071/1422] Split out temporary method for refactor

---
 .../Features/Navigation/BaseNavigationMenu.php       | 12 +++++++++++-
 .../Navigation/GeneratesMainNavigationMenu.php       |  2 +-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/BaseNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/BaseNavigationMenu.php
index d8bf84ebfab..4e83f7f1cc9 100644
--- a/packages/framework/src/Framework/Features/Navigation/BaseNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/BaseNavigationMenu.php
@@ -22,7 +22,8 @@ final protected function __construct()
         $this->items = new Collection();
     }
 
-    public static function create(): static
+    /** @deprecated Temporary method for refactor */
+    public static function __generate(): static
     {
         $menu = new static();
 
@@ -33,6 +34,15 @@ public static function create(): static
         return $menu;
     }
 
+    /** @deprecated Temporary method for refactor */
+    public static function create(): static
+    {
+        $menu = new static();
+        $menu->items = GeneratesMainNavigationMenu::handle()->getItems();
+
+        return $menu;
+    }
+
     protected function generate(): void
     {
         Routes::each(function (Route $route): void {
diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index c160f6d8723..3a776e61ade 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -13,7 +13,7 @@ class GeneratesMainNavigationMenu
 {
     public static function handle(): NavigationMenu
     {
-        $navigation = \Hyde\Framework\Features\Navigation\MainNavigationMenu::create();
+        $navigation = \Hyde\Framework\Features\Navigation\MainNavigationMenu::__generate();
 
         return new NavigationMenu($navigation->items);
     }

From af7e0d9727ccdad45451cf2e8af8baeaf1962448 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 13:30:32 +0100
Subject: [PATCH 0072/1422] Revert "Split out temporary method for refactor"

This reverts commit f9884c1d51654adcafe7bfd6eb774b84f7bed605.
---
 .../Features/Navigation/BaseNavigationMenu.php       | 12 +-----------
 .../Navigation/GeneratesMainNavigationMenu.php       |  2 +-
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/BaseNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/BaseNavigationMenu.php
index 4e83f7f1cc9..d8bf84ebfab 100644
--- a/packages/framework/src/Framework/Features/Navigation/BaseNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/BaseNavigationMenu.php
@@ -22,8 +22,7 @@ final protected function __construct()
         $this->items = new Collection();
     }
 
-    /** @deprecated Temporary method for refactor */
-    public static function __generate(): static
+    public static function create(): static
     {
         $menu = new static();
 
@@ -34,15 +33,6 @@ public static function __generate(): static
         return $menu;
     }
 
-    /** @deprecated Temporary method for refactor */
-    public static function create(): static
-    {
-        $menu = new static();
-        $menu->items = GeneratesMainNavigationMenu::handle()->getItems();
-
-        return $menu;
-    }
-
     protected function generate(): void
     {
         Routes::each(function (Route $route): void {
diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index 3a776e61ade..c160f6d8723 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -13,7 +13,7 @@ class GeneratesMainNavigationMenu
 {
     public static function handle(): NavigationMenu
     {
-        $navigation = \Hyde\Framework\Features\Navigation\MainNavigationMenu::__generate();
+        $navigation = \Hyde\Framework\Features\Navigation\MainNavigationMenu::create();
 
         return new NavigationMenu($navigation->items);
     }

From c61fbb43c163f1fde84e8703b3507c32f8d8766e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 13:31:16 +0100
Subject: [PATCH 0073/1422] Split out granular temporary method for refactor

---
 .../GeneratesMainNavigationMenu.php           |  2 +-
 .../Navigation/MainNavigationMenu.php         | 21 +++++++++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index c160f6d8723..3a776e61ade 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -13,7 +13,7 @@ class GeneratesMainNavigationMenu
 {
     public static function handle(): NavigationMenu
     {
-        $navigation = \Hyde\Framework\Features\Navigation\MainNavigationMenu::create();
+        $navigation = \Hyde\Framework\Features\Navigation\MainNavigationMenu::__generate();
 
         return new NavigationMenu($navigation->items);
     }
diff --git a/packages/framework/src/Framework/Features/Navigation/MainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/MainNavigationMenu.php
index db72a3569bb..f82a962ca5d 100644
--- a/packages/framework/src/Framework/Features/Navigation/MainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/MainNavigationMenu.php
@@ -12,6 +12,27 @@
 /** @deprecated Use the new NavigationMenu class instead */
 class MainNavigationMenu extends BaseNavigationMenu
 {
+    /** @deprecated Temporary method for refactor */
+    public static function __generate(): static
+    {
+        $menu = new static();
+
+        $menu->generate();
+        $menu->sortByPriority();
+        $menu->removeDuplicateItems();
+
+        return $menu;
+    }
+
+    /** @deprecated Temporary method for refactor */
+    public static function create(): static
+    {
+        $menu = new static();
+        $menu->items = GeneratesMainNavigationMenu::handle()->getItems();
+
+        return $menu;
+    }
+
     protected function generate(): void
     {
         parent::generate();

From b40f5987eea67663991335e42f34a3f334abd4d4 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 14:32:08 +0100
Subject: [PATCH 0074/1422] Temporary rename

---
 .../Features/Navigation/GeneratesMainNavigationMenu.php         | 2 +-
 .../src/Framework/Features/Navigation/MainNavigationMenu.php    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index 3a776e61ade..3ed96a630ad 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -13,7 +13,7 @@ class GeneratesMainNavigationMenu
 {
     public static function handle(): NavigationMenu
     {
-        $navigation = \Hyde\Framework\Features\Navigation\MainNavigationMenu::__generate();
+        $navigation = \Hyde\Framework\Features\Navigation\MainNavigationMenu::temp__generate();
 
         return new NavigationMenu($navigation->items);
     }
diff --git a/packages/framework/src/Framework/Features/Navigation/MainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/MainNavigationMenu.php
index f82a962ca5d..929c6c213cb 100644
--- a/packages/framework/src/Framework/Features/Navigation/MainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/MainNavigationMenu.php
@@ -13,7 +13,7 @@
 class MainNavigationMenu extends BaseNavigationMenu
 {
     /** @deprecated Temporary method for refactor */
-    public static function __generate(): static
+    public static function temp__generate(): static
     {
         $menu = new static();
 

From 850de857bed3ae354f97400d37fdad24d7c98e94 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 14:32:20 +0100
Subject: [PATCH 0075/1422] Copy temporary parent methods

---
 .../GeneratesMainNavigationMenu.php           | 37 +++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index 3ed96a630ad..fa3d76e59d2 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -4,6 +4,11 @@
 
 namespace Hyde\Framework\Features\Navigation;
 
+use Hyde\Facades\Config;
+use Hyde\Support\Models\Route;
+use Hyde\Foundation\Facades\Routes;
+use function collect;
+
 /**
  * @experimental This class may change significantly before its release.
  *
@@ -17,4 +22,36 @@ public static function handle(): NavigationMenu
 
         return new NavigationMenu($navigation->items);
     }
+
+    protected function parent__generate(): void
+    {
+        Routes::each(function (Route $route): void {
+            if ($this->canAddRoute($route)) {
+                $this->items->put($route->getRouteKey(), NavItem::fromRoute($route));
+            }
+        });
+
+        collect(Config::getArray('hyde.navigation.custom', []))->each(function (NavItem $item): void {
+            // Since these were added explicitly by the user, we can assume they should always be shown
+            $this->items->push($item);
+        });
+    }
+
+    protected function parent__canAddRoute(Route $route): bool
+    {
+        return $route->getPage()->showInNavigation();
+    }
+
+    protected function parent__removeDuplicateItems(): void
+    {
+        $this->items = $this->items->unique(function (NavItem $item): string {
+            // Filter using a combination of the group and label to allow duplicate labels in different groups
+            return $item->getGroup().$item->label;
+        });
+    }
+
+    protected function parent__sortByPriority(): void
+    {
+        $this->items = $this->items->sortBy('priority')->values();
+    }
 }

From f445c7a5183cb0c590e5547d6cf6a4ba4ae573d7 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 14:33:10 +0100
Subject: [PATCH 0076/1422] Copy over temporary child methods

---
 .../GeneratesMainNavigationMenu.php           | 46 +++++++++++++++++++
 1 file changed, 46 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index fa3d76e59d2..14bf4e60c2f 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -6,7 +6,9 @@
 
 use Hyde\Facades\Config;
 use Hyde\Support\Models\Route;
+use Hyde\Pages\DocumentationPage;
 use Hyde\Foundation\Facades\Routes;
+
 use function collect;
 
 /**
@@ -23,6 +25,50 @@ public static function handle(): NavigationMenu
         return new NavigationMenu($navigation->items);
     }
 
+    protected function generate(): void
+    {
+        $this->parent__generate();
+
+        if ($this->dropdownsEnabled()) {
+            $this->moveGroupedItemsIntoDropdowns();
+        }
+    }
+
+    protected function moveGroupedItemsIntoDropdowns(): void
+    {
+        $dropdowns = [];
+
+        foreach ($this->items as $key => $item) {
+            if ($this->canAddItemToDropdown($item)) {
+                // Buffer the item in the dropdowns array
+                $dropdowns[$item->getGroup()][] = $item;
+
+                // Remove the item from the main items collection
+                $this->items->forget($key);
+            }
+        }
+
+        foreach ($dropdowns as $group => $items) {
+            // Create a new dropdown item containing the buffered items
+            $this->items->add(new DropdownNavItem($group, $items));
+        }
+    }
+
+    protected function canAddRoute(Route $route): bool
+    {
+        return $this->parent__canAddRoute($route) && (! $route->getPage() instanceof DocumentationPage || $route->is(DocumentationPage::homeRouteName()));
+    }
+
+    protected function canAddItemToDropdown(NavItem $item): bool
+    {
+        return $item->getGroup() !== null;
+    }
+
+    protected function dropdownsEnabled(): bool
+    {
+        return Config::getString('hyde.navigation.subdirectories', 'hidden') === 'dropdown';
+    }
+
     protected function parent__generate(): void
     {
         Routes::each(function (Route $route): void {

From 8ca7263c51f8400e88e313746ddd1d648115ba7f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 14:39:01 +0100
Subject: [PATCH 0077/1422] Inline temporary refactoring method

---
 .../Navigation/GeneratesMainNavigationMenu.php  | 17 +++++++++++++++--
 .../Features/Navigation/MainNavigationMenu.php  | 12 ------------
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index 14bf4e60c2f..11acdfa71a7 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -7,6 +7,7 @@
 use Hyde\Facades\Config;
 use Hyde\Support\Models\Route;
 use Hyde\Pages\DocumentationPage;
+use Illuminate\Support\Collection;
 use Hyde\Foundation\Facades\Routes;
 
 use function collect;
@@ -18,11 +19,23 @@
  */
 class GeneratesMainNavigationMenu
 {
+    /** @var \Illuminate\Support\Collection<string, \Hyde\Framework\Features\Navigation\NavItem> */
+    protected Collection $items;
+
+    protected function __construct()
+    {
+        $this->items = new Collection();
+    }
+
     public static function handle(): NavigationMenu
     {
-        $navigation = \Hyde\Framework\Features\Navigation\MainNavigationMenu::temp__generate();
+        $menu = new static();
+
+        $menu->generate();
+        $menu->parent__sortByPriority();
+        $menu->parent__removeDuplicateItems();
 
-        return new NavigationMenu($navigation->items);
+        return new NavigationMenu($menu->items);
     }
 
     protected function generate(): void
diff --git a/packages/framework/src/Framework/Features/Navigation/MainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/MainNavigationMenu.php
index 929c6c213cb..61fad3c0fec 100644
--- a/packages/framework/src/Framework/Features/Navigation/MainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/MainNavigationMenu.php
@@ -12,18 +12,6 @@
 /** @deprecated Use the new NavigationMenu class instead */
 class MainNavigationMenu extends BaseNavigationMenu
 {
-    /** @deprecated Temporary method for refactor */
-    public static function temp__generate(): static
-    {
-        $menu = new static();
-
-        $menu->generate();
-        $menu->sortByPriority();
-        $menu->removeDuplicateItems();
-
-        return $menu;
-    }
-
     /** @deprecated Temporary method for refactor */
     public static function create(): static
     {

From 70959896044f7276c626c99ced49f6137d3436f2 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 14:42:53 +0100
Subject: [PATCH 0078/1422] Merge back old renamed test with new one

---
 .../tests/Feature/MainNavigationMenuTest.php  | 390 ------------------
 .../tests/Feature/NavigationMenuTest.php      | 378 ++++++++++++++++-
 2 files changed, 377 insertions(+), 391 deletions(-)
 delete mode 100644 packages/framework/tests/Feature/MainNavigationMenuTest.php

diff --git a/packages/framework/tests/Feature/MainNavigationMenuTest.php b/packages/framework/tests/Feature/MainNavigationMenuTest.php
deleted file mode 100644
index c7bb9bd1826..00000000000
--- a/packages/framework/tests/Feature/MainNavigationMenuTest.php
+++ /dev/null
@@ -1,390 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Hyde\Framework\Testing\Feature;
-
-use BadMethodCallException;
-use Hyde\Support\Models\Route;
-
-use function collect;
-use function config;
-
-use Hyde\Foundation\Facades\Routes;
-use Hyde\Framework\Features\Navigation\DropdownNavItem;
-use Hyde\Framework\Features\Navigation\MainNavigationMenu;
-use Hyde\Framework\Features\Navigation\NavItem;
-use Hyde\Pages\DocumentationPage;
-use Hyde\Pages\MarkdownPage;
-use Hyde\Pages\MarkdownPost;
-use Hyde\Testing\TestCase;
-use Illuminate\Support\Collection;
-
-/**
- * @covers \Hyde\Framework\Features\Navigation\MainNavigationMenu
- * @covers \Hyde\Framework\Features\Navigation\BaseNavigationMenu
- */
-class MainNavigationMenuTest extends TestCase
-{
-    public function testConstructor()
-    {
-        $this->assertInstanceOf(MainNavigationMenu::class, MainNavigationMenu::create());
-    }
-
-    public function testGenerateMethodCreatesCollectionOfNavItems()
-    {
-        $this->assertInstanceOf(Collection::class, MainNavigationMenu::create()->items);
-    }
-
-    public function testGetItemsReturnsItems()
-    {
-        $this->assertEquals(MainNavigationMenu::create()->items, MainNavigationMenu::create()->getItems());
-    }
-
-    public function testItemsAreSortedByPriority()
-    {
-        Routes::addRoute(new Route(new MarkdownPage('foo', ['navigation.priority' => 1])));
-        Routes::addRoute(new Route(new MarkdownPage('bar', ['navigation.priority' => 2])));
-        Routes::addRoute(new Route(new MarkdownPage('baz', ['navigation.priority' => 3])));
-
-        $this->assertSame(['Home', 'Foo', 'Bar', 'Baz'], MainNavigationMenu::create()->items->pluck('label')->toArray());
-    }
-
-    public function testItemsWithHiddenPropertySetToTrueAreNotAdded()
-    {
-        Routes::addRoute(new Route(new MarkdownPage('foo', ['navigation.hidden' => true])));
-        Routes::addRoute(new Route(new MarkdownPage('bar', ['navigation.hidden' => false])));
-
-        $this->assertSame(['Home', 'Bar'], MainNavigationMenu::create()->items->pluck('label')->toArray());
-    }
-
-    public function testCreatedCollectionIsSortedByNavigationMenuPriority()
-    {
-        $this->file('_pages/foo.md');
-        $this->file('_docs/index.md');
-
-        $menu = MainNavigationMenu::create();
-
-        $expected = collect([
-            NavItem::fromRoute(Routes::get('index')),
-            NavItem::fromRoute(Routes::get('foo')),
-            NavItem::fromRoute(Routes::get('docs/index')),
-        ]);
-
-        $this->assertCount(count($expected), $menu->items);
-        $this->assertEquals($expected, $menu->items);
-    }
-
-    public function testIsSortedAutomaticallyWhenUsingNavigationMenuCreate()
-    {
-        $this->file('_pages/foo.md');
-
-        $menu = MainNavigationMenu::create();
-
-        $expected = collect([
-            NavItem::fromRoute(Routes::get('index')),
-            NavItem::fromRoute(Routes::get('foo')),
-        ]);
-
-        $this->assertCount(count($expected), $menu->items);
-        $this->assertEquals($expected, $menu->items);
-    }
-
-    public function testCollectionOnlyContainsNavItems()
-    {
-        $this->assertContainsOnlyInstancesOf(NavItem::class, MainNavigationMenu::create()->items);
-    }
-
-    public function testExternalLinkCanBeAddedInConfig()
-    {
-        config(['hyde.navigation.custom' => [NavItem::forLink('https://example.com', 'foo')]]);
-
-        $menu = MainNavigationMenu::create();
-
-        $expected = collect([
-            NavItem::fromRoute(Routes::get('index')),
-            NavItem::forLink('https://example.com', 'foo'),
-        ]);
-
-        $this->assertCount(count($expected), $menu->items);
-        $this->assertEquals($expected, $menu->items);
-    }
-
-    public function testPathLinkCanBeAddedInConfig()
-    {
-        config(['hyde.navigation.custom' => [NavItem::forLink('foo', 'foo')]]);
-
-        $menu = MainNavigationMenu::create();
-
-        $expected = collect([
-            NavItem::fromRoute(Routes::get('index')),
-            NavItem::forLink('foo', 'foo'),
-        ]);
-
-        $this->assertCount(count($expected), $menu->items);
-        $this->assertEquals($expected, $menu->items);
-    }
-
-    public function testDuplicatesAreRemovedWhenAddingInConfig()
-    {
-        config(['hyde.navigation.custom' => [
-            NavItem::forLink('foo', 'foo'),
-            NavItem::forLink('foo', 'foo'),
-        ]]);
-
-        $menu = MainNavigationMenu::create();
-
-        $expected = collect([
-            NavItem::fromRoute(Routes::get('index')),
-            NavItem::forLink('foo', 'foo'),
-        ]);
-
-        $this->assertCount(count($expected), $menu->items);
-        $this->assertEquals($expected, $menu->items);
-    }
-
-    public function testDuplicatesAreRemovedWhenAddingInConfigRegardlessOfDestination()
-    {
-        config(['hyde.navigation.custom' => [
-            NavItem::forLink('foo', 'foo'),
-            NavItem::forLink('bar', 'foo'),
-        ]]);
-
-        $menu = MainNavigationMenu::create();
-
-        $expected = collect([
-            NavItem::fromRoute(Routes::get('index')),
-            NavItem::forLink('foo', 'foo'),
-        ]);
-
-        $this->assertCount(count($expected), $menu->items);
-        $this->assertEquals($expected, $menu->items);
-    }
-
-    public function testConfigItemsTakePrecedenceOverGeneratedItems()
-    {
-        $this->file('_pages/foo.md');
-
-        config(['hyde.navigation.custom' => [NavItem::forLink('bar', 'Foo')]]);
-
-        $menu = MainNavigationMenu::create();
-
-        $expected = collect([
-            NavItem::fromRoute(Routes::get('index')),
-            NavItem::forLink('bar', 'Foo'),
-        ]);
-
-        $this->assertCount(count($expected), $menu->items);
-        $this->assertEquals($expected, $menu->items);
-    }
-
-    public function testDocumentationPagesThatAreNotIndexAreNotAddedToTheMenu()
-    {
-        $this->file('_docs/foo.md');
-        $this->file('_docs/index.md');
-
-        $menu = MainNavigationMenu::create();
-
-        $expected = collect([
-            NavItem::fromRoute(Routes::get('index')),
-            NavItem::fromRoute(Routes::get('docs/index')),
-        ]);
-
-        $this->assertCount(count($expected), $menu->items);
-        $this->assertEquals($expected, $menu->items);
-    }
-
-    public function testPagesInSubdirectoriesAreNotAddedToTheNavigationMenu()
-    {
-        $this->directory('_pages/foo');
-        $this->file('_pages/foo/bar.md');
-
-        $menu = MainNavigationMenu::create();
-        $expected = collect([NavItem::fromRoute(Routes::get('index'))]);
-
-        $this->assertCount(count($expected), $menu->items);
-        $this->assertEquals($expected, $menu->items);
-    }
-
-    public function testPagesInSubdirectoriesCanBeAddedToTheNavigationMenuWithConfigFlatSetting()
-    {
-        config(['hyde.navigation.subdirectories' => 'flat']);
-        $this->directory('_pages/foo');
-        $this->file('_pages/foo/bar.md');
-
-        $menu = MainNavigationMenu::create();
-        $expected = collect([
-            NavItem::fromRoute(Routes::get('index')),
-            NavItem::fromRoute(Routes::get('foo/bar')),
-        ]);
-
-        $this->assertCount(count($expected), $menu->items);
-        $this->assertEquals($expected, $menu->items);
-    }
-
-    public function testPagesInSubdirectoriesAreNotAddedToTheNavigationMenuWithConfigDropdownSetting()
-    {
-        config(['hyde.navigation.subdirectories' => 'dropdown']);
-        $this->directory('_pages/foo');
-        $this->file('_pages/foo/bar.md');
-
-        $menu = MainNavigationMenu::create();
-        $expected = collect([
-            NavItem::fromRoute(Routes::get('index')),
-            DropdownNavItem::fromArray('foo', [
-                NavItem::fromRoute(Routes::get('foo/bar')),
-            ]),
-        ]);
-
-        $this->assertCount(count($expected), $menu->items);
-        $this->assertEquals($expected, $menu->items);
-    }
-
-    public function testHasDropdownsReturnsFalseWhenThereAreNoDropdowns()
-    {
-        config(['hyde.navigation.subdirectories' => 'dropdown']);
-        $menu = MainNavigationMenu::create();
-        $this->assertFalse($menu->hasDropdowns());
-    }
-
-    public function testHasDropdownsReturnsTrueWhenThereAreDropdowns()
-    {
-        config(['hyde.navigation.subdirectories' => 'dropdown']);
-        Routes::addRoute((new MarkdownPage('foo/bar'))->getRoute());
-        $menu = MainNavigationMenu::create();
-        $this->assertTrue($menu->hasDropdowns());
-    }
-
-    public function testHasDropdownsAlwaysReturnsFalseWhenDropdownsAreDisabled()
-    {
-        Routes::addRoute((new MarkdownPage('foo/bar'))->getRoute());
-        $this->assertFalse(MainNavigationMenu::create()->hasDropdowns());
-    }
-
-    public function testGetDropdownsReturnsEmptyArrayThereAreNoDropdowns()
-    {
-        config(['hyde.navigation.subdirectories' => 'dropdown']);
-        $menu = MainNavigationMenu::create();
-        $this->assertCount(0, $menu->getDropdowns());
-        $this->assertSame([], $menu->getDropdowns());
-    }
-
-    public function testGetDropdownsReturnsCorrectArrayWhenThereAreDropdowns()
-    {
-        config(['hyde.navigation.subdirectories' => 'dropdown']);
-        Routes::addRoute((new MarkdownPage('foo/bar'))->getRoute());
-        $menu = MainNavigationMenu::create();
-        $this->assertCount(1, $menu->getDropdowns());
-
-        $this->assertEquals([
-            DropdownNavItem::fromArray('foo', [
-                NavItem::fromRoute((new MarkdownPage('foo/bar'))->getRoute()),
-            ]), ], $menu->getDropdowns());
-    }
-
-    public function testGetDropdownsWithMultipleItems()
-    {
-        config(['hyde.navigation.subdirectories' => 'dropdown']);
-
-        Routes::addRoute((new MarkdownPage('foo/bar'))->getRoute());
-        Routes::addRoute((new MarkdownPage('foo/baz'))->getRoute());
-        $menu = MainNavigationMenu::create();
-
-        $this->assertCount(1, $menu->getDropdowns());
-
-        $this->assertEquals([
-            DropdownNavItem::fromArray('foo', [
-                NavItem::fromRoute((new MarkdownPage('foo/bar'))->getRoute()),
-                NavItem::fromRoute((new MarkdownPage('foo/baz'))->getRoute()),
-            ]),
-        ], $menu->getDropdowns());
-    }
-
-    public function testGetDropdownsWithMultipleDropdowns()
-    {
-        config(['hyde.navigation.subdirectories' => 'dropdown']);
-
-        Routes::addRoute((new MarkdownPage('foo/bar'))->getRoute());
-        Routes::addRoute((new MarkdownPage('foo/baz'))->getRoute());
-        Routes::addRoute((new MarkdownPage('cat/hat'))->getRoute());
-
-        $menu = MainNavigationMenu::create();
-
-        $this->assertCount(2, $menu->getDropdowns());
-
-        $this->assertEquals([
-            DropdownNavItem::fromArray('foo', [
-                NavItem::fromRoute((new MarkdownPage('foo/bar'))->getRoute()),
-                NavItem::fromRoute((new MarkdownPage('foo/baz'))->getRoute()),
-            ]),
-            DropdownNavItem::fromArray('cat', [
-                NavItem::fromRoute((new MarkdownPage('cat/hat'))->getRoute()),
-            ]),
-        ], $menu->getDropdowns());
-    }
-
-    public function testGetDropdownsThrowsExceptionWhenDisabled()
-    {
-        $this->expectException(BadMethodCallException::class);
-        $this->expectExceptionMessage('Dropdowns are not enabled. Enable it by setting `hyde.navigation.subdirectories` to `dropdown`.');
-
-        $menu = MainNavigationMenu::create();
-        $menu->getDropdowns();
-    }
-
-    public function testDocumentationPagesDoNotGetAddedToDropdowns()
-    {
-        config(['hyde.navigation.subdirectories' => 'dropdown']);
-
-        Routes::addRoute((new DocumentationPage('foo'))->getRoute());
-        Routes::addRoute((new DocumentationPage('bar/baz'))->getRoute());
-        $menu = MainNavigationMenu::create();
-
-        $this->assertFalse($menu->hasDropdowns());
-        $this->assertCount(0, $menu->getDropdowns());
-    }
-
-    public function testBlogPostsDoNotGetAddedToDropdowns()
-    {
-        config(['hyde.navigation.subdirectories' => 'dropdown']);
-
-        Routes::addRoute((new MarkdownPost('foo'))->getRoute());
-        Routes::addRoute((new MarkdownPost('bar/baz'))->getRoute());
-
-        $menu = MainNavigationMenu::create();
-        $this->assertFalse($menu->hasDropdowns());
-        $this->assertCount(0, $menu->getDropdowns());
-    }
-
-    public function testPagesInDropdownsDoNotGetAddedToTheMainNavigation()
-    {
-        config(['hyde.navigation.subdirectories' => 'dropdown']);
-
-        Routes::push((new MarkdownPage('foo'))->getRoute());
-        Routes::push((new MarkdownPage('bar/baz'))->getRoute());
-        $menu = MainNavigationMenu::create();
-
-        $this->assertCount(3, $menu->items);
-        $this->assertEquals([
-            NavItem::fromRoute(Routes::get('index')),
-            NavItem::fromRoute((new MarkdownPage('foo'))->getRoute()),
-            DropdownNavItem::fromArray('bar', [
-                NavItem::fromRoute((new MarkdownPage('bar/baz'))->getRoute()),
-            ]),
-        ], $menu->items->all());
-    }
-
-    public function testDropdownMenuItemsAreSortedByPriority()
-    {
-        config(['hyde.navigation.subdirectories' => 'dropdown']);
-
-        Routes::addRoute(new Route(new MarkdownPage('foo/foo', ['navigation.priority' => 1])));
-        Routes::addRoute(new Route(new MarkdownPage('foo/bar', ['navigation.priority' => 2])));
-        Routes::addRoute(new Route(new MarkdownPage('foo/baz', ['navigation.priority' => 3])));
-
-        $menu = MainNavigationMenu::create();
-        $dropdowns = $menu->getDropdowns();
-
-        $this->assertSame(['Foo', 'Bar', 'Baz'], $dropdowns[0]->getItems()->pluck('label')->toArray());
-    }
-}
diff --git a/packages/framework/tests/Feature/NavigationMenuTest.php b/packages/framework/tests/Feature/NavigationMenuTest.php
index b75fa735190..3f2fdb6afef 100644
--- a/packages/framework/tests/Feature/NavigationMenuTest.php
+++ b/packages/framework/tests/Feature/NavigationMenuTest.php
@@ -4,12 +4,388 @@
 
 namespace Hyde\Framework\Testing\Feature;
 
+use BadMethodCallException;
+use Hyde\Support\Models\Route;
+
+use function collect;
+use function config;
+
+use Hyde\Foundation\Facades\Routes;
+use Hyde\Framework\Features\Navigation\DropdownNavItem;
+use Hyde\Framework\Features\Navigation\MainNavigationMenu;
+use Hyde\Framework\Features\Navigation\NavItem;
+use Hyde\Pages\DocumentationPage;
+use Hyde\Pages\MarkdownPage;
+use Hyde\Pages\MarkdownPost;
 use Hyde\Testing\TestCase;
+use Illuminate\Support\Collection;
 
 /**
+ * @covers \Hyde\Framework\Features\Navigation\MainNavigationMenu
+ * @covers \Hyde\Framework\Features\Navigation\BaseNavigationMenu
  * @covers \Hyde\Framework\Features\Navigation\NavigationMenu
  */
 class NavigationMenuTest extends TestCase
 {
-    //
+    public function testConstructor()
+    {
+        $this->assertInstanceOf(MainNavigationMenu::class, MainNavigationMenu::create());
+    }
+
+    public function testGenerateMethodCreatesCollectionOfNavItems()
+    {
+        $this->assertInstanceOf(Collection::class, MainNavigationMenu::create()->items);
+    }
+
+    public function testGetItemsReturnsItems()
+    {
+        $this->assertEquals(MainNavigationMenu::create()->items, MainNavigationMenu::create()->getItems());
+    }
+
+    public function testItemsAreSortedByPriority()
+    {
+        Routes::addRoute(new Route(new MarkdownPage('foo', ['navigation.priority' => 1])));
+        Routes::addRoute(new Route(new MarkdownPage('bar', ['navigation.priority' => 2])));
+        Routes::addRoute(new Route(new MarkdownPage('baz', ['navigation.priority' => 3])));
+
+        $this->assertSame(['Home', 'Foo', 'Bar', 'Baz'], MainNavigationMenu::create()->items->pluck('label')->toArray());
+    }
+
+    public function testItemsWithHiddenPropertySetToTrueAreNotAdded()
+    {
+        Routes::addRoute(new Route(new MarkdownPage('foo', ['navigation.hidden' => true])));
+        Routes::addRoute(new Route(new MarkdownPage('bar', ['navigation.hidden' => false])));
+
+        $this->assertSame(['Home', 'Bar'], MainNavigationMenu::create()->items->pluck('label')->toArray());
+    }
+
+    public function testCreatedCollectionIsSortedByNavigationMenuPriority()
+    {
+        $this->file('_pages/foo.md');
+        $this->file('_docs/index.md');
+
+        $menu = MainNavigationMenu::create();
+
+        $expected = collect([
+            NavItem::fromRoute(Routes::get('index')),
+            NavItem::fromRoute(Routes::get('foo')),
+            NavItem::fromRoute(Routes::get('docs/index')),
+        ]);
+
+        $this->assertCount(count($expected), $menu->items);
+        $this->assertEquals($expected, $menu->items);
+    }
+
+    public function testIsSortedAutomaticallyWhenUsingNavigationMenuCreate()
+    {
+        $this->file('_pages/foo.md');
+
+        $menu = MainNavigationMenu::create();
+
+        $expected = collect([
+            NavItem::fromRoute(Routes::get('index')),
+            NavItem::fromRoute(Routes::get('foo')),
+        ]);
+
+        $this->assertCount(count($expected), $menu->items);
+        $this->assertEquals($expected, $menu->items);
+    }
+
+    public function testCollectionOnlyContainsNavItems()
+    {
+        $this->assertContainsOnlyInstancesOf(NavItem::class, MainNavigationMenu::create()->items);
+    }
+
+    public function testExternalLinkCanBeAddedInConfig()
+    {
+        config(['hyde.navigation.custom' => [NavItem::forLink('https://example.com', 'foo')]]);
+
+        $menu = MainNavigationMenu::create();
+
+        $expected = collect([
+            NavItem::fromRoute(Routes::get('index')),
+            NavItem::forLink('https://example.com', 'foo'),
+        ]);
+
+        $this->assertCount(count($expected), $menu->items);
+        $this->assertEquals($expected, $menu->items);
+    }
+
+    public function testPathLinkCanBeAddedInConfig()
+    {
+        config(['hyde.navigation.custom' => [NavItem::forLink('foo', 'foo')]]);
+
+        $menu = MainNavigationMenu::create();
+
+        $expected = collect([
+            NavItem::fromRoute(Routes::get('index')),
+            NavItem::forLink('foo', 'foo'),
+        ]);
+
+        $this->assertCount(count($expected), $menu->items);
+        $this->assertEquals($expected, $menu->items);
+    }
+
+    public function testDuplicatesAreRemovedWhenAddingInConfig()
+    {
+        config(['hyde.navigation.custom' => [
+            NavItem::forLink('foo', 'foo'),
+            NavItem::forLink('foo', 'foo'),
+        ]]);
+
+        $menu = MainNavigationMenu::create();
+
+        $expected = collect([
+            NavItem::fromRoute(Routes::get('index')),
+            NavItem::forLink('foo', 'foo'),
+        ]);
+
+        $this->assertCount(count($expected), $menu->items);
+        $this->assertEquals($expected, $menu->items);
+    }
+
+    public function testDuplicatesAreRemovedWhenAddingInConfigRegardlessOfDestination()
+    {
+        config(['hyde.navigation.custom' => [
+            NavItem::forLink('foo', 'foo'),
+            NavItem::forLink('bar', 'foo'),
+        ]]);
+
+        $menu = MainNavigationMenu::create();
+
+        $expected = collect([
+            NavItem::fromRoute(Routes::get('index')),
+            NavItem::forLink('foo', 'foo'),
+        ]);
+
+        $this->assertCount(count($expected), $menu->items);
+        $this->assertEquals($expected, $menu->items);
+    }
+
+    public function testConfigItemsTakePrecedenceOverGeneratedItems()
+    {
+        $this->file('_pages/foo.md');
+
+        config(['hyde.navigation.custom' => [NavItem::forLink('bar', 'Foo')]]);
+
+        $menu = MainNavigationMenu::create();
+
+        $expected = collect([
+            NavItem::fromRoute(Routes::get('index')),
+            NavItem::forLink('bar', 'Foo'),
+        ]);
+
+        $this->assertCount(count($expected), $menu->items);
+        $this->assertEquals($expected, $menu->items);
+    }
+
+    public function testDocumentationPagesThatAreNotIndexAreNotAddedToTheMenu()
+    {
+        $this->file('_docs/foo.md');
+        $this->file('_docs/index.md');
+
+        $menu = MainNavigationMenu::create();
+
+        $expected = collect([
+            NavItem::fromRoute(Routes::get('index')),
+            NavItem::fromRoute(Routes::get('docs/index')),
+        ]);
+
+        $this->assertCount(count($expected), $menu->items);
+        $this->assertEquals($expected, $menu->items);
+    }
+
+    public function testPagesInSubdirectoriesAreNotAddedToTheNavigationMenu()
+    {
+        $this->directory('_pages/foo');
+        $this->file('_pages/foo/bar.md');
+
+        $menu = MainNavigationMenu::create();
+        $expected = collect([NavItem::fromRoute(Routes::get('index'))]);
+
+        $this->assertCount(count($expected), $menu->items);
+        $this->assertEquals($expected, $menu->items);
+    }
+
+    public function testPagesInSubdirectoriesCanBeAddedToTheNavigationMenuWithConfigFlatSetting()
+    {
+        config(['hyde.navigation.subdirectories' => 'flat']);
+        $this->directory('_pages/foo');
+        $this->file('_pages/foo/bar.md');
+
+        $menu = MainNavigationMenu::create();
+        $expected = collect([
+            NavItem::fromRoute(Routes::get('index')),
+            NavItem::fromRoute(Routes::get('foo/bar')),
+        ]);
+
+        $this->assertCount(count($expected), $menu->items);
+        $this->assertEquals($expected, $menu->items);
+    }
+
+    public function testPagesInSubdirectoriesAreNotAddedToTheNavigationMenuWithConfigDropdownSetting()
+    {
+        config(['hyde.navigation.subdirectories' => 'dropdown']);
+        $this->directory('_pages/foo');
+        $this->file('_pages/foo/bar.md');
+
+        $menu = MainNavigationMenu::create();
+        $expected = collect([
+            NavItem::fromRoute(Routes::get('index')),
+            DropdownNavItem::fromArray('foo', [
+                NavItem::fromRoute(Routes::get('foo/bar')),
+            ]),
+        ]);
+
+        $this->assertCount(count($expected), $menu->items);
+        $this->assertEquals($expected, $menu->items);
+    }
+
+    public function testHasDropdownsReturnsFalseWhenThereAreNoDropdowns()
+    {
+        config(['hyde.navigation.subdirectories' => 'dropdown']);
+        $menu = MainNavigationMenu::create();
+        $this->assertFalse($menu->hasDropdowns());
+    }
+
+    public function testHasDropdownsReturnsTrueWhenThereAreDropdowns()
+    {
+        config(['hyde.navigation.subdirectories' => 'dropdown']);
+        Routes::addRoute((new MarkdownPage('foo/bar'))->getRoute());
+        $menu = MainNavigationMenu::create();
+        $this->assertTrue($menu->hasDropdowns());
+    }
+
+    public function testHasDropdownsAlwaysReturnsFalseWhenDropdownsAreDisabled()
+    {
+        Routes::addRoute((new MarkdownPage('foo/bar'))->getRoute());
+        $this->assertFalse(MainNavigationMenu::create()->hasDropdowns());
+    }
+
+    public function testGetDropdownsReturnsEmptyArrayThereAreNoDropdowns()
+    {
+        config(['hyde.navigation.subdirectories' => 'dropdown']);
+        $menu = MainNavigationMenu::create();
+        $this->assertCount(0, $menu->getDropdowns());
+        $this->assertSame([], $menu->getDropdowns());
+    }
+
+    public function testGetDropdownsReturnsCorrectArrayWhenThereAreDropdowns()
+    {
+        config(['hyde.navigation.subdirectories' => 'dropdown']);
+        Routes::addRoute((new MarkdownPage('foo/bar'))->getRoute());
+        $menu = MainNavigationMenu::create();
+        $this->assertCount(1, $menu->getDropdowns());
+
+        $this->assertEquals([
+            DropdownNavItem::fromArray('foo', [
+                NavItem::fromRoute((new MarkdownPage('foo/bar'))->getRoute()),
+            ]), ], $menu->getDropdowns());
+    }
+
+    public function testGetDropdownsWithMultipleItems()
+    {
+        config(['hyde.navigation.subdirectories' => 'dropdown']);
+
+        Routes::addRoute((new MarkdownPage('foo/bar'))->getRoute());
+        Routes::addRoute((new MarkdownPage('foo/baz'))->getRoute());
+        $menu = MainNavigationMenu::create();
+
+        $this->assertCount(1, $menu->getDropdowns());
+
+        $this->assertEquals([
+            DropdownNavItem::fromArray('foo', [
+                NavItem::fromRoute((new MarkdownPage('foo/bar'))->getRoute()),
+                NavItem::fromRoute((new MarkdownPage('foo/baz'))->getRoute()),
+            ]),
+        ], $menu->getDropdowns());
+    }
+
+    public function testGetDropdownsWithMultipleDropdowns()
+    {
+        config(['hyde.navigation.subdirectories' => 'dropdown']);
+
+        Routes::addRoute((new MarkdownPage('foo/bar'))->getRoute());
+        Routes::addRoute((new MarkdownPage('foo/baz'))->getRoute());
+        Routes::addRoute((new MarkdownPage('cat/hat'))->getRoute());
+
+        $menu = MainNavigationMenu::create();
+
+        $this->assertCount(2, $menu->getDropdowns());
+
+        $this->assertEquals([
+            DropdownNavItem::fromArray('foo', [
+                NavItem::fromRoute((new MarkdownPage('foo/bar'))->getRoute()),
+                NavItem::fromRoute((new MarkdownPage('foo/baz'))->getRoute()),
+            ]),
+            DropdownNavItem::fromArray('cat', [
+                NavItem::fromRoute((new MarkdownPage('cat/hat'))->getRoute()),
+            ]),
+        ], $menu->getDropdowns());
+    }
+
+    public function testGetDropdownsThrowsExceptionWhenDisabled()
+    {
+        $this->expectException(BadMethodCallException::class);
+        $this->expectExceptionMessage('Dropdowns are not enabled. Enable it by setting `hyde.navigation.subdirectories` to `dropdown`.');
+
+        $menu = MainNavigationMenu::create();
+        $menu->getDropdowns();
+    }
+
+    public function testDocumentationPagesDoNotGetAddedToDropdowns()
+    {
+        config(['hyde.navigation.subdirectories' => 'dropdown']);
+
+        Routes::addRoute((new DocumentationPage('foo'))->getRoute());
+        Routes::addRoute((new DocumentationPage('bar/baz'))->getRoute());
+        $menu = MainNavigationMenu::create();
+
+        $this->assertFalse($menu->hasDropdowns());
+        $this->assertCount(0, $menu->getDropdowns());
+    }
+
+    public function testBlogPostsDoNotGetAddedToDropdowns()
+    {
+        config(['hyde.navigation.subdirectories' => 'dropdown']);
+
+        Routes::addRoute((new MarkdownPost('foo'))->getRoute());
+        Routes::addRoute((new MarkdownPost('bar/baz'))->getRoute());
+
+        $menu = MainNavigationMenu::create();
+        $this->assertFalse($menu->hasDropdowns());
+        $this->assertCount(0, $menu->getDropdowns());
+    }
+
+    public function testPagesInDropdownsDoNotGetAddedToTheMainNavigation()
+    {
+        config(['hyde.navigation.subdirectories' => 'dropdown']);
+
+        Routes::push((new MarkdownPage('foo'))->getRoute());
+        Routes::push((new MarkdownPage('bar/baz'))->getRoute());
+        $menu = MainNavigationMenu::create();
+
+        $this->assertCount(3, $menu->items);
+        $this->assertEquals([
+            NavItem::fromRoute(Routes::get('index')),
+            NavItem::fromRoute((new MarkdownPage('foo'))->getRoute()),
+            DropdownNavItem::fromArray('bar', [
+                NavItem::fromRoute((new MarkdownPage('bar/baz'))->getRoute()),
+            ]),
+        ], $menu->items->all());
+    }
+
+    public function testDropdownMenuItemsAreSortedByPriority()
+    {
+        config(['hyde.navigation.subdirectories' => 'dropdown']);
+
+        Routes::addRoute(new Route(new MarkdownPage('foo/foo', ['navigation.priority' => 1])));
+        Routes::addRoute(new Route(new MarkdownPage('foo/bar', ['navigation.priority' => 2])));
+        Routes::addRoute(new Route(new MarkdownPage('foo/baz', ['navigation.priority' => 3])));
+
+        $menu = MainNavigationMenu::create();
+        $dropdowns = $menu->getDropdowns();
+
+        $this->assertSame(['Foo', 'Bar', 'Baz'], $dropdowns[0]->getItems()->pluck('label')->toArray());
+    }
 }

From 197b80723db0899c15577056c291bce48e4dcbe7 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 14:47:58 +0100
Subject: [PATCH 0079/1422] Formatting

---
 packages/framework/tests/Feature/NavigationMenuTest.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/packages/framework/tests/Feature/NavigationMenuTest.php b/packages/framework/tests/Feature/NavigationMenuTest.php
index 3f2fdb6afef..97f2673dcdf 100644
--- a/packages/framework/tests/Feature/NavigationMenuTest.php
+++ b/packages/framework/tests/Feature/NavigationMenuTest.php
@@ -6,10 +6,6 @@
 
 use BadMethodCallException;
 use Hyde\Support\Models\Route;
-
-use function collect;
-use function config;
-
 use Hyde\Foundation\Facades\Routes;
 use Hyde\Framework\Features\Navigation\DropdownNavItem;
 use Hyde\Framework\Features\Navigation\MainNavigationMenu;

From a6132c710d5f274c00288d3e7020168fb4d8c1ce Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 14:54:46 +0100
Subject: [PATCH 0080/1422] Add coverage annotation

---
 packages/framework/tests/Feature/NavigationMenuTest.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/tests/Feature/NavigationMenuTest.php b/packages/framework/tests/Feature/NavigationMenuTest.php
index 97f2673dcdf..c7a5d614f71 100644
--- a/packages/framework/tests/Feature/NavigationMenuTest.php
+++ b/packages/framework/tests/Feature/NavigationMenuTest.php
@@ -17,6 +17,7 @@
 use Illuminate\Support\Collection;
 
 /**
+ * @covers \Hyde\Framework\Features\Navigation\GeneratesMainNavigationMenu
  * @covers \Hyde\Framework\Features\Navigation\MainNavigationMenu
  * @covers \Hyde\Framework\Features\Navigation\BaseNavigationMenu
  * @covers \Hyde\Framework\Features\Navigation\NavigationMenu

From 1a4d66f3c7896efddd12185be77398a8695969bf Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 14:54:54 +0100
Subject: [PATCH 0081/1422] Remove resolved todo

---
 .../Features/Navigation/GeneratesMainNavigationMenu.php         | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index 11acdfa71a7..56aab99c18b 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -14,8 +14,6 @@
 
 /**
  * @experimental This class may change significantly before its release.
- *
- * @todo Refactor to move logic to the new action
  */
 class GeneratesMainNavigationMenu
 {

From aab36f0eb75961323907e794dbc8bba98bd690d4 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 14:56:21 +0100
Subject: [PATCH 0082/1422] Remove temporary parent prefixes from standalone
 methods

---
 .../Features/Navigation/GeneratesMainNavigationMenu.php   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index 56aab99c18b..cab76d9dd8f 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -30,8 +30,8 @@ public static function handle(): NavigationMenu
         $menu = new static();
 
         $menu->generate();
-        $menu->parent__sortByPriority();
-        $menu->parent__removeDuplicateItems();
+        $menu->sortByPriority();
+        $menu->removeDuplicateItems();
 
         return new NavigationMenu($menu->items);
     }
@@ -99,7 +99,7 @@ protected function parent__canAddRoute(Route $route): bool
         return $route->getPage()->showInNavigation();
     }
 
-    protected function parent__removeDuplicateItems(): void
+    protected function removeDuplicateItems(): void
     {
         $this->items = $this->items->unique(function (NavItem $item): string {
             // Filter using a combination of the group and label to allow duplicate labels in different groups
@@ -107,7 +107,7 @@ protected function parent__removeDuplicateItems(): void
         });
     }
 
-    protected function parent__sortByPriority(): void
+    protected function sortByPriority(): void
     {
         $this->items = $this->items->sortBy('priority')->values();
     }

From dd12c9fb9adb52c7ca6a97bdd8d9d1800360bf36 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 14:58:23 +0100
Subject: [PATCH 0083/1422] Inline temporary parent method copies

---
 .../GeneratesMainNavigationMenu.php           | 32 +++++++------------
 1 file changed, 11 insertions(+), 21 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index cab76d9dd8f..8eb8bf2b3d6 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -38,7 +38,16 @@ public static function handle(): NavigationMenu
 
     protected function generate(): void
     {
-        $this->parent__generate();
+        Routes::each(function (Route $route): void {
+            if ($this->canAddRoute($route)) {
+                $this->items->put($route->getRouteKey(), NavItem::fromRoute($route));
+            }
+        });
+
+        collect(Config::getArray('hyde.navigation.custom', []))->each(function (NavItem $item): void {
+            // Since these were added explicitly by the user, we can assume they should always be shown
+            $this->items->push($item);
+        });
 
         if ($this->dropdownsEnabled()) {
             $this->moveGroupedItemsIntoDropdowns();
@@ -67,7 +76,7 @@ protected function moveGroupedItemsIntoDropdowns(): void
 
     protected function canAddRoute(Route $route): bool
     {
-        return $this->parent__canAddRoute($route) && (! $route->getPage() instanceof DocumentationPage || $route->is(DocumentationPage::homeRouteName()));
+        return $route->getPage()->showInNavigation() && (! $route->getPage() instanceof DocumentationPage || $route->is(DocumentationPage::homeRouteName()));
     }
 
     protected function canAddItemToDropdown(NavItem $item): bool
@@ -80,25 +89,6 @@ protected function dropdownsEnabled(): bool
         return Config::getString('hyde.navigation.subdirectories', 'hidden') === 'dropdown';
     }
 
-    protected function parent__generate(): void
-    {
-        Routes::each(function (Route $route): void {
-            if ($this->canAddRoute($route)) {
-                $this->items->put($route->getRouteKey(), NavItem::fromRoute($route));
-            }
-        });
-
-        collect(Config::getArray('hyde.navigation.custom', []))->each(function (NavItem $item): void {
-            // Since these were added explicitly by the user, we can assume they should always be shown
-            $this->items->push($item);
-        });
-    }
-
-    protected function parent__canAddRoute(Route $route): bool
-    {
-        return $route->getPage()->showInNavigation();
-    }
-
     protected function removeDuplicateItems(): void
     {
         $this->items = $this->items->unique(function (NavItem $item): string {

From db45a35186911b7d5887eeea538a5ef0e6aa9973 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 14:59:50 +0100
Subject: [PATCH 0084/1422] Remove helper methods moved to new action

---
 .../Navigation/MainNavigationMenu.php         | 41 -------------------
 1 file changed, 41 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/MainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/MainNavigationMenu.php
index 61fad3c0fec..c0f51cc4b3b 100644
--- a/packages/framework/src/Framework/Features/Navigation/MainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/MainNavigationMenu.php
@@ -5,8 +5,6 @@
 namespace Hyde\Framework\Features\Navigation;
 
 use Hyde\Facades\Config;
-use Hyde\Support\Models\Route;
-use Hyde\Pages\DocumentationPage;
 use BadMethodCallException;
 
 /** @deprecated Use the new NavigationMenu class instead */
@@ -21,15 +19,6 @@ public static function create(): static
         return $menu;
     }
 
-    protected function generate(): void
-    {
-        parent::generate();
-
-        if ($this->dropdownsEnabled()) {
-            $this->moveGroupedItemsIntoDropdowns();
-        }
-    }
-
     public function hasDropdowns(): bool
     {
         return $this->dropdownsEnabled() && count($this->getDropdowns()) >= 1;
@@ -47,36 +36,6 @@ public function getDropdowns(): array
         })->values()->all();
     }
 
-    protected function moveGroupedItemsIntoDropdowns(): void
-    {
-        $dropdowns = [];
-
-        foreach ($this->items as $key => $item) {
-            if ($this->canAddItemToDropdown($item)) {
-                // Buffer the item in the dropdowns array
-                $dropdowns[$item->getGroup()][] = $item;
-
-                // Remove the item from the main items collection
-                $this->items->forget($key);
-            }
-        }
-
-        foreach ($dropdowns as $group => $items) {
-            // Create a new dropdown item containing the buffered items
-            $this->items->add(new DropdownNavItem($group, $items));
-        }
-    }
-
-    protected function canAddRoute(Route $route): bool
-    {
-        return parent::canAddRoute($route) && (! $route->getPage() instanceof DocumentationPage || $route->is(DocumentationPage::homeRouteName()));
-    }
-
-    protected function canAddItemToDropdown(NavItem $item): bool
-    {
-        return $item->getGroup() !== null;
-    }
-
     protected function dropdownsEnabled(): bool
     {
         return Config::getString('hyde.navigation.subdirectories', 'hidden') === 'dropdown';

From ee786d706f8729977588817642c5d9217c5ae37c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 15:06:16 +0100
Subject: [PATCH 0085/1422] Breaking: Make `BaseNavigationMenu::$items`
 protected

---
 .../components/docs/sidebar-items.blade.php   |  2 +-
 .../Navigation/BaseNavigationMenu.php         |  2 +-
 .../tests/Feature/NavigationMenuTest.php      | 58 +++++++++----------
 .../Services/DocumentationSidebarTest.php     | 36 ++++++------
 4 files changed, 49 insertions(+), 49 deletions(-)

diff --git a/packages/framework/resources/views/components/docs/sidebar-items.blade.php b/packages/framework/resources/views/components/docs/sidebar-items.blade.php
index 4c26062cf9f..cebd57f4833 100644
--- a/packages/framework/resources/views/components/docs/sidebar-items.blade.php
+++ b/packages/framework/resources/views/components/docs/sidebar-items.blade.php
@@ -1,7 +1,7 @@
 @php /** @var \Hyde\Framework\Features\Navigation\DocumentationSidebar $sidebar */ @endphp
 @if(! $sidebar->hasGroups())
     <ul id="sidebar-items" role="list" class="pl-2">
-        @foreach ($sidebar->items as $item)
+        @foreach ($sidebar->getItems() as $item)
             @include('hyde::components.docs.sidebar-item')
         @endforeach
     </ul>
diff --git a/packages/framework/src/Framework/Features/Navigation/BaseNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/BaseNavigationMenu.php
index d8bf84ebfab..9761a13a465 100644
--- a/packages/framework/src/Framework/Features/Navigation/BaseNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/BaseNavigationMenu.php
@@ -15,7 +15,7 @@
 abstract class BaseNavigationMenu
 {
     /** @var \Illuminate\Support\Collection<string, \Hyde\Framework\Features\Navigation\NavItem> */
-    public Collection $items;
+    protected Collection $items;
 
     final protected function __construct()
     {
diff --git a/packages/framework/tests/Feature/NavigationMenuTest.php b/packages/framework/tests/Feature/NavigationMenuTest.php
index c7a5d614f71..5bc2caf372d 100644
--- a/packages/framework/tests/Feature/NavigationMenuTest.php
+++ b/packages/framework/tests/Feature/NavigationMenuTest.php
@@ -31,12 +31,12 @@ public function testConstructor()
 
     public function testGenerateMethodCreatesCollectionOfNavItems()
     {
-        $this->assertInstanceOf(Collection::class, MainNavigationMenu::create()->items);
+        $this->assertInstanceOf(Collection::class, MainNavigationMenu::create()->getItems());
     }
 
     public function testGetItemsReturnsItems()
     {
-        $this->assertEquals(MainNavigationMenu::create()->items, MainNavigationMenu::create()->getItems());
+        $this->assertEquals(MainNavigationMenu::create()->getItems(), MainNavigationMenu::create()->getItems());
     }
 
     public function testItemsAreSortedByPriority()
@@ -45,7 +45,7 @@ public function testItemsAreSortedByPriority()
         Routes::addRoute(new Route(new MarkdownPage('bar', ['navigation.priority' => 2])));
         Routes::addRoute(new Route(new MarkdownPage('baz', ['navigation.priority' => 3])));
 
-        $this->assertSame(['Home', 'Foo', 'Bar', 'Baz'], MainNavigationMenu::create()->items->pluck('label')->toArray());
+        $this->assertSame(['Home', 'Foo', 'Bar', 'Baz'], MainNavigationMenu::create()->getItems()->pluck('label')->toArray());
     }
 
     public function testItemsWithHiddenPropertySetToTrueAreNotAdded()
@@ -53,7 +53,7 @@ public function testItemsWithHiddenPropertySetToTrueAreNotAdded()
         Routes::addRoute(new Route(new MarkdownPage('foo', ['navigation.hidden' => true])));
         Routes::addRoute(new Route(new MarkdownPage('bar', ['navigation.hidden' => false])));
 
-        $this->assertSame(['Home', 'Bar'], MainNavigationMenu::create()->items->pluck('label')->toArray());
+        $this->assertSame(['Home', 'Bar'], MainNavigationMenu::create()->getItems()->pluck('label')->toArray());
     }
 
     public function testCreatedCollectionIsSortedByNavigationMenuPriority()
@@ -69,8 +69,8 @@ public function testCreatedCollectionIsSortedByNavigationMenuPriority()
             NavItem::fromRoute(Routes::get('docs/index')),
         ]);
 
-        $this->assertCount(count($expected), $menu->items);
-        $this->assertEquals($expected, $menu->items);
+        $this->assertCount(count($expected), $menu->getItems());
+        $this->assertEquals($expected, $menu->getItems());
     }
 
     public function testIsSortedAutomaticallyWhenUsingNavigationMenuCreate()
@@ -84,13 +84,13 @@ public function testIsSortedAutomaticallyWhenUsingNavigationMenuCreate()
             NavItem::fromRoute(Routes::get('foo')),
         ]);
 
-        $this->assertCount(count($expected), $menu->items);
-        $this->assertEquals($expected, $menu->items);
+        $this->assertCount(count($expected), $menu->getItems());
+        $this->assertEquals($expected, $menu->getItems());
     }
 
     public function testCollectionOnlyContainsNavItems()
     {
-        $this->assertContainsOnlyInstancesOf(NavItem::class, MainNavigationMenu::create()->items);
+        $this->assertContainsOnlyInstancesOf(NavItem::class, MainNavigationMenu::create()->getItems());
     }
 
     public function testExternalLinkCanBeAddedInConfig()
@@ -104,8 +104,8 @@ public function testExternalLinkCanBeAddedInConfig()
             NavItem::forLink('https://example.com', 'foo'),
         ]);
 
-        $this->assertCount(count($expected), $menu->items);
-        $this->assertEquals($expected, $menu->items);
+        $this->assertCount(count($expected), $menu->getItems());
+        $this->assertEquals($expected, $menu->getItems());
     }
 
     public function testPathLinkCanBeAddedInConfig()
@@ -119,8 +119,8 @@ public function testPathLinkCanBeAddedInConfig()
             NavItem::forLink('foo', 'foo'),
         ]);
 
-        $this->assertCount(count($expected), $menu->items);
-        $this->assertEquals($expected, $menu->items);
+        $this->assertCount(count($expected), $menu->getItems());
+        $this->assertEquals($expected, $menu->getItems());
     }
 
     public function testDuplicatesAreRemovedWhenAddingInConfig()
@@ -137,8 +137,8 @@ public function testDuplicatesAreRemovedWhenAddingInConfig()
             NavItem::forLink('foo', 'foo'),
         ]);
 
-        $this->assertCount(count($expected), $menu->items);
-        $this->assertEquals($expected, $menu->items);
+        $this->assertCount(count($expected), $menu->getItems());
+        $this->assertEquals($expected, $menu->getItems());
     }
 
     public function testDuplicatesAreRemovedWhenAddingInConfigRegardlessOfDestination()
@@ -155,8 +155,8 @@ public function testDuplicatesAreRemovedWhenAddingInConfigRegardlessOfDestinatio
             NavItem::forLink('foo', 'foo'),
         ]);
 
-        $this->assertCount(count($expected), $menu->items);
-        $this->assertEquals($expected, $menu->items);
+        $this->assertCount(count($expected), $menu->getItems());
+        $this->assertEquals($expected, $menu->getItems());
     }
 
     public function testConfigItemsTakePrecedenceOverGeneratedItems()
@@ -172,8 +172,8 @@ public function testConfigItemsTakePrecedenceOverGeneratedItems()
             NavItem::forLink('bar', 'Foo'),
         ]);
 
-        $this->assertCount(count($expected), $menu->items);
-        $this->assertEquals($expected, $menu->items);
+        $this->assertCount(count($expected), $menu->getItems());
+        $this->assertEquals($expected, $menu->getItems());
     }
 
     public function testDocumentationPagesThatAreNotIndexAreNotAddedToTheMenu()
@@ -188,8 +188,8 @@ public function testDocumentationPagesThatAreNotIndexAreNotAddedToTheMenu()
             NavItem::fromRoute(Routes::get('docs/index')),
         ]);
 
-        $this->assertCount(count($expected), $menu->items);
-        $this->assertEquals($expected, $menu->items);
+        $this->assertCount(count($expected), $menu->getItems());
+        $this->assertEquals($expected, $menu->getItems());
     }
 
     public function testPagesInSubdirectoriesAreNotAddedToTheNavigationMenu()
@@ -200,8 +200,8 @@ public function testPagesInSubdirectoriesAreNotAddedToTheNavigationMenu()
         $menu = MainNavigationMenu::create();
         $expected = collect([NavItem::fromRoute(Routes::get('index'))]);
 
-        $this->assertCount(count($expected), $menu->items);
-        $this->assertEquals($expected, $menu->items);
+        $this->assertCount(count($expected), $menu->getItems());
+        $this->assertEquals($expected, $menu->getItems());
     }
 
     public function testPagesInSubdirectoriesCanBeAddedToTheNavigationMenuWithConfigFlatSetting()
@@ -216,8 +216,8 @@ public function testPagesInSubdirectoriesCanBeAddedToTheNavigationMenuWithConfig
             NavItem::fromRoute(Routes::get('foo/bar')),
         ]);
 
-        $this->assertCount(count($expected), $menu->items);
-        $this->assertEquals($expected, $menu->items);
+        $this->assertCount(count($expected), $menu->getItems());
+        $this->assertEquals($expected, $menu->getItems());
     }
 
     public function testPagesInSubdirectoriesAreNotAddedToTheNavigationMenuWithConfigDropdownSetting()
@@ -234,8 +234,8 @@ public function testPagesInSubdirectoriesAreNotAddedToTheNavigationMenuWithConfi
             ]),
         ]);
 
-        $this->assertCount(count($expected), $menu->items);
-        $this->assertEquals($expected, $menu->items);
+        $this->assertCount(count($expected), $menu->getItems());
+        $this->assertEquals($expected, $menu->getItems());
     }
 
     public function testHasDropdownsReturnsFalseWhenThereAreNoDropdowns()
@@ -362,14 +362,14 @@ public function testPagesInDropdownsDoNotGetAddedToTheMainNavigation()
         Routes::push((new MarkdownPage('bar/baz'))->getRoute());
         $menu = MainNavigationMenu::create();
 
-        $this->assertCount(3, $menu->items);
+        $this->assertCount(3, $menu->getItems());
         $this->assertEquals([
             NavItem::fromRoute(Routes::get('index')),
             NavItem::fromRoute((new MarkdownPage('foo'))->getRoute()),
             DropdownNavItem::fromArray('bar', [
                 NavItem::fromRoute((new MarkdownPage('bar/baz'))->getRoute()),
             ]),
-        ], $menu->items->all());
+        ], $menu->getItems()->all());
     }
 
     public function testDropdownMenuItemsAreSortedByPriority()
diff --git a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
index 54290a8e34d..e27a832ab3b 100644
--- a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
+++ b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
@@ -51,7 +51,7 @@ public function testSidebarItemsAreAddedAutomatically()
 
         $sidebar = DocumentationSidebar::create();
 
-        $this->assertCount(5, $sidebar->items);
+        $this->assertCount(5, $sidebar->getItems());
     }
 
     public function testIndexPageIsRemovedFromSidebar()
@@ -60,7 +60,7 @@ public function testIndexPageIsRemovedFromSidebar()
         Filesystem::touch('_docs/index.md');
 
         $sidebar = DocumentationSidebar::create();
-        $this->assertCount(5, $sidebar->items);
+        $this->assertCount(5, $sidebar->getItems());
     }
 
     public function testFilesWithFrontMatterHiddenSetToTrueAreRemovedFromSidebar()
@@ -69,7 +69,7 @@ public function testFilesWithFrontMatterHiddenSetToTrueAreRemovedFromSidebar()
         File::put(Hyde::path('_docs/test.md'), "---\nnavigation:\n    hidden: true\n---\n\n# Foo");
 
         $sidebar = DocumentationSidebar::create();
-        $this->assertCount(5, $sidebar->items);
+        $this->assertCount(5, $sidebar->getItems());
     }
 
     public function testSidebarIsOrderedAlphabeticallyWhenNoOrderIsSetInConfig()
@@ -85,7 +85,7 @@ public function testSidebarIsOrderedAlphabeticallyWhenNoOrderIsSetInConfig()
                 NavItem::fromRoute(Routes::get('docs/b'), priority: 999),
                 NavItem::fromRoute(Routes::get('docs/c'), priority: 999),
             ]),
-            DocumentationSidebar::create()->items
+            DocumentationSidebar::create()->getItems()
         );
     }
 
@@ -106,7 +106,7 @@ public function testSidebarIsOrderedByPriorityWhenPriorityIsSetInConfig()
                 NavItem::fromRoute(Routes::get('docs/b'), priority: 250 + 251),
                 NavItem::fromRoute(Routes::get('docs/a'), priority: 250 + 252),
             ]),
-            DocumentationSidebar::create()->items
+            DocumentationSidebar::create()->getItems()
         );
     }
 
@@ -114,7 +114,7 @@ public function testSidebarItemPriorityCanBeSetInFrontMatter()
     {
         $this->makePage('foo', ['navigation.priority' => 25]);
 
-        $this->assertEquals(25, DocumentationSidebar::create()->items->first()->priority);
+        $this->assertEquals(25, DocumentationSidebar::create()->getItems()->first()->priority);
     }
 
     public function testSidebarItemPrioritySetInConfigOverridesFrontMatter()
@@ -123,7 +123,7 @@ public function testSidebarItemPrioritySetInConfigOverridesFrontMatter()
 
         Config::set('docs.sidebar_order', ['foo']);
 
-        $this->assertEquals(25, DocumentationSidebar::create()->items->first()->priority);
+        $this->assertEquals(25, DocumentationSidebar::create()->getItems()->first()->priority);
     }
 
     public function testSidebarPrioritiesCanBeSetInBothFrontMatterAndConfig()
@@ -145,7 +145,7 @@ public function testSidebarPrioritiesCanBeSetInBothFrontMatterAndConfig()
                 NavItem::fromRoute(Routes::get('docs/second'), priority: 250 + 252),
                 NavItem::fromRoute(Routes::get('docs/third'), priority: 250 + 300),
             ]),
-            DocumentationSidebar::create()->items
+            DocumentationSidebar::create()->getItems()
         );
     }
 
@@ -153,7 +153,7 @@ public function testGroupCanBeSetInFrontMatter()
     {
         $this->makePage('foo', ['navigation.group' => 'bar']);
 
-        $this->assertEquals('bar', DocumentationSidebar::create()->items->first()->getGroup());
+        $this->assertEquals('bar', DocumentationSidebar::create()->getItems()->first()->getGroup());
     }
 
     public function testHasGroupsReturnsFalseWhenThereAreNoGroups()
@@ -276,7 +276,7 @@ public function testGetItemsInGroupDoesNotIncludeDocsIndex()
 
         $this->assertEquals(
             collect([NavItem::fromRoute(Routes::get('docs/foo'), priority: 999)]),
-            DocumentationSidebar::create()->items
+            DocumentationSidebar::create()->getItems()
         );
     }
 
@@ -361,14 +361,14 @@ public function testCanHaveMultipleGroupedPagesWithTheSameNameLabels()
         $this->makePage('bar', ['navigation.group' => 'bar', 'navigation.label' => 'Foo']);
 
         $sidebar = DocumentationSidebar::create();
-        $this->assertCount(2, $sidebar->items);
+        $this->assertCount(2, $sidebar->getItems());
 
         $this->assertEquals(
             collect([
                 NavItem::fromRoute(Routes::get('docs/bar'), priority: 999),
                 NavItem::fromRoute(Routes::get('docs/foo'), priority: 999),
             ]),
-            $sidebar->items
+            $sidebar->getItems()
         );
     }
 
@@ -378,11 +378,11 @@ public function testDuplicateLabelsWithinTheSameGroupIsRemoved()
         $this->makePage('bar', ['navigation.group' => 'foo', 'navigation.label' => 'Foo']);
 
         $sidebar = DocumentationSidebar::create();
-        $this->assertCount(1, $sidebar->items);
+        $this->assertCount(1, $sidebar->getItems());
 
         $this->assertEquals(
             collect([NavItem::fromRoute(Routes::get('docs/bar'), priority: 999)]),
-            $sidebar->items
+            $sidebar->getItems()
         );
     }
 
@@ -399,10 +399,10 @@ public function testIndexPageAddedToSidebarWhenItIsTheOnlyPage()
         Filesystem::touch('_docs/index.md');
         $sidebar = DocumentationSidebar::create();
 
-        $this->assertCount(1, $sidebar->items);
+        $this->assertCount(1, $sidebar->getItems());
         $this->assertEquals(
             collect([NavItem::fromRoute(Routes::get('docs/index'))]),
-            $sidebar->items
+            $sidebar->getItems()
         );
     }
 
@@ -412,10 +412,10 @@ public function testIndexPageNotAddedToSidebarWhenOtherPagesExist()
         Filesystem::touch('_docs/index.md');
         $sidebar = DocumentationSidebar::create();
 
-        $this->assertCount(1, $sidebar->items);
+        $this->assertCount(1, $sidebar->getItems());
         $this->assertEquals(
             collect([NavItem::fromRoute(Routes::get('docs/test-0'))]),
-            $sidebar->items
+            $sidebar->getItems()
         );
     }
 

From f60ababd60d29016b83a336d5b39445aa3ec889c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 15:10:11 +0100
Subject: [PATCH 0086/1422] Return the values to match annotation generics

---
 .../src/Framework/Features/Navigation/BaseNavigationMenu.php    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/BaseNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/BaseNavigationMenu.php
index 9761a13a465..c2ea70c25ff 100644
--- a/packages/framework/src/Framework/Features/Navigation/BaseNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/BaseNavigationMenu.php
@@ -68,6 +68,6 @@ protected function sortByPriority(): void
     /** @return \Illuminate\Support\Collection<\Hyde\Framework\Features\Navigation\NavItem> */
     public function getItems(): Collection
     {
-        return $this->items;
+        return $this->items->values();
     }
 }

From 9c193771fb2fa6a2a9eaac7564f9ec0754baa772 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 15:15:58 +0100
Subject: [PATCH 0087/1422] Extract testing helper method

---
 .../tests/Feature/NavigationMenuTest.php      | 63 ++++++++++---------
 1 file changed, 34 insertions(+), 29 deletions(-)

diff --git a/packages/framework/tests/Feature/NavigationMenuTest.php b/packages/framework/tests/Feature/NavigationMenuTest.php
index 5bc2caf372d..dfb5e89f147 100644
--- a/packages/framework/tests/Feature/NavigationMenuTest.php
+++ b/packages/framework/tests/Feature/NavigationMenuTest.php
@@ -26,17 +26,17 @@ class NavigationMenuTest extends TestCase
 {
     public function testConstructor()
     {
-        $this->assertInstanceOf(MainNavigationMenu::class, MainNavigationMenu::create());
+        $this->assertInstanceOf(MainNavigationMenu::class, $this->createMainNavigationMenu());
     }
 
     public function testGenerateMethodCreatesCollectionOfNavItems()
     {
-        $this->assertInstanceOf(Collection::class, MainNavigationMenu::create()->getItems());
+        $this->assertInstanceOf(Collection::class, $this->createMainNavigationMenu()->getItems());
     }
 
     public function testGetItemsReturnsItems()
     {
-        $this->assertEquals(MainNavigationMenu::create()->getItems(), MainNavigationMenu::create()->getItems());
+        $this->assertEquals($this->createMainNavigationMenu()->getItems(), $this->createMainNavigationMenu()->getItems());
     }
 
     public function testItemsAreSortedByPriority()
@@ -45,7 +45,7 @@ public function testItemsAreSortedByPriority()
         Routes::addRoute(new Route(new MarkdownPage('bar', ['navigation.priority' => 2])));
         Routes::addRoute(new Route(new MarkdownPage('baz', ['navigation.priority' => 3])));
 
-        $this->assertSame(['Home', 'Foo', 'Bar', 'Baz'], MainNavigationMenu::create()->getItems()->pluck('label')->toArray());
+        $this->assertSame(['Home', 'Foo', 'Bar', 'Baz'], $this->createMainNavigationMenu()->getItems()->pluck('label')->toArray());
     }
 
     public function testItemsWithHiddenPropertySetToTrueAreNotAdded()
@@ -53,7 +53,7 @@ public function testItemsWithHiddenPropertySetToTrueAreNotAdded()
         Routes::addRoute(new Route(new MarkdownPage('foo', ['navigation.hidden' => true])));
         Routes::addRoute(new Route(new MarkdownPage('bar', ['navigation.hidden' => false])));
 
-        $this->assertSame(['Home', 'Bar'], MainNavigationMenu::create()->getItems()->pluck('label')->toArray());
+        $this->assertSame(['Home', 'Bar'], $this->createMainNavigationMenu()->getItems()->pluck('label')->toArray());
     }
 
     public function testCreatedCollectionIsSortedByNavigationMenuPriority()
@@ -61,7 +61,7 @@ public function testCreatedCollectionIsSortedByNavigationMenuPriority()
         $this->file('_pages/foo.md');
         $this->file('_docs/index.md');
 
-        $menu = MainNavigationMenu::create();
+        $menu = $this->createMainNavigationMenu();
 
         $expected = collect([
             NavItem::fromRoute(Routes::get('index')),
@@ -77,7 +77,7 @@ public function testIsSortedAutomaticallyWhenUsingNavigationMenuCreate()
     {
         $this->file('_pages/foo.md');
 
-        $menu = MainNavigationMenu::create();
+        $menu = $this->createMainNavigationMenu();
 
         $expected = collect([
             NavItem::fromRoute(Routes::get('index')),
@@ -90,14 +90,14 @@ public function testIsSortedAutomaticallyWhenUsingNavigationMenuCreate()
 
     public function testCollectionOnlyContainsNavItems()
     {
-        $this->assertContainsOnlyInstancesOf(NavItem::class, MainNavigationMenu::create()->getItems());
+        $this->assertContainsOnlyInstancesOf(NavItem::class, $this->createMainNavigationMenu()->getItems());
     }
 
     public function testExternalLinkCanBeAddedInConfig()
     {
         config(['hyde.navigation.custom' => [NavItem::forLink('https://example.com', 'foo')]]);
 
-        $menu = MainNavigationMenu::create();
+        $menu = $this->createMainNavigationMenu();
 
         $expected = collect([
             NavItem::fromRoute(Routes::get('index')),
@@ -112,7 +112,7 @@ public function testPathLinkCanBeAddedInConfig()
     {
         config(['hyde.navigation.custom' => [NavItem::forLink('foo', 'foo')]]);
 
-        $menu = MainNavigationMenu::create();
+        $menu = $this->createMainNavigationMenu();
 
         $expected = collect([
             NavItem::fromRoute(Routes::get('index')),
@@ -130,7 +130,7 @@ public function testDuplicatesAreRemovedWhenAddingInConfig()
             NavItem::forLink('foo', 'foo'),
         ]]);
 
-        $menu = MainNavigationMenu::create();
+        $menu = $this->createMainNavigationMenu();
 
         $expected = collect([
             NavItem::fromRoute(Routes::get('index')),
@@ -148,7 +148,7 @@ public function testDuplicatesAreRemovedWhenAddingInConfigRegardlessOfDestinatio
             NavItem::forLink('bar', 'foo'),
         ]]);
 
-        $menu = MainNavigationMenu::create();
+        $menu = $this->createMainNavigationMenu();
 
         $expected = collect([
             NavItem::fromRoute(Routes::get('index')),
@@ -165,7 +165,7 @@ public function testConfigItemsTakePrecedenceOverGeneratedItems()
 
         config(['hyde.navigation.custom' => [NavItem::forLink('bar', 'Foo')]]);
 
-        $menu = MainNavigationMenu::create();
+        $menu = $this->createMainNavigationMenu();
 
         $expected = collect([
             NavItem::fromRoute(Routes::get('index')),
@@ -181,7 +181,7 @@ public function testDocumentationPagesThatAreNotIndexAreNotAddedToTheMenu()
         $this->file('_docs/foo.md');
         $this->file('_docs/index.md');
 
-        $menu = MainNavigationMenu::create();
+        $menu = $this->createMainNavigationMenu();
 
         $expected = collect([
             NavItem::fromRoute(Routes::get('index')),
@@ -197,7 +197,7 @@ public function testPagesInSubdirectoriesAreNotAddedToTheNavigationMenu()
         $this->directory('_pages/foo');
         $this->file('_pages/foo/bar.md');
 
-        $menu = MainNavigationMenu::create();
+        $menu = $this->createMainNavigationMenu();
         $expected = collect([NavItem::fromRoute(Routes::get('index'))]);
 
         $this->assertCount(count($expected), $menu->getItems());
@@ -210,7 +210,7 @@ public function testPagesInSubdirectoriesCanBeAddedToTheNavigationMenuWithConfig
         $this->directory('_pages/foo');
         $this->file('_pages/foo/bar.md');
 
-        $menu = MainNavigationMenu::create();
+        $menu = $this->createMainNavigationMenu();
         $expected = collect([
             NavItem::fromRoute(Routes::get('index')),
             NavItem::fromRoute(Routes::get('foo/bar')),
@@ -226,7 +226,7 @@ public function testPagesInSubdirectoriesAreNotAddedToTheNavigationMenuWithConfi
         $this->directory('_pages/foo');
         $this->file('_pages/foo/bar.md');
 
-        $menu = MainNavigationMenu::create();
+        $menu = $this->createMainNavigationMenu();
         $expected = collect([
             NavItem::fromRoute(Routes::get('index')),
             DropdownNavItem::fromArray('foo', [
@@ -241,7 +241,7 @@ public function testPagesInSubdirectoriesAreNotAddedToTheNavigationMenuWithConfi
     public function testHasDropdownsReturnsFalseWhenThereAreNoDropdowns()
     {
         config(['hyde.navigation.subdirectories' => 'dropdown']);
-        $menu = MainNavigationMenu::create();
+        $menu = $this->createMainNavigationMenu();
         $this->assertFalse($menu->hasDropdowns());
     }
 
@@ -249,20 +249,20 @@ public function testHasDropdownsReturnsTrueWhenThereAreDropdowns()
     {
         config(['hyde.navigation.subdirectories' => 'dropdown']);
         Routes::addRoute((new MarkdownPage('foo/bar'))->getRoute());
-        $menu = MainNavigationMenu::create();
+        $menu = $this->createMainNavigationMenu();
         $this->assertTrue($menu->hasDropdowns());
     }
 
     public function testHasDropdownsAlwaysReturnsFalseWhenDropdownsAreDisabled()
     {
         Routes::addRoute((new MarkdownPage('foo/bar'))->getRoute());
-        $this->assertFalse(MainNavigationMenu::create()->hasDropdowns());
+        $this->assertFalse($this->createMainNavigationMenu()->hasDropdowns());
     }
 
     public function testGetDropdownsReturnsEmptyArrayThereAreNoDropdowns()
     {
         config(['hyde.navigation.subdirectories' => 'dropdown']);
-        $menu = MainNavigationMenu::create();
+        $menu = $this->createMainNavigationMenu();
         $this->assertCount(0, $menu->getDropdowns());
         $this->assertSame([], $menu->getDropdowns());
     }
@@ -271,7 +271,7 @@ public function testGetDropdownsReturnsCorrectArrayWhenThereAreDropdowns()
     {
         config(['hyde.navigation.subdirectories' => 'dropdown']);
         Routes::addRoute((new MarkdownPage('foo/bar'))->getRoute());
-        $menu = MainNavigationMenu::create();
+        $menu = $this->createMainNavigationMenu();
         $this->assertCount(1, $menu->getDropdowns());
 
         $this->assertEquals([
@@ -286,7 +286,7 @@ public function testGetDropdownsWithMultipleItems()
 
         Routes::addRoute((new MarkdownPage('foo/bar'))->getRoute());
         Routes::addRoute((new MarkdownPage('foo/baz'))->getRoute());
-        $menu = MainNavigationMenu::create();
+        $menu = $this->createMainNavigationMenu();
 
         $this->assertCount(1, $menu->getDropdowns());
 
@@ -306,7 +306,7 @@ public function testGetDropdownsWithMultipleDropdowns()
         Routes::addRoute((new MarkdownPage('foo/baz'))->getRoute());
         Routes::addRoute((new MarkdownPage('cat/hat'))->getRoute());
 
-        $menu = MainNavigationMenu::create();
+        $menu = $this->createMainNavigationMenu();
 
         $this->assertCount(2, $menu->getDropdowns());
 
@@ -326,7 +326,7 @@ public function testGetDropdownsThrowsExceptionWhenDisabled()
         $this->expectException(BadMethodCallException::class);
         $this->expectExceptionMessage('Dropdowns are not enabled. Enable it by setting `hyde.navigation.subdirectories` to `dropdown`.');
 
-        $menu = MainNavigationMenu::create();
+        $menu = $this->createMainNavigationMenu();
         $menu->getDropdowns();
     }
 
@@ -336,7 +336,7 @@ public function testDocumentationPagesDoNotGetAddedToDropdowns()
 
         Routes::addRoute((new DocumentationPage('foo'))->getRoute());
         Routes::addRoute((new DocumentationPage('bar/baz'))->getRoute());
-        $menu = MainNavigationMenu::create();
+        $menu = $this->createMainNavigationMenu();
 
         $this->assertFalse($menu->hasDropdowns());
         $this->assertCount(0, $menu->getDropdowns());
@@ -349,7 +349,7 @@ public function testBlogPostsDoNotGetAddedToDropdowns()
         Routes::addRoute((new MarkdownPost('foo'))->getRoute());
         Routes::addRoute((new MarkdownPost('bar/baz'))->getRoute());
 
-        $menu = MainNavigationMenu::create();
+        $menu = $this->createMainNavigationMenu();
         $this->assertFalse($menu->hasDropdowns());
         $this->assertCount(0, $menu->getDropdowns());
     }
@@ -360,7 +360,7 @@ public function testPagesInDropdownsDoNotGetAddedToTheMainNavigation()
 
         Routes::push((new MarkdownPage('foo'))->getRoute());
         Routes::push((new MarkdownPage('bar/baz'))->getRoute());
-        $menu = MainNavigationMenu::create();
+        $menu = $this->createMainNavigationMenu();
 
         $this->assertCount(3, $menu->getItems());
         $this->assertEquals([
@@ -380,9 +380,14 @@ public function testDropdownMenuItemsAreSortedByPriority()
         Routes::addRoute(new Route(new MarkdownPage('foo/bar', ['navigation.priority' => 2])));
         Routes::addRoute(new Route(new MarkdownPage('foo/baz', ['navigation.priority' => 3])));
 
-        $menu = MainNavigationMenu::create();
+        $menu = $this->createMainNavigationMenu();
         $dropdowns = $menu->getDropdowns();
 
         $this->assertSame(['Foo', 'Bar', 'Baz'], $dropdowns[0]->getItems()->pluck('label')->toArray());
     }
+
+    protected function createMainNavigationMenu(): MainNavigationMenu
+    {
+        return MainNavigationMenu::create();
+    }
 }

From cf3869fe45d250417e77a73f872464570eede7be Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 15:19:28 +0100
Subject: [PATCH 0088/1422] Refactor to make the base navigation menu
 constructor public

Starting to normalize the API so we can merge the classes
---
 .../src/Framework/Features/Navigation/BaseNavigationMenu.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/BaseNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/BaseNavigationMenu.php
index c2ea70c25ff..2f16ac49b46 100644
--- a/packages/framework/src/Framework/Features/Navigation/BaseNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/BaseNavigationMenu.php
@@ -8,6 +8,7 @@
 use Hyde\Support\Models\Route;
 use Hyde\Foundation\Facades\Routes;
 use Illuminate\Support\Collection;
+use Illuminate\Contracts\Support\Arrayable;
 
 use function collect;
 
@@ -17,9 +18,9 @@ abstract class BaseNavigationMenu
     /** @var \Illuminate\Support\Collection<string, \Hyde\Framework\Features\Navigation\NavItem> */
     protected Collection $items;
 
-    final protected function __construct()
+    public function __construct(Arrayable|array $items = [])
     {
-        $this->items = new Collection();
+        $this->items = new Collection($items);
     }
 
     public static function create(): static

From a673b411b7ec3292916235a24a211354d8588fc0 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 15:23:06 +0100
Subject: [PATCH 0089/1422] Simplify static constructor

---
 .../src/Framework/Features/Navigation/MainNavigationMenu.php | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/MainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/MainNavigationMenu.php
index c0f51cc4b3b..da092f24a26 100644
--- a/packages/framework/src/Framework/Features/Navigation/MainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/MainNavigationMenu.php
@@ -13,10 +13,7 @@ class MainNavigationMenu extends BaseNavigationMenu
     /** @deprecated Temporary method for refactor */
     public static function create(): static
     {
-        $menu = new static();
-        $menu->items = GeneratesMainNavigationMenu::handle()->getItems();
-
-        return $menu;
+        return new static(GeneratesMainNavigationMenu::handle()->getItems());
     }
 
     public function hasDropdowns(): bool

From 2b94061ab95248f7d095967c8dec52b830eb02d0 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 15:26:14 +0100
Subject: [PATCH 0090/1422] Move parent logic now only used by sidebar to that
 class

---
 .../Navigation/BaseNavigationMenu.php         | 37 -------------------
 .../Navigation/DocumentationSidebar.php       | 34 ++++++++++++++++-
 2 files changed, 33 insertions(+), 38 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/BaseNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/BaseNavigationMenu.php
index 2f16ac49b46..e95c6e715a0 100644
--- a/packages/framework/src/Framework/Features/Navigation/BaseNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/BaseNavigationMenu.php
@@ -4,14 +4,9 @@
 
 namespace Hyde\Framework\Features\Navigation;
 
-use Hyde\Facades\Config;
-use Hyde\Support\Models\Route;
-use Hyde\Foundation\Facades\Routes;
 use Illuminate\Support\Collection;
 use Illuminate\Contracts\Support\Arrayable;
 
-use function collect;
-
 /** @deprecated Use the new NavigationMenu class instead */
 abstract class BaseNavigationMenu
 {
@@ -34,38 +29,6 @@ public static function create(): static
         return $menu;
     }
 
-    protected function generate(): void
-    {
-        Routes::each(function (Route $route): void {
-            if ($this->canAddRoute($route)) {
-                $this->items->put($route->getRouteKey(), NavItem::fromRoute($route));
-            }
-        });
-
-        collect(Config::getArray('hyde.navigation.custom', []))->each(function (NavItem $item): void {
-            // Since these were added explicitly by the user, we can assume they should always be shown
-            $this->items->push($item);
-        });
-    }
-
-    protected function canAddRoute(Route $route): bool
-    {
-        return $route->getPage()->showInNavigation();
-    }
-
-    protected function removeDuplicateItems(): void
-    {
-        $this->items = $this->items->unique(function (NavItem $item): string {
-            // Filter using a combination of the group and label to allow duplicate labels in different groups
-            return $item->getGroup().$item->label;
-        });
-    }
-
-    protected function sortByPriority(): void
-    {
-        $this->items = $this->items->sortBy('priority')->values();
-    }
-
     /** @return \Illuminate\Support\Collection<\Hyde\Framework\Features\Navigation\NavItem> */
     public function getItems(): Collection
     {
diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index ccfaacafbf9..5b316f08362 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -66,7 +66,39 @@ public function makeGroupTitle(string $group): string
 
     protected function canAddRoute(Route $route): bool
     {
-        return parent::canAddRoute($route) && ! $route->is(DocumentationPage::homeRouteName());
+        return $this->parent__canAddRoute($route) && ! $route->is(DocumentationPage::homeRouteName());
+    }
+
+    protected function parent__generate(): void
+    {
+        Routes::each(function (Route $route): void {
+            if ($this->canAddRoute($route)) {
+                $this->items->put($route->getRouteKey(), NavItem::fromRoute($route));
+            }
+        });
+
+        collect(Config::getArray('hyde.navigation.custom', []))->each(function (NavItem $item): void {
+            // Since these were added explicitly by the user, we can assume they should always be shown
+            $this->items->push($item);
+        });
+    }
+
+    protected function parent__canAddRoute(Route $route): bool
+    {
+        return $route->getPage()->showInNavigation();
+    }
+
+    protected function removeDuplicateItems(): void
+    {
+        $this->items = $this->items->unique(function (NavItem $item): string {
+            // Filter using a combination of the group and label to allow duplicate labels in different groups
+            return $item->getGroup().$item->label;
+        });
+    }
+
+    protected function sortByPriority(): void
+    {
+        $this->items = $this->items->sortBy('priority')->values();
     }
 
     private function isPageIndexPage(): bool

From 4afa8126367b4377acefaa103ed4b819ce9858dc Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 15:36:57 +0100
Subject: [PATCH 0091/1422] Move static create method to sidebar class

---
 .../Features/Navigation/BaseNavigationMenu.php        | 11 -----------
 .../Features/Navigation/DocumentationSidebar.php      | 11 +++++++++++
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/BaseNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/BaseNavigationMenu.php
index e95c6e715a0..950eb034e31 100644
--- a/packages/framework/src/Framework/Features/Navigation/BaseNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/BaseNavigationMenu.php
@@ -18,17 +18,6 @@ public function __construct(Arrayable|array $items = [])
         $this->items = new Collection($items);
     }
 
-    public static function create(): static
-    {
-        $menu = new static();
-
-        $menu->generate();
-        $menu->sortByPriority();
-        $menu->removeDuplicateItems();
-
-        return $menu;
-    }
-
     /** @return \Illuminate\Support\Collection<\Hyde\Framework\Features\Navigation\NavItem> */
     public function getItems(): Collection
     {
diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 5b316f08362..ce7c9f4238d 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -18,6 +18,17 @@
 /** @deprecated Use the new NavigationMenu class instead */
 class DocumentationSidebar extends BaseNavigationMenu
 {
+    public static function create(): static
+    {
+        $menu = new static();
+
+        $menu->generate();
+        $menu->sortByPriority();
+        $menu->removeDuplicateItems();
+
+        return $menu;
+    }
+
     protected function generate(): void
     {
         Routes::getRoutes(DocumentationPage::class)->each(function (Route $route): void {

From fd9dfdbee0a94928961c952c91c036f2948d7774 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 15:37:34 +0100
Subject: [PATCH 0092/1422] Remove unused temporary parent function copy

---
 .../Features/Navigation/DocumentationSidebar.php   | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index ce7c9f4238d..8f6cbe803c7 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -80,20 +80,6 @@ protected function canAddRoute(Route $route): bool
         return $this->parent__canAddRoute($route) && ! $route->is(DocumentationPage::homeRouteName());
     }
 
-    protected function parent__generate(): void
-    {
-        Routes::each(function (Route $route): void {
-            if ($this->canAddRoute($route)) {
-                $this->items->put($route->getRouteKey(), NavItem::fromRoute($route));
-            }
-        });
-
-        collect(Config::getArray('hyde.navigation.custom', []))->each(function (NavItem $item): void {
-            // Since these were added explicitly by the user, we can assume they should always be shown
-            $this->items->push($item);
-        });
-    }
-
     protected function parent__canAddRoute(Route $route): bool
     {
         return $route->getPage()->showInNavigation();

From 209aa9b6d4c4f507b62d4e0c523bd7ce42f4b242 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 15:37:47 +0100
Subject: [PATCH 0093/1422] Inline parent method copy

---
 .../Framework/Features/Navigation/DocumentationSidebar.php | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 8f6cbe803c7..c782e8cf16e 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -77,12 +77,7 @@ public function makeGroupTitle(string $group): string
 
     protected function canAddRoute(Route $route): bool
     {
-        return $this->parent__canAddRoute($route) && ! $route->is(DocumentationPage::homeRouteName());
-    }
-
-    protected function parent__canAddRoute(Route $route): bool
-    {
-        return $route->getPage()->showInNavigation();
+        return $route->getPage()->showInNavigation() && ! $route->is(DocumentationPage::homeRouteName());
     }
 
     protected function removeDuplicateItems(): void

From 5f12a8692506bfa2821c68b9e1b9e90078ed56a9 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 15:42:47 +0100
Subject: [PATCH 0094/1422] Deprecate create method

---
 .../src/Framework/Features/Navigation/DocumentationSidebar.php   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index c782e8cf16e..13f3d340817 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -18,6 +18,7 @@
 /** @deprecated Use the new NavigationMenu class instead */
 class DocumentationSidebar extends BaseNavigationMenu
 {
+    /** @deprecated Will be moved to an action */
     public static function create(): static
     {
         $menu = new static();

From a3ae79254e7eb613cfea7256f501fc06d1f7d7c0 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 15:43:15 +0100
Subject: [PATCH 0095/1422] Add todo

---
 .../Features/Navigation/GeneratesMainNavigationMenu.php         | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index 8eb8bf2b3d6..6ad2aba5717 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -14,6 +14,8 @@
 
 /**
  * @experimental This class may change significantly before its release.
+ *
+ * @todo Consider making into a service which can create the sidebar as well.
  */
 class GeneratesMainNavigationMenu
 {

From 54338f03be64ac2488bbb4ee3afc8d31afe5c303 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 15:49:58 +0100
Subject: [PATCH 0096/1422] Add testing helper for the new menu to aid in
 refactor

---
 packages/framework/tests/Feature/NavigationMenuTest.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/packages/framework/tests/Feature/NavigationMenuTest.php b/packages/framework/tests/Feature/NavigationMenuTest.php
index dfb5e89f147..1956ef3b391 100644
--- a/packages/framework/tests/Feature/NavigationMenuTest.php
+++ b/packages/framework/tests/Feature/NavigationMenuTest.php
@@ -7,6 +7,7 @@
 use BadMethodCallException;
 use Hyde\Support\Models\Route;
 use Hyde\Foundation\Facades\Routes;
+use Hyde\Framework\Features\Navigation\NavigationMenu;
 use Hyde\Framework\Features\Navigation\DropdownNavItem;
 use Hyde\Framework\Features\Navigation\MainNavigationMenu;
 use Hyde\Framework\Features\Navigation\NavItem;
@@ -15,6 +16,7 @@
 use Hyde\Pages\MarkdownPost;
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Collection;
+use Hyde\Framework\Features\Navigation\GeneratesMainNavigationMenu;
 
 /**
  * @covers \Hyde\Framework\Features\Navigation\GeneratesMainNavigationMenu
@@ -386,6 +388,12 @@ public function testDropdownMenuItemsAreSortedByPriority()
         $this->assertSame(['Foo', 'Bar', 'Baz'], $dropdowns[0]->getItems()->pluck('label')->toArray());
     }
 
+    protected function createNewMainNavigationMenu(): NavigationMenu
+    {
+        return GeneratesMainNavigationMenu::handle();
+    }
+
+    /** @deprecated */
     protected function createMainNavigationMenu(): MainNavigationMenu
     {
         return MainNavigationMenu::create();

From cac6d904ef262b68fcfdfd1631d42d6640f691e1 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 15:50:26 +0100
Subject: [PATCH 0097/1422] Move dropdown accessors to new menu class

---
 .../Navigation/MainNavigationMenu.php         | 25 -------------------
 .../Features/Navigation/NavigationMenu.php    | 24 ++++++++++++++++++
 .../tests/Feature/NavigationMenuTest.php      | 22 ++++++++--------
 3 files changed, 35 insertions(+), 36 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/MainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/MainNavigationMenu.php
index da092f24a26..bb046359779 100644
--- a/packages/framework/src/Framework/Features/Navigation/MainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/MainNavigationMenu.php
@@ -4,9 +4,6 @@
 
 namespace Hyde\Framework\Features\Navigation;
 
-use Hyde\Facades\Config;
-use BadMethodCallException;
-
 /** @deprecated Use the new NavigationMenu class instead */
 class MainNavigationMenu extends BaseNavigationMenu
 {
@@ -15,26 +12,4 @@ public static function create(): static
     {
         return new static(GeneratesMainNavigationMenu::handle()->getItems());
     }
-
-    public function hasDropdowns(): bool
-    {
-        return $this->dropdownsEnabled() && count($this->getDropdowns()) >= 1;
-    }
-
-    /** @return array<string, DropdownNavItem> */
-    public function getDropdowns(): array
-    {
-        if (! $this->dropdownsEnabled()) {
-            throw new BadMethodCallException('Dropdowns are not enabled. Enable it by setting `hyde.navigation.subdirectories` to `dropdown`.');
-        }
-
-        return $this->items->filter(function (NavItem $item): bool {
-            return $item instanceof DropdownNavItem;
-        })->values()->all();
-    }
-
-    protected function dropdownsEnabled(): bool
-    {
-        return Config::getString('hyde.navigation.subdirectories', 'hidden') === 'dropdown';
-    }
 }
diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
index 4919ceb1bf1..983404b9616 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
@@ -4,6 +4,8 @@
 
 namespace Hyde\Framework\Features\Navigation;
 
+use Hyde\Facades\Config;
+use BadMethodCallException;
 use Illuminate\Support\Collection;
 use Illuminate\Contracts\Support\Arrayable;
 
@@ -22,4 +24,26 @@ public function getItems(): Collection
     {
         return $this->items;
     }
+
+    public function hasDropdowns(): bool
+    {
+        return $this->dropdownsEnabled() && count($this->getDropdowns()) >= 1;
+    }
+
+    /** @return array<string, DropdownNavItem> */
+    public function getDropdowns(): array
+    {
+        if (! $this->dropdownsEnabled()) {
+            throw new BadMethodCallException('Dropdowns are not enabled. Enable it by setting `hyde.navigation.subdirectories` to `dropdown`.');
+        }
+
+        return $this->items->filter(function (NavItem $item): bool {
+            return $item instanceof DropdownNavItem;
+        })->values()->all();
+    }
+
+    protected function dropdownsEnabled(): bool
+    {
+        return Config::getString('hyde.navigation.subdirectories', 'hidden') === 'dropdown';
+    }
 }
diff --git a/packages/framework/tests/Feature/NavigationMenuTest.php b/packages/framework/tests/Feature/NavigationMenuTest.php
index 1956ef3b391..485c97e2026 100644
--- a/packages/framework/tests/Feature/NavigationMenuTest.php
+++ b/packages/framework/tests/Feature/NavigationMenuTest.php
@@ -243,7 +243,7 @@ public function testPagesInSubdirectoriesAreNotAddedToTheNavigationMenuWithConfi
     public function testHasDropdownsReturnsFalseWhenThereAreNoDropdowns()
     {
         config(['hyde.navigation.subdirectories' => 'dropdown']);
-        $menu = $this->createMainNavigationMenu();
+        $menu = $this->createNewMainNavigationMenu();
         $this->assertFalse($menu->hasDropdowns());
     }
 
@@ -251,20 +251,20 @@ public function testHasDropdownsReturnsTrueWhenThereAreDropdowns()
     {
         config(['hyde.navigation.subdirectories' => 'dropdown']);
         Routes::addRoute((new MarkdownPage('foo/bar'))->getRoute());
-        $menu = $this->createMainNavigationMenu();
+        $menu = $this->createNewMainNavigationMenu();
         $this->assertTrue($menu->hasDropdowns());
     }
 
     public function testHasDropdownsAlwaysReturnsFalseWhenDropdownsAreDisabled()
     {
         Routes::addRoute((new MarkdownPage('foo/bar'))->getRoute());
-        $this->assertFalse($this->createMainNavigationMenu()->hasDropdowns());
+        $this->assertFalse($this->createNewMainNavigationMenu()->hasDropdowns());
     }
 
     public function testGetDropdownsReturnsEmptyArrayThereAreNoDropdowns()
     {
         config(['hyde.navigation.subdirectories' => 'dropdown']);
-        $menu = $this->createMainNavigationMenu();
+        $menu = $this->createNewMainNavigationMenu();
         $this->assertCount(0, $menu->getDropdowns());
         $this->assertSame([], $menu->getDropdowns());
     }
@@ -273,7 +273,7 @@ public function testGetDropdownsReturnsCorrectArrayWhenThereAreDropdowns()
     {
         config(['hyde.navigation.subdirectories' => 'dropdown']);
         Routes::addRoute((new MarkdownPage('foo/bar'))->getRoute());
-        $menu = $this->createMainNavigationMenu();
+        $menu = $this->createNewMainNavigationMenu();
         $this->assertCount(1, $menu->getDropdowns());
 
         $this->assertEquals([
@@ -288,7 +288,7 @@ public function testGetDropdownsWithMultipleItems()
 
         Routes::addRoute((new MarkdownPage('foo/bar'))->getRoute());
         Routes::addRoute((new MarkdownPage('foo/baz'))->getRoute());
-        $menu = $this->createMainNavigationMenu();
+        $menu = $this->createNewMainNavigationMenu();
 
         $this->assertCount(1, $menu->getDropdowns());
 
@@ -308,7 +308,7 @@ public function testGetDropdownsWithMultipleDropdowns()
         Routes::addRoute((new MarkdownPage('foo/baz'))->getRoute());
         Routes::addRoute((new MarkdownPage('cat/hat'))->getRoute());
 
-        $menu = $this->createMainNavigationMenu();
+        $menu = $this->createNewMainNavigationMenu();
 
         $this->assertCount(2, $menu->getDropdowns());
 
@@ -328,7 +328,7 @@ public function testGetDropdownsThrowsExceptionWhenDisabled()
         $this->expectException(BadMethodCallException::class);
         $this->expectExceptionMessage('Dropdowns are not enabled. Enable it by setting `hyde.navigation.subdirectories` to `dropdown`.');
 
-        $menu = $this->createMainNavigationMenu();
+        $menu = $this->createNewMainNavigationMenu();
         $menu->getDropdowns();
     }
 
@@ -338,7 +338,7 @@ public function testDocumentationPagesDoNotGetAddedToDropdowns()
 
         Routes::addRoute((new DocumentationPage('foo'))->getRoute());
         Routes::addRoute((new DocumentationPage('bar/baz'))->getRoute());
-        $menu = $this->createMainNavigationMenu();
+        $menu = $this->createNewMainNavigationMenu();
 
         $this->assertFalse($menu->hasDropdowns());
         $this->assertCount(0, $menu->getDropdowns());
@@ -351,7 +351,7 @@ public function testBlogPostsDoNotGetAddedToDropdowns()
         Routes::addRoute((new MarkdownPost('foo'))->getRoute());
         Routes::addRoute((new MarkdownPost('bar/baz'))->getRoute());
 
-        $menu = $this->createMainNavigationMenu();
+        $menu = $this->createNewMainNavigationMenu();
         $this->assertFalse($menu->hasDropdowns());
         $this->assertCount(0, $menu->getDropdowns());
     }
@@ -382,7 +382,7 @@ public function testDropdownMenuItemsAreSortedByPriority()
         Routes::addRoute(new Route(new MarkdownPage('foo/bar', ['navigation.priority' => 2])));
         Routes::addRoute(new Route(new MarkdownPage('foo/baz', ['navigation.priority' => 3])));
 
-        $menu = $this->createMainNavigationMenu();
+        $menu = $this->createNewMainNavigationMenu();
         $dropdowns = $menu->getDropdowns();
 
         $this->assertSame(['Foo', 'Bar', 'Baz'], $dropdowns[0]->getItems()->pluck('label')->toArray());

From 1df963693c345d4b095c42f0eca67bc96c874292 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 15:51:54 +0100
Subject: [PATCH 0098/1422] Deprecate dropdown accessors in new class

---
 .../Features/Navigation/NavigationMenu.php          | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
index 983404b9616..3d2538f4877 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
@@ -25,12 +25,23 @@ public function getItems(): Collection
         return $this->items;
     }
 
+    /**
+     * @experimental These do not seem to be used outside of tests and may be removed
+     *
+     * @deprecated If kept, they should be renamed to be more generic.
+     */
     public function hasDropdowns(): bool
     {
         return $this->dropdownsEnabled() && count($this->getDropdowns()) >= 1;
     }
 
-    /** @return array<string, DropdownNavItem> */
+    /**
+     * @experimental These do not seem to be used outside of tests and may be removed
+     *
+     * @deprecated If kept, they should be renamed to be more generic.
+     *
+     * @return array<string, DropdownNavItem>
+     */
     public function getDropdowns(): array
     {
         if (! $this->dropdownsEnabled()) {

From 323dcce9488639b92e4993ced5a47b5706d56f4f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 16:32:42 +0100
Subject: [PATCH 0099/1422] Begin testing against new class

---
 packages/framework/tests/Feature/NavigationMenuTest.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/framework/tests/Feature/NavigationMenuTest.php b/packages/framework/tests/Feature/NavigationMenuTest.php
index 485c97e2026..d41f4e28ef9 100644
--- a/packages/framework/tests/Feature/NavigationMenuTest.php
+++ b/packages/framework/tests/Feature/NavigationMenuTest.php
@@ -28,17 +28,17 @@ class NavigationMenuTest extends TestCase
 {
     public function testConstructor()
     {
-        $this->assertInstanceOf(MainNavigationMenu::class, $this->createMainNavigationMenu());
+        $this->assertInstanceOf(NavigationMenu::class, $this->createNewMainNavigationMenu());
     }
 
     public function testGenerateMethodCreatesCollectionOfNavItems()
     {
-        $this->assertInstanceOf(Collection::class, $this->createMainNavigationMenu()->getItems());
+        $this->assertInstanceOf(Collection::class, $this->createNewMainNavigationMenu()->getItems());
     }
 
     public function testGetItemsReturnsItems()
     {
-        $this->assertEquals($this->createMainNavigationMenu()->getItems(), $this->createMainNavigationMenu()->getItems());
+        $this->assertEquals($this->createNewMainNavigationMenu()->getItems(), $this->createNewMainNavigationMenu()->getItems());
     }
 
     public function testItemsAreSortedByPriority()

From 6915770b395ac27097161b85d9fab107d145416c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 16:33:13 +0100
Subject: [PATCH 0100/1422] Invert testing helper method names

---
 .../tests/Feature/NavigationMenuTest.php      | 62 +++++++++----------
 1 file changed, 31 insertions(+), 31 deletions(-)

diff --git a/packages/framework/tests/Feature/NavigationMenuTest.php b/packages/framework/tests/Feature/NavigationMenuTest.php
index d41f4e28ef9..9482d6d1c64 100644
--- a/packages/framework/tests/Feature/NavigationMenuTest.php
+++ b/packages/framework/tests/Feature/NavigationMenuTest.php
@@ -28,17 +28,17 @@ class NavigationMenuTest extends TestCase
 {
     public function testConstructor()
     {
-        $this->assertInstanceOf(NavigationMenu::class, $this->createNewMainNavigationMenu());
+        $this->assertInstanceOf(NavigationMenu::class, $this->createNavigationMenu());
     }
 
     public function testGenerateMethodCreatesCollectionOfNavItems()
     {
-        $this->assertInstanceOf(Collection::class, $this->createNewMainNavigationMenu()->getItems());
+        $this->assertInstanceOf(Collection::class, $this->createNavigationMenu()->getItems());
     }
 
     public function testGetItemsReturnsItems()
     {
-        $this->assertEquals($this->createNewMainNavigationMenu()->getItems(), $this->createNewMainNavigationMenu()->getItems());
+        $this->assertEquals($this->createNavigationMenu()->getItems(), $this->createNavigationMenu()->getItems());
     }
 
     public function testItemsAreSortedByPriority()
@@ -47,7 +47,7 @@ public function testItemsAreSortedByPriority()
         Routes::addRoute(new Route(new MarkdownPage('bar', ['navigation.priority' => 2])));
         Routes::addRoute(new Route(new MarkdownPage('baz', ['navigation.priority' => 3])));
 
-        $this->assertSame(['Home', 'Foo', 'Bar', 'Baz'], $this->createMainNavigationMenu()->getItems()->pluck('label')->toArray());
+        $this->assertSame(['Home', 'Foo', 'Bar', 'Baz'], $this->createLegacyMainNavigationMenu()->getItems()->pluck('label')->toArray());
     }
 
     public function testItemsWithHiddenPropertySetToTrueAreNotAdded()
@@ -55,7 +55,7 @@ public function testItemsWithHiddenPropertySetToTrueAreNotAdded()
         Routes::addRoute(new Route(new MarkdownPage('foo', ['navigation.hidden' => true])));
         Routes::addRoute(new Route(new MarkdownPage('bar', ['navigation.hidden' => false])));
 
-        $this->assertSame(['Home', 'Bar'], $this->createMainNavigationMenu()->getItems()->pluck('label')->toArray());
+        $this->assertSame(['Home', 'Bar'], $this->createLegacyMainNavigationMenu()->getItems()->pluck('label')->toArray());
     }
 
     public function testCreatedCollectionIsSortedByNavigationMenuPriority()
@@ -63,7 +63,7 @@ public function testCreatedCollectionIsSortedByNavigationMenuPriority()
         $this->file('_pages/foo.md');
         $this->file('_docs/index.md');
 
-        $menu = $this->createMainNavigationMenu();
+        $menu = $this->createLegacyMainNavigationMenu();
 
         $expected = collect([
             NavItem::fromRoute(Routes::get('index')),
@@ -79,7 +79,7 @@ public function testIsSortedAutomaticallyWhenUsingNavigationMenuCreate()
     {
         $this->file('_pages/foo.md');
 
-        $menu = $this->createMainNavigationMenu();
+        $menu = $this->createLegacyMainNavigationMenu();
 
         $expected = collect([
             NavItem::fromRoute(Routes::get('index')),
@@ -92,14 +92,14 @@ public function testIsSortedAutomaticallyWhenUsingNavigationMenuCreate()
 
     public function testCollectionOnlyContainsNavItems()
     {
-        $this->assertContainsOnlyInstancesOf(NavItem::class, $this->createMainNavigationMenu()->getItems());
+        $this->assertContainsOnlyInstancesOf(NavItem::class, $this->createLegacyMainNavigationMenu()->getItems());
     }
 
     public function testExternalLinkCanBeAddedInConfig()
     {
         config(['hyde.navigation.custom' => [NavItem::forLink('https://example.com', 'foo')]]);
 
-        $menu = $this->createMainNavigationMenu();
+        $menu = $this->createLegacyMainNavigationMenu();
 
         $expected = collect([
             NavItem::fromRoute(Routes::get('index')),
@@ -114,7 +114,7 @@ public function testPathLinkCanBeAddedInConfig()
     {
         config(['hyde.navigation.custom' => [NavItem::forLink('foo', 'foo')]]);
 
-        $menu = $this->createMainNavigationMenu();
+        $menu = $this->createLegacyMainNavigationMenu();
 
         $expected = collect([
             NavItem::fromRoute(Routes::get('index')),
@@ -132,7 +132,7 @@ public function testDuplicatesAreRemovedWhenAddingInConfig()
             NavItem::forLink('foo', 'foo'),
         ]]);
 
-        $menu = $this->createMainNavigationMenu();
+        $menu = $this->createLegacyMainNavigationMenu();
 
         $expected = collect([
             NavItem::fromRoute(Routes::get('index')),
@@ -150,7 +150,7 @@ public function testDuplicatesAreRemovedWhenAddingInConfigRegardlessOfDestinatio
             NavItem::forLink('bar', 'foo'),
         ]]);
 
-        $menu = $this->createMainNavigationMenu();
+        $menu = $this->createLegacyMainNavigationMenu();
 
         $expected = collect([
             NavItem::fromRoute(Routes::get('index')),
@@ -167,7 +167,7 @@ public function testConfigItemsTakePrecedenceOverGeneratedItems()
 
         config(['hyde.navigation.custom' => [NavItem::forLink('bar', 'Foo')]]);
 
-        $menu = $this->createMainNavigationMenu();
+        $menu = $this->createLegacyMainNavigationMenu();
 
         $expected = collect([
             NavItem::fromRoute(Routes::get('index')),
@@ -183,7 +183,7 @@ public function testDocumentationPagesThatAreNotIndexAreNotAddedToTheMenu()
         $this->file('_docs/foo.md');
         $this->file('_docs/index.md');
 
-        $menu = $this->createMainNavigationMenu();
+        $menu = $this->createLegacyMainNavigationMenu();
 
         $expected = collect([
             NavItem::fromRoute(Routes::get('index')),
@@ -199,7 +199,7 @@ public function testPagesInSubdirectoriesAreNotAddedToTheNavigationMenu()
         $this->directory('_pages/foo');
         $this->file('_pages/foo/bar.md');
 
-        $menu = $this->createMainNavigationMenu();
+        $menu = $this->createLegacyMainNavigationMenu();
         $expected = collect([NavItem::fromRoute(Routes::get('index'))]);
 
         $this->assertCount(count($expected), $menu->getItems());
@@ -212,7 +212,7 @@ public function testPagesInSubdirectoriesCanBeAddedToTheNavigationMenuWithConfig
         $this->directory('_pages/foo');
         $this->file('_pages/foo/bar.md');
 
-        $menu = $this->createMainNavigationMenu();
+        $menu = $this->createLegacyMainNavigationMenu();
         $expected = collect([
             NavItem::fromRoute(Routes::get('index')),
             NavItem::fromRoute(Routes::get('foo/bar')),
@@ -228,7 +228,7 @@ public function testPagesInSubdirectoriesAreNotAddedToTheNavigationMenuWithConfi
         $this->directory('_pages/foo');
         $this->file('_pages/foo/bar.md');
 
-        $menu = $this->createMainNavigationMenu();
+        $menu = $this->createLegacyMainNavigationMenu();
         $expected = collect([
             NavItem::fromRoute(Routes::get('index')),
             DropdownNavItem::fromArray('foo', [
@@ -243,7 +243,7 @@ public function testPagesInSubdirectoriesAreNotAddedToTheNavigationMenuWithConfi
     public function testHasDropdownsReturnsFalseWhenThereAreNoDropdowns()
     {
         config(['hyde.navigation.subdirectories' => 'dropdown']);
-        $menu = $this->createNewMainNavigationMenu();
+        $menu = $this->createNavigationMenu();
         $this->assertFalse($menu->hasDropdowns());
     }
 
@@ -251,20 +251,20 @@ public function testHasDropdownsReturnsTrueWhenThereAreDropdowns()
     {
         config(['hyde.navigation.subdirectories' => 'dropdown']);
         Routes::addRoute((new MarkdownPage('foo/bar'))->getRoute());
-        $menu = $this->createNewMainNavigationMenu();
+        $menu = $this->createNavigationMenu();
         $this->assertTrue($menu->hasDropdowns());
     }
 
     public function testHasDropdownsAlwaysReturnsFalseWhenDropdownsAreDisabled()
     {
         Routes::addRoute((new MarkdownPage('foo/bar'))->getRoute());
-        $this->assertFalse($this->createNewMainNavigationMenu()->hasDropdowns());
+        $this->assertFalse($this->createNavigationMenu()->hasDropdowns());
     }
 
     public function testGetDropdownsReturnsEmptyArrayThereAreNoDropdowns()
     {
         config(['hyde.navigation.subdirectories' => 'dropdown']);
-        $menu = $this->createNewMainNavigationMenu();
+        $menu = $this->createNavigationMenu();
         $this->assertCount(0, $menu->getDropdowns());
         $this->assertSame([], $menu->getDropdowns());
     }
@@ -273,7 +273,7 @@ public function testGetDropdownsReturnsCorrectArrayWhenThereAreDropdowns()
     {
         config(['hyde.navigation.subdirectories' => 'dropdown']);
         Routes::addRoute((new MarkdownPage('foo/bar'))->getRoute());
-        $menu = $this->createNewMainNavigationMenu();
+        $menu = $this->createNavigationMenu();
         $this->assertCount(1, $menu->getDropdowns());
 
         $this->assertEquals([
@@ -288,7 +288,7 @@ public function testGetDropdownsWithMultipleItems()
 
         Routes::addRoute((new MarkdownPage('foo/bar'))->getRoute());
         Routes::addRoute((new MarkdownPage('foo/baz'))->getRoute());
-        $menu = $this->createNewMainNavigationMenu();
+        $menu = $this->createNavigationMenu();
 
         $this->assertCount(1, $menu->getDropdowns());
 
@@ -308,7 +308,7 @@ public function testGetDropdownsWithMultipleDropdowns()
         Routes::addRoute((new MarkdownPage('foo/baz'))->getRoute());
         Routes::addRoute((new MarkdownPage('cat/hat'))->getRoute());
 
-        $menu = $this->createNewMainNavigationMenu();
+        $menu = $this->createNavigationMenu();
 
         $this->assertCount(2, $menu->getDropdowns());
 
@@ -328,7 +328,7 @@ public function testGetDropdownsThrowsExceptionWhenDisabled()
         $this->expectException(BadMethodCallException::class);
         $this->expectExceptionMessage('Dropdowns are not enabled. Enable it by setting `hyde.navigation.subdirectories` to `dropdown`.');
 
-        $menu = $this->createNewMainNavigationMenu();
+        $menu = $this->createNavigationMenu();
         $menu->getDropdowns();
     }
 
@@ -338,7 +338,7 @@ public function testDocumentationPagesDoNotGetAddedToDropdowns()
 
         Routes::addRoute((new DocumentationPage('foo'))->getRoute());
         Routes::addRoute((new DocumentationPage('bar/baz'))->getRoute());
-        $menu = $this->createNewMainNavigationMenu();
+        $menu = $this->createNavigationMenu();
 
         $this->assertFalse($menu->hasDropdowns());
         $this->assertCount(0, $menu->getDropdowns());
@@ -351,7 +351,7 @@ public function testBlogPostsDoNotGetAddedToDropdowns()
         Routes::addRoute((new MarkdownPost('foo'))->getRoute());
         Routes::addRoute((new MarkdownPost('bar/baz'))->getRoute());
 
-        $menu = $this->createNewMainNavigationMenu();
+        $menu = $this->createNavigationMenu();
         $this->assertFalse($menu->hasDropdowns());
         $this->assertCount(0, $menu->getDropdowns());
     }
@@ -362,7 +362,7 @@ public function testPagesInDropdownsDoNotGetAddedToTheMainNavigation()
 
         Routes::push((new MarkdownPage('foo'))->getRoute());
         Routes::push((new MarkdownPage('bar/baz'))->getRoute());
-        $menu = $this->createMainNavigationMenu();
+        $menu = $this->createLegacyMainNavigationMenu();
 
         $this->assertCount(3, $menu->getItems());
         $this->assertEquals([
@@ -382,19 +382,19 @@ public function testDropdownMenuItemsAreSortedByPriority()
         Routes::addRoute(new Route(new MarkdownPage('foo/bar', ['navigation.priority' => 2])));
         Routes::addRoute(new Route(new MarkdownPage('foo/baz', ['navigation.priority' => 3])));
 
-        $menu = $this->createNewMainNavigationMenu();
+        $menu = $this->createNavigationMenu();
         $dropdowns = $menu->getDropdowns();
 
         $this->assertSame(['Foo', 'Bar', 'Baz'], $dropdowns[0]->getItems()->pluck('label')->toArray());
     }
 
-    protected function createNewMainNavigationMenu(): NavigationMenu
+    protected function createNavigationMenu(): NavigationMenu
     {
         return GeneratesMainNavigationMenu::handle();
     }
 
     /** @deprecated */
-    protected function createMainNavigationMenu(): MainNavigationMenu
+    protected function createLegacyMainNavigationMenu(): MainNavigationMenu
     {
         return MainNavigationMenu::create();
     }

From 483284c7becc12a57e76e3f308e144a03e41485a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 16:36:29 +0100
Subject: [PATCH 0101/1422] Update tests to have more helpful assertions

---
 packages/framework/tests/Feature/NavigationMenuTest.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/framework/tests/Feature/NavigationMenuTest.php b/packages/framework/tests/Feature/NavigationMenuTest.php
index 9482d6d1c64..d87b89ef843 100644
--- a/packages/framework/tests/Feature/NavigationMenuTest.php
+++ b/packages/framework/tests/Feature/NavigationMenuTest.php
@@ -34,11 +34,14 @@ public function testConstructor()
     public function testGenerateMethodCreatesCollectionOfNavItems()
     {
         $this->assertInstanceOf(Collection::class, $this->createNavigationMenu()->getItems());
+        $this->assertContainsOnlyInstancesOf(NavItem::class, $this->createNavigationMenu()->getItems());
     }
 
     public function testGetItemsReturnsItems()
     {
-        $this->assertEquals($this->createNavigationMenu()->getItems(), $this->createNavigationMenu()->getItems());
+        $this->assertEquals(collect([
+            NavItem::fromRoute(Routes::get('index')),
+        ]), $this->createNavigationMenu()->getItems());
     }
 
     public function testItemsAreSortedByPriority()

From 0eb760ed80f45787caa1d6736ed0321f476408e3 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 16:47:19 +0100
Subject: [PATCH 0102/1422] Remove duplicate test

---
 packages/framework/tests/Feature/NavigationMenuTest.php | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/packages/framework/tests/Feature/NavigationMenuTest.php b/packages/framework/tests/Feature/NavigationMenuTest.php
index d87b89ef843..a1e0e992f84 100644
--- a/packages/framework/tests/Feature/NavigationMenuTest.php
+++ b/packages/framework/tests/Feature/NavigationMenuTest.php
@@ -93,11 +93,6 @@ public function testIsSortedAutomaticallyWhenUsingNavigationMenuCreate()
         $this->assertEquals($expected, $menu->getItems());
     }
 
-    public function testCollectionOnlyContainsNavItems()
-    {
-        $this->assertContainsOnlyInstancesOf(NavItem::class, $this->createLegacyMainNavigationMenu()->getItems());
-    }
-
     public function testExternalLinkCanBeAddedInConfig()
     {
         config(['hyde.navigation.custom' => [NavItem::forLink('https://example.com', 'foo')]]);

From 7ef717531970738e1a327f726f8f22bd846a9e5e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 16:48:05 +0100
Subject: [PATCH 0103/1422] Move over to test new class

---
 .../tests/Feature/NavigationMenuTest.php      | 34 ++++++++-----------
 1 file changed, 14 insertions(+), 20 deletions(-)

diff --git a/packages/framework/tests/Feature/NavigationMenuTest.php b/packages/framework/tests/Feature/NavigationMenuTest.php
index a1e0e992f84..072a65eac6e 100644
--- a/packages/framework/tests/Feature/NavigationMenuTest.php
+++ b/packages/framework/tests/Feature/NavigationMenuTest.php
@@ -50,7 +50,7 @@ public function testItemsAreSortedByPriority()
         Routes::addRoute(new Route(new MarkdownPage('bar', ['navigation.priority' => 2])));
         Routes::addRoute(new Route(new MarkdownPage('baz', ['navigation.priority' => 3])));
 
-        $this->assertSame(['Home', 'Foo', 'Bar', 'Baz'], $this->createLegacyMainNavigationMenu()->getItems()->pluck('label')->toArray());
+        $this->assertSame(['Home', 'Foo', 'Bar', 'Baz'], $this->createNavigationMenu()->getItems()->pluck('label')->toArray());
     }
 
     public function testItemsWithHiddenPropertySetToTrueAreNotAdded()
@@ -58,7 +58,7 @@ public function testItemsWithHiddenPropertySetToTrueAreNotAdded()
         Routes::addRoute(new Route(new MarkdownPage('foo', ['navigation.hidden' => true])));
         Routes::addRoute(new Route(new MarkdownPage('bar', ['navigation.hidden' => false])));
 
-        $this->assertSame(['Home', 'Bar'], $this->createLegacyMainNavigationMenu()->getItems()->pluck('label')->toArray());
+        $this->assertSame(['Home', 'Bar'], $this->createNavigationMenu()->getItems()->pluck('label')->toArray());
     }
 
     public function testCreatedCollectionIsSortedByNavigationMenuPriority()
@@ -66,7 +66,7 @@ public function testCreatedCollectionIsSortedByNavigationMenuPriority()
         $this->file('_pages/foo.md');
         $this->file('_docs/index.md');
 
-        $menu = $this->createLegacyMainNavigationMenu();
+        $menu = $this->createNavigationMenu();
 
         $expected = collect([
             NavItem::fromRoute(Routes::get('index')),
@@ -82,7 +82,7 @@ public function testIsSortedAutomaticallyWhenUsingNavigationMenuCreate()
     {
         $this->file('_pages/foo.md');
 
-        $menu = $this->createLegacyMainNavigationMenu();
+        $menu = $this->createNavigationMenu();
 
         $expected = collect([
             NavItem::fromRoute(Routes::get('index')),
@@ -97,7 +97,7 @@ public function testExternalLinkCanBeAddedInConfig()
     {
         config(['hyde.navigation.custom' => [NavItem::forLink('https://example.com', 'foo')]]);
 
-        $menu = $this->createLegacyMainNavigationMenu();
+        $menu = $this->createNavigationMenu();
 
         $expected = collect([
             NavItem::fromRoute(Routes::get('index')),
@@ -112,7 +112,7 @@ public function testPathLinkCanBeAddedInConfig()
     {
         config(['hyde.navigation.custom' => [NavItem::forLink('foo', 'foo')]]);
 
-        $menu = $this->createLegacyMainNavigationMenu();
+        $menu = $this->createNavigationMenu();
 
         $expected = collect([
             NavItem::fromRoute(Routes::get('index')),
@@ -130,7 +130,7 @@ public function testDuplicatesAreRemovedWhenAddingInConfig()
             NavItem::forLink('foo', 'foo'),
         ]]);
 
-        $menu = $this->createLegacyMainNavigationMenu();
+        $menu = $this->createNavigationMenu();
 
         $expected = collect([
             NavItem::fromRoute(Routes::get('index')),
@@ -148,7 +148,7 @@ public function testDuplicatesAreRemovedWhenAddingInConfigRegardlessOfDestinatio
             NavItem::forLink('bar', 'foo'),
         ]]);
 
-        $menu = $this->createLegacyMainNavigationMenu();
+        $menu = $this->createNavigationMenu();
 
         $expected = collect([
             NavItem::fromRoute(Routes::get('index')),
@@ -165,7 +165,7 @@ public function testConfigItemsTakePrecedenceOverGeneratedItems()
 
         config(['hyde.navigation.custom' => [NavItem::forLink('bar', 'Foo')]]);
 
-        $menu = $this->createLegacyMainNavigationMenu();
+        $menu = $this->createNavigationMenu();
 
         $expected = collect([
             NavItem::fromRoute(Routes::get('index')),
@@ -181,7 +181,7 @@ public function testDocumentationPagesThatAreNotIndexAreNotAddedToTheMenu()
         $this->file('_docs/foo.md');
         $this->file('_docs/index.md');
 
-        $menu = $this->createLegacyMainNavigationMenu();
+        $menu = $this->createNavigationMenu();
 
         $expected = collect([
             NavItem::fromRoute(Routes::get('index')),
@@ -197,7 +197,7 @@ public function testPagesInSubdirectoriesAreNotAddedToTheNavigationMenu()
         $this->directory('_pages/foo');
         $this->file('_pages/foo/bar.md');
 
-        $menu = $this->createLegacyMainNavigationMenu();
+        $menu = $this->createNavigationMenu();
         $expected = collect([NavItem::fromRoute(Routes::get('index'))]);
 
         $this->assertCount(count($expected), $menu->getItems());
@@ -210,7 +210,7 @@ public function testPagesInSubdirectoriesCanBeAddedToTheNavigationMenuWithConfig
         $this->directory('_pages/foo');
         $this->file('_pages/foo/bar.md');
 
-        $menu = $this->createLegacyMainNavigationMenu();
+        $menu = $this->createNavigationMenu();
         $expected = collect([
             NavItem::fromRoute(Routes::get('index')),
             NavItem::fromRoute(Routes::get('foo/bar')),
@@ -226,7 +226,7 @@ public function testPagesInSubdirectoriesAreNotAddedToTheNavigationMenuWithConfi
         $this->directory('_pages/foo');
         $this->file('_pages/foo/bar.md');
 
-        $menu = $this->createLegacyMainNavigationMenu();
+        $menu = $this->createNavigationMenu();
         $expected = collect([
             NavItem::fromRoute(Routes::get('index')),
             DropdownNavItem::fromArray('foo', [
@@ -360,7 +360,7 @@ public function testPagesInDropdownsDoNotGetAddedToTheMainNavigation()
 
         Routes::push((new MarkdownPage('foo'))->getRoute());
         Routes::push((new MarkdownPage('bar/baz'))->getRoute());
-        $menu = $this->createLegacyMainNavigationMenu();
+        $menu = $this->createNavigationMenu();
 
         $this->assertCount(3, $menu->getItems());
         $this->assertEquals([
@@ -390,10 +390,4 @@ protected function createNavigationMenu(): NavigationMenu
     {
         return GeneratesMainNavigationMenu::handle();
     }
-
-    /** @deprecated */
-    protected function createLegacyMainNavigationMenu(): MainNavigationMenu
-    {
-        return MainNavigationMenu::create();
-    }
 }

From 78d646972417a5f3fc832f4ba4bc02f9e2b9e2a5 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 16:48:14 +0100
Subject: [PATCH 0104/1422] Remove unused import

---
 packages/framework/tests/Feature/NavigationMenuTest.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/framework/tests/Feature/NavigationMenuTest.php b/packages/framework/tests/Feature/NavigationMenuTest.php
index 072a65eac6e..b722161f4d6 100644
--- a/packages/framework/tests/Feature/NavigationMenuTest.php
+++ b/packages/framework/tests/Feature/NavigationMenuTest.php
@@ -9,7 +9,6 @@
 use Hyde\Foundation\Facades\Routes;
 use Hyde\Framework\Features\Navigation\NavigationMenu;
 use Hyde\Framework\Features\Navigation\DropdownNavItem;
-use Hyde\Framework\Features\Navigation\MainNavigationMenu;
 use Hyde\Framework\Features\Navigation\NavItem;
 use Hyde\Pages\DocumentationPage;
 use Hyde\Pages\MarkdownPage;

From d133dd62130ce5e5c1baed4b0035563a5701c99a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 16:51:35 +0100
Subject: [PATCH 0105/1422] Breaking: Remove class `MainNavigationMenu`

---
 .../Features/Navigation/MainNavigationMenu.php    | 15 ---------------
 .../tests/Feature/NavigationMenuTest.php          |  1 -
 2 files changed, 16 deletions(-)
 delete mode 100644 packages/framework/src/Framework/Features/Navigation/MainNavigationMenu.php

diff --git a/packages/framework/src/Framework/Features/Navigation/MainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/MainNavigationMenu.php
deleted file mode 100644
index bb046359779..00000000000
--- a/packages/framework/src/Framework/Features/Navigation/MainNavigationMenu.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Hyde\Framework\Features\Navigation;
-
-/** @deprecated Use the new NavigationMenu class instead */
-class MainNavigationMenu extends BaseNavigationMenu
-{
-    /** @deprecated Temporary method for refactor */
-    public static function create(): static
-    {
-        return new static(GeneratesMainNavigationMenu::handle()->getItems());
-    }
-}
diff --git a/packages/framework/tests/Feature/NavigationMenuTest.php b/packages/framework/tests/Feature/NavigationMenuTest.php
index b722161f4d6..6aed9038c02 100644
--- a/packages/framework/tests/Feature/NavigationMenuTest.php
+++ b/packages/framework/tests/Feature/NavigationMenuTest.php
@@ -19,7 +19,6 @@
 
 /**
  * @covers \Hyde\Framework\Features\Navigation\GeneratesMainNavigationMenu
- * @covers \Hyde\Framework\Features\Navigation\MainNavigationMenu
  * @covers \Hyde\Framework\Features\Navigation\BaseNavigationMenu
  * @covers \Hyde\Framework\Features\Navigation\NavigationMenu
  */

From d2660f2b9aa7b8cf491e8e27dbed31f9783444f1 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 16:51:51 +0100
Subject: [PATCH 0106/1422] Mark code that must be adapted before merge

---
 docs/digging-deeper/navigation.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/digging-deeper/navigation.md b/docs/digging-deeper/navigation.md
index 10d3ba73c90..eda34de5fea 100644
--- a/docs/digging-deeper/navigation.md
+++ b/docs/digging-deeper/navigation.md
@@ -300,6 +300,8 @@ The main navigation menu is the `MainNavigationMenu` class, and the documentatio
 Both extend the same `BaseNavigationMenu` class:
 
 ```php
+// TODO: Update these examples
+
 use Hyde\Framework\Features\Navigation\MainNavigationMenu;
 use Hyde\Framework\Features\Navigation\DocumentationSidebar;
 use Hyde\Framework\Features\Navigation\BaseNavigationMenu;

From 98854e30a704751f55b264572badc6dc540998f9 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 16:54:00 +0100
Subject: [PATCH 0107/1422] Update test to use the new logic location

---
 .../framework/tests/Unit/Views/NavigationBrandViewTest.php    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/tests/Unit/Views/NavigationBrandViewTest.php b/packages/framework/tests/Unit/Views/NavigationBrandViewTest.php
index b34478273d6..f47b998ac37 100644
--- a/packages/framework/tests/Unit/Views/NavigationBrandViewTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationBrandViewTest.php
@@ -4,7 +4,7 @@
 
 namespace Hyde\Framework\Testing\Unit\Views;
 
-use Hyde\Framework\Features\Navigation\MainNavigationMenu;
+use Hyde\Framework\Features\Navigation\GeneratesMainNavigationMenu;
 use Hyde\Testing\TestCase;
 
 /**
@@ -22,7 +22,7 @@ protected function setUp(): void
     protected function render(): string
     {
         return view('hyde::components.navigation.navigation-brand', [
-            'navigation' => MainNavigationMenu::create(),
+            'navigation' => GeneratesMainNavigationMenu::handle(),
         ])->render();
     }
 

From e89e44a057ade7a07e0f75d1e9f69913c8c040a5 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 16:55:28 +0100
Subject: [PATCH 0108/1422] Simplify test data setup

---
 .../framework/tests/Unit/Views/NavigationBrandViewTest.php    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/tests/Unit/Views/NavigationBrandViewTest.php b/packages/framework/tests/Unit/Views/NavigationBrandViewTest.php
index f47b998ac37..47fe6c7c640 100644
--- a/packages/framework/tests/Unit/Views/NavigationBrandViewTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationBrandViewTest.php
@@ -4,7 +4,7 @@
 
 namespace Hyde\Framework\Testing\Unit\Views;
 
-use Hyde\Framework\Features\Navigation\GeneratesMainNavigationMenu;
+use Hyde\Framework\Features\Navigation\NavigationMenu;
 use Hyde\Testing\TestCase;
 
 /**
@@ -22,7 +22,7 @@ protected function setUp(): void
     protected function render(): string
     {
         return view('hyde::components.navigation.navigation-brand', [
-            'navigation' => GeneratesMainNavigationMenu::handle(),
+            'navigation' => new NavigationMenu(),
         ])->render();
     }
 

From f054e91dd339a18998a44b7d9a35502720b3c8c0 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 16:58:41 +0100
Subject: [PATCH 0109/1422] Inline parent methods to only child

---
 .../Features/Navigation/BaseNavigationMenu.php  | 17 +----------------
 .../Navigation/DocumentationSidebar.php         | 15 +++++++++++++++
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/BaseNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/BaseNavigationMenu.php
index 950eb034e31..36449e0b8db 100644
--- a/packages/framework/src/Framework/Features/Navigation/BaseNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/BaseNavigationMenu.php
@@ -4,23 +4,8 @@
 
 namespace Hyde\Framework\Features\Navigation;
 
-use Illuminate\Support\Collection;
-use Illuminate\Contracts\Support\Arrayable;
-
 /** @deprecated Use the new NavigationMenu class instead */
 abstract class BaseNavigationMenu
 {
-    /** @var \Illuminate\Support\Collection<string, \Hyde\Framework\Features\Navigation\NavItem> */
-    protected Collection $items;
-
-    public function __construct(Arrayable|array $items = [])
-    {
-        $this->items = new Collection($items);
-    }
-
-    /** @return \Illuminate\Support\Collection<\Hyde\Framework\Features\Navigation\NavItem> */
-    public function getItems(): Collection
-    {
-        return $this->items->values();
-    }
+    //
 }
diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 13f3d340817..d1d52cc5e67 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -12,12 +12,27 @@
 use Hyde\Support\Models\Route;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Str;
+use Illuminate\Contracts\Support\Arrayable;
 
 use function collect;
 
 /** @deprecated Use the new NavigationMenu class instead */
 class DocumentationSidebar extends BaseNavigationMenu
 {
+    /** @var \Illuminate\Support\Collection<string, \Hyde\Framework\Features\Navigation\NavItem> */
+    protected Collection $items;
+
+    public function __construct(Arrayable|array $items = [])
+    {
+        $this->items = new Collection($items);
+    }
+
+    /** @return \Illuminate\Support\Collection<\Hyde\Framework\Features\Navigation\NavItem> */
+    public function getItems(): Collection
+    {
+        return $this->items->values();
+    }
+
     /** @deprecated Will be moved to an action */
     public static function create(): static
     {

From 12ff4cebceb24924dee33bfe14cf9fef14f40f02 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 17:03:53 +0100
Subject: [PATCH 0110/1422] DocumentationSidebar no longer extends
 BaseNavigationMenu

---
 .../src/Framework/Features/Navigation/DocumentationSidebar.php  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index d1d52cc5e67..790ac82e595 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -17,7 +17,7 @@
 use function collect;
 
 /** @deprecated Use the new NavigationMenu class instead */
-class DocumentationSidebar extends BaseNavigationMenu
+class DocumentationSidebar
 {
     /** @var \Illuminate\Support\Collection<string, \Hyde\Framework\Features\Navigation\NavItem> */
     protected Collection $items;

From bcf8ffb2d3d770c86fa652d30acf67699d6e9e66 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 17:04:17 +0100
Subject: [PATCH 0111/1422] Remove BaseNavigationMenu coverage annotation

---
 packages/framework/tests/Feature/NavigationMenuTest.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/framework/tests/Feature/NavigationMenuTest.php b/packages/framework/tests/Feature/NavigationMenuTest.php
index 6aed9038c02..1b5ee518592 100644
--- a/packages/framework/tests/Feature/NavigationMenuTest.php
+++ b/packages/framework/tests/Feature/NavigationMenuTest.php
@@ -19,7 +19,6 @@
 
 /**
  * @covers \Hyde\Framework\Features\Navigation\GeneratesMainNavigationMenu
- * @covers \Hyde\Framework\Features\Navigation\BaseNavigationMenu
  * @covers \Hyde\Framework\Features\Navigation\NavigationMenu
  */
 class NavigationMenuTest extends TestCase

From 4065016d90c7e56382afe16bf8ded83d1cd08795 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 17:05:02 +0100
Subject: [PATCH 0112/1422] Breaking: Remove class `BaseNavigationMenu`

---
 .../Features/Navigation/BaseNavigationMenu.php        | 11 -----------
 1 file changed, 11 deletions(-)
 delete mode 100644 packages/framework/src/Framework/Features/Navigation/BaseNavigationMenu.php

diff --git a/packages/framework/src/Framework/Features/Navigation/BaseNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/BaseNavigationMenu.php
deleted file mode 100644
index 36449e0b8db..00000000000
--- a/packages/framework/src/Framework/Features/Navigation/BaseNavigationMenu.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Hyde\Framework\Features\Navigation;
-
-/** @deprecated Use the new NavigationMenu class instead */
-abstract class BaseNavigationMenu
-{
-    //
-}

From ae1b24d8449bb9c01e03596f07ce8cead0c573f4 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 17:14:26 +0100
Subject: [PATCH 0113/1422] Add additional unit tests

---
 packages/framework/tests/Unit/NavItemTest.php | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/packages/framework/tests/Unit/NavItemTest.php b/packages/framework/tests/Unit/NavItemTest.php
index b7ccacf3622..47227d4d8c3 100644
--- a/packages/framework/tests/Unit/NavItemTest.php
+++ b/packages/framework/tests/Unit/NavItemTest.php
@@ -47,6 +47,28 @@ public function testConstruct()
         $this->assertSame($route, $item->destination);
     }
 
+    public function testPassingRouteInstanceToConstructorUsesRouteInstance()
+    {
+        $route = new Route(new MarkdownPage());
+        $this->assertSame($route, (new NavItem($route, 'Home'))->destination);
+    }
+
+    public function testPassingUrlToConstructorUsesExternalRoute()
+    {
+        $item = new NavItem('https://example.com', 'Home');
+        $this->assertInstanceOf(ExternalRoute::class, $item->destination);
+        $this->assertEquals(new ExternalRoute('https://example.com'), $item->destination);
+        $this->assertSame('https://example.com', (string) $item->destination);
+    }
+
+    public function testPassingUnknownRouteKeyToConstructorUsesExternalRoute()
+    {
+        $item = new NavItem('foo', 'Home');
+        $this->assertInstanceOf(ExternalRoute::class, $item->destination);
+        $this->assertEquals(new ExternalRoute('foo'), $item->destination);
+        $this->assertSame('foo', (string) $item->destination);
+    }
+
     public function testGetDestination()
     {
         $route = new Route(new InMemoryPage('foo'));

From 18d2bdf05a9ba9fae2b60b672b25ce4ad7e166db Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 17:14:46 +0100
Subject: [PATCH 0114/1422] Update NavItem constructor to resolve existing
 routes by key

---
 .../src/Framework/Features/Navigation/NavItem.php          | 2 +-
 packages/framework/tests/Unit/NavItemTest.php              | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index d5e09b898f3..19b4172afe1 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -32,7 +32,7 @@ class NavItem implements Stringable
     public function __construct(Route|string $destination, string $label, int $priority = 500, ?string $group = null)
     {
         if (is_string($destination)) {
-            $destination = new ExternalRoute($destination);
+            $destination = Routes::get($destination) ?? new ExternalRoute($destination);
         }
 
         $this->destination = $destination;
diff --git a/packages/framework/tests/Unit/NavItemTest.php b/packages/framework/tests/Unit/NavItemTest.php
index 47227d4d8c3..9c7d5b2b2b0 100644
--- a/packages/framework/tests/Unit/NavItemTest.php
+++ b/packages/framework/tests/Unit/NavItemTest.php
@@ -53,6 +53,13 @@ public function testPassingRouteInstanceToConstructorUsesRouteInstance()
         $this->assertSame($route, (new NavItem($route, 'Home'))->destination);
     }
 
+    public function testPassingRouteKeyToConstructorUsesRouteInstance()
+    {
+        $route = Routes::get('index');
+
+        $this->assertSame($route, (new NavItem('index', 'Home'))->destination);
+    }
+
     public function testPassingUrlToConstructorUsesExternalRoute()
     {
         $item = new NavItem('https://example.com', 'Home');

From 9716f2cc3e00a67245d458e0a0f1cb38740c3f2b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 17:28:12 +0100
Subject: [PATCH 0115/1422] Deprecate class `DropdownNavItem`

---
 .../src/Framework/Features/Navigation/DropdownNavItem.php       | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/DropdownNavItem.php b/packages/framework/src/Framework/Features/Navigation/DropdownNavItem.php
index aef24a99973..3a8aa3f0a50 100644
--- a/packages/framework/src/Framework/Features/Navigation/DropdownNavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/DropdownNavItem.php
@@ -12,6 +12,8 @@
 /**
  * A navigation item that contains other navigation items.
  *
+ * @deprecated Use the `NavItem::getChildren()` instead.
+ *
  * Unlike a regular navigation items, a dropdown item does not have a route or URL destination.
  */
 class DropdownNavItem extends NavItem

From 68c3b7f6f522a5f20ff7f8ef17907900618b6e34 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 18:12:09 +0100
Subject: [PATCH 0116/1422] Add new `$children` array to `NavItem` class

---
 .../framework/src/Framework/Features/Navigation/NavItem.php    | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 19b4172afe1..0959a516a49 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -26,6 +26,9 @@ class NavItem implements Stringable
     public readonly int $priority;
     public readonly ?string $group;
 
+    /** @var array<\Hyde\Framework\Features\Navigation\NavItem> */
+    public readonly array $children;
+
     /**
      * Create a new navigation menu item.
      */

From 55d4745932240eac90241a5c3c3969901b46726a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 18:13:27 +0100
Subject: [PATCH 0117/1422] Add children array to constructor

---
 .../src/Framework/Features/Navigation/NavItem.php     |  3 ++-
 packages/framework/tests/Unit/NavItemTest.php         | 11 +++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 0959a516a49..61a14cf3ba9 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -32,7 +32,7 @@ class NavItem implements Stringable
     /**
      * Create a new navigation menu item.
      */
-    public function __construct(Route|string $destination, string $label, int $priority = 500, ?string $group = null)
+    public function __construct(Route|string $destination, string $label, int $priority = 500, ?string $group = null, array $children = [])
     {
         if (is_string($destination)) {
             $destination = Routes::get($destination) ?? new ExternalRoute($destination);
@@ -42,6 +42,7 @@ public function __construct(Route|string $destination, string $label, int $prior
         $this->label = $label;
         $this->priority = $priority;
         $this->group = $group;
+        $this->children = $children;
     }
 
     /**
diff --git a/packages/framework/tests/Unit/NavItemTest.php b/packages/framework/tests/Unit/NavItemTest.php
index 9c7d5b2b2b0..bd4702f7676 100644
--- a/packages/framework/tests/Unit/NavItemTest.php
+++ b/packages/framework/tests/Unit/NavItemTest.php
@@ -76,6 +76,17 @@ public function testPassingUnknownRouteKeyToConstructorUsesExternalRoute()
         $this->assertSame('foo', (string) $item->destination);
     }
 
+    public function testCanConstructWithChildren()
+    {
+        $route = new Route(new MarkdownPage());
+        $item = new NavItem($route, 'Test', 500, null, [
+            new NavItem(new Route(new InMemoryPage('foo')), 'Foo', 500),
+            new NavItem(new Route(new InMemoryPage('bar')), 'Bar', 500),
+        ]);
+
+        $this->assertCount(2, $item->children);
+    }
+
     public function testGetDestination()
     {
         $route = new Route(new InMemoryPage('foo'));

From 1a9fc5229b75c767f65967d4c06ff4330ab63278 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 18:14:53 +0100
Subject: [PATCH 0118/1422] Add child getter

---
 .../Framework/Features/Navigation/NavItem.php   | 12 ++++++++++++
 packages/framework/tests/Unit/NavItemTest.php   | 17 +++++++++++++++++
 2 files changed, 29 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 61a14cf3ba9..8aed5f37ed8 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -137,6 +137,18 @@ public function isCurrent(): bool
         return Hyde::currentRoute()->getLink() === (string) $this->destination;
     }
 
+    /**
+     * Get the children of the navigation item.
+     *
+     * For the main navigation menu, this stores any dropdown items.
+     *
+     * @return array<\Hyde\Framework\Features\Navigation\NavItem>
+     */
+    public function getChildren(): array
+    {
+        return $this->children;
+    }
+
     protected static function getRouteGroup(Route $route): ?string
     {
         /** @var string|null $group */
diff --git a/packages/framework/tests/Unit/NavItemTest.php b/packages/framework/tests/Unit/NavItemTest.php
index bd4702f7676..d1aeb3eced7 100644
--- a/packages/framework/tests/Unit/NavItemTest.php
+++ b/packages/framework/tests/Unit/NavItemTest.php
@@ -119,6 +119,23 @@ public function testGetGroup()
         $this->assertNull($navItem->getGroup());
     }
 
+    public function testGetChildren()
+    {
+        $children = [
+            new NavItem(new Route(new InMemoryPage('foo')), 'Foo', 500),
+            new NavItem(new Route(new InMemoryPage('bar')), 'Bar', 500),
+        ];
+
+        $navItem = new NavItem(new Route(new InMemoryPage('foo')), 'Page', 500, null, $children);
+        $this->assertSame($children, $navItem->getChildren());
+    }
+
+    public function testGetChildrenWithNoChildren()
+    {
+        $navItem = new NavItem(new Route(new InMemoryPage('foo')), 'Page', 500);
+        $this->assertEmpty($navItem->getChildren());
+    }
+
     public function testFromRoute()
     {
         $route = new Route(new MarkdownPage());

From 5374dc07f5a0194f731f4fae176a8766b3e73146 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 18:27:47 +0100
Subject: [PATCH 0119/1422] Add new Navigation API section

---
 docs/digging-deeper/navigation.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/docs/digging-deeper/navigation.md b/docs/digging-deeper/navigation.md
index eda34de5fea..4ead086dd8c 100644
--- a/docs/digging-deeper/navigation.md
+++ b/docs/digging-deeper/navigation.md
@@ -319,3 +319,9 @@ Dropdowns are represented by `DropdownNavItem` instances, which extend the `NavI
 use Hyde\Framework\Features\Navigation\NavItem;
 use Hyde\Framework\Features\Navigation\DropdownNavItem;
 ```
+
+## The Navigation API
+
+If you want to interact with the site navigation programmatically, you can do so through the new Navigation API.
+
+For most cases you don't need this, as Hyde creates the navigation for you. But it can be useful for advanced users and package developers.

From 98e10b65a5d0f646715a4c6fbffe9b4c36fbdd0b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 18:33:01 +0100
Subject: [PATCH 0120/1422] Add prefixes to test method names

---
 .../framework/tests/Unit/DropdownNavItemTest.php   | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/framework/tests/Unit/DropdownNavItemTest.php b/packages/framework/tests/Unit/DropdownNavItemTest.php
index 884045acb46..e5d1eaf1cc0 100644
--- a/packages/framework/tests/Unit/DropdownNavItemTest.php
+++ b/packages/framework/tests/Unit/DropdownNavItemTest.php
@@ -32,7 +32,7 @@ public static function tearDownAfterClass(): void
         Render::swap(new RenderData());
     }
 
-    public function testConstruct()
+    public function testDropdownConstruct()
     {
         $item = new DropdownNavItem('foo', []);
 
@@ -41,21 +41,21 @@ public function testConstruct()
         $this->assertSame(999, $item->priority);
     }
 
-    public function testConstructWithCustomPriority()
+    public function testDropdownConstructWithCustomPriority()
     {
         $item = new DropdownNavItem('foo', [], 500);
 
         $this->assertSame(500, $item->priority);
     }
 
-    public function testConstructWithNullPriority()
+    public function testDropdownConstructWithNullPriority()
     {
         $item = new DropdownNavItem('foo', [], null);
 
         $this->assertSame(999, $item->priority);
     }
 
-    public function testFromArray()
+    public function testDropdownFromArray()
     {
         $item = DropdownNavItem::fromArray('foo', []);
 
@@ -63,7 +63,7 @@ public function testFromArray()
         $this->assertSame([], $item->items);
     }
 
-    public function testWithChildren()
+    public function testDropdownWithChildren()
     {
         $children = [
             new NavItem(new Route(new MarkdownPage()), 'bar'),
@@ -76,7 +76,7 @@ public function testWithChildren()
         $this->assertSame($children, $item->items);
     }
 
-    public function testGetItems()
+    public function testDropdownGetItems()
     {
         $children = [
             new NavItem(new Route(new MarkdownPage()), 'bar'),
@@ -89,7 +89,7 @@ public function testGetItems()
         $this->assertSame($children, $item->getItems()->all());
     }
 
-    public function testCanSetPriorityInConfig()
+    public function testCanSetDropdownPriorityInConfig()
     {
         $root = Config::getFacadeRoot();
         $mock = clone $root;

From 7ad9e4913fd1ed074c4ae0efc4fac29e41b21e50 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 18:36:55 +0100
Subject: [PATCH 0121/1422] Copy legacy config resolver to new class

---
 .../src/Framework/Features/Navigation/NavItem.php    | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 8aed5f37ed8..6ac062d6721 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -161,4 +161,16 @@ protected static function normalizeGroupKey(?string $group): ?string
     {
         return $group ? Str::slug($group) : null;
     }
+
+    protected function searchForDropdownPriorityInNavigationConfig(string $groupKey): ?int
+    {
+        /** @var array<string, int> $config */
+        $config = Config::getArray('hyde.navigation.order', [
+            'index' => 0,
+            'posts' => 10,
+            'docs/index' => 100,
+        ]);
+
+        return $config[$groupKey] ?? null;
+    }
 }

From 43e8d5ea5e199b2249adb7dd19efb688d8add15f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 18:38:28 +0100
Subject: [PATCH 0122/1422] Import namespace

---
 packages/framework/src/Framework/Features/Navigation/NavItem.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 6ac062d6721..2084d91bfe8 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -4,6 +4,7 @@
 
 namespace Hyde\Framework\Features\Navigation;
 
+use Hyde\Facades\Config;
 use Hyde\Foundation\Facades\Routes;
 use Hyde\Hyde;
 use Hyde\Support\Models\Route;

From 82ee80d61c086c2ef09c95a09a3c8e2d992ed29a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 18:40:01 +0100
Subject: [PATCH 0123/1422] Remove child method inherited by parent

---
 .../Features/Navigation/DropdownNavItem.php         | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DropdownNavItem.php b/packages/framework/src/Framework/Features/Navigation/DropdownNavItem.php
index 3a8aa3f0a50..a5e55fffd6b 100644
--- a/packages/framework/src/Framework/Features/Navigation/DropdownNavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/DropdownNavItem.php
@@ -4,7 +4,6 @@
 
 namespace Hyde\Framework\Features\Navigation;
 
-use Hyde\Facades\Config;
 use Illuminate\Support\Collection;
 
 use function collect;
@@ -39,16 +38,4 @@ public function getItems(): Collection
     {
         return collect($this->items);
     }
-
-    private function searchForDropdownPriorityInNavigationConfig(string $groupKey): ?int
-    {
-        /** @var array<string, int> $config */
-        $config = Config::getArray('hyde.navigation.order', [
-            'index' => 0,
-            'posts' => 10,
-            'docs/index' => 100,
-        ]);
-
-        return $config[$groupKey] ?? null;
-    }
 }

From 229adab2a1d53c64a4973fdfa2558f81c769f414 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 18:46:29 +0100
Subject: [PATCH 0124/1422] Make helper static

---
 .../src/Framework/Features/Navigation/DropdownNavItem.php       | 2 +-
 .../framework/src/Framework/Features/Navigation/NavItem.php     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DropdownNavItem.php b/packages/framework/src/Framework/Features/Navigation/DropdownNavItem.php
index a5e55fffd6b..b3119bb0827 100644
--- a/packages/framework/src/Framework/Features/Navigation/DropdownNavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/DropdownNavItem.php
@@ -23,7 +23,7 @@ class DropdownNavItem extends NavItem
     /** @param array<NavItem> $items */
     public function __construct(string $label, array $items, ?int $priority = null)
     {
-        parent::__construct('', $label, $priority ?? $this->searchForDropdownPriorityInNavigationConfig($label) ?? 999);
+        parent::__construct('', $label, $priority ?? static::searchForDropdownPriorityInNavigationConfig($label) ?? 999);
         $this->items = $items;
     }
 
diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 2084d91bfe8..663954b5ef6 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -163,7 +163,7 @@ protected static function normalizeGroupKey(?string $group): ?string
         return $group ? Str::slug($group) : null;
     }
 
-    protected function searchForDropdownPriorityInNavigationConfig(string $groupKey): ?int
+    protected static function searchForDropdownPriorityInNavigationConfig(string $groupKey): ?int
     {
         /** @var array<string, int> $config */
         $config = Config::getArray('hyde.navigation.order', [

From 47f1b9b49c6f7d447d2f206602bbde139c84af30 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 18:46:34 +0100
Subject: [PATCH 0125/1422] Add todo

---
 .../framework/src/Framework/Features/Navigation/NavItem.php     | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 663954b5ef6..dfe6e0a8a91 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -15,6 +15,8 @@
 /**
  * Abstraction for a navigation menu item. Used by the MainNavigationMenu and DocumentationSidebar classes.
  *
+ * @todo Consider splitting facade methods to actual facade class.
+ *
  * You have a few options to construct a navigation menu item:
  *   1. You can supply a Route directly and explicit properties to the constructor
  *   2. You can use NavItem::fromRoute() to use data from the route

From a90d49c75da01b13f3d7a68e4cbcce4b1885e047 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 18:52:55 +0100
Subject: [PATCH 0126/1422] Add a `NavItem::dropdown()` facade helper

---
 .../Framework/Features/Navigation/NavItem.php | 12 +++++++++
 packages/framework/tests/Unit/NavItemTest.php | 27 +++++++++++++++++++
 2 files changed, 39 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index dfe6e0a8a91..4f5f6fdbde0 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -82,6 +82,18 @@ public static function forRoute(Route|string $route, ?string $label = null, ?int
         return static::fromRoute($route instanceof Route ? $route : Routes::getOrFail($route), $label, $priority, $group);
     }
 
+    /**
+     * Create a new dropdown navigation menu item.
+     *
+     * @param  string  $label  The label of the dropdown item.
+     * @param  array<NavItem>  $items  The items to be included in the dropdown.
+     * @param  int|null  $priority  The priority of the dropdown item. Leave blank to use the default priority.
+     */
+    public static function dropdown(string $label, array $items, ?int $priority = null): static
+    {
+        return new static('', $label, $priority ?? static::searchForDropdownPriorityInNavigationConfig($label) ?? 999, null, $items);
+    }
+
     /**
      * Resolve a link to the navigation item.
      */
diff --git a/packages/framework/tests/Unit/NavItemTest.php b/packages/framework/tests/Unit/NavItemTest.php
index d1aeb3eced7..e7b68398824 100644
--- a/packages/framework/tests/Unit/NavItemTest.php
+++ b/packages/framework/tests/Unit/NavItemTest.php
@@ -231,6 +231,33 @@ public function testRouteBasedNavItemDestinationsAreResolvedRelatively()
         $this->assertSame('../../foo/bar.html', (string) NavItem::fromRoute(new Route(new InMemoryPage('foo/bar'))));
     }
 
+    public function testDropdownFacade()
+    {
+        $item = NavItem::dropdown('foo', []);
+
+        $this->assertSame('foo', $item->label);
+        $this->assertSame([], $item->getChildren());
+        $this->assertSame(999, $item->priority);
+    }
+
+    public function testDropdownFacadeWithChildren()
+    {
+        $children = [
+            new NavItem(new Route(new MarkdownPage()), 'bar'),
+        ];
+
+        $item = NavItem::dropdown('foo', $children);
+        $this->assertSame($children, $item->getChildren());
+        $this->assertSame(999, $item->priority);
+    }
+
+    public function testDropdownFacadeWithCustomPriority()
+    {
+        $item = NavItem::dropdown('foo', [], 500);
+
+        $this->assertSame(500, $item->priority);
+    }
+
     public function testIsCurrent()
     {
         Render::swap(Mockery::mock(RenderData::class, [

From 8068a2c0951e8813ae026c62c7e150bb4da3063e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 19:05:26 +0100
Subject: [PATCH 0127/1422] Merge legacy tests into new class

---
 .../tests/Unit/DropdownNavItemTest.php        | 92 +------------------
 packages/framework/tests/Unit/NavItemTest.php | 34 ++++++-
 2 files changed, 33 insertions(+), 93 deletions(-)

diff --git a/packages/framework/tests/Unit/DropdownNavItemTest.php b/packages/framework/tests/Unit/DropdownNavItemTest.php
index e5d1eaf1cc0..66b046c3008 100644
--- a/packages/framework/tests/Unit/DropdownNavItemTest.php
+++ b/packages/framework/tests/Unit/DropdownNavItemTest.php
@@ -4,13 +4,6 @@
 
 namespace Hyde\Framework\Testing\Unit;
 
-use Hyde\Facades\Config;
-use Hyde\Framework\Features\Navigation\DropdownNavItem;
-use Hyde\Framework\Features\Navigation\NavItem;
-use Hyde\Pages\MarkdownPage;
-use Hyde\Support\Facades\Render;
-use Hyde\Support\Models\RenderData;
-use Hyde\Support\Models\Route;
 use Hyde\Testing\UnitTestCase;
 
 /**
@@ -18,88 +11,5 @@
  */
 class DropdownNavItemTest extends UnitTestCase
 {
-    protected static bool $needsKernel = true;
-    protected static bool $needsConfig = true;
-
-    public static function setUpBeforeClass(): void
-    {
-        parent::setUpBeforeClass();
-        Render::swap(new RenderData());
-    }
-
-    public static function tearDownAfterClass(): void
-    {
-        Render::swap(new RenderData());
-    }
-
-    public function testDropdownConstruct()
-    {
-        $item = new DropdownNavItem('foo', []);
-
-        $this->assertSame('foo', $item->label);
-        $this->assertSame([], $item->items);
-        $this->assertSame(999, $item->priority);
-    }
-
-    public function testDropdownConstructWithCustomPriority()
-    {
-        $item = new DropdownNavItem('foo', [], 500);
-
-        $this->assertSame(500, $item->priority);
-    }
-
-    public function testDropdownConstructWithNullPriority()
-    {
-        $item = new DropdownNavItem('foo', [], null);
-
-        $this->assertSame(999, $item->priority);
-    }
-
-    public function testDropdownFromArray()
-    {
-        $item = DropdownNavItem::fromArray('foo', []);
-
-        $this->assertSame('foo', $item->label);
-        $this->assertSame([], $item->items);
-    }
-
-    public function testDropdownWithChildren()
-    {
-        $children = [
-            new NavItem(new Route(new MarkdownPage()), 'bar'),
-        ];
-
-        $item = new DropdownNavItem('foo', $children);
-        $this->assertSame($children, $item->items);
-
-        $item = DropdownNavItem::fromArray('foo', $children);
-        $this->assertSame($children, $item->items);
-    }
-
-    public function testDropdownGetItems()
-    {
-        $children = [
-            new NavItem(new Route(new MarkdownPage()), 'bar'),
-        ];
-
-        $item = new DropdownNavItem('foo', $children);
-        $this->assertSame($children, $item->getItems()->all());
-
-        $item = DropdownNavItem::fromArray('foo', $children);
-        $this->assertSame($children, $item->getItems()->all());
-    }
-
-    public function testCanSetDropdownPriorityInConfig()
-    {
-        $root = Config::getFacadeRoot();
-        $mock = clone $root;
-        Config::swap($mock);
-
-        Config::set('hyde.navigation.order.foo', 500);
-        $item = new DropdownNavItem('foo', []);
-
-        $this->assertSame(500, $item->priority);
-
-        Config::swap($root);
-    }
+    //
 }
diff --git a/packages/framework/tests/Unit/NavItemTest.php b/packages/framework/tests/Unit/NavItemTest.php
index e7b68398824..50627013951 100644
--- a/packages/framework/tests/Unit/NavItemTest.php
+++ b/packages/framework/tests/Unit/NavItemTest.php
@@ -79,12 +79,42 @@ public function testPassingUnknownRouteKeyToConstructorUsesExternalRoute()
     public function testCanConstructWithChildren()
     {
         $route = new Route(new MarkdownPage());
-        $item = new NavItem($route, 'Test', 500, null, [
+        $children = [
+            new NavItem(new Route(new InMemoryPage('foo')), 'Foo', 500),
+            new NavItem(new Route(new InMemoryPage('bar')), 'Bar', 500),
+        ];
+        $item = new NavItem($route, 'Test', 500, null, $children);
+
+        $this->assertSame('Test', $item->label);
+        $this->assertSame($route, $item->destination);
+        $this->assertSame(500, $item->priority);
+
+        $this->assertCount(2, $item->children);
+        $this->assertSame($children, $item->children);
+
+        $this->assertSame('Foo', $item->children[0]->label);
+        $this->assertSame('Bar', $item->children[1]->label);
+
+        $this->assertSame('foo.html', $item->children[0]->getLink());
+        $this->assertSame('bar.html', $item->children[1]->getLink());
+
+        $this->assertSame(500, $item->children[0]->priority);
+        $this->assertSame(500, $item->children[1]->priority);
+    }
+
+    public function testCanConstructWithChildrenWithoutRoute()
+    {
+        $children = [
             new NavItem(new Route(new InMemoryPage('foo')), 'Foo', 500),
             new NavItem(new Route(new InMemoryPage('bar')), 'Bar', 500),
-        ]);
+        ];
+        $item = new NavItem('', 'Test', 500, null, $children);
+
+        $this->assertSame('Test', $item->label);
+        $this->assertSame('', $item->destination->getLink());
 
         $this->assertCount(2, $item->children);
+        $this->assertSame($children, $item->children);
     }
 
     public function testGetDestination()

From 920868f1b1c0faa1ca3b7630b976d542b525203c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 19:20:05 +0100
Subject: [PATCH 0128/1422] Delete DropdownNavItemTest.php

---
 .../framework/tests/Unit/DropdownNavItemTest.php  | 15 ---------------
 1 file changed, 15 deletions(-)
 delete mode 100644 packages/framework/tests/Unit/DropdownNavItemTest.php

diff --git a/packages/framework/tests/Unit/DropdownNavItemTest.php b/packages/framework/tests/Unit/DropdownNavItemTest.php
deleted file mode 100644
index 66b046c3008..00000000000
--- a/packages/framework/tests/Unit/DropdownNavItemTest.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Hyde\Framework\Testing\Unit;
-
-use Hyde\Testing\UnitTestCase;
-
-/**
- * @covers \Hyde\Framework\Features\Navigation\DropdownNavItem
- */
-class DropdownNavItemTest extends UnitTestCase
-{
-    //
-}

From c1848d2556866bc0de0a380c4c70fc1b241118fa Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 19:25:37 +0100
Subject: [PATCH 0129/1422] Inline fromArray method to simplify impending class
 removal

---
 .../Features/Navigation/DropdownNavItem.php          |  6 ------
 .../framework/tests/Feature/NavigationMenuTest.php   | 12 ++++++------
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DropdownNavItem.php b/packages/framework/src/Framework/Features/Navigation/DropdownNavItem.php
index b3119bb0827..04bf803cdd0 100644
--- a/packages/framework/src/Framework/Features/Navigation/DropdownNavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/DropdownNavItem.php
@@ -27,12 +27,6 @@ public function __construct(string $label, array $items, ?int $priority = null)
         $this->items = $items;
     }
 
-    /** @param array<NavItem> $items */
-    public static function fromArray(string $name, array $items): static
-    {
-        return new static($name, $items);
-    }
-
     /** @return Collection<NavItem> */
     public function getItems(): Collection
     {
diff --git a/packages/framework/tests/Feature/NavigationMenuTest.php b/packages/framework/tests/Feature/NavigationMenuTest.php
index 1b5ee518592..e7b3fc1e454 100644
--- a/packages/framework/tests/Feature/NavigationMenuTest.php
+++ b/packages/framework/tests/Feature/NavigationMenuTest.php
@@ -226,7 +226,7 @@ public function testPagesInSubdirectoriesAreNotAddedToTheNavigationMenuWithConfi
         $menu = $this->createNavigationMenu();
         $expected = collect([
             NavItem::fromRoute(Routes::get('index')),
-            DropdownNavItem::fromArray('foo', [
+            new DropdownNavItem('foo', [
                 NavItem::fromRoute(Routes::get('foo/bar')),
             ]),
         ]);
@@ -272,7 +272,7 @@ public function testGetDropdownsReturnsCorrectArrayWhenThereAreDropdowns()
         $this->assertCount(1, $menu->getDropdowns());
 
         $this->assertEquals([
-            DropdownNavItem::fromArray('foo', [
+            new DropdownNavItem('foo', [
                 NavItem::fromRoute((new MarkdownPage('foo/bar'))->getRoute()),
             ]), ], $menu->getDropdowns());
     }
@@ -288,7 +288,7 @@ public function testGetDropdownsWithMultipleItems()
         $this->assertCount(1, $menu->getDropdowns());
 
         $this->assertEquals([
-            DropdownNavItem::fromArray('foo', [
+            new DropdownNavItem('foo', [
                 NavItem::fromRoute((new MarkdownPage('foo/bar'))->getRoute()),
                 NavItem::fromRoute((new MarkdownPage('foo/baz'))->getRoute()),
             ]),
@@ -308,11 +308,11 @@ public function testGetDropdownsWithMultipleDropdowns()
         $this->assertCount(2, $menu->getDropdowns());
 
         $this->assertEquals([
-            DropdownNavItem::fromArray('foo', [
+            new DropdownNavItem('foo', [
                 NavItem::fromRoute((new MarkdownPage('foo/bar'))->getRoute()),
                 NavItem::fromRoute((new MarkdownPage('foo/baz'))->getRoute()),
             ]),
-            DropdownNavItem::fromArray('cat', [
+            new DropdownNavItem('cat', [
                 NavItem::fromRoute((new MarkdownPage('cat/hat'))->getRoute()),
             ]),
         ], $menu->getDropdowns());
@@ -363,7 +363,7 @@ public function testPagesInDropdownsDoNotGetAddedToTheMainNavigation()
         $this->assertEquals([
             NavItem::fromRoute(Routes::get('index')),
             NavItem::fromRoute((new MarkdownPage('foo'))->getRoute()),
-            DropdownNavItem::fromArray('bar', [
+            new DropdownNavItem('bar', [
                 NavItem::fromRoute((new MarkdownPage('bar/baz'))->getRoute()),
             ]),
         ], $menu->getItems()->all());

From 948d64766f58d741aa29f2e67bc3fed376eb1bcb Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 19:42:27 +0100
Subject: [PATCH 0130/1422] Inline getItems method to simplify impending class
 removal

---
 .../Framework/Features/Navigation/DropdownNavItem.php  | 10 ----------
 .../framework/tests/Feature/NavigationMenuTest.php     |  2 +-
 2 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DropdownNavItem.php b/packages/framework/src/Framework/Features/Navigation/DropdownNavItem.php
index 04bf803cdd0..5aaa80eeed5 100644
--- a/packages/framework/src/Framework/Features/Navigation/DropdownNavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/DropdownNavItem.php
@@ -4,10 +4,6 @@
 
 namespace Hyde\Framework\Features\Navigation;
 
-use Illuminate\Support\Collection;
-
-use function collect;
-
 /**
  * A navigation item that contains other navigation items.
  *
@@ -26,10 +22,4 @@ public function __construct(string $label, array $items, ?int $priority = null)
         parent::__construct('', $label, $priority ?? static::searchForDropdownPriorityInNavigationConfig($label) ?? 999);
         $this->items = $items;
     }
-
-    /** @return Collection<NavItem> */
-    public function getItems(): Collection
-    {
-        return collect($this->items);
-    }
 }
diff --git a/packages/framework/tests/Feature/NavigationMenuTest.php b/packages/framework/tests/Feature/NavigationMenuTest.php
index e7b3fc1e454..75134937f07 100644
--- a/packages/framework/tests/Feature/NavigationMenuTest.php
+++ b/packages/framework/tests/Feature/NavigationMenuTest.php
@@ -380,7 +380,7 @@ public function testDropdownMenuItemsAreSortedByPriority()
         $menu = $this->createNavigationMenu();
         $dropdowns = $menu->getDropdowns();
 
-        $this->assertSame(['Foo', 'Bar', 'Baz'], $dropdowns[0]->getItems()->pluck('label')->toArray());
+        $this->assertSame(['Foo', 'Bar', 'Baz'], collect($dropdowns[0]->items)->pluck('label')->toArray());
     }
 
     protected function createNavigationMenu(): NavigationMenu

From 0747f2824f4493b1a92901226481ee7ba302bf3d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 19:49:10 +0100
Subject: [PATCH 0131/1422] Deprecate items array

---
 .../src/Framework/Features/Navigation/DropdownNavItem.php       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DropdownNavItem.php b/packages/framework/src/Framework/Features/Navigation/DropdownNavItem.php
index 5aaa80eeed5..38fc99d055f 100644
--- a/packages/framework/src/Framework/Features/Navigation/DropdownNavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/DropdownNavItem.php
@@ -13,7 +13,7 @@
  */
 class DropdownNavItem extends NavItem
 {
-    /** @var array<NavItem> */
+    /** @deprecated */
     public array $items;
 
     /** @param array<NavItem> $items */

From 74c2d9a806fe407c736c0d2f57eb390ce3e2b530 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 19:49:27 +0100
Subject: [PATCH 0132/1422] Add temporary compatibility for class being removed

---
 .../src/Framework/Features/Navigation/DropdownNavItem.php        | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/DropdownNavItem.php b/packages/framework/src/Framework/Features/Navigation/DropdownNavItem.php
index 38fc99d055f..99620af32e2 100644
--- a/packages/framework/src/Framework/Features/Navigation/DropdownNavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/DropdownNavItem.php
@@ -21,5 +21,6 @@ public function __construct(string $label, array $items, ?int $priority = null)
     {
         parent::__construct('', $label, $priority ?? static::searchForDropdownPriorityInNavigationConfig($label) ?? 999);
         $this->items = $items;
+        $this->children = $items;
     }
 }

From 57f0f151b9ccf4be4277ba8b0f9fb5eabf525827 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 19:49:52 +0100
Subject: [PATCH 0133/1422] Fix readonly assignment

---
 .../src/Framework/Features/Navigation/DropdownNavItem.php      | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DropdownNavItem.php b/packages/framework/src/Framework/Features/Navigation/DropdownNavItem.php
index 99620af32e2..84753e80fa9 100644
--- a/packages/framework/src/Framework/Features/Navigation/DropdownNavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/DropdownNavItem.php
@@ -19,8 +19,7 @@ class DropdownNavItem extends NavItem
     /** @param array<NavItem> $items */
     public function __construct(string $label, array $items, ?int $priority = null)
     {
-        parent::__construct('', $label, $priority ?? static::searchForDropdownPriorityInNavigationConfig($label) ?? 999);
+        parent::__construct('', $label, $priority ?? static::searchForDropdownPriorityInNavigationConfig($label) ?? 999, children: $items);
         $this->items = $items;
-        $this->children = $items;
     }
 }

From cf888d9435cb6d22b7c097179742683ada3ca8b6 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 19:56:00 +0100
Subject: [PATCH 0134/1422] Get children instead of deprecated items

---
 packages/framework/resources/views/layouts/navigation.blade.php | 2 +-
 packages/framework/tests/Feature/NavigationMenuTest.php         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/resources/views/layouts/navigation.blade.php b/packages/framework/resources/views/layouts/navigation.blade.php
index ba8c148b583..aabc9e671f0 100644
--- a/packages/framework/resources/views/layouts/navigation.blade.php
+++ b/packages/framework/resources/views/layouts/navigation.blade.php
@@ -36,7 +36,7 @@
             @foreach ($navigation->getItems() as $item)
                 <li class="md:mx-2">
                     @if($item instanceof \Hyde\Framework\Features\Navigation\DropdownNavItem)
-                        <x-hyde::navigation.dropdown :label="\Hyde\Hyde::makeTitle($item->label)" :items="$item->items"/>
+                        <x-hyde::navigation.dropdown :label="\Hyde\Hyde::makeTitle($item->label)" :items="$item->getChildren()"/>
                     @else
                         @include('hyde::components.navigation.navigation-link')
                     @endif
diff --git a/packages/framework/tests/Feature/NavigationMenuTest.php b/packages/framework/tests/Feature/NavigationMenuTest.php
index 75134937f07..e9c522c0f4f 100644
--- a/packages/framework/tests/Feature/NavigationMenuTest.php
+++ b/packages/framework/tests/Feature/NavigationMenuTest.php
@@ -380,7 +380,7 @@ public function testDropdownMenuItemsAreSortedByPriority()
         $menu = $this->createNavigationMenu();
         $dropdowns = $menu->getDropdowns();
 
-        $this->assertSame(['Foo', 'Bar', 'Baz'], collect($dropdowns[0]->items)->pluck('label')->toArray());
+        $this->assertSame(['Foo', 'Bar', 'Baz'], collect($dropdowns[0]->getChildren())->pluck('label')->toArray());
     }
 
     protected function createNavigationMenu(): NavigationMenu

From 04128ab455ea88888cc9aa9bece9e1c2ef82f09e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 19:57:21 +0100
Subject: [PATCH 0135/1422] Remove items array

---
 .../src/Framework/Features/Navigation/DropdownNavItem.php     | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DropdownNavItem.php b/packages/framework/src/Framework/Features/Navigation/DropdownNavItem.php
index 84753e80fa9..d774008d46f 100644
--- a/packages/framework/src/Framework/Features/Navigation/DropdownNavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/DropdownNavItem.php
@@ -13,13 +13,9 @@
  */
 class DropdownNavItem extends NavItem
 {
-    /** @deprecated */
-    public array $items;
-
     /** @param array<NavItem> $items */
     public function __construct(string $label, array $items, ?int $priority = null)
     {
         parent::__construct('', $label, $priority ?? static::searchForDropdownPriorityInNavigationConfig($label) ?? 999, children: $items);
-        $this->items = $items;
     }
 }

From e093242a243007f841e8271c748b331ad551613e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 20:05:15 +0100
Subject: [PATCH 0136/1422] Add additional unit test

---
 packages/framework/tests/Unit/NavItemTest.php | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/packages/framework/tests/Unit/NavItemTest.php b/packages/framework/tests/Unit/NavItemTest.php
index 50627013951..2d3a81ed193 100644
--- a/packages/framework/tests/Unit/NavItemTest.php
+++ b/packages/framework/tests/Unit/NavItemTest.php
@@ -298,6 +298,24 @@ public function testIsCurrent()
         $this->assertFalse(NavItem::fromRoute(new Route(new InMemoryPage('bar')))->isCurrent());
     }
 
+    public function testIsCurrentWithExternalRoute()
+    {
+        Render::swap(Mockery::mock(RenderData::class, [
+            'getRoute' => (new Route(new InMemoryPage('foo'))),
+            'getRouteKey' => 'foo',
+        ]));
+        $this->assertFalse(NavItem::forLink('foo', 'bar')->isCurrent());
+        $this->assertFalse(NavItem::forLink('https://example.com', 'bar')->isCurrent());
+
+        Render::swap(Mockery::mock(RenderData::class, [
+            'getRoute' => new ExternalRoute('foo'),
+            'getRouteKey' => 'foo',
+        ]));
+
+        $this->assertTrue(NavItem::forLink('foo', 'bar')->isCurrent());
+        $this->assertFalse(NavItem::forLink('https://example.com', 'bar')->isCurrent());
+    }
+
     public function testGetGroupWithNoGroup()
     {
         $this->assertNull((new NavItem(new Route(new MarkdownPage()), 'Test', 500))->getGroup());

From d6a031dc84bb134bb1e5be378b990779dfaedf27 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 20:05:35 +0100
Subject: [PATCH 0137/1422] Remove assertions not reachable by code

This should not be possible by the code itself
---
 packages/framework/tests/Unit/NavItemTest.php | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/packages/framework/tests/Unit/NavItemTest.php b/packages/framework/tests/Unit/NavItemTest.php
index 2d3a81ed193..e5860a02726 100644
--- a/packages/framework/tests/Unit/NavItemTest.php
+++ b/packages/framework/tests/Unit/NavItemTest.php
@@ -306,14 +306,6 @@ public function testIsCurrentWithExternalRoute()
         ]));
         $this->assertFalse(NavItem::forLink('foo', 'bar')->isCurrent());
         $this->assertFalse(NavItem::forLink('https://example.com', 'bar')->isCurrent());
-
-        Render::swap(Mockery::mock(RenderData::class, [
-            'getRoute' => new ExternalRoute('foo'),
-            'getRouteKey' => 'foo',
-        ]));
-
-        $this->assertTrue(NavItem::forLink('foo', 'bar')->isCurrent());
-        $this->assertFalse(NavItem::forLink('https://example.com', 'bar')->isCurrent());
     }
 
     public function testGetGroupWithNoGroup()

From 9cb345be077fbfb2421dd67c799b5bd7d787ea70 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 20:05:56 +0100
Subject: [PATCH 0138/1422] Remove unnecessary parentheses in file

---
 packages/framework/tests/Unit/NavItemTest.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/framework/tests/Unit/NavItemTest.php b/packages/framework/tests/Unit/NavItemTest.php
index e5860a02726..a91f22f060b 100644
--- a/packages/framework/tests/Unit/NavItemTest.php
+++ b/packages/framework/tests/Unit/NavItemTest.php
@@ -237,7 +237,7 @@ public function testForRouteWithCustomPriority()
     public function testRouteBasedNavItemDestinationsAreResolvedRelatively()
     {
         Render::swap(Mockery::mock(RenderData::class, [
-            'getRoute' => (new Route(new InMemoryPage('foo'))),
+            'getRoute' => new Route(new InMemoryPage('foo')),
             'getRouteKey' => 'foo',
         ]));
 
@@ -245,7 +245,7 @@ public function testRouteBasedNavItemDestinationsAreResolvedRelatively()
         $this->assertSame('foo/bar.html', (string) NavItem::fromRoute(new Route(new InMemoryPage('foo/bar'))));
 
         Render::swap(Mockery::mock(RenderData::class, [
-            'getRoute' => (new Route(new InMemoryPage('foo/bar'))),
+            'getRoute' => new Route(new InMemoryPage('foo/bar')),
             'getRouteKey' => 'foo/bar',
         ]));
 
@@ -253,7 +253,7 @@ public function testRouteBasedNavItemDestinationsAreResolvedRelatively()
         $this->assertSame('../foo/bar.html', (string) NavItem::fromRoute(new Route(new InMemoryPage('foo/bar'))));
 
         Render::swap(Mockery::mock(RenderData::class, [
-            'getRoute' => (new Route(new InMemoryPage('foo/bar/baz'))),
+            'getRoute' => new Route(new InMemoryPage('foo/bar/baz')),
             'getRouteKey' => 'foo/bar/baz',
         ]));
 
@@ -291,7 +291,7 @@ public function testDropdownFacadeWithCustomPriority()
     public function testIsCurrent()
     {
         Render::swap(Mockery::mock(RenderData::class, [
-            'getRoute' => (new Route(new InMemoryPage('foo'))),
+            'getRoute' => new Route(new InMemoryPage('foo')),
             'getRouteKey' => 'foo',
         ]));
         $this->assertTrue(NavItem::fromRoute(new Route(new InMemoryPage('foo')))->isCurrent());
@@ -301,7 +301,7 @@ public function testIsCurrent()
     public function testIsCurrentWithExternalRoute()
     {
         Render::swap(Mockery::mock(RenderData::class, [
-            'getRoute' => (new Route(new InMemoryPage('foo'))),
+            'getRoute' => new Route(new InMemoryPage('foo')),
             'getRouteKey' => 'foo',
         ]));
         $this->assertFalse(NavItem::forLink('foo', 'bar')->isCurrent());

From ca831e2303b538f1bb1573cbd3abb6024c738b2b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 20:06:34 +0100
Subject: [PATCH 0139/1422] Move up helper in source

---
 .../Framework/Features/Navigation/NavItem.php    | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 4f5f6fdbde0..45700426222 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -144,14 +144,6 @@ public function getGroup(): ?string
         return $this->group;
     }
 
-    /**
-     * Check if the NavItem instance is the current page.
-     */
-    public function isCurrent(): bool
-    {
-        return Hyde::currentRoute()->getLink() === (string) $this->destination;
-    }
-
     /**
      * Get the children of the navigation item.
      *
@@ -164,6 +156,14 @@ public function getChildren(): array
         return $this->children;
     }
 
+    /**
+     * Check if the NavItem instance is the current page.
+     */
+    public function isCurrent(): bool
+    {
+        return Hyde::currentRoute()->getLink() === (string) $this->destination;
+    }
+
     protected static function getRouteGroup(Route $route): ?string
     {
         /** @var string|null $group */

From 90b2c44b41141af362afb85190a496956812822f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 20:08:01 +0100
Subject: [PATCH 0140/1422] Add a `NavItem::hasChildren()` helper

---
 .../src/Framework/Features/Navigation/NavItem.php |  8 ++++++++
 packages/framework/tests/Unit/NavItemTest.php     | 15 +++++++++++++++
 2 files changed, 23 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 45700426222..562b8b55922 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -156,6 +156,14 @@ public function getChildren(): array
         return $this->children;
     }
 
+    /**
+     * Check if the NavItem instance has children.
+     */
+    public function hasChildren(): bool
+    {
+        return count($this->children) > 0;
+    }
+
     /**
      * Check if the NavItem instance is the current page.
      */
diff --git a/packages/framework/tests/Unit/NavItemTest.php b/packages/framework/tests/Unit/NavItemTest.php
index a91f22f060b..78e3407b0f7 100644
--- a/packages/framework/tests/Unit/NavItemTest.php
+++ b/packages/framework/tests/Unit/NavItemTest.php
@@ -288,6 +288,21 @@ public function testDropdownFacadeWithCustomPriority()
         $this->assertSame(500, $item->priority);
     }
 
+    public function testHasChildren()
+    {
+        $item = new NavItem(new Route(new MarkdownPage()), 'Test', 500);
+        $this->assertFalse($item->hasChildren());
+    }
+
+    public function testHasChildrenWithChildren()
+    {
+        $item = new NavItem(new Route(new MarkdownPage()), 'Test', 500, null, [
+            new NavItem(new Route(new InMemoryPage('foo')), 'Foo', 500),
+            new NavItem(new Route(new InMemoryPage('bar')), 'Bar', 500),
+        ]);
+        $this->assertTrue($item->hasChildren());
+    }
+
     public function testIsCurrent()
     {
         Render::swap(Mockery::mock(RenderData::class, [

From 98a3b6c81a7f5f643d0899c084f774b72f88ccee Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 20:09:26 +0100
Subject: [PATCH 0141/1422] Check dropdown state using helper instead of
 instanceof

---
 packages/framework/resources/views/layouts/navigation.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/resources/views/layouts/navigation.blade.php b/packages/framework/resources/views/layouts/navigation.blade.php
index aabc9e671f0..899ccd75f31 100644
--- a/packages/framework/resources/views/layouts/navigation.blade.php
+++ b/packages/framework/resources/views/layouts/navigation.blade.php
@@ -35,7 +35,7 @@
         <ul aria-label="Navigation links" class="md:flex-grow md:flex justify-end">
             @foreach ($navigation->getItems() as $item)
                 <li class="md:mx-2">
-                    @if($item instanceof \Hyde\Framework\Features\Navigation\DropdownNavItem)
+                    @if($item->hasChildren())
                         <x-hyde::navigation.dropdown :label="\Hyde\Hyde::makeTitle($item->label)" :items="$item->getChildren()"/>
                     @else
                         @include('hyde::components.navigation.navigation-link')

From 7f754b5fb96d63bece7b8bb6259ca066800a5d36 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 20:24:35 +0100
Subject: [PATCH 0142/1422] Add todo

---
 packages/framework/src/Framework/Features/Navigation/NavItem.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 562b8b55922..8aa758eb100 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -16,6 +16,7 @@
  * Abstraction for a navigation menu item. Used by the MainNavigationMenu and DocumentationSidebar classes.
  *
  * @todo Consider splitting facade methods to actual facade class.
+ * @todo Consider adding an "identifier" property to make it more visible how items are identified, for example when modifying sidebars in the config.
  *
  * You have a few options to construct a navigation menu item:
  *   1. You can supply a Route directly and explicit properties to the constructor

From 6d0603309eb53a2ccfea96ebb4f60b151b0de539 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 20:32:57 +0100
Subject: [PATCH 0143/1422] No longer throw exception when disabled

Since children can now manually be added we can't throw for this anymore
---
 .../src/Framework/Features/Navigation/NavigationMenu.php | 5 -----
 packages/framework/tests/Feature/NavigationMenuTest.php  | 9 +++------
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
index 3d2538f4877..6bc0ccfb2f1 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
@@ -5,7 +5,6 @@
 namespace Hyde\Framework\Features\Navigation;
 
 use Hyde\Facades\Config;
-use BadMethodCallException;
 use Illuminate\Support\Collection;
 use Illuminate\Contracts\Support\Arrayable;
 
@@ -44,10 +43,6 @@ public function hasDropdowns(): bool
      */
     public function getDropdowns(): array
     {
-        if (! $this->dropdownsEnabled()) {
-            throw new BadMethodCallException('Dropdowns are not enabled. Enable it by setting `hyde.navigation.subdirectories` to `dropdown`.');
-        }
-
         return $this->items->filter(function (NavItem $item): bool {
             return $item instanceof DropdownNavItem;
         })->values()->all();
diff --git a/packages/framework/tests/Feature/NavigationMenuTest.php b/packages/framework/tests/Feature/NavigationMenuTest.php
index e9c522c0f4f..50df269e621 100644
--- a/packages/framework/tests/Feature/NavigationMenuTest.php
+++ b/packages/framework/tests/Feature/NavigationMenuTest.php
@@ -4,7 +4,6 @@
 
 namespace Hyde\Framework\Testing\Feature;
 
-use BadMethodCallException;
 use Hyde\Support\Models\Route;
 use Hyde\Foundation\Facades\Routes;
 use Hyde\Framework\Features\Navigation\NavigationMenu;
@@ -318,13 +317,11 @@ public function testGetDropdownsWithMultipleDropdowns()
         ], $menu->getDropdowns());
     }
 
-    public function testGetDropdownsThrowsExceptionWhenDisabled()
+    public function testGetDropdownsDoesNotThrowWhenAutomaticDropdownsIsDisabled()
     {
-        $this->expectException(BadMethodCallException::class);
-        $this->expectExceptionMessage('Dropdowns are not enabled. Enable it by setting `hyde.navigation.subdirectories` to `dropdown`.');
-
         $menu = $this->createNavigationMenu();
-        $menu->getDropdowns();
+        $this->assertCount(0, $menu->getDropdowns());
+        $this->assertSame([], $menu->getDropdowns());
     }
 
     public function testDocumentationPagesDoNotGetAddedToDropdowns()

From 74fbe6b2ab28e9afd166e43398ca6f79331d993c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 20:44:46 +0100
Subject: [PATCH 0144/1422] Skip tests for deprecated method

Want to see the impact of this
---
 packages/framework/tests/Feature/NavigationMenuTest.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/framework/tests/Feature/NavigationMenuTest.php b/packages/framework/tests/Feature/NavigationMenuTest.php
index 50df269e621..29e25ac4add 100644
--- a/packages/framework/tests/Feature/NavigationMenuTest.php
+++ b/packages/framework/tests/Feature/NavigationMenuTest.php
@@ -236,6 +236,7 @@ public function testPagesInSubdirectoriesAreNotAddedToTheNavigationMenuWithConfi
 
     public function testHasDropdownsReturnsFalseWhenThereAreNoDropdowns()
     {
+        $this->markTestSkipped('Tested method may be removed.');
         config(['hyde.navigation.subdirectories' => 'dropdown']);
         $menu = $this->createNavigationMenu();
         $this->assertFalse($menu->hasDropdowns());
@@ -243,6 +244,7 @@ public function testHasDropdownsReturnsFalseWhenThereAreNoDropdowns()
 
     public function testHasDropdownsReturnsTrueWhenThereAreDropdowns()
     {
+        $this->markTestSkipped('Tested method may be removed.');
         config(['hyde.navigation.subdirectories' => 'dropdown']);
         Routes::addRoute((new MarkdownPage('foo/bar'))->getRoute());
         $menu = $this->createNavigationMenu();
@@ -251,6 +253,7 @@ public function testHasDropdownsReturnsTrueWhenThereAreDropdowns()
 
     public function testHasDropdownsAlwaysReturnsFalseWhenDropdownsAreDisabled()
     {
+        $this->markTestSkipped('Tested method may be removed.');
         Routes::addRoute((new MarkdownPage('foo/bar'))->getRoute());
         $this->assertFalse($this->createNavigationMenu()->hasDropdowns());
     }
@@ -326,6 +329,7 @@ public function testGetDropdownsDoesNotThrowWhenAutomaticDropdownsIsDisabled()
 
     public function testDocumentationPagesDoNotGetAddedToDropdowns()
     {
+        $this->markTestSkipped('Tested method may be removed.');
         config(['hyde.navigation.subdirectories' => 'dropdown']);
 
         Routes::addRoute((new DocumentationPage('foo'))->getRoute());
@@ -338,6 +342,7 @@ public function testDocumentationPagesDoNotGetAddedToDropdowns()
 
     public function testBlogPostsDoNotGetAddedToDropdowns()
     {
+        $this->markTestSkipped('Tested method may be removed.');
         config(['hyde.navigation.subdirectories' => 'dropdown']);
 
         Routes::addRoute((new MarkdownPost('foo'))->getRoute());

From 72c969ebb57e88cabc9b718fb26fd6fd321b8d93 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 20:48:42 +0100
Subject: [PATCH 0145/1422] Skip tests for deprecated method

Want to see the impact of this
---
 packages/framework/tests/Feature/NavigationMenuTest.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/packages/framework/tests/Feature/NavigationMenuTest.php b/packages/framework/tests/Feature/NavigationMenuTest.php
index 29e25ac4add..ff3b1851b35 100644
--- a/packages/framework/tests/Feature/NavigationMenuTest.php
+++ b/packages/framework/tests/Feature/NavigationMenuTest.php
@@ -260,6 +260,7 @@ public function testHasDropdownsAlwaysReturnsFalseWhenDropdownsAreDisabled()
 
     public function testGetDropdownsReturnsEmptyArrayThereAreNoDropdowns()
     {
+        $this->markTestSkipped('Tested method may be removed.');
         config(['hyde.navigation.subdirectories' => 'dropdown']);
         $menu = $this->createNavigationMenu();
         $this->assertCount(0, $menu->getDropdowns());
@@ -268,6 +269,7 @@ public function testGetDropdownsReturnsEmptyArrayThereAreNoDropdowns()
 
     public function testGetDropdownsReturnsCorrectArrayWhenThereAreDropdowns()
     {
+        $this->markTestSkipped('Tested method may be removed.');
         config(['hyde.navigation.subdirectories' => 'dropdown']);
         Routes::addRoute((new MarkdownPage('foo/bar'))->getRoute());
         $menu = $this->createNavigationMenu();
@@ -281,6 +283,7 @@ public function testGetDropdownsReturnsCorrectArrayWhenThereAreDropdowns()
 
     public function testGetDropdownsWithMultipleItems()
     {
+        $this->markTestSkipped('Tested method may be removed.');
         config(['hyde.navigation.subdirectories' => 'dropdown']);
 
         Routes::addRoute((new MarkdownPage('foo/bar'))->getRoute());
@@ -299,6 +302,7 @@ public function testGetDropdownsWithMultipleItems()
 
     public function testGetDropdownsWithMultipleDropdowns()
     {
+        $this->markTestSkipped('Tested method may be removed.');
         config(['hyde.navigation.subdirectories' => 'dropdown']);
 
         Routes::addRoute((new MarkdownPage('foo/bar'))->getRoute());
@@ -322,6 +326,7 @@ public function testGetDropdownsWithMultipleDropdowns()
 
     public function testGetDropdownsDoesNotThrowWhenAutomaticDropdownsIsDisabled()
     {
+        $this->markTestSkipped('Tested method may be removed.');
         $menu = $this->createNavigationMenu();
         $this->assertCount(0, $menu->getDropdowns());
         $this->assertSame([], $menu->getDropdowns());
@@ -373,6 +378,7 @@ public function testPagesInDropdownsDoNotGetAddedToTheMainNavigation()
 
     public function testDropdownMenuItemsAreSortedByPriority()
     {
+        $this->markTestSkipped('Tested method may be removed.');
         config(['hyde.navigation.subdirectories' => 'dropdown']);
 
         Routes::addRoute(new Route(new MarkdownPage('foo/foo', ['navigation.priority' => 1])));

From b9554d270afd1c906295c2d69f1eb279404d0131 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 20:49:32 +0100
Subject: [PATCH 0146/1422] Prefix legacy methods

Want to see the impact of this
---
 .../src/Framework/Features/Navigation/NavigationMenu.php      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
index 6bc0ccfb2f1..b172afab164 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
@@ -29,7 +29,7 @@ public function getItems(): Collection
      *
      * @deprecated If kept, they should be renamed to be more generic.
      */
-    public function hasDropdowns(): bool
+    public function legacy_hasDropdowns(): bool
     {
         return $this->dropdownsEnabled() && count($this->getDropdowns()) >= 1;
     }
@@ -41,7 +41,7 @@ public function hasDropdowns(): bool
      *
      * @return array<string, DropdownNavItem>
      */
-    public function getDropdowns(): array
+    public function legacy_getDropdowns(): array
     {
         return $this->items->filter(function (NavItem $item): bool {
             return $item instanceof DropdownNavItem;

From 70525cb76fc2a39e3265d877a80af51ec3d4ea48 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 20:50:55 +0100
Subject: [PATCH 0147/1422] Add dropdowns as new implementation type

---
 .../Features/Navigation/GeneratesMainNavigationMenu.php       | 2 +-
 packages/framework/tests/Feature/NavigationMenuTest.php       | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index 6ad2aba5717..0131bf34f31 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -72,7 +72,7 @@ protected function moveGroupedItemsIntoDropdowns(): void
 
         foreach ($dropdowns as $group => $items) {
             // Create a new dropdown item containing the buffered items
-            $this->items->add(new DropdownNavItem($group, $items));
+            $this->items->add(NavItem::dropdown($group, $items));
         }
     }
 
diff --git a/packages/framework/tests/Feature/NavigationMenuTest.php b/packages/framework/tests/Feature/NavigationMenuTest.php
index ff3b1851b35..ffcc289e1d3 100644
--- a/packages/framework/tests/Feature/NavigationMenuTest.php
+++ b/packages/framework/tests/Feature/NavigationMenuTest.php
@@ -225,7 +225,7 @@ public function testPagesInSubdirectoriesAreNotAddedToTheNavigationMenuWithConfi
         $menu = $this->createNavigationMenu();
         $expected = collect([
             NavItem::fromRoute(Routes::get('index')),
-            new DropdownNavItem('foo', [
+            NavItem::dropdown('foo', [
                 NavItem::fromRoute(Routes::get('foo/bar')),
             ]),
         ]);
@@ -370,7 +370,7 @@ public function testPagesInDropdownsDoNotGetAddedToTheMainNavigation()
         $this->assertEquals([
             NavItem::fromRoute(Routes::get('index')),
             NavItem::fromRoute((new MarkdownPage('foo'))->getRoute()),
-            new DropdownNavItem('bar', [
+            NavItem::dropdown('bar', [
                 NavItem::fromRoute((new MarkdownPage('bar/baz'))->getRoute()),
             ]),
         ], $menu->getItems()->all());

From a62664bb30bbec99e29c4c2e71c3203c24743633 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 20:57:23 +0100
Subject: [PATCH 0148/1422] Breaking: Remove class `DropdownNavItem`

---
 .../Features/Navigation/DropdownNavItem.php   | 21 -------------------
 1 file changed, 21 deletions(-)
 delete mode 100644 packages/framework/src/Framework/Features/Navigation/DropdownNavItem.php

diff --git a/packages/framework/src/Framework/Features/Navigation/DropdownNavItem.php b/packages/framework/src/Framework/Features/Navigation/DropdownNavItem.php
deleted file mode 100644
index d774008d46f..00000000000
--- a/packages/framework/src/Framework/Features/Navigation/DropdownNavItem.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Hyde\Framework\Features\Navigation;
-
-/**
- * A navigation item that contains other navigation items.
- *
- * @deprecated Use the `NavItem::getChildren()` instead.
- *
- * Unlike a regular navigation items, a dropdown item does not have a route or URL destination.
- */
-class DropdownNavItem extends NavItem
-{
-    /** @param array<NavItem> $items */
-    public function __construct(string $label, array $items, ?int $priority = null)
-    {
-        parent::__construct('', $label, $priority ?? static::searchForDropdownPriorityInNavigationConfig($label) ?? 999, children: $items);
-    }
-}

From 78d7570060718c5bca1428e4464aaf630d66ec6a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 21:03:32 +0100
Subject: [PATCH 0149/1422] Remove NavigationMenu dropdown accessor methods

These do not seem to be used outside of tests and don't offer anything useful
---
 .../Features/Navigation/NavigationMenu.php    | 30 -------------------
 1 file changed, 30 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
index b172afab164..4919ceb1bf1 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
@@ -4,7 +4,6 @@
 
 namespace Hyde\Framework\Features\Navigation;
 
-use Hyde\Facades\Config;
 use Illuminate\Support\Collection;
 use Illuminate\Contracts\Support\Arrayable;
 
@@ -23,33 +22,4 @@ public function getItems(): Collection
     {
         return $this->items;
     }
-
-    /**
-     * @experimental These do not seem to be used outside of tests and may be removed
-     *
-     * @deprecated If kept, they should be renamed to be more generic.
-     */
-    public function legacy_hasDropdowns(): bool
-    {
-        return $this->dropdownsEnabled() && count($this->getDropdowns()) >= 1;
-    }
-
-    /**
-     * @experimental These do not seem to be used outside of tests and may be removed
-     *
-     * @deprecated If kept, they should be renamed to be more generic.
-     *
-     * @return array<string, DropdownNavItem>
-     */
-    public function legacy_getDropdowns(): array
-    {
-        return $this->items->filter(function (NavItem $item): bool {
-            return $item instanceof DropdownNavItem;
-        })->values()->all();
-    }
-
-    protected function dropdownsEnabled(): bool
-    {
-        return Config::getString('hyde.navigation.subdirectories', 'hidden') === 'dropdown';
-    }
 }

From f2becade2f9dcba19f06dc9061e43a121967bb83 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 21:04:24 +0100
Subject: [PATCH 0150/1422] Update test method skip notice for
 https://github.com/hydephp/develop/commit/78d7570060718c5bca1428e4464aaf630d66ec6a

---
 .../framework/tests/Feature/NavigationMenuTest.php     | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/framework/tests/Feature/NavigationMenuTest.php b/packages/framework/tests/Feature/NavigationMenuTest.php
index ffcc289e1d3..5c8fdcafcbe 100644
--- a/packages/framework/tests/Feature/NavigationMenuTest.php
+++ b/packages/framework/tests/Feature/NavigationMenuTest.php
@@ -236,7 +236,7 @@ public function testPagesInSubdirectoriesAreNotAddedToTheNavigationMenuWithConfi
 
     public function testHasDropdownsReturnsFalseWhenThereAreNoDropdowns()
     {
-        $this->markTestSkipped('Tested method may be removed.');
+        $this->markTestSkipped('Tested method removed in https://github.com/hydephp/develop/commit/78d7570060718c5bca1428e4464aaf630d66ec6a');
         config(['hyde.navigation.subdirectories' => 'dropdown']);
         $menu = $this->createNavigationMenu();
         $this->assertFalse($menu->hasDropdowns());
@@ -244,7 +244,7 @@ public function testHasDropdownsReturnsFalseWhenThereAreNoDropdowns()
 
     public function testHasDropdownsReturnsTrueWhenThereAreDropdowns()
     {
-        $this->markTestSkipped('Tested method may be removed.');
+        $this->markTestSkipped('Tested method removed in https://github.com/hydephp/develop/commit/78d7570060718c5bca1428e4464aaf630d66ec6a');
         config(['hyde.navigation.subdirectories' => 'dropdown']);
         Routes::addRoute((new MarkdownPage('foo/bar'))->getRoute());
         $menu = $this->createNavigationMenu();
@@ -253,14 +253,14 @@ public function testHasDropdownsReturnsTrueWhenThereAreDropdowns()
 
     public function testHasDropdownsAlwaysReturnsFalseWhenDropdownsAreDisabled()
     {
-        $this->markTestSkipped('Tested method may be removed.');
+        $this->markTestSkipped('Tested method removed in https://github.com/hydephp/develop/commit/78d7570060718c5bca1428e4464aaf630d66ec6a');
         Routes::addRoute((new MarkdownPage('foo/bar'))->getRoute());
         $this->assertFalse($this->createNavigationMenu()->hasDropdowns());
     }
 
     public function testGetDropdownsReturnsEmptyArrayThereAreNoDropdowns()
     {
-        $this->markTestSkipped('Tested method may be removed.');
+        $this->markTestSkipped('Tested method removed in https://github.com/hydephp/develop/commit/78d7570060718c5bca1428e4464aaf630d66ec6a');
         config(['hyde.navigation.subdirectories' => 'dropdown']);
         $menu = $this->createNavigationMenu();
         $this->assertCount(0, $menu->getDropdowns());
@@ -378,7 +378,7 @@ public function testPagesInDropdownsDoNotGetAddedToTheMainNavigation()
 
     public function testDropdownMenuItemsAreSortedByPriority()
     {
-        $this->markTestSkipped('Tested method may be removed.');
+        $this->markTestSkipped('Tested method removed in https://github.com/hydephp/develop/commit/78d7570060718c5bca1428e4464aaf630d66ec6a');
         config(['hyde.navigation.subdirectories' => 'dropdown']);
 
         Routes::addRoute(new Route(new MarkdownPage('foo/foo', ['navigation.priority' => 1])));

From 91e6d6ad43b9d4b4b7664ed22ee648ddfef35e27 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 21:07:12 +0100
Subject: [PATCH 0151/1422] Formatting

---
 .../framework/tests/Feature/NavigationMenuTest.php    | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/packages/framework/tests/Feature/NavigationMenuTest.php b/packages/framework/tests/Feature/NavigationMenuTest.php
index 5c8fdcafcbe..64fda5a768a 100644
--- a/packages/framework/tests/Feature/NavigationMenuTest.php
+++ b/packages/framework/tests/Feature/NavigationMenuTest.php
@@ -237,6 +237,7 @@ public function testPagesInSubdirectoriesAreNotAddedToTheNavigationMenuWithConfi
     public function testHasDropdownsReturnsFalseWhenThereAreNoDropdowns()
     {
         $this->markTestSkipped('Tested method removed in https://github.com/hydephp/develop/commit/78d7570060718c5bca1428e4464aaf630d66ec6a');
+
         config(['hyde.navigation.subdirectories' => 'dropdown']);
         $menu = $this->createNavigationMenu();
         $this->assertFalse($menu->hasDropdowns());
@@ -245,6 +246,7 @@ public function testHasDropdownsReturnsFalseWhenThereAreNoDropdowns()
     public function testHasDropdownsReturnsTrueWhenThereAreDropdowns()
     {
         $this->markTestSkipped('Tested method removed in https://github.com/hydephp/develop/commit/78d7570060718c5bca1428e4464aaf630d66ec6a');
+
         config(['hyde.navigation.subdirectories' => 'dropdown']);
         Routes::addRoute((new MarkdownPage('foo/bar'))->getRoute());
         $menu = $this->createNavigationMenu();
@@ -254,6 +256,7 @@ public function testHasDropdownsReturnsTrueWhenThereAreDropdowns()
     public function testHasDropdownsAlwaysReturnsFalseWhenDropdownsAreDisabled()
     {
         $this->markTestSkipped('Tested method removed in https://github.com/hydephp/develop/commit/78d7570060718c5bca1428e4464aaf630d66ec6a');
+
         Routes::addRoute((new MarkdownPage('foo/bar'))->getRoute());
         $this->assertFalse($this->createNavigationMenu()->hasDropdowns());
     }
@@ -261,6 +264,7 @@ public function testHasDropdownsAlwaysReturnsFalseWhenDropdownsAreDisabled()
     public function testGetDropdownsReturnsEmptyArrayThereAreNoDropdowns()
     {
         $this->markTestSkipped('Tested method removed in https://github.com/hydephp/develop/commit/78d7570060718c5bca1428e4464aaf630d66ec6a');
+
         config(['hyde.navigation.subdirectories' => 'dropdown']);
         $menu = $this->createNavigationMenu();
         $this->assertCount(0, $menu->getDropdowns());
@@ -270,6 +274,7 @@ public function testGetDropdownsReturnsEmptyArrayThereAreNoDropdowns()
     public function testGetDropdownsReturnsCorrectArrayWhenThereAreDropdowns()
     {
         $this->markTestSkipped('Tested method may be removed.');
+
         config(['hyde.navigation.subdirectories' => 'dropdown']);
         Routes::addRoute((new MarkdownPage('foo/bar'))->getRoute());
         $menu = $this->createNavigationMenu();
@@ -284,6 +289,7 @@ public function testGetDropdownsReturnsCorrectArrayWhenThereAreDropdowns()
     public function testGetDropdownsWithMultipleItems()
     {
         $this->markTestSkipped('Tested method may be removed.');
+
         config(['hyde.navigation.subdirectories' => 'dropdown']);
 
         Routes::addRoute((new MarkdownPage('foo/bar'))->getRoute());
@@ -303,6 +309,7 @@ public function testGetDropdownsWithMultipleItems()
     public function testGetDropdownsWithMultipleDropdowns()
     {
         $this->markTestSkipped('Tested method may be removed.');
+
         config(['hyde.navigation.subdirectories' => 'dropdown']);
 
         Routes::addRoute((new MarkdownPage('foo/bar'))->getRoute());
@@ -327,6 +334,7 @@ public function testGetDropdownsWithMultipleDropdowns()
     public function testGetDropdownsDoesNotThrowWhenAutomaticDropdownsIsDisabled()
     {
         $this->markTestSkipped('Tested method may be removed.');
+
         $menu = $this->createNavigationMenu();
         $this->assertCount(0, $menu->getDropdowns());
         $this->assertSame([], $menu->getDropdowns());
@@ -335,6 +343,7 @@ public function testGetDropdownsDoesNotThrowWhenAutomaticDropdownsIsDisabled()
     public function testDocumentationPagesDoNotGetAddedToDropdowns()
     {
         $this->markTestSkipped('Tested method may be removed.');
+
         config(['hyde.navigation.subdirectories' => 'dropdown']);
 
         Routes::addRoute((new DocumentationPage('foo'))->getRoute());
@@ -348,6 +357,7 @@ public function testDocumentationPagesDoNotGetAddedToDropdowns()
     public function testBlogPostsDoNotGetAddedToDropdowns()
     {
         $this->markTestSkipped('Tested method may be removed.');
+
         config(['hyde.navigation.subdirectories' => 'dropdown']);
 
         Routes::addRoute((new MarkdownPost('foo'))->getRoute());
@@ -379,6 +389,7 @@ public function testPagesInDropdownsDoNotGetAddedToTheMainNavigation()
     public function testDropdownMenuItemsAreSortedByPriority()
     {
         $this->markTestSkipped('Tested method removed in https://github.com/hydephp/develop/commit/78d7570060718c5bca1428e4464aaf630d66ec6a');
+
         config(['hyde.navigation.subdirectories' => 'dropdown']);
 
         Routes::addRoute(new Route(new MarkdownPage('foo/foo', ['navigation.priority' => 1])));

From 7c8ea3b86464095a594ce3e45c4feaa9e82f2964 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 21:09:38 +0100
Subject: [PATCH 0152/1422] Create NavigationMenuUnitTest.php

---
 .../tests/Unit/NavigationMenuUnitTest.php       | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 packages/framework/tests/Unit/NavigationMenuUnitTest.php

diff --git a/packages/framework/tests/Unit/NavigationMenuUnitTest.php b/packages/framework/tests/Unit/NavigationMenuUnitTest.php
new file mode 100644
index 00000000000..3e22cc5fbf3
--- /dev/null
+++ b/packages/framework/tests/Unit/NavigationMenuUnitTest.php
@@ -0,0 +1,17 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Hyde\Framework\Testing\Unit;
+
+use Hyde\Testing\UnitTestCase;
+
+/**
+ * @covers \Hyde\Framework\Features\Navigation\NavigationMenu
+ *
+ * @see \Hyde\Framework\Testing\Feature\NavigationMenuTest
+ */
+class NavigationMenuUnitTest extends UnitTestCase
+{
+    //
+}

From bd0381ba6462996b225642a5413379acae4bd3c0 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 21:09:44 +0100
Subject: [PATCH 0153/1422] Link to unit test

---
 packages/framework/tests/Feature/NavigationMenuTest.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/tests/Feature/NavigationMenuTest.php b/packages/framework/tests/Feature/NavigationMenuTest.php
index 64fda5a768a..6bee9dd592c 100644
--- a/packages/framework/tests/Feature/NavigationMenuTest.php
+++ b/packages/framework/tests/Feature/NavigationMenuTest.php
@@ -19,6 +19,8 @@
 /**
  * @covers \Hyde\Framework\Features\Navigation\GeneratesMainNavigationMenu
  * @covers \Hyde\Framework\Features\Navigation\NavigationMenu
+ *
+ * @see \Hyde\Framework\Testing\Unit\NavigationMenuUnitTest
  */
 class NavigationMenuTest extends TestCase
 {

From abd5c186d83963d574d4bba869bfb0d0b99efb97 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 21:18:04 +0100
Subject: [PATCH 0154/1422] Test construction

---
 .../tests/Unit/NavigationMenuUnitTest.php     | 22 ++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/packages/framework/tests/Unit/NavigationMenuUnitTest.php b/packages/framework/tests/Unit/NavigationMenuUnitTest.php
index 3e22cc5fbf3..d743dc3f151 100644
--- a/packages/framework/tests/Unit/NavigationMenuUnitTest.php
+++ b/packages/framework/tests/Unit/NavigationMenuUnitTest.php
@@ -5,6 +5,7 @@
 namespace Hyde\Framework\Testing\Unit;
 
 use Hyde\Testing\UnitTestCase;
+use Hyde\Framework\Features\Navigation\NavigationMenu;
 
 /**
  * @covers \Hyde\Framework\Features\Navigation\NavigationMenu
@@ -13,5 +14,24 @@
  */
 class NavigationMenuUnitTest extends UnitTestCase
 {
-    //
+    public function testCanConstruct()
+    {
+        $this->assertInstanceOf(NavigationMenu::class, new NavigationMenu());
+    }
+
+    public function testCanConstructWithItemsArray()
+    {
+        $this->assertInstanceOf(NavigationMenu::class, new NavigationMenu([
+            'item1' => 'value1',
+            'item2' => 'value2',
+        ]));
+    }
+
+    public function testCanConstructWithItemsArrayable()
+    {
+        $this->assertInstanceOf(NavigationMenu::class, new NavigationMenu(collect([
+            'item1' => 'value1',
+            'item2' => 'value2',
+        ])));
+    }
 }

From 336c48df900f9340a66f640dcb6670f977d0b766 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 21:18:22 +0100
Subject: [PATCH 0155/1422] Test getter

---
 .../tests/Unit/NavigationMenuUnitTest.php     | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/packages/framework/tests/Unit/NavigationMenuUnitTest.php b/packages/framework/tests/Unit/NavigationMenuUnitTest.php
index d743dc3f151..c9ad45b2082 100644
--- a/packages/framework/tests/Unit/NavigationMenuUnitTest.php
+++ b/packages/framework/tests/Unit/NavigationMenuUnitTest.php
@@ -34,4 +34,25 @@ public function testCanConstructWithItemsArrayable()
             'item2' => 'value2',
         ])));
     }
+
+    public function testGetItemsReturnsCollection()
+    {
+        $this->assertInstanceOf(\Illuminate\Support\Collection::class, (new NavigationMenu())->getItems());
+    }
+
+    public function testGetItemsReturnsCollectionWhenSuppliedArray()
+    {
+        $this->assertInstanceOf(\Illuminate\Support\Collection::class, (new NavigationMenu([
+            'item1' => 'value1',
+            'item2' => 'value2',
+        ]))->getItems());
+    }
+
+    public function testGetItemsReturnsCollectionWhenSuppliedArrayable()
+    {
+        $this->assertInstanceOf(\Illuminate\Support\Collection::class, (new NavigationMenu(collect([
+            'item1' => 'value1',
+            'item2' => 'value2',
+        ])))->getItems());
+    }
 }

From d7625aee9bcefe4058da12cd89f617ad8643c1c1 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 21:18:55 +0100
Subject: [PATCH 0156/1422] Test retrieval

---
 .../tests/Unit/NavigationMenuUnitTest.php     | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/packages/framework/tests/Unit/NavigationMenuUnitTest.php b/packages/framework/tests/Unit/NavigationMenuUnitTest.php
index c9ad45b2082..eeb51958740 100644
--- a/packages/framework/tests/Unit/NavigationMenuUnitTest.php
+++ b/packages/framework/tests/Unit/NavigationMenuUnitTest.php
@@ -55,4 +55,27 @@ public function testGetItemsReturnsCollectionWhenSuppliedArrayable()
             'item2' => 'value2',
         ])))->getItems());
     }
+
+    public function testGetItemsReturnsItems()
+    {
+        $items = [
+            'item1' => 'value1',
+            'item2' => 'value2',
+        ];
+        $this->assertSame($items, (new NavigationMenu($items))->getItems()->all());
+    }
+
+    public function testGetItemsReturnsItemsWhenSuppliedArrayable()
+    {
+        $items = [
+            'item1' => 'value1',
+            'item2' => 'value2',
+        ];
+        $this->assertSame($items, (new NavigationMenu(collect($items)))->getItems()->all());
+    }
+
+    public function testGetItemsReturnsEmptyArrayWhenNoItems()
+    {
+        $this->assertSame([], (new NavigationMenu())->getItems()->all());
+    }
 }

From a520f06aa43103bd70b3b16370b28ad81a757c93 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 21:19:17 +0100
Subject: [PATCH 0157/1422] Extract testing helper

---
 .../tests/Unit/NavigationMenuUnitTest.php     | 38 +++++++------------
 1 file changed, 14 insertions(+), 24 deletions(-)

diff --git a/packages/framework/tests/Unit/NavigationMenuUnitTest.php b/packages/framework/tests/Unit/NavigationMenuUnitTest.php
index eeb51958740..52f8d444203 100644
--- a/packages/framework/tests/Unit/NavigationMenuUnitTest.php
+++ b/packages/framework/tests/Unit/NavigationMenuUnitTest.php
@@ -21,18 +21,12 @@ public function testCanConstruct()
 
     public function testCanConstructWithItemsArray()
     {
-        $this->assertInstanceOf(NavigationMenu::class, new NavigationMenu([
-            'item1' => 'value1',
-            'item2' => 'value2',
-        ]));
+        $this->assertInstanceOf(NavigationMenu::class, new NavigationMenu($this->getItems()));
     }
 
     public function testCanConstructWithItemsArrayable()
     {
-        $this->assertInstanceOf(NavigationMenu::class, new NavigationMenu(collect([
-            'item1' => 'value1',
-            'item2' => 'value2',
-        ])));
+        $this->assertInstanceOf(NavigationMenu::class, new NavigationMenu(collect($this->getItems())));
     }
 
     public function testGetItemsReturnsCollection()
@@ -42,35 +36,23 @@ public function testGetItemsReturnsCollection()
 
     public function testGetItemsReturnsCollectionWhenSuppliedArray()
     {
-        $this->assertInstanceOf(\Illuminate\Support\Collection::class, (new NavigationMenu([
-            'item1' => 'value1',
-            'item2' => 'value2',
-        ]))->getItems());
+        $this->assertInstanceOf(\Illuminate\Support\Collection::class, (new NavigationMenu($this->getItems()))->getItems());
     }
 
     public function testGetItemsReturnsCollectionWhenSuppliedArrayable()
     {
-        $this->assertInstanceOf(\Illuminate\Support\Collection::class, (new NavigationMenu(collect([
-            'item1' => 'value1',
-            'item2' => 'value2',
-        ])))->getItems());
+        $this->assertInstanceOf(\Illuminate\Support\Collection::class, (new NavigationMenu(collect($this->getItems())))->getItems());
     }
 
     public function testGetItemsReturnsItems()
     {
-        $items = [
-            'item1' => 'value1',
-            'item2' => 'value2',
-        ];
+        $items = $this->getItems();
         $this->assertSame($items, (new NavigationMenu($items))->getItems()->all());
     }
 
     public function testGetItemsReturnsItemsWhenSuppliedArrayable()
     {
-        $items = [
-            'item1' => 'value1',
-            'item2' => 'value2',
-        ];
+        $items = $this->getItems();
         $this->assertSame($items, (new NavigationMenu(collect($items)))->getItems()->all());
     }
 
@@ -78,4 +60,12 @@ public function testGetItemsReturnsEmptyArrayWhenNoItems()
     {
         $this->assertSame([], (new NavigationMenu())->getItems()->all());
     }
+
+    protected function getItems(): array
+    {
+        return [
+            'item1' => 'value1',
+            'item2' => 'value2',
+        ];
+    }
 }

From 57b11fb683700bfe50b7e47c556a4fa97c215569 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 21:19:57 +0100
Subject: [PATCH 0158/1422] Add code spacing

---
 packages/framework/tests/Unit/NavigationMenuUnitTest.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/tests/Unit/NavigationMenuUnitTest.php b/packages/framework/tests/Unit/NavigationMenuUnitTest.php
index 52f8d444203..5a0137bdf48 100644
--- a/packages/framework/tests/Unit/NavigationMenuUnitTest.php
+++ b/packages/framework/tests/Unit/NavigationMenuUnitTest.php
@@ -47,12 +47,14 @@ public function testGetItemsReturnsCollectionWhenSuppliedArrayable()
     public function testGetItemsReturnsItems()
     {
         $items = $this->getItems();
+
         $this->assertSame($items, (new NavigationMenu($items))->getItems()->all());
     }
 
     public function testGetItemsReturnsItemsWhenSuppliedArrayable()
     {
         $items = $this->getItems();
+
         $this->assertSame($items, (new NavigationMenu(collect($items)))->getItems()->all());
     }
 

From f0396bcb71cb91a4a53b0bc437e71c4ecd7ba335 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 21:20:03 +0100
Subject: [PATCH 0159/1422] Cleanup code

---
 packages/framework/tests/Unit/NavigationMenuUnitTest.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/framework/tests/Unit/NavigationMenuUnitTest.php b/packages/framework/tests/Unit/NavigationMenuUnitTest.php
index 5a0137bdf48..a1b7d58c786 100644
--- a/packages/framework/tests/Unit/NavigationMenuUnitTest.php
+++ b/packages/framework/tests/Unit/NavigationMenuUnitTest.php
@@ -5,6 +5,7 @@
 namespace Hyde\Framework\Testing\Unit;
 
 use Hyde\Testing\UnitTestCase;
+use Illuminate\Support\Collection;
 use Hyde\Framework\Features\Navigation\NavigationMenu;
 
 /**
@@ -31,17 +32,17 @@ public function testCanConstructWithItemsArrayable()
 
     public function testGetItemsReturnsCollection()
     {
-        $this->assertInstanceOf(\Illuminate\Support\Collection::class, (new NavigationMenu())->getItems());
+        $this->assertInstanceOf(Collection::class, (new NavigationMenu())->getItems());
     }
 
     public function testGetItemsReturnsCollectionWhenSuppliedArray()
     {
-        $this->assertInstanceOf(\Illuminate\Support\Collection::class, (new NavigationMenu($this->getItems()))->getItems());
+        $this->assertInstanceOf(Collection::class, (new NavigationMenu($this->getItems()))->getItems());
     }
 
     public function testGetItemsReturnsCollectionWhenSuppliedArrayable()
     {
-        $this->assertInstanceOf(\Illuminate\Support\Collection::class, (new NavigationMenu(collect($this->getItems())))->getItems());
+        $this->assertInstanceOf(Collection::class, (new NavigationMenu(collect($this->getItems())))->getItems());
     }
 
     public function testGetItemsReturnsItems()

From 51f4c64ca57e97d6c2f3ff2134b0ca8051138615 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 21:24:16 +0100
Subject: [PATCH 0160/1422] Sketch out add method contract

---
 .../src/Framework/Features/Navigation/NavigationMenu.php     | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
index 4919ceb1bf1..c0174ea2134 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
@@ -22,4 +22,9 @@ public function getItems(): Collection
     {
         return $this->items;
     }
+
+    public function add(NavItem $item): void
+    {
+        //
+    }
 }

From 238dac75d43f1192079d826eafb0d7778484bb1d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 21:27:07 +0100
Subject: [PATCH 0161/1422] Add todo concerning priorities

---
 .../src/Framework/Features/Navigation/NavigationMenu.php        | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
index c0174ea2134..82aaf2bfc2f 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
@@ -20,6 +20,8 @@ public function __construct(Arrayable|array $items = [])
     /** @return \Illuminate\Support\Collection<string, \Hyde\Framework\Features\Navigation\NavItem> */
     public function getItems(): Collection
     {
+        // TODO: Consider sorting by priority here, as orders may have been changed after adding items
+
         return $this->items;
     }
 

From 5cb76da6e7dc87a8aa22320ce5c868874a48a427 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 21:29:44 +0100
Subject: [PATCH 0162/1422] Sketch out implementation idea

---
 .../src/Framework/Features/Navigation/NavigationMenu.php        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
index 82aaf2bfc2f..cf3fb231968 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
@@ -27,6 +27,6 @@ public function getItems(): Collection
 
     public function add(NavItem $item): void
     {
-        //
+        // If item has identifier, put $this->items->put($item->identifier(), $item);
     }
 }

From 2a31157686fb0ff4a73a5090fc25451809cb5ec2 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 21:29:47 +0100
Subject: [PATCH 0163/1422] Revert "Add todo concerning priorities"

This reverts commit 238dac75d43f1192079d826eafb0d7778484bb1d. See https://github.com/hydephp/develop/pull/1568/files#r1490023195
---
 .../src/Framework/Features/Navigation/NavigationMenu.php        | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
index cf3fb231968..0019292c4e4 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
@@ -20,8 +20,6 @@ public function __construct(Arrayable|array $items = [])
     /** @return \Illuminate\Support\Collection<string, \Hyde\Framework\Features\Navigation\NavItem> */
     public function getItems(): Collection
     {
-        // TODO: Consider sorting by priority here, as orders may have been changed after adding items
-
         return $this->items;
     }
 

From ffe7ad81544defc8331603a3b74cb78196714662 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 21:31:15 +0100
Subject: [PATCH 0164/1422] Push added items directly

---
 .../src/Framework/Features/Navigation/NavigationMenu.php        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
index 0019292c4e4..9e4901c484b 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
@@ -25,6 +25,6 @@ public function getItems(): Collection
 
     public function add(NavItem $item): void
     {
-        // If item has identifier, put $this->items->put($item->identifier(), $item);
+        $this->items->push($item);
     }
 }

From 9330ac7a1c1d98892bb0855bd649875065136d73 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 21:33:22 +0100
Subject: [PATCH 0165/1422] Test the add method

---
 .../framework/tests/Unit/NavigationMenuUnitTest.php | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/packages/framework/tests/Unit/NavigationMenuUnitTest.php b/packages/framework/tests/Unit/NavigationMenuUnitTest.php
index a1b7d58c786..c960b2dce01 100644
--- a/packages/framework/tests/Unit/NavigationMenuUnitTest.php
+++ b/packages/framework/tests/Unit/NavigationMenuUnitTest.php
@@ -6,6 +6,8 @@
 
 use Hyde\Testing\UnitTestCase;
 use Illuminate\Support\Collection;
+use Hyde\Support\Models\ExternalRoute;
+use Hyde\Framework\Features\Navigation\NavItem;
 use Hyde\Framework\Features\Navigation\NavigationMenu;
 
 /**
@@ -64,6 +66,17 @@ public function testGetItemsReturnsEmptyArrayWhenNoItems()
         $this->assertSame([], (new NavigationMenu())->getItems()->all());
     }
 
+    public function testCanAddItems()
+    {
+        $menu = new NavigationMenu();
+        $item = new NavItem(new ExternalRoute('/'), 'Home');
+
+        $menu->add($item);
+
+        $this->assertCount(1, $menu->getItems());
+        $this->assertSame($item, $menu->getItems()->first());
+    }
+
     protected function getItems(): array
     {
         return [

From 95b395ce69a1b3e0e373285adcb64aa0f3cc57d5 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 21:37:09 +0100
Subject: [PATCH 0166/1422] Update navigation menu to construct items using add
 method

This adds an implicit type system ensuring the types of the internal array
---
 .../src/Framework/Features/Navigation/NavigationMenu.php    | 6 +++++-
 packages/framework/tests/Unit/NavigationMenuUnitTest.php    | 5 +++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
index 9e4901c484b..9edc2783dd6 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
@@ -14,7 +14,11 @@ class NavigationMenu
 
     public function __construct(Arrayable|array $items = [])
     {
-        $this->items = new Collection($items);
+        $this->items = new Collection();
+
+        foreach ($items as $item) {
+            $this->add($item);
+        }
     }
 
     /** @return \Illuminate\Support\Collection<string, \Hyde\Framework\Features\Navigation\NavItem> */
diff --git a/packages/framework/tests/Unit/NavigationMenuUnitTest.php b/packages/framework/tests/Unit/NavigationMenuUnitTest.php
index c960b2dce01..57ad6222993 100644
--- a/packages/framework/tests/Unit/NavigationMenuUnitTest.php
+++ b/packages/framework/tests/Unit/NavigationMenuUnitTest.php
@@ -80,8 +80,9 @@ public function testCanAddItems()
     protected function getItems(): array
     {
         return [
-            'item1' => 'value1',
-            'item2' => 'value2',
+            new NavItem(new ExternalRoute('/'), 'Home'),
+            new NavItem(new ExternalRoute('/about'), 'About'),
+            new NavItem(new ExternalRoute('/contact'), 'Contact'),
         ];
     }
 }

From 088d5b5e6f55d61050890c2cbe4bab312fa62bb6 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 21:38:21 +0100
Subject: [PATCH 0167/1422] Update array generics to match new forced data
 state

Data format is ensured by https://github.com/hydephp/develop/pull/1568/commits/95b395ce69a1b3e0e373285adcb64aa0f3cc57d5
---
 .../src/Framework/Features/Navigation/NavigationMenu.php      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
index 9edc2783dd6..d187de988bb 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
@@ -9,7 +9,7 @@
 
 class NavigationMenu
 {
-    /** @var \Illuminate\Support\Collection<string, \Hyde\Framework\Features\Navigation\NavItem> */
+    /** @var \Illuminate\Support\Collection<\Hyde\Framework\Features\Navigation\NavItem> */
     protected Collection $items;
 
     public function __construct(Arrayable|array $items = [])
@@ -21,7 +21,7 @@ public function __construct(Arrayable|array $items = [])
         }
     }
 
-    /** @return \Illuminate\Support\Collection<string, \Hyde\Framework\Features\Navigation\NavItem> */
+    /** @return \Illuminate\Support\Collection<\Hyde\Framework\Features\Navigation\NavItem> */
     public function getItems(): Collection
     {
         return $this->items;

From dcc1a5ff94285f56b683f3eba635c4515936a3a7 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 21:42:27 +0100
Subject: [PATCH 0168/1422] Add code documentation for the navigation menu
 class

---
 .../Features/Navigation/NavigationMenu.php        | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
index d187de988bb..4f5a40ba4b8 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
@@ -7,11 +7,17 @@
 use Illuminate\Support\Collection;
 use Illuminate\Contracts\Support\Arrayable;
 
+/**
+ * Represents a site navigation menu, and contains all of its navigation items.
+ */
 class NavigationMenu
 {
     /** @var \Illuminate\Support\Collection<\Hyde\Framework\Features\Navigation\NavItem> */
     protected Collection $items;
 
+    /**
+     * Create a new navigation menu instance.
+     */
     public function __construct(Arrayable|array $items = [])
     {
         $this->items = new Collection();
@@ -21,12 +27,19 @@ public function __construct(Arrayable|array $items = [])
         }
     }
 
-    /** @return \Illuminate\Support\Collection<\Hyde\Framework\Features\Navigation\NavItem> */
+    /**
+     * Get the navigation items in the menu.
+     *
+     * @return \Illuminate\Support\Collection<\Hyde\Framework\Features\Navigation\NavItem>
+     */
     public function getItems(): Collection
     {
         return $this->items;
     }
 
+    /**
+     * Add a navigation item to the navigation menu.
+     */
     public function add(NavItem $item): void
     {
         $this->items->push($item);

From 1078ee6a1506f708b37ab68be7dda2fb21e1aeac Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 21:48:16 +0100
Subject: [PATCH 0169/1422] Normalize skip message

---
 .../framework/tests/Feature/NavigationMenuTest.php   | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/framework/tests/Feature/NavigationMenuTest.php b/packages/framework/tests/Feature/NavigationMenuTest.php
index 6bee9dd592c..cf3e5f2d451 100644
--- a/packages/framework/tests/Feature/NavigationMenuTest.php
+++ b/packages/framework/tests/Feature/NavigationMenuTest.php
@@ -275,7 +275,7 @@ public function testGetDropdownsReturnsEmptyArrayThereAreNoDropdowns()
 
     public function testGetDropdownsReturnsCorrectArrayWhenThereAreDropdowns()
     {
-        $this->markTestSkipped('Tested method may be removed.');
+        $this->markTestSkipped('Tested method removed in https://github.com/hydephp/develop/commit/78d7570060718c5bca1428e4464aaf630d66ec6a');
 
         config(['hyde.navigation.subdirectories' => 'dropdown']);
         Routes::addRoute((new MarkdownPage('foo/bar'))->getRoute());
@@ -290,7 +290,7 @@ public function testGetDropdownsReturnsCorrectArrayWhenThereAreDropdowns()
 
     public function testGetDropdownsWithMultipleItems()
     {
-        $this->markTestSkipped('Tested method may be removed.');
+        $this->markTestSkipped('Tested method removed in https://github.com/hydephp/develop/commit/78d7570060718c5bca1428e4464aaf630d66ec6a');
 
         config(['hyde.navigation.subdirectories' => 'dropdown']);
 
@@ -310,7 +310,7 @@ public function testGetDropdownsWithMultipleItems()
 
     public function testGetDropdownsWithMultipleDropdowns()
     {
-        $this->markTestSkipped('Tested method may be removed.');
+        $this->markTestSkipped('Tested method removed in https://github.com/hydephp/develop/commit/78d7570060718c5bca1428e4464aaf630d66ec6a');
 
         config(['hyde.navigation.subdirectories' => 'dropdown']);
 
@@ -335,7 +335,7 @@ public function testGetDropdownsWithMultipleDropdowns()
 
     public function testGetDropdownsDoesNotThrowWhenAutomaticDropdownsIsDisabled()
     {
-        $this->markTestSkipped('Tested method may be removed.');
+        $this->markTestSkipped('Tested method removed in https://github.com/hydephp/develop/commit/78d7570060718c5bca1428e4464aaf630d66ec6a');
 
         $menu = $this->createNavigationMenu();
         $this->assertCount(0, $menu->getDropdowns());
@@ -344,7 +344,7 @@ public function testGetDropdownsDoesNotThrowWhenAutomaticDropdownsIsDisabled()
 
     public function testDocumentationPagesDoNotGetAddedToDropdowns()
     {
-        $this->markTestSkipped('Tested method may be removed.');
+        $this->markTestSkipped('Tested method removed in https://github.com/hydephp/develop/commit/78d7570060718c5bca1428e4464aaf630d66ec6a');
 
         config(['hyde.navigation.subdirectories' => 'dropdown']);
 
@@ -358,7 +358,7 @@ public function testDocumentationPagesDoNotGetAddedToDropdowns()
 
     public function testBlogPostsDoNotGetAddedToDropdowns()
     {
-        $this->markTestSkipped('Tested method may be removed.');
+        $this->markTestSkipped('Tested method removed in https://github.com/hydephp/develop/commit/78d7570060718c5bca1428e4464aaf630d66ec6a');
 
         config(['hyde.navigation.subdirectories' => 'dropdown']);
 

From c1ca8fc0125ed51f5535e6627bdbdbb40baa2611 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 21:48:53 +0100
Subject: [PATCH 0170/1422] Test service container integration

---
 .../tests/Feature/NavigationMenuTest.php          | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/packages/framework/tests/Feature/NavigationMenuTest.php b/packages/framework/tests/Feature/NavigationMenuTest.php
index cf3e5f2d451..00bac2a5c96 100644
--- a/packages/framework/tests/Feature/NavigationMenuTest.php
+++ b/packages/framework/tests/Feature/NavigationMenuTest.php
@@ -6,6 +6,7 @@
 
 use Hyde\Support\Models\Route;
 use Hyde\Foundation\Facades\Routes;
+use Hyde\Support\Models\ExternalRoute;
 use Hyde\Framework\Features\Navigation\NavigationMenu;
 use Hyde\Framework\Features\Navigation\DropdownNavItem;
 use Hyde\Framework\Features\Navigation\NavItem;
@@ -404,6 +405,20 @@ public function testDropdownMenuItemsAreSortedByPriority()
         $this->assertSame(['Foo', 'Bar', 'Baz'], collect($dropdowns[0]->getChildren())->pluck('label')->toArray());
     }
 
+    public function testCanGetMenuFromServiceContainer()
+    {
+        $this->assertEquals($this->createNavigationMenu(), app('navigation')->getMenu('main'));
+    }
+
+    public function testCanAddItemsToMainNavigationMenuResolvedFromContainer()
+    {
+        $navigation = app('navigation')->getMenu('main');
+        $navigation->add(new NavItem(new ExternalRoute('/foo'), 'Foo'));
+
+        $this->assertCount(2, $navigation->getItems());
+        $this->assertSame('Foo', $navigation->getItems()->last()->label);
+    }
+
     protected function createNavigationMenu(): NavigationMenu
     {
         return GeneratesMainNavigationMenu::handle();

From 8b0f21c9d5348bf946f64747e90f54eff74bde94 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 22:04:28 +0100
Subject: [PATCH 0171/1422] Automatically sort items by priority upon retrieval

I considered adding a secondary method to get sorted items, but I anticipate most people will want it sorted. Otherwise they can extend the class and change it. Or suggest a PR to add a $sort parameter. The values are reset to reorder the keys.
---
 .../Features/Navigation/NavigationMenu.php    |  2 +-
 .../tests/Unit/NavigationMenuUnitTest.php     | 28 +++++++++++++++++++
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
index 4f5a40ba4b8..4473baca808 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
@@ -34,7 +34,7 @@ public function __construct(Arrayable|array $items = [])
      */
     public function getItems(): Collection
     {
-        return $this->items;
+        return $this->items->sortBy('priority')->values();
     }
 
     /**
diff --git a/packages/framework/tests/Unit/NavigationMenuUnitTest.php b/packages/framework/tests/Unit/NavigationMenuUnitTest.php
index 57ad6222993..5242dd9f317 100644
--- a/packages/framework/tests/Unit/NavigationMenuUnitTest.php
+++ b/packages/framework/tests/Unit/NavigationMenuUnitTest.php
@@ -77,6 +77,34 @@ public function testCanAddItems()
         $this->assertSame($item, $menu->getItems()->first());
     }
 
+    public function testItemsAreInTheOrderTheyWereAddedWhenThereAreNoCustomPriorities()
+    {
+        $menu = new NavigationMenu();
+        $item1 = new NavItem(new ExternalRoute('/'), 'Home');
+        $item2 = new NavItem(new ExternalRoute('/about'), 'About');
+        $item3 = new NavItem(new ExternalRoute('/contact'), 'Contact');
+
+        $menu->add($item1);
+        $menu->add($item2);
+        $menu->add($item3);
+
+        $this->assertSame([$item1, $item2, $item3], $menu->getItems()->all());
+    }
+
+    public function testItemsAreSortedByPriority()
+    {
+        $menu = new NavigationMenu();
+        $item1 = new NavItem(new ExternalRoute('/'), 'Home', 100);
+        $item2 = new NavItem(new ExternalRoute('/about'), 'About', 200);
+        $item3 = new NavItem(new ExternalRoute('/contact'), 'Contact', 300);
+
+        $menu->add($item3);
+        $menu->add($item1);
+        $menu->add($item2);
+
+        $this->assertSame([$item1, $item2, $item3], $menu->getItems()->all());
+    }
+
     protected function getItems(): array
     {
         return [

From 3a7280394136825c64e0c643c0b9c0681f63d534 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 22:16:38 +0100
Subject: [PATCH 0172/1422] Document sorting

---
 .../src/Framework/Features/Navigation/NavigationMenu.php        | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
index 4473baca808..ca3021f1336 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
@@ -30,6 +30,8 @@ public function __construct(Arrayable|array $items = [])
     /**
      * Get the navigation items in the menu.
      *
+     * Items are automatically sorted by their priority, falling back to the order they were added.
+     *
      * @return \Illuminate\Support\Collection<\Hyde\Framework\Features\Navigation\NavItem>
      */
     public function getItems(): Collection

From 86e9e48208b221b77777aa5065fe1019cdc875a0 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 22:17:34 +0100
Subject: [PATCH 0173/1422] Begin overview

---
 docs/digging-deeper/navigation.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/docs/digging-deeper/navigation.md b/docs/digging-deeper/navigation.md
index 4ead086dd8c..4d201775d42 100644
--- a/docs/digging-deeper/navigation.md
+++ b/docs/digging-deeper/navigation.md
@@ -325,3 +325,11 @@ use Hyde\Framework\Features\Navigation\DropdownNavItem;
 If you want to interact with the site navigation programmatically, you can do so through the new Navigation API.
 
 For most cases you don't need this, as Hyde creates the navigation for you. But it can be useful for advanced users and package developers.
+
+### Overview
+
+The Navigation API consists of the following classes, allowing you to fluently interact with the navigation menus:
+
+```php
+use Hyde\Framework\Features\Navigation\NavigationMenu;
+```

From 80899397081abadbd821dc014ac6599e181dc5b2 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 22:23:03 +0100
Subject: [PATCH 0174/1422] Remove tests for methods removed in
 https://github.com/hydephp/develop/commit/78d7570060718c5bca1428e4464aaf630d66ec6a

---
 .../tests/Feature/NavigationMenuTest.php      | 153 ------------------
 1 file changed, 153 deletions(-)

diff --git a/packages/framework/tests/Feature/NavigationMenuTest.php b/packages/framework/tests/Feature/NavigationMenuTest.php
index 00bac2a5c96..83c10b62dd5 100644
--- a/packages/framework/tests/Feature/NavigationMenuTest.php
+++ b/packages/framework/tests/Feature/NavigationMenuTest.php
@@ -8,11 +8,8 @@
 use Hyde\Foundation\Facades\Routes;
 use Hyde\Support\Models\ExternalRoute;
 use Hyde\Framework\Features\Navigation\NavigationMenu;
-use Hyde\Framework\Features\Navigation\DropdownNavItem;
 use Hyde\Framework\Features\Navigation\NavItem;
-use Hyde\Pages\DocumentationPage;
 use Hyde\Pages\MarkdownPage;
-use Hyde\Pages\MarkdownPost;
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Collection;
 use Hyde\Framework\Features\Navigation\GeneratesMainNavigationMenu;
@@ -237,140 +234,6 @@ public function testPagesInSubdirectoriesAreNotAddedToTheNavigationMenuWithConfi
         $this->assertEquals($expected, $menu->getItems());
     }
 
-    public function testHasDropdownsReturnsFalseWhenThereAreNoDropdowns()
-    {
-        $this->markTestSkipped('Tested method removed in https://github.com/hydephp/develop/commit/78d7570060718c5bca1428e4464aaf630d66ec6a');
-
-        config(['hyde.navigation.subdirectories' => 'dropdown']);
-        $menu = $this->createNavigationMenu();
-        $this->assertFalse($menu->hasDropdowns());
-    }
-
-    public function testHasDropdownsReturnsTrueWhenThereAreDropdowns()
-    {
-        $this->markTestSkipped('Tested method removed in https://github.com/hydephp/develop/commit/78d7570060718c5bca1428e4464aaf630d66ec6a');
-
-        config(['hyde.navigation.subdirectories' => 'dropdown']);
-        Routes::addRoute((new MarkdownPage('foo/bar'))->getRoute());
-        $menu = $this->createNavigationMenu();
-        $this->assertTrue($menu->hasDropdowns());
-    }
-
-    public function testHasDropdownsAlwaysReturnsFalseWhenDropdownsAreDisabled()
-    {
-        $this->markTestSkipped('Tested method removed in https://github.com/hydephp/develop/commit/78d7570060718c5bca1428e4464aaf630d66ec6a');
-
-        Routes::addRoute((new MarkdownPage('foo/bar'))->getRoute());
-        $this->assertFalse($this->createNavigationMenu()->hasDropdowns());
-    }
-
-    public function testGetDropdownsReturnsEmptyArrayThereAreNoDropdowns()
-    {
-        $this->markTestSkipped('Tested method removed in https://github.com/hydephp/develop/commit/78d7570060718c5bca1428e4464aaf630d66ec6a');
-
-        config(['hyde.navigation.subdirectories' => 'dropdown']);
-        $menu = $this->createNavigationMenu();
-        $this->assertCount(0, $menu->getDropdowns());
-        $this->assertSame([], $menu->getDropdowns());
-    }
-
-    public function testGetDropdownsReturnsCorrectArrayWhenThereAreDropdowns()
-    {
-        $this->markTestSkipped('Tested method removed in https://github.com/hydephp/develop/commit/78d7570060718c5bca1428e4464aaf630d66ec6a');
-
-        config(['hyde.navigation.subdirectories' => 'dropdown']);
-        Routes::addRoute((new MarkdownPage('foo/bar'))->getRoute());
-        $menu = $this->createNavigationMenu();
-        $this->assertCount(1, $menu->getDropdowns());
-
-        $this->assertEquals([
-            new DropdownNavItem('foo', [
-                NavItem::fromRoute((new MarkdownPage('foo/bar'))->getRoute()),
-            ]), ], $menu->getDropdowns());
-    }
-
-    public function testGetDropdownsWithMultipleItems()
-    {
-        $this->markTestSkipped('Tested method removed in https://github.com/hydephp/develop/commit/78d7570060718c5bca1428e4464aaf630d66ec6a');
-
-        config(['hyde.navigation.subdirectories' => 'dropdown']);
-
-        Routes::addRoute((new MarkdownPage('foo/bar'))->getRoute());
-        Routes::addRoute((new MarkdownPage('foo/baz'))->getRoute());
-        $menu = $this->createNavigationMenu();
-
-        $this->assertCount(1, $menu->getDropdowns());
-
-        $this->assertEquals([
-            new DropdownNavItem('foo', [
-                NavItem::fromRoute((new MarkdownPage('foo/bar'))->getRoute()),
-                NavItem::fromRoute((new MarkdownPage('foo/baz'))->getRoute()),
-            ]),
-        ], $menu->getDropdowns());
-    }
-
-    public function testGetDropdownsWithMultipleDropdowns()
-    {
-        $this->markTestSkipped('Tested method removed in https://github.com/hydephp/develop/commit/78d7570060718c5bca1428e4464aaf630d66ec6a');
-
-        config(['hyde.navigation.subdirectories' => 'dropdown']);
-
-        Routes::addRoute((new MarkdownPage('foo/bar'))->getRoute());
-        Routes::addRoute((new MarkdownPage('foo/baz'))->getRoute());
-        Routes::addRoute((new MarkdownPage('cat/hat'))->getRoute());
-
-        $menu = $this->createNavigationMenu();
-
-        $this->assertCount(2, $menu->getDropdowns());
-
-        $this->assertEquals([
-            new DropdownNavItem('foo', [
-                NavItem::fromRoute((new MarkdownPage('foo/bar'))->getRoute()),
-                NavItem::fromRoute((new MarkdownPage('foo/baz'))->getRoute()),
-            ]),
-            new DropdownNavItem('cat', [
-                NavItem::fromRoute((new MarkdownPage('cat/hat'))->getRoute()),
-            ]),
-        ], $menu->getDropdowns());
-    }
-
-    public function testGetDropdownsDoesNotThrowWhenAutomaticDropdownsIsDisabled()
-    {
-        $this->markTestSkipped('Tested method removed in https://github.com/hydephp/develop/commit/78d7570060718c5bca1428e4464aaf630d66ec6a');
-
-        $menu = $this->createNavigationMenu();
-        $this->assertCount(0, $menu->getDropdowns());
-        $this->assertSame([], $menu->getDropdowns());
-    }
-
-    public function testDocumentationPagesDoNotGetAddedToDropdowns()
-    {
-        $this->markTestSkipped('Tested method removed in https://github.com/hydephp/develop/commit/78d7570060718c5bca1428e4464aaf630d66ec6a');
-
-        config(['hyde.navigation.subdirectories' => 'dropdown']);
-
-        Routes::addRoute((new DocumentationPage('foo'))->getRoute());
-        Routes::addRoute((new DocumentationPage('bar/baz'))->getRoute());
-        $menu = $this->createNavigationMenu();
-
-        $this->assertFalse($menu->hasDropdowns());
-        $this->assertCount(0, $menu->getDropdowns());
-    }
-
-    public function testBlogPostsDoNotGetAddedToDropdowns()
-    {
-        $this->markTestSkipped('Tested method removed in https://github.com/hydephp/develop/commit/78d7570060718c5bca1428e4464aaf630d66ec6a');
-
-        config(['hyde.navigation.subdirectories' => 'dropdown']);
-
-        Routes::addRoute((new MarkdownPost('foo'))->getRoute());
-        Routes::addRoute((new MarkdownPost('bar/baz'))->getRoute());
-
-        $menu = $this->createNavigationMenu();
-        $this->assertFalse($menu->hasDropdowns());
-        $this->assertCount(0, $menu->getDropdowns());
-    }
-
     public function testPagesInDropdownsDoNotGetAddedToTheMainNavigation()
     {
         config(['hyde.navigation.subdirectories' => 'dropdown']);
@@ -389,22 +252,6 @@ public function testPagesInDropdownsDoNotGetAddedToTheMainNavigation()
         ], $menu->getItems()->all());
     }
 
-    public function testDropdownMenuItemsAreSortedByPriority()
-    {
-        $this->markTestSkipped('Tested method removed in https://github.com/hydephp/develop/commit/78d7570060718c5bca1428e4464aaf630d66ec6a');
-
-        config(['hyde.navigation.subdirectories' => 'dropdown']);
-
-        Routes::addRoute(new Route(new MarkdownPage('foo/foo', ['navigation.priority' => 1])));
-        Routes::addRoute(new Route(new MarkdownPage('foo/bar', ['navigation.priority' => 2])));
-        Routes::addRoute(new Route(new MarkdownPage('foo/baz', ['navigation.priority' => 3])));
-
-        $menu = $this->createNavigationMenu();
-        $dropdowns = $menu->getDropdowns();
-
-        $this->assertSame(['Foo', 'Bar', 'Baz'], collect($dropdowns[0]->getChildren())->pluck('label')->toArray());
-    }
-
     public function testCanGetMenuFromServiceContainer()
     {
         $this->assertEquals($this->createNavigationMenu(), app('navigation')->getMenu('main'));

From 1647be4f748f0493e642b466b706944e9ab6d62a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 15 Feb 2024 13:08:33 +0100
Subject: [PATCH 0175/1422] Create GeneratesDocumentationSidebarMenu.php

---
 .../Navigation/GeneratesDocumentationSidebarMenu.php   | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
new file mode 100644
index 00000000000..d9e6d69e081
--- /dev/null
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Hyde\Framework\Features\Navigation;
+
+class GeneratesDocumentationSidebarMenu
+{
+    //
+}

From 2a21f77e02e4462fdaaacf334dc46bbab6f889a3 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 15 Feb 2024 13:08:47 +0100
Subject: [PATCH 0176/1422] Add design annotations

---
 .../Navigation/GeneratesDocumentationSidebarMenu.php         | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index d9e6d69e081..e72cb873f49 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -4,6 +4,11 @@
 
 namespace Hyde\Framework\Features\Navigation;
 
+/**
+ * @experimental This class may change significantly before its release.
+ *
+ * @todo Consider making into a service which can create the sidebar as well.
+ */
 class GeneratesDocumentationSidebarMenu
 {
     //

From a9342cfb765601f1047aa02c4db84aca793b6f2b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 15 Feb 2024 13:09:34 +0100
Subject: [PATCH 0177/1422] Copy over base contract from related class

---
 .../GeneratesDocumentationSidebarMenu.php     | 21 ++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index e72cb873f49..50715a1f245 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -4,6 +4,8 @@
 
 namespace Hyde\Framework\Features\Navigation;
 
+use Illuminate\Support\Collection;
+
 /**
  * @experimental This class may change significantly before its release.
  *
@@ -11,5 +13,22 @@
  */
 class GeneratesDocumentationSidebarMenu
 {
-    //
+    /** @var \Illuminate\Support\Collection<string, \Hyde\Framework\Features\Navigation\NavItem> */
+    protected Collection $items;
+
+    protected function __construct()
+    {
+        $this->items = new Collection();
+    }
+
+    public static function handle(): DocumentationSidebar
+    {
+        $menu = new static();
+
+        $menu->generate();
+        $menu->sortByPriority();
+        $menu->removeDuplicateItems();
+
+        return new DocumentationSidebar($menu->items);
+    }
 }

From 80df7fffdabf6fae2d4c2e912654e0e5fea93dd4 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 15 Feb 2024 13:10:09 +0100
Subject: [PATCH 0178/1422] Copy over helper methods for refactor

---
 .../GeneratesDocumentationSidebarMenu.php     | 33 +++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index 50715a1f245..a71d19c6a97 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -4,8 +4,13 @@
 
 namespace Hyde\Framework\Features\Navigation;
 
+use Hyde\Support\Models\Route;
+use Hyde\Support\Facades\Render;
+use Hyde\Pages\DocumentationPage;
 use Illuminate\Support\Collection;
 
+use function collect;
+
 /**
  * @experimental This class may change significantly before its release.
  *
@@ -31,4 +36,32 @@ public static function handle(): DocumentationSidebar
 
         return new DocumentationSidebar($menu->items);
     }
+
+    protected function canAddRoute(Route $route): bool
+    {
+        return $route->getPage()->showInNavigation() && ! $route->is(DocumentationPage::homeRouteName());
+    }
+
+    protected function removeDuplicateItems(): void
+    {
+        $this->items = $this->items->unique(function (NavItem $item): string {
+            // Filter using a combination of the group and label to allow duplicate labels in different groups
+            return $item->getGroup().$item->label;
+        });
+    }
+
+    protected function sortByPriority(): void
+    {
+        $this->items = $this->items->sortBy('priority')->values();
+    }
+
+    private function isPageIndexPage(): bool
+    {
+        return Render::getPage()->getRoute()->is(DocumentationPage::homeRouteName());
+    }
+
+    private function shouldIndexPageBeActive(string $group): bool
+    {
+        return Render::getPage()->navigationMenuGroup() === 'other' && $group === collect($this->getGroups())->first();
+    }
 }

From fe4b91fd32a8f3ce5035df417add227ecbfefb75 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 15 Feb 2024 13:14:27 +0100
Subject: [PATCH 0179/1422] Deprecate methods being refactored

---
 .../Framework/Features/Navigation/DocumentationSidebar.php   | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 790ac82e595..c9a029020d6 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -91,11 +91,13 @@ public function makeGroupTitle(string $group): string
         return Config::getNullableString("docs.sidebar_group_labels.$group") ?? Hyde::makeTitle($group);
     }
 
+    /** @deprecated Move to new action */
     protected function canAddRoute(Route $route): bool
     {
         return $route->getPage()->showInNavigation() && ! $route->is(DocumentationPage::homeRouteName());
     }
 
+    /** @deprecated Move to new action */
     protected function removeDuplicateItems(): void
     {
         $this->items = $this->items->unique(function (NavItem $item): string {
@@ -104,16 +106,19 @@ protected function removeDuplicateItems(): void
         });
     }
 
+    /** @deprecated Move to new action */
     protected function sortByPriority(): void
     {
         $this->items = $this->items->sortBy('priority')->values();
     }
 
+    /** @deprecated Move to new action */
     private function isPageIndexPage(): bool
     {
         return Render::getPage()->getRoute()->is(DocumentationPage::homeRouteName());
     }
 
+    /** @deprecated Move to new action */
     private function shouldIndexPageBeActive(string $group): bool
     {
         return Render::getPage()->navigationMenuGroup() === 'other' && $group === collect($this->getGroups())->first();

From bed0d5d8d0a3d7678bf6529b673b25312809e487 Mon Sep 17 00:00:00 2001
From: caendesilva <caen@desilva.se>
Date: Thu, 15 Feb 2024 13:17:34 +0100
Subject: [PATCH 0180/1422] Begin copying over generate method to action

---
 .../Features/Navigation/DocumentationSidebar.php  |  1 +
 .../GeneratesDocumentationSidebarMenu.php         | 15 +++++++++++++++
 2 files changed, 16 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index c9a029020d6..c4ffabaf2fa 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -45,6 +45,7 @@ public static function create(): static
         return $menu;
     }
 
+    /** @deprecated Move to new action */
     protected function generate(): void
     {
         Routes::getRoutes(DocumentationPage::class)->each(function (Route $route): void {
diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index a71d19c6a97..7fe9094cafd 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -8,6 +8,7 @@
 use Hyde\Support\Facades\Render;
 use Hyde\Pages\DocumentationPage;
 use Illuminate\Support\Collection;
+use Hyde\Foundation\Facades\Routes;
 
 use function collect;
 
@@ -37,6 +38,20 @@ public static function handle(): DocumentationSidebar
         return new DocumentationSidebar($menu->items);
     }
 
+    protected function generate(): void
+    {
+        Routes::getRoutes(DocumentationPage::class)->each(function (Route $route): void {
+            if ($this->canAddRoute($route)) {
+                $this->items->put($route->getRouteKey(), NavItem::fromRoute($route));
+            }
+        });
+
+        // If there are no pages other than the index page, we add it to the sidebar so that it's not empty
+        if ($this->items->count() === 0 && DocumentationPage::home() !== null) {
+            $this->items->push(NavItem::fromRoute(DocumentationPage::home(), group: 'other'));
+        }
+    }
+
     protected function canAddRoute(Route $route): bool
     {
         return $route->getPage()->showInNavigation() && ! $route->is(DocumentationPage::homeRouteName());

From 80243ae50e29cee54cfaf24b2aa9740a2227ea75 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 15 Feb 2024 13:29:55 +0100
Subject: [PATCH 0181/1422] Defer logic to new action

---
 .../Features/Navigation/DocumentationSidebar.php          | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index c4ffabaf2fa..665e845c341 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -36,13 +36,7 @@ public function getItems(): Collection
     /** @deprecated Will be moved to an action */
     public static function create(): static
     {
-        $menu = new static();
-
-        $menu->generate();
-        $menu->sortByPriority();
-        $menu->removeDuplicateItems();
-
-        return $menu;
+        return GeneratesDocumentationSidebarMenu::handle();
     }
 
     /** @deprecated Move to new action */

From c1105f06335f10f479e5e5bf8e07e184dece30e7 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 15 Feb 2024 13:30:58 +0100
Subject: [PATCH 0182/1422] Remove now moved methods

---
 .../Navigation/DocumentationSidebar.php       | 38 -------------------
 1 file changed, 38 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 665e845c341..3ec019cd188 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -6,10 +6,8 @@
 
 use Hyde\Hyde;
 use Hyde\Facades\Config;
-use Hyde\Foundation\Facades\Routes;
 use Hyde\Pages\DocumentationPage;
 use Hyde\Support\Facades\Render;
-use Hyde\Support\Models\Route;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Str;
 use Illuminate\Contracts\Support\Arrayable;
@@ -39,21 +37,6 @@ public static function create(): static
         return GeneratesDocumentationSidebarMenu::handle();
     }
 
-    /** @deprecated Move to new action */
-    protected function generate(): void
-    {
-        Routes::getRoutes(DocumentationPage::class)->each(function (Route $route): void {
-            if ($this->canAddRoute($route)) {
-                $this->items->put($route->getRouteKey(), NavItem::fromRoute($route));
-            }
-        });
-
-        // If there are no pages other than the index page, we add it to the sidebar so that it's not empty
-        if ($this->items->count() === 0 && DocumentationPage::home() !== null) {
-            $this->items->push(NavItem::fromRoute(DocumentationPage::home(), group: 'other'));
-        }
-    }
-
     public function hasGroups(): bool
     {
         return (count($this->getGroups()) >= 1) && ($this->getGroups() !== ['other']);
@@ -86,27 +69,6 @@ public function makeGroupTitle(string $group): string
         return Config::getNullableString("docs.sidebar_group_labels.$group") ?? Hyde::makeTitle($group);
     }
 
-    /** @deprecated Move to new action */
-    protected function canAddRoute(Route $route): bool
-    {
-        return $route->getPage()->showInNavigation() && ! $route->is(DocumentationPage::homeRouteName());
-    }
-
-    /** @deprecated Move to new action */
-    protected function removeDuplicateItems(): void
-    {
-        $this->items = $this->items->unique(function (NavItem $item): string {
-            // Filter using a combination of the group and label to allow duplicate labels in different groups
-            return $item->getGroup().$item->label;
-        });
-    }
-
-    /** @deprecated Move to new action */
-    protected function sortByPriority(): void
-    {
-        $this->items = $this->items->sortBy('priority')->values();
-    }
-
     /** @deprecated Move to new action */
     private function isPageIndexPage(): bool
     {

From 189c515bbc3a277b8b8fd5d0b12be4ce8452268b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 15 Feb 2024 13:32:49 +0100
Subject: [PATCH 0183/1422] Deprecate method
 `DocumentationSidebar::makeGroupTitle()`

With the new NavItem system this should not be necessary, as the parent has a title
---
 .../src/Framework/Features/Navigation/DocumentationSidebar.php   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 3ec019cd188..0e2027dcb15 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -64,6 +64,7 @@ public function isGroupActive(string $group): bool
             || $this->isPageIndexPage() && $this->shouldIndexPageBeActive($group);
     }
 
+    /** @deprecated With the new NavItem system this should not be necessary, as the parent has a title */
     public function makeGroupTitle(string $group): string
     {
         return Config::getNullableString("docs.sidebar_group_labels.$group") ?? Hyde::makeTitle($group);

From 92ea7ea99f877ac086f5ae2024de07f891499a3f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 15 Feb 2024 13:35:39 +0100
Subject: [PATCH 0184/1422] Revert private method deprecations

---
 .../src/Framework/Features/Navigation/DocumentationSidebar.php  | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 0e2027dcb15..4a661bfaafe 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -70,13 +70,11 @@ public function makeGroupTitle(string $group): string
         return Config::getNullableString("docs.sidebar_group_labels.$group") ?? Hyde::makeTitle($group);
     }
 
-    /** @deprecated Move to new action */
     private function isPageIndexPage(): bool
     {
         return Render::getPage()->getRoute()->is(DocumentationPage::homeRouteName());
     }
 
-    /** @deprecated Move to new action */
     private function shouldIndexPageBeActive(string $group): bool
     {
         return Render::getPage()->navigationMenuGroup() === 'other' && $group === collect($this->getGroups())->first();

From 41849e670aee8e614a5367f4301002bc070dc7dc Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 15 Feb 2024 13:35:46 +0100
Subject: [PATCH 0185/1422] Remove unused methods

---
 .../GeneratesDocumentationSidebarMenu.php           | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index 7fe9094cafd..3221bfa3ada 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -5,13 +5,10 @@
 namespace Hyde\Framework\Features\Navigation;
 
 use Hyde\Support\Models\Route;
-use Hyde\Support\Facades\Render;
 use Hyde\Pages\DocumentationPage;
 use Illuminate\Support\Collection;
 use Hyde\Foundation\Facades\Routes;
 
-use function collect;
-
 /**
  * @experimental This class may change significantly before its release.
  *
@@ -69,14 +66,4 @@ protected function sortByPriority(): void
     {
         $this->items = $this->items->sortBy('priority')->values();
     }
-
-    private function isPageIndexPage(): bool
-    {
-        return Render::getPage()->getRoute()->is(DocumentationPage::homeRouteName());
-    }
-
-    private function shouldIndexPageBeActive(string $group): bool
-    {
-        return Render::getPage()->navigationMenuGroup() === 'other' && $group === collect($this->getGroups())->first();
-    }
 }

From 831983e525588c73d9ebc4586cf62514b375f2b7 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 15 Feb 2024 14:00:35 +0100
Subject: [PATCH 0186/1422] Document public method

---
 .../src/Framework/Features/Navigation/DocumentationSidebar.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 4a661bfaafe..04e33c4b60f 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -58,6 +58,9 @@ public function getItemsInGroup(?string $group): Collection
         })->sortBy('navigation.priority')->values();
     }
 
+    /**
+     * Is a page within the group the current page?
+     */
     public function isGroupActive(string $group): bool
     {
         return Str::slug(Render::getPage()->navigationMenuGroup()) === $group

From b1a800fa1b1d0aa402ae7b0fd6265dd7ca3f965a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 15 Feb 2024 14:01:38 +0100
Subject: [PATCH 0187/1422] Explain complex logic regarding
 https://github.com/hydephp/develop/pull/1084

---
 .../src/Framework/Features/Navigation/DocumentationSidebar.php  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 04e33c4b60f..3646fe7e250 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -60,6 +60,8 @@ public function getItemsInGroup(?string $group): Collection
 
     /**
      * Is a page within the group the current page?
+     *
+     * For index pages, this will also return true for the first group in the menu, unless the index page has a specific group set.
      */
     public function isGroupActive(string $group): bool
     {

From 1876a680b67b42312923af6a8b2fcc98bbc854ad Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 15 Feb 2024 14:02:52 +0100
Subject: [PATCH 0188/1422] Introduce local variables to make complex logic
 clearer

---
 .../Features/Navigation/DocumentationSidebar.php      | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 3646fe7e250..5bc6cb04c0e 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -65,8 +65,10 @@ public function getItemsInGroup(?string $group): Collection
      */
     public function isGroupActive(string $group): bool
     {
-        return Str::slug(Render::getPage()->navigationMenuGroup()) === $group
-            || $this->isPageIndexPage() && $this->shouldIndexPageBeActive($group);
+        $groupMatchesCurrentPageGroup = Str::slug(Render::getPage()->navigationMenuGroup()) === $group;
+        $currentPageIsIndexPageAndShouldBeActive = $this->isPageIndexPage() && $this->shouldIndexPageBeActive($group);
+
+        return $groupMatchesCurrentPageGroup || $currentPageIsIndexPageAndShouldBeActive;
     }
 
     /** @deprecated With the new NavItem system this should not be necessary, as the parent has a title */
@@ -82,6 +84,9 @@ private function isPageIndexPage(): bool
 
     private function shouldIndexPageBeActive(string $group): bool
     {
-        return Render::getPage()->navigationMenuGroup() === 'other' && $group === collect($this->getGroups())->first();
+        $indexPageHasNoSetGroup = Render::getPage()->navigationMenuGroup() === 'other';
+        $groupIsTheFirstOneInSidebar = $group === collect($this->getGroups())->first();
+
+        return $indexPageHasNoSetGroup && $groupIsTheFirstOneInSidebar;
     }
 }

From 206a57f98281156c19f7adc24d5ded8de5825c40 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 15 Feb 2024 14:58:00 +0100
Subject: [PATCH 0189/1422] Add todo

---
 .../framework/src/Framework/Factories/NavigationDataFactory.php  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/src/Framework/Factories/NavigationDataFactory.php b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
index d9406d6f2ca..51827a4d0a0 100644
--- a/packages/framework/src/Framework/Factories/NavigationDataFactory.php
+++ b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
@@ -210,6 +210,7 @@ private function canUseSubdirectoryForGroups(): bool
 
     private function defaultGroup(): ?string
     {
+        // TODO: It would be better if this was null in all cases, considering 'other' is used a a sort of confusing pseudo-null
         return $this->isInstanceOf(DocumentationPage::class) ? 'other' : null;
     }
 

From a1a4d115d24dd1dd1137d989d1ebcfbc538a1352 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 15 Feb 2024 15:13:38 +0100
Subject: [PATCH 0190/1422] Add todo to deprecation notice

---
 .../Framework/Features/Navigation/DocumentationSidebar.php  | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 5bc6cb04c0e..d071b031480 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -71,7 +71,11 @@ public function isGroupActive(string $group): bool
         return $groupMatchesCurrentPageGroup || $currentPageIsIndexPageAndShouldBeActive;
     }
 
-    /** @deprecated With the new NavItem system this should not be necessary, as the parent has a title */
+    /**
+     * @deprecated With the new NavItem system this should not be necessary, as the parent has a title
+     *
+     * @todo Get title from instance
+     */
     public function makeGroupTitle(string $group): string
     {
         return Config::getNullableString("docs.sidebar_group_labels.$group") ?? Hyde::makeTitle($group);

From 27afe8e4e3f62ff1038136698b67ccd6cf46ed89 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 15 Feb 2024 15:18:29 +0100
Subject: [PATCH 0191/1422] Add todo

---
 .../src/Framework/Features/Navigation/DocumentationSidebar.php   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index d071b031480..eba36a0d3ac 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -54,6 +54,7 @@ public function getGroups(): array
     public function getItemsInGroup(?string $group): Collection
     {
         return $this->items->filter(function (NavItem $item) use ($group): bool {
+            // Todo: Use identifier instead of slug
             return ($item->getGroup() === $group) || ($item->getGroup() === Str::slug($group));
         })->sortBy('navigation.priority')->values();
     }

From 67a98047d6b7bed1241adee5874a480adc45054e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 15 Feb 2024 16:32:07 +0100
Subject: [PATCH 0192/1422] Create AutomaticNavigationConfigurationsTest.php

---
 .../AutomaticNavigationConfigurationsTest.php | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
new file mode 100644
index 00000000000..50dabdca18c
--- /dev/null
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -0,0 +1,21 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Hyde\Framework\Testing\Feature;
+
+use Hyde\Testing\TestCase;
+
+/**
+ * High-level broad-spectrum tests for the automatic navigation configurations, testing various setups.
+ *
+ * @covers \Hyde\Framework\Factories\NavigationDataFactory
+ * @covers \Hyde\Framework\Features\Navigation\DocumentationSidebar
+ * @covers \Hyde\Framework\Features\Navigation\GeneratesDocumentationSidebarMenu
+ * @covers \Hyde\Framework\Features\Navigation\GeneratesMainNavigationMenu
+ * @covers \Hyde\Framework\Features\Navigation\NavItem
+ */
+class AutomaticNavigationConfigurationsTest extends TestCase
+{
+    //
+}

From 10c43d5a462b725340a0efcba19337c434ef9578 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 15 Feb 2024 17:14:54 +0100
Subject: [PATCH 0193/1422] Begin creating metatest framework

---
 .../AutomaticNavigationConfigurationsTest.php | 122 +++++++++++++++++-
 1 file changed, 121 insertions(+), 1 deletion(-)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 50dabdca18c..aa13b13a4e7 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -5,6 +5,9 @@
 namespace Hyde\Framework\Testing\Feature;
 
 use Hyde\Testing\TestCase;
+use Hyde\Framework\Features\Navigation\NavItem;
+use Hyde\Framework\Features\Navigation\NavigationMenu;
+use Hyde\Framework\Features\Navigation\GeneratesMainNavigationMenu;
 
 /**
  * High-level broad-spectrum tests for the automatic navigation configurations, testing various setups.
@@ -17,5 +20,122 @@
  */
 class AutomaticNavigationConfigurationsTest extends TestCase
 {
-    //
+    public function testMainNavigationMenu()
+    {
+        $this->menu()
+            ->assertHasItem('Home')
+            ->assertMatchesFormat([
+                [
+                    'label' => 'Home',
+                    'group' => null,
+                    'priority' => 0,
+                    'children' => [],
+                ],
+            ]);
+    }
+
+    protected function menu(): AssertableNavigationMenu
+    {
+        return new AssertableNavigationMenu($this);
+    }
+}
+
+class TestNavItem
+{
+    public readonly string $label;
+    public readonly ?string $group;
+    public readonly int $priority;
+    public readonly array $children;
+
+    public function __construct(string $label, ?string $group, int $priority, array $children)
+    {
+        $this->label = $label;
+        $this->group = $group;
+        $this->priority = $priority;
+        $this->children = collect($children)->map(fn (NavItem $child) => $child->getLabel())->toArray();
+    }
+
+    public static function properties(): array
+    {
+        return ['label', 'group', 'priority', 'children'];
+    }
+}
+
+class AssertableNavigationMenu extends NavigationMenu
+{
+    protected TestCase $test;
+
+    public function __construct(TestCase $test)
+    {
+        parent::__construct(GeneratesMainNavigationMenu::handle()->getItems());
+
+        $this->test = $test;
+    }
+
+    /** A simplified serialized format for comparisons */
+    public function format(): array
+    {
+        return $this->items->map(function (NavItem $item) {
+            return new TestNavItem(
+                $item->getLabel(),
+                $item->getGroup(),
+                $item->getPriority(),
+                $item->getChildren()
+            );
+        })->toArray();
+    }
+
+    /** @noinspection PhpUnused, PhpNoReturnAttributeCanBeAddedInspection */
+    public function dd(): void
+    {
+        dd($this->items);
+    }
+
+    /** @noinspection PhpUnused, PhpNoReturnAttributeCanBeAddedInspection */
+    public function ddFormat(): void
+    {
+        dd($this->format());
+    }
+
+    /**
+     * @param  array  $expected  The expected format
+     * @param  bool  $strict  If false, missing array keys are ignored
+     */
+    public function assertMatchesFormat(array $expected, bool $strict = false): static
+    {
+        // $this->test->assertEquals($expected, $this->format(), 'Failed to match the expected format');
+
+        foreach ($expected as $index => $item) {
+            foreach (TestNavItem::properties() as $property) {
+                $actual = $this->format()[$index] ?? null;
+
+                if ($actual === null) {
+                    // Count mismatch which we will catch at end of loop
+
+                    continue;
+                }
+
+                if (! isset($item[$property])) {
+                    if ($strict) {
+                        $this->test->fail("Missing array key '$property' in the expected format");
+                    }
+
+                    continue;
+                }
+
+                $this->test->assertSame($item[$property], $actual->$property, "Failed to match the expected value for '$property'");
+            }
+
+            $this->test->assertCount(count($expected), $this->format(), 'The expected format has a different count than the actual format');
+        }
+
+        return $this;
+    }
+
+    public function assertHasItem(string $label): static
+    {
+        $this->test->assertNotEmpty($this->items->first(fn ($item) => $item->getLabel() === $label), "Item with label '$label' not found in the main navigation menu");
+
+        return $this;
+    }
 }

From 62a7b36f2c48422c662b2febccf3dc11490cc70b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 15 Feb 2024 17:17:30 +0100
Subject: [PATCH 0194/1422] Rename testing helper

---
 .../tests/Feature/AutomaticNavigationConfigurationsTest.php   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index aa13b13a4e7..dcf9a6162d4 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -24,7 +24,7 @@ public function testMainNavigationMenu()
     {
         $this->menu()
             ->assertHasItem('Home')
-            ->assertMatchesFormat([
+            ->assertEquals([
                 [
                     'label' => 'Home',
                     'group' => null,
@@ -101,7 +101,7 @@ public function ddFormat(): void
      * @param  array  $expected  The expected format
      * @param  bool  $strict  If false, missing array keys are ignored
      */
-    public function assertMatchesFormat(array $expected, bool $strict = false): static
+    public function assertEquals(array $expected, bool $strict = false): static
     {
         // $this->test->assertEquals($expected, $this->format(), 'Failed to match the expected format');
 

From 0ff7bda614aaf3dd68431dd67e97f4f444fae7ca Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 15 Feb 2024 17:17:38 +0100
Subject: [PATCH 0195/1422] Join comma-separated values into a single line

---
 .../Feature/AutomaticNavigationConfigurationsTest.php      | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index dcf9a6162d4..d81e2afcdd8 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -76,12 +76,7 @@ public function __construct(TestCase $test)
     public function format(): array
     {
         return $this->items->map(function (NavItem $item) {
-            return new TestNavItem(
-                $item->getLabel(),
-                $item->getGroup(),
-                $item->getPriority(),
-                $item->getChildren()
-            );
+            return new TestNavItem($item->getLabel(), $item->getGroup(), $item->getPriority(), $item->getChildren());
         })->toArray();
     }
 

From c126b4916296e938d6946e287bc66c2e15459492 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 15 Feb 2024 17:17:51 +0100
Subject: [PATCH 0196/1422] Add closure return type

---
 .../tests/Feature/AutomaticNavigationConfigurationsTest.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index d81e2afcdd8..f5e65c6cb5e 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -75,7 +75,7 @@ public function __construct(TestCase $test)
     /** A simplified serialized format for comparisons */
     public function format(): array
     {
-        return $this->items->map(function (NavItem $item) {
+        return $this->items->map(function (NavItem $item): TestNavItem {
             return new TestNavItem($item->getLabel(), $item->getGroup(), $item->getPriority(), $item->getChildren());
         })->toArray();
     }

From 70f55a94868850b2aa3c86576adc9c5ca809ca96 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 15 Feb 2024 17:18:16 +0100
Subject: [PATCH 0197/1422] Remove comment

---
 .../tests/Feature/AutomaticNavigationConfigurationsTest.php     | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index f5e65c6cb5e..5460d007492 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -98,8 +98,6 @@ public function ddFormat(): void
      */
     public function assertEquals(array $expected, bool $strict = false): static
     {
-        // $this->test->assertEquals($expected, $this->format(), 'Failed to match the expected format');
-
         foreach ($expected as $index => $item) {
             foreach (TestNavItem::properties() as $property) {
                 $actual = $this->format()[$index] ?? null;

From 24ae3e7539802b685a031514c9d29fbdfe428610 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 15 Feb 2024 17:19:38 +0100
Subject: [PATCH 0198/1422] Rename test term to be more specific

---
 .../AutomaticNavigationConfigurationsTest.php        | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 5460d007492..bb3b7039341 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -73,7 +73,7 @@ public function __construct(TestCase $test)
     }
 
     /** A simplified serialized format for comparisons */
-    public function format(): array
+    public function state(): array
     {
         return $this->items->map(function (NavItem $item): TestNavItem {
             return new TestNavItem($item->getLabel(), $item->getGroup(), $item->getPriority(), $item->getChildren());
@@ -89,18 +89,18 @@ public function dd(): void
     /** @noinspection PhpUnused, PhpNoReturnAttributeCanBeAddedInspection */
     public function ddFormat(): void
     {
-        dd($this->format());
+        dd($this->state());
     }
 
     /**
-     * @param  array  $expected  The expected format
+     * @param  array  $expected  The expected state format
      * @param  bool  $strict  If false, missing array keys are ignored
      */
     public function assertEquals(array $expected, bool $strict = false): static
     {
         foreach ($expected as $index => $item) {
             foreach (TestNavItem::properties() as $property) {
-                $actual = $this->format()[$index] ?? null;
+                $actual = $this->state()[$index] ?? null;
 
                 if ($actual === null) {
                     // Count mismatch which we will catch at end of loop
@@ -110,7 +110,7 @@ public function assertEquals(array $expected, bool $strict = false): static
 
                 if (! isset($item[$property])) {
                     if ($strict) {
-                        $this->test->fail("Missing array key '$property' in the expected format");
+                        $this->test->fail("Missing array key '$property' in the expected state");
                     }
 
                     continue;
@@ -119,7 +119,7 @@ public function assertEquals(array $expected, bool $strict = false): static
                 $this->test->assertSame($item[$property], $actual->$property, "Failed to match the expected value for '$property'");
             }
 
-            $this->test->assertCount(count($expected), $this->format(), 'The expected format has a different count than the actual format');
+            $this->test->assertCount(count($expected), $this->state(), 'The expected state has a different count than the actual state');
         }
 
         return $this;

From 28d9ede3c5ccdf2f9b066fcd36b0b7408b1b5a7f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 15 Feb 2024 17:21:03 +0100
Subject: [PATCH 0199/1422] Add option to get single state

---
 .../Feature/AutomaticNavigationConfigurationsTest.php     | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index bb3b7039341..a8608efa41e 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -73,8 +73,12 @@ public function __construct(TestCase $test)
     }
 
     /** A simplified serialized format for comparisons */
-    public function state(): array
+    public function state(?int $index = null): TestNavItem|array
     {
+        if ($index !== null) {
+            return $this->state()[$index];
+        }
+
         return $this->items->map(function (NavItem $item): TestNavItem {
             return new TestNavItem($item->getLabel(), $item->getGroup(), $item->getPriority(), $item->getChildren());
         })->toArray();
@@ -100,7 +104,7 @@ public function assertEquals(array $expected, bool $strict = false): static
     {
         foreach ($expected as $index => $item) {
             foreach (TestNavItem::properties() as $property) {
-                $actual = $this->state()[$index] ?? null;
+                $actual = $this->state($index) ?? null;
 
                 if ($actual === null) {
                     // Count mismatch which we will catch at end of loop

From 97c6de8f8fb17178e2c0f8d8ef0aa5b041735f01 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 15 Feb 2024 17:21:07 +0100
Subject: [PATCH 0200/1422] Revert "Add option to get single state"

This reverts commit 28d9ede3c5ccdf2f9b066fcd36b0b7408b1b5a7f.
---
 .../Feature/AutomaticNavigationConfigurationsTest.php     | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index a8608efa41e..bb3b7039341 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -73,12 +73,8 @@ public function __construct(TestCase $test)
     }
 
     /** A simplified serialized format for comparisons */
-    public function state(?int $index = null): TestNavItem|array
+    public function state(): array
     {
-        if ($index !== null) {
-            return $this->state()[$index];
-        }
-
         return $this->items->map(function (NavItem $item): TestNavItem {
             return new TestNavItem($item->getLabel(), $item->getGroup(), $item->getPriority(), $item->getChildren());
         })->toArray();
@@ -104,7 +100,7 @@ public function assertEquals(array $expected, bool $strict = false): static
     {
         foreach ($expected as $index => $item) {
             foreach (TestNavItem::properties() as $property) {
-                $actual = $this->state($index) ?? null;
+                $actual = $this->state()[$index] ?? null;
 
                 if ($actual === null) {
                     // Count mismatch which we will catch at end of loop

From a741c8eb4093104f0c8d271f976e5286bca9e826 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 15 Feb 2024 17:21:46 +0100
Subject: [PATCH 0201/1422] Add helper to get single state

---
 .../Feature/AutomaticNavigationConfigurationsTest.php      | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index bb3b7039341..6231ca3ad4b 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -80,6 +80,11 @@ public function state(): array
         })->toArray();
     }
 
+    public function getState(int $index): ?TestNavItem
+    {
+        return $this->state()[$index] ?? null;
+    }
+
     /** @noinspection PhpUnused, PhpNoReturnAttributeCanBeAddedInspection */
     public function dd(): void
     {
@@ -100,7 +105,7 @@ public function assertEquals(array $expected, bool $strict = false): static
     {
         foreach ($expected as $index => $item) {
             foreach (TestNavItem::properties() as $property) {
-                $actual = $this->state()[$index] ?? null;
+                $actual = $this->getState($index);
 
                 if ($actual === null) {
                     // Count mismatch which we will catch at end of loop

From cd8b33f9e5fae115e4dc400aced8c13f2bf512e2 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 15 Feb 2024 17:21:55 +0100
Subject: [PATCH 0202/1422] Inline local variable

---
 .../tests/Feature/AutomaticNavigationConfigurationsTest.php | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 6231ca3ad4b..5f303481684 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -105,9 +105,7 @@ public function assertEquals(array $expected, bool $strict = false): static
     {
         foreach ($expected as $index => $item) {
             foreach (TestNavItem::properties() as $property) {
-                $actual = $this->getState($index);
-
-                if ($actual === null) {
+                if ($this->getState($index) === null) {
                     // Count mismatch which we will catch at end of loop
 
                     continue;
@@ -121,7 +119,7 @@ public function assertEquals(array $expected, bool $strict = false): static
                     continue;
                 }
 
-                $this->test->assertSame($item[$property], $actual->$property, "Failed to match the expected value for '$property'");
+                $this->test->assertSame($item[$property], $this->getState($index)->$property, "Failed to match the expected value for '$property'");
             }
 
             $this->test->assertCount(count($expected), $this->state(), 'The expected state has a different count than the actual state');

From d1714175d1dff84c8de7bd6cb636f0584d346238 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 15 Feb 2024 17:22:57 +0100
Subject: [PATCH 0203/1422] Fix assertion should run after all loops

---
 .../tests/Feature/AutomaticNavigationConfigurationsTest.php   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 5f303481684..98668ae4be4 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -121,10 +121,10 @@ public function assertEquals(array $expected, bool $strict = false): static
 
                 $this->test->assertSame($item[$property], $this->getState($index)->$property, "Failed to match the expected value for '$property'");
             }
-
-            $this->test->assertCount(count($expected), $this->state(), 'The expected state has a different count than the actual state');
         }
 
+        $this->test->assertCount(count($expected), $this->state(), 'The expected state has a different count than the actual state');
+
         return $this;
     }
 

From 986694cc02d3041bc026594e83e2d0c2b8f614e0 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 15 Feb 2024 17:24:09 +0100
Subject: [PATCH 0204/1422] Refactor loop control flow

---
 .../AutomaticNavigationConfigurationsTest.php        | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 98668ae4be4..e3a1ba39739 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -111,15 +111,11 @@ public function assertEquals(array $expected, bool $strict = false): static
                     continue;
                 }
 
-                if (! isset($item[$property])) {
-                    if ($strict) {
-                        $this->test->fail("Missing array key '$property' in the expected state");
-                    }
-
-                    continue;
+                if (isset($item[$property])) {
+                    $this->test->assertSame($item[$property], $this->getState($index)->$property, "Failed to match the expected value for '$property'");
+                } elseif ($strict) {
+                    $this->test->fail("Missing array key '$property' in the expected state");
                 }
-
-                $this->test->assertSame($item[$property], $this->getState($index)->$property, "Failed to match the expected value for '$property'");
             }
         }
 

From 789cfa045f683c3df0503f2cbce9aef20faf2b7c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 15 Feb 2024 17:25:53 +0100
Subject: [PATCH 0205/1422] Refactor inner loop control flow

---
 .../AutomaticNavigationConfigurationsTest.php    | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index e3a1ba39739..2c0d1032e29 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -105,16 +105,12 @@ public function assertEquals(array $expected, bool $strict = false): static
     {
         foreach ($expected as $index => $item) {
             foreach (TestNavItem::properties() as $property) {
-                if ($this->getState($index) === null) {
-                    // Count mismatch which we will catch at end of loop
-
-                    continue;
-                }
-
-                if (isset($item[$property])) {
-                    $this->test->assertSame($item[$property], $this->getState($index)->$property, "Failed to match the expected value for '$property'");
-                } elseif ($strict) {
-                    $this->test->fail("Missing array key '$property' in the expected state");
+                if ($this->getState($index) !== null) {
+                    if (isset($item[$property])) {
+                        $this->test->assertSame($item[$property], $this->getState($index)->$property, "Failed to match the expected value for '$property'");
+                    } elseif ($strict) {
+                        $this->test->fail("Missing array key '$property' in the expected state");
+                    }
                 }
             }
         }

From 07956df1e632f47c602d4803fd4f094726bad9c5 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 15 Feb 2024 17:37:35 +0100
Subject: [PATCH 0206/1422] Add shorthand to compare labels

---
 .../AutomaticNavigationConfigurationsTest.php       | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 2c0d1032e29..95abc807742 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -24,14 +24,7 @@ public function testMainNavigationMenu()
     {
         $this->menu()
             ->assertHasItem('Home')
-            ->assertEquals([
-                [
-                    'label' => 'Home',
-                    'group' => null,
-                    'priority' => 0,
-                    'children' => [],
-                ],
-            ]);
+            ->assertEquals(['Home']);
     }
 
     protected function menu(): AssertableNavigationMenu
@@ -104,6 +97,10 @@ public function ddFormat(): void
     public function assertEquals(array $expected, bool $strict = false): static
     {
         foreach ($expected as $index => $item) {
+            if (! is_array($item)) {
+                $item = ['label' => $item];
+            }
+
             foreach (TestNavItem::properties() as $property) {
                 if ($this->getState($index) !== null) {
                     if (isset($item[$property])) {

From 68fa1d9a1de483887c10690c297319de74a525bb Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 15 Feb 2024 17:38:36 +0100
Subject: [PATCH 0207/1422] Simplify comparison

---
 .../tests/Feature/AutomaticNavigationConfigurationsTest.php   | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 95abc807742..e5f72c8a14a 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -22,9 +22,7 @@ class AutomaticNavigationConfigurationsTest extends TestCase
 {
     public function testMainNavigationMenu()
     {
-        $this->menu()
-            ->assertHasItem('Home')
-            ->assertEquals(['Home']);
+        $this->menu()->assertEquals(['Home']);
     }
 
     protected function menu(): AssertableNavigationMenu

From 47fe9e92652293a64508bc7901524814575fcd57 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 15 Feb 2024 17:40:42 +0100
Subject: [PATCH 0208/1422] Add property instead of extension

---
 .../Feature/AutomaticNavigationConfigurationsTest.php      | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index e5f72c8a14a..d69fa94b658 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -5,8 +5,8 @@
 namespace Hyde\Framework\Testing\Feature;
 
 use Hyde\Testing\TestCase;
+use Illuminate\Support\Collection;
 use Hyde\Framework\Features\Navigation\NavItem;
-use Hyde\Framework\Features\Navigation\NavigationMenu;
 use Hyde\Framework\Features\Navigation\GeneratesMainNavigationMenu;
 
 /**
@@ -52,13 +52,14 @@ public static function properties(): array
     }
 }
 
-class AssertableNavigationMenu extends NavigationMenu
+class AssertableNavigationMenu
 {
     protected TestCase $test;
+    protected Collection $items;
 
     public function __construct(TestCase $test)
     {
-        parent::__construct(GeneratesMainNavigationMenu::handle()->getItems());
+        $this->items = GeneratesMainNavigationMenu::handle()->getItems();
 
         $this->test = $test;
     }

From 723d49c6737082387100564234c3dcd5c31a9ef9 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 15 Feb 2024 17:43:09 +0100
Subject: [PATCH 0209/1422] Add scaffolding to test sidebars

---
 .../AutomaticNavigationConfigurationsTest.php   | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index d69fa94b658..be75abaf099 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -8,6 +8,7 @@
 use Illuminate\Support\Collection;
 use Hyde\Framework\Features\Navigation\NavItem;
 use Hyde\Framework\Features\Navigation\GeneratesMainNavigationMenu;
+use Hyde\Framework\Features\Navigation\GeneratesDocumentationSidebarMenu;
 
 /**
  * High-level broad-spectrum tests for the automatic navigation configurations, testing various setups.
@@ -25,10 +26,20 @@ public function testMainNavigationMenu()
         $this->menu()->assertEquals(['Home']);
     }
 
+    public function testDocumentationSidebarMenu()
+    {
+        $this->sidebar()->assertEquals([]);
+    }
+
     protected function menu(): AssertableNavigationMenu
     {
         return new AssertableNavigationMenu($this);
     }
+
+    protected function sidebar(): AssertableNavigationMenu
+    {
+        return new AssertableNavigationMenu($this, true);
+    }
 }
 
 class TestNavItem
@@ -57,9 +68,11 @@ class AssertableNavigationMenu
     protected TestCase $test;
     protected Collection $items;
 
-    public function __construct(TestCase $test)
+    public function __construct(TestCase $test, $sidebar = false)
     {
-        $this->items = GeneratesMainNavigationMenu::handle()->getItems();
+        $this->items = $sidebar
+            ? GeneratesDocumentationSidebarMenu::handle()->getItems()
+            : GeneratesMainNavigationMenu::handle()->getItems();
 
         $this->test = $test;
     }

From 88af77f2a24b2a2a5c43f0d005738a9b5bd2016f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 15 Feb 2024 18:10:43 +0100
Subject: [PATCH 0210/1422] Set up test kernel

---
 .../AutomaticNavigationConfigurationsTest.php | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index be75abaf099..a52c853a5fd 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -5,7 +5,9 @@
 namespace Hyde\Framework\Testing\Feature;
 
 use Hyde\Testing\TestCase;
+use Hyde\Foundation\HydeKernel;
 use Illuminate\Support\Collection;
+use Hyde\Foundation\Kernel\RouteCollection;
 use Hyde\Framework\Features\Navigation\NavItem;
 use Hyde\Framework\Features\Navigation\GeneratesMainNavigationMenu;
 use Hyde\Framework\Features\Navigation\GeneratesDocumentationSidebarMenu;
@@ -21,6 +23,14 @@
  */
 class AutomaticNavigationConfigurationsTest extends TestCase
 {
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->kernel = new TestKernel();
+        HydeKernel::setInstance($this->kernel);
+    }
+
     public function testMainNavigationMenu()
     {
         $this->menu()->assertEquals(['Home']);
@@ -136,3 +146,19 @@ public function assertHasItem(string $label): static
         return $this;
     }
 }
+
+class TestKernel extends HydeKernel
+{
+    protected ?RouteCollection $mockRoutes = null;
+
+    public function setRoutes(Collection $routes): void
+    {
+        $this->mockRoutes = RouteCollection::make($routes);
+    }
+
+    /** @return \Hyde\Foundation\Kernel\RouteCollection<string, \Hyde\Support\Models\Route> */
+    public function routes(): RouteCollection
+    {
+        return $this->mockRoutes ?? parent::routes();
+    }
+}

From 118d1331cc888689602e05d016e9d07c74158a15 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 15 Feb 2024 18:12:03 +0100
Subject: [PATCH 0211/1422] Test with pages

---
 .../AutomaticNavigationConfigurationsTest.php | 25 +++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index a52c853a5fd..572c8cd404a 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -5,6 +5,8 @@
 namespace Hyde\Framework\Testing\Feature;
 
 use Hyde\Testing\TestCase;
+use Illuminate\Support\Str;
+use Hyde\Pages\MarkdownPage;
 use Hyde\Foundation\HydeKernel;
 use Illuminate\Support\Collection;
 use Hyde\Foundation\Kernel\RouteCollection;
@@ -41,6 +43,29 @@ public function testDocumentationSidebarMenu()
         $this->sidebar()->assertEquals([]);
     }
 
+    public function testMainNavigationMenuWithPages()
+    {
+        $this->withPages([
+            'About' => MarkdownPage::class,
+            'Contact' => MarkdownPage::class,
+        ]);
+
+        $this->menu()->assertEquals([
+            'About',
+            'Contact',
+        ]);
+    }
+
+    protected function withPages(array $pages): static
+    {
+        $routes = collect($pages)->mapWithKeys(/** @param class-string<\Hyde\Pages\Concerns\HydePage> $page */ function (string $page, string $title) {
+            return [Str::slug($title) => $page::make(Str::slug($title), ['title' => $title])->getRoute()];
+        });
+        $this->kernel->setRoutes($routes);
+
+        return $this;
+    }
+
     protected function menu(): AssertableNavigationMenu
     {
         return new AssertableNavigationMenu($this);

From f9d55c816a14fb7cb9b6d353dc3d379a51bdad27 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 15 Feb 2024 18:12:36 +0100
Subject: [PATCH 0212/1422] Merge fluent method calls

---
 .../tests/Feature/AutomaticNavigationConfigurationsTest.php   | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 572c8cd404a..c63a39b9a6f 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -48,9 +48,7 @@ public function testMainNavigationMenuWithPages()
         $this->withPages([
             'About' => MarkdownPage::class,
             'Contact' => MarkdownPage::class,
-        ]);
-
-        $this->menu()->assertEquals([
+        ])->menu()->assertEquals([
             'About',
             'Contact',
         ]);

From a56a071be1441604dde0ba52379a44fd333a040e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 15 Feb 2024 18:37:17 +0100
Subject: [PATCH 0213/1422] Simplify test data handling

---
 .../Feature/AutomaticNavigationConfigurationsTest.php | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index c63a39b9a6f..474edf688c2 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -5,9 +5,9 @@
 namespace Hyde\Framework\Testing\Feature;
 
 use Hyde\Testing\TestCase;
-use Illuminate\Support\Str;
 use Hyde\Pages\MarkdownPage;
 use Hyde\Foundation\HydeKernel;
+use Hyde\Pages\Concerns\HydePage;
 use Illuminate\Support\Collection;
 use Hyde\Foundation\Kernel\RouteCollection;
 use Hyde\Framework\Features\Navigation\NavItem;
@@ -46,8 +46,8 @@ public function testDocumentationSidebarMenu()
     public function testMainNavigationMenuWithPages()
     {
         $this->withPages([
-            'About' => MarkdownPage::class,
-            'Contact' => MarkdownPage::class,
+            new MarkdownPage('about'),
+            new MarkdownPage('contact'),
         ])->menu()->assertEquals([
             'About',
             'Contact',
@@ -56,10 +56,7 @@ public function testMainNavigationMenuWithPages()
 
     protected function withPages(array $pages): static
     {
-        $routes = collect($pages)->mapWithKeys(/** @param class-string<\Hyde\Pages\Concerns\HydePage> $page */ function (string $page, string $title) {
-            return [Str::slug($title) => $page::make(Str::slug($title), ['title' => $title])->getRoute()];
-        });
-        $this->kernel->setRoutes($routes);
+        $this->kernel->setRoutes(collect($pages)->map(fn (HydePage $page) => $page->getRoute()));
 
         return $this;
     }

From 996debd08126e92e5d6b4d48950b629aa89b7a03 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 15 Feb 2024 18:49:44 +0100
Subject: [PATCH 0214/1422] Rename method to match other rename

---
 .../tests/Feature/AutomaticNavigationConfigurationsTest.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 474edf688c2..5022cb91237 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -127,7 +127,7 @@ public function dd(): void
     }
 
     /** @noinspection PhpUnused, PhpNoReturnAttributeCanBeAddedInspection */
-    public function ddFormat(): void
+    public function ddState(): void
     {
         dd($this->state());
     }

From 2e04862b5197da3a4944470a325a4ba1dab8692f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 15 Feb 2024 18:49:22 +0100
Subject: [PATCH 0215/1422] Test main navigation menu with front matter
 priorities

---
 .../AutomaticNavigationConfigurationsTest.php | 27 +++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 5022cb91237..dfea0f05b02 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -54,6 +54,33 @@ public function testMainNavigationMenuWithPages()
         ]);
     }
 
+    public function testMainNavigationMenuWithPagesWithFrontMatterPriority()
+    {
+        $this->withPages([
+            new MarkdownPage('first', ['navigation.priority' => 1]),
+            new MarkdownPage('second', ['navigation.priority' => 2]),
+        ])->menu()->assertEquals([
+            'First',
+            'Second',
+        ]);
+
+        $this->withPages([
+            new MarkdownPage('first', ['navigation.priority' => 2]),
+            new MarkdownPage('second', ['navigation.priority' => 1]),
+        ])->menu()->assertEquals([
+            'Second',
+            'First',
+        ]);
+
+        $this->withPages([
+            new MarkdownPage('first', ['navigation.order' => 2]),
+            new MarkdownPage('second', ['navigation.order' => 1]),
+        ])->menu()->assertEquals([
+            'Second',
+            'First',
+        ]);
+    }
+
     protected function withPages(array $pages): static
     {
         $this->kernel->setRoutes(collect($pages)->map(fn (HydePage $page) => $page->getRoute()));

From b195e8b08cd658dfa7c1e4f0b71b3f53b7e67f98 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 15 Feb 2024 18:51:56 +0100
Subject: [PATCH 0216/1422] Improve test specificity

---
 .../AutomaticNavigationConfigurationsTest.php | 27 ++++++++++++++++---
 1 file changed, 23 insertions(+), 4 deletions(-)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index dfea0f05b02..3fe78583315 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -59,23 +59,42 @@ public function testMainNavigationMenuWithPagesWithFrontMatterPriority()
         $this->withPages([
             new MarkdownPage('first', ['navigation.priority' => 1]),
             new MarkdownPage('second', ['navigation.priority' => 2]),
+            new MarkdownPage('third', ['navigation.priority' => 3]),
         ])->menu()->assertEquals([
             'First',
             'Second',
+            'Third',
         ]);
 
         $this->withPages([
-            new MarkdownPage('first', ['navigation.priority' => 2]),
-            new MarkdownPage('second', ['navigation.priority' => 1]),
+            new MarkdownPage('first', ['navigation.priority' => 3]),
+            new MarkdownPage('second', ['navigation.priority' => 2]),
+            new MarkdownPage('third', ['navigation.priority' => 1]),
         ])->menu()->assertEquals([
+            'Third',
             'Second',
             'First',
         ]);
+    }
+
+    public function testMainNavigationMenuWithPagesWithFrontMatterOrder()
+    {
+        $this->withPages([
+            new MarkdownPage('first', ['navigation.order' => 1]),
+            new MarkdownPage('second', ['navigation.order' => 2]),
+            new MarkdownPage('third', ['navigation.order' => 3]),
+        ])->menu()->assertEquals([
+            'First',
+            'Second',
+            'Third',
+        ]);
 
         $this->withPages([
-            new MarkdownPage('first', ['navigation.order' => 2]),
-            new MarkdownPage('second', ['navigation.order' => 1]),
+            new MarkdownPage('first', ['navigation.order' => 3]),
+            new MarkdownPage('second', ['navigation.order' => 2]),
+            new MarkdownPage('third', ['navigation.order' => 1]),
         ])->menu()->assertEquals([
+            'Third',
             'Second',
             'First',
         ]);

From 0eaaa096e1a3b5e18ecdc3edb31e9bc83676a9ef Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 15 Feb 2024 18:59:19 +0100
Subject: [PATCH 0217/1422] Refactor to extract helper to reduce boilerplate

---
 .../AutomaticNavigationConfigurationsTest.php | 50 +++++--------------
 1 file changed, 13 insertions(+), 37 deletions(-)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 3fe78583315..ae8b55be136 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -5,6 +5,7 @@
 namespace Hyde\Framework\Testing\Feature;
 
 use Hyde\Testing\TestCase;
+use Illuminate\Support\Str;
 use Hyde\Pages\MarkdownPage;
 use Hyde\Foundation\HydeKernel;
 use Hyde\Pages\Concerns\HydePage;
@@ -56,48 +57,23 @@ public function testMainNavigationMenuWithPages()
 
     public function testMainNavigationMenuWithPagesWithFrontMatterPriority()
     {
-        $this->withPages([
-            new MarkdownPage('first', ['navigation.priority' => 1]),
-            new MarkdownPage('second', ['navigation.priority' => 2]),
-            new MarkdownPage('third', ['navigation.priority' => 3]),
-        ])->menu()->assertEquals([
-            'First',
-            'Second',
-            'Third',
-        ]);
-
-        $this->withPages([
-            new MarkdownPage('first', ['navigation.priority' => 3]),
-            new MarkdownPage('second', ['navigation.priority' => 2]),
-            new MarkdownPage('third', ['navigation.priority' => 1]),
-        ])->menu()->assertEquals([
-            'Third',
-            'Second',
-            'First',
-        ]);
+        $this->testNavigationMenuWithPages('priority', [1, 2, 3], ['First', 'Second', 'Third']);
+        $this->testNavigationMenuWithPages('priority', [3, 2, 1], ['Third', 'Second', 'First']);
     }
 
     public function testMainNavigationMenuWithPagesWithFrontMatterOrder()
     {
-        $this->withPages([
-            new MarkdownPage('first', ['navigation.order' => 1]),
-            new MarkdownPage('second', ['navigation.order' => 2]),
-            new MarkdownPage('third', ['navigation.order' => 3]),
-        ])->menu()->assertEquals([
-            'First',
-            'Second',
-            'Third',
-        ]);
+        $this->testNavigationMenuWithPages('order', [1, 2, 3], ['First', 'Second', 'Third']);
+        $this->testNavigationMenuWithPages('order', [3, 2, 1], ['Third', 'Second', 'First']);
+    }
 
-        $this->withPages([
-            new MarkdownPage('first', ['navigation.order' => 3]),
-            new MarkdownPage('second', ['navigation.order' => 2]),
-            new MarkdownPage('third', ['navigation.order' => 1]),
-        ])->menu()->assertEquals([
-            'Third',
-            'Second',
-            'First',
-        ]);
+    protected function testNavigationMenuWithPages($field, $priorities, $expectedOrder): void
+    {
+        $pages = collect($priorities)->map(function ($value) use ($expectedOrder, $field) {
+            return new MarkdownPage(Str::slug($expectedOrder[$value - 1]), ["navigation.$field" => $value]);
+        })->all();
+
+        $this->withPages($pages)->menu()->assertEquals($expectedOrder);
     }
 
     protected function withPages(array $pages): static

From 0b216709a132efc9e218a52af5c159593f1575d5 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 15 Feb 2024 19:01:11 +0100
Subject: [PATCH 0218/1422] Improve testing helper implementation

---
 .../AutomaticNavigationConfigurationsTest.php  | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index ae8b55be136..7940346a495 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -55,21 +55,23 @@ public function testMainNavigationMenuWithPages()
         ]);
     }
 
-    public function testMainNavigationMenuWithPagesWithFrontMatterPriority()
+    public function testMainNavigationMenuWithPagesPriority()
     {
-        $this->testNavigationMenuWithPages('priority', [1, 2, 3], ['First', 'Second', 'Third']);
-        $this->testNavigationMenuWithPages('priority', [3, 2, 1], ['Third', 'Second', 'First']);
+        $this->assertMenuOrder(['priority' => [1, 2, 3]], ['First', 'Second', 'Third']);
+        $this->assertMenuOrder(['priority' => [3, 2, 1]], ['Third', 'Second', 'First']);
     }
 
-    public function testMainNavigationMenuWithPagesWithFrontMatterOrder()
+    public function testMainNavigationMenuWithPagesOrder()
     {
-        $this->testNavigationMenuWithPages('order', [1, 2, 3], ['First', 'Second', 'Third']);
-        $this->testNavigationMenuWithPages('order', [3, 2, 1], ['Third', 'Second', 'First']);
+        $this->assertMenuOrder(['order' => [1, 2, 3]], ['First', 'Second', 'Third']);
+        $this->assertMenuOrder(['order' => [3, 2, 1]], ['Third', 'Second', 'First']);
     }
 
-    protected function testNavigationMenuWithPages($field, $priorities, $expectedOrder): void
+    protected function assertMenuOrder(array $frontMatterValues, array $expectedOrder): void
     {
-        $pages = collect($priorities)->map(function ($value) use ($expectedOrder, $field) {
+        $field = key($frontMatterValues);
+
+        $pages = collect($frontMatterValues[$field])->map(function ($value) use ($expectedOrder, $field) {
             return new MarkdownPage(Str::slug($expectedOrder[$value - 1]), ["navigation.$field" => $value]);
         })->all();
 

From 24fb65ac3f74aa7d2b81381e513ad24ff5bae1c2 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 15 Feb 2024 19:03:17 +0100
Subject: [PATCH 0219/1422] Rename tests to be clearer

---
 .../tests/Feature/AutomaticNavigationConfigurationsTest.php   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 7940346a495..14c8b8ee7b0 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -55,13 +55,13 @@ public function testMainNavigationMenuWithPages()
         ]);
     }
 
-    public function testMainNavigationMenuWithPagesPriority()
+    public function testMainNavigationMenuWithPagesWithFrontMatterPriority()
     {
         $this->assertMenuOrder(['priority' => [1, 2, 3]], ['First', 'Second', 'Third']);
         $this->assertMenuOrder(['priority' => [3, 2, 1]], ['Third', 'Second', 'First']);
     }
 
-    public function testMainNavigationMenuWithPagesOrder()
+    public function testMainNavigationMenuWithPagesWithFrontMatterOrder()
     {
         $this->assertMenuOrder(['order' => [1, 2, 3]], ['First', 'Second', 'Third']);
         $this->assertMenuOrder(['order' => [3, 2, 1]], ['Third', 'Second', 'First']);

From c17a6c644dccebb65a25238f04b13fbbf65fe36d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 15 Feb 2024 19:07:43 +0100
Subject: [PATCH 0220/1422] Merge test methods to further assess field
 interoperability

---
 .../AutomaticNavigationConfigurationsTest.php | 24 +++++++------------
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 14c8b8ee7b0..08a04343910 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -57,25 +57,19 @@ public function testMainNavigationMenuWithPages()
 
     public function testMainNavigationMenuWithPagesWithFrontMatterPriority()
     {
-        $this->assertMenuOrder(['priority' => [1, 2, 3]], ['First', 'Second', 'Third']);
-        $this->assertMenuOrder(['priority' => [3, 2, 1]], ['Third', 'Second', 'First']);
+        $this->assertMenuOrder(['priority', 'order'], [1, 2, 3], ['First', 'Second', 'Third']);
+        $this->assertMenuOrder(['priority', 'order'], [3, 2, 1], ['Third', 'Second', 'First']);
     }
 
-    public function testMainNavigationMenuWithPagesWithFrontMatterOrder()
+    protected function assertMenuOrder(array $fields, array $frontMatterValues, array $expectedOrder): void
     {
-        $this->assertMenuOrder(['order' => [1, 2, 3]], ['First', 'Second', 'Third']);
-        $this->assertMenuOrder(['order' => [3, 2, 1]], ['Third', 'Second', 'First']);
-    }
-
-    protected function assertMenuOrder(array $frontMatterValues, array $expectedOrder): void
-    {
-        $field = key($frontMatterValues);
+        foreach ($fields as $field) {
+            $pages = collect($frontMatterValues)->map(function ($value) use ($expectedOrder, $field) {
+                return new MarkdownPage(Str::slug($expectedOrder[$value - 1]), ["navigation.$field" => $value]);
+            })->all();
 
-        $pages = collect($frontMatterValues[$field])->map(function ($value) use ($expectedOrder, $field) {
-            return new MarkdownPage(Str::slug($expectedOrder[$value - 1]), ["navigation.$field" => $value]);
-        })->all();
-
-        $this->withPages($pages)->menu()->assertEquals($expectedOrder);
+            $this->withPages($pages)->menu()->assertEquals($expectedOrder);
+        }
     }
 
     protected function withPages(array $pages): static

From 80e56fbba53a8519f312d81ed2a4c7278608458b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 15 Feb 2024 19:08:24 +0100
Subject: [PATCH 0221/1422] Inline constant parameter value

---
 .../Feature/AutomaticNavigationConfigurationsTest.php     | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 08a04343910..cc3c2530945 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -57,12 +57,14 @@ public function testMainNavigationMenuWithPages()
 
     public function testMainNavigationMenuWithPagesWithFrontMatterPriority()
     {
-        $this->assertMenuOrder(['priority', 'order'], [1, 2, 3], ['First', 'Second', 'Third']);
-        $this->assertMenuOrder(['priority', 'order'], [3, 2, 1], ['Third', 'Second', 'First']);
+        $this->assertMenuOrder([1, 2, 3], ['First', 'Second', 'Third']);
+        $this->assertMenuOrder([3, 2, 1], ['Third', 'Second', 'First']);
     }
 
-    protected function assertMenuOrder(array $fields, array $frontMatterValues, array $expectedOrder): void
+    protected function assertMenuOrder(array $frontMatterValues, array $expectedOrder): void
     {
+        $fields = ['priority', 'order'];
+
         foreach ($fields as $field) {
             $pages = collect($frontMatterValues)->map(function ($value) use ($expectedOrder, $field) {
                 return new MarkdownPage(Str::slug($expectedOrder[$value - 1]), ["navigation.$field" => $value]);

From 4db97af9c29c1037fb4b0101567ce1136cfbc778 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 15 Feb 2024 19:08:46 +0100
Subject: [PATCH 0222/1422] Inline local variable

---
 .../tests/Feature/AutomaticNavigationConfigurationsTest.php   | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index cc3c2530945..ea4377c9060 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -63,9 +63,7 @@ public function testMainNavigationMenuWithPagesWithFrontMatterPriority()
 
     protected function assertMenuOrder(array $frontMatterValues, array $expectedOrder): void
     {
-        $fields = ['priority', 'order'];
-
-        foreach ($fields as $field) {
+        foreach (['priority', 'order'] as $field) {
             $pages = collect($frontMatterValues)->map(function ($value) use ($expectedOrder, $field) {
                 return new MarkdownPage(Str::slug($expectedOrder[$value - 1]), ["navigation.$field" => $value]);
             })->all();

From af4f9b89b47b45af515fb5a106e579bad1c36e89 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 15 Feb 2024 19:09:14 +0100
Subject: [PATCH 0223/1422] Simplify parameter name

---
 .../tests/Feature/AutomaticNavigationConfigurationsTest.php   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index ea4377c9060..0e3715acab8 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -61,10 +61,10 @@ public function testMainNavigationMenuWithPagesWithFrontMatterPriority()
         $this->assertMenuOrder([3, 2, 1], ['Third', 'Second', 'First']);
     }
 
-    protected function assertMenuOrder(array $frontMatterValues, array $expectedOrder): void
+    protected function assertMenuOrder(array $priorities, array $expectedOrder): void
     {
         foreach (['priority', 'order'] as $field) {
-            $pages = collect($frontMatterValues)->map(function ($value) use ($expectedOrder, $field) {
+            $pages = collect($priorities)->map(function ($value) use ($expectedOrder, $field) {
                 return new MarkdownPage(Str::slug($expectedOrder[$value - 1]), ["navigation.$field" => $value]);
             })->all();
 

From ccc78e08b7482c7611d863fecf508a159095dd18 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 15 Feb 2024 19:10:17 +0100
Subject: [PATCH 0224/1422] Remove unnecessary suffix for merged methods

---
 .../tests/Feature/AutomaticNavigationConfigurationsTest.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 0e3715acab8..1a721c3a4d8 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -55,7 +55,7 @@ public function testMainNavigationMenuWithPages()
         ]);
     }
 
-    public function testMainNavigationMenuWithPagesWithFrontMatterPriority()
+    public function testMainNavigationMenuWithPagesWithFrontMatter()
     {
         $this->assertMenuOrder([1, 2, 3], ['First', 'Second', 'Third']);
         $this->assertMenuOrder([3, 2, 1], ['Third', 'Second', 'First']);

From 7c9100e1d4f8825c6359d138f05bd0934aa1207f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 15 Feb 2024 19:17:26 +0100
Subject: [PATCH 0225/1422] Rollback to
 b195e8b08cd658dfa7c1e4f0b71b3f53b7e67f98

This quickly lost its use now that we want to test more options
---
 .../AutomaticNavigationConfigurationsTest.php | 50 +++++++++++++++----
 1 file changed, 39 insertions(+), 11 deletions(-)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 1a721c3a4d8..3fe78583315 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -5,7 +5,6 @@
 namespace Hyde\Framework\Testing\Feature;
 
 use Hyde\Testing\TestCase;
-use Illuminate\Support\Str;
 use Hyde\Pages\MarkdownPage;
 use Hyde\Foundation\HydeKernel;
 use Hyde\Pages\Concerns\HydePage;
@@ -55,21 +54,50 @@ public function testMainNavigationMenuWithPages()
         ]);
     }
 
-    public function testMainNavigationMenuWithPagesWithFrontMatter()
+    public function testMainNavigationMenuWithPagesWithFrontMatterPriority()
     {
-        $this->assertMenuOrder([1, 2, 3], ['First', 'Second', 'Third']);
-        $this->assertMenuOrder([3, 2, 1], ['Third', 'Second', 'First']);
+        $this->withPages([
+            new MarkdownPage('first', ['navigation.priority' => 1]),
+            new MarkdownPage('second', ['navigation.priority' => 2]),
+            new MarkdownPage('third', ['navigation.priority' => 3]),
+        ])->menu()->assertEquals([
+            'First',
+            'Second',
+            'Third',
+        ]);
+
+        $this->withPages([
+            new MarkdownPage('first', ['navigation.priority' => 3]),
+            new MarkdownPage('second', ['navigation.priority' => 2]),
+            new MarkdownPage('third', ['navigation.priority' => 1]),
+        ])->menu()->assertEquals([
+            'Third',
+            'Second',
+            'First',
+        ]);
     }
 
-    protected function assertMenuOrder(array $priorities, array $expectedOrder): void
+    public function testMainNavigationMenuWithPagesWithFrontMatterOrder()
     {
-        foreach (['priority', 'order'] as $field) {
-            $pages = collect($priorities)->map(function ($value) use ($expectedOrder, $field) {
-                return new MarkdownPage(Str::slug($expectedOrder[$value - 1]), ["navigation.$field" => $value]);
-            })->all();
+        $this->withPages([
+            new MarkdownPage('first', ['navigation.order' => 1]),
+            new MarkdownPage('second', ['navigation.order' => 2]),
+            new MarkdownPage('third', ['navigation.order' => 3]),
+        ])->menu()->assertEquals([
+            'First',
+            'Second',
+            'Third',
+        ]);
 
-            $this->withPages($pages)->menu()->assertEquals($expectedOrder);
-        }
+        $this->withPages([
+            new MarkdownPage('first', ['navigation.order' => 3]),
+            new MarkdownPage('second', ['navigation.order' => 2]),
+            new MarkdownPage('third', ['navigation.order' => 1]),
+        ])->menu()->assertEquals([
+            'Third',
+            'Second',
+            'First',
+        ]);
     }
 
     protected function withPages(array $pages): static

From 3d81244039918f7373b58157745d77de36152411 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 15 Feb 2024 20:07:19 +0100
Subject: [PATCH 0226/1422] Add shorthand option

---
 .../AutomaticNavigationConfigurationsTest.php | 22 +++++++++++--------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 3fe78583315..12ceb8fb17e 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -56,21 +56,21 @@ public function testMainNavigationMenuWithPages()
 
     public function testMainNavigationMenuWithPagesWithFrontMatterPriority()
     {
-        $this->withPages([
+        $this->menu([
             new MarkdownPage('first', ['navigation.priority' => 1]),
             new MarkdownPage('second', ['navigation.priority' => 2]),
             new MarkdownPage('third', ['navigation.priority' => 3]),
-        ])->menu()->assertEquals([
+        ])->assertEquals([
             'First',
             'Second',
             'Third',
         ]);
 
-        $this->withPages([
+        $this->menu([
             new MarkdownPage('first', ['navigation.priority' => 3]),
             new MarkdownPage('second', ['navigation.priority' => 2]),
             new MarkdownPage('third', ['navigation.priority' => 1]),
-        ])->menu()->assertEquals([
+        ])->assertEquals([
             'Third',
             'Second',
             'First',
@@ -79,21 +79,21 @@ public function testMainNavigationMenuWithPagesWithFrontMatterPriority()
 
     public function testMainNavigationMenuWithPagesWithFrontMatterOrder()
     {
-        $this->withPages([
+        $this->menu([
             new MarkdownPage('first', ['navigation.order' => 1]),
             new MarkdownPage('second', ['navigation.order' => 2]),
             new MarkdownPage('third', ['navigation.order' => 3]),
-        ])->menu()->assertEquals([
+        ])->assertEquals([
             'First',
             'Second',
             'Third',
         ]);
 
-        $this->withPages([
+        $this->menu([
             new MarkdownPage('first', ['navigation.order' => 3]),
             new MarkdownPage('second', ['navigation.order' => 2]),
             new MarkdownPage('third', ['navigation.order' => 1]),
-        ])->menu()->assertEquals([
+        ])->assertEquals([
             'Third',
             'Second',
             'First',
@@ -107,8 +107,12 @@ protected function withPages(array $pages): static
         return $this;
     }
 
-    protected function menu(): AssertableNavigationMenu
+    protected function menu(?array $withPages = null): AssertableNavigationMenu
     {
+        if ($withPages) {
+            $this->withPages($withPages);
+        }
+
         return new AssertableNavigationMenu($this);
     }
 

From 6f2ce09e87453640ccc9f186e7ed71eb0ea21a08 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 15 Feb 2024 20:11:21 +0100
Subject: [PATCH 0227/1422] Move up method in source

---
 .../AutomaticNavigationConfigurationsTest.php      | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 12ceb8fb17e..466f12833f5 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -100,13 +100,6 @@ public function testMainNavigationMenuWithPagesWithFrontMatterOrder()
         ]);
     }
 
-    protected function withPages(array $pages): static
-    {
-        $this->kernel->setRoutes(collect($pages)->map(fn (HydePage $page) => $page->getRoute()));
-
-        return $this;
-    }
-
     protected function menu(?array $withPages = null): AssertableNavigationMenu
     {
         if ($withPages) {
@@ -116,6 +109,13 @@ protected function menu(?array $withPages = null): AssertableNavigationMenu
         return new AssertableNavigationMenu($this);
     }
 
+    protected function withPages(array $pages): static
+    {
+        $this->kernel->setRoutes(collect($pages)->map(fn (HydePage $page) => $page->getRoute()));
+
+        return $this;
+    }
+
     protected function sidebar(): AssertableNavigationMenu
     {
         return new AssertableNavigationMenu($this, true);

From ae3328de7a37dc113019e38dc515909f07d962a3 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 15 Feb 2024 20:12:40 +0100
Subject: [PATCH 0228/1422] Add additional simplified assertion helper

---
 .../AutomaticNavigationConfigurationsTest.php | 21 ++++++++++++-------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 466f12833f5..dae030aafb2 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -56,21 +56,21 @@ public function testMainNavigationMenuWithPages()
 
     public function testMainNavigationMenuWithPagesWithFrontMatterPriority()
     {
-        $this->menu([
+        $this->assertMenuEquals([
             new MarkdownPage('first', ['navigation.priority' => 1]),
             new MarkdownPage('second', ['navigation.priority' => 2]),
             new MarkdownPage('third', ['navigation.priority' => 3]),
-        ])->assertEquals([
+        ], [
             'First',
             'Second',
             'Third',
         ]);
 
-        $this->menu([
+        $this->assertMenuEquals([
             new MarkdownPage('first', ['navigation.priority' => 3]),
             new MarkdownPage('second', ['navigation.priority' => 2]),
             new MarkdownPage('third', ['navigation.priority' => 1]),
-        ])->assertEquals([
+        ], [
             'Third',
             'Second',
             'First',
@@ -79,27 +79,32 @@ public function testMainNavigationMenuWithPagesWithFrontMatterPriority()
 
     public function testMainNavigationMenuWithPagesWithFrontMatterOrder()
     {
-        $this->menu([
+        $this->assertMenuEquals([
             new MarkdownPage('first', ['navigation.order' => 1]),
             new MarkdownPage('second', ['navigation.order' => 2]),
             new MarkdownPage('third', ['navigation.order' => 3]),
-        ])->assertEquals([
+        ], [
             'First',
             'Second',
             'Third',
         ]);
 
-        $this->menu([
+        $this->assertMenuEquals([
             new MarkdownPage('first', ['navigation.order' => 3]),
             new MarkdownPage('second', ['navigation.order' => 2]),
             new MarkdownPage('third', ['navigation.order' => 1]),
-        ])->assertEquals([
+        ], [
             'Third',
             'Second',
             'First',
         ]);
     }
 
+    protected function assertMenuEquals(array $menuPages, array $expected): void
+    {
+        $this->menu($menuPages)->assertEquals($expected);
+    }
+
     protected function menu(?array $withPages = null): AssertableNavigationMenu
     {
         if ($withPages) {

From 92af696d3cc89105a9a2465bce793a0c9ada5805 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 15 Feb 2024 20:13:12 +0100
Subject: [PATCH 0229/1422] Flip helper parameter order to match base assertion
 order

---
 .../AutomaticNavigationConfigurationsTest.php | 34 +++++++++----------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index dae030aafb2..3b501f90f19 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -57,50 +57,50 @@ public function testMainNavigationMenuWithPages()
     public function testMainNavigationMenuWithPagesWithFrontMatterPriority()
     {
         $this->assertMenuEquals([
-            new MarkdownPage('first', ['navigation.priority' => 1]),
-            new MarkdownPage('second', ['navigation.priority' => 2]),
-            new MarkdownPage('third', ['navigation.priority' => 3]),
-        ], [
             'First',
             'Second',
             'Third',
+        ], [
+            new MarkdownPage('first', ['navigation.priority' => 1]),
+            new MarkdownPage('second', ['navigation.priority' => 2]),
+            new MarkdownPage('third', ['navigation.priority' => 3]),
         ]);
 
         $this->assertMenuEquals([
-            new MarkdownPage('first', ['navigation.priority' => 3]),
-            new MarkdownPage('second', ['navigation.priority' => 2]),
-            new MarkdownPage('third', ['navigation.priority' => 1]),
-        ], [
             'Third',
             'Second',
             'First',
+        ], [
+            new MarkdownPage('first', ['navigation.priority' => 3]),
+            new MarkdownPage('second', ['navigation.priority' => 2]),
+            new MarkdownPage('third', ['navigation.priority' => 1]),
         ]);
     }
 
     public function testMainNavigationMenuWithPagesWithFrontMatterOrder()
     {
         $this->assertMenuEquals([
-            new MarkdownPage('first', ['navigation.order' => 1]),
-            new MarkdownPage('second', ['navigation.order' => 2]),
-            new MarkdownPage('third', ['navigation.order' => 3]),
-        ], [
             'First',
             'Second',
             'Third',
+        ], [
+            new MarkdownPage('first', ['navigation.order' => 1]),
+            new MarkdownPage('second', ['navigation.order' => 2]),
+            new MarkdownPage('third', ['navigation.order' => 3]),
         ]);
 
         $this->assertMenuEquals([
-            new MarkdownPage('first', ['navigation.order' => 3]),
-            new MarkdownPage('second', ['navigation.order' => 2]),
-            new MarkdownPage('third', ['navigation.order' => 1]),
-        ], [
             'Third',
             'Second',
             'First',
+        ], [
+            new MarkdownPage('first', ['navigation.order' => 3]),
+            new MarkdownPage('second', ['navigation.order' => 2]),
+            new MarkdownPage('third', ['navigation.order' => 1]),
         ]);
     }
 
-    protected function assertMenuEquals(array $menuPages, array $expected): void
+    protected function assertMenuEquals(array $expected, array $menuPages): void
     {
         $this->menu($menuPages)->assertEquals($expected);
     }

From af247f82ed63913272715dcb54cc3ab39e473d5e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 15 Feb 2024 20:13:45 +0100
Subject: [PATCH 0230/1422] Join comma-separated values into a single line

---
 .../AutomaticNavigationConfigurationsTest.php | 24 ++++---------------
 1 file changed, 4 insertions(+), 20 deletions(-)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 3b501f90f19..5a61719ffdf 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -56,21 +56,13 @@ public function testMainNavigationMenuWithPages()
 
     public function testMainNavigationMenuWithPagesWithFrontMatterPriority()
     {
-        $this->assertMenuEquals([
-            'First',
-            'Second',
-            'Third',
-        ], [
+        $this->assertMenuEquals(['First', 'Second', 'Third'], [
             new MarkdownPage('first', ['navigation.priority' => 1]),
             new MarkdownPage('second', ['navigation.priority' => 2]),
             new MarkdownPage('third', ['navigation.priority' => 3]),
         ]);
 
-        $this->assertMenuEquals([
-            'Third',
-            'Second',
-            'First',
-        ], [
+        $this->assertMenuEquals(['Third', 'Second', 'First'], [
             new MarkdownPage('first', ['navigation.priority' => 3]),
             new MarkdownPage('second', ['navigation.priority' => 2]),
             new MarkdownPage('third', ['navigation.priority' => 1]),
@@ -79,21 +71,13 @@ public function testMainNavigationMenuWithPagesWithFrontMatterPriority()
 
     public function testMainNavigationMenuWithPagesWithFrontMatterOrder()
     {
-        $this->assertMenuEquals([
-            'First',
-            'Second',
-            'Third',
-        ], [
+        $this->assertMenuEquals(['First', 'Second', 'Third'], [
             new MarkdownPage('first', ['navigation.order' => 1]),
             new MarkdownPage('second', ['navigation.order' => 2]),
             new MarkdownPage('third', ['navigation.order' => 3]),
         ]);
 
-        $this->assertMenuEquals([
-            'Third',
-            'Second',
-            'First',
-        ], [
+        $this->assertMenuEquals(['Third', 'Second', 'First'], [
             new MarkdownPage('first', ['navigation.order' => 3]),
             new MarkdownPage('second', ['navigation.order' => 2]),
             new MarkdownPage('third', ['navigation.order' => 1]),

From c0b3b4bd0cb3e831016ab4f85f8e92cc7bba4091 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 15 Feb 2024 20:16:00 +0100
Subject: [PATCH 0231/1422] Remove unnecessary qualifiers from test method
 names

---
 .../tests/Feature/AutomaticNavigationConfigurationsTest.php   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 5a61719ffdf..1158bdc003f 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -54,7 +54,7 @@ public function testMainNavigationMenuWithPages()
         ]);
     }
 
-    public function testMainNavigationMenuWithPagesWithFrontMatterPriority()
+    public function testMainNavigationMenuWithFrontMatterPriority()
     {
         $this->assertMenuEquals(['First', 'Second', 'Third'], [
             new MarkdownPage('first', ['navigation.priority' => 1]),
@@ -69,7 +69,7 @@ public function testMainNavigationMenuWithPagesWithFrontMatterPriority()
         ]);
     }
 
-    public function testMainNavigationMenuWithPagesWithFrontMatterOrder()
+    public function testMainNavigationMenuWithFrontMatterOrder()
     {
         $this->assertMenuEquals(['First', 'Second', 'Third'], [
             new MarkdownPage('first', ['navigation.order' => 1]),

From cfcdf12ff23cd0b01bc1fb1f2545abe6e866e4e7 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 15 Feb 2024 20:17:02 +0100
Subject: [PATCH 0232/1422] Test main navigation menu with front matter label

---
 .../Feature/AutomaticNavigationConfigurationsTest.php    | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 1158bdc003f..fa4b1827a64 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -84,6 +84,15 @@ public function testMainNavigationMenuWithFrontMatterOrder()
         ]);
     }
 
+    public function testMainNavigationMenuWithFrontMatterLabel()
+    {
+        $this->assertMenuEquals(['First', 'Second', 'Third'], [
+            new MarkdownPage('foo', ['navigation.label' => 'First']),
+            new MarkdownPage('bar', ['navigation.label' => 'Second']),
+            new MarkdownPage('baz', ['navigation.label' => 'Third']),
+        ]);
+    }
+
     protected function assertMenuEquals(array $expected, array $menuPages): void
     {
         $this->menu($menuPages)->assertEquals($expected);

From 734276d74234351d33d53a80b807abbd32e37be3 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 15 Feb 2024 20:19:41 +0100
Subject: [PATCH 0233/1422] Test front matter visibility control

---
 .../AutomaticNavigationConfigurationsTest.php | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index fa4b1827a64..bca57f42e1d 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -93,6 +93,36 @@ public function testMainNavigationMenuWithFrontMatterLabel()
         ]);
     }
 
+    public function testMainNavigationMenuWithFrontMatterHidden()
+    {
+        $this->assertMenuEquals(['Foo', 'Bar', 'Baz'], [
+            new MarkdownPage('foo', ['navigation.hidden' => false]),
+            new MarkdownPage('bar', ['navigation.hidden' => false]),
+            new MarkdownPage('baz', ['navigation.hidden' => false]),
+        ]);
+
+        $this->assertMenuEquals([], [
+            new MarkdownPage('foo', ['navigation.hidden' => true]),
+            new MarkdownPage('bar', ['navigation.hidden' => true]),
+            new MarkdownPage('baz', ['navigation.hidden' => true]),
+        ]);
+    }
+
+    public function testMainNavigationMenuWithFrontMatterVisible()
+    {
+        $this->assertMenuEquals(['Foo', 'Bar', 'Baz'], [
+            new MarkdownPage('foo', ['navigation.visible' => true]),
+            new MarkdownPage('bar', ['navigation.visible' => true]),
+            new MarkdownPage('baz', ['navigation.visible' => true]),
+        ]);
+
+        $this->assertMenuEquals([], [
+            new MarkdownPage('foo', ['navigation.visible' => false]),
+            new MarkdownPage('bar', ['navigation.visible' => false]),
+            new MarkdownPage('baz', ['navigation.visible' => false]),
+        ]);
+    }
+
     protected function assertMenuEquals(array $expected, array $menuPages): void
     {
         $this->menu($menuPages)->assertEquals($expected);

From 23315ece834fe2530e5a426f06db76c796adcc7d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 15 Feb 2024 20:22:08 +0100
Subject: [PATCH 0234/1422] Test main navigation menu with front matter group

---
 .../AutomaticNavigationConfigurationsTest.php       | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index bca57f42e1d..2134e5bd324 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -123,6 +123,19 @@ public function testMainNavigationMenuWithFrontMatterVisible()
         ]);
     }
 
+    public function testMainNavigationMenuWithFrontMatterGroup()
+    {
+        $this->assertMenuEquals([
+            ['label' => 'Foo', 'group' => 'group-1'],
+            ['label' => 'Bar', 'group' => 'group-1'],
+            ['label' => 'Baz', 'group' => 'group-1'],
+        ], [
+            new MarkdownPage('foo', ['navigation.group' => 'Group 1']),
+            new MarkdownPage('bar', ['navigation.group' => 'Group 1']),
+            new MarkdownPage('baz', ['navigation.group' => 'Group 1']),
+        ]);
+    }
+
     protected function assertMenuEquals(array $expected, array $menuPages): void
     {
         $this->menu($menuPages)->assertEquals($expected);

From cd2b957522dc299e8bada37f3129b40043a712e9 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 15 Feb 2024 20:23:33 +0100
Subject: [PATCH 0235/1422] Test main navigation menu with front matter
 category

---
 .../AutomaticNavigationConfigurationsTest.php       | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 2134e5bd324..e5cc03dabc6 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -136,6 +136,19 @@ public function testMainNavigationMenuWithFrontMatterGroup()
         ]);
     }
 
+    public function testMainNavigationMenuWithFrontMatterCategory()
+    {
+        $this->assertMenuEquals([
+            ['label' => 'Foo', 'group' => 'group-1'],
+            ['label' => 'Bar', 'group' => 'group-1'],
+            ['label' => 'Baz', 'group' => 'group-1'],
+        ], [
+            new MarkdownPage('foo', ['navigation.category' => 'Group 1']),
+            new MarkdownPage('bar', ['navigation.category' => 'Group 1']),
+            new MarkdownPage('baz', ['navigation.category' => 'Group 1']),
+        ]);
+    }
+
     protected function assertMenuEquals(array $expected, array $menuPages): void
     {
         $this->menu($menuPages)->assertEquals($expected);

From 469f4c8afb5c61a5d71a9b1b8a9db776d389596e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 15 Feb 2024 20:23:46 +0100
Subject: [PATCH 0236/1422] Add todo

---
 .../tests/Feature/AutomaticNavigationConfigurationsTest.php   | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index e5cc03dabc6..43594b3b5e0 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -125,6 +125,8 @@ public function testMainNavigationMenuWithFrontMatterVisible()
 
     public function testMainNavigationMenuWithFrontMatterGroup()
     {
+        // TODO: For new v2 system, this should insert a root item with the group name and the children as the pages
+
         $this->assertMenuEquals([
             ['label' => 'Foo', 'group' => 'group-1'],
             ['label' => 'Bar', 'group' => 'group-1'],
@@ -138,6 +140,8 @@ public function testMainNavigationMenuWithFrontMatterGroup()
 
     public function testMainNavigationMenuWithFrontMatterCategory()
     {
+        // TODO: For new v2 system, this should insert a root item with the group name and the children as the pages
+
         $this->assertMenuEquals([
             ['label' => 'Foo', 'group' => 'group-1'],
             ['label' => 'Bar', 'group' => 'group-1'],

From 06159f65764bc1592bea1be79059f4c5494873e0 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 15 Feb 2024 20:28:04 +0100
Subject: [PATCH 0237/1422] Test conflicting priority state to assert
 precedence

---
 .../AutomaticNavigationConfigurationsTest.php | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 43594b3b5e0..86d18f916ec 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -153,6 +153,29 @@ public function testMainNavigationMenuWithFrontMatterCategory()
         ]);
     }
 
+    public function testMainNavigationMenuWithFrontMatterPriorityAndOrder()
+    {
+        $this->assertMenuEquals([
+            ['label' => 'Foo', 'priority' => 1],
+            ['label' => 'Bar', 'priority' => 2],
+            ['label' => 'Baz', 'priority' => 3],
+        ], [
+            new MarkdownPage('foo', ['navigation.priority' => 1, 'navigation.order' => 10]),
+            new MarkdownPage('bar', ['navigation.priority' => 2, 'navigation.order' => 20]),
+            new MarkdownPage('baz', ['navigation.priority' => 3, 'navigation.order' => 30]),
+        ]);
+
+        $this->assertMenuEquals([
+            ['label' => 'Foo', 'priority' => 1],
+            ['label' => 'Bar', 'priority' => 2],
+            ['label' => 'Baz', 'priority' => 3],
+        ], [
+            new MarkdownPage('foo', ['navigation.order' => 10, 'navigation.priority' => 1]),
+            new MarkdownPage('bar', ['navigation.order' => 20, 'navigation.priority' => 2]),
+            new MarkdownPage('baz', ['navigation.order' => 30, 'navigation.priority' => 3]),
+        ]);
+    }
+
     protected function assertMenuEquals(array $expected, array $menuPages): void
     {
         $this->menu($menuPages)->assertEquals($expected);

From da3205ba1954b79d598f376bb732898819206c36 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 15 Feb 2024 20:28:59 +0100
Subject: [PATCH 0238/1422] Document precedence reason

---
 .../tests/Feature/AutomaticNavigationConfigurationsTest.php     | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 86d18f916ec..eb34df4053f 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -155,6 +155,8 @@ public function testMainNavigationMenuWithFrontMatterCategory()
 
     public function testMainNavigationMenuWithFrontMatterPriorityAndOrder()
     {
+        // Since the main key in the navigation schema is 'priority', that takes precedence over its 'order' alias
+
         $this->assertMenuEquals([
             ['label' => 'Foo', 'priority' => 1],
             ['label' => 'Bar', 'priority' => 2],

From 98ddc00aff6156be1bae89c8359d2b017e51dfac Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 15 Feb 2024 20:29:57 +0100
Subject: [PATCH 0239/1422] Introduce local variable for duplicate array

---
 .../AutomaticNavigationConfigurationsTest.php        | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index eb34df4053f..46208be7905 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -157,21 +157,19 @@ public function testMainNavigationMenuWithFrontMatterPriorityAndOrder()
     {
         // Since the main key in the navigation schema is 'priority', that takes precedence over its 'order' alias
 
-        $this->assertMenuEquals([
+        $expected = [
             ['label' => 'Foo', 'priority' => 1],
             ['label' => 'Bar', 'priority' => 2],
             ['label' => 'Baz', 'priority' => 3],
-        ], [
+        ];
+
+        $this->assertMenuEquals($expected, [
             new MarkdownPage('foo', ['navigation.priority' => 1, 'navigation.order' => 10]),
             new MarkdownPage('bar', ['navigation.priority' => 2, 'navigation.order' => 20]),
             new MarkdownPage('baz', ['navigation.priority' => 3, 'navigation.order' => 30]),
         ]);
 
-        $this->assertMenuEquals([
-            ['label' => 'Foo', 'priority' => 1],
-            ['label' => 'Bar', 'priority' => 2],
-            ['label' => 'Baz', 'priority' => 3],
-        ], [
+        $this->assertMenuEquals($expected, [
             new MarkdownPage('foo', ['navigation.order' => 10, 'navigation.priority' => 1]),
             new MarkdownPage('bar', ['navigation.order' => 20, 'navigation.priority' => 2]),
             new MarkdownPage('baz', ['navigation.order' => 30, 'navigation.priority' => 3]),

From 80bf7decdf7784f22361b5f49ac8c75f8ab6a38f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 15 Feb 2024 20:32:18 +0100
Subject: [PATCH 0240/1422] Test visibility conflict precedence

---
 .../AutomaticNavigationConfigurationsTest.php | 35 +++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 46208be7905..142673a42ee 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -176,6 +176,41 @@ public function testMainNavigationMenuWithFrontMatterPriorityAndOrder()
         ]);
     }
 
+    public function testMainNavigationMenuWithFrontMatterHiddenAndVisible()
+    {
+        // Since the main key in the navigation schema is 'hidden', that takes precedence over its 'visible' alias
+
+        $this->assertMenuEquals(['Foo', 'Bar', 'Baz'], [
+            new MarkdownPage('foo', ['navigation.hidden' => false, 'navigation.visible' => true]),
+            new MarkdownPage('bar', ['navigation.hidden' => false, 'navigation.visible' => true]),
+            new MarkdownPage('baz', ['navigation.hidden' => false, 'navigation.visible' => true]),
+        ]);
+
+        $this->assertMenuEquals([], [
+            new MarkdownPage('foo', ['navigation.hidden' => true, 'navigation.visible' => false]),
+            new MarkdownPage('bar', ['navigation.hidden' => true, 'navigation.visible' => false]),
+            new MarkdownPage('baz', ['navigation.hidden' => true, 'navigation.visible' => false]),
+        ]);
+
+        $this->assertMenuEquals([], [
+            new MarkdownPage('foo', ['navigation.hidden' => true, 'navigation.visible' => true]),
+            new MarkdownPage('bar', ['navigation.hidden' => true, 'navigation.visible' => true]),
+            new MarkdownPage('baz', ['navigation.hidden' => true, 'navigation.visible' => true]),
+        ]);
+
+        $this->assertMenuEquals(['Foo', 'Bar', 'Baz'], [
+            new MarkdownPage('foo', ['navigation.hidden' => false, 'navigation.visible' => false]),
+            new MarkdownPage('bar', ['navigation.hidden' => false, 'navigation.visible' => false]),
+            new MarkdownPage('baz', ['navigation.hidden' => false, 'navigation.visible' => false]),
+        ]);
+
+        $this->assertMenuEquals(['Bar'], [
+            new MarkdownPage('foo', ['navigation.hidden' => true, 'navigation.visible' => false]),
+            new MarkdownPage('bar', ['navigation.hidden' => false, 'navigation.visible' => true]),
+            new MarkdownPage('baz', ['navigation.hidden' => true, 'navigation.visible' => false]),
+        ]);
+    }
+
     protected function assertMenuEquals(array $expected, array $menuPages): void
     {
         $this->menu($menuPages)->assertEquals($expected);

From 9c02dcf24e11c1709c64d576a46b0900b0da221a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 15 Feb 2024 20:35:35 +0100
Subject: [PATCH 0241/1422] Test group conflict precedence

---
 .../AutomaticNavigationConfigurationsTest.php     | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 142673a42ee..0cb8b22ddd6 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -211,6 +211,21 @@ public function testMainNavigationMenuWithFrontMatterHiddenAndVisible()
         ]);
     }
 
+    public function testMainNavigationMenuWithFrontMatterGroupAndCategory()
+    {
+        // Since the main key in the navigation schema is 'group', that takes precedence over its 'category' alias
+
+        $this->assertMenuEquals([
+            ['label' => 'Foo', 'group' => 'group-1'],
+            ['label' => 'Bar', 'group' => 'group-1'],
+            ['label' => 'Baz', 'group' => 'group-1'],
+        ], [
+            new MarkdownPage('foo', ['navigation.group' => 'Group 1', 'navigation.category' => 'Group 2']),
+            new MarkdownPage('bar', ['navigation.group' => 'Group 1', 'navigation.category' => 'Group 2']),
+            new MarkdownPage('baz', ['navigation.group' => 'Group 1', 'navigation.category' => 'Group 2']),
+        ]);
+    }
+
     protected function assertMenuEquals(array $expected, array $menuPages): void
     {
         $this->menu($menuPages)->assertEquals($expected);

From afe3f91377925664e2610e50c098eee4d27ff221 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 15 Feb 2024 20:35:54 +0100
Subject: [PATCH 0242/1422] Remove data from test that has no impact on result

---
 .../tests/Feature/AutomaticNavigationConfigurationsTest.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 0cb8b22ddd6..8b9ca8d1803 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -216,9 +216,9 @@ public function testMainNavigationMenuWithFrontMatterGroupAndCategory()
         // Since the main key in the navigation schema is 'group', that takes precedence over its 'category' alias
 
         $this->assertMenuEquals([
-            ['label' => 'Foo', 'group' => 'group-1'],
-            ['label' => 'Bar', 'group' => 'group-1'],
-            ['label' => 'Baz', 'group' => 'group-1'],
+            ['group' => 'group-1'],
+            ['group' => 'group-1'],
+            ['group' => 'group-1'],
         ], [
             new MarkdownPage('foo', ['navigation.group' => 'Group 1', 'navigation.category' => 'Group 2']),
             new MarkdownPage('bar', ['navigation.group' => 'Group 1', 'navigation.category' => 'Group 2']),

From c6a92eac4a4eccfd794988e3880f6459012d0689 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 15 Feb 2024 20:36:46 +0100
Subject: [PATCH 0243/1422] Fill repeated array

---
 .../tests/Feature/AutomaticNavigationConfigurationsTest.php | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 8b9ca8d1803..65987a64866 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -215,11 +215,7 @@ public function testMainNavigationMenuWithFrontMatterGroupAndCategory()
     {
         // Since the main key in the navigation schema is 'group', that takes precedence over its 'category' alias
 
-        $this->assertMenuEquals([
-            ['group' => 'group-1'],
-            ['group' => 'group-1'],
-            ['group' => 'group-1'],
-        ], [
+        $this->assertMenuEquals(array_fill(0, 3, ['group' => 'group-1']), [
             new MarkdownPage('foo', ['navigation.group' => 'Group 1', 'navigation.category' => 'Group 2']),
             new MarkdownPage('bar', ['navigation.group' => 'Group 1', 'navigation.category' => 'Group 2']),
             new MarkdownPage('baz', ['navigation.group' => 'Group 1', 'navigation.category' => 'Group 2']),

From 0cc29e1e9d99c921b4cf2b2555d29252156cc61b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 15 Feb 2024 21:27:14 +0100
Subject: [PATCH 0244/1422] Test default configuration results

---
 .../AutomaticNavigationConfigurationsTest.php | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 65987a64866..f9452fbfca1 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -4,10 +4,15 @@
 
 namespace Hyde\Framework\Testing\Feature;
 
+use Hyde\Pages\HtmlPage;
+use Hyde\Pages\BladePage;
 use Hyde\Testing\TestCase;
 use Hyde\Pages\MarkdownPage;
+use Hyde\Pages\MarkdownPost;
+use Hyde\Pages\InMemoryPage;
 use Hyde\Foundation\HydeKernel;
 use Hyde\Pages\Concerns\HydePage;
+use Hyde\Pages\DocumentationPage;
 use Illuminate\Support\Collection;
 use Hyde\Foundation\Kernel\RouteCollection;
 use Hyde\Framework\Features\Navigation\NavItem;
@@ -54,6 +59,29 @@ public function testMainNavigationMenuWithPages()
         ]);
     }
 
+    public function testMainNavigationDoesNotInclude404Page()
+    {
+        $this->assertMenuEquals([], [new MarkdownPage('404')]);
+    }
+
+    public function testOnlyRootTypePagesAreAddedToNavigationMenu()
+    {
+        $this->assertMenuEquals(['Html Page', 'Blade Page', 'Markdown Page'], [
+            new HtmlPage('html-page'),
+            new BladePage('blade-page'),
+            new MarkdownPage('markdown-page'),
+            new MarkdownPost('markdown-post'),
+            new DocumentationPage('documentation-page'),
+        ]);
+    }
+
+    public function testInMemoryPagesIsAddedToNavigationMenu()
+    {
+        $this->assertMenuEquals(['In Memory Page'], [
+            new InMemoryPage('in-memory-page'),
+        ]);
+    }
+
     public function testMainNavigationMenuWithFrontMatterPriority()
     {
         $this->assertMenuEquals(['First', 'Second', 'Third'], [

From 0b880c0b7dc556fb0c9a9febd5363cb44d1df280 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 15 Feb 2024 21:29:26 +0100
Subject: [PATCH 0245/1422] Test duplicated identifier states

---
 .../AutomaticNavigationConfigurationsTest.php | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index f9452fbfca1..ffe21af1e42 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -82,6 +82,27 @@ public function testInMemoryPagesIsAddedToNavigationMenu()
         ]);
     }
 
+    public function testOnlyFirstItemWithDuplicateIdentifierIsUsed()
+    {
+        $this->assertMenuEquals(['Markdown'], [
+            new MarkdownPage('foo', ['navigation.label' => 'Markdown']),
+            new BladePage('foo', ['navigation.label' => 'Blade']),
+        ]);
+    }
+
+    public function testItemWithHighestPriorityIsUsedForDuplicateIdentifier()
+    {
+        $this->assertMenuEquals(['Markdown'], [
+            new MarkdownPage('foo', ['navigation.label' => 'Markdown', 'navigation.priority' => 1]),
+            new BladePage('foo', ['navigation.label' => 'Blade', 'navigation.priority' => 2]),
+        ]);
+
+        $this->assertMenuEquals(['Blade'], [
+            new MarkdownPage('foo', ['navigation.label' => 'Markdown', 'navigation.priority' => 2]),
+            new BladePage('foo', ['navigation.label' => 'Blade', 'navigation.priority' => 1]),
+        ]);
+    }
+
     public function testMainNavigationMenuWithFrontMatterPriority()
     {
         $this->assertMenuEquals(['First', 'Second', 'Third'], [

From 5ec271384839aabb0f449d1a0417cbae21bf1b90 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 15 Feb 2024 21:29:29 +0100
Subject: [PATCH 0246/1422] Revert "Test duplicated identifier states"

This reverts commit 0b880c0b7dc556fb0c9a9febd5363cb44d1df280. This is a bad idea, we do not at all want to handle cases like these. We can't imply support for something that simply cannot work.
---
 .../AutomaticNavigationConfigurationsTest.php | 21 -------------------
 1 file changed, 21 deletions(-)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index ffe21af1e42..f9452fbfca1 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -82,27 +82,6 @@ public function testInMemoryPagesIsAddedToNavigationMenu()
         ]);
     }
 
-    public function testOnlyFirstItemWithDuplicateIdentifierIsUsed()
-    {
-        $this->assertMenuEquals(['Markdown'], [
-            new MarkdownPage('foo', ['navigation.label' => 'Markdown']),
-            new BladePage('foo', ['navigation.label' => 'Blade']),
-        ]);
-    }
-
-    public function testItemWithHighestPriorityIsUsedForDuplicateIdentifier()
-    {
-        $this->assertMenuEquals(['Markdown'], [
-            new MarkdownPage('foo', ['navigation.label' => 'Markdown', 'navigation.priority' => 1]),
-            new BladePage('foo', ['navigation.label' => 'Blade', 'navigation.priority' => 2]),
-        ]);
-
-        $this->assertMenuEquals(['Blade'], [
-            new MarkdownPage('foo', ['navigation.label' => 'Markdown', 'navigation.priority' => 2]),
-            new BladePage('foo', ['navigation.label' => 'Blade', 'navigation.priority' => 1]),
-        ]);
-    }
-
     public function testMainNavigationMenuWithFrontMatterPriority()
     {
         $this->assertMenuEquals(['First', 'Second', 'Third'], [

From d7d75aba994e14f913b0233542ada3a3ee2ec78f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 16 Feb 2024 20:47:50 +0100
Subject: [PATCH 0247/1422] Fix test method name grammar

---
 .../tests/Feature/AutomaticNavigationConfigurationsTest.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index f9452fbfca1..a64fc927423 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -75,7 +75,7 @@ public function testOnlyRootTypePagesAreAddedToNavigationMenu()
         ]);
     }
 
-    public function testInMemoryPagesIsAddedToNavigationMenu()
+    public function testInMemoryPagesAreAddedToNavigationMenu()
     {
         $this->assertMenuEquals(['In Memory Page'], [
             new InMemoryPage('in-memory-page'),

From 376278b5ef5f04eb36237c78becccb8783eddfc4 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 16 Feb 2024 20:51:37 +0100
Subject: [PATCH 0248/1422] Test default navigation priorities

---
 .../AutomaticNavigationConfigurationsTest.php       | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index a64fc927423..fb643574990 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -82,6 +82,19 @@ public function testInMemoryPagesAreAddedToNavigationMenu()
         ]);
     }
 
+    public function testDefaultNavigationPriorities()
+    {
+        $this->assertMenuEquals([
+            ['priority' => 0],
+            ['priority' => 10],
+            ['priority' => 100],
+        ], [
+            new MarkdownPage('index'),
+            new MarkdownPage('posts'),
+            new MarkdownPage('docs/index'),
+        ]);
+    }
+
     public function testMainNavigationMenuWithFrontMatterPriority()
     {
         $this->assertMenuEquals(['First', 'Second', 'Third'], [

From eba2918733f0b2e45de9e8ac7281a89cb08294af Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 16 Feb 2024 20:51:46 +0100
Subject: [PATCH 0249/1422] Test default navigation labels

---
 .../Feature/AutomaticNavigationConfigurationsTest.php | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index fb643574990..b7477191832 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -95,6 +95,17 @@ public function testDefaultNavigationPriorities()
         ]);
     }
 
+    public function testDefaultNavigationLabels()
+    {
+        $this->assertMenuEquals([
+            ['label' => 'Home'],
+            ['label' => 'Docs'],
+        ], [
+            new MarkdownPage('index'),
+            new MarkdownPage('docs/index'),
+        ]);
+    }
+
     public function testMainNavigationMenuWithFrontMatterPriority()
     {
         $this->assertMenuEquals(['First', 'Second', 'Third'], [

From 90bbd6b79c6a15d4f999f146fba08b99c1f3b004 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 17 Feb 2024 11:51:37 +0100
Subject: [PATCH 0250/1422] Test documentation index pages are added to
 navigation menu

---
 .../Feature/AutomaticNavigationConfigurationsTest.php      | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index b7477191832..af380e02e2d 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -75,6 +75,13 @@ public function testOnlyRootTypePagesAreAddedToNavigationMenu()
         ]);
     }
 
+    public function testDocumentationIndexPagesAreAddedToNavigationMenu()
+    {
+        $this->assertMenuEquals(['Docs'], [
+            new DocumentationPage('index'),
+        ]);
+    }
+
     public function testInMemoryPagesAreAddedToNavigationMenu()
     {
         $this->assertMenuEquals(['In Memory Page'], [

From 42fefd6170760bcc579e1c4464b4342134c0b580 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 17 Feb 2024 11:52:09 +0100
Subject: [PATCH 0251/1422] Add auxiliary assertion

---
 .../tests/Feature/AutomaticNavigationConfigurationsTest.php      | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index af380e02e2d..177cbfc9b70 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -79,6 +79,7 @@ public function testDocumentationIndexPagesAreAddedToNavigationMenu()
     {
         $this->assertMenuEquals(['Docs'], [
             new DocumentationPage('index'),
+            new DocumentationPage('foo'),
         ]);
     }
 

From 7c87eddcba9015e5975175184becb615608fd592 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 17 Feb 2024 11:55:00 +0100
Subject: [PATCH 0252/1422] Reorder test methods

---
 .../Feature/AutomaticNavigationConfigurationsTest.php  | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 177cbfc9b70..ac60f39af5a 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -59,11 +59,6 @@ public function testMainNavigationMenuWithPages()
         ]);
     }
 
-    public function testMainNavigationDoesNotInclude404Page()
-    {
-        $this->assertMenuEquals([], [new MarkdownPage('404')]);
-    }
-
     public function testOnlyRootTypePagesAreAddedToNavigationMenu()
     {
         $this->assertMenuEquals(['Html Page', 'Blade Page', 'Markdown Page'], [
@@ -90,6 +85,11 @@ public function testInMemoryPagesAreAddedToNavigationMenu()
         ]);
     }
 
+    public function testMainNavigationDoesNotInclude404Page()
+    {
+        $this->assertMenuEquals([], [new MarkdownPage('404')]);
+    }
+
     public function testDefaultNavigationPriorities()
     {
         $this->assertMenuEquals([

From ed59f2c74edfba4fac53ffb4f00bf7b7a7c89533 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 17 Feb 2024 11:55:22 +0100
Subject: [PATCH 0253/1422] Test redirect pages are added to navigation menu

---
 .../Feature/AutomaticNavigationConfigurationsTest.php     | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index ac60f39af5a..73d5451985b 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -13,6 +13,7 @@
 use Hyde\Foundation\HydeKernel;
 use Hyde\Pages\Concerns\HydePage;
 use Hyde\Pages\DocumentationPage;
+use Hyde\Support\Models\Redirect;
 use Illuminate\Support\Collection;
 use Hyde\Foundation\Kernel\RouteCollection;
 use Hyde\Framework\Features\Navigation\NavItem;
@@ -90,6 +91,13 @@ public function testMainNavigationDoesNotInclude404Page()
         $this->assertMenuEquals([], [new MarkdownPage('404')]);
     }
 
+    public function testRedirectPagesAreAddedToNavigationMenu()
+    {
+        $this->assertMenuEquals(['Redirect'], [
+            new Redirect('redirect', 'destination'),
+        ]);
+    }
+
     public function testDefaultNavigationPriorities()
     {
         $this->assertMenuEquals([

From 2ff05f5d5630348f0c910db7426bb46fa9960940 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 17 Feb 2024 12:01:27 +0100
Subject: [PATCH 0254/1422] Remove unused assertion helper

---
 .../Feature/AutomaticNavigationConfigurationsTest.php      | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 73d5451985b..d5c5af688a6 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -403,13 +403,6 @@ public function assertEquals(array $expected, bool $strict = false): static
 
         return $this;
     }
-
-    public function assertHasItem(string $label): static
-    {
-        $this->test->assertNotEmpty($this->items->first(fn ($item) => $item->getLabel() === $label), "Item with label '$label' not found in the main navigation menu");
-
-        return $this;
-    }
 }
 
 class TestKernel extends HydeKernel

From bab57f1ced4e6dafe86936a2876f60b4e59c7fa3 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 17 Feb 2024 12:14:27 +0100
Subject: [PATCH 0255/1422] Update sidebar testing helper to allow pages

---
 .../tests/Feature/AutomaticNavigationConfigurationsTest.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index d5c5af688a6..152d79c1c55 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -311,8 +311,12 @@ protected function withPages(array $pages): static
         return $this;
     }
 
-    protected function sidebar(): AssertableNavigationMenu
+    protected function sidebar(?array $withPages = null): AssertableNavigationMenu
     {
+        if ($withPages) {
+            $this->withPages($withPages);
+        }
+
         return new AssertableNavigationMenu($this, true);
     }
 }

From d48c4b2c90b51be915eb5aaa8ad970c2bad5ef9e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 17 Feb 2024 12:14:55 +0100
Subject: [PATCH 0256/1422] Add sidebar assertion helper

---
 .../tests/Feature/AutomaticNavigationConfigurationsTest.php  | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 152d79c1c55..84de380a864 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -290,6 +290,11 @@ public function testMainNavigationMenuWithFrontMatterGroupAndCategory()
         ]);
     }
 
+    protected function assertSidebarEquals(array $expected, array $menuPages): void
+    {
+        $this->sidebar($menuPages)->assertEquals($expected);
+    }
+
     protected function assertMenuEquals(array $expected, array $menuPages): void
     {
         $this->menu($menuPages)->assertEquals($expected);

From 26fb57b001ba807c582c255bbf2ee9b96e289c1f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 17 Feb 2024 12:15:08 +0100
Subject: [PATCH 0257/1422] Test sidebar with pages

---
 .../Feature/AutomaticNavigationConfigurationsTest.php    | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 84de380a864..f85f320f098 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -290,6 +290,15 @@ public function testMainNavigationMenuWithFrontMatterGroupAndCategory()
         ]);
     }
 
+    public function testSidebarWithPages()
+    {
+        $this->assertSidebarEquals(['Foo', 'Bar', 'Baz'], [
+            new DocumentationPage('foo'),
+            new DocumentationPage('bar'),
+            new DocumentationPage('baz'),
+        ]);
+    }
+
     protected function assertSidebarEquals(array $expected, array $menuPages): void
     {
         $this->sidebar($menuPages)->assertEquals($expected);

From 34c9c2e0fcb20962f0e4e2d3c594018208dee41a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 17 Feb 2024 13:27:16 +0100
Subject: [PATCH 0258/1422] Test only documentation pages are added to sidebar

---
 .../AutomaticNavigationConfigurationsTest.php       | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index f85f320f098..f79d2577573 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -299,6 +299,19 @@ public function testSidebarWithPages()
         ]);
     }
 
+    public function testOnlyDocumentationPagesAreAddedToSidebar()
+    {
+        $this->assertSidebarEquals(['Documentation Page'], [
+            new HtmlPage('html-page'),
+            new BladePage('blade-page'),
+            new MarkdownPage('markdown-page'),
+            new MarkdownPost('markdown-post'),
+            new DocumentationPage('documentation-page'),
+            new InMemoryPage('in-memory-page'),
+            new Redirect('redirect', 'destination'),
+        ]);
+    }
+
     protected function assertSidebarEquals(array $expected, array $menuPages): void
     {
         $this->sidebar($menuPages)->assertEquals($expected);

From 7abfce51728dfbec9cdba57ff8079cd36a6eba78 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 17 Feb 2024 13:53:25 +0100
Subject: [PATCH 0259/1422] Add base sidebar front matter tests

---
 .../AutomaticNavigationConfigurationsTest.php | 69 +++++++++++++++++++
 1 file changed, 69 insertions(+)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index f79d2577573..824c0409641 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -312,6 +312,75 @@ public function testOnlyDocumentationPagesAreAddedToSidebar()
         ]);
     }
 
+    public function testSidebarWithFrontMatterPriority()
+    {
+        $this->assertSidebarEquals(['First', 'Second', 'Third'], [
+            new DocumentationPage('first', ['navigation.priority' => 1]),
+            new DocumentationPage('second', ['navigation.priority' => 2]),
+            new DocumentationPage('third', ['navigation.priority' => 3]),
+        ]);
+
+        $this->assertSidebarEquals(['Third', 'Second', 'First'], [
+            new DocumentationPage('first', ['navigation.priority' => 3]),
+            new DocumentationPage('second', ['navigation.priority' => 2]),
+            new DocumentationPage('third', ['navigation.priority' => 1]),
+        ]);
+    }
+
+    public function testSidebarWithFrontMatterOrder()
+    {
+        $this->assertSidebarEquals(['First', 'Second', 'Third'], [
+            new DocumentationPage('first', ['navigation.order' => 1]),
+            new DocumentationPage('second', ['navigation.order' => 2]),
+            new DocumentationPage('third', ['navigation.order' => 3]),
+        ]);
+
+        $this->assertSidebarEquals(['Third', 'Second', 'First'], [
+            new DocumentationPage('first', ['navigation.order' => 3]),
+            new DocumentationPage('second', ['navigation.order' => 2]),
+            new DocumentationPage('third', ['navigation.order' => 1]),
+        ]);
+    }
+
+    public function testSidebarWithFrontMatterLabel()
+    {
+        $this->assertSidebarEquals(['First', 'Second', 'Third'], [
+            new DocumentationPage('foo', ['navigation.label' => 'First']),
+            new DocumentationPage('bar', ['navigation.label' => 'Second']),
+            new DocumentationPage('baz', ['navigation.label' => 'Third']),
+        ]);
+    }
+
+    public function testSidebarWithFrontMatterHidden()
+    {
+        $this->assertSidebarEquals(['Foo', 'Bar', 'Baz'], [
+            new DocumentationPage('foo', ['navigation.hidden' => false]),
+            new DocumentationPage('bar', ['navigation.hidden' => false]),
+            new DocumentationPage('baz', ['navigation.hidden' => false]),
+        ]);
+
+        $this->assertSidebarEquals([], [
+            new DocumentationPage('foo', ['navigation.hidden' => true]),
+            new DocumentationPage('bar', ['navigation.hidden' => true]),
+            new DocumentationPage('baz', ['navigation.hidden' => true]),
+        ]);
+    }
+
+    public function testSidebarWithFrontMatterVisible()
+    {
+        $this->assertSidebarEquals(['Foo', 'Bar', 'Baz'], [
+            new DocumentationPage('foo', ['navigation.visible' => true]),
+            new DocumentationPage('bar', ['navigation.visible' => true]),
+            new DocumentationPage('baz', ['navigation.visible' => true]),
+        ]);
+
+        $this->assertSidebarEquals([], [
+            new DocumentationPage('foo', ['navigation.visible' => false]),
+            new DocumentationPage('bar', ['navigation.visible' => false]),
+            new DocumentationPage('baz', ['navigation.visible' => false]),
+        ]);
+    }
+
     protected function assertSidebarEquals(array $expected, array $menuPages): void
     {
         $this->sidebar($menuPages)->assertEquals($expected);

From f9df95aff83817e3791eb4b204f990c26a2c530b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 17 Feb 2024 13:57:30 +0100
Subject: [PATCH 0260/1422] Add sidebar category front matter tests

---
 .../AutomaticNavigationConfigurationsTest.php | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 824c0409641..cd93444832a 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -381,6 +381,36 @@ public function testSidebarWithFrontMatterVisible()
         ]);
     }
 
+    public function testSidebarWithFrontMatterGroup()
+    {
+        // TODO: For new v2 system, this should insert a root item with the group name and the children as the pages
+
+        $this->assertSidebarEquals([
+            ['label' => 'Foo', 'group' => 'group-1'],
+            ['label' => 'Bar', 'group' => 'group-1'],
+            ['label' => 'Baz', 'group' => 'group-1'],
+        ], [
+            new DocumentationPage('foo', ['navigation.group' => 'Group 1']),
+            new DocumentationPage('bar', ['navigation.group' => 'Group 1']),
+            new DocumentationPage('baz', ['navigation.group' => 'Group 1']),
+        ]);
+    }
+
+    public function testSidebarWithFrontMatterCategory()
+    {
+        // TODO: For new v2 system, this should insert a root item with the group name and the children as the pages
+
+        $this->assertSidebarEquals([
+            ['label' => 'Foo', 'group' => 'group-1'],
+            ['label' => 'Bar', 'group' => 'group-1'],
+            ['label' => 'Baz', 'group' => 'group-1'],
+        ], [
+            new DocumentationPage('foo', ['navigation.category' => 'Group 1']),
+            new DocumentationPage('bar', ['navigation.category' => 'Group 1']),
+            new DocumentationPage('baz', ['navigation.category' => 'Group 1']),
+        ]);
+    }
+
     protected function assertSidebarEquals(array $expected, array $menuPages): void
     {
         $this->sidebar($menuPages)->assertEquals($expected);

From 199360ae10dbdb5334804ce943df6af9cb9e3b4b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 17 Feb 2024 13:58:31 +0100
Subject: [PATCH 0261/1422] Add sidebar front matter precedence tests

---
 .../AutomaticNavigationConfigurationsTest.php | 69 +++++++++++++++++++
 1 file changed, 69 insertions(+)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index cd93444832a..5881a571428 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -411,6 +411,75 @@ public function testSidebarWithFrontMatterCategory()
         ]);
     }
 
+    public function testSidebarWithFrontMatterPriorityAndOrder()
+    {
+        // Since the main key in the navigation schema is 'priority', that takes precedence over its 'order' alias
+
+        $expected = [
+            ['label' => 'Foo', 'priority' => 1],
+            ['label' => 'Bar', 'priority' => 2],
+            ['label' => 'Baz', 'priority' => 3],
+        ];
+
+        $this->assertSidebarEquals($expected, [
+            new DocumentationPage('foo', ['navigation.priority' => 1, 'navigation.order' => 10]),
+            new DocumentationPage('bar', ['navigation.priority' => 2, 'navigation.order' => 20]),
+            new DocumentationPage('baz', ['navigation.priority' => 3, 'navigation.order' => 30]),
+        ]);
+
+        $this->assertSidebarEquals($expected, [
+            new DocumentationPage('foo', ['navigation.order' => 10, 'navigation.priority' => 1]),
+            new DocumentationPage('bar', ['navigation.order' => 20, 'navigation.priority' => 2]),
+            new DocumentationPage('baz', ['navigation.order' => 30, 'navigation.priority' => 3]),
+        ]);
+    }
+
+    public function testSidebarWithFrontMatterHiddenAndVisible()
+    {
+        // Since the main key in the navigation schema is 'hidden', that takes precedence over its 'visible' alias
+
+        $this->assertSidebarEquals(['Foo', 'Bar', 'Baz'], [
+            new DocumentationPage('foo', ['navigation.hidden' => false, 'navigation.visible' => true]),
+            new DocumentationPage('bar', ['navigation.hidden' => false, 'navigation.visible' => true]),
+            new DocumentationPage('baz', ['navigation.hidden' => false, 'navigation.visible' => true]),
+        ]);
+
+        $this->assertSidebarEquals([], [
+            new DocumentationPage('foo', ['navigation.hidden' => true, 'navigation.visible' => false]),
+            new DocumentationPage('bar', ['navigation.hidden' => true, 'navigation.visible' => false]),
+            new DocumentationPage('baz', ['navigation.hidden' => true, 'navigation.visible' => false]),
+        ]);
+
+        $this->assertSidebarEquals([], [
+            new DocumentationPage('foo', ['navigation.hidden' => true, 'navigation.visible' => true]),
+            new DocumentationPage('bar', ['navigation.hidden' => true, 'navigation.visible' => true]),
+            new DocumentationPage('baz', ['navigation.hidden' => true, 'navigation.visible' => true]),
+        ]);
+
+        $this->assertSidebarEquals(['Foo', 'Bar', 'Baz'], [
+            new DocumentationPage('foo', ['navigation.hidden' => false, 'navigation.visible' => false]),
+            new DocumentationPage('bar', ['navigation.hidden' => false, 'navigation.visible' => false]),
+            new DocumentationPage('baz', ['navigation.hidden' => false, 'navigation.visible' => false]),
+        ]);
+
+        $this->assertSidebarEquals(['Bar'], [
+            new DocumentationPage('foo', ['navigation.hidden' => true, 'navigation.visible' => false]),
+            new DocumentationPage('bar', ['navigation.hidden' => false, 'navigation.visible' => true]),
+            new DocumentationPage('baz', ['navigation.hidden' => true, 'navigation.visible' => false]),
+        ]);
+    }
+
+    public function testSidebarWithFrontMatterGroupAndCategory()
+    {
+        // Since the main key in the navigation schema is 'group', that takes precedence over its 'category' alias
+
+        $this->assertSidebarEquals(array_fill(0, 3, ['group' => 'group-1']), [
+            new DocumentationPage('foo', ['navigation.group' => 'Group 1', 'navigation.category' => 'Group 2']),
+            new DocumentationPage('bar', ['navigation.group' => 'Group 1', 'navigation.category' => 'Group 2']),
+            new DocumentationPage('baz', ['navigation.group' => 'Group 1', 'navigation.category' => 'Group 2']),
+        ]);
+    }
+
     protected function assertSidebarEquals(array $expected, array $menuPages): void
     {
         $this->sidebar($menuPages)->assertEquals($expected);

From cd4e77f7602526ef8df475fb1d9a01ad5637e6d5 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 17 Feb 2024 14:07:30 +0100
Subject: [PATCH 0262/1422] Add section comments to test

---
 .../Feature/AutomaticNavigationConfigurationsTest.php     | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 5881a571428..a9253494fb7 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -39,6 +39,8 @@ protected function setUp(): void
         HydeKernel::setInstance($this->kernel);
     }
 
+    // Base tests
+
     public function testMainNavigationMenu()
     {
         $this->menu()->assertEquals(['Home']);
@@ -49,6 +51,8 @@ public function testDocumentationSidebarMenu()
         $this->sidebar()->assertEquals([]);
     }
 
+    // Main navigation menu tests
+
     public function testMainNavigationMenuWithPages()
     {
         $this->withPages([
@@ -290,6 +294,8 @@ public function testMainNavigationMenuWithFrontMatterGroupAndCategory()
         ]);
     }
 
+    // Documentation sidebar menu tests
+
     public function testSidebarWithPages()
     {
         $this->assertSidebarEquals(['Foo', 'Bar', 'Baz'], [
@@ -480,6 +486,8 @@ public function testSidebarWithFrontMatterGroupAndCategory()
         ]);
     }
 
+    // Testing helpers
+
     protected function assertSidebarEquals(array $expected, array $menuPages): void
     {
         $this->sidebar($menuPages)->assertEquals($expected);

From f6b3564d6af6283b9de9c80679fae97f2842ced2 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 17 Feb 2024 14:17:16 +0100
Subject: [PATCH 0263/1422] Add base main navigation subdirectory handling
 tests

---
 .../AutomaticNavigationConfigurationsTest.php | 36 +++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index a9253494fb7..20d36b0cdc4 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -294,6 +294,42 @@ public function testMainNavigationMenuWithFrontMatterGroupAndCategory()
         ]);
     }
 
+    // Main navigation subdirectory handling tests
+
+    public function testPagesInSubdirectoriesAreNotAddedToNavigation()
+    {
+        $this->assertMenuEquals([], [
+            new MarkdownPage('about/foo'),
+            new MarkdownPage('about/bar'),
+            new MarkdownPage('about/baz'),
+        ]);
+    }
+
+    public function testPagesInSubdirectoriesAreAddedToNavigationWhenNavigationSubdirectoriesIsSetToFlat()
+    {
+        config(['hyde.navigation.subdirectories' => 'flat']);
+
+        $this->assertMenuEquals(['Foo', 'Bar', 'Baz'], [
+            new MarkdownPage('about/foo'),
+            new MarkdownPage('about/bar'),
+            new MarkdownPage('about/baz'),
+        ]);
+    }
+
+    public function testPagesInSubdirectoriesAreAddedAsDropdownsWhenNavigationSubdirectoriesIsSetToDropdown()
+    {
+        config(['hyde.navigation.subdirectories' => 'dropdown']);
+
+        $this->assertMenuEquals([
+            ['Foo', 'Bar', 'Baz'],
+            // TODO: New state will be ['label' => 'About', 'children' => ['Foo', 'Bar', 'Baz']],
+        ], [
+            new MarkdownPage('about/foo'),
+            new MarkdownPage('about/bar'),
+            new MarkdownPage('about/baz'),
+        ]);
+    }
+
     // Documentation sidebar menu tests
 
     public function testSidebarWithPages()

From 388b31faa74a89c7729dea0424c8803f79561a29 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 17 Feb 2024 15:05:49 +0100
Subject: [PATCH 0264/1422] Add base sidebar subdirectory handling tests

---
 .../AutomaticNavigationConfigurationsTest.php | 40 +++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 20d36b0cdc4..4941d20feb3 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -522,6 +522,46 @@ public function testSidebarWithFrontMatterGroupAndCategory()
         ]);
     }
 
+    // Sidebar subdirectory handling tests
+
+    public function testDocumentationPagesInSubdirectoriesAreAddedToSidebar()
+    {
+        $this->assertSidebarEquals([
+            ['label' => 'Foo', 'group' => 'about'],
+            ['label' => 'Bar', 'group' => 'about'],
+            ['label' => 'Baz', 'group' => 'about'],
+        ], [
+            new DocumentationPage('about/foo'),
+            new DocumentationPage('about/bar'),
+            new DocumentationPage('about/baz'),
+        ]);
+    }
+
+    public function testPagesInSubdirectoriesAreAddedToSidebarWhenSidebarSubdirectoriesIsSetToFlat()
+    {
+        config(['hyde.navigation.subdirectories' => 'flat']);
+
+        $this->assertSidebarEquals(['Foo', 'Bar', 'Baz'], [
+            new DocumentationPage('about/foo'),
+            new DocumentationPage('about/bar'),
+            new DocumentationPage('about/baz'),
+        ]);
+    }
+
+    public function testPagesInSubdirectoriesAreAddedAsDropdownsWhenSidebarSubdirectoriesIsSetToDropdown()
+    {
+        config(['hyde.navigation.subdirectories' => 'dropdown']);
+
+        $this->assertSidebarEquals([
+            'Foo', 'Bar', 'Baz',
+            // TODO: New state will be ['label' => 'About', 'children' => ['Foo', 'Bar', 'Baz']],
+        ], [
+            new DocumentationPage('about/foo'),
+            new DocumentationPage('about/bar'),
+            new DocumentationPage('about/baz'),
+        ]);
+    }
+
     // Testing helpers
 
     protected function assertSidebarEquals(array $expected, array $menuPages): void

From 58d25c186c9a389dc7505188206e887022c12776 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 17 Feb 2024 18:27:42 +0100
Subject: [PATCH 0265/1422] Proof of concept for using index pages as dropdown
 parent

See https://github.com/hydephp/develop/pull/1568#issuecomment-1950223514
---
 .../Navigation/GeneratesMainNavigationMenu.php     | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index 0131bf34f31..bbc972966f0 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -71,8 +71,20 @@ protected function moveGroupedItemsIntoDropdowns(): void
         }
 
         foreach ($dropdowns as $group => $items) {
+            // If items contain an index page, we use that as the dropdown root (TODO handle external links)
+            $hasIndex = collect($items)->first(fn (NavItem $item): bool => basename($item->getDestination()->getPageIdentifier()) === 'index');
+
+            if ($hasIndex) {
+                /** @var NavItem $index */
+                $index = collect($items)->first(fn (NavItem $item): bool => basename($item->getDestination()->getPageIdentifier()) === 'index');
+                $items = collect($items)->reject(fn (NavItem $item): bool => basename($item->getDestination()->getPageIdentifier()) === 'index')->values();
+                $dropdown = new NavItem($index->getDestination(), $index->getLabel(), $index->getPriority(), $group, $items->all());
+            } else {
+                $dropdown = NavItem::dropdown($group, $items);
+            }
+
             // Create a new dropdown item containing the buffered items
-            $this->items->add(NavItem::dropdown($group, $items));
+            $this->items->add($dropdown);
         }
     }
 

From 74684acb54c3299e72381f846538930a97ebfccf Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 17 Feb 2024 18:28:03 +0100
Subject: [PATCH 0266/1422] Add todo

---
 packages/framework/resources/views/layouts/navigation.blade.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/resources/views/layouts/navigation.blade.php b/packages/framework/resources/views/layouts/navigation.blade.php
index 899ccd75f31..6884496f0d4 100644
--- a/packages/framework/resources/views/layouts/navigation.blade.php
+++ b/packages/framework/resources/views/layouts/navigation.blade.php
@@ -1,4 +1,5 @@
 @php
+    // Todo consider passing from shared view data?
     $navigation = app('navigation')->getMenu('main');
 @endphp
 

From 8f1511d7972cab40c03acb4fac60b43529588a74 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 17 Feb 2024 18:28:06 +0100
Subject: [PATCH 0267/1422] Revert "Add todo"

This reverts commit 74684acb54c3299e72381f846538930a97ebfccf.
---
 packages/framework/resources/views/layouts/navigation.blade.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/framework/resources/views/layouts/navigation.blade.php b/packages/framework/resources/views/layouts/navigation.blade.php
index 6884496f0d4..899ccd75f31 100644
--- a/packages/framework/resources/views/layouts/navigation.blade.php
+++ b/packages/framework/resources/views/layouts/navigation.blade.php
@@ -1,5 +1,4 @@
 @php
-    // Todo consider passing from shared view data?
     $navigation = app('navigation')->getMenu('main');
 @endphp
 

From b00c434bd45986e606e1ffd17498fbc506d8c8d8 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 17 Feb 2024 18:28:15 +0100
Subject: [PATCH 0268/1422] Revert "Proof of concept for using index pages as
 dropdown parent"

This reverts commit 58d25c186c9a389dc7505188206e887022c12776 as it has issues on mobile UX. See https://twitter.com/CodeWithCaen/status/1758864331083489579
---
 .../Navigation/GeneratesMainNavigationMenu.php     | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index bbc972966f0..0131bf34f31 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -71,20 +71,8 @@ protected function moveGroupedItemsIntoDropdowns(): void
         }
 
         foreach ($dropdowns as $group => $items) {
-            // If items contain an index page, we use that as the dropdown root (TODO handle external links)
-            $hasIndex = collect($items)->first(fn (NavItem $item): bool => basename($item->getDestination()->getPageIdentifier()) === 'index');
-
-            if ($hasIndex) {
-                /** @var NavItem $index */
-                $index = collect($items)->first(fn (NavItem $item): bool => basename($item->getDestination()->getPageIdentifier()) === 'index');
-                $items = collect($items)->reject(fn (NavItem $item): bool => basename($item->getDestination()->getPageIdentifier()) === 'index')->values();
-                $dropdown = new NavItem($index->getDestination(), $index->getLabel(), $index->getPriority(), $group, $items->all());
-            } else {
-                $dropdown = NavItem::dropdown($group, $items);
-            }
-
             // Create a new dropdown item containing the buffered items
-            $this->items->add($dropdown);
+            $this->items->add(NavItem::dropdown($group, $items));
         }
     }
 

From 1224416c283b24897295e02d4764d60b7438b493 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 17 Feb 2024 18:31:32 +0100
Subject: [PATCH 0269/1422] Add todo

---
 packages/framework/src/Framework/Features/Navigation/NavItem.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 8aa758eb100..77d2403a3e6 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -92,6 +92,7 @@ public static function forRoute(Route|string $route, ?string $label = null, ?int
      */
     public static function dropdown(string $label, array $items, ?int $priority = null): static
     {
+        // TODO resolve label from config here instead of view
         return new static('', $label, $priority ?? static::searchForDropdownPriorityInNavigationConfig($label) ?? 999, null, $items);
     }
 

From 4b4a9abab5960dcfe0c93676f0403f0d8d7da48a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 17 Feb 2024 18:38:54 +0100
Subject: [PATCH 0270/1422] Normalize navigation item group keys at construct
 time

---
 .../framework/src/Framework/Features/Navigation/NavItem.php | 2 +-
 packages/framework/tests/Unit/NavItemTest.php               | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 77d2403a3e6..c01de3a004b 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -45,7 +45,7 @@ public function __construct(Route|string $destination, string $label, int $prior
         $this->destination = $destination;
         $this->label = $label;
         $this->priority = $priority;
-        $this->group = $group;
+        $this->group = static::normalizeGroupKey($group);
         $this->children = $children;
     }
 
diff --git a/packages/framework/tests/Unit/NavItemTest.php b/packages/framework/tests/Unit/NavItemTest.php
index 78e3407b0f7..c3996365c55 100644
--- a/packages/framework/tests/Unit/NavItemTest.php
+++ b/packages/framework/tests/Unit/NavItemTest.php
@@ -342,4 +342,10 @@ public function testGetGroupForRouteWithGroup()
     {
         $this->assertSame('foo', NavItem::forRoute(new Route(new MarkdownPage(matter: ['navigation.group' => 'foo'])), 'foo')->getGroup());
     }
+
+    public function testGroupKeysAreNormalized()
+    {
+        $item = new NavItem(new Route(new MarkdownPage()), 'Test', 500, 'Foo Bar');
+        $this->assertSame('foo-bar', $item->getGroup());
+    }
 }

From 6905c631ba5532d1cda75bbd111e1888a4e7c9aa Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 17 Feb 2024 18:42:47 +0100
Subject: [PATCH 0271/1422] Simplify static helper for logic now handled in
 constructor

---
 .../src/Framework/Features/Navigation/NavItem.php      | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index c01de3a004b..ce0f247ed48 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -58,7 +58,7 @@ public static function fromRoute(Route $route, ?string $label = null, ?int $prio
             $route,
             $label ?? $route->getPage()->navigationMenuLabel(),
             $priority ?? $route->getPage()->navigationMenuPriority(),
-            $group ?? static::getRouteGroup($route),
+            $group ?? $route->getPage()->data('navigation.group'),
         );
     }
 
@@ -174,14 +174,6 @@ public function isCurrent(): bool
         return Hyde::currentRoute()->getLink() === (string) $this->destination;
     }
 
-    protected static function getRouteGroup(Route $route): ?string
-    {
-        /** @var string|null $group */
-        $group = $route->getPage()->data('navigation.group');
-
-        return static::normalizeGroupKey($group);
-    }
-
     protected static function normalizeGroupKey(?string $group): ?string
     {
         return $group ? Str::slug($group) : null;

From 42ab213a44a94ee24d28640c5d6a00b889e7b800 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 17 Feb 2024 18:44:10 +0100
Subject: [PATCH 0272/1422] Remove title logic from view

---
 packages/framework/resources/views/layouts/navigation.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/resources/views/layouts/navigation.blade.php b/packages/framework/resources/views/layouts/navigation.blade.php
index 899ccd75f31..d7f8edcde5b 100644
--- a/packages/framework/resources/views/layouts/navigation.blade.php
+++ b/packages/framework/resources/views/layouts/navigation.blade.php
@@ -36,7 +36,7 @@
             @foreach ($navigation->getItems() as $item)
                 <li class="md:mx-2">
                     @if($item->hasChildren())
-                        <x-hyde::navigation.dropdown :label="\Hyde\Hyde::makeTitle($item->label)" :items="$item->getChildren()"/>
+                        <x-hyde::navigation.dropdown :label="$item->label" :items="$item->getChildren()"/>
                     @else
                         @include('hyde::components.navigation.navigation-link')
                     @endif

From 0d4897b23f1b508d146a0c83a8f2348cec03003c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 17 Feb 2024 21:21:51 +0100
Subject: [PATCH 0273/1422] Add section comments

---
 .../tests/Feature/AutomaticNavigationConfigurationsTest.php   | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 4941d20feb3..78d218ed38c 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -102,6 +102,8 @@ public function testRedirectPagesAreAddedToNavigationMenu()
         ]);
     }
 
+    // Main navigation front matter tests
+
     public function testDefaultNavigationPriorities()
     {
         $this->assertMenuEquals([
@@ -354,6 +356,8 @@ public function testOnlyDocumentationPagesAreAddedToSidebar()
         ]);
     }
 
+    // Documentation sidebar front matter tests
+
     public function testSidebarWithFrontMatterPriority()
     {
         $this->assertSidebarEquals(['First', 'Second', 'Third'], [

From 193f0b597f8d0d81e3848b1e8f319bf5a4f09fde Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 17 Feb 2024 21:38:40 +0100
Subject: [PATCH 0274/1422] Add main navigation configuration tests section

---
 .../tests/Feature/AutomaticNavigationConfigurationsTest.php     | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 78d218ed38c..e7918deabdd 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -296,6 +296,8 @@ public function testMainNavigationMenuWithFrontMatterGroupAndCategory()
         ]);
     }
 
+    // Main navigation configuration tests
+
     // Main navigation subdirectory handling tests
 
     public function testPagesInSubdirectoriesAreNotAddedToNavigation()

From 1381d299695c71bf81fe3cc2421716fbeedb3454 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 17 Feb 2024 21:40:03 +0100
Subject: [PATCH 0275/1422] Add config order tests

---
 .../AutomaticNavigationConfigurationsTest.php | 90 +++++++++++++++++++
 1 file changed, 90 insertions(+)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index e7918deabdd..a26691191f1 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -298,6 +298,96 @@ public function testMainNavigationMenuWithFrontMatterGroupAndCategory()
 
     // Main navigation configuration tests
 
+    public function testMainNavigationMenuWithConfigOrder()
+    {
+        config(['hyde.navigation.order' => ['first', 'second', 'third']]);
+
+        $this->assertMenuEquals(['First', 'Second', 'Third'], [
+            new MarkdownPage('first'),
+            new MarkdownPage('second'),
+            new MarkdownPage('third'),
+        ]);
+
+        config(['hyde.navigation.order' => ['third', 'second', 'first']]);
+
+        $this->assertMenuEquals(['Third', 'Second', 'First'], [
+            new MarkdownPage('first'),
+            new MarkdownPage('second'),
+            new MarkdownPage('third'),
+        ]);
+    }
+
+    public function testMainNavigationMenuWithConfigOrderHasInferredPriorities()
+    {
+        $this->assertMenuEquals([
+            ['priority' => 999],
+            ['priority' => 999],
+            ['priority' => 999],
+        ], [
+            new MarkdownPage('first'),
+            new MarkdownPage('second'),
+            new MarkdownPage('third'),
+        ]);
+
+        config(['hyde.navigation.order' => ['first', 'second', 'third']]);
+
+        $this->assertMenuEquals([
+            ['priority' => 500],
+            ['priority' => 501],
+            ['priority' => 502],
+        ], [
+            new MarkdownPage('first'),
+            new MarkdownPage('second'),
+            new MarkdownPage('third'),
+        ]);
+    }
+
+    public function testMainNavigationMenuWithExplicitConfigOrder()
+    {
+        config(['hyde.navigation.order' => ['first' => 1, 'second' => 2, 'third' => 3]]);
+
+        $this->assertMenuEquals(['First', 'Second', 'Third'], [
+            new MarkdownPage('first'),
+            new MarkdownPage('second'),
+            new MarkdownPage('third'),
+        ]);
+
+        config(['hyde.navigation.order' => ['first' => 3, 'second' => 2, 'third' => 1]]);
+
+        $this->assertMenuEquals(['Third', 'Second', 'First'], [
+            new MarkdownPage('first'),
+            new MarkdownPage('second'),
+            new MarkdownPage('third'),
+        ]);
+
+        config(['hyde.navigation.order' => ['first' => 1, 'second' => 2, 'third' => 3]]);
+
+        $this->assertMenuEquals([
+            ['label' => 'First', 'priority' => 1],
+            ['label' => 'Second', 'priority' => 2],
+            ['label' => 'Third', 'priority' => 3],
+        ], [
+            new MarkdownPage('first'),
+            new MarkdownPage('second'),
+            new MarkdownPage('third'),
+        ]);
+    }
+
+    public function testMainNavigationMenuWithMixedConfigOrders()
+    {
+        config(['hyde.navigation.order' => ['foo', 'bar' => 650]]);
+
+        $this->assertMenuEquals([
+            ['label' => 'Foo', 'priority' => 500],
+            ['label' => 'Bar', 'priority' => 650],
+            ['label' => 'Baz', 'priority' => 999],
+        ], [
+            new MarkdownPage('foo'),
+            new MarkdownPage('bar'),
+            new MarkdownPage('baz'),
+        ]);
+    }
+
     // Main navigation subdirectory handling tests
 
     public function testPagesInSubdirectoriesAreNotAddedToNavigation()

From 71d12989ea5d35230852fa5f050ec607def889c5 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 17 Feb 2024 21:51:25 +0100
Subject: [PATCH 0276/1422] Test main navigation menu with config labels

---
 .../Feature/AutomaticNavigationConfigurationsTest.php | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index a26691191f1..c1d3ecfd633 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -388,6 +388,17 @@ public function testMainNavigationMenuWithMixedConfigOrders()
         ]);
     }
 
+    public function testMainNavigationMenuWithConfigLabels()
+    {
+        config(['hyde.navigation.labels' => ['foo' => 'First', 'bar' => 'Second', 'baz' => 'Third']]);
+
+        $this->assertMenuEquals(['First', 'Second', 'Third'], [
+            new MarkdownPage('foo'),
+            new MarkdownPage('bar'),
+            new MarkdownPage('baz'),
+        ]);
+    }
+
     // Main navigation subdirectory handling tests
 
     public function testPagesInSubdirectoriesAreNotAddedToNavigation()

From 9f3b40c20f789deb9d6a67f5b2aa94b9daaf7dc0 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 17 Feb 2024 21:52:59 +0100
Subject: [PATCH 0277/1422] Test main navigation menu with config hidden

---
 .../Feature/AutomaticNavigationConfigurationsTest.php | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index c1d3ecfd633..959464b80c0 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -399,6 +399,17 @@ public function testMainNavigationMenuWithConfigLabels()
         ]);
     }
 
+    public function testMainNavigationMenuWithConfigHidden()
+    {
+        config(['hyde.navigation.exclude' => ['foo', 'bar', 'baz']]);
+
+        $this->assertMenuEquals([], [
+            new MarkdownPage('foo'),
+            new MarkdownPage('bar'),
+            new MarkdownPage('baz'),
+        ]);
+    }
+
     // Main navigation subdirectory handling tests
 
     public function testPagesInSubdirectoriesAreNotAddedToNavigation()

From 4ce527a6d6f64e66421fbce4416c6a1b5b80be2e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 17 Feb 2024 21:58:36 +0100
Subject: [PATCH 0278/1422] Add test placeholders

---
 .../Feature/AutomaticNavigationConfigurationsTest.php  | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 959464b80c0..d502b09d0ed 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -399,6 +399,16 @@ public function testMainNavigationMenuWithConfigLabels()
         ]);
     }
 
+    public function testMainNavigationDropdownLabelsCanBeSetInConfig()
+    {
+        $this->markTestSkipped('Not yet implemented');
+    }
+
+    public function testMainNavigationAutomaticDropdownLabelsCanBeSetInConfig()
+    {
+        $this->markTestSkipped('Not yet implemented');
+    }
+
     public function testMainNavigationMenuWithConfigHidden()
     {
         config(['hyde.navigation.exclude' => ['foo', 'bar', 'baz']]);

From 9ceeda415b52148dea2b0d7dedeb01777ad58fc1 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 18 Feb 2024 13:16:08 +0100
Subject: [PATCH 0279/1422] Add sidebar config tests

---
 .../AutomaticNavigationConfigurationsTest.php | 130 ++++++++++++++++++
 1 file changed, 130 insertions(+)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index d502b09d0ed..7a757b9e48c 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -650,6 +650,136 @@ public function testSidebarWithFrontMatterGroupAndCategory()
         ]);
     }
 
+    // Sidebar configuration tests
+
+    public function testSidebarWithConfigOrder()
+    {
+        // TODO should be sidebar.order instead of docs.sidebar_order
+
+        config(['docs.sidebar_order' => ['first', 'second', 'third']]);
+
+        $this->assertSidebarEquals(['First', 'Second', 'Third'], [
+            new DocumentationPage('first'),
+            new DocumentationPage('second'),
+            new DocumentationPage('third'),
+        ]);
+
+        config(['docs.sidebar_order' => ['third', 'second', 'first']]);
+
+        $this->assertSidebarEquals(['Third', 'Second', 'First'], [
+            new DocumentationPage('first'),
+            new DocumentationPage('second'),
+            new DocumentationPage('third'),
+        ]);
+    }
+
+    public function testSidebarWithConfigOrderHasInferredPriorities()
+    {
+        $this->assertSidebarEquals([
+            ['priority' => 999],
+            ['priority' => 999],
+            ['priority' => 999],
+        ], [
+            new DocumentationPage('first'),
+            new DocumentationPage('second'),
+            new DocumentationPage('third'),
+        ]);
+
+        config(['docs.sidebar_order' => ['first', 'second', 'third']]);
+
+        $this->assertSidebarEquals([
+            ['priority' => 500],
+            ['priority' => 501],
+            ['priority' => 502],
+        ], [
+            new DocumentationPage('first'),
+            new DocumentationPage('second'),
+            new DocumentationPage('third'),
+        ]);
+    }
+
+    public function testSidebarWithExplicitConfigOrder()
+    {
+        config(['docs.sidebar_order' => ['first' => 1, 'second' => 2, 'third' => 3]]);
+
+        $this->assertSidebarEquals(['First', 'Second', 'Third'], [
+            new DocumentationPage('first'),
+            new DocumentationPage('second'),
+            new DocumentationPage('third'),
+        ]);
+
+        config(['docs.sidebar_order' => ['first' => 3, 'second' => 2, 'third' => 1]]);
+
+        $this->assertSidebarEquals(['Third', 'Second', 'First'], [
+            new DocumentationPage('first'),
+            new DocumentationPage('second'),
+            new DocumentationPage('third'),
+        ]);
+
+        config(['docs.sidebar_order' => ['first' => 1, 'second' => 2, 'third' => 3]]);
+
+        $this->assertSidebarEquals([
+            ['label' => 'First', 'priority' => 1],
+            ['label' => 'Second', 'priority' => 2],
+            ['label' => 'Third', 'priority' => 3],
+        ], [
+            new DocumentationPage('first'),
+            new DocumentationPage('second'),
+            new DocumentationPage('third'),
+        ]);
+    }
+
+    public function testSidebarWithMixedConfigOrders()
+    {
+        config(['docs.sidebar_order' => ['foo', 'bar' => 650]]);
+
+        $this->assertSidebarEquals([
+            ['label' => 'Foo', 'priority' => 500],
+            ['label' => 'Bar', 'priority' => 650],
+            ['label' => 'Baz', 'priority' => 999],
+        ], [
+            new DocumentationPage('foo'),
+            new DocumentationPage('bar'),
+            new DocumentationPage('baz'),
+        ]);
+    }
+
+    public function testSidebarWithConfigLabels()
+    {
+        $this->markTestSkipped('Not supported (yet?)');
+
+        config(['docs.sidebar.labels' => ['foo' => 'First', 'bar' => 'Second', 'baz' => 'Third']]);
+
+        $this->assertSidebarEquals(['First', 'Second', 'Third'], [
+            new DocumentationPage('foo'),
+            new DocumentationPage('bar'),
+            new DocumentationPage('baz'),
+        ]);
+    }
+
+    public function testSidebarDropdownLabelsCanBeSetInConfig()
+    {
+        $this->markTestSkipped('Not yet implemented');
+    }
+
+    public function testSidebarAutomaticDropdownLabelsCanBeSetInConfig()
+    {
+        $this->markTestSkipped('Not yet implemented');
+    }
+
+    public function testSidebarWithConfigHidden()
+    {
+        $this->markTestSkipped('Not supported (yet?)');
+
+        config(['docs.sidebar.exclude' => ['foo', 'bar', 'baz']]);
+
+        $this->assertSidebarEquals([], [
+            new DocumentationPage('foo'),
+            new DocumentationPage('bar'),
+            new DocumentationPage('baz'),
+        ]);
+    }
+
     // Sidebar subdirectory handling tests
 
     public function testDocumentationPagesInSubdirectoriesAreAddedToSidebar()

From afd5e6c265ba3414ce63b62f8f843f161a245fcf Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 18 Feb 2024 14:49:00 +0100
Subject: [PATCH 0280/1422] Merge tests to use loop providing better clarity

---
 .../AutomaticNavigationConfigurationsTest.php | 40 ++++++++-----------
 1 file changed, 17 insertions(+), 23 deletions(-)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 7a757b9e48c..d9687910ee4 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -795,29 +795,23 @@ public function testDocumentationPagesInSubdirectoriesAreAddedToSidebar()
         ]);
     }
 
-    public function testPagesInSubdirectoriesAreAddedToSidebarWhenSidebarSubdirectoriesIsSetToFlat()
-    {
-        config(['hyde.navigation.subdirectories' => 'flat']);
-
-        $this->assertSidebarEquals(['Foo', 'Bar', 'Baz'], [
-            new DocumentationPage('about/foo'),
-            new DocumentationPage('about/bar'),
-            new DocumentationPage('about/baz'),
-        ]);
-    }
-
-    public function testPagesInSubdirectoriesAreAddedAsDropdownsWhenSidebarSubdirectoriesIsSetToDropdown()
-    {
-        config(['hyde.navigation.subdirectories' => 'dropdown']);
-
-        $this->assertSidebarEquals([
-            'Foo', 'Bar', 'Baz',
-            // TODO: New state will be ['label' => 'About', 'children' => ['Foo', 'Bar', 'Baz']],
-        ], [
-            new DocumentationPage('about/foo'),
-            new DocumentationPage('about/bar'),
-            new DocumentationPage('about/baz'),
-        ]);
+    public function testPagesInSubdirectoriesAreAddedToSidebarRegardlessOfConfiguration()
+    {
+        $options = ['dropdown', 'flat', 'hidden'];
+
+        foreach ($options as $option) {
+            config(['docs.sidebar.subdirectories' => $option]);
+
+            $this->assertSidebarEquals([
+                ['label' => 'Foo', 'group' => 'about'],
+                ['label' => 'Bar', 'group' => 'about'],
+                ['label' => 'Baz', 'group' => 'about'],
+            ], [
+                new DocumentationPage('about/foo'),
+                new DocumentationPage('about/bar'),
+                new DocumentationPage('about/baz'),
+            ]);
+        }
     }
 
     // Testing helpers

From c639ccce8faef690d9729721d3a32315844dbc8a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 18 Feb 2024 14:50:52 +0100
Subject: [PATCH 0281/1422] Temporarily commit broken Idea file (WI-76125)

Getting tired of having to unstage this file all the time, so committing it to be removed before PR merge. This is due to a known bug that does not have high enough priority. See https://youtrack.jetbrains.com/issue/WI-76125/PhpStorm-has-started-to-add-an-undesired-line-to-.idea-php-test-framework.xml-when-running-Pest-PHPUnit-tests
---
 .idea/php-test-framework.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.idea/php-test-framework.xml b/.idea/php-test-framework.xml
index f990e0a96bb..8ecfa3b3072 100644
--- a/.idea/php-test-framework.xml
+++ b/.idea/php-test-framework.xml
@@ -17,6 +17,7 @@
         <cache>
           <versions>
             <info id="Local" version="9.5.21" />
+            <info id="LocalH:\monorepo\vendor\autoload.php" version="10.4.2" />
           </versions>
         </cache>
       </tool>

From 5fd8344328541b5c30eb3555364d105dba72d4de Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 18 Feb 2024 14:55:23 +0100
Subject: [PATCH 0282/1422] Add crosslinks between related actions

---
 .../Features/Navigation/GeneratesDocumentationSidebarMenu.php   | 2 ++
 .../Features/Navigation/GeneratesMainNavigationMenu.php         | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index 3221bfa3ada..77562aabef1 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -13,6 +13,8 @@
  * @experimental This class may change significantly before its release.
  *
  * @todo Consider making into a service which can create the sidebar as well.
+ *
+ * @see \Hyde\Framework\Features\Navigation\GeneratesMainNavigationMenu
  */
 class GeneratesDocumentationSidebarMenu
 {
diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index 0131bf34f31..832248bd43f 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -16,6 +16,8 @@
  * @experimental This class may change significantly before its release.
  *
  * @todo Consider making into a service which can create the sidebar as well.
+ *
+ * @see \Hyde\Framework\Features\Navigation\GeneratesDocumentationSidebarMenu
  */
 class GeneratesMainNavigationMenu
 {

From de4bedaab4c707d94bf26488f3157b746ee39b36 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 18 Feb 2024 15:24:32 +0100
Subject: [PATCH 0283/1422] Add navigation item label filtering tests

---
 .../AutomaticNavigationConfigurationsTest.php | 56 +++++++++++++++++++
 1 file changed, 56 insertions(+)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index d9687910ee4..320f10d73d2 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -456,6 +456,34 @@ public function testPagesInSubdirectoriesAreAddedAsDropdownsWhenNavigationSubdir
         ]);
     }
 
+    public function testMainNavigationMenuItemsWithTheSameLabelAreFiltered()
+    {
+        $this->assertMenuEquals(['Foo'], [
+            new MarkdownPage('foo'),
+            new MarkdownPage('foo'),
+        ]);
+
+        $this->assertMenuEquals(['Foo'], [
+            new MarkdownPage('foo', ['navigation.label' => 'Foo']),
+            new MarkdownPage('bar', ['navigation.label' => 'Foo']),
+        ]);
+    }
+
+    public function testMainNavigationMenuItemsWithTheSameLabelAreFilteredCaseInsensitive()
+    {
+        $this->markTestSkipped('Not yet implemented, but we should, as identifiers on some systems are case insensitive, and it makes sense to match that to labels');
+
+        $this->assertMenuEquals(['Foo'], [
+            new MarkdownPage('foo'),
+            new MarkdownPage('FOO'),
+        ]);
+
+        $this->assertMenuEquals(['Foo'], [
+            new MarkdownPage('foo', ['navigation.label' => 'foo']),
+            new MarkdownPage('bar', ['navigation.label' => 'Foo']),
+        ]);
+    }
+
     // Documentation sidebar menu tests
 
     public function testSidebarWithPages()
@@ -814,6 +842,34 @@ public function testPagesInSubdirectoriesAreAddedToSidebarRegardlessOfConfigurat
         }
     }
 
+    public function testSidebarItemsWithTheSameLabelAreFiltered()
+    {
+        $this->assertSidebarEquals(['Foo'], [
+            new DocumentationPage('foo'),
+            new DocumentationPage('foo'),
+        ]);
+
+        $this->assertSidebarEquals(['Foo'], [
+            new DocumentationPage('foo', ['navigation.label' => 'Foo']),
+            new DocumentationPage('bar', ['navigation.label' => 'Foo']),
+        ]);
+    }
+
+    public function testSidebarItemsWithTheSameLabelAreFilteredCaseInsensitive()
+    {
+        $this->markTestSkipped('Not yet implemented, but we should, as identifiers on some systems are case insensitive, and it makes sense to match that to labels');
+
+        $this->assertSidebarEquals(['Foo'], [
+            new DocumentationPage('foo'),
+            new DocumentationPage('FOO'),
+        ]);
+
+        $this->assertSidebarEquals(['Foo'], [
+            new DocumentationPage('foo', ['navigation.label' => 'foo']),
+            new DocumentationPage('bar', ['navigation.label' => 'Foo']),
+        ]);
+    }
+
     // Testing helpers
 
     protected function assertSidebarEquals(array $expected, array $menuPages): void

From c9ab278724299fe9884ce72f9d193ac94553ba2d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 18 Feb 2024 16:05:05 +0100
Subject: [PATCH 0284/1422] Add navigation group filtering tests

---
 .../AutomaticNavigationConfigurationsTest.php | 93 +++++++++++++++++++
 1 file changed, 93 insertions(+)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 320f10d73d2..6f01a7fc931 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -484,6 +484,45 @@ public function testMainNavigationMenuItemsWithTheSameLabelAreFilteredCaseInsens
         ]);
     }
 
+    public function testMainNavigationMenuItemsWithSameLabelButDifferentGroupsAreNotFiltered()
+    {
+        $this->assertMenuEquals([
+            ['label' => 'Foo', 'group' => 'group-1'],
+            ['label' => 'Foo', 'group' => 'group-2'],
+        ], [
+            new MarkdownPage('foo', ['navigation.label' => 'Foo', 'navigation.group' => 'Group 1']),
+            new MarkdownPage('bar', ['navigation.label' => 'Foo', 'navigation.group' => 'Group 2']),
+        ]);
+    }
+
+    public function testMainNavigationMenuDropdownItemsWithSameLabelButDifferentGroupsAreNotFiltered()
+    {
+        config(['hyde.navigation.subdirectories' => 'dropdown']);
+
+        $this->assertMenuEquals([
+            // Todo: Should use proper group name
+            ['label' => 'group-1', 'children' => ['Foo']],
+            ['label' => 'group-2', 'children' => ['Foo']],
+        ], [
+            new MarkdownPage('one/foo', ['navigation.group' => 'Group 1']),
+            new MarkdownPage('two/foo', ['navigation.group' => 'Group 2']),
+        ]);
+    }
+
+    public function testMainNavigationMenuAutomaticDropdownItemsWithSameLabelButDifferentGroupsAreNotFiltered()
+    {
+        config(['hyde.navigation.subdirectories' => 'dropdown']);
+
+        $this->assertMenuEquals([
+            // Todo: Should use proper group name
+            ['label' => 'one', 'children' => ['Foo']],
+            ['label' => 'two', 'children' => ['Foo']],
+        ], [
+            new MarkdownPage('one/foo'),
+            new MarkdownPage('two/foo'),
+        ]);
+    }
+
     // Documentation sidebar menu tests
 
     public function testSidebarWithPages()
@@ -870,6 +909,60 @@ public function testSidebarItemsWithTheSameLabelAreFilteredCaseInsensitive()
         ]);
     }
 
+    public function testSidebarItemsWithSameLabelButDifferentGroupsAreNotFiltered()
+    {
+        $this->assertSidebarEquals([
+            ['label' => 'Foo', 'group' => 'group-1'],
+            ['label' => 'Foo', 'group' => 'group-2'],
+        ], [
+            new DocumentationPage('foo', ['navigation.label' => 'Foo', 'navigation.group' => 'Group 1']),
+            new DocumentationPage('bar', ['navigation.label' => 'Foo', 'navigation.group' => 'Group 2']),
+        ]);
+    }
+
+    public function testSidebarDropdownItemsWithSameLabelButDifferentGroupsAreFiltered()
+    {
+        $this->assertSidebarEquals(['Foo'], [
+            new DocumentationPage('one/foo', ['navigation.group' => 'Group 1']),
+            new DocumentationPage('two/foo', ['navigation.group' => 'Group 2']),
+        ]);
+    }
+
+    public function testSidebarAutomaticDropdownItemsWithSameLabelButDifferentGroupsAreFiltered()
+    {
+        $this->assertSidebarEquals(['Foo'], [
+            new DocumentationPage('one/foo'),
+            new DocumentationPage('two/foo'),
+        ]);
+    }
+
+    public function testSidebarDropdownItemsWithSameLabelButDifferentGroupsAreNotFilteredWithFlattenedOutputPaths()
+    {
+        config(['docs.flattened_output_paths' => false]);
+
+        $this->assertSidebarEquals([
+            ['label' => 'Foo', 'group' => 'group-1'],
+            ['label' => 'Foo', 'group' => 'group-2'],
+        ], [
+            new DocumentationPage('one/foo', ['navigation.group' => 'Group 1']),
+            new DocumentationPage('two/foo', ['navigation.group' => 'Group 2']),
+        ]);
+    }
+
+    public function testSidebarAutomaticDropdownItemsWithSameLabelButDifferentGroupsAreNotFilteredWithFlattenedOutputPaths()
+    {
+        config(['docs.flattened_output_paths' => false]);
+
+        $this->assertSidebarEquals([
+            // Todo: Should use proper group name
+            ['label' => 'Foo', 'group' => 'one'],
+            ['label' => 'Foo', 'group' => 'two'],
+        ], [
+            new DocumentationPage('one/foo'),
+            new DocumentationPage('two/foo'),
+        ]);
+    }
+
     // Testing helpers
 
     protected function assertSidebarEquals(array $expected, array $menuPages): void

From 3088d902a16c3face3739938721dd1a6f1bea5b5 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 18 Feb 2024 17:58:28 +0100
Subject: [PATCH 0285/1422] Make navigation item duplicate filtering case
 insensitive

As identifiers on some systems are case insensitive, and it makes sense to match that to labels
---
 .../Navigation/GeneratesDocumentationSidebarMenu.php |  3 ++-
 .../Navigation/GeneratesMainNavigationMenu.php       |  3 ++-
 .../AutomaticNavigationConfigurationsTest.php        | 12 ++++++------
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index 77562aabef1..9b254c75e31 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -4,6 +4,7 @@
 
 namespace Hyde\Framework\Features\Navigation;
 
+use Illuminate\Support\Str;
 use Hyde\Support\Models\Route;
 use Hyde\Pages\DocumentationPage;
 use Illuminate\Support\Collection;
@@ -60,7 +61,7 @@ protected function removeDuplicateItems(): void
     {
         $this->items = $this->items->unique(function (NavItem $item): string {
             // Filter using a combination of the group and label to allow duplicate labels in different groups
-            return $item->getGroup().$item->label;
+            return $item->getGroup().Str::slug($item->getLabel());
         });
     }
 
diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index 832248bd43f..a6edfdafa83 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -5,6 +5,7 @@
 namespace Hyde\Framework\Features\Navigation;
 
 use Hyde\Facades\Config;
+use Illuminate\Support\Str;
 use Hyde\Support\Models\Route;
 use Hyde\Pages\DocumentationPage;
 use Illuminate\Support\Collection;
@@ -97,7 +98,7 @@ protected function removeDuplicateItems(): void
     {
         $this->items = $this->items->unique(function (NavItem $item): string {
             // Filter using a combination of the group and label to allow duplicate labels in different groups
-            return $item->getGroup().$item->label;
+            return $item->getGroup().Str::slug($item->getLabel());
         });
     }
 
diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 6f01a7fc931..fe8ffd13a65 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -471,16 +471,16 @@ public function testMainNavigationMenuItemsWithTheSameLabelAreFiltered()
 
     public function testMainNavigationMenuItemsWithTheSameLabelAreFilteredCaseInsensitive()
     {
-        $this->markTestSkipped('Not yet implemented, but we should, as identifiers on some systems are case insensitive, and it makes sense to match that to labels');
-
         $this->assertMenuEquals(['Foo'], [
             new MarkdownPage('foo'),
+            new MarkdownPage('Foo'),
             new MarkdownPage('FOO'),
         ]);
 
-        $this->assertMenuEquals(['Foo'], [
+        $this->assertMenuEquals(['foo'], [
             new MarkdownPage('foo', ['navigation.label' => 'foo']),
             new MarkdownPage('bar', ['navigation.label' => 'Foo']),
+            new MarkdownPage('baz', ['navigation.label' => 'FOO']),
         ]);
     }
 
@@ -896,16 +896,16 @@ public function testSidebarItemsWithTheSameLabelAreFiltered()
 
     public function testSidebarItemsWithTheSameLabelAreFilteredCaseInsensitive()
     {
-        $this->markTestSkipped('Not yet implemented, but we should, as identifiers on some systems are case insensitive, and it makes sense to match that to labels');
-
         $this->assertSidebarEquals(['Foo'], [
             new DocumentationPage('foo'),
+            new DocumentationPage('Foo'),
             new DocumentationPage('FOO'),
         ]);
 
-        $this->assertSidebarEquals(['Foo'], [
+        $this->assertSidebarEquals(['foo'], [
             new DocumentationPage('foo', ['navigation.label' => 'foo']),
             new DocumentationPage('bar', ['navigation.label' => 'Foo']),
+            new DocumentationPage('baz', ['navigation.label' => 'FOO']),
         ]);
     }
 

From 2ca0ec6b6917639ca5ff70fba093683595255974 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 18 Feb 2024 19:04:07 +0100
Subject: [PATCH 0286/1422] Remove unused test helpers

---
 .../AutomaticNavigationConfigurationsTest.php        | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index fe8ffd13a65..d4e6df9af5b 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -1049,18 +1049,6 @@ public function getState(int $index): ?TestNavItem
         return $this->state()[$index] ?? null;
     }
 
-    /** @noinspection PhpUnused, PhpNoReturnAttributeCanBeAddedInspection */
-    public function dd(): void
-    {
-        dd($this->items);
-    }
-
-    /** @noinspection PhpUnused, PhpNoReturnAttributeCanBeAddedInspection */
-    public function ddState(): void
-    {
-        dd($this->state());
-    }
-
     /**
      * @param  array  $expected  The expected state format
      * @param  bool  $strict  If false, missing array keys are ignored

From b0a7e94dd14518eb78fff27a85960723c9fb337a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 18 Feb 2024 20:00:40 +0100
Subject: [PATCH 0287/1422] Add todo

---
 .../Features/Navigation/GeneratesDocumentationSidebarMenu.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index 9b254c75e31..cc9b9e25488 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -61,7 +61,7 @@ protected function removeDuplicateItems(): void
     {
         $this->items = $this->items->unique(function (NavItem $item): string {
             // Filter using a combination of the group and label to allow duplicate labels in different groups
-            return $item->getGroup().Str::slug($item->getLabel());
+            return $item->getGroup().Str::slug($item->getLabel()); // Todo we could use this as the "identifier" for the item, as it uniquely identifies it
         });
     }
 

From b773f12ab653267108c10678f9ee0d4f47b380f5 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 18 Feb 2024 21:05:29 +0100
Subject: [PATCH 0288/1422] Add testing helper

---
 .../Feature/AutomaticNavigationConfigurationsTest.php      | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index d4e6df9af5b..c866603b2ee 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -11,6 +11,7 @@
 use Hyde\Pages\MarkdownPost;
 use Hyde\Pages\InMemoryPage;
 use Hyde\Foundation\HydeKernel;
+use JetBrains\PhpStorm\NoReturn;
 use Hyde\Pages\Concerns\HydePage;
 use Hyde\Pages\DocumentationPage;
 use Hyde\Support\Models\Redirect;
@@ -975,6 +976,12 @@ protected function assertMenuEquals(array $expected, array $menuPages): void
         $this->menu($menuPages)->assertEquals($expected);
     }
 
+    #[NoReturn]
+    protected function ddMenu(?array $menuPages = null): void
+    {
+        dd($this->menu($menuPages)->state());
+    }
+
     protected function menu(?array $withPages = null): AssertableNavigationMenu
     {
         if ($withPages) {

From f03eb689f862900f32d58a55e6762c6ceaca6ccc Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 18 Feb 2024 21:05:58 +0100
Subject: [PATCH 0289/1422] Assert on the new state

---
 .../tests/Feature/AutomaticNavigationConfigurationsTest.php   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index c866603b2ee..f42c61c8d3a 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -448,8 +448,8 @@ public function testPagesInSubdirectoriesAreAddedAsDropdownsWhenNavigationSubdir
         config(['hyde.navigation.subdirectories' => 'dropdown']);
 
         $this->assertMenuEquals([
-            ['Foo', 'Bar', 'Baz'],
-            // TODO: New state will be ['label' => 'About', 'children' => ['Foo', 'Bar', 'Baz']],
+            ['label' => 'about', 'children' => ['Foo', 'Bar', 'Baz']],
+            // TODO: Label should be About
         ], [
             new MarkdownPage('about/foo'),
             new MarkdownPage('about/bar'),

From 66a4b903988297f58e0cfcd7ed8ba02d95b3c40a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 18 Feb 2024 21:19:15 +0100
Subject: [PATCH 0290/1422] Update testing helper

---
 .../tests/Feature/AutomaticNavigationConfigurationsTest.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index f42c61c8d3a..971dfd11f9c 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -977,8 +977,12 @@ protected function assertMenuEquals(array $expected, array $menuPages): void
     }
 
     #[NoReturn]
-    protected function ddMenu(?array $menuPages = null): void
+    protected function ddMenu(?array $menuPages = null, ?string $menu = 'menu'): void
     {
+        if ($menu === 'sidebar') {
+            dd($this->sidebar($menuPages)->state());
+        }
+
         dd($this->menu($menuPages)->state());
     }
 

From 74c9fd0b70310557af36ec3d1ee468f344004073 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 18 Feb 2024 21:24:44 +0100
Subject: [PATCH 0291/1422] Push group as null

---
 .../Features/Navigation/GeneratesDocumentationSidebarMenu.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index cc9b9e25488..1275944aebf 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -48,7 +48,7 @@ protected function generate(): void
 
         // If there are no pages other than the index page, we add it to the sidebar so that it's not empty
         if ($this->items->count() === 0 && DocumentationPage::home() !== null) {
-            $this->items->push(NavItem::fromRoute(DocumentationPage::home(), group: 'other'));
+            $this->items->push(NavItem::fromRoute(DocumentationPage::home(), group: null));
         }
     }
 

From 1eb8a5aed8ee386e778fe0f450e4dd3c639dd07a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 18 Feb 2024 21:25:16 +0100
Subject: [PATCH 0292/1422] Compare against null

---
 .../Framework/Features/Navigation/DocumentationSidebar.php    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index eba36a0d3ac..7ac9725e22d 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -39,7 +39,7 @@ public static function create(): static
 
     public function hasGroups(): bool
     {
-        return (count($this->getGroups()) >= 1) && ($this->getGroups() !== ['other']);
+        return (count($this->getGroups()) >= 1) && ($this->getGroups() !== [null]);
     }
 
     /** @return array<string> */
@@ -89,7 +89,7 @@ private function isPageIndexPage(): bool
 
     private function shouldIndexPageBeActive(string $group): bool
     {
-        $indexPageHasNoSetGroup = Render::getPage()->navigationMenuGroup() === 'other';
+        $indexPageHasNoSetGroup = Render::getPage()->navigationMenuGroup() === null;
         $groupIsTheFirstOneInSidebar = $group === collect($this->getGroups())->first();
 
         return $indexPageHasNoSetGroup && $groupIsTheFirstOneInSidebar;

From 9ef346504686484aa5725c5e8c0918061a753590 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 18 Feb 2024 21:30:57 +0100
Subject: [PATCH 0293/1422] Compare against null

---
 .../framework/src/Framework/Factories/NavigationDataFactory.php | 2 +-
 packages/framework/tests/Feature/HydePageTest.php               | 2 +-
 .../framework/tests/Unit/Pages/DocumentationPageUnitTest.php    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/framework/src/Framework/Factories/NavigationDataFactory.php b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
index 51827a4d0a0..12f6267a6fc 100644
--- a/packages/framework/src/Framework/Factories/NavigationDataFactory.php
+++ b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
@@ -211,7 +211,7 @@ private function canUseSubdirectoryForGroups(): bool
     private function defaultGroup(): ?string
     {
         // TODO: It would be better if this was null in all cases, considering 'other' is used a a sort of confusing pseudo-null
-        return $this->isInstanceOf(DocumentationPage::class) ? 'other' : null;
+        return $this->isInstanceOf(DocumentationPage::class) ? null : null;
     }
 
     private function pageIsInSubdirectory(): bool
diff --git a/packages/framework/tests/Feature/HydePageTest.php b/packages/framework/tests/Feature/HydePageTest.php
index dde95fffb96..4e545c1a9d6 100644
--- a/packages/framework/tests/Feature/HydePageTest.php
+++ b/packages/framework/tests/Feature/HydePageTest.php
@@ -239,7 +239,7 @@ public function testNavigationMenuGroup()
         $this->assertNull((new MarkdownPage())->navigationMenuGroup());
         $this->assertNull((new MarkdownPost())->navigationMenuGroup());
         $this->assertNull((new HtmlPage())->navigationMenuGroup());
-        $this->assertSame('other', (new DocumentationPage())->navigationMenuGroup());
+        $this->assertSame(null, (new DocumentationPage())->navigationMenuGroup());
         $this->assertSame('foo', DocumentationPage::make(matter: ['navigation' => ['group' => 'foo']])->navigationMenuGroup());
     }
 
diff --git a/packages/framework/tests/Unit/Pages/DocumentationPageUnitTest.php b/packages/framework/tests/Unit/Pages/DocumentationPageUnitTest.php
index 2ef2ae376ed..f24ded96215 100644
--- a/packages/framework/tests/Unit/Pages/DocumentationPageUnitTest.php
+++ b/packages/framework/tests/Unit/Pages/DocumentationPageUnitTest.php
@@ -98,7 +98,7 @@ public function testNavigationMenuLabel()
 
     public function testNavigationMenuGroup()
     {
-        $this->assertSame('other', (new DocumentationPage('foo'))->navigationMenuGroup());
+        $this->assertSame(null, (new DocumentationPage('foo'))->navigationMenuGroup());
     }
 
     public function testNavigationMenuGroupWithData()

From 8b66dd025c5b268fbe37479c45032934016f217e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 18 Feb 2024 21:35:02 +0100
Subject: [PATCH 0294/1422] Expect null

---
 packages/framework/tests/Unit/HydePageSerializableUnitTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/tests/Unit/HydePageSerializableUnitTest.php b/packages/framework/tests/Unit/HydePageSerializableUnitTest.php
index 9462f29728c..149e184dee6 100644
--- a/packages/framework/tests/Unit/HydePageSerializableUnitTest.php
+++ b/packages/framework/tests/Unit/HydePageSerializableUnitTest.php
@@ -347,7 +347,7 @@ public function testJsonSerializedDocumentationPageContents()
                     "label": "",
                     "priority": 999,
                     "hidden": false,
-                    "group": "other"
+                    "group": null
                 },
                 "title": ""
             }

From 8cd042487ef22371cca574f9a6f147d1784bae3e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 18 Feb 2024 21:33:37 +0100
Subject: [PATCH 0295/1422] Allow nullable return

---
 .../src/Framework/Features/Navigation/DocumentationSidebar.php  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 7ac9725e22d..06f8e12286a 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -45,7 +45,7 @@ public function hasGroups(): bool
     /** @return array<string> */
     public function getGroups(): array
     {
-        return $this->items->map(function (NavItem $item): string {
+        return $this->items->map(function (NavItem $item): ?string {
             return $item->getGroup();
         })->unique()->toArray();
     }

From 4dca8c5fc75cf85413385890429a75efd07d2f54 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 18 Feb 2024 21:47:38 +0100
Subject: [PATCH 0296/1422] Test sidebar with mixed grouped and ungrouped items

---
 .../tests/Feature/SidebarViewTest.php         | 25 +++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/packages/framework/tests/Feature/SidebarViewTest.php b/packages/framework/tests/Feature/SidebarViewTest.php
index 44840e6440e..2dcd7646d91 100644
--- a/packages/framework/tests/Feature/SidebarViewTest.php
+++ b/packages/framework/tests/Feature/SidebarViewTest.php
@@ -169,6 +169,31 @@ public function testSidebarWithNonCollapsibleGroupedItems()
         $this->assertViewWasNotRendered(view('hyde::components.docs.sidebar-group-toggle-button'));
     }
 
+    public function testSidebarWithMixedGroupedAndUngroupedItems()
+    {
+        $this->mockRoute();
+        $this->mockPage();
+        $this->file('_docs/index.md');
+        $this->markdown('_docs/first.md', matter: ['navigation.group' => 'Group 1']);
+        $this->markdown('_docs/second.md');
+
+        $this->renderComponent(view('hyde::components.docs.sidebar'))
+            ->assertSeeText('Group 1')
+            ->assertSeeText('First')
+            ->assertSeeText('Other')
+            ->assertSeeText('Second')
+            ->assertSeeHtml('href="docs/first.html"')
+            ->assertSeeHtml('href="docs/second.html"')
+            ->allGood();
+
+        $this->assertViewWasRendered(view('hyde::components.docs.sidebar-items', [
+            'sidebar' => DocumentationSidebar::create(),
+            'grouped' => true,
+        ]));
+
+        $this->assertViewWasRendered(view('hyde::components.docs.sidebar-group-toggle-button'));
+    }
+
     protected function renderComponent(View $view): self
     {
         try {

From deb0e57cb18eafc8610753ec517e0bd0cf50c81e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 18 Feb 2024 21:50:00 +0100
Subject: [PATCH 0297/1422] Allow null group in parameter

---
 .../src/Framework/Features/Navigation/DocumentationSidebar.php  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 06f8e12286a..5cd4893cb34 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -64,7 +64,7 @@ public function getItemsInGroup(?string $group): Collection
      *
      * For index pages, this will also return true for the first group in the menu, unless the index page has a specific group set.
      */
-    public function isGroupActive(string $group): bool
+    public function isGroupActive(?string $group): bool
     {
         $groupMatchesCurrentPageGroup = Str::slug(Render::getPage()->navigationMenuGroup()) === $group;
         $currentPageIsIndexPageAndShouldBeActive = $this->isPageIndexPage() && $this->shouldIndexPageBeActive($group);

From 66d250b72b21c9064786693017da4b05ee29788d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 18 Feb 2024 21:50:15 +0100
Subject: [PATCH 0298/1422] Return false if group is null

---
 .../Framework/Features/Navigation/DocumentationSidebar.php    | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 5cd4893cb34..13fdfd4469b 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -66,6 +66,10 @@ public function getItemsInGroup(?string $group): Collection
      */
     public function isGroupActive(?string $group): bool
     {
+        if ($group === null) {
+            return false;
+        }
+
         $groupMatchesCurrentPageGroup = Str::slug(Render::getPage()->navigationMenuGroup()) === $group;
         $currentPageIsIndexPageAndShouldBeActive = $this->isPageIndexPage() && $this->shouldIndexPageBeActive($group);
 

From 67422aee238d1a0bd4ae3bbbe3c5e4744d0911fa Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 18 Feb 2024 21:50:59 +0100
Subject: [PATCH 0299/1422] Null coalesce to other when making group title

---
 .../Framework/Features/Navigation/DocumentationSidebar.php    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 13fdfd4469b..596b1aba075 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -81,9 +81,9 @@ public function isGroupActive(?string $group): bool
      *
      * @todo Get title from instance
      */
-    public function makeGroupTitle(string $group): string
+    public function makeGroupTitle(?string $group): string
     {
-        return Config::getNullableString("docs.sidebar_group_labels.$group") ?? Hyde::makeTitle($group);
+        return Config::getNullableString("docs.sidebar_group_labels.$group") ?? Hyde::makeTitle($group ?? 'Other');
     }
 
     private function isPageIndexPage(): bool

From 960415b72ef6991292190ef4ba93dc5959459c46 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 18 Feb 2024 21:54:56 +0100
Subject: [PATCH 0300/1422] Remove resolved todo

---
 .../framework/src/Framework/Factories/NavigationDataFactory.php  | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/framework/src/Framework/Factories/NavigationDataFactory.php b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
index 12f6267a6fc..2eaede36b70 100644
--- a/packages/framework/src/Framework/Factories/NavigationDataFactory.php
+++ b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
@@ -210,7 +210,6 @@ private function canUseSubdirectoryForGroups(): bool
 
     private function defaultGroup(): ?string
     {
-        // TODO: It would be better if this was null in all cases, considering 'other' is used a a sort of confusing pseudo-null
         return $this->isInstanceOf(DocumentationPage::class) ? null : null;
     }
 

From db4166b9bd6040bd0d35c4f3e3df19a3b8891dac Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 18 Feb 2024 21:55:43 +0100
Subject: [PATCH 0301/1422] Evaluate conditional with same operands

---
 .../framework/src/Framework/Factories/NavigationDataFactory.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Factories/NavigationDataFactory.php b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
index 2eaede36b70..1bedb99c117 100644
--- a/packages/framework/src/Framework/Factories/NavigationDataFactory.php
+++ b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
@@ -210,7 +210,7 @@ private function canUseSubdirectoryForGroups(): bool
 
     private function defaultGroup(): ?string
     {
-        return $this->isInstanceOf(DocumentationPage::class) ? null : null;
+        return null;
     }
 
     private function pageIsInSubdirectory(): bool

From 03ce8261dad7083672e6999a47587d31718a38aa Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 18 Feb 2024 21:55:58 +0100
Subject: [PATCH 0302/1422] Inline constant private helper method

---
 .../src/Framework/Factories/NavigationDataFactory.php      | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/packages/framework/src/Framework/Factories/NavigationDataFactory.php b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
index 1bedb99c117..26c230cdada 100644
--- a/packages/framework/src/Framework/Factories/NavigationDataFactory.php
+++ b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
@@ -84,7 +84,7 @@ protected function makeGroup(): ?string
             return $this->getSubdirectoryName();
         }
 
-        return $this->searchForGroupInFrontMatter() ?? $this->defaultGroup();
+        return $this->searchForGroupInFrontMatter() ?? null;
     }
 
     protected function makeHidden(): bool
@@ -208,11 +208,6 @@ private function canUseSubdirectoryForGroups(): bool
             || $this->isInstanceOf(DocumentationPage::class);
     }
 
-    private function defaultGroup(): ?string
-    {
-        return null;
-    }
-
     private function pageIsInSubdirectory(): bool
     {
         return Str::contains($this->identifier, '/');

From 4be1a4550837702952a83166711f9bee41728aaa Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 18 Feb 2024 21:56:09 +0100
Subject: [PATCH 0303/1422] Remove unnecessary null coalesce to null

---
 .../framework/src/Framework/Factories/NavigationDataFactory.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Factories/NavigationDataFactory.php b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
index 26c230cdada..0fb46e79da2 100644
--- a/packages/framework/src/Framework/Factories/NavigationDataFactory.php
+++ b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
@@ -84,7 +84,7 @@ protected function makeGroup(): ?string
             return $this->getSubdirectoryName();
         }
 
-        return $this->searchForGroupInFrontMatter() ?? null;
+        return $this->searchForGroupInFrontMatter();
     }
 
     protected function makeHidden(): bool

From 3ce096794b831e348b3dcec0bd0a4f077d667bc8 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 18 Feb 2024 21:57:46 +0100
Subject: [PATCH 0304/1422] Use null assertion helper helper

---
 packages/framework/tests/Feature/HydePageTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/tests/Feature/HydePageTest.php b/packages/framework/tests/Feature/HydePageTest.php
index 4e545c1a9d6..158e06e56c6 100644
--- a/packages/framework/tests/Feature/HydePageTest.php
+++ b/packages/framework/tests/Feature/HydePageTest.php
@@ -239,7 +239,7 @@ public function testNavigationMenuGroup()
         $this->assertNull((new MarkdownPage())->navigationMenuGroup());
         $this->assertNull((new MarkdownPost())->navigationMenuGroup());
         $this->assertNull((new HtmlPage())->navigationMenuGroup());
-        $this->assertSame(null, (new DocumentationPage())->navigationMenuGroup());
+        $this->assertNull((new DocumentationPage())->navigationMenuGroup());
         $this->assertSame('foo', DocumentationPage::make(matter: ['navigation' => ['group' => 'foo']])->navigationMenuGroup());
     }
 

From 89f32fb98c34041fe2345aca4a36c2225281a652 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 18 Feb 2024 22:05:25 +0100
Subject: [PATCH 0305/1422] Update navigation provider to register the sidebar
 generation

---
 .../src/Foundation/Providers/NavigationServiceProvider.php      | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php b/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php
index edb8ee9bf13..6b10ab8d13f 100644
--- a/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php
+++ b/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php
@@ -8,6 +8,7 @@
 use Illuminate\Support\ServiceProvider;
 use Hyde\Framework\Features\Navigation\NavigationManager;
 use Hyde\Framework\Features\Navigation\GeneratesMainNavigationMenu;
+use Hyde\Framework\Features\Navigation\GeneratesDocumentationSidebarMenu;
 
 class NavigationServiceProvider extends ServiceProvider
 {
@@ -21,6 +22,7 @@ public function register(): void
 
         $this->app->make(HydeKernel::class)->booted(function () {
             $this->app->make(NavigationManager::class)->registerMenu('main', GeneratesMainNavigationMenu::handle());
+            $this->app->make(NavigationManager::class)->registerMenu('sidebar', GeneratesDocumentationSidebarMenu::handle());
         });
     }
 }

From a63e293bb43bf880086e5fc4355914f223905b2d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 18 Feb 2024 22:08:24 +0100
Subject: [PATCH 0306/1422] Update DocumentationSidebar class to extend
 NavigationMenu

---
 .../src/Framework/Features/Navigation/DocumentationSidebar.php  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 596b1aba075..f62493b6164 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -15,7 +15,7 @@
 use function collect;
 
 /** @deprecated Use the new NavigationMenu class instead */
-class DocumentationSidebar
+class DocumentationSidebar extends NavigationMenu
 {
     /** @var \Illuminate\Support\Collection<string, \Hyde\Framework\Features\Navigation\NavItem> */
     protected Collection $items;

From a5f8378cb059ac3f6057ea069ea6e251fb92dbc2 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 10:14:59 +0100
Subject: [PATCH 0307/1422] Use constructor from parent

---
 .../Framework/Features/Navigation/DocumentationSidebar.php  | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index f62493b6164..d899d4acf38 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -10,7 +10,6 @@
 use Hyde\Support\Facades\Render;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Str;
-use Illuminate\Contracts\Support\Arrayable;
 
 use function collect;
 
@@ -20,11 +19,6 @@ class DocumentationSidebar extends NavigationMenu
     /** @var \Illuminate\Support\Collection<string, \Hyde\Framework\Features\Navigation\NavItem> */
     protected Collection $items;
 
-    public function __construct(Arrayable|array $items = [])
-    {
-        $this->items = new Collection($items);
-    }
-
     /** @return \Illuminate\Support\Collection<\Hyde\Framework\Features\Navigation\NavItem> */
     public function getItems(): Collection
     {

From 5bd62d529c45948b8c7337ef3c5a8c991803dc46 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 10:19:50 +0100
Subject: [PATCH 0308/1422] Update sidebar component to get menu from container

---
 .../framework/resources/views/components/docs/sidebar.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/resources/views/components/docs/sidebar.blade.php b/packages/framework/resources/views/components/docs/sidebar.blade.php
index 04b9857a1d5..f4f3d9c2cb3 100644
--- a/packages/framework/resources/views/components/docs/sidebar.blade.php
+++ b/packages/framework/resources/views/components/docs/sidebar.blade.php
@@ -4,7 +4,7 @@
     </header>
     <nav id="sidebar-navigation" class="p-2 overflow-y-auto border-y border-gray-300 dark:border-[#1b2533] h-full">
         @include('hyde::components.docs.sidebar-items', [
-            'sidebar' => \Hyde\Framework\Features\Navigation\DocumentationSidebar::create(),
+            'sidebar' => app('navigation')->getMenu('sidebar'),
         ])
     </nav>
     @if(config('docs.sidebar.footer', true) !== false)

From daf092af323cf0146c606c2c27d3b3f7e9ed4cf3 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 10:23:01 +0100
Subject: [PATCH 0309/1422] Get items from the parent method

---
 .../Framework/Features/Navigation/DocumentationSidebar.php  | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index d899d4acf38..b5b1fb74e1e 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -19,12 +19,6 @@ class DocumentationSidebar extends NavigationMenu
     /** @var \Illuminate\Support\Collection<string, \Hyde\Framework\Features\Navigation\NavItem> */
     protected Collection $items;
 
-    /** @return \Illuminate\Support\Collection<\Hyde\Framework\Features\Navigation\NavItem> */
-    public function getItems(): Collection
-    {
-        return $this->items->values();
-    }
-
     /** @deprecated Will be moved to an action */
     public static function create(): static
     {

From 9765785bc12ca80169888b8403a63a791fa3540b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 10:33:58 +0100
Subject: [PATCH 0310/1422] Expand on method description

---
 .../src/Framework/Features/Navigation/DocumentationSidebar.php  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index b5b1fb74e1e..d6faae266f4 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -48,7 +48,7 @@ public function getItemsInGroup(?string $group): Collection
     }
 
     /**
-     * Is a page within the group the current page?
+     * Is a page within the group the current page? This is used to determine if the sidebar group should be open when loading the page.
      *
      * For index pages, this will also return true for the first group in the menu, unless the index page has a specific group set.
      */

From c05b8b3a1f6ad97f0115b91e7b8dd15e4acc4e5b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 11:37:44 +0100
Subject: [PATCH 0311/1422] Simplify conditional

---
 .../src/Framework/Features/Navigation/DocumentationSidebar.php  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index d6faae266f4..e0346aacc8c 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -27,7 +27,7 @@ public static function create(): static
 
     public function hasGroups(): bool
     {
-        return (count($this->getGroups()) >= 1) && ($this->getGroups() !== [null]);
+        return (! empty($this->getGroups())) && ($this->getGroups() !== [null]);
     }
 
     /** @return array<string> */

From f16ed77c9d8ecb40e501285d4bc12002d379c829 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 11:42:06 +0100
Subject: [PATCH 0312/1422] Rename factory helper method to be more clear

---
 .../Features/Navigation/GeneratesMainNavigationMenu.php       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index a6edfdafa83..dcc88fe5878 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -54,7 +54,7 @@ protected function generate(): void
             $this->items->push($item);
         });
 
-        if ($this->dropdownsEnabled()) {
+        if ($this->useSubdirectoriesAsDropdowns()) {
             $this->moveGroupedItemsIntoDropdowns();
         }
     }
@@ -89,7 +89,7 @@ protected function canAddItemToDropdown(NavItem $item): bool
         return $item->getGroup() !== null;
     }
 
-    protected function dropdownsEnabled(): bool
+    protected function useSubdirectoriesAsDropdowns(): bool
     {
         return Config::getString('hyde.navigation.subdirectories', 'hidden') === 'dropdown';
     }

From aebee358014fa628ffbe6140d4f801f64232985e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 11:42:27 +0100
Subject: [PATCH 0313/1422] Remove redundant argument

---
 .../Features/Navigation/GeneratesDocumentationSidebarMenu.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index 1275944aebf..dd017b21772 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -48,7 +48,7 @@ protected function generate(): void
 
         // If there are no pages other than the index page, we add it to the sidebar so that it's not empty
         if ($this->items->count() === 0 && DocumentationPage::home() !== null) {
-            $this->items->push(NavItem::fromRoute(DocumentationPage::home(), group: null));
+            $this->items->push(NavItem::fromRoute(DocumentationPage::home()));
         }
     }
 

From 896f8e19d0b6431694ae701d7fe6894e580dfc8b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 11:45:47 +0100
Subject: [PATCH 0314/1422] Introduce local variable for loop routes

---
 .../Features/Navigation/GeneratesDocumentationSidebarMenu.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index dd017b21772..70eca4faef0 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -40,7 +40,9 @@ public static function handle(): DocumentationSidebar
 
     protected function generate(): void
     {
-        Routes::getRoutes(DocumentationPage::class)->each(function (Route $route): void {
+        $routes = Routes::getRoutes(DocumentationPage::class);
+
+        $routes->each(function (Route $route): void {
             if ($this->canAddRoute($route)) {
                 $this->items->put($route->getRouteKey(), NavItem::fromRoute($route));
             }

From b577ccc3f46b137cd09f1b9eaf170b13bdbe2bb4 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 11:50:17 +0100
Subject: [PATCH 0315/1422] Add helper to prefind sidebar groups

---
 .../GeneratesDocumentationSidebarMenu.php       | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index 70eca4faef0..7c16e7b6f1c 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -9,6 +9,7 @@
 use Hyde\Pages\DocumentationPage;
 use Illuminate\Support\Collection;
 use Hyde\Foundation\Facades\Routes;
+use Hyde\Foundation\Kernel\RouteCollection;
 
 /**
  * @experimental This class may change significantly before its release.
@@ -54,6 +55,22 @@ protected function generate(): void
         }
     }
 
+    protected function findSidebarGroups(RouteCollection $routes): array
+    {
+        // In order to know if we should use groups in the sidebar,
+        // we need to loop through all the pages and see if they have a group set
+
+        $groups = [];
+
+        $routes->each(function (Route $route) use (&$groups): void {
+            if ($route->getPage()->data('navigation.group')) {
+                $groups[Str::slug($route->getPage()->data('navigation.group'))] = true;
+            }
+        });
+
+        return array_keys($groups);
+    }
+
     protected function canAddRoute(Route $route): bool
     {
         return $route->getPage()->showInNavigation() && ! $route->is(DocumentationPage::homeRouteName());

From f41a5450897c70748c38591c0a1f7018a539ce2a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 11:51:18 +0100
Subject: [PATCH 0316/1422] Add todo

---
 .../src/Framework/Features/Navigation/DocumentationSidebar.php  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index e0346aacc8c..1e639981876 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -27,6 +27,8 @@ public static function create(): static
 
     public function hasGroups(): bool
     {
+        // Todo check if any items have children
+
         return (! empty($this->getGroups())) && ($this->getGroups() !== [null]);
     }
 

From 2d160af61c566b8a5d3fb00950865d7b455b23c5 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 11:51:41 +0100
Subject: [PATCH 0317/1422] Deprecate group accessor

---
 .../Framework/Features/Navigation/DocumentationSidebar.php  | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 1e639981876..d87bcbd2313 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -32,7 +32,11 @@ public function hasGroups(): bool
         return (! empty($this->getGroups())) && ($this->getGroups() !== [null]);
     }
 
-    /** @return array<string> */
+    /**
+     * @deprecated Use children instead
+     *
+     * @return array<string>
+     */
     public function getGroups(): array
     {
         return $this->items->map(function (NavItem $item): ?string {

From 7579dfdc6f1fb99173119963c21cfe904a7c04c3 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 12:08:01 +0100
Subject: [PATCH 0318/1422] Mark new method as experimental

---
 .../Features/Navigation/GeneratesDocumentationSidebarMenu.php    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index 7c16e7b6f1c..cc7a7d832e4 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -55,6 +55,7 @@ protected function generate(): void
         }
     }
 
+    /** @experimental Might not actually be needed now that groups default to null */
     protected function findSidebarGroups(RouteCollection $routes): array
     {
         // In order to know if we should use groups in the sidebar,

From c6a0e406d6ad14299ef4ae147300acb0ec0ec097 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 12:08:15 +0100
Subject: [PATCH 0319/1422] Find the sidebar groups

---
 .../Features/Navigation/GeneratesDocumentationSidebarMenu.php   | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index cc7a7d832e4..e54bfd93570 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -43,6 +43,8 @@ protected function generate(): void
     {
         $routes = Routes::getRoutes(DocumentationPage::class);
 
+        $groups = $this->findSidebarGroups($routes);
+
         $routes->each(function (Route $route): void {
             if ($this->canAddRoute($route)) {
                 $this->items->put($route->getRouteKey(), NavItem::fromRoute($route));

From f4e21dfee8393d6077bdc8f7aa33ae5347c2adea Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 12:09:09 +0100
Subject: [PATCH 0320/1422] Introduce local variable

---
 .../Features/Navigation/GeneratesDocumentationSidebarMenu.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index e54bfd93570..55fd915ff38 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -47,7 +47,9 @@ protected function generate(): void
 
         $routes->each(function (Route $route): void {
             if ($this->canAddRoute($route)) {
-                $this->items->put($route->getRouteKey(), NavItem::fromRoute($route));
+                $item = NavItem::fromRoute($route);
+
+                $this->items->put($route->getRouteKey(), $item);
             }
         });
 

From a06508435b46f7fe036817fd42179630318e8b0a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 12:10:17 +0100
Subject: [PATCH 0321/1422] Add groups to closure use construct

---
 .../Features/Navigation/GeneratesDocumentationSidebarMenu.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index 55fd915ff38..ddf00b8e159 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -45,7 +45,7 @@ protected function generate(): void
 
         $groups = $this->findSidebarGroups($routes);
 
-        $routes->each(function (Route $route): void {
+        $routes->each(function (Route $route) use ($groups): void {
             if ($this->canAddRoute($route)) {
                 $item = NavItem::fromRoute($route);
 

From 6d780915edafc73ad71bd7168b78753e3d38129d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 12:11:03 +0100
Subject: [PATCH 0322/1422] Get the item group

---
 .../Features/Navigation/GeneratesDocumentationSidebarMenu.php    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index ddf00b8e159..1d4d7130dee 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -48,6 +48,7 @@ protected function generate(): void
         $routes->each(function (Route $route) use ($groups): void {
             if ($this->canAddRoute($route)) {
                 $item = NavItem::fromRoute($route);
+                $group = $item->getGroup();
 
                 $this->items->put($route->getRouteKey(), $item);
             }

From bf8abd8c1caef9d180347c0bf7b31a2af099c5bc Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 12:11:19 +0100
Subject: [PATCH 0323/1422] Check for group state

---
 .../Features/Navigation/GeneratesDocumentationSidebarMenu.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index 1d4d7130dee..fcb2d850eba 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -50,6 +50,10 @@ protected function generate(): void
                 $item = NavItem::fromRoute($route);
                 $group = $item->getGroup();
 
+                if ($groups && $group === null) {
+                    // Todo: Add item
+                }
+
                 $this->items->put($route->getRouteKey(), $item);
             }
         });

From afa61fd1bfc7541330225e31b10e28f44edcd52f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 12:13:21 +0100
Subject: [PATCH 0324/1422] Add navigation item identifier property

---
 .../framework/src/Framework/Features/Navigation/NavItem.php     | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index ce0f247ed48..80f32711fed 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -30,6 +30,8 @@ class NavItem implements Stringable
     public readonly int $priority;
     public readonly ?string $group;
 
+    public readonly string $identifier;
+
     /** @var array<\Hyde\Framework\Features\Navigation\NavItem> */
     public readonly array $children;
 

From 9e016e8206e2c9d669d00a30ee29c680a66b6df2 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 12:15:23 +0100
Subject: [PATCH 0325/1422] Set identifier to route key

---
 packages/framework/src/Framework/Features/Navigation/NavItem.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 80f32711fed..396092a9690 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -48,6 +48,7 @@ public function __construct(Route|string $destination, string $label, int $prior
         $this->label = $label;
         $this->priority = $priority;
         $this->group = static::normalizeGroupKey($group);
+        $this->identifier = $destination->getRouteKey();
         $this->children = $children;
     }
 

From 406cd50f9a0d765d15423a25296b058c1b369ed5 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 12:16:33 +0100
Subject: [PATCH 0326/1422] Coerce falsy route keys to label slug

---
 .../framework/src/Framework/Features/Navigation/NavItem.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 396092a9690..5ba78965564 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -48,7 +48,7 @@ public function __construct(Route|string $destination, string $label, int $prior
         $this->label = $label;
         $this->priority = $priority;
         $this->group = static::normalizeGroupKey($group);
-        $this->identifier = $destination->getRouteKey();
+        $this->identifier = $destination->getRouteKey() ?: Str::slug($label);
         $this->children = $children;
     }
 

From 82f59e883b310691c0e26a82fed2726a57a7c6d5 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 12:17:44 +0100
Subject: [PATCH 0327/1422] Replace '?:' with if

---
 .../framework/src/Framework/Features/Navigation/NavItem.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 5ba78965564..8c6aee51ee5 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -48,7 +48,11 @@ public function __construct(Route|string $destination, string $label, int $prior
         $this->label = $label;
         $this->priority = $priority;
         $this->group = static::normalizeGroupKey($group);
-        $this->identifier = $destination->getRouteKey() ?: Str::slug($label);
+        if ($destination->getRouteKey()) {
+            $this->identifier = $destination->getRouteKey();
+        } else {
+            $this->identifier = Str::slug($label);
+        }
         $this->children = $children;
     }
 

From d8a97d915ea9ae51bc3508e5b81cf1d5473315d5 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 12:18:23 +0100
Subject: [PATCH 0328/1422] Add type check

---
 .../framework/src/Framework/Features/Navigation/NavItem.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 8c6aee51ee5..aa0b504d5bc 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -48,7 +48,7 @@ public function __construct(Route|string $destination, string $label, int $prior
         $this->label = $label;
         $this->priority = $priority;
         $this->group = static::normalizeGroupKey($group);
-        if ($destination->getRouteKey()) {
+        if (! $destination instanceof ExternalRoute && $destination->getRouteKey()) {
             $this->identifier = $destination->getRouteKey();
         } else {
             $this->identifier = Str::slug($label);

From fd20252088fb31a23992e4d75663173e6f527f07 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 12:20:06 +0100
Subject: [PATCH 0329/1422] Extract helper method

---
 .../Framework/Features/Navigation/NavItem.php   | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index aa0b504d5bc..2a5e2249565 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -48,11 +48,7 @@ public function __construct(Route|string $destination, string $label, int $prior
         $this->label = $label;
         $this->priority = $priority;
         $this->group = static::normalizeGroupKey($group);
-        if (! $destination instanceof ExternalRoute && $destination->getRouteKey()) {
-            $this->identifier = $destination->getRouteKey();
-        } else {
-            $this->identifier = Str::slug($label);
-        }
+        $this->identifier = $this->makeIdentifier($destination, $label);
         $this->children = $children;
     }
 
@@ -197,4 +193,15 @@ protected static function searchForDropdownPriorityInNavigationConfig(string $gr
 
         return $config[$groupKey] ?? null;
     }
+
+    protected static function makeIdentifier(Route|ExternalRoute $destination, string $label): string
+    {
+        if (! $destination instanceof ExternalRoute && $destination->getRouteKey()) {
+            $identifier = $destination->getRouteKey();
+        } else {
+            $identifier = Str::slug($label);
+        }
+
+        return $identifier;
+    }
 }

From 06d3fdfa3c9279c30fed3d2d49454c7c9b086803 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 12:21:56 +0100
Subject: [PATCH 0330/1422] Remove already evaluated union type

Right hand is inherited by left hand parent
---
 .../framework/src/Framework/Features/Navigation/NavItem.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 2a5e2249565..d6169ebc322 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -194,7 +194,7 @@ protected static function searchForDropdownPriorityInNavigationConfig(string $gr
         return $config[$groupKey] ?? null;
     }
 
-    protected static function makeIdentifier(Route|ExternalRoute $destination, string $label): string
+    protected static function makeIdentifier(Route $destination, string $label): string
     {
         if (! $destination instanceof ExternalRoute && $destination->getRouteKey()) {
             $identifier = $destination->getRouteKey();

From aac2e9c95e470e698f284bc55c0406c552ef8220 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 12:24:31 +0100
Subject: [PATCH 0331/1422] Move up helper method

---
 .../Framework/Features/Navigation/NavItem.php | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index d6169ebc322..583632d07b2 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -182,6 +182,17 @@ protected static function normalizeGroupKey(?string $group): ?string
         return $group ? Str::slug($group) : null;
     }
 
+    protected static function makeIdentifier(Route $destination, string $label): string
+    {
+        if (! $destination instanceof ExternalRoute && $destination->getRouteKey()) {
+            $identifier = $destination->getRouteKey();
+        } else {
+            $identifier = Str::slug($label);
+        }
+
+        return $identifier;
+    }
+
     protected static function searchForDropdownPriorityInNavigationConfig(string $groupKey): ?int
     {
         /** @var array<string, int> $config */
@@ -193,15 +204,4 @@ protected static function searchForDropdownPriorityInNavigationConfig(string $gr
 
         return $config[$groupKey] ?? null;
     }
-
-    protected static function makeIdentifier(Route $destination, string $label): string
-    {
-        if (! $destination instanceof ExternalRoute && $destination->getRouteKey()) {
-            $identifier = $destination->getRouteKey();
-        } else {
-            $identifier = Str::slug($label);
-        }
-
-        return $identifier;
-    }
 }

From 4b803f01d2107684c054abb2bc7eca46a40d4c56 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 12:24:43 +0100
Subject: [PATCH 0332/1422] Refactor control flow

---
 .../framework/src/Framework/Features/Navigation/NavItem.php | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 583632d07b2..a675b9bd679 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -185,12 +185,10 @@ protected static function normalizeGroupKey(?string $group): ?string
     protected static function makeIdentifier(Route $destination, string $label): string
     {
         if (! $destination instanceof ExternalRoute && $destination->getRouteKey()) {
-            $identifier = $destination->getRouteKey();
+            return $destination->getRouteKey();
         } else {
-            $identifier = Str::slug($label);
+            return Str::slug($label);
         }
-
-        return $identifier;
     }
 
     protected static function searchForDropdownPriorityInNavigationConfig(string $groupKey): ?int

From a388822f38272dbf8c884cac22d03f245e9f1d3e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 12:25:09 +0100
Subject: [PATCH 0333/1422] Simplify if with ternary return

---
 .../src/Framework/Features/Navigation/NavItem.php         | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index a675b9bd679..6c125864430 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -184,11 +184,9 @@ protected static function normalizeGroupKey(?string $group): ?string
 
     protected static function makeIdentifier(Route $destination, string $label): string
     {
-        if (! $destination instanceof ExternalRoute && $destination->getRouteKey()) {
-            return $destination->getRouteKey();
-        } else {
-            return Str::slug($label);
-        }
+        return ! $destination instanceof ExternalRoute && $destination->getRouteKey()
+            ? $destination->getRouteKey()
+            : Str::slug($label);
     }
 
     protected static function searchForDropdownPriorityInNavigationConfig(string $groupKey): ?int

From 50afd828ddafb25ab4ed23a079d887bdacdc01a5 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 13:35:03 +0100
Subject: [PATCH 0334/1422] Add identifier tests

---
 packages/framework/tests/Unit/NavItemTest.php | 36 +++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/packages/framework/tests/Unit/NavItemTest.php b/packages/framework/tests/Unit/NavItemTest.php
index c3996365c55..56748364ee8 100644
--- a/packages/framework/tests/Unit/NavItemTest.php
+++ b/packages/framework/tests/Unit/NavItemTest.php
@@ -348,4 +348,40 @@ public function testGroupKeysAreNormalized()
         $item = new NavItem(new Route(new MarkdownPage()), 'Test', 500, 'Foo Bar');
         $this->assertSame('foo-bar', $item->getGroup());
     }
+
+    public function testIdentifier()
+    {
+        $route = new Route(new MarkdownPage());
+        $item = new NavItem($route, 'Test', 500);
+
+        $this->assertSame('test', $item->identifier);
+    }
+
+    public function testIdentifierWithCustomLabel()
+    {
+        $route = new Route(new MarkdownPage());
+        $item = new NavItem($route, 'Foo Bar', 500);
+
+        $this->assertSame('foo-bar', $item->identifier);
+    }
+
+    public function testIdentifierFromRouteKey()
+    {
+        $item = NavItem::fromRoute(Routes::get('index'));
+        $this->assertSame('index', $item->identifier);
+    }
+
+    public function testIdentifierUsesLabelWhenRouteKeyIsFalsy()
+    {
+        $route = new Route(new MarkdownPage());
+        $item = new NavItem($route, 'Foo Bar', 500);
+
+        $this->assertSame('foo-bar', $item->identifier);
+    }
+
+    public function testIdentifierUsesLabelForExternalRoute()
+    {
+        $item = NavItem::forLink('https://example.com', 'Foo Bar');
+        $this->assertSame('foo-bar', $item->identifier);
+    }
 }

From b94d684ff557887838723731db04ec4560c5c905 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 13:43:05 +0100
Subject: [PATCH 0335/1422] Document identifier property

---
 packages/framework/src/Framework/Features/Navigation/NavItem.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 6c125864430..e6226f87626 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -30,6 +30,7 @@ class NavItem implements Stringable
     public readonly int $priority;
     public readonly ?string $group;
 
+    /** The route key, or a "slugified" version of the label if the route has no key, for example external links and dropdowns items. */
     public readonly string $identifier;
 
     /** @var array<\Hyde\Framework\Features\Navigation\NavItem> */

From 06605a0b4fcfb70535026075eebdb1a1488ec9b1 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 13:43:37 +0100
Subject: [PATCH 0336/1422] Use the item identifier to determine uniqueness

---
 .../Features/Navigation/GeneratesDocumentationSidebarMenu.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index fcb2d850eba..8ca04be8895 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -89,8 +89,8 @@ protected function canAddRoute(Route $route): bool
     protected function removeDuplicateItems(): void
     {
         $this->items = $this->items->unique(function (NavItem $item): string {
-            // Filter using a combination of the group and label to allow duplicate labels in different groups
-            return $item->getGroup().Str::slug($item->getLabel()); // Todo we could use this as the "identifier" for the item, as it uniquely identifies it
+            // Filter using a combination of the group and identifier to allow duplicate labels in different groups
+            return $item->getGroup().$item->identifier;
         });
     }
 

From 6137a7df04a91107c4f55f8968dea2da26bdf89f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 13:46:00 +0100
Subject: [PATCH 0337/1422] Remove resolved todo

---
 packages/framework/src/Framework/Features/Navigation/NavItem.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index e6226f87626..622f2c9a712 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -16,7 +16,6 @@
  * Abstraction for a navigation menu item. Used by the MainNavigationMenu and DocumentationSidebar classes.
  *
  * @todo Consider splitting facade methods to actual facade class.
- * @todo Consider adding an "identifier" property to make it more visible how items are identified, for example when modifying sidebars in the config.
  *
  * You have a few options to construct a navigation menu item:
  *   1. You can supply a Route directly and explicit properties to the constructor

From 22979d4a6944882579d8dcd5a22f7fa84476628d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 13:50:23 +0100
Subject: [PATCH 0338/1422] Generate navigation item identifier solely on label

Originally added route keys so that page labels can be set in config and provide compatibility for that, but realized that that happens way earlier, so at this point we only need to sort against labels.
---
 .../src/Framework/Features/Navigation/NavItem.php      | 10 ++++------
 packages/framework/tests/Unit/NavItemTest.php          |  2 +-
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 622f2c9a712..e89d293efad 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -29,7 +29,7 @@ class NavItem implements Stringable
     public readonly int $priority;
     public readonly ?string $group;
 
-    /** The route key, or a "slugified" version of the label if the route has no key, for example external links and dropdowns items. */
+    /** The "slugified" version of the label. */
     public readonly string $identifier;
 
     /** @var array<\Hyde\Framework\Features\Navigation\NavItem> */
@@ -48,7 +48,7 @@ public function __construct(Route|string $destination, string $label, int $prior
         $this->label = $label;
         $this->priority = $priority;
         $this->group = static::normalizeGroupKey($group);
-        $this->identifier = $this->makeIdentifier($destination, $label);
+        $this->identifier = $this->makeIdentifier($label);
         $this->children = $children;
     }
 
@@ -182,11 +182,9 @@ protected static function normalizeGroupKey(?string $group): ?string
         return $group ? Str::slug($group) : null;
     }
 
-    protected static function makeIdentifier(Route $destination, string $label): string
+    protected static function makeIdentifier(string $label): string
     {
-        return ! $destination instanceof ExternalRoute && $destination->getRouteKey()
-            ? $destination->getRouteKey()
-            : Str::slug($label);
+        return Str::slug($label);
     }
 
     protected static function searchForDropdownPriorityInNavigationConfig(string $groupKey): ?int
diff --git a/packages/framework/tests/Unit/NavItemTest.php b/packages/framework/tests/Unit/NavItemTest.php
index 56748364ee8..71f6697fc7a 100644
--- a/packages/framework/tests/Unit/NavItemTest.php
+++ b/packages/framework/tests/Unit/NavItemTest.php
@@ -368,7 +368,7 @@ public function testIdentifierWithCustomLabel()
     public function testIdentifierFromRouteKey()
     {
         $item = NavItem::fromRoute(Routes::get('index'));
-        $this->assertSame('index', $item->identifier);
+        $this->assertSame('home', $item->identifier);
     }
 
     public function testIdentifierUsesLabelWhenRouteKeyIsFalsy()

From 1f149a435c6368658355dbaaa40b1b7005d4dee5 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 13:50:28 +0100
Subject: [PATCH 0339/1422] Add todo

---
 .../framework/src/Framework/Features/Navigation/NavItem.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index e89d293efad..a885d3eb9ad 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -184,7 +184,7 @@ protected static function normalizeGroupKey(?string $group): ?string
 
     protected static function makeIdentifier(string $label): string
     {
-        return Str::slug($label);
+        return Str::slug($label); // Todo: If it's a dropdown based on a subdirectory, we should use the subdirectory as the identifier
     }
 
     protected static function searchForDropdownPriorityInNavigationConfig(string $groupKey): ?int

From c8a145b1bbd831dd82613e5f3acc27da392337fb Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 13:54:21 +0100
Subject: [PATCH 0340/1422] Remove duplicate item filtering from navigation
 menu generator

---
 .../Navigation/GeneratesMainNavigationMenu.php        | 10 ----------
 .../Feature/AutomaticNavigationConfigurationsTest.php | 11 ++++++-----
 .../framework/tests/Feature/NavigationMenuTest.php    |  7 +++++--
 3 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index dcc88fe5878..de4e5af2503 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -5,7 +5,6 @@
 namespace Hyde\Framework\Features\Navigation;
 
 use Hyde\Facades\Config;
-use Illuminate\Support\Str;
 use Hyde\Support\Models\Route;
 use Hyde\Pages\DocumentationPage;
 use Illuminate\Support\Collection;
@@ -36,7 +35,6 @@ public static function handle(): NavigationMenu
 
         $menu->generate();
         $menu->sortByPriority();
-        $menu->removeDuplicateItems();
 
         return new NavigationMenu($menu->items);
     }
@@ -94,14 +92,6 @@ protected function useSubdirectoriesAsDropdowns(): bool
         return Config::getString('hyde.navigation.subdirectories', 'hidden') === 'dropdown';
     }
 
-    protected function removeDuplicateItems(): void
-    {
-        $this->items = $this->items->unique(function (NavItem $item): string {
-            // Filter using a combination of the group and label to allow duplicate labels in different groups
-            return $item->getGroup().Str::slug($item->getLabel());
-        });
-    }
-
     protected function sortByPriority(): void
     {
         $this->items = $this->items->sortBy('priority')->values();
diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 971dfd11f9c..fc10f0ec95f 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -457,28 +457,29 @@ public function testPagesInSubdirectoriesAreAddedAsDropdownsWhenNavigationSubdir
         ]);
     }
 
-    public function testMainNavigationMenuItemsWithTheSameLabelAreFiltered()
+    public function testMainNavigationMenuItemsWithTheSameLabelAreNotFilteredForDuplicates()
     {
+        // Since the route key is the same, only one route is actually added
         $this->assertMenuEquals(['Foo'], [
             new MarkdownPage('foo'),
             new MarkdownPage('foo'),
         ]);
 
-        $this->assertMenuEquals(['Foo'], [
+        $this->assertMenuEquals(['Foo', 'Foo'], [
             new MarkdownPage('foo', ['navigation.label' => 'Foo']),
             new MarkdownPage('bar', ['navigation.label' => 'Foo']),
         ]);
     }
 
-    public function testMainNavigationMenuItemsWithTheSameLabelAreFilteredCaseInsensitive()
+    public function testMainNavigationMenuItemsWithTheSameLabelAreNotFilteredForDuplicatesRegardlessOfCase()
     {
-        $this->assertMenuEquals(['Foo'], [
+        $this->assertMenuEquals(['Foo', 'Foo', 'FOO'], [
             new MarkdownPage('foo'),
             new MarkdownPage('Foo'),
             new MarkdownPage('FOO'),
         ]);
 
-        $this->assertMenuEquals(['foo'], [
+        $this->assertMenuEquals(['foo', 'Foo', 'FOO'], [
             new MarkdownPage('foo', ['navigation.label' => 'foo']),
             new MarkdownPage('bar', ['navigation.label' => 'Foo']),
             new MarkdownPage('baz', ['navigation.label' => 'FOO']),
diff --git a/packages/framework/tests/Feature/NavigationMenuTest.php b/packages/framework/tests/Feature/NavigationMenuTest.php
index 83c10b62dd5..e19f0039018 100644
--- a/packages/framework/tests/Feature/NavigationMenuTest.php
+++ b/packages/framework/tests/Feature/NavigationMenuTest.php
@@ -119,7 +119,7 @@ public function testPathLinkCanBeAddedInConfig()
         $this->assertEquals($expected, $menu->getItems());
     }
 
-    public function testDuplicatesAreRemovedWhenAddingInConfig()
+    public function testDuplicatesAreNotRemovedWhenAddingInConfig()
     {
         config(['hyde.navigation.custom' => [
             NavItem::forLink('foo', 'foo'),
@@ -131,13 +131,14 @@ public function testDuplicatesAreRemovedWhenAddingInConfig()
         $expected = collect([
             NavItem::fromRoute(Routes::get('index')),
             NavItem::forLink('foo', 'foo'),
+            NavItem::forLink('foo', 'foo'),
         ]);
 
         $this->assertCount(count($expected), $menu->getItems());
         $this->assertEquals($expected, $menu->getItems());
     }
 
-    public function testDuplicatesAreRemovedWhenAddingInConfigRegardlessOfDestination()
+    public function testDuplicatesAreNotRemovedWhenAddingInConfigRegardlessOfDestination()
     {
         config(['hyde.navigation.custom' => [
             NavItem::forLink('foo', 'foo'),
@@ -149,6 +150,7 @@ public function testDuplicatesAreRemovedWhenAddingInConfigRegardlessOfDestinatio
         $expected = collect([
             NavItem::fromRoute(Routes::get('index')),
             NavItem::forLink('foo', 'foo'),
+            NavItem::forLink('bar', 'foo'),
         ]);
 
         $this->assertCount(count($expected), $menu->getItems());
@@ -166,6 +168,7 @@ public function testConfigItemsTakePrecedenceOverGeneratedItems()
         $expected = collect([
             NavItem::fromRoute(Routes::get('index')),
             NavItem::forLink('bar', 'Foo'),
+            NavItem::fromRoute(Routes::get('foo')),
         ]);
 
         $this->assertCount(count($expected), $menu->getItems());

From 03f0f94cf3ee9be5a10d67663e3bd45b754f3ce7 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 14:04:01 +0100
Subject: [PATCH 0341/1422] Remove duplicate item filtering from documentation
 sidebar generator

---
 .../Navigation/GeneratesDocumentationSidebarMenu.php  |  9 ---------
 .../Feature/AutomaticNavigationConfigurationsTest.php | 11 ++++++-----
 .../Feature/Services/DocumentationSidebarTest.php     |  9 ++++++---
 3 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index 8ca04be8895..ef28dd5457d 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -34,7 +34,6 @@ public static function handle(): DocumentationSidebar
 
         $menu->generate();
         $menu->sortByPriority();
-        $menu->removeDuplicateItems();
 
         return new DocumentationSidebar($menu->items);
     }
@@ -86,14 +85,6 @@ protected function canAddRoute(Route $route): bool
         return $route->getPage()->showInNavigation() && ! $route->is(DocumentationPage::homeRouteName());
     }
 
-    protected function removeDuplicateItems(): void
-    {
-        $this->items = $this->items->unique(function (NavItem $item): string {
-            // Filter using a combination of the group and identifier to allow duplicate labels in different groups
-            return $item->getGroup().$item->identifier;
-        });
-    }
-
     protected function sortByPriority(): void
     {
         $this->items = $this->items->sortBy('priority')->values();
diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index fc10f0ec95f..6849d3e23e0 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -883,28 +883,29 @@ public function testPagesInSubdirectoriesAreAddedToSidebarRegardlessOfConfigurat
         }
     }
 
-    public function testSidebarItemsWithTheSameLabelAreFiltered()
+    public function testSidebarItemsWithTheSameLabelAreNotFiltered()
     {
+        // Since the route key is the same, only one route is actually added
         $this->assertSidebarEquals(['Foo'], [
             new DocumentationPage('foo'),
             new DocumentationPage('foo'),
         ]);
 
-        $this->assertSidebarEquals(['Foo'], [
+        $this->assertSidebarEquals(['Foo', 'Foo'], [
             new DocumentationPage('foo', ['navigation.label' => 'Foo']),
             new DocumentationPage('bar', ['navigation.label' => 'Foo']),
         ]);
     }
 
-    public function testSidebarItemsWithTheSameLabelAreFilteredCaseInsensitive()
+    public function testSidebarItemsWithTheSameLabelAreNotFilteredForDuplicatesRegardlessOfCase()
     {
-        $this->assertSidebarEquals(['Foo'], [
+        $this->assertSidebarEquals(['Foo', 'Foo', 'FOO'], [
             new DocumentationPage('foo'),
             new DocumentationPage('Foo'),
             new DocumentationPage('FOO'),
         ]);
 
-        $this->assertSidebarEquals(['foo'], [
+        $this->assertSidebarEquals(['foo', 'Foo', 'FOO'], [
             new DocumentationPage('foo', ['navigation.label' => 'foo']),
             new DocumentationPage('bar', ['navigation.label' => 'Foo']),
             new DocumentationPage('baz', ['navigation.label' => 'FOO']),
diff --git a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
index e27a832ab3b..4d09e812e2c 100644
--- a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
+++ b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
@@ -372,16 +372,19 @@ public function testCanHaveMultipleGroupedPagesWithTheSameNameLabels()
         );
     }
 
-    public function testDuplicateLabelsWithinTheSameGroupIsRemoved()
+    public function testDuplicateLabelsWithinTheSameGroupAreNotRemoved()
     {
         $this->makePage('foo', ['navigation.group' => 'foo', 'navigation.label' => 'Foo']);
         $this->makePage('bar', ['navigation.group' => 'foo', 'navigation.label' => 'Foo']);
 
         $sidebar = DocumentationSidebar::create();
-        $this->assertCount(1, $sidebar->getItems());
+        $this->assertCount(2, $sidebar->getItems());
 
         $this->assertEquals(
-            collect([NavItem::fromRoute(Routes::get('docs/bar'), priority: 999)]),
+            collect([
+                NavItem::fromRoute(Routes::get('docs/bar'), priority: 999),
+                NavItem::fromRoute(Routes::get('docs/foo'), priority: 999),
+            ]),
             $sidebar->getItems()
         );
     }

From bd90f9386e197798dc2577965347e9660c2faa31 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 14:06:36 +0100
Subject: [PATCH 0342/1422] Clean up tests

---
 .../AutomaticNavigationConfigurationsTest.php        | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 6849d3e23e0..6cb83ced334 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -459,12 +459,6 @@ public function testPagesInSubdirectoriesAreAddedAsDropdownsWhenNavigationSubdir
 
     public function testMainNavigationMenuItemsWithTheSameLabelAreNotFilteredForDuplicates()
     {
-        // Since the route key is the same, only one route is actually added
-        $this->assertMenuEquals(['Foo'], [
-            new MarkdownPage('foo'),
-            new MarkdownPage('foo'),
-        ]);
-
         $this->assertMenuEquals(['Foo', 'Foo'], [
             new MarkdownPage('foo', ['navigation.label' => 'Foo']),
             new MarkdownPage('bar', ['navigation.label' => 'Foo']),
@@ -885,12 +879,6 @@ public function testPagesInSubdirectoriesAreAddedToSidebarRegardlessOfConfigurat
 
     public function testSidebarItemsWithTheSameLabelAreNotFiltered()
     {
-        // Since the route key is the same, only one route is actually added
-        $this->assertSidebarEquals(['Foo'], [
-            new DocumentationPage('foo'),
-            new DocumentationPage('foo'),
-        ]);
-
         $this->assertSidebarEquals(['Foo', 'Foo'], [
             new DocumentationPage('foo', ['navigation.label' => 'Foo']),
             new DocumentationPage('bar', ['navigation.label' => 'Foo']),

From a3cd45330e3e5175e8f4c577301917a71dec1747 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 14:06:40 +0100
Subject: [PATCH 0343/1422] Update RELEASE_NOTES.md

---
 RELEASE_NOTES.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 3ff8919c416..6e4e58d51d3 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -18,6 +18,7 @@ This serves two purposes:
 - Changed how the documentation search is generated, to be an `InMemoryPage` instead of a post-build task.
 - Media asset files are now copied using the new build task instead of the deprecated `BuildService::transferMediaAssets()` method.
 - Minor: The documentation article component now supports disabling the semantic rendering using a falsy value in https://github.com/hydephp/develop/pull/1566
+- Navigation menu items are now no longer filtered by duplicates (meaning two items with the same label can now exist in the same menu) in https://github.com/hydephp/develop/pull/1573
 - Breaking: The `NavItem` class now always stores the destination as a `Route` instance.
 - Breaking: The `NavItem::getDestination()` method now returns its `Route` instance.
 

From b018e7d73e300b6b39c003717fd2f1364d1007f4 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 14:17:04 +0100
Subject: [PATCH 0344/1422] Fix boolean logic

---
 .../Features/Navigation/GeneratesDocumentationSidebarMenu.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index ef28dd5457d..178dfe4b5f9 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -49,7 +49,7 @@ protected function generate(): void
                 $item = NavItem::fromRoute($route);
                 $group = $item->getGroup();
 
-                if ($groups && $group === null) {
+                if ($groups && $group !== null) {
                     // Todo: Add item
                 }
 

From 26b263237ffb95a505833e679ef392329723c99e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 14:21:25 +0100
Subject: [PATCH 0345/1422] Remove readonly modifiers from NavItem class
 properties

---
 .../src/Framework/Features/Navigation/NavItem.php    | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index a885d3eb9ad..c2b35be9acc 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -24,16 +24,16 @@
  */
 class NavItem implements Stringable
 {
-    public readonly Route $destination;
-    public readonly string $label;
-    public readonly int $priority;
-    public readonly ?string $group;
+    public Route $destination;
+    public string $label;
+    public int $priority;
+    public ?string $group;
 
     /** The "slugified" version of the label. */
-    public readonly string $identifier;
+    public string $identifier;
 
     /** @var array<\Hyde\Framework\Features\Navigation\NavItem> */
-    public readonly array $children;
+    public array $children;
 
     /**
      * Create a new navigation menu item.

From e2a8f366d93326e2039e073179f4eb6cf4396a0e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 14:27:05 +0100
Subject: [PATCH 0346/1422] Breaking: Make `NavItem::$destination` property
 protected

---
 .../components/docs/sidebar-item.blade.php    |  4 +--
 .../Framework/Features/Navigation/NavItem.php |  2 +-
 packages/framework/tests/Unit/NavItemTest.php | 30 +++++++++----------
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/packages/framework/resources/views/components/docs/sidebar-item.blade.php b/packages/framework/resources/views/components/docs/sidebar-item.blade.php
index a6da983c180..98e259d0950 100644
--- a/packages/framework/resources/views/components/docs/sidebar-item.blade.php
+++ b/packages/framework/resources/views/components/docs/sidebar-item.blade.php
@@ -5,7 +5,7 @@
         : 'active bg-black/5 dark:bg-black/10' => $item->isCurrent()
     ]) role="listitem">
     @if($item->isCurrent())
-        <a href="{{ $item->destination }}" aria-current="true" @class([$grouped
+        <a href="{{ $item->getDestination() }}" aria-current="true" @class([$grouped
             ? '-ml-8 pl-4 py-1 px-2 block text-indigo-600 dark:text-indigo-400 dark:font-medium border-l-[0.325rem] border-indigo-500 transition-colors duration-300 ease-in-out hover:bg-black/10'
             : '-ml-4 p-2 block hover:bg-black/5 dark:hover:bg-black/10 text-indigo-600 dark:text-indigo-400 dark:font-medium border-l-[0.325rem] border-indigo-500 transition-colors duration-300 ease-in-out'
         ])>
@@ -17,7 +17,7 @@
             {!! ($page->getTableOfContents()) !!}
         @endif
     @else
-        <a href="{{ $item->destination }}" @class([$grouped
+        <a href="{{ $item->getDestination() }}" @class([$grouped
             ? '-ml-8 pl-4 py-1 px-2 block border-l-[0.325rem] border-transparent transition-colors duration-300 ease-in-out hover:bg-black/10'
             : 'block -ml-4 p-2 border-l-[0.325rem] border-transparent hover:bg-black/5 dark:hover:bg-black/10'
         ])>
diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index c2b35be9acc..7b996af28c3 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -24,7 +24,7 @@
  */
 class NavItem implements Stringable
 {
-    public Route $destination;
+    protected Route $destination;
     public string $label;
     public int $priority;
     public ?string $group;
diff --git a/packages/framework/tests/Unit/NavItemTest.php b/packages/framework/tests/Unit/NavItemTest.php
index 71f6697fc7a..3832cec8874 100644
--- a/packages/framework/tests/Unit/NavItemTest.php
+++ b/packages/framework/tests/Unit/NavItemTest.php
@@ -44,36 +44,36 @@ public function testConstruct()
         $route = new Route(new MarkdownPage());
         $item = new NavItem($route, 'Test', 500);
 
-        $this->assertSame($route, $item->destination);
+        $this->assertSame($route, $item->getDestination());
     }
 
     public function testPassingRouteInstanceToConstructorUsesRouteInstance()
     {
         $route = new Route(new MarkdownPage());
-        $this->assertSame($route, (new NavItem($route, 'Home'))->destination);
+        $this->assertSame($route, (new NavItem($route, 'Home'))->getDestination());
     }
 
     public function testPassingRouteKeyToConstructorUsesRouteInstance()
     {
         $route = Routes::get('index');
 
-        $this->assertSame($route, (new NavItem('index', 'Home'))->destination);
+        $this->assertSame($route, (new NavItem('index', 'Home'))->getDestination());
     }
 
     public function testPassingUrlToConstructorUsesExternalRoute()
     {
         $item = new NavItem('https://example.com', 'Home');
-        $this->assertInstanceOf(ExternalRoute::class, $item->destination);
-        $this->assertEquals(new ExternalRoute('https://example.com'), $item->destination);
-        $this->assertSame('https://example.com', (string) $item->destination);
+        $this->assertInstanceOf(ExternalRoute::class, $item->getDestination());
+        $this->assertEquals(new ExternalRoute('https://example.com'), $item->getDestination());
+        $this->assertSame('https://example.com', (string) $item->getDestination());
     }
 
     public function testPassingUnknownRouteKeyToConstructorUsesExternalRoute()
     {
         $item = new NavItem('foo', 'Home');
-        $this->assertInstanceOf(ExternalRoute::class, $item->destination);
-        $this->assertEquals(new ExternalRoute('foo'), $item->destination);
-        $this->assertSame('foo', (string) $item->destination);
+        $this->assertInstanceOf(ExternalRoute::class, $item->getDestination());
+        $this->assertEquals(new ExternalRoute('foo'), $item->getDestination());
+        $this->assertSame('foo', (string) $item->getDestination());
     }
 
     public function testCanConstructWithChildren()
@@ -86,7 +86,7 @@ public function testCanConstructWithChildren()
         $item = new NavItem($route, 'Test', 500, null, $children);
 
         $this->assertSame('Test', $item->label);
-        $this->assertSame($route, $item->destination);
+        $this->assertSame($route, $item->getDestination());
         $this->assertSame(500, $item->priority);
 
         $this->assertCount(2, $item->children);
@@ -111,7 +111,7 @@ public function testCanConstructWithChildrenWithoutRoute()
         $item = new NavItem('', 'Test', 500, null, $children);
 
         $this->assertSame('Test', $item->label);
-        $this->assertSame('', $item->destination->getLink());
+        $this->assertSame('', $item->getDestination()->getLink());
 
         $this->assertCount(2, $item->children);
         $this->assertSame($children, $item->children);
@@ -171,7 +171,7 @@ public function testFromRoute()
         $route = new Route(new MarkdownPage());
         $item = NavItem::fromRoute($route);
 
-        $this->assertSame($route, $item->destination);
+        $this->assertSame($route, $item->getDestination());
     }
 
     public function testToString()
@@ -185,7 +185,7 @@ public function testForLink()
     {
         $item = NavItem::forLink('foo', 'bar');
 
-        $this->assertEquals(new ExternalRoute('foo'), $item->destination);
+        $this->assertEquals(new ExternalRoute('foo'), $item->getDestination());
         $this->assertSame('bar', $item->label);
         $this->assertSame(500, $item->priority);
     }
@@ -200,7 +200,7 @@ public function testForRoute()
         $route = Routes::get('404');
         $item = NavItem::forRoute($route, 'foo');
 
-        $this->assertSame($route, $item->destination);
+        $this->assertSame($route, $item->getDestination());
         $this->assertSame('foo', $item->label);
         $this->assertSame(999, $item->priority);
     }
@@ -210,7 +210,7 @@ public function testForIndexRoute()
         $route = Routes::get('index');
         $item = NavItem::forRoute($route, 'foo');
 
-        $this->assertSame($route, $item->destination);
+        $this->assertSame($route, $item->getDestination());
         $this->assertSame('foo', $item->label);
         $this->assertSame(0, $item->priority);
     }

From 5fa2bb206844314bfa97431e37815acb7cf3e6ec Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 14:32:52 +0100
Subject: [PATCH 0347/1422] Breaking: Make `NavItem::$label` property protected

---
 .../views/components/docs/sidebar-item.blade.php |  4 ++--
 .../navigation/navigation-link.blade.php         |  2 +-
 .../Framework/Features/Navigation/NavItem.php    |  2 +-
 .../tests/Feature/NavigationMenuTest.php         |  6 +++---
 packages/framework/tests/Unit/NavItemTest.php    | 16 ++++++++--------
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/packages/framework/resources/views/components/docs/sidebar-item.blade.php b/packages/framework/resources/views/components/docs/sidebar-item.blade.php
index 98e259d0950..012947357c0 100644
--- a/packages/framework/resources/views/components/docs/sidebar-item.blade.php
+++ b/packages/framework/resources/views/components/docs/sidebar-item.blade.php
@@ -9,7 +9,7 @@
             ? '-ml-8 pl-4 py-1 px-2 block text-indigo-600 dark:text-indigo-400 dark:font-medium border-l-[0.325rem] border-indigo-500 transition-colors duration-300 ease-in-out hover:bg-black/10'
             : '-ml-4 p-2 block hover:bg-black/5 dark:hover:bg-black/10 text-indigo-600 dark:text-indigo-400 dark:font-medium border-l-[0.325rem] border-indigo-500 transition-colors duration-300 ease-in-out'
         ])>
-            {{ $item->label }}
+            {{ $item->getLabel() }}
         </a>
 
         @if(config('docs.table_of_contents.enabled', true))
@@ -21,7 +21,7 @@
             ? '-ml-8 pl-4 py-1 px-2 block border-l-[0.325rem] border-transparent transition-colors duration-300 ease-in-out hover:bg-black/10'
             : 'block -ml-4 p-2 border-l-[0.325rem] border-transparent hover:bg-black/5 dark:hover:bg-black/10'
         ])>
-            {{ $item->label }}
+            {{ $item->getLabel() }}
         </a>
     @endif
 </li>
\ No newline at end of file
diff --git a/packages/framework/resources/views/components/navigation/navigation-link.blade.php b/packages/framework/resources/views/components/navigation/navigation-link.blade.php
index cfad8bdb1e2..dbb5407245a 100644
--- a/packages/framework/resources/views/components/navigation/navigation-link.blade.php
+++ b/packages/framework/resources/views/components/navigation/navigation-link.blade.php
@@ -1,4 +1,4 @@
 <a href="{{ $item }}" {!! $item->isCurrent() ? 'aria-current="page"' : '' !!} @class([
     'block my-2 md:my-0 md:inline-block py-1 text-gray-700 hover:text-gray-900 dark:text-gray-100',
     'border-l-4 border-indigo-500 md:border-none font-medium -ml-6 pl-5 md:ml-0 md:pl-0 bg-gray-100 dark:bg-gray-800 md:bg-transparent dark:md:bg-transparent' => $item->isCurrent()
-])>{{ $item->label }}</a>
\ No newline at end of file
+])>{{ $item->getLabel() }}</a>
\ No newline at end of file
diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 7b996af28c3..1bd1fe61505 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -25,7 +25,7 @@
 class NavItem implements Stringable
 {
     protected Route $destination;
-    public string $label;
+    protected string $label;
     public int $priority;
     public ?string $group;
 
diff --git a/packages/framework/tests/Feature/NavigationMenuTest.php b/packages/framework/tests/Feature/NavigationMenuTest.php
index e19f0039018..31bb0ad3f19 100644
--- a/packages/framework/tests/Feature/NavigationMenuTest.php
+++ b/packages/framework/tests/Feature/NavigationMenuTest.php
@@ -46,7 +46,7 @@ public function testItemsAreSortedByPriority()
         Routes::addRoute(new Route(new MarkdownPage('bar', ['navigation.priority' => 2])));
         Routes::addRoute(new Route(new MarkdownPage('baz', ['navigation.priority' => 3])));
 
-        $this->assertSame(['Home', 'Foo', 'Bar', 'Baz'], $this->createNavigationMenu()->getItems()->pluck('label')->toArray());
+        $this->assertSame(['Home', 'Foo', 'Bar', 'Baz'], $this->createNavigationMenu()->getItems()->map(fn ($item) => $item->getLabel())->toArray());
     }
 
     public function testItemsWithHiddenPropertySetToTrueAreNotAdded()
@@ -54,7 +54,7 @@ public function testItemsWithHiddenPropertySetToTrueAreNotAdded()
         Routes::addRoute(new Route(new MarkdownPage('foo', ['navigation.hidden' => true])));
         Routes::addRoute(new Route(new MarkdownPage('bar', ['navigation.hidden' => false])));
 
-        $this->assertSame(['Home', 'Bar'], $this->createNavigationMenu()->getItems()->pluck('label')->toArray());
+        $this->assertSame(['Home', 'Bar'], $this->createNavigationMenu()->getItems()->map(fn ($item) => $item->getLabel())->toArray());
     }
 
     public function testCreatedCollectionIsSortedByNavigationMenuPriority()
@@ -266,7 +266,7 @@ public function testCanAddItemsToMainNavigationMenuResolvedFromContainer()
         $navigation->add(new NavItem(new ExternalRoute('/foo'), 'Foo'));
 
         $this->assertCount(2, $navigation->getItems());
-        $this->assertSame('Foo', $navigation->getItems()->last()->label);
+        $this->assertSame('Foo', $navigation->getItems()->last()->getLabel());
     }
 
     protected function createNavigationMenu(): NavigationMenu
diff --git a/packages/framework/tests/Unit/NavItemTest.php b/packages/framework/tests/Unit/NavItemTest.php
index 3832cec8874..dd28a2d6e24 100644
--- a/packages/framework/tests/Unit/NavItemTest.php
+++ b/packages/framework/tests/Unit/NavItemTest.php
@@ -85,15 +85,15 @@ public function testCanConstructWithChildren()
         ];
         $item = new NavItem($route, 'Test', 500, null, $children);
 
-        $this->assertSame('Test', $item->label);
+        $this->assertSame('Test', $item->getLabel());
         $this->assertSame($route, $item->getDestination());
         $this->assertSame(500, $item->priority);
 
         $this->assertCount(2, $item->children);
         $this->assertSame($children, $item->children);
 
-        $this->assertSame('Foo', $item->children[0]->label);
-        $this->assertSame('Bar', $item->children[1]->label);
+        $this->assertSame('Foo', $item->children[0]->getLabel());
+        $this->assertSame('Bar', $item->children[1]->getLabel());
 
         $this->assertSame('foo.html', $item->children[0]->getLink());
         $this->assertSame('bar.html', $item->children[1]->getLink());
@@ -110,7 +110,7 @@ public function testCanConstructWithChildrenWithoutRoute()
         ];
         $item = new NavItem('', 'Test', 500, null, $children);
 
-        $this->assertSame('Test', $item->label);
+        $this->assertSame('Test', $item->getLabel());
         $this->assertSame('', $item->getDestination()->getLink());
 
         $this->assertCount(2, $item->children);
@@ -186,7 +186,7 @@ public function testForLink()
         $item = NavItem::forLink('foo', 'bar');
 
         $this->assertEquals(new ExternalRoute('foo'), $item->getDestination());
-        $this->assertSame('bar', $item->label);
+        $this->assertSame('bar', $item->getLabel());
         $this->assertSame(500, $item->priority);
     }
 
@@ -201,7 +201,7 @@ public function testForRoute()
         $item = NavItem::forRoute($route, 'foo');
 
         $this->assertSame($route, $item->getDestination());
-        $this->assertSame('foo', $item->label);
+        $this->assertSame('foo', $item->getLabel());
         $this->assertSame(999, $item->priority);
     }
 
@@ -211,7 +211,7 @@ public function testForIndexRoute()
         $item = NavItem::forRoute($route, 'foo');
 
         $this->assertSame($route, $item->getDestination());
-        $this->assertSame('foo', $item->label);
+        $this->assertSame('foo', $item->getLabel());
         $this->assertSame(0, $item->priority);
     }
 
@@ -265,7 +265,7 @@ public function testDropdownFacade()
     {
         $item = NavItem::dropdown('foo', []);
 
-        $this->assertSame('foo', $item->label);
+        $this->assertSame('foo', $item->getLabel());
         $this->assertSame([], $item->getChildren());
         $this->assertSame(999, $item->priority);
     }

From d51186d4f902bca0889e3cf2d8e06852df801baf Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 15:20:13 +0100
Subject: [PATCH 0348/1422] Breaking: Make `NavItem::$priority` property
 protected

---
 .../GeneratesDocumentationSidebarMenu.php     |  2 +-
 .../GeneratesMainNavigationMenu.php           |  2 +-
 .../Framework/Features/Navigation/NavItem.php |  2 +-
 .../Features/Navigation/NavigationMenu.php    |  2 +-
 .../Services/DocumentationSidebarTest.php     |  4 ++--
 packages/framework/tests/Unit/NavItemTest.php | 22 +++++++++----------
 6 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index 178dfe4b5f9..43ca0b929db 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -87,6 +87,6 @@ protected function canAddRoute(Route $route): bool
 
     protected function sortByPriority(): void
     {
-        $this->items = $this->items->sortBy('priority')->values();
+        $this->items = $this->items->sortBy(fn (NavItem $item) => $item->getPriority())->values();
     }
 }
diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index de4e5af2503..b3dda7b9f73 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -94,6 +94,6 @@ protected function useSubdirectoriesAsDropdowns(): bool
 
     protected function sortByPriority(): void
     {
-        $this->items = $this->items->sortBy('priority')->values();
+        $this->items = $this->items->sortBy(fn (NavItem $item): int => $item->getPriority())->values();
     }
 }
diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 1bd1fe61505..bc0c7694fd7 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -26,7 +26,7 @@ class NavItem implements Stringable
 {
     protected Route $destination;
     protected string $label;
-    public int $priority;
+    protected int $priority;
     public ?string $group;
 
     /** The "slugified" version of the label. */
diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
index ca3021f1336..0c1e610a0e2 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
@@ -36,7 +36,7 @@ public function __construct(Arrayable|array $items = [])
      */
     public function getItems(): Collection
     {
-        return $this->items->sortBy('priority')->values();
+        return $this->items->sortBy(fn (NavItem $item) => $item->getPriority())->values();
     }
 
     /**
diff --git a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
index 4d09e812e2c..ed2df0ba297 100644
--- a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
+++ b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
@@ -114,7 +114,7 @@ public function testSidebarItemPriorityCanBeSetInFrontMatter()
     {
         $this->makePage('foo', ['navigation.priority' => 25]);
 
-        $this->assertEquals(25, DocumentationSidebar::create()->getItems()->first()->priority);
+        $this->assertEquals(25, DocumentationSidebar::create()->getItems()->first()->getPriority());
     }
 
     public function testSidebarItemPrioritySetInConfigOverridesFrontMatter()
@@ -123,7 +123,7 @@ public function testSidebarItemPrioritySetInConfigOverridesFrontMatter()
 
         Config::set('docs.sidebar_order', ['foo']);
 
-        $this->assertEquals(25, DocumentationSidebar::create()->getItems()->first()->priority);
+        $this->assertEquals(25, DocumentationSidebar::create()->getItems()->first()->getPriority());
     }
 
     public function testSidebarPrioritiesCanBeSetInBothFrontMatterAndConfig()
diff --git a/packages/framework/tests/Unit/NavItemTest.php b/packages/framework/tests/Unit/NavItemTest.php
index dd28a2d6e24..b908101810d 100644
--- a/packages/framework/tests/Unit/NavItemTest.php
+++ b/packages/framework/tests/Unit/NavItemTest.php
@@ -87,7 +87,7 @@ public function testCanConstructWithChildren()
 
         $this->assertSame('Test', $item->getLabel());
         $this->assertSame($route, $item->getDestination());
-        $this->assertSame(500, $item->priority);
+        $this->assertSame(500, $item->getPriority());
 
         $this->assertCount(2, $item->children);
         $this->assertSame($children, $item->children);
@@ -98,8 +98,8 @@ public function testCanConstructWithChildren()
         $this->assertSame('foo.html', $item->children[0]->getLink());
         $this->assertSame('bar.html', $item->children[1]->getLink());
 
-        $this->assertSame(500, $item->children[0]->priority);
-        $this->assertSame(500, $item->children[1]->priority);
+        $this->assertSame(500, $item->children[0]->getPriority());
+        $this->assertSame(500, $item->children[1]->getPriority());
     }
 
     public function testCanConstructWithChildrenWithoutRoute()
@@ -187,12 +187,12 @@ public function testForLink()
 
         $this->assertEquals(new ExternalRoute('foo'), $item->getDestination());
         $this->assertSame('bar', $item->getLabel());
-        $this->assertSame(500, $item->priority);
+        $this->assertSame(500, $item->getPriority());
     }
 
     public function testForLinkWithCustomPriority()
     {
-        $this->assertSame(100, NavItem::forLink('foo', 'bar', 100)->priority);
+        $this->assertSame(100, NavItem::forLink('foo', 'bar', 100)->getPriority());
     }
 
     public function testForRoute()
@@ -202,7 +202,7 @@ public function testForRoute()
 
         $this->assertSame($route, $item->getDestination());
         $this->assertSame('foo', $item->getLabel());
-        $this->assertSame(999, $item->priority);
+        $this->assertSame(999, $item->getPriority());
     }
 
     public function testForIndexRoute()
@@ -212,7 +212,7 @@ public function testForIndexRoute()
 
         $this->assertSame($route, $item->getDestination());
         $this->assertSame('foo', $item->getLabel());
-        $this->assertSame(0, $item->priority);
+        $this->assertSame(0, $item->getPriority());
     }
 
     public function testForRouteWithRouteKey()
@@ -231,7 +231,7 @@ public function testForRouteWithMissingRouteKey()
 
     public function testForRouteWithCustomPriority()
     {
-        $this->assertSame(100, NavItem::forRoute(Routes::get('index'), 'foo', 100)->priority);
+        $this->assertSame(100, NavItem::forRoute(Routes::get('index'), 'foo', 100)->getPriority());
     }
 
     public function testRouteBasedNavItemDestinationsAreResolvedRelatively()
@@ -267,7 +267,7 @@ public function testDropdownFacade()
 
         $this->assertSame('foo', $item->getLabel());
         $this->assertSame([], $item->getChildren());
-        $this->assertSame(999, $item->priority);
+        $this->assertSame(999, $item->getPriority());
     }
 
     public function testDropdownFacadeWithChildren()
@@ -278,14 +278,14 @@ public function testDropdownFacadeWithChildren()
 
         $item = NavItem::dropdown('foo', $children);
         $this->assertSame($children, $item->getChildren());
-        $this->assertSame(999, $item->priority);
+        $this->assertSame(999, $item->getPriority());
     }
 
     public function testDropdownFacadeWithCustomPriority()
     {
         $item = NavItem::dropdown('foo', [], 500);
 
-        $this->assertSame(500, $item->priority);
+        $this->assertSame(500, $item->getPriority());
     }
 
     public function testHasChildren()

From 597e6c6e7cf6fdc9e56588b0605be354fc0db603 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 15:40:00 +0100
Subject: [PATCH 0349/1422] Breaking: Make `NavItem::$group` property protected

---
 .../framework/src/Framework/Features/Navigation/NavItem.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index bc0c7694fd7..3f096d557ed 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -27,7 +27,7 @@ class NavItem implements Stringable
     protected Route $destination;
     protected string $label;
     protected int $priority;
-    public ?string $group;
+    protected ?string $group;
 
     /** The "slugified" version of the label. */
     public string $identifier;

From 55da9624572e1ab2ec1e97425b40e567067cecf5 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 15:44:01 +0100
Subject: [PATCH 0350/1422] Breaking: Make `NavItem::$children` property
 protected

---
 .../Framework/Features/Navigation/NavItem.php |  2 +-
 packages/framework/tests/Unit/NavItemTest.php | 20 +++++++++----------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 3f096d557ed..ce42587f8f3 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -33,7 +33,7 @@ class NavItem implements Stringable
     public string $identifier;
 
     /** @var array<\Hyde\Framework\Features\Navigation\NavItem> */
-    public array $children;
+    protected array $children;
 
     /**
      * Create a new navigation menu item.
diff --git a/packages/framework/tests/Unit/NavItemTest.php b/packages/framework/tests/Unit/NavItemTest.php
index b908101810d..82a4023243d 100644
--- a/packages/framework/tests/Unit/NavItemTest.php
+++ b/packages/framework/tests/Unit/NavItemTest.php
@@ -89,17 +89,17 @@ public function testCanConstructWithChildren()
         $this->assertSame($route, $item->getDestination());
         $this->assertSame(500, $item->getPriority());
 
-        $this->assertCount(2, $item->children);
-        $this->assertSame($children, $item->children);
+        $this->assertCount(2, $item->getChildren());
+        $this->assertSame($children, $item->getChildren());
 
-        $this->assertSame('Foo', $item->children[0]->getLabel());
-        $this->assertSame('Bar', $item->children[1]->getLabel());
+        $this->assertSame('Foo', $item->getChildren()[0]->getLabel());
+        $this->assertSame('Bar', $item->getChildren()[1]->getLabel());
 
-        $this->assertSame('foo.html', $item->children[0]->getLink());
-        $this->assertSame('bar.html', $item->children[1]->getLink());
+        $this->assertSame('foo.html', $item->getChildren()[0]->getLink());
+        $this->assertSame('bar.html', $item->getChildren()[1]->getLink());
 
-        $this->assertSame(500, $item->children[0]->getPriority());
-        $this->assertSame(500, $item->children[1]->getPriority());
+        $this->assertSame(500, $item->getChildren()[0]->getPriority());
+        $this->assertSame(500, $item->getChildren()[1]->getPriority());
     }
 
     public function testCanConstructWithChildrenWithoutRoute()
@@ -113,8 +113,8 @@ public function testCanConstructWithChildrenWithoutRoute()
         $this->assertSame('Test', $item->getLabel());
         $this->assertSame('', $item->getDestination()->getLink());
 
-        $this->assertCount(2, $item->children);
-        $this->assertSame($children, $item->children);
+        $this->assertCount(2, $item->getChildren());
+        $this->assertSame($children, $item->getChildren());
     }
 
     public function testGetDestination()

From 482ac8a32f48accef23f334ab8b6e683be11baf7 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 15:46:15 +0100
Subject: [PATCH 0351/1422] Add accessor for the identifier and protect the
 property

Not breaking as it is a new property
---
 .../src/Framework/Features/Navigation/NavItem.php      | 10 +++++++++-
 packages/framework/tests/Unit/NavItemTest.php          | 10 +++++-----
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index ce42587f8f3..0b290e3ca32 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -30,7 +30,7 @@ class NavItem implements Stringable
     protected ?string $group;
 
     /** The "slugified" version of the label. */
-    public string $identifier;
+    protected string $identifier;
 
     /** @var array<\Hyde\Framework\Features\Navigation\NavItem> */
     protected array $children;
@@ -149,6 +149,14 @@ public function getGroup(): ?string
         return $this->group;
     }
 
+    /**
+     * Get the identifier of the navigation item.
+     */
+    public function getIdentifier(): string
+    {
+        return $this->identifier;
+    }
+
     /**
      * Get the children of the navigation item.
      *
diff --git a/packages/framework/tests/Unit/NavItemTest.php b/packages/framework/tests/Unit/NavItemTest.php
index 82a4023243d..49670868bb9 100644
--- a/packages/framework/tests/Unit/NavItemTest.php
+++ b/packages/framework/tests/Unit/NavItemTest.php
@@ -354,7 +354,7 @@ public function testIdentifier()
         $route = new Route(new MarkdownPage());
         $item = new NavItem($route, 'Test', 500);
 
-        $this->assertSame('test', $item->identifier);
+        $this->assertSame('test', $item->getIdentifier());
     }
 
     public function testIdentifierWithCustomLabel()
@@ -362,13 +362,13 @@ public function testIdentifierWithCustomLabel()
         $route = new Route(new MarkdownPage());
         $item = new NavItem($route, 'Foo Bar', 500);
 
-        $this->assertSame('foo-bar', $item->identifier);
+        $this->assertSame('foo-bar', $item->getIdentifier());
     }
 
     public function testIdentifierFromRouteKey()
     {
         $item = NavItem::fromRoute(Routes::get('index'));
-        $this->assertSame('home', $item->identifier);
+        $this->assertSame('home', $item->getIdentifier());
     }
 
     public function testIdentifierUsesLabelWhenRouteKeyIsFalsy()
@@ -376,12 +376,12 @@ public function testIdentifierUsesLabelWhenRouteKeyIsFalsy()
         $route = new Route(new MarkdownPage());
         $item = new NavItem($route, 'Foo Bar', 500);
 
-        $this->assertSame('foo-bar', $item->identifier);
+        $this->assertSame('foo-bar', $item->getIdentifier());
     }
 
     public function testIdentifierUsesLabelForExternalRoute()
     {
         $item = NavItem::forLink('https://example.com', 'Foo Bar');
-        $this->assertSame('foo-bar', $item->identifier);
+        $this->assertSame('foo-bar', $item->getIdentifier());
     }
 }

From 7b5cabc08ed53bd5a5da846f692e869f746477e4 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 16:07:16 +0100
Subject: [PATCH 0352/1422] Remove unnecessary priority sorting from navigation
 generator

We don't need to sort this as the accessor sorts it on retrieval
---
 .../Features/Navigation/GeneratesMainNavigationMenu.php     | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index b3dda7b9f73..9ed815aa01d 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -34,7 +34,6 @@ public static function handle(): NavigationMenu
         $menu = new static();
 
         $menu->generate();
-        $menu->sortByPriority();
 
         return new NavigationMenu($menu->items);
     }
@@ -91,9 +90,4 @@ protected function useSubdirectoriesAsDropdowns(): bool
     {
         return Config::getString('hyde.navigation.subdirectories', 'hidden') === 'dropdown';
     }
-
-    protected function sortByPriority(): void
-    {
-        $this->items = $this->items->sortBy(fn (NavItem $item): int => $item->getPriority())->values();
-    }
 }

From fe3a4ceb8e7f751145f7ac7fd4aa8c4a6b05836d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 16:08:55 +0100
Subject: [PATCH 0353/1422] Use the item accessor to get groups

---
 .../Framework/Features/Navigation/DocumentationSidebar.php    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index d87bcbd2313..ad92eaa31c9 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -39,7 +39,7 @@ public function hasGroups(): bool
      */
     public function getGroups(): array
     {
-        return $this->items->map(function (NavItem $item): ?string {
+        return $this->getItems()->map(function (NavItem $item): ?string {
             return $item->getGroup();
         })->unique()->toArray();
     }
@@ -47,7 +47,7 @@ public function getGroups(): array
     /** @return Collection<\Hyde\Framework\Features\Navigation\NavItem> */
     public function getItemsInGroup(?string $group): Collection
     {
-        return $this->items->filter(function (NavItem $item) use ($group): bool {
+        return $this->getItems()->filter(function (NavItem $item) use ($group): bool {
             // Todo: Use identifier instead of slug
             return ($item->getGroup() === $group) || ($item->getGroup() === Str::slug($group));
         })->sortBy('navigation.priority')->values();

From 4c3fd2c03826b3681b58bc7eaebf2176afd08f65 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 16:09:07 +0100
Subject: [PATCH 0354/1422] Remove unnecessary priority sorting from sidebar
 generator

We don't need to sort this as the accessor sorts it on retrieval
---
 .../Navigation/GeneratesDocumentationSidebarMenu.php        | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index 43ca0b929db..88602279c7e 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -33,7 +33,6 @@ public static function handle(): DocumentationSidebar
         $menu = new static();
 
         $menu->generate();
-        $menu->sortByPriority();
 
         return new DocumentationSidebar($menu->items);
     }
@@ -84,9 +83,4 @@ protected function canAddRoute(Route $route): bool
     {
         return $route->getPage()->showInNavigation() && ! $route->is(DocumentationPage::homeRouteName());
     }
-
-    protected function sortByPriority(): void
-    {
-        $this->items = $this->items->sortBy(fn (NavItem $item) => $item->getPriority())->values();
-    }
 }

From 9b0cb0f0d370038f58fb7f9b62bd97de1f4e5e32 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 16:13:08 +0100
Subject: [PATCH 0355/1422] Add helper to add child items to navigation items

---
 .../src/Framework/Features/Navigation/NavItem.php    |  8 ++++++++
 packages/framework/tests/Unit/NavItemTest.php        | 12 ++++++++++++
 2 files changed, 20 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 0b290e3ca32..2b16f03cfff 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -185,6 +185,14 @@ public function isCurrent(): bool
         return Hyde::currentRoute()->getLink() === (string) $this->destination;
     }
 
+    /**
+     * Add a navigation item to the children of the navigation item.
+     */
+    public function addChild(NavItem $item): void
+    {
+        $this->children[] = $item;
+    }
+
     protected static function normalizeGroupKey(?string $group): ?string
     {
         return $group ? Str::slug($group) : null;
diff --git a/packages/framework/tests/Unit/NavItemTest.php b/packages/framework/tests/Unit/NavItemTest.php
index 49670868bb9..f2caf94538c 100644
--- a/packages/framework/tests/Unit/NavItemTest.php
+++ b/packages/framework/tests/Unit/NavItemTest.php
@@ -384,4 +384,16 @@ public function testIdentifierUsesLabelForExternalRoute()
         $item = NavItem::forLink('https://example.com', 'Foo Bar');
         $this->assertSame('foo-bar', $item->getIdentifier());
     }
+
+    public function testCanAddItemToDropdown()
+    {
+        $parent = new NavItem(new Route(new MarkdownPage()), 'Parent', 500, 'foo');
+        $child = new NavItem(new Route(new MarkdownPage()), 'Child', 500, 'foo');
+
+        $this->assertSame([], $parent->getChildren());
+
+        $parent->addChild($child);
+
+        $this->assertSame([$child], $parent->getChildren());
+    }
 }

From 744b2722a034a725baedc66936e31aed1d6b90f8 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 17:49:19 +0100
Subject: [PATCH 0356/1422] Update testing helper to dump state

---
 .../AutomaticNavigationConfigurationsTest.php      | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 6cb83ced334..7e095aa4ef3 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -1064,7 +1064,19 @@ public function assertEquals(array $expected, bool $strict = false): static
             foreach (TestNavItem::properties() as $property) {
                 if ($this->getState($index) !== null) {
                     if (isset($item[$property])) {
-                        $this->test->assertSame($item[$property], $this->getState($index)->$property, "Failed to match the expected value for '$property'");
+                        $a = $item[$property];
+                        $b = $this->getState($index)->$property;
+
+                        if ($a !== $b) {
+                            dump([
+                                'error' => "Failed to match the expected value for '$property'",
+                                'expected' => $a,
+                                'actual' => $b,
+                                'menu' => $this->state(),
+                            ]);
+                        }
+
+                        $this->test->assertSame($a, $b, "Failed to match the expected value for '$property'");
                     } elseif ($strict) {
                         $this->test->fail("Missing array key '$property' in the expected state");
                     }

From 9f675e1c9680f19a69073faf40fa1766cee28041 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 18:01:17 +0100
Subject: [PATCH 0357/1422] Begin making sidebar group assembly deterministic

Changes how sidebar groups are assembled so that they conform to the new dropdown system
---
 .../Navigation/DocumentationSidebar.php       | 30 ++++++---
 .../GeneratesDocumentationSidebarMenu.php     | 21 +++++-
 .../AutomaticNavigationConfigurationsTest.php | 67 ++++++++++---------
 .../Services/DocumentationSidebarTest.php     | 19 ++++--
 4 files changed, 88 insertions(+), 49 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index ad92eaa31c9..a35bbd9d94b 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -27,9 +27,14 @@ public static function create(): static
 
     public function hasGroups(): bool
     {
-        // Todo check if any items have children
+        /** @deprecated */
+        $legacyCompat = (! empty($this->getGroups())) && ($this->getGroups() !== [null]);
 
-        return (! empty($this->getGroups())) && ($this->getGroups() !== [null]);
+        $newLogic = $this->getItems()->filter(function (NavItem $item): bool {
+            return $item->hasChildren();
+        })->isNotEmpty();
+
+        return $legacyCompat || $newLogic;
     }
 
     /**
@@ -39,18 +44,25 @@ public function hasGroups(): bool
      */
     public function getGroups(): array
     {
-        return $this->getItems()->map(function (NavItem $item): ?string {
-            return $item->getGroup();
-        })->unique()->toArray();
+        return $this->getItems()->filter(function (NavItem $item): bool {
+            return $item->hasChildren();
+        })->sortBy(function (NavItem $item): int {
+            // Sort by lowest priority found in each group
+            return collect($item->getChildren())->min(
+                fn (NavItem $child): int => $child->getPriority()
+            );
+        })->map(function (NavItem $item): string {
+            return $item->getIdentifier();
+        })->values()->toArray();
     }
 
     /** @return Collection<\Hyde\Framework\Features\Navigation\NavItem> */
     public function getItemsInGroup(?string $group): Collection
     {
-        return $this->getItems()->filter(function (NavItem $item) use ($group): bool {
-            // Todo: Use identifier instead of slug
-            return ($item->getGroup() === $group) || ($item->getGroup() === Str::slug($group));
-        })->sortBy('navigation.priority')->values();
+        // Todo might not need collections here
+        return collect($this->getItems()->first(function (NavItem $item) use ($group): bool {
+            return $item->getIdentifier() === Str::slug($group);
+        })?->getChildren() ?? []);
     }
 
     /**
diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index 88602279c7e..c0856952ff2 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -48,8 +48,25 @@ protected function generate(): void
                 $item = NavItem::fromRoute($route);
                 $group = $item->getGroup();
 
-                if ($groups && $group !== null) {
-                    // Todo: Add item
+                if ($groups) {
+                    if (! $group) {
+                        $group = 'Other';
+                    }
+
+                    $groupItem = $this->items->get($group);
+
+                    if ($groupItem === null) {
+                        // Todo get group label
+                        $groupItem = NavItem::dropdown($group, []);
+                    }
+
+                    $groupItem->addChild($item);
+
+                    if (! $this->items->has($group)) {
+                        $this->items->put($group, $groupItem);
+                    }
+
+                    return;
                 }
 
                 $this->items->put($route->getRouteKey(), $item);
diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 7e095aa4ef3..2a38498ec23 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -616,12 +616,9 @@ public function testSidebarWithFrontMatterVisible()
 
     public function testSidebarWithFrontMatterGroup()
     {
-        // TODO: For new v2 system, this should insert a root item with the group name and the children as the pages
-
-        $this->assertSidebarEquals([
-            ['label' => 'Foo', 'group' => 'group-1'],
-            ['label' => 'Bar', 'group' => 'group-1'],
-            ['label' => 'Baz', 'group' => 'group-1'],
+        $this->assertSidebarEquals([[
+            'label' => 'group-1', // Todo: Should use proper group name
+            'children' => ['Foo', 'Bar', 'Baz']],
         ], [
             new DocumentationPage('foo', ['navigation.group' => 'Group 1']),
             new DocumentationPage('bar', ['navigation.group' => 'Group 1']),
@@ -631,12 +628,9 @@ public function testSidebarWithFrontMatterGroup()
 
     public function testSidebarWithFrontMatterCategory()
     {
-        // TODO: For new v2 system, this should insert a root item with the group name and the children as the pages
-
-        $this->assertSidebarEquals([
-            ['label' => 'Foo', 'group' => 'group-1'],
-            ['label' => 'Bar', 'group' => 'group-1'],
-            ['label' => 'Baz', 'group' => 'group-1'],
+        $this->assertSidebarEquals([[
+            'label' => 'group-1', // Todo: Should use proper group name
+            'children' => ['Foo', 'Bar', 'Baz']],
         ], [
             new DocumentationPage('foo', ['navigation.category' => 'Group 1']),
             new DocumentationPage('bar', ['navigation.category' => 'Group 1']),
@@ -706,7 +700,10 @@ public function testSidebarWithFrontMatterGroupAndCategory()
     {
         // Since the main key in the navigation schema is 'group', that takes precedence over its 'category' alias
 
-        $this->assertSidebarEquals(array_fill(0, 3, ['group' => 'group-1']), [
+        $this->assertSidebarEquals([[
+            'label' => 'group-1', // Todo: Should use proper group name
+            'children' => ['Foo', 'Bar', 'Baz'],
+        ]], [
             new DocumentationPage('foo', ['navigation.group' => 'Group 1', 'navigation.category' => 'Group 2']),
             new DocumentationPage('bar', ['navigation.group' => 'Group 1', 'navigation.category' => 'Group 2']),
             new DocumentationPage('baz', ['navigation.group' => 'Group 1', 'navigation.category' => 'Group 2']),
@@ -847,11 +844,10 @@ public function testSidebarWithConfigHidden()
 
     public function testDocumentationPagesInSubdirectoriesAreAddedToSidebar()
     {
-        $this->assertSidebarEquals([
-            ['label' => 'Foo', 'group' => 'about'],
-            ['label' => 'Bar', 'group' => 'about'],
-            ['label' => 'Baz', 'group' => 'about'],
-        ], [
+        $this->assertSidebarEquals([[
+            'label' => 'about', // Todo: Should use proper group name
+            'children' => ['Foo', 'Bar', 'Baz'],
+        ]], [
             new DocumentationPage('about/foo'),
             new DocumentationPage('about/bar'),
             new DocumentationPage('about/baz'),
@@ -865,11 +861,10 @@ public function testPagesInSubdirectoriesAreAddedToSidebarRegardlessOfConfigurat
         foreach ($options as $option) {
             config(['docs.sidebar.subdirectories' => $option]);
 
-            $this->assertSidebarEquals([
-                ['label' => 'Foo', 'group' => 'about'],
-                ['label' => 'Bar', 'group' => 'about'],
-                ['label' => 'Baz', 'group' => 'about'],
-            ], [
+            $this->assertSidebarEquals([[
+                'label' => 'about', // Todo: Should use proper group name
+                'children' => ['Foo', 'Bar', 'Baz'],
+            ]], [
                 new DocumentationPage('about/foo'),
                 new DocumentationPage('about/bar'),
                 new DocumentationPage('about/baz'),
@@ -903,8 +898,9 @@ public function testSidebarItemsWithTheSameLabelAreNotFilteredForDuplicatesRegar
     public function testSidebarItemsWithSameLabelButDifferentGroupsAreNotFiltered()
     {
         $this->assertSidebarEquals([
-            ['label' => 'Foo', 'group' => 'group-1'],
-            ['label' => 'Foo', 'group' => 'group-2'],
+            // Todo: Should use proper group name
+            ['label' => 'group-1', 'children' => ['Foo']],
+            ['label' => 'group-2', 'children' => ['Foo']],
         ], [
             new DocumentationPage('foo', ['navigation.label' => 'Foo', 'navigation.group' => 'Group 1']),
             new DocumentationPage('bar', ['navigation.label' => 'Foo', 'navigation.group' => 'Group 2']),
@@ -913,7 +909,11 @@ public function testSidebarItemsWithSameLabelButDifferentGroupsAreNotFiltered()
 
     public function testSidebarDropdownItemsWithSameLabelButDifferentGroupsAreFiltered()
     {
-        $this->assertSidebarEquals(['Foo'], [
+        $this->assertSidebarEquals([
+            // Todo: Should use proper group name
+            ['label' => 'group-1', 'children' => ['Foo']],
+            ['label' => 'group-2', 'children' => ['Foo']],
+        ], [
             new DocumentationPage('one/foo', ['navigation.group' => 'Group 1']),
             new DocumentationPage('two/foo', ['navigation.group' => 'Group 2']),
         ]);
@@ -921,7 +921,11 @@ public function testSidebarDropdownItemsWithSameLabelButDifferentGroupsAreFilter
 
     public function testSidebarAutomaticDropdownItemsWithSameLabelButDifferentGroupsAreFiltered()
     {
-        $this->assertSidebarEquals(['Foo'], [
+        $this->assertSidebarEquals([
+            // Todo: Should use proper group name
+            ['label' => 'one', 'children' => ['Foo']],
+            ['label' => 'two', 'children' => ['Foo']],
+        ], [
             new DocumentationPage('one/foo'),
             new DocumentationPage('two/foo'),
         ]);
@@ -932,8 +936,9 @@ public function testSidebarDropdownItemsWithSameLabelButDifferentGroupsAreNotFil
         config(['docs.flattened_output_paths' => false]);
 
         $this->assertSidebarEquals([
-            ['label' => 'Foo', 'group' => 'group-1'],
-            ['label' => 'Foo', 'group' => 'group-2'],
+            // Todo: Should use proper group name
+            ['label' => 'group-1', 'children' => ['Foo']],
+            ['label' => 'group-2', 'children' => ['Foo']],
         ], [
             new DocumentationPage('one/foo', ['navigation.group' => 'Group 1']),
             new DocumentationPage('two/foo', ['navigation.group' => 'Group 2']),
@@ -946,8 +951,8 @@ public function testSidebarAutomaticDropdownItemsWithSameLabelButDifferentGroups
 
         $this->assertSidebarEquals([
             // Todo: Should use proper group name
-            ['label' => 'Foo', 'group' => 'one'],
-            ['label' => 'Foo', 'group' => 'two'],
+            ['label' => 'one', 'children' => ['Foo']],
+            ['label' => 'two', 'children' => ['Foo']],
         ], [
             new DocumentationPage('one/foo'),
             new DocumentationPage('two/foo'),
diff --git a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
index ed2df0ba297..76ca6abe6f9 100644
--- a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
+++ b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
@@ -152,8 +152,7 @@ public function testSidebarPrioritiesCanBeSetInBothFrontMatterAndConfig()
     public function testGroupCanBeSetInFrontMatter()
     {
         $this->makePage('foo', ['navigation.group' => 'bar']);
-
-        $this->assertEquals('bar', DocumentationSidebar::create()->getItems()->first()->getGroup());
+        $this->assertEquals('bar', collect(DocumentationSidebar::create()->getItems()->first()->getChildren())->first()->getGroup());
     }
 
     public function testHasGroupsReturnsFalseWhenThereAreNoGroups()
@@ -365,8 +364,12 @@ public function testCanHaveMultipleGroupedPagesWithTheSameNameLabels()
 
         $this->assertEquals(
             collect([
-                NavItem::fromRoute(Routes::get('docs/bar'), priority: 999),
-                NavItem::fromRoute(Routes::get('docs/foo'), priority: 999),
+                NavItem::dropdown('bar', [
+                    NavItem::fromRoute(Routes::get('docs/bar'), priority: 999),
+                ]),
+                NavItem::dropdown('foo', [
+                    NavItem::fromRoute(Routes::get('docs/foo'), priority: 999),
+                ]),
             ]),
             $sidebar->getItems()
         );
@@ -378,12 +381,14 @@ public function testDuplicateLabelsWithinTheSameGroupAreNotRemoved()
         $this->makePage('bar', ['navigation.group' => 'foo', 'navigation.label' => 'Foo']);
 
         $sidebar = DocumentationSidebar::create();
-        $this->assertCount(2, $sidebar->getItems());
+        $this->assertCount(1, $sidebar->getItems());
 
         $this->assertEquals(
             collect([
-                NavItem::fromRoute(Routes::get('docs/bar'), priority: 999),
-                NavItem::fromRoute(Routes::get('docs/foo'), priority: 999),
+                NavItem::dropdown('foo', [
+                    NavItem::fromRoute(Routes::get('docs/bar'), priority: 999),
+                    NavItem::fromRoute(Routes::get('docs/foo'), priority: 999),
+                ]),
             ]),
             $sidebar->getItems()
         );

From 78ff763bacb3ab2f1aa8cfc15b09325e373660cf Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 18:54:42 +0100
Subject: [PATCH 0358/1422] Remove temporary legacy compat

---
 .../Framework/Features/Navigation/DocumentationSidebar.php | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index a35bbd9d94b..7427c1df10b 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -27,14 +27,9 @@ public static function create(): static
 
     public function hasGroups(): bool
     {
-        /** @deprecated */
-        $legacyCompat = (! empty($this->getGroups())) && ($this->getGroups() !== [null]);
-
-        $newLogic = $this->getItems()->filter(function (NavItem $item): bool {
+        return $this->getItems()->filter(function (NavItem $item): bool {
             return $item->hasChildren();
         })->isNotEmpty();
-
-        return $legacyCompat || $newLogic;
     }
 
     /**

From 4646103a74a3a9482c6c9ce7582a55d5aa6761f3 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 19:00:54 +0100
Subject: [PATCH 0359/1422] Revert "Remove unnecessary priority sorting from
 sidebar generator"

This reverts commit 4c3fd2c03826b3681b58bc7eaebf2176afd08f65.
---
 .../Navigation/GeneratesDocumentationSidebarMenu.php        | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index c0856952ff2..c3579ed29dd 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -33,6 +33,7 @@ public static function handle(): DocumentationSidebar
         $menu = new static();
 
         $menu->generate();
+        $menu->sortByPriority();
 
         return new DocumentationSidebar($menu->items);
     }
@@ -100,4 +101,9 @@ protected function canAddRoute(Route $route): bool
     {
         return $route->getPage()->showInNavigation() && ! $route->is(DocumentationPage::homeRouteName());
     }
+
+    protected function sortByPriority(): void
+    {
+        $this->items = $this->items->sortBy(fn (NavItem $item) => $item->getPriority())->values();
+    }
 }

From 5b099efd90446f784b037a70a18874e9e5df15d3 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 19:10:52 +0100
Subject: [PATCH 0360/1422] Handle complex sidebar sorting in generator action

---
 .../Features/Navigation/DocumentationSidebar.php    |  5 -----
 .../GeneratesDocumentationSidebarMenu.php           | 13 ++++++++++++-
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 7427c1df10b..bce1b607ddf 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -41,11 +41,6 @@ public function getGroups(): array
     {
         return $this->getItems()->filter(function (NavItem $item): bool {
             return $item->hasChildren();
-        })->sortBy(function (NavItem $item): int {
-            // Sort by lowest priority found in each group
-            return collect($item->getChildren())->min(
-                fn (NavItem $child): int => $child->getPriority()
-            );
         })->map(function (NavItem $item): string {
             return $item->getIdentifier();
         })->values()->toArray();
diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index c3579ed29dd..7b1265c121b 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -11,6 +11,8 @@
 use Hyde\Foundation\Facades\Routes;
 use Hyde\Foundation\Kernel\RouteCollection;
 
+use function collect;
+
 /**
  * @experimental This class may change significantly before its release.
  *
@@ -104,6 +106,15 @@ protected function canAddRoute(Route $route): bool
 
     protected function sortByPriority(): void
     {
-        $this->items = $this->items->sortBy(fn (NavItem $item) => $item->getPriority())->values();
+        $this->items = $this->items->sortBy(function (NavItem $item): int {
+            if ($item->getChildren()) {
+                // Sort by lowest priority found in each group
+                return collect($item->getChildren())->min(
+                    fn (NavItem $child): int => $child->getPriority()
+                );
+            } else {
+                return $item->getPriority();
+            }
+        })->values();
     }
 }

From e687790c53db49dcd5c85bba2df15b34191076a2 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 19:14:21 +0100
Subject: [PATCH 0361/1422] Deprecate helper method

---
 .../Framework/Features/Navigation/DocumentationSidebar.php  | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index bce1b607ddf..32cafd492d2 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -46,7 +46,11 @@ public function getGroups(): array
         })->values()->toArray();
     }
 
-    /** @return Collection<\Hyde\Framework\Features\Navigation\NavItem> */
+    /**
+     * @deprecated Use children instead
+     *
+     * @return Collection<\Hyde\Framework\Features\Navigation\NavItem>
+     */
     public function getItemsInGroup(?string $group): Collection
     {
         // Todo might not need collections here

From 7269ecb51f7ee0483b5ff7d67f328752e6870ac8 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 19:15:34 +0100
Subject: [PATCH 0362/1422] Extract helper method

---
 .../Navigation/GeneratesDocumentationSidebarMenu.php   | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index 7b1265c121b..3edfdaa41b9 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -108,13 +108,15 @@ protected function sortByPriority(): void
     {
         $this->items = $this->items->sortBy(function (NavItem $item): int {
             if ($item->getChildren()) {
-                // Sort by lowest priority found in each group
-                return collect($item->getChildren())->min(
-                    fn (NavItem $child): int => $child->getPriority()
-                );
+                return $this->getLowestPriorityInGroup($item);
             } else {
                 return $item->getPriority();
             }
         })->values();
     }
+
+    protected function getLowestPriorityInGroup(NavItem $item): int
+    {
+        return collect($item->getChildren())->min(fn (NavItem $child): int => $child->getPriority());
+    }
 }

From ea67d1d762d402d09958b3e8932a4cb732a58feb Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 19:18:06 +0100
Subject: [PATCH 0363/1422] Use clearer helper method

---
 .../Features/Navigation/GeneratesDocumentationSidebarMenu.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index 3edfdaa41b9..4305672648a 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -107,7 +107,7 @@ protected function canAddRoute(Route $route): bool
     protected function sortByPriority(): void
     {
         $this->items = $this->items->sortBy(function (NavItem $item): int {
-            if ($item->getChildren()) {
+            if ($item->hasChildren()) {
                 return $this->getLowestPriorityInGroup($item);
             } else {
                 return $item->getPriority();

From 792e1d7a1a50d82a5e9582cc7867c12aa5c04ee0 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 19:18:36 +0100
Subject: [PATCH 0364/1422] Simplify conditional returns with simple ternary
 return expression

---
 .../Navigation/GeneratesDocumentationSidebarMenu.php      | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index 4305672648a..bf445ddce9b 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -107,11 +107,9 @@ protected function canAddRoute(Route $route): bool
     protected function sortByPriority(): void
     {
         $this->items = $this->items->sortBy(function (NavItem $item): int {
-            if ($item->hasChildren()) {
-                return $this->getLowestPriorityInGroup($item);
-            } else {
-                return $item->getPriority();
-            }
+            return $item->hasChildren()
+                ? $this->getLowestPriorityInGroup($item)
+                : $item->getPriority();
         })->values();
     }
 

From 397de0086d51b19230f12854f967ed8d1fcba790 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 20:18:36 +0100
Subject: [PATCH 0365/1422] Get items directly as all items are evaluated to be
 groups at this point

If there is a single group, the generator puts all null groups into "Other".
---
 .../resources/views/components/docs/sidebar-items.blade.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/resources/views/components/docs/sidebar-items.blade.php b/packages/framework/resources/views/components/docs/sidebar-items.blade.php
index cebd57f4833..b05aad8f57b 100644
--- a/packages/framework/resources/views/components/docs/sidebar-items.blade.php
+++ b/packages/framework/resources/views/components/docs/sidebar-items.blade.php
@@ -8,7 +8,7 @@
 @else
     <ul id="sidebar-items" role="list">
         @php ($collapsible = config('docs.sidebar.collapsible', true))
-        @foreach ($sidebar->getGroups() as $group)
+        @foreach ($sidebar->getItems() as $group)
             <li class="sidebar-group" role="listitem" @if($collapsible) x-data="{ groupOpen: {{ $sidebar->isGroupActive($group) ? 'true' : 'false' }} }" @endif>
                 <header class="sidebar-group-header p-2 px-4 -ml-2 flex justify-between items-center @if($collapsible) group hover:bg-black/10 @endif" @if($collapsible) @click="groupOpen = ! groupOpen" @endif>
                     <h4 class="sidebar-group-heading text-base font-semibold @if($collapsible) cursor-pointer dark:group-hover:text-white @endif">{{ $sidebar->makeGroupTitle($group) }}</h4>

From 2235f56164e5b5bba66882c5648f1a4dc12f64f3 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 20:27:33 +0100
Subject: [PATCH 0366/1422] Update sidebar view to use new navigation item
 format

---
 .../resources/views/components/docs/sidebar-items.blade.php   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/resources/views/components/docs/sidebar-items.blade.php b/packages/framework/resources/views/components/docs/sidebar-items.blade.php
index b05aad8f57b..a0acc5d1b3a 100644
--- a/packages/framework/resources/views/components/docs/sidebar-items.blade.php
+++ b/packages/framework/resources/views/components/docs/sidebar-items.blade.php
@@ -11,13 +11,13 @@
         @foreach ($sidebar->getItems() as $group)
             <li class="sidebar-group" role="listitem" @if($collapsible) x-data="{ groupOpen: {{ $sidebar->isGroupActive($group) ? 'true' : 'false' }} }" @endif>
                 <header class="sidebar-group-header p-2 px-4 -ml-2 flex justify-between items-center @if($collapsible) group hover:bg-black/10 @endif" @if($collapsible) @click="groupOpen = ! groupOpen" @endif>
-                    <h4 class="sidebar-group-heading text-base font-semibold @if($collapsible) cursor-pointer dark:group-hover:text-white @endif">{{ $sidebar->makeGroupTitle($group) }}</h4>
+                    <h4 class="sidebar-group-heading text-base font-semibold @if($collapsible) cursor-pointer dark:group-hover:text-white @endif">{{ Hyde::makeTitle($group->getLabel()) }}</h4>
                     @if($collapsible)
                         @include('hyde::components.docs.sidebar-group-toggle-button')
                     @endif
                 </header>
                 <ul class="sidebar-group-items ml-4 px-2 mb-2" role="list" @if($collapsible) x-show="groupOpen" @endif>
-                    @foreach ($sidebar->getItemsInGroup($group) as $item)
+                    @foreach ($group->getChildren() as $item)
                         @include('hyde::components.docs.sidebar-item', ['grouped' => true])
                     @endforeach
                 </ul>

From 57c425450ca426ec3b6b79a81160e37caed441ab Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 20:44:17 +0100
Subject: [PATCH 0367/1422] Inline granular collection logic

We only need part of the getGroups method, so this inlines those semantics
---
 .../Framework/Features/Navigation/DocumentationSidebar.php   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 32cafd492d2..477105eb864 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -94,7 +94,10 @@ private function isPageIndexPage(): bool
     private function shouldIndexPageBeActive(string $group): bool
     {
         $indexPageHasNoSetGroup = Render::getPage()->navigationMenuGroup() === null;
-        $groupIsTheFirstOneInSidebar = $group === collect($this->getGroups())->first();
+
+        $groupIsTheFirstOneInSidebar = $group === $this->getItems()->firstWhere(function (NavItem $item): bool {
+            return $item->hasChildren();
+        })?->getIdentifier();
 
         return $indexPageHasNoSetGroup && $groupIsTheFirstOneInSidebar;
     }

From c554ad2268aaad964d0d2bbff2eebe4b16964ccd Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 20:49:34 +0100
Subject: [PATCH 0368/1422] Use the identifier for comparison

---
 .../resources/views/components/docs/sidebar-items.blade.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/resources/views/components/docs/sidebar-items.blade.php b/packages/framework/resources/views/components/docs/sidebar-items.blade.php
index a0acc5d1b3a..b2c6832f828 100644
--- a/packages/framework/resources/views/components/docs/sidebar-items.blade.php
+++ b/packages/framework/resources/views/components/docs/sidebar-items.blade.php
@@ -9,7 +9,7 @@
     <ul id="sidebar-items" role="list">
         @php ($collapsible = config('docs.sidebar.collapsible', true))
         @foreach ($sidebar->getItems() as $group)
-            <li class="sidebar-group" role="listitem" @if($collapsible) x-data="{ groupOpen: {{ $sidebar->isGroupActive($group) ? 'true' : 'false' }} }" @endif>
+            <li class="sidebar-group" role="listitem" @if($collapsible) x-data="{ groupOpen: {{ $sidebar->isGroupActive($group->getIdentifier()) ? 'true' : 'false' }} }" @endif>
                 <header class="sidebar-group-header p-2 px-4 -ml-2 flex justify-between items-center @if($collapsible) group hover:bg-black/10 @endif" @if($collapsible) @click="groupOpen = ! groupOpen" @endif>
                     <h4 class="sidebar-group-heading text-base font-semibold @if($collapsible) cursor-pointer dark:group-hover:text-white @endif">{{ Hyde::makeTitle($group->getLabel()) }}</h4>
                     @if($collapsible)

From ba11d33b31b47dd4b32ca71366a8aa7ffbb491cc Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 20:59:10 +0100
Subject: [PATCH 0369/1422] Test sidebar groups are sorted by lowest found
 priority in each group

Moves test for method being deleted
---
 .../AutomaticNavigationConfigurationsTest.php | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 2a38498ec23..f926616f632 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -959,6 +959,34 @@ public function testSidebarAutomaticDropdownItemsWithSameLabelButDifferentGroups
         ]);
     }
 
+    public function testSidebarGroupsAreSortedByLowestFoundPriorityInEachGroup()
+    {
+        $this->assertSidebarEquals([
+            'a', 'b', 'c',
+        ], [
+            new DocumentationPage('foo', ['navigation.group' => 'a', 'navigation.priority' => 1]),
+            new DocumentationPage('bar', ['navigation.group' => 'b', 'navigation.priority' => 2]),
+            new DocumentationPage('baz', ['navigation.group' => 'c', 'navigation.priority' => 3]),
+        ]);
+
+        $this->assertSidebarEquals([
+            'c', 'b', 'a',
+        ], [
+            new DocumentationPage('foo', ['navigation.group' => 'a', 'navigation.priority' => 3]),
+            new DocumentationPage('bar', ['navigation.group' => 'b', 'navigation.priority' => 2]),
+            new DocumentationPage('baz', ['navigation.group' => 'c', 'navigation.priority' => 1]),
+        ]);
+
+        $this->assertSidebarEquals([
+            'c', 'a', 'b',
+        ], [
+            new DocumentationPage('a', ['navigation.group' => 'a', 'navigation.priority' => 100]),
+            new DocumentationPage('b', ['navigation.group' => 'b', 'navigation.priority' => 200]),
+            new DocumentationPage('c', ['navigation.group' => 'c', 'navigation.priority' => 300]),
+            new DocumentationPage('d', ['navigation.group' => 'c', 'navigation.priority' => 10]),
+        ]);
+    }
+
     // Testing helpers
 
     protected function assertSidebarEquals(array $expected, array $menuPages): void

From 035dcd18ed9ee863bcf59eb6c7a3a3de4394b294 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 21:01:29 +0100
Subject: [PATCH 0370/1422] Breaking: Remove `DocumentationSidebar::getGroups`
 method

---
 .../Navigation/DocumentationSidebar.php       | 14 ---------
 .../Services/DocumentationSidebarTest.php     | 30 -------------------
 2 files changed, 44 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 477105eb864..59b8adf58a4 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -32,20 +32,6 @@ public function hasGroups(): bool
         })->isNotEmpty();
     }
 
-    /**
-     * @deprecated Use children instead
-     *
-     * @return array<string>
-     */
-    public function getGroups(): array
-    {
-        return $this->getItems()->filter(function (NavItem $item): bool {
-            return $item->hasChildren();
-        })->map(function (NavItem $item): string {
-            return $item->getIdentifier();
-        })->values()->toArray();
-    }
-
     /**
      * @deprecated Use children instead
      *
diff --git a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
index 76ca6abe6f9..4339193631a 100644
--- a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
+++ b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
@@ -184,36 +184,6 @@ public function testHasGroupsReturnsTrueWhenThereAreMultipleGroupsMixedWithDefau
         $this->assertTrue(DocumentationSidebar::create()->hasGroups());
     }
 
-    public function testGetGroupsReturnsEmptyArrayWhenThereAreNoGroups()
-    {
-        $this->assertEquals([], DocumentationSidebar::create()->getGroups());
-    }
-
-    public function testGetGroupsReturnsArrayOfGroupsWhenThereAreGroups()
-    {
-        $this->makePage('foo', ['navigation.group' => 'bar']);
-
-        $this->assertEquals(['bar'], DocumentationSidebar::create()->getGroups());
-    }
-
-    public function testGetGroupsReturnsArrayWithNoDuplicates()
-    {
-        $this->makePage('foo', ['navigation.group' => 'bar']);
-        $this->makePage('bar', ['navigation.group' => 'bar']);
-        $this->makePage('baz', ['navigation.group' => 'baz']);
-
-        $this->assertEquals(['bar', 'baz'], DocumentationSidebar::create()->getGroups());
-    }
-
-    public function testGroupsAreSortedByLowestFoundPriorityInEachGroup()
-    {
-        $this->makePage('foo', ['navigation.group' => 'bar', 'navigation.priority' => 100]);
-        $this->makePage('bar', ['navigation.group' => 'bar', 'navigation.priority' => 200]);
-        $this->makePage('baz', ['navigation.group' => 'baz', 'navigation.priority' => 10]);
-
-        $this->assertEquals(['baz', 'bar'], DocumentationSidebar::create()->getGroups());
-    }
-
     public function testGetItemsInGroupReturnsEmptyCollectionWhenThereAreNoItems()
     {
         $this->assertEquals(collect(), DocumentationSidebar::create()->getItemsInGroup('foo'));

From e623d7b05d0cb60f82c2a3dd5c7db4b444ee747c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 21:06:50 +0100
Subject: [PATCH 0371/1422] Add additional sidebar grouping test

Test all sidebar items are placed in groups when at least one item is grouped
---
 .../Feature/AutomaticNavigationConfigurationsTest.php | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index f926616f632..cd9dc14ecca 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -987,6 +987,17 @@ public function testSidebarGroupsAreSortedByLowestFoundPriorityInEachGroup()
         ]);
     }
 
+    public function testAllSidebarItemsArePlacedInGroupsWhenAtLeastOneItemIsGrouped()
+    {
+        $this->assertSidebarEquals([
+            ['label' => 'foo', 'children' => ['Grouped']],
+            ['label' => 'Other', 'children' => ['Ungrouped']],
+        ], [
+            new DocumentationPage('grouped', ['navigation.group' => 'foo']),
+            new DocumentationPage('ungrouped'),
+        ]);
+    }
+
     // Testing helpers
 
     protected function assertSidebarEquals(array $expected, array $menuPages): void

From d4849778504d519e984d516511be0fd2e2dcd9e6 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 21:25:32 +0100
Subject: [PATCH 0372/1422] Test documentation index page is not added to
 sidebar

---
 .../tests/Feature/AutomaticNavigationConfigurationsTest.php  | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index cd9dc14ecca..de132b726ae 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -543,6 +543,11 @@ public function testOnlyDocumentationPagesAreAddedToSidebar()
         ]);
     }
 
+    public function testDocumentationIndexPageIsNotAddedToSidebar()
+    {
+        $this->assertSidebarEquals([], [new DocumentationPage('index')]);
+    }
+
     // Documentation sidebar front matter tests
 
     public function testSidebarWithFrontMatterPriority()

From ae2d500309b643fbb213ff5cd58aae84d1b2253f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 21:28:02 +0100
Subject: [PATCH 0373/1422] Test sidebar item grouping is case insensitive

---
 .../Feature/AutomaticNavigationConfigurationsTest.php    | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index de132b726ae..25c7eecf10c 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -964,6 +964,15 @@ public function testSidebarAutomaticDropdownItemsWithSameLabelButDifferentGroups
         ]);
     }
 
+    public function testSidebarItemGroupingIsCaseInsensitive()
+    {
+        $this->assertSidebarEquals(['foo'], [
+            new DocumentationPage('foo', ['navigation.group' => 'foo']),
+            new DocumentationPage('bar', ['navigation.group' => 'Foo']),
+            new DocumentationPage('baz', ['navigation.group' => 'FOO']),
+        ]);
+    }
+
     public function testSidebarGroupsAreSortedByLowestFoundPriorityInEachGroup()
     {
         $this->assertSidebarEquals([

From c302496d24c0d1e5e762a05bbfdad55122a3891a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 21:30:23 +0100
Subject: [PATCH 0374/1422] Breaking: Remove
 `DocumentationSidebar::getItemsInGroup` method

---
 .../Navigation/DocumentationSidebar.php       | 15 ------
 .../Services/DocumentationSidebarTest.php     | 54 -------------------
 2 files changed, 69 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 59b8adf58a4..c7139248ef8 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -11,8 +11,6 @@
 use Illuminate\Support\Collection;
 use Illuminate\Support\Str;
 
-use function collect;
-
 /** @deprecated Use the new NavigationMenu class instead */
 class DocumentationSidebar extends NavigationMenu
 {
@@ -32,19 +30,6 @@ public function hasGroups(): bool
         })->isNotEmpty();
     }
 
-    /**
-     * @deprecated Use children instead
-     *
-     * @return Collection<\Hyde\Framework\Features\Navigation\NavItem>
-     */
-    public function getItemsInGroup(?string $group): Collection
-    {
-        // Todo might not need collections here
-        return collect($this->getItems()->first(function (NavItem $item) use ($group): bool {
-            return $item->getIdentifier() === Str::slug($group);
-        })?->getChildren() ?? []);
-    }
-
     /**
      * Is a page within the group the current page? This is used to determine if the sidebar group should be open when loading the page.
      *
diff --git a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
index 4339193631a..06ec3c00223 100644
--- a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
+++ b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
@@ -184,60 +184,6 @@ public function testHasGroupsReturnsTrueWhenThereAreMultipleGroupsMixedWithDefau
         $this->assertTrue(DocumentationSidebar::create()->hasGroups());
     }
 
-    public function testGetItemsInGroupReturnsEmptyCollectionWhenThereAreNoItems()
-    {
-        $this->assertEquals(collect(), DocumentationSidebar::create()->getItemsInGroup('foo'));
-    }
-
-    public function testGetItemsInGroupReturnsCollectionOfItemsInGroup()
-    {
-        $this->makePage('foo', ['navigation.group' => 'bar']);
-        $this->makePage('bar', ['navigation.group' => 'bar']);
-        $this->makePage('baz', ['navigation.group' => 'baz']);
-
-        $this->assertEquals(
-            collect([
-                NavItem::fromRoute(Routes::get('docs/bar'), priority: 999),
-                NavItem::fromRoute(Routes::get('docs/foo'), priority: 999),
-            ]),
-            DocumentationSidebar::create()->getItemsInGroup('bar')
-        );
-
-        $this->assertEquals(
-            collect([
-                NavItem::fromRoute(Routes::get('docs/baz'), priority: 999),
-            ]),
-            DocumentationSidebar::create()->getItemsInGroup('baz')
-        );
-    }
-
-    public function testGetItemsInGroupNormalizesGroupNameToSlugFormat()
-    {
-        $this->makePage('a', ['navigation.group' => 'foo bar']);
-        $this->makePage('b', ['navigation.group' => 'Foo Bar']);
-        $this->makePage('c', ['navigation.group' => 'foo-bar']);
-
-        $this->assertEquals(
-            collect([
-                NavItem::fromRoute(Routes::get('docs/a'), priority: 999),
-                NavItem::fromRoute(Routes::get('docs/b'), priority: 999),
-                NavItem::fromRoute(Routes::get('docs/c'), priority: 999),
-            ]),
-            DocumentationSidebar::create()->getItemsInGroup('Foo bar')
-        );
-    }
-
-    public function testGetItemsInGroupDoesNotIncludeItemsWithHiddenFrontMatter()
-    {
-        $this->makePage('a', ['navigation.hidden' => true, 'navigation.group' => 'foo']);
-        $this->makePage('b', ['navigation.group' => 'foo']);
-
-        $this->assertEquals(
-            collect([NavItem::fromRoute(Routes::get('docs/b'), priority: 999)]),
-            DocumentationSidebar::create()->getItemsInGroup('foo')
-        );
-    }
-
     public function testGetItemsInGroupDoesNotIncludeDocsIndex()
     {
         Filesystem::touch('_docs/foo.md');

From 403e2bf175041a3130dea368518743eda92f2a44 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 21:40:54 +0100
Subject: [PATCH 0375/1422] Refactor to simplify internal logic

---
 .../GeneratesDocumentationSidebarMenu.php     | 24 +++++++------------
 1 file changed, 8 insertions(+), 16 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index bf445ddce9b..e45d4816eec 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -4,7 +4,6 @@
 
 namespace Hyde\Framework\Features\Navigation;
 
-use Illuminate\Support\Str;
 use Hyde\Support\Models\Route;
 use Hyde\Pages\DocumentationPage;
 use Illuminate\Support\Collection;
@@ -44,14 +43,14 @@ protected function generate(): void
     {
         $routes = Routes::getRoutes(DocumentationPage::class);
 
-        $groups = $this->findSidebarGroups($routes);
+        $useGroups = $this->usesSidebarGroups($routes);
 
-        $routes->each(function (Route $route) use ($groups): void {
+        $routes->each(function (Route $route) use ($useGroups): void {
             if ($this->canAddRoute($route)) {
                 $item = NavItem::fromRoute($route);
                 $group = $item->getGroup();
 
-                if ($groups) {
+                if ($useGroups) {
                     if (! $group) {
                         $group = 'Other';
                     }
@@ -82,21 +81,14 @@ protected function generate(): void
         }
     }
 
-    /** @experimental Might not actually be needed now that groups default to null */
-    protected function findSidebarGroups(RouteCollection $routes): array
+    protected function usesSidebarGroups(RouteCollection $routes): bool
     {
         // In order to know if we should use groups in the sidebar,
-        // we need to loop through all the pages and see if they have a group set
+        // we need to loop through the pages and see if they have a group set
 
-        $groups = [];
-
-        $routes->each(function (Route $route) use (&$groups): void {
-            if ($route->getPage()->data('navigation.group')) {
-                $groups[Str::slug($route->getPage()->data('navigation.group'))] = true;
-            }
-        });
-
-        return array_keys($groups);
+        return $routes->first(function (Route $route): bool {
+            return filled($route->getPage()->data('navigation.group'));
+        }) !== null;
     }
 
     protected function canAddRoute(Route $route): bool

From 5ae82eadce173c1aa6afec3e89ac404a3e58077c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 21:43:21 +0100
Subject: [PATCH 0376/1422] Support category matter for comparison

---
 .../Features/Navigation/GeneratesDocumentationSidebarMenu.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index e45d4816eec..5ed8e86708b 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -87,7 +87,7 @@ protected function usesSidebarGroups(RouteCollection $routes): bool
         // we need to loop through the pages and see if they have a group set
 
         return $routes->first(function (Route $route): bool {
-            return filled($route->getPage()->data('navigation.group'));
+            return filled($route->getPage()->data('navigation.group')) || filled($route->getPage()->data('navigation.category'));
         }) !== null;
     }
 

From 27c5b2d97f2467e78ad4dddf9cac9c5cd2daa201 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 21:44:43 +0100
Subject: [PATCH 0377/1422] Revert "Support category matter for comparison"

This reverts commit 5ae82eadce173c1aa6afec3e89ac404a3e58077c as it is not necessary since we are actually checking the already normalized navigation data
---
 .../Features/Navigation/GeneratesDocumentationSidebarMenu.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index 5ed8e86708b..e45d4816eec 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -87,7 +87,7 @@ protected function usesSidebarGroups(RouteCollection $routes): bool
         // we need to loop through the pages and see if they have a group set
 
         return $routes->first(function (Route $route): bool {
-            return filled($route->getPage()->data('navigation.group')) || filled($route->getPage()->data('navigation.category'));
+            return filled($route->getPage()->data('navigation.group'));
         }) !== null;
     }
 

From 622f63520deb0d021382f4eb056adc366804b306 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 21:45:44 +0100
Subject: [PATCH 0378/1422] Use specific accessor to get same data

Makes it clearer where the data is coming from
---
 .../Features/Navigation/GeneratesDocumentationSidebarMenu.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index e45d4816eec..63f629f8024 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -87,7 +87,7 @@ protected function usesSidebarGroups(RouteCollection $routes): bool
         // we need to loop through the pages and see if they have a group set
 
         return $routes->first(function (Route $route): bool {
-            return filled($route->getPage()->data('navigation.group'));
+            return filled($route->getPage()->navigationMenuGroup());
         }) !== null;
     }
 

From 9d5162adeb27da27f524fc4fd2c0edf9aea69d5b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 22:42:06 +0100
Subject: [PATCH 0379/1422] Update todo

---
 .../Features/Navigation/GeneratesDocumentationSidebarMenu.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index 63f629f8024..4000d84900e 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -58,7 +58,7 @@ protected function generate(): void
                     $groupItem = $this->items->get($group);
 
                     if ($groupItem === null) {
-                        // Todo get group label
+                        // Todo search for group label in config
                         $groupItem = NavItem::dropdown($group, []);
                     }
 

From d55fa5c309066ae901532f0a44e54061cc8f7e5c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 22:42:32 +0100
Subject: [PATCH 0380/1422] Add to todo

---
 .../Features/Navigation/GeneratesDocumentationSidebarMenu.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index 4000d84900e..41a1e53658a 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -58,7 +58,7 @@ protected function generate(): void
                     $groupItem = $this->items->get($group);
 
                     if ($groupItem === null) {
-                        // Todo search for group label in config
+                        // Todo search for group label in config (we can also search for other labels in the group before slugifying them)
                         $groupItem = NavItem::dropdown($group, []);
                     }
 

From 05c391b7e850b3ec0f83fa8b676ebd0197a762ad Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 22:46:38 +0100
Subject: [PATCH 0381/1422] Format back the grouped navigation item titles

---
 .../components/docs/sidebar-items.blade.php   |  2 +-
 .../GeneratesDocumentationSidebarMenu.php     |  3 +-
 .../AutomaticNavigationConfigurationsTest.php | 45 +++++++++----------
 .../Services/DocumentationSidebarTest.php     |  6 +--
 4 files changed, 26 insertions(+), 30 deletions(-)

diff --git a/packages/framework/resources/views/components/docs/sidebar-items.blade.php b/packages/framework/resources/views/components/docs/sidebar-items.blade.php
index b2c6832f828..37a416bdc89 100644
--- a/packages/framework/resources/views/components/docs/sidebar-items.blade.php
+++ b/packages/framework/resources/views/components/docs/sidebar-items.blade.php
@@ -11,7 +11,7 @@
         @foreach ($sidebar->getItems() as $group)
             <li class="sidebar-group" role="listitem" @if($collapsible) x-data="{ groupOpen: {{ $sidebar->isGroupActive($group->getIdentifier()) ? 'true' : 'false' }} }" @endif>
                 <header class="sidebar-group-header p-2 px-4 -ml-2 flex justify-between items-center @if($collapsible) group hover:bg-black/10 @endif" @if($collapsible) @click="groupOpen = ! groupOpen" @endif>
-                    <h4 class="sidebar-group-heading text-base font-semibold @if($collapsible) cursor-pointer dark:group-hover:text-white @endif">{{ Hyde::makeTitle($group->getLabel()) }}</h4>
+                    <h4 class="sidebar-group-heading text-base font-semibold @if($collapsible) cursor-pointer dark:group-hover:text-white @endif">{{ $group->getLabel() }}</h4>
                     @if($collapsible)
                         @include('hyde::components.docs.sidebar-group-toggle-button')
                     @endif
diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index 41a1e53658a..1168c20d964 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -4,6 +4,7 @@
 
 namespace Hyde\Framework\Features\Navigation;
 
+use Hyde\Hyde;
 use Hyde\Support\Models\Route;
 use Hyde\Pages\DocumentationPage;
 use Illuminate\Support\Collection;
@@ -59,7 +60,7 @@ protected function generate(): void
 
                     if ($groupItem === null) {
                         // Todo search for group label in config (we can also search for other labels in the group before slugifying them)
-                        $groupItem = NavItem::dropdown($group, []);
+                        $groupItem = NavItem::dropdown(Hyde::makeTitle($group), []);
                     }
 
                     $groupItem->addChild($item);
diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 25c7eecf10c..c88df773866 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -622,7 +622,7 @@ public function testSidebarWithFrontMatterVisible()
     public function testSidebarWithFrontMatterGroup()
     {
         $this->assertSidebarEquals([[
-            'label' => 'group-1', // Todo: Should use proper group name
+            'label' => 'Group 1',
             'children' => ['Foo', 'Bar', 'Baz']],
         ], [
             new DocumentationPage('foo', ['navigation.group' => 'Group 1']),
@@ -634,7 +634,7 @@ public function testSidebarWithFrontMatterGroup()
     public function testSidebarWithFrontMatterCategory()
     {
         $this->assertSidebarEquals([[
-            'label' => 'group-1', // Todo: Should use proper group name
+            'label' => 'Group 1',
             'children' => ['Foo', 'Bar', 'Baz']],
         ], [
             new DocumentationPage('foo', ['navigation.category' => 'Group 1']),
@@ -706,7 +706,7 @@ public function testSidebarWithFrontMatterGroupAndCategory()
         // Since the main key in the navigation schema is 'group', that takes precedence over its 'category' alias
 
         $this->assertSidebarEquals([[
-            'label' => 'group-1', // Todo: Should use proper group name
+            'label' => 'Group 1',
             'children' => ['Foo', 'Bar', 'Baz'],
         ]], [
             new DocumentationPage('foo', ['navigation.group' => 'Group 1', 'navigation.category' => 'Group 2']),
@@ -850,7 +850,7 @@ public function testSidebarWithConfigHidden()
     public function testDocumentationPagesInSubdirectoriesAreAddedToSidebar()
     {
         $this->assertSidebarEquals([[
-            'label' => 'about', // Todo: Should use proper group name
+            'label' => 'About',
             'children' => ['Foo', 'Bar', 'Baz'],
         ]], [
             new DocumentationPage('about/foo'),
@@ -867,7 +867,7 @@ public function testPagesInSubdirectoriesAreAddedToSidebarRegardlessOfConfigurat
             config(['docs.sidebar.subdirectories' => $option]);
 
             $this->assertSidebarEquals([[
-                'label' => 'about', // Todo: Should use proper group name
+                'label' => 'About',
                 'children' => ['Foo', 'Bar', 'Baz'],
             ]], [
                 new DocumentationPage('about/foo'),
@@ -903,9 +903,8 @@ public function testSidebarItemsWithTheSameLabelAreNotFilteredForDuplicatesRegar
     public function testSidebarItemsWithSameLabelButDifferentGroupsAreNotFiltered()
     {
         $this->assertSidebarEquals([
-            // Todo: Should use proper group name
-            ['label' => 'group-1', 'children' => ['Foo']],
-            ['label' => 'group-2', 'children' => ['Foo']],
+            ['label' => 'Group 1', 'children' => ['Foo']],
+            ['label' => 'Group 2', 'children' => ['Foo']],
         ], [
             new DocumentationPage('foo', ['navigation.label' => 'Foo', 'navigation.group' => 'Group 1']),
             new DocumentationPage('bar', ['navigation.label' => 'Foo', 'navigation.group' => 'Group 2']),
@@ -915,9 +914,8 @@ public function testSidebarItemsWithSameLabelButDifferentGroupsAreNotFiltered()
     public function testSidebarDropdownItemsWithSameLabelButDifferentGroupsAreFiltered()
     {
         $this->assertSidebarEquals([
-            // Todo: Should use proper group name
-            ['label' => 'group-1', 'children' => ['Foo']],
-            ['label' => 'group-2', 'children' => ['Foo']],
+            ['label' => 'Group 1', 'children' => ['Foo']],
+            ['label' => 'Group 2', 'children' => ['Foo']],
         ], [
             new DocumentationPage('one/foo', ['navigation.group' => 'Group 1']),
             new DocumentationPage('two/foo', ['navigation.group' => 'Group 2']),
@@ -927,9 +925,8 @@ public function testSidebarDropdownItemsWithSameLabelButDifferentGroupsAreFilter
     public function testSidebarAutomaticDropdownItemsWithSameLabelButDifferentGroupsAreFiltered()
     {
         $this->assertSidebarEquals([
-            // Todo: Should use proper group name
-            ['label' => 'one', 'children' => ['Foo']],
-            ['label' => 'two', 'children' => ['Foo']],
+            ['label' => 'One', 'children' => ['Foo']],
+            ['label' => 'Two', 'children' => ['Foo']],
         ], [
             new DocumentationPage('one/foo'),
             new DocumentationPage('two/foo'),
@@ -941,9 +938,8 @@ public function testSidebarDropdownItemsWithSameLabelButDifferentGroupsAreNotFil
         config(['docs.flattened_output_paths' => false]);
 
         $this->assertSidebarEquals([
-            // Todo: Should use proper group name
-            ['label' => 'group-1', 'children' => ['Foo']],
-            ['label' => 'group-2', 'children' => ['Foo']],
+            ['label' => 'Group 1', 'children' => ['Foo']],
+            ['label' => 'Group 2', 'children' => ['Foo']],
         ], [
             new DocumentationPage('one/foo', ['navigation.group' => 'Group 1']),
             new DocumentationPage('two/foo', ['navigation.group' => 'Group 2']),
@@ -955,9 +951,8 @@ public function testSidebarAutomaticDropdownItemsWithSameLabelButDifferentGroups
         config(['docs.flattened_output_paths' => false]);
 
         $this->assertSidebarEquals([
-            // Todo: Should use proper group name
-            ['label' => 'one', 'children' => ['Foo']],
-            ['label' => 'two', 'children' => ['Foo']],
+            ['label' => 'One', 'children' => ['Foo']],
+            ['label' => 'Two', 'children' => ['Foo']],
         ], [
             new DocumentationPage('one/foo'),
             new DocumentationPage('two/foo'),
@@ -966,7 +961,7 @@ public function testSidebarAutomaticDropdownItemsWithSameLabelButDifferentGroups
 
     public function testSidebarItemGroupingIsCaseInsensitive()
     {
-        $this->assertSidebarEquals(['foo'], [
+        $this->assertSidebarEquals(['Foo'], [
             new DocumentationPage('foo', ['navigation.group' => 'foo']),
             new DocumentationPage('bar', ['navigation.group' => 'Foo']),
             new DocumentationPage('baz', ['navigation.group' => 'FOO']),
@@ -976,7 +971,7 @@ public function testSidebarItemGroupingIsCaseInsensitive()
     public function testSidebarGroupsAreSortedByLowestFoundPriorityInEachGroup()
     {
         $this->assertSidebarEquals([
-            'a', 'b', 'c',
+            'A', 'B', 'C',
         ], [
             new DocumentationPage('foo', ['navigation.group' => 'a', 'navigation.priority' => 1]),
             new DocumentationPage('bar', ['navigation.group' => 'b', 'navigation.priority' => 2]),
@@ -984,7 +979,7 @@ public function testSidebarGroupsAreSortedByLowestFoundPriorityInEachGroup()
         ]);
 
         $this->assertSidebarEquals([
-            'c', 'b', 'a',
+            'C', 'B', 'A',
         ], [
             new DocumentationPage('foo', ['navigation.group' => 'a', 'navigation.priority' => 3]),
             new DocumentationPage('bar', ['navigation.group' => 'b', 'navigation.priority' => 2]),
@@ -992,7 +987,7 @@ public function testSidebarGroupsAreSortedByLowestFoundPriorityInEachGroup()
         ]);
 
         $this->assertSidebarEquals([
-            'c', 'a', 'b',
+            'C', 'A', 'B',
         ], [
             new DocumentationPage('a', ['navigation.group' => 'a', 'navigation.priority' => 100]),
             new DocumentationPage('b', ['navigation.group' => 'b', 'navigation.priority' => 200]),
@@ -1004,7 +999,7 @@ public function testSidebarGroupsAreSortedByLowestFoundPriorityInEachGroup()
     public function testAllSidebarItemsArePlacedInGroupsWhenAtLeastOneItemIsGrouped()
     {
         $this->assertSidebarEquals([
-            ['label' => 'foo', 'children' => ['Grouped']],
+            ['label' => 'Foo', 'children' => ['Grouped']],
             ['label' => 'Other', 'children' => ['Ungrouped']],
         ], [
             new DocumentationPage('grouped', ['navigation.group' => 'foo']),
diff --git a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
index 06ec3c00223..e6bb1b17868 100644
--- a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
+++ b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
@@ -280,10 +280,10 @@ public function testCanHaveMultipleGroupedPagesWithTheSameNameLabels()
 
         $this->assertEquals(
             collect([
-                NavItem::dropdown('bar', [
+                NavItem::dropdown('Bar', [
                     NavItem::fromRoute(Routes::get('docs/bar'), priority: 999),
                 ]),
-                NavItem::dropdown('foo', [
+                NavItem::dropdown('Foo', [
                     NavItem::fromRoute(Routes::get('docs/foo'), priority: 999),
                 ]),
             ]),
@@ -301,7 +301,7 @@ public function testDuplicateLabelsWithinTheSameGroupAreNotRemoved()
 
         $this->assertEquals(
             collect([
-                NavItem::dropdown('foo', [
+                NavItem::dropdown('Foo', [
                     NavItem::fromRoute(Routes::get('docs/bar'), priority: 999),
                     NavItem::fromRoute(Routes::get('docs/foo'), priority: 999),
                 ]),

From 0562e13df0f4fc8b4854202e9849ca67108308fa Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 22:54:18 +0100
Subject: [PATCH 0382/1422] Refactor view to use dynamic class directives

---
 .../resources/views/components/docs/sidebar-items.blade.php   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/resources/views/components/docs/sidebar-items.blade.php b/packages/framework/resources/views/components/docs/sidebar-items.blade.php
index 37a416bdc89..615ea53dcd4 100644
--- a/packages/framework/resources/views/components/docs/sidebar-items.blade.php
+++ b/packages/framework/resources/views/components/docs/sidebar-items.blade.php
@@ -10,8 +10,8 @@
         @php ($collapsible = config('docs.sidebar.collapsible', true))
         @foreach ($sidebar->getItems() as $group)
             <li class="sidebar-group" role="listitem" @if($collapsible) x-data="{ groupOpen: {{ $sidebar->isGroupActive($group->getIdentifier()) ? 'true' : 'false' }} }" @endif>
-                <header class="sidebar-group-header p-2 px-4 -ml-2 flex justify-between items-center @if($collapsible) group hover:bg-black/10 @endif" @if($collapsible) @click="groupOpen = ! groupOpen" @endif>
-                    <h4 class="sidebar-group-heading text-base font-semibold @if($collapsible) cursor-pointer dark:group-hover:text-white @endif">{{ $group->getLabel() }}</h4>
+                <header @class(['sidebar-group-header p-2 px-4 -ml-2 flex justify-between items-center', 'group hover:bg-black/10' => $collapsible]) @if($collapsible) @click="groupOpen = ! groupOpen" @endif>
+                    <h4 @class(['sidebar-group-heading text-base font-semibold', 'cursor-pointer dark:group-hover:text-white' => $collapsible])>{{ $group->getLabel() }}</h4>
                     @if($collapsible)
                         @include('hyde::components.docs.sidebar-group-toggle-button')
                     @endif

From 17441a679ca3d7e923c2c7aa3ed9237022f459dd Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 08:18:31 +0100
Subject: [PATCH 0383/1422] Print states on assertion fail

---
 .../tests/Feature/AutomaticNavigationConfigurationsTest.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index c88df773866..9243f775ebd 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -1137,7 +1137,7 @@ public function assertEquals(array $expected, bool $strict = false): static
             }
         }
 
-        $this->test->assertCount(count($expected), $this->state(), 'The expected state has a different count than the actual state');
+        $this->test->assertCount(count($expected), $this->state(), 'The expected state has a different count than the actual state'."\n".json_encode($this->state(), JSON_PRETTY_PRINT));
 
         return $this;
     }

From 71e44c3b9284ec9ca3c75ba5239eb56b5769e297 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 08:19:15 +0100
Subject: [PATCH 0384/1422] Test sidebar item grouping is normalized

---
 .../Feature/AutomaticNavigationConfigurationsTest.php  | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 9243f775ebd..ac84dbcc47f 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -968,6 +968,16 @@ public function testSidebarItemGroupingIsCaseInsensitive()
         ]);
     }
 
+    public function testSidebarItemGroupingIsNormalized()
+    {
+        $this->assertSidebarEquals(['Hello World'], [
+            new DocumentationPage('foo', ['navigation.group' => 'hello world']),
+            new DocumentationPage('bar', ['navigation.group' => 'hello-world']),
+            new DocumentationPage('baz', ['navigation.group' => 'hello_world']),
+            new DocumentationPage('qux', ['navigation.group' => 'Hello World']),
+        ]);
+    }
+
     public function testSidebarGroupsAreSortedByLowestFoundPriorityInEachGroup()
     {
         $this->assertSidebarEquals([

From 758cb3762acb0f0fdbf5d205ff1e42b682383627 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 08:26:06 +0100
Subject: [PATCH 0385/1422] Sketch out test

---
 .../Feature/AutomaticNavigationConfigurationsTest.php  | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index ac84dbcc47f..5a7205c1d10 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -978,6 +978,16 @@ public function testSidebarItemGroupingIsNormalized()
         ]);
     }
 
+    public function testSidebarLabelsRetainBestFormatting()
+    {
+        $this->markTestSkipped('Not yet implemented');
+
+        $this->assertSidebarEquals(['GitHub'], [
+            new DocumentationPage('foo', ['navigation.group' => 'GitHub']),
+            new DocumentationPage('bar', ['navigation.group' => 'github']),
+        ]);
+    }
+
     public function testSidebarGroupsAreSortedByLowestFoundPriorityInEachGroup()
     {
         $this->assertSidebarEquals([

From cca7269f57b8f0f74621710b7c2bf99fa8622812 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 08:30:48 +0100
Subject: [PATCH 0386/1422] Extract helper method

---
 .../Navigation/GeneratesDocumentationSidebarMenu.php   | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index 1168c20d964..28c89a78325 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -59,8 +59,7 @@ protected function generate(): void
                     $groupItem = $this->items->get($group);
 
                     if ($groupItem === null) {
-                        // Todo search for group label in config (we can also search for other labels in the group before slugifying them)
-                        $groupItem = NavItem::dropdown(Hyde::makeTitle($group), []);
+                        $groupItem = NavItem::dropdown($this->makeTitleForGroup($group), []);
                     }
 
                     $groupItem->addChild($item);
@@ -92,6 +91,13 @@ protected function usesSidebarGroups(RouteCollection $routes): bool
         }) !== null;
     }
 
+    protected function makeTitleForGroup(string $group): string
+    {
+        // Todo search for group label in config (we can also search for other labels in the group before slugifying them)
+
+        return Hyde::makeTitle($group);
+    }
+
     protected function canAddRoute(Route $route): bool
     {
         return $route->getPage()->showInNavigation() && ! $route->is(DocumentationPage::homeRouteName());

From ed9701aec2eee78be175c921f76fc893826e205d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 08:37:09 +0100
Subject: [PATCH 0387/1422] Move sidebar group title generation to action

---
 .../GeneratesDocumentationSidebarMenu.php      |  3 ++-
 .../AutomaticNavigationConfigurationsTest.php  |  9 +++++++++
 .../Services/DocumentationSidebarTest.php      | 18 ------------------
 3 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index 28c89a78325..20becf179de 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -5,6 +5,7 @@
 namespace Hyde\Framework\Features\Navigation;
 
 use Hyde\Hyde;
+use Hyde\Facades\Config;
 use Hyde\Support\Models\Route;
 use Hyde\Pages\DocumentationPage;
 use Illuminate\Support\Collection;
@@ -95,7 +96,7 @@ protected function makeTitleForGroup(string $group): string
     {
         // Todo search for group label in config (we can also search for other labels in the group before slugifying them)
 
-        return Hyde::makeTitle($group);
+        return Config::getNullableString("docs.sidebar_group_labels.$group") ?? Hyde::makeTitle($group);
     }
 
     protected function canAddRoute(Route $route): bool
diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 5a7205c1d10..03fc8d38a94 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -988,6 +988,15 @@ public function testSidebarLabelsRetainBestFormatting()
         ]);
     }
 
+    public function testSidebarLabelsCanBeSetInConfig()
+    {
+        config(['docs.sidebar_group_labels' => ['foo' => 'Hello world!']]);
+
+        $this->assertSidebarEquals(['Hello world!'], [
+            new DocumentationPage('foo', ['navigation.group' => 'foo']),
+        ]);
+    }
+
     public function testSidebarGroupsAreSortedByLowestFoundPriorityInEachGroup()
     {
         $this->assertSidebarEquals([
diff --git a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
index e6bb1b17868..c7d79c3faad 100644
--- a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
+++ b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
@@ -252,24 +252,6 @@ public function testAutomaticIndexPageGroupExpansionRespectsCustomNavigationMenu
         $this->assertTrue(DocumentationSidebar::create()->isGroupActive('baz'));
     }
 
-    public function testMakeGroupTitleTurnsGroupKeyIntoTitle()
-    {
-        $this->assertSame('Hello World', DocumentationSidebar::create()->makeGroupTitle('hello world'));
-        $this->assertSame('Hello World', DocumentationSidebar::create()->makeGroupTitle('hello-world'));
-        $this->assertSame('Hello World', DocumentationSidebar::create()->makeGroupTitle('hello_world'));
-        $this->assertSame('Hello World', DocumentationSidebar::create()->makeGroupTitle('helloWorld'));
-    }
-
-    public function testMakeGroupTitleUsesConfiguredSidebarGroupLabelsWhenAvailable()
-    {
-        Config::set('docs.sidebar_group_labels', [
-            'example' => 'Hello world!',
-        ]);
-
-        $this->assertSame('Hello world!', DocumentationSidebar::create()->makeGroupTitle('example'));
-        $this->assertSame('Default', DocumentationSidebar::create()->makeGroupTitle('default'));
-    }
-
     public function testCanHaveMultipleGroupedPagesWithTheSameNameLabels()
     {
         $this->makePage('foo', ['navigation.group' => 'foo', 'navigation.label' => 'Foo']);

From 047950508cf76354e1a1c67b3e5c17dd93be1a34 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 08:38:17 +0100
Subject: [PATCH 0388/1422] Breaking: Remove method
 `DocumentationSidebar::makeGroupTitle`

---
 .../Features/Navigation/DocumentationSidebar.php     | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index c7139248ef8..413bf51d736 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -4,8 +4,6 @@
 
 namespace Hyde\Framework\Features\Navigation;
 
-use Hyde\Hyde;
-use Hyde\Facades\Config;
 use Hyde\Pages\DocumentationPage;
 use Hyde\Support\Facades\Render;
 use Illuminate\Support\Collection;
@@ -47,16 +45,6 @@ public function isGroupActive(?string $group): bool
         return $groupMatchesCurrentPageGroup || $currentPageIsIndexPageAndShouldBeActive;
     }
 
-    /**
-     * @deprecated With the new NavItem system this should not be necessary, as the parent has a title
-     *
-     * @todo Get title from instance
-     */
-    public function makeGroupTitle(?string $group): string
-    {
-        return Config::getNullableString("docs.sidebar_group_labels.$group") ?? Hyde::makeTitle($group ?? 'Other');
-    }
-
     private function isPageIndexPage(): bool
     {
         return Render::getPage()->getRoute()->is(DocumentationPage::homeRouteName());

From d3b858089c773d435327b947edf180aaa7818d4a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 11:47:57 +0100
Subject: [PATCH 0389/1422] Simplify collection state check

It's about 0.001ms faster which does not matter at all, but it is more readable I think
---
 .../Framework/Features/Navigation/DocumentationSidebar.php    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 413bf51d736..8c32ef768c8 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -23,9 +23,9 @@ public static function create(): static
 
     public function hasGroups(): bool
     {
-        return $this->getItems()->filter(function (NavItem $item): bool {
+        return $this->getItems()->contains(function (NavItem $item): bool {
             return $item->hasChildren();
-        })->isNotEmpty();
+        });
     }
 
     /**

From 869676f98464377c6a3db5a96e7d59583e6f166b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 11:48:10 +0100
Subject: [PATCH 0390/1422] Convert closure to arrow function

---
 .../Framework/Features/Navigation/DocumentationSidebar.php    | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 8c32ef768c8..5c079ea2804 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -23,9 +23,7 @@ public static function create(): static
 
     public function hasGroups(): bool
     {
-        return $this->getItems()->contains(function (NavItem $item): bool {
-            return $item->hasChildren();
-        });
+        return $this->getItems()->contains(fn (NavItem $item): bool => $item->hasChildren());
     }
 
     /**

From 290664e9efe466c10e84000d373805c465ef2024 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 11:49:45 +0100
Subject: [PATCH 0391/1422] Introduce local variable to make operation clearer

---
 .../Framework/Features/Navigation/DocumentationSidebar.php  | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 5c079ea2804..95b2d87abe9 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -52,9 +52,11 @@ private function shouldIndexPageBeActive(string $group): bool
     {
         $indexPageHasNoSetGroup = Render::getPage()->navigationMenuGroup() === null;
 
-        $groupIsTheFirstOneInSidebar = $group === $this->getItems()->firstWhere(function (NavItem $item): bool {
+        $firstGroupInSidebar = $this->getItems()->firstWhere(function (NavItem $item): bool {
             return $item->hasChildren();
-        })?->getIdentifier();
+        });
+
+        $groupIsTheFirstOneInSidebar = $group === $firstGroupInSidebar?->getIdentifier();
 
         return $indexPageHasNoSetGroup && $groupIsTheFirstOneInSidebar;
     }

From 271f05a150b65f6132c7f8503a1a37eba8ab8ce0 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 11:53:43 +0100
Subject: [PATCH 0392/1422] Document why item sorting is needed here

We could also trigger a resort when items are added, but I don't think it's that big of a problem (Sorting takes ~0.003ms)
---
 .../src/Framework/Features/Navigation/NavigationMenu.php      | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
index 0c1e610a0e2..48427b978f9 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
@@ -36,6 +36,10 @@ public function __construct(Arrayable|array $items = [])
      */
     public function getItems(): Collection
     {
+        // The reason we sort them here is that navigation items can be added from different sources,
+        // so any sorting we do in generator actions will only be partial. This way, we can ensure
+        // that the items are always freshly sorted by their priorities when they are retrieved.
+
         return $this->items->sortBy(fn (NavItem $item) => $item->getPriority())->values();
     }
 

From 84b5e27bc15d3aee0abd60dad1e2d69900e7a6ba Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 11:55:35 +0100
Subject: [PATCH 0393/1422] Document why items are added in a loop

---
 .../src/Framework/Features/Navigation/NavigationMenu.php      | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
index 48427b978f9..d7a1a92d221 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
@@ -23,6 +23,10 @@ public function __construct(Arrayable|array $items = [])
         $this->items = new Collection();
 
         foreach ($items as $item) {
+            // Instead of adding the items directly, we iterate through them and
+            // add them through the helper. This ensures that all the items are
+            // of the correct type, bringing type safety to the menu's items.
+
             $this->add($item);
         }
     }

From 2a2dbb8dd922989002c6cd3bc7ddf76e928be71e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 12:16:54 +0100
Subject: [PATCH 0394/1422] Expand on class documentation

---
 .../src/Framework/Features/Navigation/NavigationMenu.php     | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
index d7a1a92d221..23e3ba7b3f3 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
@@ -9,6 +9,11 @@
 
 /**
  * Represents a site navigation menu, and contains all of its navigation items.
+ *
+ * The automatic navigation menus are stored within the service container and can be resolved by their identifiers.
+ *
+ * @example `$menu = app('navigation')->getMenu('main');` for the main navigation menu.
+ * @example `$menu = app('navigation')->getMenu('sidebar');` for the documentation sidebar.
  */
 class NavigationMenu
 {

From a66e1ae11243240be34462ad3a71436b067024ba Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 12:17:46 +0100
Subject: [PATCH 0395/1422] Convert closure to arrow function

---
 .../Framework/Features/Navigation/DocumentationSidebar.php    | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 95b2d87abe9..4a0cbd53e46 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -52,9 +52,7 @@ private function shouldIndexPageBeActive(string $group): bool
     {
         $indexPageHasNoSetGroup = Render::getPage()->navigationMenuGroup() === null;
 
-        $firstGroupInSidebar = $this->getItems()->firstWhere(function (NavItem $item): bool {
-            return $item->hasChildren();
-        });
+        $firstGroupInSidebar = $this->getItems()->firstWhere(fn (NavItem $item): bool => $item->hasChildren());
 
         $groupIsTheFirstOneInSidebar = $group === $firstGroupInSidebar?->getIdentifier();
 

From 1ecc60c4edc757f337c8e0045da15fd5256ed16b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 12:19:25 +0100
Subject: [PATCH 0396/1422] Document method feature

---
 .../src/Framework/Features/Navigation/DocumentationSidebar.php  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 4a0cbd53e46..67fa6ae3c99 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -50,6 +50,8 @@ private function isPageIndexPage(): bool
 
     private function shouldIndexPageBeActive(string $group): bool
     {
+        // Unless the index page has a specific group set, the first group in the sidebar should be active.
+
         $indexPageHasNoSetGroup = Render::getPage()->navigationMenuGroup() === null;
 
         $firstGroupInSidebar = $this->getItems()->firstWhere(fn (NavItem $item): bool => $item->hasChildren());

From 6d02202ae55f06342fbc558c4c08895030ca63c1 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 12:34:57 +0100
Subject: [PATCH 0397/1422] Remove null handling as type is evaluated at this
 point

---
 .../Framework/Features/Navigation/DocumentationSidebar.php  | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 67fa6ae3c99..cb9433ed093 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -31,12 +31,8 @@ public function hasGroups(): bool
      *
      * For index pages, this will also return true for the first group in the menu, unless the index page has a specific group set.
      */
-    public function isGroupActive(?string $group): bool
+    public function isGroupActive(string $group): bool
     {
-        if ($group === null) {
-            return false;
-        }
-
         $groupMatchesCurrentPageGroup = Str::slug(Render::getPage()->navigationMenuGroup()) === $group;
         $currentPageIsIndexPageAndShouldBeActive = $this->isPageIndexPage() && $this->shouldIndexPageBeActive($group);
 

From b50d06d47fb69e267dcea8993044a8a46c094885 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 13:31:43 +0100
Subject: [PATCH 0398/1422] Remove resolved part of todo

---
 .../Features/Navigation/GeneratesDocumentationSidebarMenu.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index 20becf179de..c26319125bb 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -94,7 +94,7 @@ protected function usesSidebarGroups(RouteCollection $routes): bool
 
     protected function makeTitleForGroup(string $group): string
     {
-        // Todo search for group label in config (we can also search for other labels in the group before slugifying them)
+        // Todo search for other labels in the group before slugifying them
 
         return Config::getNullableString("docs.sidebar_group_labels.$group") ?? Hyde::makeTitle($group);
     }

From 9b683e6f22ef187114d82caf3a4fd9ca83b72a06 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 13:38:53 +0100
Subject: [PATCH 0399/1422] Document reasoning behind extra sort

---
 .../Features/Navigation/GeneratesDocumentationSidebarMenu.php  | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index c26319125bb..2af8b9626e8 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -106,6 +106,9 @@ protected function canAddRoute(Route $route): bool
 
     protected function sortByPriority(): void
     {
+        // While the items accessor sorts the items upon retrieval,
+        // we do an initial sorting here to order any groups.
+
         $this->items = $this->items->sortBy(function (NavItem $item): int {
             return $item->hasChildren()
                 ? $this->getLowestPriorityInGroup($item)

From 26b28d12dc61ca99ddf384c5ed3d23d5c0c12f8e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 13:44:27 +0100
Subject: [PATCH 0400/1422] Break up coalesce return

---
 .../Navigation/GeneratesDocumentationSidebarMenu.php      | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index 2af8b9626e8..66cabdca506 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -96,7 +96,13 @@ protected function makeTitleForGroup(string $group): string
     {
         // Todo search for other labels in the group before slugifying them
 
-        return Config::getNullableString("docs.sidebar_group_labels.$group") ?? Hyde::makeTitle($group);
+        $configLabel = Config::getNullableString("docs.sidebar_group_labels.$group");
+
+        if ($configLabel) {
+            return $configLabel;
+        }
+
+        return Hyde::makeTitle($group);
     }
 
     protected function canAddRoute(Route $route): bool

From 97f74c3799e4d156b31f4f3f2a7b13ab6079789a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 13:48:32 +0100
Subject: [PATCH 0401/1422] Refactor local variable to instance property

---
 .../GeneratesDocumentationSidebarMenu.php          | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index 66cabdca506..024aeb7e5a0 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -26,9 +26,13 @@ class GeneratesDocumentationSidebarMenu
     /** @var \Illuminate\Support\Collection<string, \Hyde\Framework\Features\Navigation\NavItem> */
     protected Collection $items;
 
+    /** @var \Hyde\Foundation\Kernel\RouteCollection<string, \Hyde\Support\Models\Route> */
+    protected RouteCollection $routes;
+
     protected function __construct()
     {
         $this->items = new Collection();
+        $this->routes = Routes::getRoutes(DocumentationPage::class);
     }
 
     public static function handle(): DocumentationSidebar
@@ -43,11 +47,9 @@ public static function handle(): DocumentationSidebar
 
     protected function generate(): void
     {
-        $routes = Routes::getRoutes(DocumentationPage::class);
-
-        $useGroups = $this->usesSidebarGroups($routes);
+        $useGroups = $this->usesSidebarGroups();
 
-        $routes->each(function (Route $route) use ($useGroups): void {
+        $this->routes->each(function (Route $route) use ($useGroups): void {
             if ($this->canAddRoute($route)) {
                 $item = NavItem::fromRoute($route);
                 $group = $item->getGroup();
@@ -82,12 +84,12 @@ protected function generate(): void
         }
     }
 
-    protected function usesSidebarGroups(RouteCollection $routes): bool
+    protected function usesSidebarGroups(): bool
     {
         // In order to know if we should use groups in the sidebar,
         // we need to loop through the pages and see if they have a group set
 
-        return $routes->first(function (Route $route): bool {
+        return $this->routes->first(function (Route $route): bool {
             return filled($route->getPage()->navigationMenuGroup());
         }) !== null;
     }

From ae14037e332fc06449a87187f4b858e88d9eecc2 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 13:53:37 +0100
Subject: [PATCH 0402/1422] Add todo

---
 .../framework/src/Framework/Features/Navigation/NavItem.php     | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 2b16f03cfff..5e5b18588d5 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -89,6 +89,8 @@ public static function forRoute(Route|string $route, ?string $label = null, ?int
     /**
      * Create a new dropdown navigation menu item.
      *
+     * @TODO: Might be more semantic to have this named something else, as it also includes sidebars groups.
+     *
      * @param  string  $label  The label of the dropdown item.
      * @param  array<NavItem>  $items  The items to be included in the dropdown.
      * @param  int|null  $priority  The priority of the dropdown item. Leave blank to use the default priority.

From 2ad01e4979a5fb450b728e8b293683ba680294af Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 13:56:23 +0100
Subject: [PATCH 0403/1422] Add todo

---
 .../Features/Navigation/GeneratesDocumentationSidebarMenu.php    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index 024aeb7e5a0..1153d1cad9b 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -94,6 +94,7 @@ protected function usesSidebarGroups(): bool
         }) !== null;
     }
 
+    /** Todo: Refactor to move label resolver to model classRefactor to move label resolver to model class */
     protected function makeTitleForGroup(string $group): string
     {
         // Todo search for other labels in the group before slugifying them

From 7ca644fefd2620d6848f1fc023cedbb3a5dfaf41 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 13:58:20 +0100
Subject: [PATCH 0404/1422] Add todo

---
 packages/framework/src/Framework/Features/Navigation/NavItem.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 5e5b18588d5..26c6a634350 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -205,6 +205,7 @@ protected static function makeIdentifier(string $label): string
         return Str::slug($label); // Todo: If it's a dropdown based on a subdirectory, we should use the subdirectory as the identifier
     }
 
+    // TODO: Consider moving all of these to a dropdown factory
     protected static function searchForDropdownPriorityInNavigationConfig(string $groupKey): ?int
     {
         /** @var array<string, int> $config */

From 6ef6f70e3c90f3c83612d474c4e345d3f8034129 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 13:59:17 +0100
Subject: [PATCH 0405/1422] Test default dropdown item priority

---
 packages/framework/tests/Unit/NavItemTest.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/framework/tests/Unit/NavItemTest.php b/packages/framework/tests/Unit/NavItemTest.php
index f2caf94538c..2039c4b93d8 100644
--- a/packages/framework/tests/Unit/NavItemTest.php
+++ b/packages/framework/tests/Unit/NavItemTest.php
@@ -396,4 +396,9 @@ public function testCanAddItemToDropdown()
 
         $this->assertSame([$child], $parent->getChildren());
     }
+
+    public function testDefaultDropdownItemPriority()
+    {
+        $this->assertSame(999, NavItem::dropdown('foo', [])->getPriority());
+    }
 }

From dc68cadb846540a7f38167e33787ded90fb0fa89 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 14:01:46 +0100
Subject: [PATCH 0406/1422] Test can resolve dropdown item priority from config

---
 packages/framework/tests/Unit/NavItemTest.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/packages/framework/tests/Unit/NavItemTest.php b/packages/framework/tests/Unit/NavItemTest.php
index 2039c4b93d8..ebcd7e675dd 100644
--- a/packages/framework/tests/Unit/NavItemTest.php
+++ b/packages/framework/tests/Unit/NavItemTest.php
@@ -401,4 +401,11 @@ public function testDefaultDropdownItemPriority()
     {
         $this->assertSame(999, NavItem::dropdown('foo', [])->getPriority());
     }
+
+    public function testCanResolveDropdownItemPriorityFromConfig()
+    {
+        $this->mockConfig(['hyde.navigation.order' => ['foo' => 500]]);
+
+        $this->assertSame(500, NavItem::dropdown('foo', [])->getPriority());
+    }
 }

From 80d5644c89f80d81ecf789661b5398a12ca986a9 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 14:02:40 +0100
Subject: [PATCH 0407/1422] Extract new method for normalizing group labels

---
 .../src/Framework/Features/Navigation/NavItem.php          | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 26c6a634350..6c010022ee5 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -98,7 +98,7 @@ public static function forRoute(Route|string $route, ?string $label = null, ?int
     public static function dropdown(string $label, array $items, ?int $priority = null): static
     {
         // TODO resolve label from config here instead of view
-        return new static('', $label, $priority ?? static::searchForDropdownPriorityInNavigationConfig($label) ?? 999, null, $items);
+        return new static('', static::normalizeGroupLabel($label), $priority ?? static::searchForDropdownPriorityInNavigationConfig($label) ?? 999, null, $items);
     }
 
     /**
@@ -205,6 +205,11 @@ protected static function makeIdentifier(string $label): string
         return Str::slug($label); // Todo: If it's a dropdown based on a subdirectory, we should use the subdirectory as the identifier
     }
 
+    protected static function normalizeGroupLabel(string $label): string
+    {
+        return $label;
+    }
+
     // TODO: Consider moving all of these to a dropdown factory
     protected static function searchForDropdownPriorityInNavigationConfig(string $groupKey): ?int
     {

From 0a1c29cccc7499c74b642ae9215ea22cffd2c560 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 14:07:16 +0100
Subject: [PATCH 0408/1422] Fix todo comment

---
 .../Features/Navigation/GeneratesDocumentationSidebarMenu.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index 1153d1cad9b..e7751e47826 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -94,7 +94,7 @@ protected function usesSidebarGroups(): bool
         }) !== null;
     }
 
-    /** Todo: Refactor to move label resolver to model classRefactor to move label resolver to model class */
+    /** Todo: Refactor to move label resolver to model class */
     protected function makeTitleForGroup(string $group): string
     {
         // Todo search for other labels in the group before slugifying them

From d3a0a59175dc30243b05a64b702b3efe8a56f62e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 14:08:18 +0100
Subject: [PATCH 0409/1422] Refactor to move config label resolver to model
 class

---
 .../Navigation/GeneratesDocumentationSidebarMenu.php      | 8 --------
 .../src/Framework/Features/Navigation/NavItem.php         | 6 ++++++
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index e7751e47826..9a964b53f1a 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -5,7 +5,6 @@
 namespace Hyde\Framework\Features\Navigation;
 
 use Hyde\Hyde;
-use Hyde\Facades\Config;
 use Hyde\Support\Models\Route;
 use Hyde\Pages\DocumentationPage;
 use Illuminate\Support\Collection;
@@ -94,17 +93,10 @@ protected function usesSidebarGroups(): bool
         }) !== null;
     }
 
-    /** Todo: Refactor to move label resolver to model class */
     protected function makeTitleForGroup(string $group): string
     {
         // Todo search for other labels in the group before slugifying them
 
-        $configLabel = Config::getNullableString("docs.sidebar_group_labels.$group");
-
-        if ($configLabel) {
-            return $configLabel;
-        }
-
         return Hyde::makeTitle($group);
     }
 
diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 6c010022ee5..317d11eda6e 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -207,6 +207,12 @@ protected static function makeIdentifier(string $label): string
 
     protected static function normalizeGroupLabel(string $label): string
     {
+        $configLabel = Config::getNullableString('docs.sidebar_group_labels.'.Str::slug($label));
+
+        if ($configLabel) {
+            return $configLabel;
+        }
+
         return $label;
     }
 

From 64f663491e23489983e4fec88d6d5f031d984a94 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 14:34:22 +0100
Subject: [PATCH 0410/1422] Add accessor hook to make the group label

---
 .../framework/src/Framework/Features/Navigation/NavItem.php   | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 317d11eda6e..9900b45f62f 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -130,6 +130,10 @@ public function getLink(): string
      */
     public function getLabel(): string
     {
+        if ($this->hasChildren()) {
+            return $this->makeGroupLabel();
+        }
+
         return $this->label;
     }
 

From 54a82d048a3ca6efbc62884066e61c7f2a37f4cb Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 14:35:05 +0100
Subject: [PATCH 0411/1422] Sketch out group label generator method

---
 .../framework/src/Framework/Features/Navigation/NavItem.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 9900b45f62f..bb70406f858 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -232,4 +232,10 @@ protected static function searchForDropdownPriorityInNavigationConfig(string $gr
 
         return $config[$groupKey] ?? null;
     }
+
+    /** Find the best label for the group. */
+    protected function makeGroupLabel(): string
+    {
+        return static::normalizeGroupLabel($this->label);
+    }
 }

From 0cb1fad3a812131b6c21aab7843f2ed9a67ef7b2 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 14:37:33 +0100
Subject: [PATCH 0412/1422] Inline adapted normalization method

---
 .../src/Framework/Features/Navigation/NavItem.php         | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index bb70406f858..7e354f4ba7f 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -236,6 +236,12 @@ protected static function searchForDropdownPriorityInNavigationConfig(string $gr
     /** Find the best label for the group. */
     protected function makeGroupLabel(): string
     {
-        return static::normalizeGroupLabel($this->label);
+        $configLabel = Config::getNullableString('docs.sidebar_group_labels.'.Str::slug($this->identifier));
+
+        if ($configLabel) {
+            return $configLabel;
+        }
+
+        return $this->label;
     }
 }

From 6e858fcea79b14e422805ad2cc8ebe2e95a665c2 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 14:39:29 +0100
Subject: [PATCH 0413/1422] Remove label normalization at create time

We don't have all the context at this point
---
 .../src/Framework/Features/Navigation/NavItem.php   | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 7e354f4ba7f..e0246f4d5db 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -98,7 +98,7 @@ public static function forRoute(Route|string $route, ?string $label = null, ?int
     public static function dropdown(string $label, array $items, ?int $priority = null): static
     {
         // TODO resolve label from config here instead of view
-        return new static('', static::normalizeGroupLabel($label), $priority ?? static::searchForDropdownPriorityInNavigationConfig($label) ?? 999, null, $items);
+        return new static('', $label, $priority ?? static::searchForDropdownPriorityInNavigationConfig($label) ?? 999, null, $items);
     }
 
     /**
@@ -209,17 +209,6 @@ protected static function makeIdentifier(string $label): string
         return Str::slug($label); // Todo: If it's a dropdown based on a subdirectory, we should use the subdirectory as the identifier
     }
 
-    protected static function normalizeGroupLabel(string $label): string
-    {
-        $configLabel = Config::getNullableString('docs.sidebar_group_labels.'.Str::slug($label));
-
-        if ($configLabel) {
-            return $configLabel;
-        }
-
-        return $label;
-    }
-
     // TODO: Consider moving all of these to a dropdown factory
     protected static function searchForDropdownPriorityInNavigationConfig(string $groupKey): ?int
     {

From 9e5dc91f7676470eb30439e1470adf4c75e77d2a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 14:43:08 +0100
Subject: [PATCH 0414/1422] Pass label as group key even for group parents

Can allow us to have two states, one pretty for labels, and one normalized internal one
---
 .../framework/src/Framework/Features/Navigation/NavItem.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index e0246f4d5db..a5cc738a5cf 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -98,7 +98,7 @@ public static function forRoute(Route|string $route, ?string $label = null, ?int
     public static function dropdown(string $label, array $items, ?int $priority = null): static
     {
         // TODO resolve label from config here instead of view
-        return new static('', $label, $priority ?? static::searchForDropdownPriorityInNavigationConfig($label) ?? 999, null, $items);
+        return new static('', $label, $priority ?? static::searchForDropdownPriorityInNavigationConfig($label) ?? 999, $label, $items);
     }
 
     /**

From 7fd874e8c519e2c96a9c6bd9404dfe281bf8972a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 14:47:00 +0100
Subject: [PATCH 0415/1422] Use group identifier for internal generator state

---
 .../Navigation/GeneratesDocumentationSidebarMenu.php       | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index 9a964b53f1a..87a1311647e 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -5,6 +5,7 @@
 namespace Hyde\Framework\Features\Navigation;
 
 use Hyde\Hyde;
+use Illuminate\Support\Str;
 use Hyde\Support\Models\Route;
 use Hyde\Pages\DocumentationPage;
 use Illuminate\Support\Collection;
@@ -58,7 +59,7 @@ protected function generate(): void
                         $group = 'Other';
                     }
 
-                    $groupItem = $this->items->get($group);
+                    $groupItem = $this->items->get(Str::slug($group));
 
                     if ($groupItem === null) {
                         $groupItem = NavItem::dropdown($this->makeTitleForGroup($group), []);
@@ -66,8 +67,8 @@ protected function generate(): void
 
                     $groupItem->addChild($item);
 
-                    if (! $this->items->has($group)) {
-                        $this->items->put($group, $groupItem);
+                    if (! $this->items->has($groupItem->getIdentifier())) {
+                        $this->items->put($groupItem->getIdentifier(), $groupItem);
                     }
 
                     return;

From 29f78ea5e50f13cbef354f661aee6b1ef035b695 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 14:54:55 +0100
Subject: [PATCH 0416/1422] Add auxiliary assertion case to improve accuracy

---
 .../tests/Feature/AutomaticNavigationConfigurationsTest.php  | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 03fc8d38a94..53f9093b410 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -986,6 +986,11 @@ public function testSidebarLabelsRetainBestFormatting()
             new DocumentationPage('foo', ['navigation.group' => 'GitHub']),
             new DocumentationPage('bar', ['navigation.group' => 'github']),
         ]);
+
+        $this->assertSidebarEquals(['GitHub'], [
+            new DocumentationPage('foo', ['navigation.group' => 'github']),
+            new DocumentationPage('bar', ['navigation.group' => 'GitHub']),
+        ]);
     }
 
     public function testSidebarLabelsCanBeSetInConfig()

From edd20ab28c9ec42dede280e8ca9f330c81baa6e1 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 15:11:00 +0100
Subject: [PATCH 0417/1422] Create titles when necessary

---
 .../src/Framework/Features/Navigation/NavItem.php   |  5 +++++
 .../AutomaticNavigationConfigurationsTest.php       | 13 +++++--------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index a5cc738a5cf..adc18ad7b2a 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -231,6 +231,11 @@ protected function makeGroupLabel(): string
             return $configLabel;
         }
 
+        // If there is no label, and the group is a slug, we can make a title from it
+        if ($this->group === $this->label && $this->group === strtolower($this->group)) {
+            return Hyde::makeTitle($this->group);
+        }
+
         return $this->label;
     }
 }
diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 53f9093b410..6377a29d95b 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -448,8 +448,7 @@ public function testPagesInSubdirectoriesAreAddedAsDropdownsWhenNavigationSubdir
         config(['hyde.navigation.subdirectories' => 'dropdown']);
 
         $this->assertMenuEquals([
-            ['label' => 'about', 'children' => ['Foo', 'Bar', 'Baz']],
-            // TODO: Label should be About
+            ['label' => 'About', 'children' => ['Foo', 'Bar', 'Baz']],
         ], [
             new MarkdownPage('about/foo'),
             new MarkdownPage('about/bar'),
@@ -496,9 +495,8 @@ public function testMainNavigationMenuDropdownItemsWithSameLabelButDifferentGrou
         config(['hyde.navigation.subdirectories' => 'dropdown']);
 
         $this->assertMenuEquals([
-            // Todo: Should use proper group name
-            ['label' => 'group-1', 'children' => ['Foo']],
-            ['label' => 'group-2', 'children' => ['Foo']],
+            ['label' => 'Group 1', 'children' => ['Foo']],
+            ['label' => 'Group 2', 'children' => ['Foo']],
         ], [
             new MarkdownPage('one/foo', ['navigation.group' => 'Group 1']),
             new MarkdownPage('two/foo', ['navigation.group' => 'Group 2']),
@@ -510,9 +508,8 @@ public function testMainNavigationMenuAutomaticDropdownItemsWithSameLabelButDiff
         config(['hyde.navigation.subdirectories' => 'dropdown']);
 
         $this->assertMenuEquals([
-            // Todo: Should use proper group name
-            ['label' => 'one', 'children' => ['Foo']],
-            ['label' => 'two', 'children' => ['Foo']],
+            ['label' => 'One', 'children' => ['Foo']],
+            ['label' => 'Two', 'children' => ['Foo']],
         ], [
             new MarkdownPage('one/foo'),
             new MarkdownPage('two/foo'),

From 9ab9700774c161f890ab343c05e8b3a64521b6b7 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 15:22:17 +0100
Subject: [PATCH 0418/1422] Extract helper method

---
 .../src/Framework/Features/Navigation/NavItem.php     | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index adc18ad7b2a..ed5ad39cfdb 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -232,10 +232,15 @@ protected function makeGroupLabel(): string
         }
 
         // If there is no label, and the group is a slug, we can make a title from it
-        if ($this->group === $this->label && $this->group === strtolower($this->group)) {
-            return Hyde::makeTitle($this->group);
+        return $this->normalizeLabel($this->group);
+    }
+
+    protected function normalizeLabel(string $label): ?string
+    {
+        if ($label === strtolower($label)) {
+            return Hyde::makeTitle($label);
         }
 
-        return $this->label;
+        return $label;
     }
 }

From 2a1c38fa9094906daff4f933c5a434b7fe9c87c9 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 15:23:32 +0100
Subject: [PATCH 0419/1422] Normalize label at construct

---
 .../framework/src/Framework/Features/Navigation/NavItem.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index ed5ad39cfdb..d9b48554a2d 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -45,7 +45,7 @@ public function __construct(Route|string $destination, string $label, int $prior
         }
 
         $this->destination = $destination;
-        $this->label = $label;
+        $this->label = $this->normalizeLabel($label);
         $this->priority = $priority;
         $this->group = static::normalizeGroupKey($group);
         $this->identifier = $this->makeIdentifier($label);

From a9638ab3b6b67715d3f3626bdf32500a90e5f338 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 15:23:36 +0100
Subject: [PATCH 0420/1422] Remove redundant title generation

---
 .../Navigation/GeneratesDocumentationSidebarMenu.php   | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index 87a1311647e..a82d86721ba 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -4,7 +4,6 @@
 
 namespace Hyde\Framework\Features\Navigation;
 
-use Hyde\Hyde;
 use Illuminate\Support\Str;
 use Hyde\Support\Models\Route;
 use Hyde\Pages\DocumentationPage;
@@ -62,7 +61,7 @@ protected function generate(): void
                     $groupItem = $this->items->get(Str::slug($group));
 
                     if ($groupItem === null) {
-                        $groupItem = NavItem::dropdown($this->makeTitleForGroup($group), []);
+                        $groupItem = NavItem::dropdown($group, []);
                     }
 
                     $groupItem->addChild($item);
@@ -94,13 +93,6 @@ protected function usesSidebarGroups(): bool
         }) !== null;
     }
 
-    protected function makeTitleForGroup(string $group): string
-    {
-        // Todo search for other labels in the group before slugifying them
-
-        return Hyde::makeTitle($group);
-    }
-
     protected function canAddRoute(Route $route): bool
     {
         return $route->getPage()->showInNavigation() && ! $route->is(DocumentationPage::homeRouteName());

From b7e858825e553a26f0568a167a74ab7ef731b6cf Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 15:25:35 +0100
Subject: [PATCH 0421/1422] Handle null case as property can be explicitly set
 to null

---
 .../framework/src/Framework/Features/Navigation/NavItem.php   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index d9b48554a2d..01c7ccaf4d8 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -235,9 +235,9 @@ protected function makeGroupLabel(): string
         return $this->normalizeLabel($this->group);
     }
 
-    protected function normalizeLabel(string $label): ?string
+    protected function normalizeLabel(?string $label): ?string
     {
-        if ($label === strtolower($label)) {
+        if ($label && ($label === strtolower($label))) {
             return Hyde::makeTitle($label);
         }
 

From 9a228f160d38b7088b801816347243c3c717cd79 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 15:26:24 +0100
Subject: [PATCH 0422/1422] Add todo

---
 .../framework/src/Framework/Features/Navigation/NavItem.php     | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 01c7ccaf4d8..891e8ddbadd 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -196,6 +196,8 @@ public function isCurrent(): bool
      */
     public function addChild(NavItem $item): void
     {
+        // Todo: Ensure that the item has a group identifier by creating it from the label if it doesn't exist?
+
         $this->children[] = $item;
     }
 

From 18e2511b870ece71b953bb11621ebf6867405112 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 15:29:57 +0100
Subject: [PATCH 0423/1422] Coalesce to try label

---
 .../framework/src/Framework/Features/Navigation/NavItem.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 891e8ddbadd..ac4d5dc3e6a 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -234,7 +234,7 @@ protected function makeGroupLabel(): string
         }
 
         // If there is no label, and the group is a slug, we can make a title from it
-        return $this->normalizeLabel($this->group);
+        return $this->normalizeLabel($this->group ?? $this->label);
     }
 
     protected function normalizeLabel(?string $label): ?string

From bb46d130f84cb0ce14cdcb72690305a63ad6be1d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 15:31:11 +0100
Subject: [PATCH 0424/1422] Update to expect pretty labels

---
 .../Feature/AutomaticNavigationConfigurationsTest.php     | 4 ++--
 packages/framework/tests/Unit/NavItemTest.php             | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 6377a29d95b..85ae4436594 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -472,7 +472,7 @@ public function testMainNavigationMenuItemsWithTheSameLabelAreNotFilteredForDupl
             new MarkdownPage('FOO'),
         ]);
 
-        $this->assertMenuEquals(['foo', 'Foo', 'FOO'], [
+        $this->assertMenuEquals(['Foo', 'Foo', 'FOO'], [
             new MarkdownPage('foo', ['navigation.label' => 'foo']),
             new MarkdownPage('bar', ['navigation.label' => 'Foo']),
             new MarkdownPage('baz', ['navigation.label' => 'FOO']),
@@ -890,7 +890,7 @@ public function testSidebarItemsWithTheSameLabelAreNotFilteredForDuplicatesRegar
             new DocumentationPage('FOO'),
         ]);
 
-        $this->assertSidebarEquals(['foo', 'Foo', 'FOO'], [
+        $this->assertSidebarEquals(['Foo', 'Foo', 'FOO'], [
             new DocumentationPage('foo', ['navigation.label' => 'foo']),
             new DocumentationPage('bar', ['navigation.label' => 'Foo']),
             new DocumentationPage('baz', ['navigation.label' => 'FOO']),
diff --git a/packages/framework/tests/Unit/NavItemTest.php b/packages/framework/tests/Unit/NavItemTest.php
index ebcd7e675dd..957ec88cbca 100644
--- a/packages/framework/tests/Unit/NavItemTest.php
+++ b/packages/framework/tests/Unit/NavItemTest.php
@@ -186,7 +186,7 @@ public function testForLink()
         $item = NavItem::forLink('foo', 'bar');
 
         $this->assertEquals(new ExternalRoute('foo'), $item->getDestination());
-        $this->assertSame('bar', $item->getLabel());
+        $this->assertSame('Bar', $item->getLabel());
         $this->assertSame(500, $item->getPriority());
     }
 
@@ -201,7 +201,7 @@ public function testForRoute()
         $item = NavItem::forRoute($route, 'foo');
 
         $this->assertSame($route, $item->getDestination());
-        $this->assertSame('foo', $item->getLabel());
+        $this->assertSame('Foo', $item->getLabel());
         $this->assertSame(999, $item->getPriority());
     }
 
@@ -211,7 +211,7 @@ public function testForIndexRoute()
         $item = NavItem::forRoute($route, 'foo');
 
         $this->assertSame($route, $item->getDestination());
-        $this->assertSame('foo', $item->getLabel());
+        $this->assertSame('Foo', $item->getLabel());
         $this->assertSame(0, $item->getPriority());
     }
 
@@ -265,7 +265,7 @@ public function testDropdownFacade()
     {
         $item = NavItem::dropdown('foo', []);
 
-        $this->assertSame('foo', $item->getLabel());
+        $this->assertSame('Foo', $item->getLabel());
         $this->assertSame([], $item->getChildren());
         $this->assertSame(999, $item->getPriority());
     }

From 30373f7685de7146a3687473fa3997fcdbf0a0a1 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 16:08:40 +0100
Subject: [PATCH 0425/1422] Add label casing tests

---
 .../AutomaticNavigationConfigurationsTest.php | 62 +++++++++++++++++++
 1 file changed, 62 insertions(+)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 85ae4436594..8118ba124bb 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -1038,6 +1038,68 @@ public function testAllSidebarItemsArePlacedInGroupsWhenAtLeastOneItemIsGrouped(
         ]);
     }
 
+    // Label casing tests
+
+    public function testMainMenuNavigationItemCasing()
+    {
+        $this->assertMenuEquals(['Hello World'], [new MarkdownPage('Hello World')]);
+        $this->assertMenuEquals(['Hello World'], [new MarkdownPage('hello-world')]);
+        $this->assertMenuEquals(['Hello World'], [new MarkdownPage('hello world')]);
+    }
+
+    public function testMainMenuNavigationItemCasingUsingFrontMatter()
+    {
+        $this->assertMenuEquals(['Hello World'], [new MarkdownPage('foo', ['navigation.label' => 'Hello World'])]);
+        $this->assertMenuEquals(['Hello World'], [new MarkdownPage('foo', ['navigation.label' => 'hello-world'])]);
+        $this->assertMenuEquals(['Hello World'], [new MarkdownPage('foo', ['navigation.label' => 'hello world'])]);
+    }
+
+    public function testMainMenuNavigationGroupCasing()
+    {
+        config(['hyde.navigation.subdirectories' => 'dropdown']);
+
+        $this->assertMenuEquals(['Hello World'], [new MarkdownPage('Hello World/foo')]);
+        $this->assertMenuEquals(['Hello World'], [new MarkdownPage('hello-world/foo')]);
+        $this->assertMenuEquals(['Hello World'], [new MarkdownPage('hello world/foo')]);
+    }
+
+    public function testMainMenuNavigationGroupCasingUsingFrontMatter()
+    {
+        config(['hyde.navigation.subdirectories' => 'dropdown']); // TODO This should NOT be necessary when using front matter
+
+        $this->assertMenuEquals(['Hello World'], [new MarkdownPage('foo', ['navigation.group' => 'Hello World'])]);
+        $this->assertMenuEquals(['Hello World'], [new MarkdownPage('foo', ['navigation.group' => 'hello-world'])]);
+        $this->assertMenuEquals(['Hello World'], [new MarkdownPage('foo', ['navigation.group' => 'hello world'])]);
+    }
+
+    public function testSidebarItemCasing()
+    {
+        $this->assertSidebarEquals(['Hello World'], [new DocumentationPage('Hello World')]);
+        $this->assertSidebarEquals(['Hello World'], [new DocumentationPage('hello-world')]);
+        $this->assertSidebarEquals(['Hello World'], [new DocumentationPage('hello world')]);
+    }
+
+    public function testSidebarItemCasingUsingFrontMatter()
+    {
+        $this->assertSidebarEquals(['Hello World'], [new DocumentationPage('foo', ['navigation.label' => 'Hello World'])]);
+        $this->assertSidebarEquals(['Hello World'], [new DocumentationPage('foo', ['navigation.label' => 'hello-world'])]);
+        $this->assertSidebarEquals(['Hello World'], [new DocumentationPage('foo', ['navigation.label' => 'hello world'])]);
+    }
+
+    public function testSidebarGroupCasing()
+    {
+        $this->assertSidebarEquals(['Hello World'], [new DocumentationPage('Hello World/foo')]);
+        $this->assertSidebarEquals(['Hello World'], [new DocumentationPage('hello-world/foo')]);
+        $this->assertSidebarEquals(['Hello World'], [new DocumentationPage('hello world/foo')]);
+    }
+
+    public function testSidebarGroupCasingUsingFrontMatter()
+    {
+        $this->assertSidebarEquals(['Hello World'], [new DocumentationPage('foo', ['navigation.group' => 'Hello World'])]);
+        $this->assertSidebarEquals(['Hello World'], [new DocumentationPage('foo', ['navigation.group' => 'hello-world'])]);
+        $this->assertSidebarEquals(['Hello World'], [new DocumentationPage('foo', ['navigation.group' => 'hello world'])]);
+    }
+
     // Testing helpers
 
     protected function assertSidebarEquals(array $expected, array $menuPages): void

From 649142b78a521f4d82b4b71242db014a92383f60 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 16:11:25 +0100
Subject: [PATCH 0426/1422] Revert "Normalize label at construct"

This reverts commit 2a1c38fa9094906daff4f933c5a434b7fe9c87c9.
---
 .../framework/src/Framework/Features/Navigation/NavItem.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index ac4d5dc3e6a..99b7fc3414e 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -45,7 +45,7 @@ public function __construct(Route|string $destination, string $label, int $prior
         }
 
         $this->destination = $destination;
-        $this->label = $this->normalizeLabel($label);
+        $this->label = $label;
         $this->priority = $priority;
         $this->group = static::normalizeGroupKey($group);
         $this->identifier = $this->makeIdentifier($label);

From ffe7314cbe80a325af56859e33be428ae8b7d96a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 16:12:03 +0100
Subject: [PATCH 0427/1422] Normalize group label at construct

---
 .../framework/src/Framework/Features/Navigation/NavItem.php   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 99b7fc3414e..abadee85f53 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -98,7 +98,7 @@ public static function forRoute(Route|string $route, ?string $label = null, ?int
     public static function dropdown(string $label, array $items, ?int $priority = null): static
     {
         // TODO resolve label from config here instead of view
-        return new static('', $label, $priority ?? static::searchForDropdownPriorityInNavigationConfig($label) ?? 999, $label, $items);
+        return new static('', static::normalizeLabel($label), $priority ?? static::searchForDropdownPriorityInNavigationConfig($label) ?? 999, $label, $items);
     }
 
     /**
@@ -237,7 +237,7 @@ protected function makeGroupLabel(): string
         return $this->normalizeLabel($this->group ?? $this->label);
     }
 
-    protected function normalizeLabel(?string $label): ?string
+    protected static function normalizeLabel(?string $label): ?string
     {
         if ($label && ($label === strtolower($label))) {
             return Hyde::makeTitle($label);

From e283b5a76e4f44bc5914057edd136459b4b9a66e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 16:12:07 +0100
Subject: [PATCH 0428/1422] Revert "Update to expect pretty labels"

This reverts commit bb46d130f84cb0ce14cdcb72690305a63ad6be1d.
---
 .../Feature/AutomaticNavigationConfigurationsTest.php     | 4 ++--
 packages/framework/tests/Unit/NavItemTest.php             | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 8118ba124bb..c683ba1cf1d 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -472,7 +472,7 @@ public function testMainNavigationMenuItemsWithTheSameLabelAreNotFilteredForDupl
             new MarkdownPage('FOO'),
         ]);
 
-        $this->assertMenuEquals(['Foo', 'Foo', 'FOO'], [
+        $this->assertMenuEquals(['foo', 'Foo', 'FOO'], [
             new MarkdownPage('foo', ['navigation.label' => 'foo']),
             new MarkdownPage('bar', ['navigation.label' => 'Foo']),
             new MarkdownPage('baz', ['navigation.label' => 'FOO']),
@@ -890,7 +890,7 @@ public function testSidebarItemsWithTheSameLabelAreNotFilteredForDuplicatesRegar
             new DocumentationPage('FOO'),
         ]);
 
-        $this->assertSidebarEquals(['Foo', 'Foo', 'FOO'], [
+        $this->assertSidebarEquals(['foo', 'Foo', 'FOO'], [
             new DocumentationPage('foo', ['navigation.label' => 'foo']),
             new DocumentationPage('bar', ['navigation.label' => 'Foo']),
             new DocumentationPage('baz', ['navigation.label' => 'FOO']),
diff --git a/packages/framework/tests/Unit/NavItemTest.php b/packages/framework/tests/Unit/NavItemTest.php
index 957ec88cbca..ebcd7e675dd 100644
--- a/packages/framework/tests/Unit/NavItemTest.php
+++ b/packages/framework/tests/Unit/NavItemTest.php
@@ -186,7 +186,7 @@ public function testForLink()
         $item = NavItem::forLink('foo', 'bar');
 
         $this->assertEquals(new ExternalRoute('foo'), $item->getDestination());
-        $this->assertSame('Bar', $item->getLabel());
+        $this->assertSame('bar', $item->getLabel());
         $this->assertSame(500, $item->getPriority());
     }
 
@@ -201,7 +201,7 @@ public function testForRoute()
         $item = NavItem::forRoute($route, 'foo');
 
         $this->assertSame($route, $item->getDestination());
-        $this->assertSame('Foo', $item->getLabel());
+        $this->assertSame('foo', $item->getLabel());
         $this->assertSame(999, $item->getPriority());
     }
 
@@ -211,7 +211,7 @@ public function testForIndexRoute()
         $item = NavItem::forRoute($route, 'foo');
 
         $this->assertSame($route, $item->getDestination());
-        $this->assertSame('Foo', $item->getLabel());
+        $this->assertSame('foo', $item->getLabel());
         $this->assertSame(0, $item->getPriority());
     }
 
@@ -265,7 +265,7 @@ public function testDropdownFacade()
     {
         $item = NavItem::dropdown('foo', []);
 
-        $this->assertSame('Foo', $item->getLabel());
+        $this->assertSame('foo', $item->getLabel());
         $this->assertSame([], $item->getChildren());
         $this->assertSame(999, $item->getPriority());
     }

From 008910c6c92690d73a2be9e684cbf64fc6b63e12 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 16:17:23 +0100
Subject: [PATCH 0429/1422] Expect explicitly set front matter to be what the
 user wants

See https://github.com/hydephp/develop/pull/1576#issuecomment-1954364613
---
 .../AutomaticNavigationConfigurationsTest.php | 32 ++++++++++++++++---
 1 file changed, 28 insertions(+), 4 deletions(-)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index c683ba1cf1d..eaba945cf0c 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -1042,6 +1042,8 @@ public function testAllSidebarItemsArePlacedInGroupsWhenAtLeastOneItemIsGrouped(
 
     public function testMainMenuNavigationItemCasing()
     {
+        // These labels are based on the page titles, which are made from the file names, so we try to format them
+
         $this->assertMenuEquals(['Hello World'], [new MarkdownPage('Hello World')]);
         $this->assertMenuEquals(['Hello World'], [new MarkdownPage('hello-world')]);
         $this->assertMenuEquals(['Hello World'], [new MarkdownPage('hello world')]);
@@ -1049,15 +1051,23 @@ public function testMainMenuNavigationItemCasing()
 
     public function testMainMenuNavigationItemCasingUsingFrontMatter()
     {
+        // If the user explicitly sets the label, we should respect that and assume it's already formatted correctly
+
+        $this->assertMenuEquals(['Hello World'], [new MarkdownPage('foo', ['title' => 'Hello World'])]);
+        $this->assertMenuEquals(['hello-world'], [new MarkdownPage('foo', ['title' => 'hello-world'])]);
+        $this->assertMenuEquals(['hello world'], [new MarkdownPage('foo', ['title' => 'hello world'])]);
+
         $this->assertMenuEquals(['Hello World'], [new MarkdownPage('foo', ['navigation.label' => 'Hello World'])]);
-        $this->assertMenuEquals(['Hello World'], [new MarkdownPage('foo', ['navigation.label' => 'hello-world'])]);
-        $this->assertMenuEquals(['Hello World'], [new MarkdownPage('foo', ['navigation.label' => 'hello world'])]);
+        $this->assertMenuEquals(['hello-world'], [new MarkdownPage('foo', ['navigation.label' => 'hello-world'])]);
+        $this->assertMenuEquals(['hello world'], [new MarkdownPage('foo', ['navigation.label' => 'hello world'])]);
     }
 
     public function testMainMenuNavigationGroupCasing()
     {
         config(['hyde.navigation.subdirectories' => 'dropdown']);
 
+        // When using subdirectory groupings, we try to format them the same way as the page titles
+
         $this->assertMenuEquals(['Hello World'], [new MarkdownPage('Hello World/foo')]);
         $this->assertMenuEquals(['Hello World'], [new MarkdownPage('hello-world/foo')]);
         $this->assertMenuEquals(['Hello World'], [new MarkdownPage('hello world/foo')]);
@@ -1067,6 +1077,8 @@ public function testMainMenuNavigationGroupCasingUsingFrontMatter()
     {
         config(['hyde.navigation.subdirectories' => 'dropdown']); // TODO This should NOT be necessary when using front matter
 
+        // If the user explicitly sets the group, we should respect that and assume it's already formatted correctly
+
         $this->assertMenuEquals(['Hello World'], [new MarkdownPage('foo', ['navigation.group' => 'Hello World'])]);
         $this->assertMenuEquals(['Hello World'], [new MarkdownPage('foo', ['navigation.group' => 'hello-world'])]);
         $this->assertMenuEquals(['Hello World'], [new MarkdownPage('foo', ['navigation.group' => 'hello world'])]);
@@ -1074,6 +1086,8 @@ public function testMainMenuNavigationGroupCasingUsingFrontMatter()
 
     public function testSidebarItemCasing()
     {
+        // These labels are based on the page titles, which are made from the file names, so we try to format them
+
         $this->assertSidebarEquals(['Hello World'], [new DocumentationPage('Hello World')]);
         $this->assertSidebarEquals(['Hello World'], [new DocumentationPage('hello-world')]);
         $this->assertSidebarEquals(['Hello World'], [new DocumentationPage('hello world')]);
@@ -1081,13 +1095,21 @@ public function testSidebarItemCasing()
 
     public function testSidebarItemCasingUsingFrontMatter()
     {
+        // If the user explicitly sets the label, we should respect that and assume it's already formatted correctly
+
+        $this->assertSidebarEquals(['Hello World'], [new DocumentationPage('foo', ['title' => 'Hello World'])]);
+        $this->assertSidebarEquals(['hello-world'], [new DocumentationPage('foo', ['title' => 'hello-world'])]);
+        $this->assertSidebarEquals(['hello world'], [new DocumentationPage('foo', ['title' => 'hello world'])]);
+
         $this->assertSidebarEquals(['Hello World'], [new DocumentationPage('foo', ['navigation.label' => 'Hello World'])]);
-        $this->assertSidebarEquals(['Hello World'], [new DocumentationPage('foo', ['navigation.label' => 'hello-world'])]);
-        $this->assertSidebarEquals(['Hello World'], [new DocumentationPage('foo', ['navigation.label' => 'hello world'])]);
+        $this->assertSidebarEquals(['hello-world'], [new DocumentationPage('foo', ['navigation.label' => 'hello-world'])]);
+        $this->assertSidebarEquals(['hello world'], [new DocumentationPage('foo', ['navigation.label' => 'hello world'])]);
     }
 
     public function testSidebarGroupCasing()
     {
+        // When using subdirectory groupings, we try to format them the same way as the page titles
+
         $this->assertSidebarEquals(['Hello World'], [new DocumentationPage('Hello World/foo')]);
         $this->assertSidebarEquals(['Hello World'], [new DocumentationPage('hello-world/foo')]);
         $this->assertSidebarEquals(['Hello World'], [new DocumentationPage('hello world/foo')]);
@@ -1095,6 +1117,8 @@ public function testSidebarGroupCasing()
 
     public function testSidebarGroupCasingUsingFrontMatter()
     {
+        // If the user explicitly sets the group, we should respect that and assume it's already formatted correctly
+
         $this->assertSidebarEquals(['Hello World'], [new DocumentationPage('foo', ['navigation.group' => 'Hello World'])]);
         $this->assertSidebarEquals(['Hello World'], [new DocumentationPage('foo', ['navigation.group' => 'hello-world'])]);
         $this->assertSidebarEquals(['Hello World'], [new DocumentationPage('foo', ['navigation.group' => 'hello world'])]);

From fceca310591d6543e16e98065d962d0f6f0cfe24 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 16:18:19 +0100
Subject: [PATCH 0430/1422] Expect dropdown label to be formatted

---
 packages/framework/tests/Unit/NavItemTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/tests/Unit/NavItemTest.php b/packages/framework/tests/Unit/NavItemTest.php
index ebcd7e675dd..9dab7732acb 100644
--- a/packages/framework/tests/Unit/NavItemTest.php
+++ b/packages/framework/tests/Unit/NavItemTest.php
@@ -265,7 +265,7 @@ public function testDropdownFacade()
     {
         $item = NavItem::dropdown('foo', []);
 
-        $this->assertSame('foo', $item->getLabel());
+        $this->assertSame('Foo', $item->getLabel());
         $this->assertSame([], $item->getChildren());
         $this->assertSame(999, $item->getPriority());
     }

From 2296d30734dd79793d2e563263a69b028bbf9aba Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 16:26:30 +0100
Subject: [PATCH 0431/1422] Rename back helper method name

---
 .../framework/src/Framework/Features/Navigation/NavItem.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index abadee85f53..9ca73f04645 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -98,7 +98,7 @@ public static function forRoute(Route|string $route, ?string $label = null, ?int
     public static function dropdown(string $label, array $items, ?int $priority = null): static
     {
         // TODO resolve label from config here instead of view
-        return new static('', static::normalizeLabel($label), $priority ?? static::searchForDropdownPriorityInNavigationConfig($label) ?? 999, $label, $items);
+        return new static('', static::normalizeGroupLabel($label), $priority ?? static::searchForDropdownPriorityInNavigationConfig($label) ?? 999, $label, $items);
     }
 
     /**
@@ -234,10 +234,10 @@ protected function makeGroupLabel(): string
         }
 
         // If there is no label, and the group is a slug, we can make a title from it
-        return $this->normalizeLabel($this->group ?? $this->label);
+        return $this->normalizeGroupLabel($this->group ?? $this->label);
     }
 
-    protected static function normalizeLabel(?string $label): ?string
+    protected static function normalizeGroupLabel(?string $label): ?string
     {
         if ($label && ($label === strtolower($label))) {
             return Hyde::makeTitle($label);

From be556710bd289c38cfd5fb10acafa96de50e01fd Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 16:26:59 +0100
Subject: [PATCH 0432/1422] Switch order of helpers to group static methods

---
 .../Framework/Features/Navigation/NavItem.php  | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 9ca73f04645..08b50714aee 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -224,6 +224,15 @@ protected static function searchForDropdownPriorityInNavigationConfig(string $gr
         return $config[$groupKey] ?? null;
     }
 
+    protected static function normalizeGroupLabel(?string $label): ?string
+    {
+        if ($label && ($label === strtolower($label))) {
+            return Hyde::makeTitle($label);
+        }
+
+        return $label;
+    }
+
     /** Find the best label for the group. */
     protected function makeGroupLabel(): string
     {
@@ -236,13 +245,4 @@ protected function makeGroupLabel(): string
         // If there is no label, and the group is a slug, we can make a title from it
         return $this->normalizeGroupLabel($this->group ?? $this->label);
     }
-
-    protected static function normalizeGroupLabel(?string $label): ?string
-    {
-        if ($label && ($label === strtolower($label))) {
-            return Hyde::makeTitle($label);
-        }
-
-        return $label;
-    }
 }

From ed383406f91dc3426887622f2cb48214490444cc Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 16:27:37 +0100
Subject: [PATCH 0433/1422] Call static method statically

---
 .../framework/src/Framework/Features/Navigation/NavItem.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 08b50714aee..93ea71bf326 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -243,6 +243,6 @@ protected function makeGroupLabel(): string
         }
 
         // If there is no label, and the group is a slug, we can make a title from it
-        return $this->normalizeGroupLabel($this->group ?? $this->label);
+        return static::normalizeGroupLabel($this->group ?? $this->label);
     }
 }

From a297250eec5699adfa6bb65a2083fc24f687b34c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 16:27:54 +0100
Subject: [PATCH 0434/1422] Move comment to more relevant location

---
 .../framework/src/Framework/Features/Navigation/NavItem.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 93ea71bf326..924270c8847 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -226,6 +226,7 @@ protected static function searchForDropdownPriorityInNavigationConfig(string $gr
 
     protected static function normalizeGroupLabel(?string $label): ?string
     {
+        // If there is no label, and the group is a slug, we can make a title from it
         if ($label && ($label === strtolower($label))) {
             return Hyde::makeTitle($label);
         }
@@ -242,7 +243,6 @@ protected function makeGroupLabel(): string
             return $configLabel;
         }
 
-        // If there is no label, and the group is a slug, we can make a title from it
         return static::normalizeGroupLabel($this->group ?? $this->label);
     }
 }

From c6324bce2d2b74b32d58eb4dad4e2e9450f3517f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 16:28:10 +0100
Subject: [PATCH 0435/1422] Import used functions

---
 .../framework/src/Framework/Features/Navigation/NavItem.php    | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 924270c8847..0fdad4e0e32 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -12,6 +12,9 @@
 use Stringable;
 use Hyde\Support\Models\ExternalRoute;
 
+use function is_string;
+use function strtolower;
+
 /**
  * Abstraction for a navigation menu item. Used by the MainNavigationMenu and DocumentationSidebar classes.
  *

From 36177faaf02a696e51b686559463550e2afe03b6 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 16:29:10 +0100
Subject: [PATCH 0436/1422] Simplify method return

---
 .../src/Framework/Features/Navigation/NavItem.php        | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 0fdad4e0e32..ef9665fbafe 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -240,12 +240,7 @@ protected static function normalizeGroupLabel(?string $label): ?string
     /** Find the best label for the group. */
     protected function makeGroupLabel(): string
     {
-        $configLabel = Config::getNullableString('docs.sidebar_group_labels.'.Str::slug($this->identifier));
-
-        if ($configLabel) {
-            return $configLabel;
-        }
-
-        return static::normalizeGroupLabel($this->group ?? $this->label);
+        return Config::getNullableString('docs.sidebar_group_labels.'.Str::slug($this->identifier))
+            ?? static::normalizeGroupLabel($this->group ?? $this->label);
     }
 }

From 303562067d1d91b8dfc5eda0d80215d4cef694a3 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 16:30:55 +0100
Subject: [PATCH 0437/1422] Remove unnecessary method call for already executed
 operation

---
 .../framework/src/Framework/Features/Navigation/NavItem.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index ef9665fbafe..bad6e1af237 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -241,6 +241,6 @@ protected static function normalizeGroupLabel(?string $label): ?string
     protected function makeGroupLabel(): string
     {
         return Config::getNullableString('docs.sidebar_group_labels.'.Str::slug($this->identifier))
-            ?? static::normalizeGroupLabel($this->group ?? $this->label);
+            ?? $this->label;
     }
 }

From 913e8b9c7a36cb522350a79360d9e96cb747046c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 16:32:35 +0100
Subject: [PATCH 0438/1422] Revert "Handle null case as property can be
 explicitly set to null"

This reverts commit b7e858825e553a26f0568a167a74ab7ef731b6cf as a group without a title indicates an issue that should be thrown.
---
 .../framework/src/Framework/Features/Navigation/NavItem.php   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index bad6e1af237..c69719b5dce 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -227,10 +227,10 @@ protected static function searchForDropdownPriorityInNavigationConfig(string $gr
         return $config[$groupKey] ?? null;
     }
 
-    protected static function normalizeGroupLabel(?string $label): ?string
+    protected static function normalizeGroupLabel(string $label): string
     {
         // If there is no label, and the group is a slug, we can make a title from it
-        if ($label && ($label === strtolower($label))) {
+        if ($label === strtolower($label)) {
             return Hyde::makeTitle($label);
         }
 

From 0e55c2b55134e4ff9d543c3421a06d5b60a8f761 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 16:34:50 +0100
Subject: [PATCH 0439/1422] Remove unnecessary default values from config call

There is no reason to expect things like "index" to be a dropdown group. Posts maybe, if for some reason a user wants to list all posts in a dropdown but at that point they need to make other changes so I see no reason to have an extra line for something so uncommon.
---
 .../framework/src/Framework/Features/Navigation/NavItem.php | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index c69719b5dce..6d9d80970f3 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -218,11 +218,7 @@ protected static function makeIdentifier(string $label): string
     protected static function searchForDropdownPriorityInNavigationConfig(string $groupKey): ?int
     {
         /** @var array<string, int> $config */
-        $config = Config::getArray('hyde.navigation.order', [
-            'index' => 0,
-            'posts' => 10,
-            'docs/index' => 100,
-        ]);
+        $config = Config::getArray('hyde.navigation.order', []);
 
         return $config[$groupKey] ?? null;
     }

From 8e1ab831b4c162925138492d750d78033f77f322 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 16:43:39 +0100
Subject: [PATCH 0440/1422] Simplify config return

---
 .../framework/src/Framework/Features/Navigation/NavItem.php  | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 6d9d80970f3..020f7883101 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -217,10 +217,7 @@ protected static function makeIdentifier(string $label): string
     // TODO: Consider moving all of these to a dropdown factory
     protected static function searchForDropdownPriorityInNavigationConfig(string $groupKey): ?int
     {
-        /** @var array<string, int> $config */
-        $config = Config::getArray('hyde.navigation.order', []);
-
-        return $config[$groupKey] ?? null;
+        return Config::getArray('hyde.navigation.order', [])[$groupKey] ?? null;
     }
 
     protected static function normalizeGroupLabel(string $label): string

From 8398351eeecc3a92ef96cd85103038f959d46faf Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 16:44:56 +0100
Subject: [PATCH 0441/1422] Normalize config access

---
 .../framework/src/Framework/Features/Navigation/NavItem.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 020f7883101..a4df1fe75c8 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -233,7 +233,7 @@ protected static function normalizeGroupLabel(string $label): string
     /** Find the best label for the group. */
     protected function makeGroupLabel(): string
     {
-        return Config::getNullableString('docs.sidebar_group_labels.'.Str::slug($this->identifier))
+        return Config::getArray('docs.sidebar_group_labels', [])[Str::slug($this->identifier)]
             ?? $this->label;
     }
 }

From 8cc5bd6eb29bdebab698cc5e7b7a4e3510ebc687 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 16:45:33 +0100
Subject: [PATCH 0442/1422] Format to single line

---
 .../framework/src/Framework/Features/Navigation/NavItem.php    | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index a4df1fe75c8..e7c6cc10dbb 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -233,7 +233,6 @@ protected static function normalizeGroupLabel(string $label): string
     /** Find the best label for the group. */
     protected function makeGroupLabel(): string
     {
-        return Config::getArray('docs.sidebar_group_labels', [])[Str::slug($this->identifier)]
-            ?? $this->label;
+        return Config::getArray('docs.sidebar_group_labels', [])[Str::slug($this->identifier)] ?? $this->label;
     }
 }

From 2c06b5241f132aef35d3b1a754c9afe5bfa12b2a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 17:46:26 +0100
Subject: [PATCH 0443/1422] Remove resolved todo

---
 packages/framework/src/Framework/Features/Navigation/NavItem.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index e7c6cc10dbb..e4275b37fbb 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -100,7 +100,6 @@ public static function forRoute(Route|string $route, ?string $label = null, ?int
      */
     public static function dropdown(string $label, array $items, ?int $priority = null): static
     {
-        // TODO resolve label from config here instead of view
         return new static('', static::normalizeGroupLabel($label), $priority ?? static::searchForDropdownPriorityInNavigationConfig($label) ?? 999, $label, $items);
     }
 

From 17a992ace5043396ed228a8e0196b557547c42a7 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 17:49:39 +0100
Subject: [PATCH 0444/1422] Remove complex logic from roadmap

This is not worth it as it adds a lot of complexity. For these cases, the user will have to add a custom label.
---
 .../AutomaticNavigationConfigurationsTest.php     | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index eaba945cf0c..51f873fbe18 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -975,21 +975,6 @@ public function testSidebarItemGroupingIsNormalized()
         ]);
     }
 
-    public function testSidebarLabelsRetainBestFormatting()
-    {
-        $this->markTestSkipped('Not yet implemented');
-
-        $this->assertSidebarEquals(['GitHub'], [
-            new DocumentationPage('foo', ['navigation.group' => 'GitHub']),
-            new DocumentationPage('bar', ['navigation.group' => 'github']),
-        ]);
-
-        $this->assertSidebarEquals(['GitHub'], [
-            new DocumentationPage('foo', ['navigation.group' => 'github']),
-            new DocumentationPage('bar', ['navigation.group' => 'GitHub']),
-        ]);
-    }
-
     public function testSidebarLabelsCanBeSetInConfig()
     {
         config(['docs.sidebar_group_labels' => ['foo' => 'Hello world!']]);

From e2b04d4f1269936c1d69d7e27d6c823273ee264e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 17:51:31 +0100
Subject: [PATCH 0445/1422] Move back group label logic to generator

---
 .../Navigation/GeneratesDocumentationSidebarMenu.php   |  3 ++-
 .../src/Framework/Features/Navigation/NavItem.php      | 10 ----------
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index a82d86721ba..eeaa0e11ee3 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -4,6 +4,7 @@
 
 namespace Hyde\Framework\Features\Navigation;
 
+use Hyde\Facades\Config;
 use Illuminate\Support\Str;
 use Hyde\Support\Models\Route;
 use Hyde\Pages\DocumentationPage;
@@ -61,7 +62,7 @@ protected function generate(): void
                     $groupItem = $this->items->get(Str::slug($group));
 
                     if ($groupItem === null) {
-                        $groupItem = NavItem::dropdown($group, []);
+                        $groupItem = NavItem::dropdown(Config::getArray('docs.sidebar_group_labels', [])[Str::slug($group)] ?? $group, []);
                     }
 
                     $groupItem->addChild($item);
diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index e4275b37fbb..8096142db28 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -132,10 +132,6 @@ public function getLink(): string
      */
     public function getLabel(): string
     {
-        if ($this->hasChildren()) {
-            return $this->makeGroupLabel();
-        }
-
         return $this->label;
     }
 
@@ -228,10 +224,4 @@ protected static function normalizeGroupLabel(string $label): string
 
         return $label;
     }
-
-    /** Find the best label for the group. */
-    protected function makeGroupLabel(): string
-    {
-        return Config::getArray('docs.sidebar_group_labels', [])[Str::slug($this->identifier)] ?? $this->label;
-    }
 }

From cde50ca0205117c910c845f44b73cd7d47c1808b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 17:52:47 +0100
Subject: [PATCH 0446/1422] Introduce local variable

---
 .../Navigation/GeneratesDocumentationSidebarMenu.php         | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index eeaa0e11ee3..32045ace739 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -59,10 +59,11 @@ protected function generate(): void
                         $group = 'Other';
                     }
 
-                    $groupItem = $this->items->get(Str::slug($group));
+                    $groupIdentifier = Str::slug($group);
+                    $groupItem = $this->items->get($groupIdentifier);
 
                     if ($groupItem === null) {
-                        $groupItem = NavItem::dropdown(Config::getArray('docs.sidebar_group_labels', [])[Str::slug($group)] ?? $group, []);
+                        $groupItem = NavItem::dropdown(Config::getArray('docs.sidebar_group_labels', [])[$groupIdentifier] ?? $group, []);
                     }
 
                     $groupItem->addChild($item);

From 4e1521f96c15e3e4ef32ec90acc47c5ec47abd7b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 17:53:04 +0100
Subject: [PATCH 0447/1422] Rename local variable to be clearer

---
 .../Navigation/GeneratesDocumentationSidebarMenu.php   | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index 32045ace739..56598f838ea 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -52,18 +52,18 @@ protected function generate(): void
         $this->routes->each(function (Route $route) use ($useGroups): void {
             if ($this->canAddRoute($route)) {
                 $item = NavItem::fromRoute($route);
-                $group = $item->getGroup();
+                $groupName = $item->getGroup();
 
                 if ($useGroups) {
-                    if (! $group) {
-                        $group = 'Other';
+                    if (! $groupName) {
+                        $groupName = 'Other';
                     }
 
-                    $groupIdentifier = Str::slug($group);
+                    $groupIdentifier = Str::slug($groupName);
                     $groupItem = $this->items->get($groupIdentifier);
 
                     if ($groupItem === null) {
-                        $groupItem = NavItem::dropdown(Config::getArray('docs.sidebar_group_labels', [])[$groupIdentifier] ?? $group, []);
+                        $groupItem = NavItem::dropdown(Config::getArray('docs.sidebar_group_labels', [])[$groupIdentifier] ?? $groupName, []);
                     }
 
                     $groupItem->addChild($item);

From 08d7783db5878d7a38614232db05306bd331a956 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 17:54:50 +0100
Subject: [PATCH 0448/1422] Extract helper method

---
 .../GeneratesDocumentationSidebarMenu.php     | 27 ++++++++++++-------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index 56598f838ea..fdedaf41e6d 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -55,16 +55,7 @@ protected function generate(): void
                 $groupName = $item->getGroup();
 
                 if ($useGroups) {
-                    if (! $groupName) {
-                        $groupName = 'Other';
-                    }
-
-                    $groupIdentifier = Str::slug($groupName);
-                    $groupItem = $this->items->get($groupIdentifier);
-
-                    if ($groupItem === null) {
-                        $groupItem = NavItem::dropdown(Config::getArray('docs.sidebar_group_labels', [])[$groupIdentifier] ?? $groupName, []);
-                    }
+                    $groupItem = $this->createGroupItem($groupName);
 
                     $groupItem->addChild($item);
 
@@ -116,4 +107,20 @@ protected function getLowestPriorityInGroup(NavItem $item): int
     {
         return collect($item->getChildren())->min(fn (NavItem $child): int => $child->getPriority());
     }
+
+    protected function createGroupItem(?string $groupName): NavItem
+    {
+        if (! $groupName) {
+            $groupName = 'Other';
+        }
+
+        $groupIdentifier = Str::slug($groupName);
+        $groupItem = $this->items->get($groupIdentifier);
+
+        if ($groupItem === null) {
+            $groupItem = NavItem::dropdown(Config::getArray('docs.sidebar_group_labels', [])[$groupIdentifier] ?? $groupName, []);
+        }
+
+        return $groupItem;
+    }
 }

From 78039310c608708bad70884c0c836924f9b9e66e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 17:56:50 +0100
Subject: [PATCH 0449/1422] Inline local variable

---
 .../Features/Navigation/GeneratesDocumentationSidebarMenu.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index fdedaf41e6d..5049dad7808 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -52,10 +52,8 @@ protected function generate(): void
         $this->routes->each(function (Route $route) use ($useGroups): void {
             if ($this->canAddRoute($route)) {
                 $item = NavItem::fromRoute($route);
-                $groupName = $item->getGroup();
-
                 if ($useGroups) {
-                    $groupItem = $this->createGroupItem($groupName);
+                    $groupItem = $this->createGroupItem($item->getGroup());
 
                     $groupItem->addChild($item);
 

From 21076ecb8685a9d271e2fbb27e1fa2c84daf4e25 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 17:57:24 +0100
Subject: [PATCH 0450/1422] Shift fallback to parameter coalesce

---
 .../Navigation/GeneratesDocumentationSidebarMenu.php      | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index 5049dad7808..7fcab729355 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -53,7 +53,7 @@ protected function generate(): void
             if ($this->canAddRoute($route)) {
                 $item = NavItem::fromRoute($route);
                 if ($useGroups) {
-                    $groupItem = $this->createGroupItem($item->getGroup());
+                    $groupItem = $this->createGroupItem($item->getGroup() ?? 'Other');
 
                     $groupItem->addChild($item);
 
@@ -106,12 +106,8 @@ protected function getLowestPriorityInGroup(NavItem $item): int
         return collect($item->getChildren())->min(fn (NavItem $child): int => $child->getPriority());
     }
 
-    protected function createGroupItem(?string $groupName): NavItem
+    protected function createGroupItem(string $groupName): NavItem
     {
-        if (! $groupName) {
-            $groupName = 'Other';
-        }
-
         $groupIdentifier = Str::slug($groupName);
         $groupItem = $this->items->get($groupIdentifier);
 

From f98333f552df932a1b66fd8a22d43f6fad9f757b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 17:57:59 +0100
Subject: [PATCH 0451/1422] Rename helper method to be clearer and more correct

---
 .../Features/Navigation/GeneratesDocumentationSidebarMenu.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index 7fcab729355..cde08b69220 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -53,7 +53,7 @@ protected function generate(): void
             if ($this->canAddRoute($route)) {
                 $item = NavItem::fromRoute($route);
                 if ($useGroups) {
-                    $groupItem = $this->createGroupItem($item->getGroup() ?? 'Other');
+                    $groupItem = $this->getOrCreateGroupItem($item->getGroup() ?? 'Other');
 
                     $groupItem->addChild($item);
 
@@ -106,7 +106,7 @@ protected function getLowestPriorityInGroup(NavItem $item): int
         return collect($item->getChildren())->min(fn (NavItem $child): int => $child->getPriority());
     }
 
-    protected function createGroupItem(string $groupName): NavItem
+    protected function getOrCreateGroupItem(string $groupName): NavItem
     {
         $groupIdentifier = Str::slug($groupName);
         $groupItem = $this->items->get($groupIdentifier);

From 3e827976685eff77f592ce3486124dcfff9dd98a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 17:59:03 +0100
Subject: [PATCH 0452/1422] Remove unnecessary qualifiers from narrowed scope

---
 .../Navigation/GeneratesDocumentationSidebarMenu.php   | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index cde08b69220..6cb507713fe 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -108,13 +108,13 @@ protected function getLowestPriorityInGroup(NavItem $item): int
 
     protected function getOrCreateGroupItem(string $groupName): NavItem
     {
-        $groupIdentifier = Str::slug($groupName);
-        $groupItem = $this->items->get($groupIdentifier);
+        $identifier = Str::slug($groupName);
+        $group = $this->items->get($identifier);
 
-        if ($groupItem === null) {
-            $groupItem = NavItem::dropdown(Config::getArray('docs.sidebar_group_labels', [])[$groupIdentifier] ?? $groupName, []);
+        if ($group === null) {
+            $group = NavItem::dropdown(Config::getArray('docs.sidebar_group_labels', [])[$identifier] ?? $groupName, []);
         }
 
-        return $groupItem;
+        return $group;
     }
 }

From cb4cf0d28d63f79fffd31aec50e0e0d415c896d6 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 18:00:09 +0100
Subject: [PATCH 0453/1422] Simplify conditional return with coalescing return
 expression

---
 .../Navigation/GeneratesDocumentationSidebarMenu.php        | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index 6cb507713fe..493d7e520d4 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -111,10 +111,6 @@ protected function getOrCreateGroupItem(string $groupName): NavItem
         $identifier = Str::slug($groupName);
         $group = $this->items->get($identifier);
 
-        if ($group === null) {
-            $group = NavItem::dropdown(Config::getArray('docs.sidebar_group_labels', [])[$identifier] ?? $groupName, []);
-        }
-
-        return $group;
+        return $group ?? NavItem::dropdown(Config::getArray('docs.sidebar_group_labels', [])[$identifier] ?? $groupName, []);
     }
 }

From 8365d594b0b22d44672848e37260ee20bfeb5b76 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 18:01:20 +0100
Subject: [PATCH 0454/1422] Extract helper

---
 .../Navigation/GeneratesDocumentationSidebarMenu.php       | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index 493d7e520d4..a4c9b74031e 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -111,6 +111,11 @@ protected function getOrCreateGroupItem(string $groupName): NavItem
         $identifier = Str::slug($groupName);
         $group = $this->items->get($identifier);
 
-        return $group ?? NavItem::dropdown(Config::getArray('docs.sidebar_group_labels', [])[$identifier] ?? $groupName, []);
+        return $group ?? $this->createGroupItem($identifier, $groupName);
+    }
+
+    protected function createGroupItem(string $identifier, string $groupName): NavItem
+    {
+        return NavItem::dropdown(Config::getArray('docs.sidebar_group_labels', [])[$identifier] ?? $groupName, []);
     }
 }

From 17f4a265af2cf001bf418e2ecec83e0c1b2ec3e8 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 18:02:52 +0100
Subject: [PATCH 0455/1422] Extract helper

---
 .../Navigation/GeneratesDocumentationSidebarMenu.php       | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index a4c9b74031e..f5a23cc7bc0 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -116,6 +116,11 @@ protected function getOrCreateGroupItem(string $groupName): NavItem
 
     protected function createGroupItem(string $identifier, string $groupName): NavItem
     {
-        return NavItem::dropdown(Config::getArray('docs.sidebar_group_labels', [])[$identifier] ?? $groupName, []);
+        return NavItem::dropdown($this->searchForGroupLabelInConfig($identifier) ?? $groupName, []);
+    }
+
+    protected function searchForGroupLabelInConfig(string $identifier): ?string
+    {
+        return Config::getArray('docs.sidebar_group_labels', [])[$identifier] ?? null;
     }
 }

From 4ab40d50af5b1cc462d6dcd672d328e128872e6a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 18:04:24 +0100
Subject: [PATCH 0456/1422] Introduce local variable

---
 .../Features/Navigation/GeneratesDocumentationSidebarMenu.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index f5a23cc7bc0..f339458686b 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -116,7 +116,9 @@ protected function getOrCreateGroupItem(string $groupName): NavItem
 
     protected function createGroupItem(string $identifier, string $groupName): NavItem
     {
-        return NavItem::dropdown($this->searchForGroupLabelInConfig($identifier) ?? $groupName, []);
+        $label = $this->searchForGroupLabelInConfig($identifier) ?? $groupName;
+
+        return NavItem::dropdown($label, []);
     }
 
     protected function searchForGroupLabelInConfig(string $identifier): ?string

From c1fdebb3ff006330b1df9cd4117daafa52e74f55 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 18:07:36 +0100
Subject: [PATCH 0457/1422] Move normalization logic to action

This is specific to the sidebar, so we don't need to pollute the global model with it
---
 .../GeneratesDocumentationSidebarMenu.php          | 14 +++++++++++++-
 .../src/Framework/Features/Navigation/NavItem.php  | 13 +------------
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index f339458686b..c0524e331e0 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -4,6 +4,7 @@
 
 namespace Hyde\Framework\Features\Navigation;
 
+use Hyde\Hyde;
 use Hyde\Facades\Config;
 use Illuminate\Support\Str;
 use Hyde\Support\Models\Route;
@@ -13,6 +14,7 @@
 use Hyde\Foundation\Kernel\RouteCollection;
 
 use function collect;
+use function strtolower;
 
 /**
  * @experimental This class may change significantly before its release.
@@ -116,7 +118,7 @@ protected function getOrCreateGroupItem(string $groupName): NavItem
 
     protected function createGroupItem(string $identifier, string $groupName): NavItem
     {
-        $label = $this->searchForGroupLabelInConfig($identifier) ?? $groupName;
+        $label = $this->normalizeGroupLabel($this->searchForGroupLabelInConfig($identifier) ?? $groupName);
 
         return NavItem::dropdown($label, []);
     }
@@ -125,4 +127,14 @@ protected function searchForGroupLabelInConfig(string $identifier): ?string
     {
         return Config::getArray('docs.sidebar_group_labels', [])[$identifier] ?? null;
     }
+
+    protected function normalizeGroupLabel(string $label): string
+    {
+        // If there is no label, and the group is a slug, we can make a title from it
+        if ($label === strtolower($label)) {
+            return Hyde::makeTitle($label);
+        }
+
+        return $label;
+    }
 }
diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 8096142db28..0d81cfb85b4 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -13,7 +13,6 @@
 use Hyde\Support\Models\ExternalRoute;
 
 use function is_string;
-use function strtolower;
 
 /**
  * Abstraction for a navigation menu item. Used by the MainNavigationMenu and DocumentationSidebar classes.
@@ -100,7 +99,7 @@ public static function forRoute(Route|string $route, ?string $label = null, ?int
      */
     public static function dropdown(string $label, array $items, ?int $priority = null): static
     {
-        return new static('', static::normalizeGroupLabel($label), $priority ?? static::searchForDropdownPriorityInNavigationConfig($label) ?? 999, $label, $items);
+        return new static('', $label, $priority ?? static::searchForDropdownPriorityInNavigationConfig($label) ?? 999, $label, $items);
     }
 
     /**
@@ -214,14 +213,4 @@ protected static function searchForDropdownPriorityInNavigationConfig(string $gr
     {
         return Config::getArray('hyde.navigation.order', [])[$groupKey] ?? null;
     }
-
-    protected static function normalizeGroupLabel(string $label): string
-    {
-        // If there is no label, and the group is a slug, we can make a title from it
-        if ($label === strtolower($label)) {
-            return Hyde::makeTitle($label);
-        }
-
-        return $label;
-    }
 }

From 3d831c0d34dd6d8d2e2c40a8bd8e6b45592685d5 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 18:10:45 +0100
Subject: [PATCH 0458/1422] Revert "Move normalization logic to action"

This reverts commit c1fdebb3ff006330b1df9cd4117daafa52e74f55.
---
 .../GeneratesDocumentationSidebarMenu.php          | 14 +-------------
 .../src/Framework/Features/Navigation/NavItem.php  | 13 ++++++++++++-
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index c0524e331e0..f339458686b 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -4,7 +4,6 @@
 
 namespace Hyde\Framework\Features\Navigation;
 
-use Hyde\Hyde;
 use Hyde\Facades\Config;
 use Illuminate\Support\Str;
 use Hyde\Support\Models\Route;
@@ -14,7 +13,6 @@
 use Hyde\Foundation\Kernel\RouteCollection;
 
 use function collect;
-use function strtolower;
 
 /**
  * @experimental This class may change significantly before its release.
@@ -118,7 +116,7 @@ protected function getOrCreateGroupItem(string $groupName): NavItem
 
     protected function createGroupItem(string $identifier, string $groupName): NavItem
     {
-        $label = $this->normalizeGroupLabel($this->searchForGroupLabelInConfig($identifier) ?? $groupName);
+        $label = $this->searchForGroupLabelInConfig($identifier) ?? $groupName;
 
         return NavItem::dropdown($label, []);
     }
@@ -127,14 +125,4 @@ protected function searchForGroupLabelInConfig(string $identifier): ?string
     {
         return Config::getArray('docs.sidebar_group_labels', [])[$identifier] ?? null;
     }
-
-    protected function normalizeGroupLabel(string $label): string
-    {
-        // If there is no label, and the group is a slug, we can make a title from it
-        if ($label === strtolower($label)) {
-            return Hyde::makeTitle($label);
-        }
-
-        return $label;
-    }
 }
diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 0d81cfb85b4..8096142db28 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -13,6 +13,7 @@
 use Hyde\Support\Models\ExternalRoute;
 
 use function is_string;
+use function strtolower;
 
 /**
  * Abstraction for a navigation menu item. Used by the MainNavigationMenu and DocumentationSidebar classes.
@@ -99,7 +100,7 @@ public static function forRoute(Route|string $route, ?string $label = null, ?int
      */
     public static function dropdown(string $label, array $items, ?int $priority = null): static
     {
-        return new static('', $label, $priority ?? static::searchForDropdownPriorityInNavigationConfig($label) ?? 999, $label, $items);
+        return new static('', static::normalizeGroupLabel($label), $priority ?? static::searchForDropdownPriorityInNavigationConfig($label) ?? 999, $label, $items);
     }
 
     /**
@@ -213,4 +214,14 @@ protected static function searchForDropdownPriorityInNavigationConfig(string $gr
     {
         return Config::getArray('hyde.navigation.order', [])[$groupKey] ?? null;
     }
+
+    protected static function normalizeGroupLabel(string $label): string
+    {
+        // If there is no label, and the group is a slug, we can make a title from it
+        if ($label === strtolower($label)) {
+            return Hyde::makeTitle($label);
+        }
+
+        return $label;
+    }
 }

From f0fb28637703d52bc9af5bbe9e03c10af6f064ea Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 18:30:23 +0100
Subject: [PATCH 0459/1422] Add test for conflicting configuration states

---
 .../AutomaticNavigationConfigurationsTest.php     | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 51f873fbe18..0ecc49a463d 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -516,6 +516,21 @@ public function testMainNavigationMenuAutomaticDropdownItemsWithSameLabelButDiff
         ]);
     }
 
+    public function testConflictingSubdirectoryAndFrontMatterDropdownConfigurationGivesPrecedenceToSubdirectory()
+    {
+        // In case subdirectories are set to be used as dropdowns, but a page has a group set in its front matter,
+        // we run into a conflicting state where we don't know what the user intended. We solve this by giving
+        // precedence to the subdirectory configuration. This is opinionated, but allows for good grouping.
+
+        config(['hyde.navigation.subdirectories' => 'dropdown']);
+
+        $this->assertMenuEquals([
+            ['label' => 'Foo', 'children' => ['Child']],
+        ], [
+            new MarkdownPage('foo/child', ['navigation.group' => 'bar']),
+        ]);
+    }
+
     // Documentation sidebar menu tests
 
     public function testSidebarWithPages()

From 194b9b849495b9fd17c2e9896a3f5f41e72ac624 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 18:33:35 +0100
Subject: [PATCH 0460/1422] Remove unnecessary data from test

---
 .../AutomaticNavigationConfigurationsTest.php | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 0ecc49a463d..afa4b3fdc0f 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -495,11 +495,11 @@ public function testMainNavigationMenuDropdownItemsWithSameLabelButDifferentGrou
         config(['hyde.navigation.subdirectories' => 'dropdown']);
 
         $this->assertMenuEquals([
-            ['label' => 'Group 1', 'children' => ['Foo']],
-            ['label' => 'Group 2', 'children' => ['Foo']],
+            ['label' => 'One', 'children' => ['Foo']],
+            ['label' => 'Two', 'children' => ['Foo']],
         ], [
-            new MarkdownPage('one/foo', ['navigation.group' => 'Group 1']),
-            new MarkdownPage('two/foo', ['navigation.group' => 'Group 2']),
+            new MarkdownPage('one/foo'),
+            new MarkdownPage('two/foo'),
         ]);
     }
 
@@ -926,11 +926,11 @@ public function testSidebarItemsWithSameLabelButDifferentGroupsAreNotFiltered()
     public function testSidebarDropdownItemsWithSameLabelButDifferentGroupsAreFiltered()
     {
         $this->assertSidebarEquals([
-            ['label' => 'Group 1', 'children' => ['Foo']],
-            ['label' => 'Group 2', 'children' => ['Foo']],
+            ['label' => 'One', 'children' => ['Foo']],
+            ['label' => 'Two', 'children' => ['Foo']],
         ], [
-            new DocumentationPage('one/foo', ['navigation.group' => 'Group 1']),
-            new DocumentationPage('two/foo', ['navigation.group' => 'Group 2']),
+            new DocumentationPage('one/foo'),
+            new DocumentationPage('two/foo'),
         ]);
     }
 
@@ -950,11 +950,11 @@ public function testSidebarDropdownItemsWithSameLabelButDifferentGroupsAreNotFil
         config(['docs.flattened_output_paths' => false]);
 
         $this->assertSidebarEquals([
-            ['label' => 'Group 1', 'children' => ['Foo']],
-            ['label' => 'Group 2', 'children' => ['Foo']],
+            ['label' => 'One', 'children' => ['Foo']],
+            ['label' => 'Two', 'children' => ['Foo']],
         ], [
-            new DocumentationPage('one/foo', ['navigation.group' => 'Group 1']),
-            new DocumentationPage('two/foo', ['navigation.group' => 'Group 2']),
+            new DocumentationPage('one/foo'),
+            new DocumentationPage('two/foo'),
         ]);
     }
 

From bdcc4b5cdc1a4374b3ab16863ab254e8bb874a0c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 18:32:14 +0100
Subject: [PATCH 0461/1422] Use accessor to use fully processed data

Has slightly differing semantics, but ones that we probably want
---
 .../framework/src/Framework/Features/Navigation/NavItem.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 8096142db28..4b792447f14 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -64,7 +64,7 @@ public static function fromRoute(Route $route, ?string $label = null, ?int $prio
             $route,
             $label ?? $route->getPage()->navigationMenuLabel(),
             $priority ?? $route->getPage()->navigationMenuPriority(),
-            $group ?? $route->getPage()->data('navigation.group'),
+            $group ?? $route->getPage()->navigationMenuGroup(),
         );
     }
 

From 1eabf7e463ea9c108e2ebcb24f40fe36dc4d9d4a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 18:46:26 +0100
Subject: [PATCH 0462/1422] Experiment with using factory to create sidebar
 data

See https://github.com/hydephp/develop/pull/1568#issuecomment-1954674961
---
 .../Framework/Features/Navigation/NavItem.php | 30 ++++++++++++++-----
 1 file changed, 22 insertions(+), 8 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 4b792447f14..b8643c128f4 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -4,13 +4,15 @@
 
 namespace Hyde\Framework\Features\Navigation;
 
-use Hyde\Facades\Config;
 use Hyde\Foundation\Facades\Routes;
 use Hyde\Hyde;
 use Hyde\Support\Models\Route;
 use Illuminate\Support\Str;
 use Stringable;
+use Hyde\Markdown\Models\FrontMatter;
 use Hyde\Support\Models\ExternalRoute;
+use Hyde\Framework\Factories\NavigationDataFactory;
+use Hyde\Framework\Factories\Concerns\CoreDataObject;
 
 use function is_string;
 use function strtolower;
@@ -100,7 +102,25 @@ public static function forRoute(Route|string $route, ?string $label = null, ?int
      */
     public static function dropdown(string $label, array $items, ?int $priority = null): static
     {
-        return new static('', static::normalizeGroupLabel($label), $priority ?? static::searchForDropdownPriorityInNavigationConfig($label) ?? 999, $label, $items);
+        $data = (new NavigationDataFactory(new CoreDataObject(
+            new FrontMatter([
+                'navigation' => [
+                    'label' => static::normalizeGroupLabel($label),
+                    'priority' => $priority,
+                    'hidden' => false,
+                    'group' => static::normalizeGroupKey($label),
+                ]
+            ]),
+            false, '', '', '', '', Str::slug($label),
+        ), $label))->toArray();
+
+        return new static(
+            '',
+            $data['label'],
+            $data['priority'],
+            $data['group'],
+            $items
+        );
     }
 
     /**
@@ -209,12 +229,6 @@ protected static function makeIdentifier(string $label): string
         return Str::slug($label); // Todo: If it's a dropdown based on a subdirectory, we should use the subdirectory as the identifier
     }
 
-    // TODO: Consider moving all of these to a dropdown factory
-    protected static function searchForDropdownPriorityInNavigationConfig(string $groupKey): ?int
-    {
-        return Config::getArray('hyde.navigation.order', [])[$groupKey] ?? null;
-    }
-
     protected static function normalizeGroupLabel(string $label): string
     {
         // If there is no label, and the group is a slug, we can make a title from it

From 8ae48761639e9a9f626be6d7d086a4add8256fe1 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 19:07:28 +0100
Subject: [PATCH 0463/1422] Revert "Experiment with using factory to create
 sidebar data"

This reverts commit 1eabf7e463ea9c108e2ebcb24f40fe36dc4d9d4a.
---
 .../Framework/Features/Navigation/NavItem.php | 30 +++++--------------
 1 file changed, 8 insertions(+), 22 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index b8643c128f4..4b792447f14 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -4,15 +4,13 @@
 
 namespace Hyde\Framework\Features\Navigation;
 
+use Hyde\Facades\Config;
 use Hyde\Foundation\Facades\Routes;
 use Hyde\Hyde;
 use Hyde\Support\Models\Route;
 use Illuminate\Support\Str;
 use Stringable;
-use Hyde\Markdown\Models\FrontMatter;
 use Hyde\Support\Models\ExternalRoute;
-use Hyde\Framework\Factories\NavigationDataFactory;
-use Hyde\Framework\Factories\Concerns\CoreDataObject;
 
 use function is_string;
 use function strtolower;
@@ -102,25 +100,7 @@ public static function forRoute(Route|string $route, ?string $label = null, ?int
      */
     public static function dropdown(string $label, array $items, ?int $priority = null): static
     {
-        $data = (new NavigationDataFactory(new CoreDataObject(
-            new FrontMatter([
-                'navigation' => [
-                    'label' => static::normalizeGroupLabel($label),
-                    'priority' => $priority,
-                    'hidden' => false,
-                    'group' => static::normalizeGroupKey($label),
-                ]
-            ]),
-            false, '', '', '', '', Str::slug($label),
-        ), $label))->toArray();
-
-        return new static(
-            '',
-            $data['label'],
-            $data['priority'],
-            $data['group'],
-            $items
-        );
+        return new static('', static::normalizeGroupLabel($label), $priority ?? static::searchForDropdownPriorityInNavigationConfig($label) ?? 999, $label, $items);
     }
 
     /**
@@ -229,6 +209,12 @@ protected static function makeIdentifier(string $label): string
         return Str::slug($label); // Todo: If it's a dropdown based on a subdirectory, we should use the subdirectory as the identifier
     }
 
+    // TODO: Consider moving all of these to a dropdown factory
+    protected static function searchForDropdownPriorityInNavigationConfig(string $groupKey): ?int
+    {
+        return Config::getArray('hyde.navigation.order', [])[$groupKey] ?? null;
+    }
+
     protected static function normalizeGroupLabel(string $label): string
     {
         // If there is no label, and the group is a slug, we can make a title from it

From 4bcfbeb4c91fd2df4c83f27c637c0935d8c6e1e1 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 19:11:51 +0100
Subject: [PATCH 0464/1422] Extract helper method

---
 .../GeneratesDocumentationSidebarMenu.php     | 26 +++++++++++--------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index f339458686b..545355ad96d 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -52,19 +52,12 @@ protected function generate(): void
         $this->routes->each(function (Route $route) use ($useGroups): void {
             if ($this->canAddRoute($route)) {
                 $item = NavItem::fromRoute($route);
-                if ($useGroups) {
-                    $groupItem = $this->getOrCreateGroupItem($item->getGroup() ?? 'Other');
-
-                    $groupItem->addChild($item);
-
-                    if (! $this->items->has($groupItem->getIdentifier())) {
-                        $this->items->put($groupItem->getIdentifier(), $groupItem);
-                    }
 
-                    return;
+                if ($useGroups) {
+                    $this->addItemToGroup($item);
+                } else {
+                    $this->items->put($route->getRouteKey(), $item);
                 }
-
-                $this->items->put($route->getRouteKey(), $item);
             }
         });
 
@@ -101,6 +94,17 @@ protected function sortByPriority(): void
         })->values();
     }
 
+    protected function addItemToGroup(NavItem $item): void
+    {
+        $groupItem = $this->getOrCreateGroupItem($item->getGroup() ?? 'Other');
+
+        $groupItem->addChild($item);
+
+        if (! $this->items->has($groupItem->getIdentifier())) {
+            $this->items->put($groupItem->getIdentifier(), $groupItem);
+        }
+    }
+
     protected function getLowestPriorityInGroup(NavItem $item): int
     {
         return collect($item->getChildren())->min(fn (NavItem $child): int => $child->getPriority());

From 942ebb765c1efab9856c403404a7a573bd79c97d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 19:15:05 +0100
Subject: [PATCH 0465/1422] Deprecate out of scope helpers

---
 .../framework/src/Framework/Features/Navigation/NavItem.php    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 4b792447f14..43314b92ccd 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -209,12 +209,13 @@ protected static function makeIdentifier(string $label): string
         return Str::slug($label); // Todo: If it's a dropdown based on a subdirectory, we should use the subdirectory as the identifier
     }
 
-    // TODO: Consider moving all of these to a dropdown factory
+    /** @deprecated This responsibility does not belong here. This should happen before the NavItem is created. */
     protected static function searchForDropdownPriorityInNavigationConfig(string $groupKey): ?int
     {
         return Config::getArray('hyde.navigation.order', [])[$groupKey] ?? null;
     }
 
+    /** @deprecated This responsibility does not belong here. This should happen before the NavItem is created. */
     protected static function normalizeGroupLabel(string $label): string
     {
         // If there is no label, and the group is a slug, we can make a title from it

From 2c389e4b4aea7b4bd3a243dd92479fe3c6086816 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 19:21:03 +0100
Subject: [PATCH 0466/1422] Move label normalization to generators

This means that when creating navigation dropdown items directly, you no longer get the normalization
---
 .../GeneratesDocumentationSidebarMenu.php         | 15 ++++++++++++++-
 .../Navigation/GeneratesMainNavigationMenu.php    | 15 ++++++++++++++-
 .../src/Framework/Features/Navigation/NavItem.php | 14 +-------------
 .../tests/Feature/NavigationMenuTest.php          |  4 ++--
 packages/framework/tests/Unit/NavItemTest.php     |  2 +-
 5 files changed, 32 insertions(+), 18 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index 545355ad96d..5105b3b12f0 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -4,6 +4,7 @@
 
 namespace Hyde\Framework\Features\Navigation;
 
+use Hyde\Hyde;
 use Hyde\Facades\Config;
 use Illuminate\Support\Str;
 use Hyde\Support\Models\Route;
@@ -13,6 +14,7 @@
 use Hyde\Foundation\Kernel\RouteCollection;
 
 use function collect;
+use function strtolower;
 
 /**
  * @experimental This class may change significantly before its release.
@@ -122,11 +124,22 @@ protected function createGroupItem(string $identifier, string $groupName): NavIt
     {
         $label = $this->searchForGroupLabelInConfig($identifier) ?? $groupName;
 
-        return NavItem::dropdown($label, []);
+        return NavItem::dropdown(static::normalizeGroupLabel($label), []);
     }
 
     protected function searchForGroupLabelInConfig(string $identifier): ?string
     {
         return Config::getArray('docs.sidebar_group_labels', [])[$identifier] ?? null;
     }
+
+    /** Todo: Move into shared class */
+    protected static function normalizeGroupLabel(string $label): string
+    {
+        // If there is no label, and the group is a slug, we can make a title from it
+        if ($label === strtolower($label)) {
+            return Hyde::makeTitle($label);
+        }
+
+        return $label;
+    }
 }
diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index 9ed815aa01d..9b3adb0be56 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -4,6 +4,7 @@
 
 namespace Hyde\Framework\Features\Navigation;
 
+use Hyde\Hyde;
 use Hyde\Facades\Config;
 use Hyde\Support\Models\Route;
 use Hyde\Pages\DocumentationPage;
@@ -11,6 +12,7 @@
 use Hyde\Foundation\Facades\Routes;
 
 use function collect;
+use function strtolower;
 
 /**
  * @experimental This class may change significantly before its release.
@@ -72,7 +74,7 @@ protected function moveGroupedItemsIntoDropdowns(): void
 
         foreach ($dropdowns as $group => $items) {
             // Create a new dropdown item containing the buffered items
-            $this->items->add(NavItem::dropdown($group, $items));
+            $this->items->add(NavItem::dropdown(static::normalizeGroupLabel($group), $items));
         }
     }
 
@@ -90,4 +92,15 @@ protected function useSubdirectoriesAsDropdowns(): bool
     {
         return Config::getString('hyde.navigation.subdirectories', 'hidden') === 'dropdown';
     }
+
+    /** Todo: Move into shared class */
+    protected static function normalizeGroupLabel(string $label): string
+    {
+        // If there is no label, and the group is a slug, we can make a title from it
+        if ($label === strtolower($label)) {
+            return Hyde::makeTitle($label);
+        }
+
+        return $label;
+    }
 }
diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 43314b92ccd..6cfd3cae668 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -13,7 +13,6 @@
 use Hyde\Support\Models\ExternalRoute;
 
 use function is_string;
-use function strtolower;
 
 /**
  * Abstraction for a navigation menu item. Used by the MainNavigationMenu and DocumentationSidebar classes.
@@ -100,7 +99,7 @@ public static function forRoute(Route|string $route, ?string $label = null, ?int
      */
     public static function dropdown(string $label, array $items, ?int $priority = null): static
     {
-        return new static('', static::normalizeGroupLabel($label), $priority ?? static::searchForDropdownPriorityInNavigationConfig($label) ?? 999, $label, $items);
+        return new static('', $label, $priority ?? static::searchForDropdownPriorityInNavigationConfig($label) ?? 999, $label, $items);
     }
 
     /**
@@ -214,15 +213,4 @@ protected static function searchForDropdownPriorityInNavigationConfig(string $gr
     {
         return Config::getArray('hyde.navigation.order', [])[$groupKey] ?? null;
     }
-
-    /** @deprecated This responsibility does not belong here. This should happen before the NavItem is created. */
-    protected static function normalizeGroupLabel(string $label): string
-    {
-        // If there is no label, and the group is a slug, we can make a title from it
-        if ($label === strtolower($label)) {
-            return Hyde::makeTitle($label);
-        }
-
-        return $label;
-    }
 }
diff --git a/packages/framework/tests/Feature/NavigationMenuTest.php b/packages/framework/tests/Feature/NavigationMenuTest.php
index 31bb0ad3f19..15c00178129 100644
--- a/packages/framework/tests/Feature/NavigationMenuTest.php
+++ b/packages/framework/tests/Feature/NavigationMenuTest.php
@@ -228,7 +228,7 @@ public function testPagesInSubdirectoriesAreNotAddedToTheNavigationMenuWithConfi
         $menu = $this->createNavigationMenu();
         $expected = collect([
             NavItem::fromRoute(Routes::get('index')),
-            NavItem::dropdown('foo', [
+            NavItem::dropdown('Foo', [
                 NavItem::fromRoute(Routes::get('foo/bar')),
             ]),
         ]);
@@ -249,7 +249,7 @@ public function testPagesInDropdownsDoNotGetAddedToTheMainNavigation()
         $this->assertEquals([
             NavItem::fromRoute(Routes::get('index')),
             NavItem::fromRoute((new MarkdownPage('foo'))->getRoute()),
-            NavItem::dropdown('bar', [
+            NavItem::dropdown('Bar', [
                 NavItem::fromRoute((new MarkdownPage('bar/baz'))->getRoute()),
             ]),
         ], $menu->getItems()->all());
diff --git a/packages/framework/tests/Unit/NavItemTest.php b/packages/framework/tests/Unit/NavItemTest.php
index 9dab7732acb..ebcd7e675dd 100644
--- a/packages/framework/tests/Unit/NavItemTest.php
+++ b/packages/framework/tests/Unit/NavItemTest.php
@@ -265,7 +265,7 @@ public function testDropdownFacade()
     {
         $item = NavItem::dropdown('foo', []);
 
-        $this->assertSame('Foo', $item->getLabel());
+        $this->assertSame('foo', $item->getLabel());
         $this->assertSame([], $item->getChildren());
         $this->assertSame(999, $item->getPriority());
     }

From 514facdeca53f2c39eefbc930764fc03c4fb8b58 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 21:05:32 +0100
Subject: [PATCH 0467/1422] Fix method should convert label to identifier for
 comparison

---
 .../framework/src/Framework/Features/Navigation/NavItem.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 6cfd3cae668..764d491d72e 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -99,7 +99,7 @@ public static function forRoute(Route|string $route, ?string $label = null, ?int
      */
     public static function dropdown(string $label, array $items, ?int $priority = null): static
     {
-        return new static('', $label, $priority ?? static::searchForDropdownPriorityInNavigationConfig($label) ?? 999, $label, $items);
+        return new static('', $label, $priority ?? static::searchForDropdownPriorityInNavigationConfig(Str::slug($label)) ?? 999, $label, $items);
     }
 
     /**

From ffa86ffb6568894659e0f390079e76a15309c976 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 21:25:40 +0100
Subject: [PATCH 0468/1422] Add priority tests

---
 .../AutomaticNavigationConfigurationsTest.php | 48 +++++++++++++++++++
 1 file changed, 48 insertions(+)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index afa4b3fdc0f..7297b6da681 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -1038,6 +1038,54 @@ public function testAllSidebarItemsArePlacedInGroupsWhenAtLeastOneItemIsGrouped(
         ]);
     }
 
+    // Priority tests
+
+    public function testMainNavigationDropdownPriorityCanBeSetInConfig()
+    {
+        config(['hyde.navigation.subdirectories' => 'dropdown']);
+        config(['hyde.navigation.order' => ['foo' => 500]]);
+
+        $this->assertMenuEquals(
+            [['label' => 'Foo', 'priority' => 500]],
+            [new MarkdownPage('foo/bar')]
+        );
+    }
+
+    public function testMainNavigationDropdownPriorityCanBeSetInConfigUsingDifferingCases()
+    {
+        config(['hyde.navigation.subdirectories' => 'dropdown']);
+        config(['hyde.navigation.order' => ['hello-world' => 500]]);
+
+        $expected = [['label' => 'Hello World', 'priority' => 500]];
+        $this->assertMenuEquals($expected, [new MarkdownPage('Hello World/bar')]);
+        $this->assertMenuEquals($expected, [new MarkdownPage('hello-world/bar')]);
+        $this->assertMenuEquals($expected, [new MarkdownPage('hello world/bar')]);
+    }
+
+    public function testSidebarGroupPriorityCanBeSetInConfig()
+    {
+        $this->markTestSkipped('TODO');
+
+        config(['docs.sidebar_order' => ['foo' => 500]]);
+
+        $this->assertSidebarEquals(
+            [['label' => 'Foo', 'priority' => 500]],
+            [new DocumentationPage('foo/bar')]
+        );
+    }
+
+    public function testSidebarGroupPriorityCanBeSetInConfigUsingDifferingCases()
+    {
+        $this->markTestSkipped('TODO');
+
+        config(['docs.sidebar_order' => ['hello-world' => 500]]);
+
+        $expected = [['label' => 'Hello World', 'priority' => 500]];
+        $this->assertSidebarEquals($expected, [new DocumentationPage('Hello World/bar')]);
+        $this->assertSidebarEquals($expected, [new DocumentationPage('hello-world/bar')]);
+        $this->assertSidebarEquals($expected, [new DocumentationPage('hello world/bar')]);
+    }
+
     // Label casing tests
 
     public function testMainMenuNavigationItemCasing()

From e2e0f2d65fac3e935edfb83bad8a787842ba3219 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 21:30:08 +0100
Subject: [PATCH 0469/1422] Refactor to handle priority search in generators

---
 .../Navigation/GeneratesDocumentationSidebarMenu.php | 10 +++++++++-
 .../Navigation/GeneratesMainNavigationMenu.php       |  8 +++++++-
 .../src/Framework/Features/Navigation/NavItem.php    |  9 +--------
 .../AutomaticNavigationConfigurationsTest.php        |  4 ----
 packages/framework/tests/Unit/NavItemTest.php        | 12 ------------
 5 files changed, 17 insertions(+), 26 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index 5105b3b12f0..22f9d0609fe 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -13,6 +13,7 @@
 use Hyde\Foundation\Facades\Routes;
 use Hyde\Foundation\Kernel\RouteCollection;
 
+use function filled;
 use function collect;
 use function strtolower;
 
@@ -123,8 +124,9 @@ protected function getOrCreateGroupItem(string $groupName): NavItem
     protected function createGroupItem(string $identifier, string $groupName): NavItem
     {
         $label = $this->searchForGroupLabelInConfig($identifier) ?? $groupName;
+        $priority = $this->searchForGroupPriorityInConfig($identifier);
 
-        return NavItem::dropdown(static::normalizeGroupLabel($label), []);
+        return NavItem::dropdown(static::normalizeGroupLabel($label), [], $priority);
     }
 
     protected function searchForGroupLabelInConfig(string $identifier): ?string
@@ -142,4 +144,10 @@ protected static function normalizeGroupLabel(string $label): string
 
         return $label;
     }
+
+    /** Todo: Move into shared class */
+    protected static function searchForGroupPriorityInConfig(string $groupKey): ?int
+    {
+        return Config::getArray('docs.sidebar_order', [])[$groupKey] ?? null;
+    }
 }
diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index 9b3adb0be56..9eaea26bde6 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -74,7 +74,7 @@ protected function moveGroupedItemsIntoDropdowns(): void
 
         foreach ($dropdowns as $group => $items) {
             // Create a new dropdown item containing the buffered items
-            $this->items->add(NavItem::dropdown(static::normalizeGroupLabel($group), $items));
+            $this->items->add(NavItem::dropdown(static::normalizeGroupLabel($group), $items, static::searchForDropdownPriorityInConfig($group)));
         }
     }
 
@@ -103,4 +103,10 @@ protected static function normalizeGroupLabel(string $label): string
 
         return $label;
     }
+
+    /** Todo: Move into shared class */
+    protected static function searchForDropdownPriorityInConfig(string $groupKey): ?int
+    {
+        return Config::getArray('hyde.navigation.order', [])[$groupKey] ?? null;
+    }
 }
diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 764d491d72e..ffbb2ac6234 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -4,7 +4,6 @@
 
 namespace Hyde\Framework\Features\Navigation;
 
-use Hyde\Facades\Config;
 use Hyde\Foundation\Facades\Routes;
 use Hyde\Hyde;
 use Hyde\Support\Models\Route;
@@ -99,7 +98,7 @@ public static function forRoute(Route|string $route, ?string $label = null, ?int
      */
     public static function dropdown(string $label, array $items, ?int $priority = null): static
     {
-        return new static('', $label, $priority ?? static::searchForDropdownPriorityInNavigationConfig(Str::slug($label)) ?? 999, $label, $items);
+        return new static('', $label, $priority ?? 999, $label, $items);
     }
 
     /**
@@ -207,10 +206,4 @@ protected static function makeIdentifier(string $label): string
     {
         return Str::slug($label); // Todo: If it's a dropdown based on a subdirectory, we should use the subdirectory as the identifier
     }
-
-    /** @deprecated This responsibility does not belong here. This should happen before the NavItem is created. */
-    protected static function searchForDropdownPriorityInNavigationConfig(string $groupKey): ?int
-    {
-        return Config::getArray('hyde.navigation.order', [])[$groupKey] ?? null;
-    }
 }
diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 7297b6da681..0fea5535c0a 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -1064,8 +1064,6 @@ public function testMainNavigationDropdownPriorityCanBeSetInConfigUsingDiffering
 
     public function testSidebarGroupPriorityCanBeSetInConfig()
     {
-        $this->markTestSkipped('TODO');
-
         config(['docs.sidebar_order' => ['foo' => 500]]);
 
         $this->assertSidebarEquals(
@@ -1076,8 +1074,6 @@ public function testSidebarGroupPriorityCanBeSetInConfig()
 
     public function testSidebarGroupPriorityCanBeSetInConfigUsingDifferingCases()
     {
-        $this->markTestSkipped('TODO');
-
         config(['docs.sidebar_order' => ['hello-world' => 500]]);
 
         $expected = [['label' => 'Hello World', 'priority' => 500]];
diff --git a/packages/framework/tests/Unit/NavItemTest.php b/packages/framework/tests/Unit/NavItemTest.php
index ebcd7e675dd..f2caf94538c 100644
--- a/packages/framework/tests/Unit/NavItemTest.php
+++ b/packages/framework/tests/Unit/NavItemTest.php
@@ -396,16 +396,4 @@ public function testCanAddItemToDropdown()
 
         $this->assertSame([$child], $parent->getChildren());
     }
-
-    public function testDefaultDropdownItemPriority()
-    {
-        $this->assertSame(999, NavItem::dropdown('foo', [])->getPriority());
-    }
-
-    public function testCanResolveDropdownItemPriorityFromConfig()
-    {
-        $this->mockConfig(['hyde.navigation.order' => ['foo' => 500]]);
-
-        $this->assertSame(500, NavItem::dropdown('foo', [])->getPriority());
-    }
 }

From 66da2e4acb9cf085407808f6b408f7bb84e3d1ed Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 12:15:34 +0100
Subject: [PATCH 0470/1422] Deprecate internal helper method

---
 .../Features/Navigation/GeneratesMainNavigationMenu.php          | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index 9eaea26bde6..777e0723cd3 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -58,6 +58,7 @@ protected function generate(): void
         }
     }
 
+    /** @deprecated */
     protected function moveGroupedItemsIntoDropdowns(): void
     {
         $dropdowns = [];

From 2695ad37ef5e2eb23146812ddd258317bea939fc Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 12:18:00 +0100
Subject: [PATCH 0471/1422] Add outer conditional

---
 .../Features/Navigation/GeneratesMainNavigationMenu.php        | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index 777e0723cd3..cfe063288eb 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -44,6 +44,9 @@ protected function generate(): void
     {
         Routes::each(function (Route $route): void {
             if ($this->canAddRoute($route)) {
+                if ($this->useSubdirectoriesAsDropdowns()) {
+                    //
+                }
                 $this->items->put($route->getRouteKey(), NavItem::fromRoute($route));
             }
         });

From 657462f966aaf62a43827269587e2ea95bf87fd6 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 12:20:15 +0100
Subject: [PATCH 0472/1422] Add todo

---
 .../Features/Navigation/GeneratesMainNavigationMenu.php          | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index cfe063288eb..b9467178d87 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -44,6 +44,7 @@ protected function generate(): void
     {
         Routes::each(function (Route $route): void {
             if ($this->canAddRoute($route)) {
+                // TODO This conditional might not be needed as it might be evaluated by the NavDaF
                 if ($this->useSubdirectoriesAsDropdowns()) {
                     //
                 }

From e864054044aa8ead26fbbff330352ef991a150f5 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 12:20:30 +0100
Subject: [PATCH 0473/1422] Add new helper

---
 .../Features/Navigation/GeneratesMainNavigationMenu.php      | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index b9467178d87..f86ee67cbfc 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -93,6 +93,11 @@ protected function canAddItemToDropdown(NavItem $item): bool
         return $item->getGroup() !== null;
     }
 
+    protected function canAddRouteToDropdown(Route $route): bool
+    {
+        return $route->getPage()->navigationMenuGroup() !== null;
+    }
+
     protected function useSubdirectoriesAsDropdowns(): bool
     {
         return Config::getString('hyde.navigation.subdirectories', 'hidden') === 'dropdown';

From b0f682fc192a16f30ecc5d680e3c9eab8667063b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 12:22:45 +0100
Subject: [PATCH 0474/1422] Add inner conditional

---
 .../Features/Navigation/GeneratesMainNavigationMenu.php       | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index f86ee67cbfc..0f62130071d 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -46,7 +46,9 @@ protected function generate(): void
             if ($this->canAddRoute($route)) {
                 // TODO This conditional might not be needed as it might be evaluated by the NavDaF
                 if ($this->useSubdirectoriesAsDropdowns()) {
-                    //
+                    if ($this->canAddRouteToDropdown($route)) {
+                        //
+                    }
                 }
                 $this->items->put($route->getRouteKey(), NavItem::fromRoute($route));
             }

From e7a9f6fd7bdb7a591499e3112767c4692e1fe7de Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 12:30:42 +0100
Subject: [PATCH 0475/1422] Begin porting deterministic generation logic

---
 .../GeneratesMainNavigationMenu.php           | 43 ++++++++++++++++---
 1 file changed, 38 insertions(+), 5 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index 0f62130071d..dea95364e9b 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -6,6 +6,7 @@
 
 use Hyde\Hyde;
 use Hyde\Facades\Config;
+use Illuminate\Support\Str;
 use Hyde\Support\Models\Route;
 use Hyde\Pages\DocumentationPage;
 use Illuminate\Support\Collection;
@@ -47,7 +48,9 @@ protected function generate(): void
                 // TODO This conditional might not be needed as it might be evaluated by the NavDaF
                 if ($this->useSubdirectoriesAsDropdowns()) {
                     if ($this->canAddRouteToDropdown($route)) {
-                        //
+                        $this->addRouteToGroup($route);
+
+                        return;
                     }
                 }
                 $this->items->put($route->getRouteKey(), NavItem::fromRoute($route));
@@ -58,10 +61,6 @@ protected function generate(): void
             // Since these were added explicitly by the user, we can assume they should always be shown
             $this->items->push($item);
         });
-
-        if ($this->useSubdirectoriesAsDropdowns()) {
-            $this->moveGroupedItemsIntoDropdowns();
-        }
     }
 
     /** @deprecated */
@@ -100,11 +99,45 @@ protected function canAddRouteToDropdown(Route $route): bool
         return $route->getPage()->navigationMenuGroup() !== null;
     }
 
+    protected function addRouteToGroup(Route $route): void
+    {
+        $group = $route->getPage()->navigationMenuGroup();
+
+        $groupItem = $this->getOrCreateGroupItem($group);
+
+        $groupItem->addChild(NavItem::fromRoute($route));
+
+        if (! $this->items->has($groupItem->getIdentifier())) {
+            $this->items->put($groupItem->getIdentifier(), $groupItem);
+        }
+    }
+
+    protected function getOrCreateGroupItem(string $groupName): NavItem
+    {
+        $identifier = Str::slug($groupName);
+        $group = $this->items->get($identifier);
+
+        return $group ?? $this->createGroupItem($identifier, $groupName);
+    }
+
+    protected function createGroupItem(string $identifier, string $groupName): NavItem
+    {
+        $label = $this->searchForGroupLabelInConfig($identifier) ?? $groupName;
+        $priority = $this->searchForDropdownPriorityInConfig($identifier);
+
+        return NavItem::dropdown(static::normalizeGroupLabel($label), [], $priority);
+    }
+
     protected function useSubdirectoriesAsDropdowns(): bool
     {
         return Config::getString('hyde.navigation.subdirectories', 'hidden') === 'dropdown';
     }
 
+    protected function searchForGroupLabelInConfig(string $identifier): ?string
+    {
+        return Config::getArray('hyde.navigation.labels', [])[$identifier] ?? null;
+    }
+
     /** Todo: Move into shared class */
     protected static function normalizeGroupLabel(string $label): string
     {

From f505764cb02aa00d3c89528cd222bff48a76e988 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 12:57:43 +0100
Subject: [PATCH 0476/1422] Remove now unused helpers

---
 .../GeneratesMainNavigationMenu.php           | 26 -------------------
 1 file changed, 26 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index dea95364e9b..5e719a5ba62 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -63,37 +63,11 @@ protected function generate(): void
         });
     }
 
-    /** @deprecated */
-    protected function moveGroupedItemsIntoDropdowns(): void
-    {
-        $dropdowns = [];
-
-        foreach ($this->items as $key => $item) {
-            if ($this->canAddItemToDropdown($item)) {
-                // Buffer the item in the dropdowns array
-                $dropdowns[$item->getGroup()][] = $item;
-
-                // Remove the item from the main items collection
-                $this->items->forget($key);
-            }
-        }
-
-        foreach ($dropdowns as $group => $items) {
-            // Create a new dropdown item containing the buffered items
-            $this->items->add(NavItem::dropdown(static::normalizeGroupLabel($group), $items, static::searchForDropdownPriorityInConfig($group)));
-        }
-    }
-
     protected function canAddRoute(Route $route): bool
     {
         return $route->getPage()->showInNavigation() && (! $route->getPage() instanceof DocumentationPage || $route->is(DocumentationPage::homeRouteName()));
     }
 
-    protected function canAddItemToDropdown(NavItem $item): bool
-    {
-        return $item->getGroup() !== null;
-    }
-
     protected function canAddRouteToDropdown(Route $route): bool
     {
         return $route->getPage()->navigationMenuGroup() !== null;

From 68f0d95095190ed8aac47327fff1058275efc7e8 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 13:02:12 +0100
Subject: [PATCH 0477/1422] Revert "Add todo"

This reverts commit 657462f966aaf62a43827269587e2ea95bf87fd6.
---
 .../Features/Navigation/GeneratesMainNavigationMenu.php          | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index 5e719a5ba62..8ff3a52ee0b 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -45,7 +45,6 @@ protected function generate(): void
     {
         Routes::each(function (Route $route): void {
             if ($this->canAddRoute($route)) {
-                // TODO This conditional might not be needed as it might be evaluated by the NavDaF
                 if ($this->useSubdirectoriesAsDropdowns()) {
                     if ($this->canAddRouteToDropdown($route)) {
                         $this->addRouteToGroup($route);

From 2171de13e7d7ed7289692eb10c090c82df4f01f6 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 13:03:05 +0100
Subject: [PATCH 0478/1422] Rename helpers to be more generic

---
 .../Features/Navigation/GeneratesMainNavigationMenu.php       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index 8ff3a52ee0b..c8bd7b95224 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -46,7 +46,7 @@ protected function generate(): void
         Routes::each(function (Route $route): void {
             if ($this->canAddRoute($route)) {
                 if ($this->useSubdirectoriesAsDropdowns()) {
-                    if ($this->canAddRouteToDropdown($route)) {
+                    if ($this->canAddRouteToGroup($route)) {
                         $this->addRouteToGroup($route);
 
                         return;
@@ -67,7 +67,7 @@ protected function canAddRoute(Route $route): bool
         return $route->getPage()->showInNavigation() && (! $route->getPage() instanceof DocumentationPage || $route->is(DocumentationPage::homeRouteName()));
     }
 
-    protected function canAddRouteToDropdown(Route $route): bool
+    protected function canAddRouteToGroup(Route $route): bool
     {
         return $route->getPage()->navigationMenuGroup() !== null;
     }

From de8069000609267aeae3b9ce5cf7102ddf805693 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 13:13:30 +0100
Subject: [PATCH 0479/1422] Merge with outer condition

---
 .../Features/Navigation/GeneratesMainNavigationMenu.php   | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index c8bd7b95224..49cf9ff3867 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -45,12 +45,10 @@ protected function generate(): void
     {
         Routes::each(function (Route $route): void {
             if ($this->canAddRoute($route)) {
-                if ($this->useSubdirectoriesAsDropdowns()) {
-                    if ($this->canAddRouteToGroup($route)) {
-                        $this->addRouteToGroup($route);
+                if ($this->useSubdirectoriesAsDropdowns() && $this->canAddRouteToGroup($route)) {
+                    $this->addRouteToGroup($route);
 
-                        return;
-                    }
+                    return;
                 }
                 $this->items->put($route->getRouteKey(), NavItem::fromRoute($route));
             }

From 15621bfaee98392917acbb16f659c4d0a3f65ba9 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 13:14:37 +0100
Subject: [PATCH 0480/1422] Replace closure return with else branch

---
 .../Features/Navigation/GeneratesMainNavigationMenu.php      | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index 49cf9ff3867..650cc3a8f71 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -47,10 +47,9 @@ protected function generate(): void
             if ($this->canAddRoute($route)) {
                 if ($this->useSubdirectoriesAsDropdowns() && $this->canAddRouteToGroup($route)) {
                     $this->addRouteToGroup($route);
-
-                    return;
+                } else {
+                    $this->items->put($route->getRouteKey(), NavItem::fromRoute($route));
                 }
-                $this->items->put($route->getRouteKey(), NavItem::fromRoute($route));
             }
         });
 

From 6f0e46d22a3e46805c9c9b4992da947ccb6434d5 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 13:19:50 +0100
Subject: [PATCH 0481/1422] Inline local variable

---
 .../Navigation/GeneratesDocumentationSidebarMenu.php        | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index 22f9d0609fe..e59666dbb99 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -54,12 +54,10 @@ protected function generate(): void
 
         $this->routes->each(function (Route $route) use ($useGroups): void {
             if ($this->canAddRoute($route)) {
-                $item = NavItem::fromRoute($route);
-
                 if ($useGroups) {
-                    $this->addItemToGroup($item);
+                    $this->addItemToGroup(NavItem::fromRoute($route));
                 } else {
-                    $this->items->put($route->getRouteKey(), $item);
+                    $this->items->put($route->getRouteKey(), NavItem::fromRoute($route));
                 }
             }
         });

From 742ba39ff7e311e657b6fe1b5cad3aa0e2e0305f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 13:24:24 +0100
Subject: [PATCH 0482/1422] Shift item construction to normalize method
 signature

---
 .../Navigation/GeneratesDocumentationSidebarMenu.php        | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index e59666dbb99..71f723b3df9 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -55,7 +55,7 @@ protected function generate(): void
         $this->routes->each(function (Route $route) use ($useGroups): void {
             if ($this->canAddRoute($route)) {
                 if ($useGroups) {
-                    $this->addItemToGroup(NavItem::fromRoute($route));
+                    $this->addRouteToGroup($route);
                 } else {
                     $this->items->put($route->getRouteKey(), NavItem::fromRoute($route));
                 }
@@ -95,8 +95,10 @@ protected function sortByPriority(): void
         })->values();
     }
 
-    protected function addItemToGroup(NavItem $item): void
+    protected function addRouteToGroup(Route $route): void
     {
+        $item = NavItem::fromRoute($route);
+
         $groupItem = $this->getOrCreateGroupItem($item->getGroup() ?? 'Other');
 
         $groupItem->addChild($item);

From cf175b6293c09130985d21619536ae7a4f60860a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 14:45:46 +0100
Subject: [PATCH 0483/1422] Normalize method implementation

---
 .../Features/Navigation/GeneratesMainNavigationMenu.php       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index 650cc3a8f71..cc0e7f0017b 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -71,9 +71,9 @@ protected function canAddRouteToGroup(Route $route): bool
 
     protected function addRouteToGroup(Route $route): void
     {
-        $group = $route->getPage()->navigationMenuGroup();
+        $item = NavItem::fromRoute($route);
 
-        $groupItem = $this->getOrCreateGroupItem($group);
+        $groupItem = $this->getOrCreateGroupItem($item->getGroup());
 
         $groupItem->addChild(NavItem::fromRoute($route));
 

From b96a898e72936028da9f234c9b8fba988967488d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 14:46:57 +0100
Subject: [PATCH 0484/1422] Use the local variable

---
 .../Features/Navigation/GeneratesMainNavigationMenu.php         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index cc0e7f0017b..28c4547fb44 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -75,7 +75,7 @@ protected function addRouteToGroup(Route $route): void
 
         $groupItem = $this->getOrCreateGroupItem($item->getGroup());
 
-        $groupItem->addChild(NavItem::fromRoute($route));
+        $groupItem->addChild($item);
 
         if (! $this->items->has($groupItem->getIdentifier())) {
             $this->items->put($groupItem->getIdentifier(), $groupItem);

From 034cf3fc39d2fe62877efeba461a2dce45718464 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 14:47:33 +0100
Subject: [PATCH 0485/1422] Create BaseMenuGenerator.php

---
 .../Features/Navigation/BaseMenuGenerator.php          | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php

diff --git a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
new file mode 100644
index 00000000000..adf8f5baf74
--- /dev/null
+++ b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Hyde\Framework\Features\Navigation;
+
+class BaseMenuGenerator
+{
+    //
+}

From d6649f0526cf036433992db959fefa8226b05909 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 14:48:06 +0100
Subject: [PATCH 0486/1422] Make class abstract

---
 .../src/Framework/Features/Navigation/BaseMenuGenerator.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
index adf8f5baf74..62bf88953e0 100644
--- a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
@@ -4,7 +4,7 @@
 
 namespace Hyde\Framework\Features\Navigation;
 
-class BaseMenuGenerator
+abstract class BaseMenuGenerator
 {
     //
 }

From eef96d7b8af58b38300f4943bd97a7d5b90434a3 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 14:48:26 +0100
Subject: [PATCH 0487/1422] Mark class as experimental

---
 .../src/Framework/Features/Navigation/BaseMenuGenerator.php    | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
index 62bf88953e0..73c31725aa0 100644
--- a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
@@ -4,6 +4,9 @@
 
 namespace Hyde\Framework\Features\Navigation;
 
+/**
+ * @experimental This class may change significantly before its release.
+ */
 abstract class BaseMenuGenerator
 {
     //

From 9132c240c05b0cb07ea7fb508360c35e4c8ca4d3 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 14:48:56 +0100
Subject: [PATCH 0488/1422] Cover new base class

---
 .../tests/Feature/AutomaticNavigationConfigurationsTest.php      | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 0fea5535c0a..a79b92703a9 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -25,6 +25,7 @@
  * High-level broad-spectrum tests for the automatic navigation configurations, testing various setups.
  *
  * @covers \Hyde\Framework\Factories\NavigationDataFactory
+ * @covers \Hyde\Framework\Features\Navigation\BaseMenuGenerator
  * @covers \Hyde\Framework\Features\Navigation\DocumentationSidebar
  * @covers \Hyde\Framework\Features\Navigation\GeneratesDocumentationSidebarMenu
  * @covers \Hyde\Framework\Features\Navigation\GeneratesMainNavigationMenu

From 276f176f48cabcb16e5c3e4da336b24cc993db34 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 14:49:27 +0100
Subject: [PATCH 0489/1422] Extend new base class

---
 .../Features/Navigation/GeneratesDocumentationSidebarMenu.php   | 2 +-
 .../Features/Navigation/GeneratesMainNavigationMenu.php         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index 71f723b3df9..06e27d77a4e 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -24,7 +24,7 @@
  *
  * @see \Hyde\Framework\Features\Navigation\GeneratesMainNavigationMenu
  */
-class GeneratesDocumentationSidebarMenu
+class GeneratesDocumentationSidebarMenu extends BaseMenuGenerator
 {
     /** @var \Illuminate\Support\Collection<string, \Hyde\Framework\Features\Navigation\NavItem> */
     protected Collection $items;
diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index 28c4547fb44..cc77cf17ee2 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -22,7 +22,7 @@
  *
  * @see \Hyde\Framework\Features\Navigation\GeneratesDocumentationSidebarMenu
  */
-class GeneratesMainNavigationMenu
+class GeneratesMainNavigationMenu extends BaseMenuGenerator
 {
     /** @var \Illuminate\Support\Collection<string, \Hyde\Framework\Features\Navigation\NavItem> */
     protected Collection $items;

From 3a8d1083b5ac31e8ea8252f613bd8bed5faeb719 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 14:50:26 +0100
Subject: [PATCH 0490/1422] Move shared property to base class

---
 .../src/Framework/Features/Navigation/BaseMenuGenerator.php  | 5 ++++-
 .../Navigation/GeneratesDocumentationSidebarMenu.php         | 3 ---
 .../Features/Navigation/GeneratesMainNavigationMenu.php      | 3 ---
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
index 73c31725aa0..da42a8bf8a2 100644
--- a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
@@ -4,10 +4,13 @@
 
 namespace Hyde\Framework\Features\Navigation;
 
+use Illuminate\Support\Collection;
+
 /**
  * @experimental This class may change significantly before its release.
  */
 abstract class BaseMenuGenerator
 {
-    //
+    /** @var \Illuminate\Support\Collection<string, \Hyde\Framework\Features\Navigation\NavItem> */
+    protected Collection $items;
 }
diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index 06e27d77a4e..c13e8b35001 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -26,9 +26,6 @@
  */
 class GeneratesDocumentationSidebarMenu extends BaseMenuGenerator
 {
-    /** @var \Illuminate\Support\Collection<string, \Hyde\Framework\Features\Navigation\NavItem> */
-    protected Collection $items;
-
     /** @var \Hyde\Foundation\Kernel\RouteCollection<string, \Hyde\Support\Models\Route> */
     protected RouteCollection $routes;
 
diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index cc77cf17ee2..3b0a010b456 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -24,9 +24,6 @@
  */
 class GeneratesMainNavigationMenu extends BaseMenuGenerator
 {
-    /** @var \Illuminate\Support\Collection<string, \Hyde\Framework\Features\Navigation\NavItem> */
-    protected Collection $items;
-
     protected function __construct()
     {
         $this->items = new Collection();

From f3a99ba6cb9be18cfc24def74610b2164d9934dd Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 15:13:48 +0100
Subject: [PATCH 0491/1422] Move routes property to base class

---
 .../src/Framework/Features/Navigation/BaseMenuGenerator.php   | 4 ++++
 .../Features/Navigation/GeneratesDocumentationSidebarMenu.php | 4 ----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
index da42a8bf8a2..9348aec8c2e 100644
--- a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
@@ -5,6 +5,7 @@
 namespace Hyde\Framework\Features\Navigation;
 
 use Illuminate\Support\Collection;
+use Hyde\Foundation\Kernel\RouteCollection;
 
 /**
  * @experimental This class may change significantly before its release.
@@ -13,4 +14,7 @@ abstract class BaseMenuGenerator
 {
     /** @var \Illuminate\Support\Collection<string, \Hyde\Framework\Features\Navigation\NavItem> */
     protected Collection $items;
+
+    /** @var \Hyde\Foundation\Kernel\RouteCollection<string, \Hyde\Support\Models\Route> */
+    protected RouteCollection $routes;
 }
diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index c13e8b35001..6af78e7a942 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -11,7 +11,6 @@
 use Hyde\Pages\DocumentationPage;
 use Illuminate\Support\Collection;
 use Hyde\Foundation\Facades\Routes;
-use Hyde\Foundation\Kernel\RouteCollection;
 
 use function filled;
 use function collect;
@@ -26,9 +25,6 @@
  */
 class GeneratesDocumentationSidebarMenu extends BaseMenuGenerator
 {
-    /** @var \Hyde\Foundation\Kernel\RouteCollection<string, \Hyde\Support\Models\Route> */
-    protected RouteCollection $routes;
-
     protected function __construct()
     {
         $this->items = new Collection();

From 5609efa01f2f03c4d6956b309888496f3699d812 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 15:14:32 +0100
Subject: [PATCH 0492/1422] Move constructors to base class

---
 .../Framework/Features/Navigation/BaseMenuGenerator.php   | 8 ++++++++
 .../Navigation/GeneratesDocumentationSidebarMenu.php      | 8 --------
 .../Features/Navigation/GeneratesMainNavigationMenu.php   | 6 ------
 3 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
index 9348aec8c2e..5bdf5f67eed 100644
--- a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
@@ -4,7 +4,9 @@
 
 namespace Hyde\Framework\Features\Navigation;
 
+use Hyde\Pages\DocumentationPage;
 use Illuminate\Support\Collection;
+use Hyde\Foundation\Facades\Routes;
 use Hyde\Foundation\Kernel\RouteCollection;
 
 /**
@@ -17,4 +19,10 @@ abstract class BaseMenuGenerator
 
     /** @var \Hyde\Foundation\Kernel\RouteCollection<string, \Hyde\Support\Models\Route> */
     protected RouteCollection $routes;
+
+    protected function __construct()
+    {
+        $this->items = new Collection();
+        $this->routes = Routes::getRoutes(DocumentationPage::class);
+    }
 }
diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index 6af78e7a942..5c62c01c6bb 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -9,8 +9,6 @@
 use Illuminate\Support\Str;
 use Hyde\Support\Models\Route;
 use Hyde\Pages\DocumentationPage;
-use Illuminate\Support\Collection;
-use Hyde\Foundation\Facades\Routes;
 
 use function filled;
 use function collect;
@@ -25,12 +23,6 @@
  */
 class GeneratesDocumentationSidebarMenu extends BaseMenuGenerator
 {
-    protected function __construct()
-    {
-        $this->items = new Collection();
-        $this->routes = Routes::getRoutes(DocumentationPage::class);
-    }
-
     public static function handle(): DocumentationSidebar
     {
         $menu = new static();
diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index 3b0a010b456..fd11bcdf237 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -9,7 +9,6 @@
 use Illuminate\Support\Str;
 use Hyde\Support\Models\Route;
 use Hyde\Pages\DocumentationPage;
-use Illuminate\Support\Collection;
 use Hyde\Foundation\Facades\Routes;
 
 use function collect;
@@ -24,11 +23,6 @@
  */
 class GeneratesMainNavigationMenu extends BaseMenuGenerator
 {
-    protected function __construct()
-    {
-        $this->items = new Collection();
-    }
-
     public static function handle(): NavigationMenu
     {
         $menu = new static();

From b2af8b4a67bb6f64e88030ec4d6b653b308e629b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 15:15:48 +0100
Subject: [PATCH 0493/1422] Use routes property

---
 .../Features/Navigation/GeneratesMainNavigationMenu.php        | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index fd11bcdf237..543b4b67677 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -9,7 +9,6 @@
 use Illuminate\Support\Str;
 use Hyde\Support\Models\Route;
 use Hyde\Pages\DocumentationPage;
-use Hyde\Foundation\Facades\Routes;
 
 use function collect;
 use function strtolower;
@@ -34,7 +33,7 @@ public static function handle(): NavigationMenu
 
     protected function generate(): void
     {
-        Routes::each(function (Route $route): void {
+        $this->routes->each(function (Route $route): void {
             if ($this->canAddRoute($route)) {
                 if ($this->useSubdirectoriesAsDropdowns() && $this->canAddRouteToGroup($route)) {
                     $this->addRouteToGroup($route);

From aa33de8bbad43a6bdab4ab7124acdf9bc58b0612 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 15:16:36 +0100
Subject: [PATCH 0494/1422] Fix route construction logic

---
 .../Framework/Features/Navigation/BaseMenuGenerator.php    | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
index 5bdf5f67eed..4142ca13a15 100644
--- a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
@@ -23,6 +23,11 @@ abstract class BaseMenuGenerator
     protected function __construct()
     {
         $this->items = new Collection();
-        $this->routes = Routes::getRoutes(DocumentationPage::class);
+
+        if ($this instanceof GeneratesDocumentationSidebarMenu) {
+            $this->routes = Routes::getRoutes(DocumentationPage::class);
+        } else {
+            $this->routes = Routes::all();
+        }
     }
 }

From f4b336e1196ff0d638861f99a95de8502973434c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 15:17:30 +0100
Subject: [PATCH 0495/1422] Simplify 'if'

---
 .../Framework/Features/Navigation/BaseMenuGenerator.php   | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
index 4142ca13a15..da9aef80df8 100644
--- a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
@@ -24,10 +24,8 @@ protected function __construct()
     {
         $this->items = new Collection();
 
-        if ($this instanceof GeneratesDocumentationSidebarMenu) {
-            $this->routes = Routes::getRoutes(DocumentationPage::class);
-        } else {
-            $this->routes = Routes::all();
-        }
+        $this->routes = $this instanceof GeneratesDocumentationSidebarMenu
+            ? Routes::getRoutes(DocumentationPage::class)
+            : Routes::all();
     }
 }

From 116ca5a0a44d30161609964d9c3af75352560a0a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 15:27:07 +0100
Subject: [PATCH 0496/1422] Refactor to move entry point to base class

---
 .../Framework/Features/Navigation/BaseMenuGenerator.php  | 9 +++++++++
 .../Features/Navigation/GeneratesMainNavigationMenu.php  | 9 ---------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
index da9aef80df8..f26a29a3542 100644
--- a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
@@ -28,4 +28,13 @@ protected function __construct()
             ? Routes::getRoutes(DocumentationPage::class)
             : Routes::all();
     }
+
+    public static function handle(): NavigationMenu
+    {
+        $menu = new static();
+
+        $menu->generate();
+
+        return new NavigationMenu($menu->items);
+    }
 }
diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index 543b4b67677..33b9f970590 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -22,15 +22,6 @@
  */
 class GeneratesMainNavigationMenu extends BaseMenuGenerator
 {
-    public static function handle(): NavigationMenu
-    {
-        $menu = new static();
-
-        $menu->generate();
-
-        return new NavigationMenu($menu->items);
-    }
-
     protected function generate(): void
     {
         $this->routes->each(function (Route $route): void {

From 65dbb894260330e9a3a0d3087236caa8a7ec9a38 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 15:37:11 +0100
Subject: [PATCH 0497/1422] Introduce state field

---
 .../src/Framework/Features/Navigation/BaseMenuGenerator.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
index f26a29a3542..85d5fc96c24 100644
--- a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
@@ -20,11 +20,15 @@ abstract class BaseMenuGenerator
     /** @var \Hyde\Foundation\Kernel\RouteCollection<string, \Hyde\Support\Models\Route> */
     protected RouteCollection $routes;
 
+    protected bool $generatesSidebar;
+
     protected function __construct()
     {
         $this->items = new Collection();
 
-        $this->routes = $this instanceof GeneratesDocumentationSidebarMenu
+        $this->generatesSidebar = $this instanceof GeneratesDocumentationSidebarMenu;
+
+        $this->routes = $this->generatesSidebar
             ? Routes::getRoutes(DocumentationPage::class)
             : Routes::all();
     }

From 19cfb690ecc2bab5241cc1130b9558a88ca366b1 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 15:38:10 +0100
Subject: [PATCH 0498/1422] Contract abstract function

---
 .../src/Framework/Features/Navigation/BaseMenuGenerator.php     | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
index 85d5fc96c24..b27fef3e8b3 100644
--- a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
@@ -41,4 +41,6 @@ public static function handle(): NavigationMenu
 
         return new NavigationMenu($menu->items);
     }
+
+    abstract protected function generate(): void;
 }

From 5ae81ea1836fc9ceec63a07bec7029d9a19a6816 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 15:40:43 +0100
Subject: [PATCH 0499/1422] Introduce polymorphic state field

---
 .../src/Framework/Features/Navigation/BaseMenuGenerator.php  | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
index b27fef3e8b3..31c9e210e2d 100644
--- a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
@@ -21,6 +21,7 @@ abstract class BaseMenuGenerator
     protected RouteCollection $routes;
 
     protected bool $generatesSidebar;
+    protected bool $usesGroups;
 
     protected function __construct()
     {
@@ -31,6 +32,10 @@ protected function __construct()
         $this->routes = $this->generatesSidebar
             ? Routes::getRoutes(DocumentationPage::class)
             : Routes::all();
+
+        $this->usesGroups = $this->generatesSidebar
+            ? $this->usesSidebarGroups()
+            : $this->useSubdirectoriesAsDropdowns();
     }
 
     public static function handle(): NavigationMenu

From 15453da8e4d73ab51743342a9f8a0354b79dc39e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 15:41:42 +0100
Subject: [PATCH 0500/1422] Extract helper method

---
 .../Features/Navigation/BaseMenuGenerator.php         | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
index 31c9e210e2d..44e0e89e6da 100644
--- a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
@@ -33,9 +33,7 @@ protected function __construct()
             ? Routes::getRoutes(DocumentationPage::class)
             : Routes::all();
 
-        $this->usesGroups = $this->generatesSidebar
-            ? $this->usesSidebarGroups()
-            : $this->useSubdirectoriesAsDropdowns();
+        $this->usesGroups = $this->usesGroups();
     }
 
     public static function handle(): NavigationMenu
@@ -48,4 +46,11 @@ public static function handle(): NavigationMenu
     }
 
     abstract protected function generate(): void;
+
+    protected function usesGroups(): bool
+    {
+        return $this->generatesSidebar
+            ? $this->usesSidebarGroups()
+            : $this->useSubdirectoriesAsDropdowns();
+    }
 }

From 4ef3834868f495c35473eee8fcb47f52cafe39f9 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 15:42:03 +0100
Subject: [PATCH 0501/1422] Replace '?:' with if

---
 .../Framework/Features/Navigation/BaseMenuGenerator.php   | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
index 44e0e89e6da..ce732b543dc 100644
--- a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
@@ -49,8 +49,10 @@ abstract protected function generate(): void;
 
     protected function usesGroups(): bool
     {
-        return $this->generatesSidebar
-            ? $this->usesSidebarGroups()
-            : $this->useSubdirectoriesAsDropdowns();
+        if ($this->generatesSidebar) {
+            return $this->usesSidebarGroups();
+        } else {
+            return $this->useSubdirectoriesAsDropdowns();
+        }
     }
 }

From ce2e9ddb038dd67ca772e99ea913a80a3f8d6da7 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 15:44:18 +0100
Subject: [PATCH 0502/1422] Use added state field

---
 .../Features/Navigation/GeneratesDocumentationSidebarMenu.php   | 2 +-
 .../Features/Navigation/GeneratesMainNavigationMenu.php         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index 5c62c01c6bb..a65f1f5015e 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -35,7 +35,7 @@ public static function handle(): DocumentationSidebar
 
     protected function generate(): void
     {
-        $useGroups = $this->usesSidebarGroups();
+        $useGroups = $this->usesGroups;
 
         $this->routes->each(function (Route $route) use ($useGroups): void {
             if ($this->canAddRoute($route)) {
diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index 33b9f970590..f84afbd154b 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -26,7 +26,7 @@ protected function generate(): void
     {
         $this->routes->each(function (Route $route): void {
             if ($this->canAddRoute($route)) {
-                if ($this->useSubdirectoriesAsDropdowns() && $this->canAddRouteToGroup($route)) {
+                if ($this->usesGroups && $this->canAddRouteToGroup($route)) {
                     $this->addRouteToGroup($route);
                 } else {
                     $this->items->put($route->getRouteKey(), NavItem::fromRoute($route));

From 8bb755202d463381ef716282ac4e20cb103e5b59 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 15:44:44 +0100
Subject: [PATCH 0503/1422] Inline polymorphic helper methods

---
 .../Features/Navigation/BaseMenuGenerator.php       | 13 +++++++++++--
 .../GeneratesDocumentationSidebarMenu.php           | 11 -----------
 .../Navigation/GeneratesMainNavigationMenu.php      |  5 -----
 3 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
index ce732b543dc..aa3900abe82 100644
--- a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
@@ -4,11 +4,15 @@
 
 namespace Hyde\Framework\Features\Navigation;
 
+use Hyde\Facades\Config;
+use Hyde\Support\Models\Route;
 use Hyde\Pages\DocumentationPage;
 use Illuminate\Support\Collection;
 use Hyde\Foundation\Facades\Routes;
 use Hyde\Foundation\Kernel\RouteCollection;
 
+use function filled;
+
 /**
  * @experimental This class may change significantly before its release.
  */
@@ -50,9 +54,14 @@ abstract protected function generate(): void;
     protected function usesGroups(): bool
     {
         if ($this->generatesSidebar) {
-            return $this->usesSidebarGroups();
+            // In order to know if we should use groups in the sidebar,
+            // we need to loop through the pages and see if they have a group set
+
+            return $this->routes->first(function (Route $route): bool {
+                return filled($route->getPage()->navigationMenuGroup());
+            }) !== null;
         } else {
-            return $this->useSubdirectoriesAsDropdowns();
+            return Config::getString('hyde.navigation.subdirectories', 'hidden') === 'dropdown';
         }
     }
 }
diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index a65f1f5015e..af70c970c75 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -10,7 +10,6 @@
 use Hyde\Support\Models\Route;
 use Hyde\Pages\DocumentationPage;
 
-use function filled;
 use function collect;
 use function strtolower;
 
@@ -53,16 +52,6 @@ protected function generate(): void
         }
     }
 
-    protected function usesSidebarGroups(): bool
-    {
-        // In order to know if we should use groups in the sidebar,
-        // we need to loop through the pages and see if they have a group set
-
-        return $this->routes->first(function (Route $route): bool {
-            return filled($route->getPage()->navigationMenuGroup());
-        }) !== null;
-    }
-
     protected function canAddRoute(Route $route): bool
     {
         return $route->getPage()->showInNavigation() && ! $route->is(DocumentationPage::homeRouteName());
diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index f84afbd154b..e981b956897 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -79,11 +79,6 @@ protected function createGroupItem(string $identifier, string $groupName): NavIt
         return NavItem::dropdown(static::normalizeGroupLabel($label), [], $priority);
     }
 
-    protected function useSubdirectoriesAsDropdowns(): bool
-    {
-        return Config::getString('hyde.navigation.subdirectories', 'hidden') === 'dropdown';
-    }
-
     protected function searchForGroupLabelInConfig(string $identifier): ?string
     {
         return Config::getArray('hyde.navigation.labels', [])[$identifier] ?? null;

From 5d9e82a0d1f3b74d9d4389e2bd0a7f6050266b5e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 15:45:52 +0100
Subject: [PATCH 0504/1422] Convert closure to arrow function

---
 .../src/Framework/Features/Navigation/BaseMenuGenerator.php   | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
index aa3900abe82..d5781fab250 100644
--- a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
@@ -57,9 +57,7 @@ protected function usesGroups(): bool
             // In order to know if we should use groups in the sidebar,
             // we need to loop through the pages and see if they have a group set
 
-            return $this->routes->first(function (Route $route): bool {
-                return filled($route->getPage()->navigationMenuGroup());
-            }) !== null;
+            return $this->routes->first(fn (Route $route): bool => filled($route->getPage()->navigationMenuGroup())) !== null;
         } else {
             return Config::getString('hyde.navigation.subdirectories', 'hidden') === 'dropdown';
         }

From 2778649c463670bc942dcfe12a20a484342a568f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 15:46:25 +0100
Subject: [PATCH 0505/1422] Clarify logic description

---
 .../src/Framework/Features/Navigation/BaseMenuGenerator.php    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
index d5781fab250..9b360765859 100644
--- a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
@@ -55,7 +55,8 @@ protected function usesGroups(): bool
     {
         if ($this->generatesSidebar) {
             // In order to know if we should use groups in the sidebar,
-            // we need to loop through the pages and see if they have a group set
+            // we need to loop through the pages and see if they have a group set.
+            // This automatically enables the sidebar grouping for all pages if at least one group is set.
 
             return $this->routes->first(fn (Route $route): bool => filled($route->getPage()->navigationMenuGroup())) !== null;
         } else {

From 7c7f582899773a77567ca3e2f5f0dc8964ecb7cd Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 15:46:54 +0100
Subject: [PATCH 0506/1422] Format code comment

---
 .../src/Framework/Features/Navigation/BaseMenuGenerator.php    | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
index 9b360765859..282e208e1e1 100644
--- a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
@@ -54,8 +54,7 @@ abstract protected function generate(): void;
     protected function usesGroups(): bool
     {
         if ($this->generatesSidebar) {
-            // In order to know if we should use groups in the sidebar,
-            // we need to loop through the pages and see if they have a group set.
+            // In order to know if we should use groups in the sidebar, we need to loop through the pages and see if they have a group set.
             // This automatically enables the sidebar grouping for all pages if at least one group is set.
 
             return $this->routes->first(fn (Route $route): bool => filled($route->getPage()->navigationMenuGroup())) !== null;

From a4ab7ada916bbaf63fd88bfe3487ac9ed70cf847 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 15:48:20 +0100
Subject: [PATCH 0507/1422] Inline local variable

---
 .../Navigation/GeneratesDocumentationSidebarMenu.php        | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index af70c970c75..0d9f3df0238 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -34,11 +34,9 @@ public static function handle(): DocumentationSidebar
 
     protected function generate(): void
     {
-        $useGroups = $this->usesGroups;
-
-        $this->routes->each(function (Route $route) use ($useGroups): void {
+        $this->routes->each(function (Route $route): void {
             if ($this->canAddRoute($route)) {
-                if ($useGroups) {
+                if ($this->usesGroups) {
                     $this->addRouteToGroup($route);
                 } else {
                     $this->items->put($route->getRouteKey(), NavItem::fromRoute($route));

From ae551a4c860a3bdbcab0b63d84bc0b5a255a2769 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 15:59:57 +0100
Subject: [PATCH 0508/1422] Document reasoning behind filter

---
 .../Features/Navigation/GeneratesMainNavigationMenu.php     | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index e981b956897..d424848f011 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -42,7 +42,11 @@ protected function generate(): void
 
     protected function canAddRoute(Route $route): bool
     {
-        return $route->getPage()->showInNavigation() && (! $route->getPage() instanceof DocumentationPage || $route->is(DocumentationPage::homeRouteName()));
+        return $route->getPage()->showInNavigation()
+            // While we for the most part can rely on the navigation visibility state provided by the navigation data factory,
+            // we need to make an exception for documentation pages, which generally have a visible state, as the data is
+            // also used in the sidebar. But we only want the documentation index page to be in the main navigation.
+            && (! $route->getPage() instanceof DocumentationPage || $route->is(DocumentationPage::homeRouteName()));
     }
 
     protected function canAddRouteToGroup(Route $route): bool

From 31f7e626c5010ea1c1f0d4683e5ee5a0df5a7eef Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 16:00:43 +0100
Subject: [PATCH 0509/1422] Document reasoning behind filter

---
 .../Features/Navigation/GeneratesDocumentationSidebarMenu.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index 0d9f3df0238..c510a4020ba 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -52,7 +52,9 @@ protected function generate(): void
 
     protected function canAddRoute(Route $route): bool
     {
-        return $route->getPage()->showInNavigation() && ! $route->is(DocumentationPage::homeRouteName());
+        return $route->getPage()->showInNavigation()
+            // Since the index page is linked in the header, we don't want it in the sidebar
+            && ! $route->is(DocumentationPage::homeRouteName());
     }
 
     protected function sortByPriority(): void

From 03599ca916f0c86be4fbca91837becea213b3e59 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 16:01:58 +0100
Subject: [PATCH 0510/1422] Extract parent method

---
 .../src/Framework/Features/Navigation/BaseMenuGenerator.php  | 5 +++++
 .../Navigation/GeneratesDocumentationSidebarMenu.php         | 2 +-
 .../Features/Navigation/GeneratesMainNavigationMenu.php      | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
index 282e208e1e1..04451f46183 100644
--- a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
@@ -62,4 +62,9 @@ protected function usesGroups(): bool
             return Config::getString('hyde.navigation.subdirectories', 'hidden') === 'dropdown';
         }
     }
+
+    protected function canAddRoute(Route $route): bool
+    {
+        return $route->getPage()->showInNavigation();
+    }
 }
diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index c510a4020ba..768c4ca43e5 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -52,7 +52,7 @@ protected function generate(): void
 
     protected function canAddRoute(Route $route): bool
     {
-        return $route->getPage()->showInNavigation()
+        return parent::canAddRoute($route)
             // Since the index page is linked in the header, we don't want it in the sidebar
             && ! $route->is(DocumentationPage::homeRouteName());
     }
diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index d424848f011..19d671d2b9f 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -42,7 +42,7 @@ protected function generate(): void
 
     protected function canAddRoute(Route $route): bool
     {
-        return $route->getPage()->showInNavigation()
+        return parent::canAddRoute($route)
             // While we for the most part can rely on the navigation visibility state provided by the navigation data factory,
             // we need to make an exception for documentation pages, which generally have a visible state, as the data is
             // also used in the sidebar. But we only want the documentation index page to be in the main navigation.

From 8b2760cac48238aa27f16926f7a29a49a6e6051f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 16:12:51 +0100
Subject: [PATCH 0511/1422] Swap method source order

---
 .../GeneratesDocumentationSidebarMenu.php     | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index 768c4ca43e5..cd43fcc66e2 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -57,18 +57,6 @@ protected function canAddRoute(Route $route): bool
             && ! $route->is(DocumentationPage::homeRouteName());
     }
 
-    protected function sortByPriority(): void
-    {
-        // While the items accessor sorts the items upon retrieval,
-        // we do an initial sorting here to order any groups.
-
-        $this->items = $this->items->sortBy(function (NavItem $item): int {
-            return $item->hasChildren()
-                ? $this->getLowestPriorityInGroup($item)
-                : $item->getPriority();
-        })->values();
-    }
-
     protected function addRouteToGroup(Route $route): void
     {
         $item = NavItem::fromRoute($route);
@@ -82,6 +70,18 @@ protected function addRouteToGroup(Route $route): void
         }
     }
 
+    protected function sortByPriority(): void
+    {
+        // While the items accessor sorts the items upon retrieval,
+        // we do an initial sorting here to order any groups.
+
+        $this->items = $this->items->sortBy(function (NavItem $item): int {
+            return $item->hasChildren()
+                ? $this->getLowestPriorityInGroup($item)
+                : $item->getPriority();
+        })->values();
+    }
+
     protected function getLowestPriorityInGroup(NavItem $item): int
     {
         return collect($item->getChildren())->min(fn (NavItem $child): int => $child->getPriority());

From 9e01c8d470fe5b1bacbaff08eb778bd53831490c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 16:14:56 +0100
Subject: [PATCH 0512/1422] Add abstract method stub

---
 .../src/Framework/Features/Navigation/BaseMenuGenerator.php    | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
index 04451f46183..4ddf3daf910 100644
--- a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
@@ -67,4 +67,7 @@ protected function canAddRoute(Route $route): bool
     {
         return $route->getPage()->showInNavigation();
     }
+
+    // Todo: Refactor to bring logic here
+    abstract protected function addRouteToGroup(Route $route): void;
 }

From d67c695f3d3c18b2299696c7e7539551206bf73a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 17:26:38 +0100
Subject: [PATCH 0513/1422] Rename helper method

---
 .../Features/Navigation/GeneratesMainNavigationMenu.php       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index 19d671d2b9f..75e5e3d05c6 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -26,7 +26,7 @@ protected function generate(): void
     {
         $this->routes->each(function (Route $route): void {
             if ($this->canAddRoute($route)) {
-                if ($this->usesGroups && $this->canAddRouteToGroup($route)) {
+                if ($this->usesGroups && $this->canGroupRoute($route)) {
                     $this->addRouteToGroup($route);
                 } else {
                     $this->items->put($route->getRouteKey(), NavItem::fromRoute($route));
@@ -49,7 +49,7 @@ protected function canAddRoute(Route $route): bool
             && (! $route->getPage() instanceof DocumentationPage || $route->is(DocumentationPage::homeRouteName()));
     }
 
-    protected function canAddRouteToGroup(Route $route): bool
+    protected function canGroupRoute(Route $route): bool
     {
         return $route->getPage()->navigationMenuGroup() !== null;
     }

From d50c054fb6f1fe992257115679e8d7ce94e4950b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 17:28:40 +0100
Subject: [PATCH 0514/1422] Refactor to add parent method

Normalizes the implementations
---
 .../src/Framework/Features/Navigation/BaseMenuGenerator.php  | 5 +++++
 .../Navigation/GeneratesDocumentationSidebarMenu.php         | 2 +-
 .../Features/Navigation/GeneratesMainNavigationMenu.php      | 4 ++--
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
index 4ddf3daf910..06dcf0bbe51 100644
--- a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
@@ -68,6 +68,11 @@ protected function canAddRoute(Route $route): bool
         return $route->getPage()->showInNavigation();
     }
 
+    protected function canGroupRoute(Route $route): bool
+    {
+        return $this->usesGroups;
+    }
+
     // Todo: Refactor to bring logic here
     abstract protected function addRouteToGroup(Route $route): void;
 }
diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index cd43fcc66e2..56ef1c1f9c0 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -36,7 +36,7 @@ protected function generate(): void
     {
         $this->routes->each(function (Route $route): void {
             if ($this->canAddRoute($route)) {
-                if ($this->usesGroups) {
+                if ($this->canGroupRoute($route)) {
                     $this->addRouteToGroup($route);
                 } else {
                     $this->items->put($route->getRouteKey(), NavItem::fromRoute($route));
diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index 75e5e3d05c6..4414010134c 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -26,7 +26,7 @@ protected function generate(): void
     {
         $this->routes->each(function (Route $route): void {
             if ($this->canAddRoute($route)) {
-                if ($this->usesGroups && $this->canGroupRoute($route)) {
+                if ($this->canGroupRoute($route)) {
                     $this->addRouteToGroup($route);
                 } else {
                     $this->items->put($route->getRouteKey(), NavItem::fromRoute($route));
@@ -51,7 +51,7 @@ protected function canAddRoute(Route $route): bool
 
     protected function canGroupRoute(Route $route): bool
     {
-        return $route->getPage()->navigationMenuGroup() !== null;
+        return parent::canGroupRoute($route) && $route->getPage()->navigationMenuGroup() !== null;
     }
 
     protected function addRouteToGroup(Route $route): void

From ba428a8fac20fa63dbdf6bee090975fbcc7c3873 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 17:31:47 +0100
Subject: [PATCH 0515/1422] Add shared logic to parent class

---
 .../Features/Navigation/BaseMenuGenerator.php       | 13 ++++++++++++-
 .../GeneratesDocumentationSidebarMenu.php           | 10 +---------
 .../Navigation/GeneratesMainNavigationMenu.php      | 10 +---------
 3 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
index 06dcf0bbe51..0aa9c49630d 100644
--- a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
@@ -49,7 +49,18 @@ public static function handle(): NavigationMenu
         return new NavigationMenu($menu->items);
     }
 
-    abstract protected function generate(): void;
+    protected function generate(): void
+    {
+        $this->routes->each(function (Route $route): void {
+            if ($this->canAddRoute($route)) {
+                if ($this->canGroupRoute($route)) {
+                    $this->addRouteToGroup($route);
+                } else {
+                    $this->items->put($route->getRouteKey(), NavItem::fromRoute($route));
+                }
+            }
+        });
+    }
 
     protected function usesGroups(): bool
     {
diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index 56ef1c1f9c0..7b4193d909a 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -34,15 +34,7 @@ public static function handle(): DocumentationSidebar
 
     protected function generate(): void
     {
-        $this->routes->each(function (Route $route): void {
-            if ($this->canAddRoute($route)) {
-                if ($this->canGroupRoute($route)) {
-                    $this->addRouteToGroup($route);
-                } else {
-                    $this->items->put($route->getRouteKey(), NavItem::fromRoute($route));
-                }
-            }
-        });
+        parent::generate();
 
         // If there are no pages other than the index page, we add it to the sidebar so that it's not empty
         if ($this->items->count() === 0 && DocumentationPage::home() !== null) {
diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index 4414010134c..2eb0319488a 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -24,15 +24,7 @@ class GeneratesMainNavigationMenu extends BaseMenuGenerator
 {
     protected function generate(): void
     {
-        $this->routes->each(function (Route $route): void {
-            if ($this->canAddRoute($route)) {
-                if ($this->canGroupRoute($route)) {
-                    $this->addRouteToGroup($route);
-                } else {
-                    $this->items->put($route->getRouteKey(), NavItem::fromRoute($route));
-                }
-            }
-        });
+        parent::generate();
 
         collect(Config::getArray('hyde.navigation.custom', []))->each(function (NavItem $item): void {
             // Since these were added explicitly by the user, we can assume they should always be shown

From 0832057593c7d24a8a5359d79790a12c67e0191e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 17:33:24 +0100
Subject: [PATCH 0516/1422] Refactor to bring logic to parent

---
 .../Features/Navigation/BaseMenuGenerator.php | 20 +++++++++++++++++--
 .../GeneratesDocumentationSidebarMenu.php     | 13 ------------
 .../GeneratesMainNavigationMenu.php           | 13 ------------
 3 files changed, 18 insertions(+), 28 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
index 0aa9c49630d..5a2d1cf5dd2 100644
--- a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
@@ -84,6 +84,22 @@ protected function canGroupRoute(Route $route): bool
         return $this->usesGroups;
     }
 
-    // Todo: Refactor to bring logic here
-    abstract protected function addRouteToGroup(Route $route): void;
+    protected function addRouteToGroup(Route $route): void
+    {
+        $item = NavItem::fromRoute($route);
+
+        if ($this->generatesSidebar) {
+            $groupName = $item->getGroup() ?? 'Other';
+        } else {
+            $groupName = $item->getGroup();
+        }
+
+        $groupItem = $this->getOrCreateGroupItem($groupName);
+
+        $groupItem->addChild($item);
+
+        if (! $this->items->has($groupItem->getIdentifier())) {
+            $this->items->put($groupItem->getIdentifier(), $groupItem);
+        }
+    }
 }
diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index 7b4193d909a..80b8a13c4ca 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -49,19 +49,6 @@ protected function canAddRoute(Route $route): bool
             && ! $route->is(DocumentationPage::homeRouteName());
     }
 
-    protected function addRouteToGroup(Route $route): void
-    {
-        $item = NavItem::fromRoute($route);
-
-        $groupItem = $this->getOrCreateGroupItem($item->getGroup() ?? 'Other');
-
-        $groupItem->addChild($item);
-
-        if (! $this->items->has($groupItem->getIdentifier())) {
-            $this->items->put($groupItem->getIdentifier(), $groupItem);
-        }
-    }
-
     protected function sortByPriority(): void
     {
         // While the items accessor sorts the items upon retrieval,
diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index 2eb0319488a..29e933c46eb 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -46,19 +46,6 @@ protected function canGroupRoute(Route $route): bool
         return parent::canGroupRoute($route) && $route->getPage()->navigationMenuGroup() !== null;
     }
 
-    protected function addRouteToGroup(Route $route): void
-    {
-        $item = NavItem::fromRoute($route);
-
-        $groupItem = $this->getOrCreateGroupItem($item->getGroup());
-
-        $groupItem->addChild($item);
-
-        if (! $this->items->has($groupItem->getIdentifier())) {
-            $this->items->put($groupItem->getIdentifier(), $groupItem);
-        }
-    }
-
     protected function getOrCreateGroupItem(string $groupName): NavItem
     {
         $identifier = Str::slug($groupName);

From a0a64aae3028a37be112c5a6a411e124750cb0dc Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 17:34:26 +0100
Subject: [PATCH 0517/1422] Simplify 'if'

---
 .../src/Framework/Features/Navigation/BaseMenuGenerator.php | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
index 5a2d1cf5dd2..e470d0d8de4 100644
--- a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
@@ -88,11 +88,7 @@ protected function addRouteToGroup(Route $route): void
     {
         $item = NavItem::fromRoute($route);
 
-        if ($this->generatesSidebar) {
-            $groupName = $item->getGroup() ?? 'Other';
-        } else {
-            $groupName = $item->getGroup();
-        }
+        $groupName = $this->generatesSidebar ? $item->getGroup() ?? 'Other' : $item->getGroup();
 
         $groupItem = $this->getOrCreateGroupItem($groupName);
 

From 800d1982ed477409d073824c37198f03b5385777 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 17:35:04 +0100
Subject: [PATCH 0518/1422] Add clarifying parentheses

---
 .../src/Framework/Features/Navigation/BaseMenuGenerator.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
index e470d0d8de4..87eae0adac3 100644
--- a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
@@ -88,7 +88,7 @@ protected function addRouteToGroup(Route $route): void
     {
         $item = NavItem::fromRoute($route);
 
-        $groupName = $this->generatesSidebar ? $item->getGroup() ?? 'Other' : $item->getGroup();
+        $groupName = $this->generatesSidebar ? ($item->getGroup() ?? 'Other') : $item->getGroup();
 
         $groupItem = $this->getOrCreateGroupItem($groupName);
 

From e759d5cacf002584479ccc4ed0fbb620dc7c9ad4 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 17:36:07 +0100
Subject: [PATCH 0519/1422] Move shared method to parent

---
 .../Framework/Features/Navigation/BaseMenuGenerator.php  | 9 +++++++++
 .../Navigation/GeneratesDocumentationSidebarMenu.php     | 9 ---------
 .../Features/Navigation/GeneratesMainNavigationMenu.php  | 9 ---------
 3 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
index 87eae0adac3..272f8bb801e 100644
--- a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
@@ -5,6 +5,7 @@
 namespace Hyde\Framework\Features\Navigation;
 
 use Hyde\Facades\Config;
+use Illuminate\Support\Str;
 use Hyde\Support\Models\Route;
 use Hyde\Pages\DocumentationPage;
 use Illuminate\Support\Collection;
@@ -98,4 +99,12 @@ protected function addRouteToGroup(Route $route): void
             $this->items->put($groupItem->getIdentifier(), $groupItem);
         }
     }
+
+    protected function getOrCreateGroupItem(string $groupName): NavItem
+    {
+        $identifier = Str::slug($groupName);
+        $group = $this->items->get($identifier);
+
+        return $group ?? $this->createGroupItem($identifier, $groupName);
+    }
 }
diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index 80b8a13c4ca..8c4af350163 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -6,7 +6,6 @@
 
 use Hyde\Hyde;
 use Hyde\Facades\Config;
-use Illuminate\Support\Str;
 use Hyde\Support\Models\Route;
 use Hyde\Pages\DocumentationPage;
 
@@ -66,14 +65,6 @@ protected function getLowestPriorityInGroup(NavItem $item): int
         return collect($item->getChildren())->min(fn (NavItem $child): int => $child->getPriority());
     }
 
-    protected function getOrCreateGroupItem(string $groupName): NavItem
-    {
-        $identifier = Str::slug($groupName);
-        $group = $this->items->get($identifier);
-
-        return $group ?? $this->createGroupItem($identifier, $groupName);
-    }
-
     protected function createGroupItem(string $identifier, string $groupName): NavItem
     {
         $label = $this->searchForGroupLabelInConfig($identifier) ?? $groupName;
diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index 29e933c46eb..df7eb0339f4 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -6,7 +6,6 @@
 
 use Hyde\Hyde;
 use Hyde\Facades\Config;
-use Illuminate\Support\Str;
 use Hyde\Support\Models\Route;
 use Hyde\Pages\DocumentationPage;
 
@@ -46,14 +45,6 @@ protected function canGroupRoute(Route $route): bool
         return parent::canGroupRoute($route) && $route->getPage()->navigationMenuGroup() !== null;
     }
 
-    protected function getOrCreateGroupItem(string $groupName): NavItem
-    {
-        $identifier = Str::slug($groupName);
-        $group = $this->items->get($identifier);
-
-        return $group ?? $this->createGroupItem($identifier, $groupName);
-    }
-
     protected function createGroupItem(string $identifier, string $groupName): NavItem
     {
         $label = $this->searchForGroupLabelInConfig($identifier) ?? $groupName;

From d40f25577986f61dd655928e049dfb616aa6e671 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 17:49:20 +0100
Subject: [PATCH 0520/1422] Begin refactoring method to parent class

---
 .../Features/Navigation/BaseMenuGenerator.php     | 15 +++++++++++++++
 .../GeneratesDocumentationSidebarMenu.php         |  8 --------
 .../Navigation/GeneratesMainNavigationMenu.php    |  8 --------
 3 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
index 272f8bb801e..0129239384f 100644
--- a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
@@ -107,4 +107,19 @@ protected function getOrCreateGroupItem(string $groupName): NavItem
 
         return $group ?? $this->createGroupItem($identifier, $groupName);
     }
+
+    protected function createGroupItem(string $identifier, string $groupName): NavItem
+    {
+        if ($this->generatesSidebar) {
+            $label = $this->searchForGroupLabelInConfig($identifier) ?? $groupName;
+            $priority = $this->searchForGroupPriorityInConfig($identifier);
+
+            return NavItem::dropdown(static::normalizeGroupLabel($label), [], $priority);
+        } else {
+            $label = $this->searchForGroupLabelInConfig($identifier) ?? $groupName;
+            $priority = $this->searchForDropdownPriorityInConfig($identifier);
+
+            return NavItem::dropdown(static::normalizeGroupLabel($label), [], $priority);
+        }
+    }
 }
diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index 8c4af350163..d9174598e4a 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -65,14 +65,6 @@ protected function getLowestPriorityInGroup(NavItem $item): int
         return collect($item->getChildren())->min(fn (NavItem $child): int => $child->getPriority());
     }
 
-    protected function createGroupItem(string $identifier, string $groupName): NavItem
-    {
-        $label = $this->searchForGroupLabelInConfig($identifier) ?? $groupName;
-        $priority = $this->searchForGroupPriorityInConfig($identifier);
-
-        return NavItem::dropdown(static::normalizeGroupLabel($label), [], $priority);
-    }
-
     protected function searchForGroupLabelInConfig(string $identifier): ?string
     {
         return Config::getArray('docs.sidebar_group_labels', [])[$identifier] ?? null;
diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index df7eb0339f4..4e093aa3cec 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -45,14 +45,6 @@ protected function canGroupRoute(Route $route): bool
         return parent::canGroupRoute($route) && $route->getPage()->navigationMenuGroup() !== null;
     }
 
-    protected function createGroupItem(string $identifier, string $groupName): NavItem
-    {
-        $label = $this->searchForGroupLabelInConfig($identifier) ?? $groupName;
-        $priority = $this->searchForDropdownPriorityInConfig($identifier);
-
-        return NavItem::dropdown(static::normalizeGroupLabel($label), [], $priority);
-    }
-
     protected function searchForGroupLabelInConfig(string $identifier): ?string
     {
         return Config::getArray('hyde.navigation.labels', [])[$identifier] ?? null;

From b57a54922e035a5aa22fae82ec8f91dcea7a23b1 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 17:50:40 +0100
Subject: [PATCH 0521/1422] Extract common parts from if/else block

---
 .../Features/Navigation/BaseMenuGenerator.php          | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
index 0129239384f..db07ab50d0c 100644
--- a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
@@ -110,16 +110,14 @@ protected function getOrCreateGroupItem(string $groupName): NavItem
 
     protected function createGroupItem(string $identifier, string $groupName): NavItem
     {
+        $label = $this->searchForGroupLabelInConfig($identifier) ?? $groupName;
+
         if ($this->generatesSidebar) {
-            $label = $this->searchForGroupLabelInConfig($identifier) ?? $groupName;
             $priority = $this->searchForGroupPriorityInConfig($identifier);
-
-            return NavItem::dropdown(static::normalizeGroupLabel($label), [], $priority);
         } else {
-            $label = $this->searchForGroupLabelInConfig($identifier) ?? $groupName;
             $priority = $this->searchForDropdownPriorityInConfig($identifier);
-
-            return NavItem::dropdown(static::normalizeGroupLabel($label), [], $priority);
         }
+
+        return NavItem::dropdown(static::normalizeGroupLabel($label), [], $priority);
     }
 }

From d6c33aedf1017ab8a2ad6ac3e8a43eec1233d02f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 17:53:47 +0100
Subject: [PATCH 0522/1422] Simplify 'if'

---
 .../Framework/Features/Navigation/BaseMenuGenerator.php   | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
index db07ab50d0c..19085bc73f7 100644
--- a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
@@ -112,11 +112,9 @@ protected function createGroupItem(string $identifier, string $groupName): NavIt
     {
         $label = $this->searchForGroupLabelInConfig($identifier) ?? $groupName;
 
-        if ($this->generatesSidebar) {
-            $priority = $this->searchForGroupPriorityInConfig($identifier);
-        } else {
-            $priority = $this->searchForDropdownPriorityInConfig($identifier);
-        }
+        $priority = $this->generatesSidebar
+            ? $this->searchForGroupPriorityInConfig($identifier)
+            : $this->searchForDropdownPriorityInConfig($identifier);
 
         return NavItem::dropdown(static::normalizeGroupLabel($label), [], $priority);
     }

From 338b453a4b355e091180c65022b73cae761d0c25 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 17:55:56 +0100
Subject: [PATCH 0523/1422] Normalize method signatures

---
 .../src/Framework/Features/Navigation/BaseMenuGenerator.php   | 4 +---
 .../Features/Navigation/GeneratesDocumentationSidebarMenu.php | 2 +-
 .../Features/Navigation/GeneratesMainNavigationMenu.php       | 2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
index 19085bc73f7..5dadc5520e0 100644
--- a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
@@ -112,9 +112,7 @@ protected function createGroupItem(string $identifier, string $groupName): NavIt
     {
         $label = $this->searchForGroupLabelInConfig($identifier) ?? $groupName;
 
-        $priority = $this->generatesSidebar
-            ? $this->searchForGroupPriorityInConfig($identifier)
-            : $this->searchForDropdownPriorityInConfig($identifier);
+        $priority = $this->searchForGroupPriorityInConfig($identifier);
 
         return NavItem::dropdown(static::normalizeGroupLabel($label), [], $priority);
     }
diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index d9174598e4a..593b7863160 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -82,7 +82,7 @@ protected static function normalizeGroupLabel(string $label): string
     }
 
     /** Todo: Move into shared class */
-    protected static function searchForGroupPriorityInConfig(string $groupKey): ?int
+    protected function searchForGroupPriorityInConfig(string $groupKey): ?int
     {
         return Config::getArray('docs.sidebar_order', [])[$groupKey] ?? null;
     }
diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index 4e093aa3cec..7129b82df1f 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -62,7 +62,7 @@ protected static function normalizeGroupLabel(string $label): string
     }
 
     /** Todo: Move into shared class */
-    protected static function searchForDropdownPriorityInConfig(string $groupKey): ?int
+    protected function searchForGroupPriorityInConfig(string $groupKey): ?int
     {
         return Config::getArray('hyde.navigation.order', [])[$groupKey] ?? null;
     }

From 9af0fbc4616bd9423a5312c10608924d3a2c14b9 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 17:57:59 +0100
Subject: [PATCH 0524/1422] Move shared method into base class

---
 .../Features/Navigation/BaseMenuGenerator.php       | 12 ++++++++++++
 .../GeneratesDocumentationSidebarMenu.php           | 13 -------------
 .../Navigation/GeneratesMainNavigationMenu.php      | 13 -------------
 3 files changed, 12 insertions(+), 26 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
index 5dadc5520e0..82d5b6a14a6 100644
--- a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
@@ -4,6 +4,7 @@
 
 namespace Hyde\Framework\Features\Navigation;
 
+use Hyde\Hyde;
 use Hyde\Facades\Config;
 use Illuminate\Support\Str;
 use Hyde\Support\Models\Route;
@@ -13,6 +14,7 @@
 use Hyde\Foundation\Kernel\RouteCollection;
 
 use function filled;
+use function strtolower;
 
 /**
  * @experimental This class may change significantly before its release.
@@ -116,4 +118,14 @@ protected function createGroupItem(string $identifier, string $groupName): NavIt
 
         return NavItem::dropdown(static::normalizeGroupLabel($label), [], $priority);
     }
+
+    protected static function normalizeGroupLabel(string $label): string
+    {
+        // If there is no label, and the group is a slug, we can make a title from it
+        if ($label === strtolower($label)) {
+            return Hyde::makeTitle($label);
+        }
+
+        return $label;
+    }
 }
diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index 593b7863160..cbd8309532e 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -4,13 +4,11 @@
 
 namespace Hyde\Framework\Features\Navigation;
 
-use Hyde\Hyde;
 use Hyde\Facades\Config;
 use Hyde\Support\Models\Route;
 use Hyde\Pages\DocumentationPage;
 
 use function collect;
-use function strtolower;
 
 /**
  * @experimental This class may change significantly before its release.
@@ -70,17 +68,6 @@ protected function searchForGroupLabelInConfig(string $identifier): ?string
         return Config::getArray('docs.sidebar_group_labels', [])[$identifier] ?? null;
     }
 
-    /** Todo: Move into shared class */
-    protected static function normalizeGroupLabel(string $label): string
-    {
-        // If there is no label, and the group is a slug, we can make a title from it
-        if ($label === strtolower($label)) {
-            return Hyde::makeTitle($label);
-        }
-
-        return $label;
-    }
-
     /** Todo: Move into shared class */
     protected function searchForGroupPriorityInConfig(string $groupKey): ?int
     {
diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index 7129b82df1f..794fed0e571 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -4,13 +4,11 @@
 
 namespace Hyde\Framework\Features\Navigation;
 
-use Hyde\Hyde;
 use Hyde\Facades\Config;
 use Hyde\Support\Models\Route;
 use Hyde\Pages\DocumentationPage;
 
 use function collect;
-use function strtolower;
 
 /**
  * @experimental This class may change significantly before its release.
@@ -50,17 +48,6 @@ protected function searchForGroupLabelInConfig(string $identifier): ?string
         return Config::getArray('hyde.navigation.labels', [])[$identifier] ?? null;
     }
 
-    /** Todo: Move into shared class */
-    protected static function normalizeGroupLabel(string $label): string
-    {
-        // If there is no label, and the group is a slug, we can make a title from it
-        if ($label === strtolower($label)) {
-            return Hyde::makeTitle($label);
-        }
-
-        return $label;
-    }
-
     /** Todo: Move into shared class */
     protected function searchForGroupPriorityInConfig(string $groupKey): ?int
     {

From d167660042914030197aacc9ce271ce48294a16e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 18:04:12 +0100
Subject: [PATCH 0525/1422] Change static method to instance member

---
 .../src/Framework/Features/Navigation/BaseMenuGenerator.php   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
index 82d5b6a14a6..249903d18a4 100644
--- a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
@@ -116,10 +116,10 @@ protected function createGroupItem(string $identifier, string $groupName): NavIt
 
         $priority = $this->searchForGroupPriorityInConfig($identifier);
 
-        return NavItem::dropdown(static::normalizeGroupLabel($label), [], $priority);
+        return NavItem::dropdown($this->normalizeGroupLabel($label), [], $priority);
     }
 
-    protected static function normalizeGroupLabel(string $label): string
+    protected function normalizeGroupLabel(string $label): string
     {
         // If there is no label, and the group is a slug, we can make a title from it
         if ($label === strtolower($label)) {

From 5ee8ce1da782a1bffe8533fb9d131cadf6808d0e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 18:06:55 +0100
Subject: [PATCH 0526/1422] Refactor to move method into parent class

---
 .../Framework/Features/Navigation/BaseMenuGenerator.php    | 7 +++++++
 .../Navigation/GeneratesDocumentationSidebarMenu.php       | 6 ------
 .../Features/Navigation/GeneratesMainNavigationMenu.php    | 6 ------
 3 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
index 249903d18a4..79262d9abdb 100644
--- a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
@@ -128,4 +128,11 @@ protected function normalizeGroupLabel(string $label): string
 
         return $label;
     }
+
+    protected function searchForGroupPriorityInConfig(string $groupKey): ?int
+    {
+        $key = $this->generatesSidebar ? 'docs.sidebar_order' : 'hyde.navigation.order';
+
+        return Config::getArray($key, [])[$groupKey] ?? null;
+    }
 }
diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index cbd8309532e..59737dce823 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -67,10 +67,4 @@ protected function searchForGroupLabelInConfig(string $identifier): ?string
     {
         return Config::getArray('docs.sidebar_group_labels', [])[$identifier] ?? null;
     }
-
-    /** Todo: Move into shared class */
-    protected function searchForGroupPriorityInConfig(string $groupKey): ?int
-    {
-        return Config::getArray('docs.sidebar_order', [])[$groupKey] ?? null;
-    }
 }
diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index 794fed0e571..aa36fddf141 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -47,10 +47,4 @@ protected function searchForGroupLabelInConfig(string $identifier): ?string
     {
         return Config::getArray('hyde.navigation.labels', [])[$identifier] ?? null;
     }
-
-    /** Todo: Move into shared class */
-    protected function searchForGroupPriorityInConfig(string $groupKey): ?int
-    {
-        return Config::getArray('hyde.navigation.order', [])[$groupKey] ?? null;
-    }
 }

From 351ff643d588f66750bf797422e18e072e0c7f7e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 18:08:44 +0100
Subject: [PATCH 0527/1422] Refactor to move method into parent class

---
 .../Framework/Features/Navigation/BaseMenuGenerator.php    | 7 +++++++
 .../Navigation/GeneratesDocumentationSidebarMenu.php       | 6 ------
 .../Features/Navigation/GeneratesMainNavigationMenu.php    | 5 -----
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
index 79262d9abdb..ed5f73bfbda 100644
--- a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
@@ -129,6 +129,13 @@ protected function normalizeGroupLabel(string $label): string
         return $label;
     }
 
+    protected function searchForGroupLabelInConfig(string $identifier): ?string
+    {
+        $key = $this->generatesSidebar ? 'docs.sidebar_group_labels' : 'hyde.navigation.labels';
+
+        return Config::getArray($key, [])[$identifier] ?? null;
+    }
+
     protected function searchForGroupPriorityInConfig(string $groupKey): ?int
     {
         $key = $this->generatesSidebar ? 'docs.sidebar_order' : 'hyde.navigation.order';
diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index 59737dce823..ed88032994f 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -4,7 +4,6 @@
 
 namespace Hyde\Framework\Features\Navigation;
 
-use Hyde\Facades\Config;
 use Hyde\Support\Models\Route;
 use Hyde\Pages\DocumentationPage;
 
@@ -62,9 +61,4 @@ protected function getLowestPriorityInGroup(NavItem $item): int
     {
         return collect($item->getChildren())->min(fn (NavItem $child): int => $child->getPriority());
     }
-
-    protected function searchForGroupLabelInConfig(string $identifier): ?string
-    {
-        return Config::getArray('docs.sidebar_group_labels', [])[$identifier] ?? null;
-    }
 }
diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index aa36fddf141..33b802cf4fb 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -42,9 +42,4 @@ protected function canGroupRoute(Route $route): bool
     {
         return parent::canGroupRoute($route) && $route->getPage()->navigationMenuGroup() !== null;
     }
-
-    protected function searchForGroupLabelInConfig(string $identifier): ?string
-    {
-        return Config::getArray('hyde.navigation.labels', [])[$identifier] ?? null;
-    }
 }

From 02b327c315e52c8cbd83ab2ab068e8414ceb50fc Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 18:11:13 +0100
Subject: [PATCH 0528/1422] Normalize helper method signatures

Using groupKey instead of identifier as the latter can also apply to the pages
---
 .../Features/Navigation/BaseMenuGenerator.php    | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
index ed5f73bfbda..128ee3c0cc0 100644
--- a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
@@ -104,17 +104,17 @@ protected function addRouteToGroup(Route $route): void
 
     protected function getOrCreateGroupItem(string $groupName): NavItem
     {
-        $identifier = Str::slug($groupName);
-        $group = $this->items->get($identifier);
+        $groupKey = Str::slug($groupName);
+        $group = $this->items->get($groupKey);
 
-        return $group ?? $this->createGroupItem($identifier, $groupName);
+        return $group ?? $this->createGroupItem($groupKey, $groupName);
     }
 
-    protected function createGroupItem(string $identifier, string $groupName): NavItem
+    protected function createGroupItem(string $groupKey, string $groupName): NavItem
     {
-        $label = $this->searchForGroupLabelInConfig($identifier) ?? $groupName;
+        $label = $this->searchForGroupLabelInConfig($groupKey) ?? $groupName;
 
-        $priority = $this->searchForGroupPriorityInConfig($identifier);
+        $priority = $this->searchForGroupPriorityInConfig($groupKey);
 
         return NavItem::dropdown($this->normalizeGroupLabel($label), [], $priority);
     }
@@ -129,11 +129,11 @@ protected function normalizeGroupLabel(string $label): string
         return $label;
     }
 
-    protected function searchForGroupLabelInConfig(string $identifier): ?string
+    protected function searchForGroupLabelInConfig(string $groupKey): ?string
     {
         $key = $this->generatesSidebar ? 'docs.sidebar_group_labels' : 'hyde.navigation.labels';
 
-        return Config::getArray($key, [])[$identifier] ?? null;
+        return Config::getArray($key, [])[$groupKey] ?? null;
     }
 
     protected function searchForGroupPriorityInConfig(string $groupKey): ?int

From f14c7dd75f82b8622b00a8695dac3e54bd56973e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 18:16:15 +0100
Subject: [PATCH 0529/1422] Remove resolved todos

---
 .../Features/Navigation/GeneratesDocumentationSidebarMenu.php   | 2 --
 .../Features/Navigation/GeneratesMainNavigationMenu.php         | 2 --
 2 files changed, 4 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index ed88032994f..efa661ffdc7 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -12,8 +12,6 @@
 /**
  * @experimental This class may change significantly before its release.
  *
- * @todo Consider making into a service which can create the sidebar as well.
- *
  * @see \Hyde\Framework\Features\Navigation\GeneratesMainNavigationMenu
  */
 class GeneratesDocumentationSidebarMenu extends BaseMenuGenerator
diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index 33b802cf4fb..00503a07751 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -13,8 +13,6 @@
 /**
  * @experimental This class may change significantly before its release.
  *
- * @todo Consider making into a service which can create the sidebar as well.
- *
  * @see \Hyde\Framework\Features\Navigation\GeneratesDocumentationSidebarMenu
  */
 class GeneratesMainNavigationMenu extends BaseMenuGenerator

From d8c378dca4421cea0783b4cdec23f4e630ce1ada Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 19:15:09 +0100
Subject: [PATCH 0530/1422] Move method call into method body

---
 .../Features/Navigation/GeneratesDocumentationSidebarMenu.php  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index efa661ffdc7..b7fe4ab3bc0 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -21,7 +21,6 @@ public static function handle(): DocumentationSidebar
         $menu = new static();
 
         $menu->generate();
-        $menu->sortByPriority();
 
         return new DocumentationSidebar($menu->items);
     }
@@ -34,6 +33,8 @@ protected function generate(): void
         if ($this->items->count() === 0 && DocumentationPage::home() !== null) {
             $this->items->push(NavItem::fromRoute(DocumentationPage::home()));
         }
+
+        $this->sortByPriority();
     }
 
     protected function canAddRoute(Route $route): bool

From a4a8fb951cd91a7f1756ffcac4087bae3893d42d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 19:42:38 +0100
Subject: [PATCH 0531/1422] Add a type parameter to the base class

---
 .../Features/Navigation/BaseMenuGenerator.php          | 10 ++++++++--
 .../Navigation/GeneratesDocumentationSidebarMenu.php   |  2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
index 128ee3c0cc0..d624ff198a9 100644
--- a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
@@ -27,11 +27,17 @@ abstract class BaseMenuGenerator
     /** @var \Hyde\Foundation\Kernel\RouteCollection<string, \Hyde\Support\Models\Route> */
     protected RouteCollection $routes;
 
+    /** @var class-string<\Hyde\Framework\Features\Navigation\NavigationMenu> */
+    protected string $menuType;
+
     protected bool $generatesSidebar;
     protected bool $usesGroups;
 
-    protected function __construct()
+    /** @param class-string<\Hyde\Framework\Features\Navigation\NavigationMenu> $menuType */
+    protected function __construct(string $menuType)
     {
+        $this->menuType = $menuType;
+
         $this->items = new Collection();
 
         $this->generatesSidebar = $this instanceof GeneratesDocumentationSidebarMenu;
@@ -45,7 +51,7 @@ protected function __construct()
 
     public static function handle(): NavigationMenu
     {
-        $menu = new static();
+        $menu = new static(NavigationMenu::class);
 
         $menu->generate();
 
diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index b7fe4ab3bc0..29ba4d18925 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -18,7 +18,7 @@ class GeneratesDocumentationSidebarMenu extends BaseMenuGenerator
 {
     public static function handle(): DocumentationSidebar
     {
-        $menu = new static();
+        $menu = new static(DocumentationSidebar::class);
 
         $menu->generate();
 

From 84500ff4e84e2bcd045db024ea304a891aebd867 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 19:44:36 +0100
Subject: [PATCH 0532/1422] Replace type check

---
 .../src/Framework/Features/Navigation/BaseMenuGenerator.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
index d624ff198a9..80de191640c 100644
--- a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
@@ -40,7 +40,7 @@ protected function __construct(string $menuType)
 
         $this->items = new Collection();
 
-        $this->generatesSidebar = $this instanceof GeneratesDocumentationSidebarMenu;
+        $this->generatesSidebar = $menuType === DocumentationSidebar::class;
 
         $this->routes = $this->generatesSidebar
             ? Routes::getRoutes(DocumentationPage::class)

From e05f5ea87014a5fab74663e3f03a13358a59019d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 19:48:33 +0100
Subject: [PATCH 0533/1422] Rename helper method

---
 .../Features/Navigation/GeneratesDocumentationSidebarMenu.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index 29ba4d18925..bb596fc456d 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -34,7 +34,7 @@ protected function generate(): void
             $this->items->push(NavItem::fromRoute(DocumentationPage::home()));
         }
 
-        $this->sortByPriority();
+        $this->sortSidebarGroupsByLowestPriority();
     }
 
     protected function canAddRoute(Route $route): bool
@@ -44,7 +44,7 @@ protected function canAddRoute(Route $route): bool
             && ! $route->is(DocumentationPage::homeRouteName());
     }
 
-    protected function sortByPriority(): void
+    protected function sortSidebarGroupsByLowestPriority(): void
     {
         // While the items accessor sorts the items upon retrieval,
         // we do an initial sorting here to order any groups.

From ed1e32a452330fb34ac1fdb6fa41bb52d1a0a08a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 19:49:13 +0100
Subject: [PATCH 0534/1422] Break out return expression

---
 .../src/Framework/Features/Navigation/BaseMenuGenerator.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
index 80de191640c..ed304d1f0a1 100644
--- a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
@@ -85,7 +85,11 @@ protected function usesGroups(): bool
 
     protected function canAddRoute(Route $route): bool
     {
-        return $route->getPage()->showInNavigation();
+        if (! $route->getPage()->showInNavigation()) {
+            return false;
+        }
+
+        return true;
     }
 
     protected function canGroupRoute(Route $route): bool

From ed5d0730c7def57ff342edba0d96ff401f8f0bf2 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 19:50:00 +0100
Subject: [PATCH 0535/1422] Merge child method into parent block

---
 .../Framework/Features/Navigation/BaseMenuGenerator.php   | 5 +++++
 .../Navigation/GeneratesDocumentationSidebarMenu.php      | 8 --------
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
index ed304d1f0a1..bee751211f3 100644
--- a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
@@ -89,6 +89,11 @@ protected function canAddRoute(Route $route): bool
             return false;
         }
 
+        if ($this->generatesSidebar) {
+            // Since the index page is linked in the header, we don't want it in the sidebar
+            return ! $route->is(DocumentationPage::homeRouteName());
+        }
+
         return true;
     }
 
diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index bb596fc456d..6d70a536159 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -4,7 +4,6 @@
 
 namespace Hyde\Framework\Features\Navigation;
 
-use Hyde\Support\Models\Route;
 use Hyde\Pages\DocumentationPage;
 
 use function collect;
@@ -37,13 +36,6 @@ protected function generate(): void
         $this->sortSidebarGroupsByLowestPriority();
     }
 
-    protected function canAddRoute(Route $route): bool
-    {
-        return parent::canAddRoute($route)
-            // Since the index page is linked in the header, we don't want it in the sidebar
-            && ! $route->is(DocumentationPage::homeRouteName());
-    }
-
     protected function sortSidebarGroupsByLowestPriority(): void
     {
         // While the items accessor sorts the items upon retrieval,

From 85674518281f4e9cff66599cf295bebc6a89aa06 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 20:00:53 +0100
Subject: [PATCH 0536/1422] Merge child method into parent block

---
 .../Features/Navigation/BaseMenuGenerator.php          |  7 +++++--
 .../Navigation/GeneratesMainNavigationMenu.php         | 10 ----------
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
index bee751211f3..214dc370fdc 100644
--- a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
@@ -92,9 +92,12 @@ protected function canAddRoute(Route $route): bool
         if ($this->generatesSidebar) {
             // Since the index page is linked in the header, we don't want it in the sidebar
             return ! $route->is(DocumentationPage::homeRouteName());
+        } else {
+            // While we for the most part can rely on the navigation visibility state provided by the navigation data factory,
+            // we need to make an exception for documentation pages, which generally have a visible state, as the data is
+            // also used in the sidebar. But we only want the documentation index page to be in the main navigation.
+            return ! $route->getPage() instanceof DocumentationPage || $route->is(DocumentationPage::homeRouteName());
         }
-
-        return true;
     }
 
     protected function canGroupRoute(Route $route): bool
diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index 00503a07751..13a80ea62fa 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -6,7 +6,6 @@
 
 use Hyde\Facades\Config;
 use Hyde\Support\Models\Route;
-use Hyde\Pages\DocumentationPage;
 
 use function collect;
 
@@ -27,15 +26,6 @@ protected function generate(): void
         });
     }
 
-    protected function canAddRoute(Route $route): bool
-    {
-        return parent::canAddRoute($route)
-            // While we for the most part can rely on the navigation visibility state provided by the navigation data factory,
-            // we need to make an exception for documentation pages, which generally have a visible state, as the data is
-            // also used in the sidebar. But we only want the documentation index page to be in the main navigation.
-            && (! $route->getPage() instanceof DocumentationPage || $route->is(DocumentationPage::homeRouteName()));
-    }
-
     protected function canGroupRoute(Route $route): bool
     {
         return parent::canGroupRoute($route) && $route->getPage()->navigationMenuGroup() !== null;

From 3ec2a3aa49bed13c9c279a7cfde563cbd2f440de Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 20:03:59 +0100
Subject: [PATCH 0537/1422] Break out return expression

---
 .../src/Framework/Features/Navigation/BaseMenuGenerator.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
index 214dc370fdc..ccf1a50bede 100644
--- a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
@@ -102,7 +102,11 @@ protected function canAddRoute(Route $route): bool
 
     protected function canGroupRoute(Route $route): bool
     {
-        return $this->usesGroups;
+        if (! $this->usesGroups) {
+            return false;
+        }
+
+        return true;
     }
 
     protected function addRouteToGroup(Route $route): void

From ea9305e42877293f7d7f2ac54d74c2b4ed221db4 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 20:04:44 +0100
Subject: [PATCH 0538/1422] Merge child method into parent block

---
 .../src/Framework/Features/Navigation/BaseMenuGenerator.php | 4 ++++
 .../Features/Navigation/GeneratesMainNavigationMenu.php     | 6 ------
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
index ccf1a50bede..c37a13b0126 100644
--- a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
@@ -106,6 +106,10 @@ protected function canGroupRoute(Route $route): bool
             return false;
         }
 
+        if (! $this->generatesSidebar) {
+            return $route->getPage()->navigationMenuGroup() !== null;
+        }
+
         return true;
     }
 
diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index 13a80ea62fa..fec562b9b76 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -5,7 +5,6 @@
 namespace Hyde\Framework\Features\Navigation;
 
 use Hyde\Facades\Config;
-use Hyde\Support\Models\Route;
 
 use function collect;
 
@@ -25,9 +24,4 @@ protected function generate(): void
             $this->items->push($item);
         });
     }
-
-    protected function canGroupRoute(Route $route): bool
-    {
-        return parent::canGroupRoute($route) && $route->getPage()->navigationMenuGroup() !== null;
-    }
 }

From e9aac1c7b85c0848fa7d0d111bfb04360ce5b238 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 20:08:44 +0100
Subject: [PATCH 0539/1422] Add todo

---
 .../Features/Navigation/GeneratesDocumentationSidebarMenu.php   | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index 6d70a536159..d318b8d0d50 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -50,6 +50,8 @@ protected function sortSidebarGroupsByLowestPriority(): void
 
     protected function getLowestPriorityInGroup(NavItem $item): int
     {
+        // Todo: Could actually be moved to the NavItem accessor
+
         return collect($item->getChildren())->min(fn (NavItem $child): int => $child->getPriority());
     }
 }

From 59a3cc4f5923a28cc40b9b932fc3ae698476fb47 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 20:12:49 +0100
Subject: [PATCH 0540/1422] Move logic to instance accessor

---
 .../GeneratesDocumentationSidebarMenu.php           | 13 +------------
 .../src/Framework/Features/Navigation/NavItem.php   |  7 +++++++
 packages/framework/tests/Unit/NavItemTest.php       |  2 +-
 3 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index d318b8d0d50..7e041eca0be 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -6,8 +6,6 @@
 
 use Hyde\Pages\DocumentationPage;
 
-use function collect;
-
 /**
  * @experimental This class may change significantly before its release.
  *
@@ -42,16 +40,7 @@ protected function sortSidebarGroupsByLowestPriority(): void
         // we do an initial sorting here to order any groups.
 
         $this->items = $this->items->sortBy(function (NavItem $item): int {
-            return $item->hasChildren()
-                ? $this->getLowestPriorityInGroup($item)
-                : $item->getPriority();
+            return $item->getPriority();
         })->values();
     }
-
-    protected function getLowestPriorityInGroup(NavItem $item): int
-    {
-        // Todo: Could actually be moved to the NavItem accessor
-
-        return collect($item->getChildren())->min(fn (NavItem $child): int => $child->getPriority());
-    }
 }
diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index ffbb2ac6234..309271bd21e 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -11,6 +11,7 @@
 use Stringable;
 use Hyde\Support\Models\ExternalRoute;
 
+use function collect;
 use function is_string;
 
 /**
@@ -135,9 +136,15 @@ public function getLabel(): string
 
     /**
      * Get the priority to determine the order of the navigation item.
+     *
+     * For dropdowns, this is the priority of the lowest priority child, unless the dropdown has a lower priority.
      */
     public function getPriority(): int
     {
+        if ($this->hasChildren()) {
+            return min($this->priority, collect($this->getChildren())->min(fn (NavItem $child): int => $child->getPriority()));
+        }
+
         return $this->priority;
     }
 
diff --git a/packages/framework/tests/Unit/NavItemTest.php b/packages/framework/tests/Unit/NavItemTest.php
index f2caf94538c..68145381e30 100644
--- a/packages/framework/tests/Unit/NavItemTest.php
+++ b/packages/framework/tests/Unit/NavItemTest.php
@@ -278,7 +278,7 @@ public function testDropdownFacadeWithChildren()
 
         $item = NavItem::dropdown('foo', $children);
         $this->assertSame($children, $item->getChildren());
-        $this->assertSame(999, $item->getPriority());
+        $this->assertSame(500, $item->getPriority());
     }
 
     public function testDropdownFacadeWithCustomPriority()

From df2859546674a221f123152e637f4d3843cd2d09 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 20:17:31 +0100
Subject: [PATCH 0541/1422] Initial sorting is now no longer needed

Thanks to https://github.com/hydephp/develop/commit/59a3cc4f5923a28cc40b9b932fc3ae698476fb47
---
 .../Navigation/GeneratesDocumentationSidebarMenu.php | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index 7e041eca0be..2a56a4cd6ed 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -30,17 +30,5 @@ protected function generate(): void
         if ($this->items->count() === 0 && DocumentationPage::home() !== null) {
             $this->items->push(NavItem::fromRoute(DocumentationPage::home()));
         }
-
-        $this->sortSidebarGroupsByLowestPriority();
-    }
-
-    protected function sortSidebarGroupsByLowestPriority(): void
-    {
-        // While the items accessor sorts the items upon retrieval,
-        // we do an initial sorting here to order any groups.
-
-        $this->items = $this->items->sortBy(function (NavItem $item): int {
-            return $item->getPriority();
-        })->values();
     }
 }

From b70045e1779c591d47fca5faf201decc14a6a8cf Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 20:39:03 +0100
Subject: [PATCH 0542/1422] Refactor to move post-generation logic to base
 class

---
 .../Features/Navigation/BaseMenuGenerator.php      | 13 +++++++++++++
 .../GeneratesDocumentationSidebarMenu.php          | 12 ------------
 .../Navigation/GeneratesMainNavigationMenu.php     | 14 +-------------
 3 files changed, 14 insertions(+), 25 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
index c37a13b0126..504bcf1680f 100644
--- a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
@@ -14,6 +14,7 @@
 use Hyde\Foundation\Kernel\RouteCollection;
 
 use function filled;
+use function collect;
 use function strtolower;
 
 /**
@@ -69,6 +70,18 @@ protected function generate(): void
                 }
             }
         });
+
+        if ($this->generatesSidebar) {
+            // If there are no pages other than the index page, we add it to the sidebar so that it's not empty
+            if ($this->items->count() === 0 && DocumentationPage::home() !== null) {
+                $this->items->push(NavItem::fromRoute(DocumentationPage::home()));
+            }
+        } else {
+            collect(Config::getArray('hyde.navigation.custom', []))->each(function (NavItem $item): void {
+                // Since these were added explicitly by the user, we can assume they should always be shown
+                $this->items->push($item);
+            });
+        }
     }
 
     protected function usesGroups(): bool
diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index 2a56a4cd6ed..d2245aa6893 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -4,8 +4,6 @@
 
 namespace Hyde\Framework\Features\Navigation;
 
-use Hyde\Pages\DocumentationPage;
-
 /**
  * @experimental This class may change significantly before its release.
  *
@@ -21,14 +19,4 @@ public static function handle(): DocumentationSidebar
 
         return new DocumentationSidebar($menu->items);
     }
-
-    protected function generate(): void
-    {
-        parent::generate();
-
-        // If there are no pages other than the index page, we add it to the sidebar so that it's not empty
-        if ($this->items->count() === 0 && DocumentationPage::home() !== null) {
-            $this->items->push(NavItem::fromRoute(DocumentationPage::home()));
-        }
-    }
 }
diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index fec562b9b76..fc22addb6f2 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -4,10 +4,6 @@
 
 namespace Hyde\Framework\Features\Navigation;
 
-use Hyde\Facades\Config;
-
-use function collect;
-
 /**
  * @experimental This class may change significantly before its release.
  *
@@ -15,13 +11,5 @@
  */
 class GeneratesMainNavigationMenu extends BaseMenuGenerator
 {
-    protected function generate(): void
-    {
-        parent::generate();
-
-        collect(Config::getArray('hyde.navigation.custom', []))->each(function (NavItem $item): void {
-            // Since these were added explicitly by the user, we can assume they should always be shown
-            $this->items->push($item);
-        });
-    }
+    //
 }

From c7459fb41f7314e195d3d13bffc6eb7d3d889d06 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 20:41:08 +0100
Subject: [PATCH 0543/1422] Move entrypoint to child

---
 .../Framework/Features/Navigation/BaseMenuGenerator.php  | 9 +--------
 .../Features/Navigation/GeneratesMainNavigationMenu.php  | 9 ++++++++-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
index 504bcf1680f..9bf8ae7591a 100644
--- a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
@@ -50,14 +50,7 @@ protected function __construct(string $menuType)
         $this->usesGroups = $this->usesGroups();
     }
 
-    public static function handle(): NavigationMenu
-    {
-        $menu = new static(NavigationMenu::class);
-
-        $menu->generate();
-
-        return new NavigationMenu($menu->items);
-    }
+    abstract public static function handle(): NavigationMenu;
 
     protected function generate(): void
     {
diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index fc22addb6f2..0190480ee04 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -11,5 +11,12 @@
  */
 class GeneratesMainNavigationMenu extends BaseMenuGenerator
 {
-    //
+    public static function handle(): NavigationMenu
+    {
+        $menu = new static(NavigationMenu::class);
+
+        $menu->generate();
+
+        return new NavigationMenu($menu->items);
+    }
 }

From f92c1d1edd60dac52068fdc0bf635175cf9699e5 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 20:41:47 +0100
Subject: [PATCH 0544/1422] Revert "Move entrypoint to child"

This reverts commit c7459fb41f7314e195d3d13bffc6eb7d3d889d06.
---
 .../Framework/Features/Navigation/BaseMenuGenerator.php  | 9 ++++++++-
 .../Features/Navigation/GeneratesMainNavigationMenu.php  | 9 +--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
index 9bf8ae7591a..504bcf1680f 100644
--- a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
@@ -50,7 +50,14 @@ protected function __construct(string $menuType)
         $this->usesGroups = $this->usesGroups();
     }
 
-    abstract public static function handle(): NavigationMenu;
+    public static function handle(): NavigationMenu
+    {
+        $menu = new static(NavigationMenu::class);
+
+        $menu->generate();
+
+        return new NavigationMenu($menu->items);
+    }
 
     protected function generate(): void
     {
diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index 0190480ee04..fc22addb6f2 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -11,12 +11,5 @@
  */
 class GeneratesMainNavigationMenu extends BaseMenuGenerator
 {
-    public static function handle(): NavigationMenu
-    {
-        $menu = new static(NavigationMenu::class);
-
-        $menu->generate();
-
-        return new NavigationMenu($menu->items);
-    }
+    //
 }

From 372ee5377ff1f1102e50cbbd0f13d5803d95d790 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 20:42:03 +0100
Subject: [PATCH 0545/1422] Copy entrypoint to child

---
 .../Features/Navigation/GeneratesMainNavigationMenu.php  | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index fc22addb6f2..0190480ee04 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -11,5 +11,12 @@
  */
 class GeneratesMainNavigationMenu extends BaseMenuGenerator
 {
-    //
+    public static function handle(): NavigationMenu
+    {
+        $menu = new static(NavigationMenu::class);
+
+        $menu->generate();
+
+        return new NavigationMenu($menu->items);
+    }
 }

From 5aa4b4e6d6e33329a408a8f65068b1b6c5346665 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 20:45:11 +0100
Subject: [PATCH 0546/1422] Make base entrypoint dynamic

---
 .../Framework/Features/Navigation/BaseMenuGenerator.php   | 7 ++++---
 .../Navigation/GeneratesDocumentationSidebarMenu.php      | 8 ++------
 .../Features/Navigation/GeneratesMainNavigationMenu.php   | 8 ++------
 3 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
index 504bcf1680f..b07ac46a1e7 100644
--- a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
@@ -50,13 +50,14 @@ protected function __construct(string $menuType)
         $this->usesGroups = $this->usesGroups();
     }
 
-    public static function handle(): NavigationMenu
+    /** @param class-string<\Hyde\Framework\Features\Navigation\NavigationMenu> $menuType */
+    public static function handle(string $menuType): NavigationMenu
     {
-        $menu = new static(NavigationMenu::class);
+        $menu = new static($menuType);
 
         $menu->generate();
 
-        return new NavigationMenu($menu->items);
+        return new $menuType($menu->items);
     }
 
     protected function generate(): void
diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index d2245aa6893..08b6ca3b4e2 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -11,12 +11,8 @@
  */
 class GeneratesDocumentationSidebarMenu extends BaseMenuGenerator
 {
-    public static function handle(): DocumentationSidebar
+    public static function handle(string $menuType = DocumentationSidebar::class): DocumentationSidebar
     {
-        $menu = new static(DocumentationSidebar::class);
-
-        $menu->generate();
-
-        return new DocumentationSidebar($menu->items);
+        return parent::handle($menuType);
     }
 }
diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index 0190480ee04..4bd8014ce1a 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -11,12 +11,8 @@
  */
 class GeneratesMainNavigationMenu extends BaseMenuGenerator
 {
-    public static function handle(): NavigationMenu
+    public static function handle(string $menuType = NavigationMenu::class): NavigationMenu
     {
-        $menu = new static(NavigationMenu::class);
-
-        $menu->generate();
-
-        return new NavigationMenu($menu->items);
+        return parent::handle($menuType);
     }
 }

From 8d16f180397539526d8942a488c8eb25d261bdc8 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 20:46:08 +0100
Subject: [PATCH 0547/1422] Union type auxiliary return type

---
 .../src/Framework/Features/Navigation/BaseMenuGenerator.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
index b07ac46a1e7..9b3ca985b8f 100644
--- a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
@@ -51,7 +51,7 @@ protected function __construct(string $menuType)
     }
 
     /** @param class-string<\Hyde\Framework\Features\Navigation\NavigationMenu> $menuType */
-    public static function handle(string $menuType): NavigationMenu
+    public static function handle(string $menuType): NavigationMenu|DocumentationSidebar
     {
         $menu = new static($menuType);
 

From 5a16f7ad753fcb1e3c423adcd134ca14e62798f5 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 20:49:13 +0100
Subject: [PATCH 0548/1422] Revert "Make class abstract"

This reverts commit d6649f0526cf036433992db959fefa8226b05909.
---
 .../src/Framework/Features/Navigation/BaseMenuGenerator.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
index 9b3ca985b8f..357e68618a9 100644
--- a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
@@ -20,7 +20,7 @@
 /**
  * @experimental This class may change significantly before its release.
  */
-abstract class BaseMenuGenerator
+class BaseMenuGenerator
 {
     /** @var \Illuminate\Support\Collection<string, \Hyde\Framework\Features\Navigation\NavItem> */
     protected Collection $items;

From 5fca759959846ac624ee41726b61227b2be361ab Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 20:49:47 +0100
Subject: [PATCH 0549/1422] Replace parent syntax with direct parent call

---
 .../Features/Navigation/GeneratesDocumentationSidebarMenu.php   | 2 +-
 .../Features/Navigation/GeneratesMainNavigationMenu.php         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index 08b6ca3b4e2..95fb06eb6b4 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -13,6 +13,6 @@ class GeneratesDocumentationSidebarMenu extends BaseMenuGenerator
 {
     public static function handle(string $menuType = DocumentationSidebar::class): DocumentationSidebar
     {
-        return parent::handle($menuType);
+        return BaseMenuGenerator::handle($menuType);
     }
 }
diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index 4bd8014ce1a..44d02e2af42 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -13,6 +13,6 @@ class GeneratesMainNavigationMenu extends BaseMenuGenerator
 {
     public static function handle(string $menuType = NavigationMenu::class): NavigationMenu
     {
-        return parent::handle($menuType);
+        return BaseMenuGenerator::handle($menuType);
     }
 }

From 1b85b6857867dd1db58274af9f959326d976c15d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 20:50:51 +0100
Subject: [PATCH 0550/1422] Hardcode call type

---
 .../Features/Navigation/GeneratesDocumentationSidebarMenu.php   | 2 +-
 .../Features/Navigation/GeneratesMainNavigationMenu.php         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index 95fb06eb6b4..a4bcd561a30 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -13,6 +13,6 @@ class GeneratesDocumentationSidebarMenu extends BaseMenuGenerator
 {
     public static function handle(string $menuType = DocumentationSidebar::class): DocumentationSidebar
     {
-        return BaseMenuGenerator::handle($menuType);
+        return BaseMenuGenerator::handle(DocumentationSidebar::class);
     }
 }
diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index 44d02e2af42..29789c4558b 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -13,6 +13,6 @@ class GeneratesMainNavigationMenu extends BaseMenuGenerator
 {
     public static function handle(string $menuType = NavigationMenu::class): NavigationMenu
     {
-        return BaseMenuGenerator::handle($menuType);
+        return BaseMenuGenerator::handle(NavigationMenu::class);
     }
 }

From 4f1bedd01b3134823fb6100b68b9f4c4c69054f4 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 20:52:13 +0100
Subject: [PATCH 0551/1422] Generators no longer need to extend base generator

All logic has been moved to the base class
---
 .../Features/Navigation/GeneratesDocumentationSidebarMenu.php   | 2 +-
 .../Features/Navigation/GeneratesMainNavigationMenu.php         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index a4bcd561a30..f8719c3648f 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -9,7 +9,7 @@
  *
  * @see \Hyde\Framework\Features\Navigation\GeneratesMainNavigationMenu
  */
-class GeneratesDocumentationSidebarMenu extends BaseMenuGenerator
+class GeneratesDocumentationSidebarMenu
 {
     public static function handle(string $menuType = DocumentationSidebar::class): DocumentationSidebar
     {
diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index 29789c4558b..f3b3b2d290f 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -9,7 +9,7 @@
  *
  * @see \Hyde\Framework\Features\Navigation\GeneratesDocumentationSidebarMenu
  */
-class GeneratesMainNavigationMenu extends BaseMenuGenerator
+class GeneratesMainNavigationMenu
 {
     public static function handle(string $menuType = NavigationMenu::class): NavigationMenu
     {

From 5bfa158a21b2798e4e0c12f88f492c1a25040c1e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 20:53:24 +0100
Subject: [PATCH 0552/1422] Remove unused parameters

Was only needed for parent compatibility
---
 .../Features/Navigation/GeneratesDocumentationSidebarMenu.php   | 2 +-
 .../Features/Navigation/GeneratesMainNavigationMenu.php         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index f8719c3648f..200fceda1b5 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -11,7 +11,7 @@
  */
 class GeneratesDocumentationSidebarMenu
 {
-    public static function handle(string $menuType = DocumentationSidebar::class): DocumentationSidebar
+    public static function handle(): DocumentationSidebar
     {
         return BaseMenuGenerator::handle(DocumentationSidebar::class);
     }
diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index f3b3b2d290f..261a851264d 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -11,7 +11,7 @@
  */
 class GeneratesMainNavigationMenu
 {
-    public static function handle(string $menuType = NavigationMenu::class): NavigationMenu
+    public static function handle(): NavigationMenu
     {
         return BaseMenuGenerator::handle(NavigationMenu::class);
     }

From 22b3cac7a95ba19ae194eabf00a3505f0d0b7bd5 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 20:53:36 +0100
Subject: [PATCH 0553/1422] Remove crosslinks

---
 .../Features/Navigation/GeneratesDocumentationSidebarMenu.php   | 2 --
 .../Features/Navigation/GeneratesMainNavigationMenu.php         | 2 --
 2 files changed, 4 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index 200fceda1b5..a3b851e2ec3 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -6,8 +6,6 @@
 
 /**
  * @experimental This class may change significantly before its release.
- *
- * @see \Hyde\Framework\Features\Navigation\GeneratesMainNavigationMenu
  */
 class GeneratesDocumentationSidebarMenu
 {
diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index 261a851264d..4e7fda16843 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -6,8 +6,6 @@
 
 /**
  * @experimental This class may change significantly before its release.
- *
- * @see \Hyde\Framework\Features\Navigation\GeneratesDocumentationSidebarMenu
  */
 class GeneratesMainNavigationMenu
 {

From 84bec87842caf66e584c9b833419fdbcd26d7b7d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 20:54:19 +0100
Subject: [PATCH 0554/1422] Rename base generator class for it to be standalone

---
 .../Features/Navigation/GeneratesDocumentationSidebarMenu.php   | 2 +-
 .../Features/Navigation/GeneratesMainNavigationMenu.php         | 2 +-
 .../{BaseMenuGenerator.php => NavigationMenuGenerator.php}      | 2 +-
 .../tests/Feature/AutomaticNavigationConfigurationsTest.php     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
 rename packages/framework/src/Framework/Features/Navigation/{BaseMenuGenerator.php => NavigationMenuGenerator.php} (99%)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index a3b851e2ec3..ee07cac9ed3 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -11,6 +11,6 @@ class GeneratesDocumentationSidebarMenu
 {
     public static function handle(): DocumentationSidebar
     {
-        return BaseMenuGenerator::handle(DocumentationSidebar::class);
+        return NavigationMenuGenerator::handle(DocumentationSidebar::class);
     }
 }
diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index 4e7fda16843..c8c43230012 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -11,6 +11,6 @@ class GeneratesMainNavigationMenu
 {
     public static function handle(): NavigationMenu
     {
-        return BaseMenuGenerator::handle(NavigationMenu::class);
+        return NavigationMenuGenerator::handle(NavigationMenu::class);
     }
 }
diff --git a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
similarity index 99%
rename from packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
rename to packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
index 357e68618a9..45c6986ab99 100644
--- a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
@@ -20,7 +20,7 @@
 /**
  * @experimental This class may change significantly before its release.
  */
-class BaseMenuGenerator
+class NavigationMenuGenerator
 {
     /** @var \Illuminate\Support\Collection<string, \Hyde\Framework\Features\Navigation\NavItem> */
     protected Collection $items;
diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index a79b92703a9..b0de676cf72 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -25,7 +25,7 @@
  * High-level broad-spectrum tests for the automatic navigation configurations, testing various setups.
  *
  * @covers \Hyde\Framework\Factories\NavigationDataFactory
- * @covers \Hyde\Framework\Features\Navigation\BaseMenuGenerator
+ * @covers \Hyde\Framework\Features\Navigation\NavigationMenuGenerator
  * @covers \Hyde\Framework\Features\Navigation\DocumentationSidebar
  * @covers \Hyde\Framework\Features\Navigation\GeneratesDocumentationSidebarMenu
  * @covers \Hyde\Framework\Features\Navigation\GeneratesMainNavigationMenu

From e06f1c027debcabe318a223b9d34f89e91f188f6 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 20:55:21 +0100
Subject: [PATCH 0555/1422] Inline `GeneratesDocumentationSidebarMenu::handle`
 method

---
 .../src/Foundation/Providers/NavigationServiceProvider.php   | 5 +++--
 .../Framework/Features/Navigation/DocumentationSidebar.php   | 2 +-
 .../Navigation/GeneratesDocumentationSidebarMenu.php         | 5 +----
 .../tests/Feature/AutomaticNavigationConfigurationsTest.php  | 5 +++--
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php b/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php
index 6b10ab8d13f..2ef94f373ab 100644
--- a/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php
+++ b/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php
@@ -7,8 +7,9 @@
 use Hyde\Foundation\HydeKernel;
 use Illuminate\Support\ServiceProvider;
 use Hyde\Framework\Features\Navigation\NavigationManager;
+use Hyde\Framework\Features\Navigation\DocumentationSidebar;
+use Hyde\Framework\Features\Navigation\NavigationMenuGenerator;
 use Hyde\Framework\Features\Navigation\GeneratesMainNavigationMenu;
-use Hyde\Framework\Features\Navigation\GeneratesDocumentationSidebarMenu;
 
 class NavigationServiceProvider extends ServiceProvider
 {
@@ -22,7 +23,7 @@ public function register(): void
 
         $this->app->make(HydeKernel::class)->booted(function () {
             $this->app->make(NavigationManager::class)->registerMenu('main', GeneratesMainNavigationMenu::handle());
-            $this->app->make(NavigationManager::class)->registerMenu('sidebar', GeneratesDocumentationSidebarMenu::handle());
+            $this->app->make(NavigationManager::class)->registerMenu('sidebar', NavigationMenuGenerator::handle(DocumentationSidebar::class));
         });
     }
 }
diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index cb9433ed093..03829479837 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -18,7 +18,7 @@ class DocumentationSidebar extends NavigationMenu
     /** @deprecated Will be moved to an action */
     public static function create(): static
     {
-        return GeneratesDocumentationSidebarMenu::handle();
+        return NavigationMenuGenerator::handle(DocumentationSidebar::class);
     }
 
     public function hasGroups(): bool
diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index ee07cac9ed3..07c3d77b86b 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -9,8 +9,5 @@
  */
 class GeneratesDocumentationSidebarMenu
 {
-    public static function handle(): DocumentationSidebar
-    {
-        return NavigationMenuGenerator::handle(DocumentationSidebar::class);
-    }
+    //
 }
diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index b0de676cf72..cfcb1d98bfc 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -18,8 +18,9 @@
 use Illuminate\Support\Collection;
 use Hyde\Foundation\Kernel\RouteCollection;
 use Hyde\Framework\Features\Navigation\NavItem;
+use Hyde\Framework\Features\Navigation\DocumentationSidebar;
+use Hyde\Framework\Features\Navigation\NavigationMenuGenerator;
 use Hyde\Framework\Features\Navigation\GeneratesMainNavigationMenu;
-use Hyde\Framework\Features\Navigation\GeneratesDocumentationSidebarMenu;
 
 /**
  * High-level broad-spectrum tests for the automatic navigation configurations, testing various setups.
@@ -1246,7 +1247,7 @@ class AssertableNavigationMenu
     public function __construct(TestCase $test, $sidebar = false)
     {
         $this->items = $sidebar
-            ? GeneratesDocumentationSidebarMenu::handle()->getItems()
+            ? NavigationMenuGenerator::handle(DocumentationSidebar::class)->getItems()
             : GeneratesMainNavigationMenu::handle()->getItems();
 
         $this->test = $test;

From eb5d79eea61906b9341e6ddbb7f5fdc276196e00 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 20:56:48 +0100
Subject: [PATCH 0556/1422] Inline `GeneratesMainNavigationMenu::handle` method

---
 .../src/Foundation/Providers/NavigationServiceProvider.php   | 4 ++--
 .../Features/Navigation/GeneratesMainNavigationMenu.php      | 5 +----
 .../tests/Feature/AutomaticNavigationConfigurationsTest.php  | 4 ++--
 packages/framework/tests/Feature/NavigationMenuTest.php      | 4 ++--
 4 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php b/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php
index 2ef94f373ab..4e62984f336 100644
--- a/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php
+++ b/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php
@@ -6,10 +6,10 @@
 
 use Hyde\Foundation\HydeKernel;
 use Illuminate\Support\ServiceProvider;
+use Hyde\Framework\Features\Navigation\NavigationMenu;
 use Hyde\Framework\Features\Navigation\NavigationManager;
 use Hyde\Framework\Features\Navigation\DocumentationSidebar;
 use Hyde\Framework\Features\Navigation\NavigationMenuGenerator;
-use Hyde\Framework\Features\Navigation\GeneratesMainNavigationMenu;
 
 class NavigationServiceProvider extends ServiceProvider
 {
@@ -22,7 +22,7 @@ public function register(): void
         $this->app->alias(NavigationManager::class, 'navigation');
 
         $this->app->make(HydeKernel::class)->booted(function () {
-            $this->app->make(NavigationManager::class)->registerMenu('main', GeneratesMainNavigationMenu::handle());
+            $this->app->make(NavigationManager::class)->registerMenu('main', NavigationMenuGenerator::handle(NavigationMenu::class));
             $this->app->make(NavigationManager::class)->registerMenu('sidebar', NavigationMenuGenerator::handle(DocumentationSidebar::class));
         });
     }
diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index c8c43230012..99e50dce6d5 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -9,8 +9,5 @@
  */
 class GeneratesMainNavigationMenu
 {
-    public static function handle(): NavigationMenu
-    {
-        return NavigationMenuGenerator::handle(NavigationMenu::class);
-    }
+    //
 }
diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index cfcb1d98bfc..8c17b45ce9a 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -18,9 +18,9 @@
 use Illuminate\Support\Collection;
 use Hyde\Foundation\Kernel\RouteCollection;
 use Hyde\Framework\Features\Navigation\NavItem;
+use Hyde\Framework\Features\Navigation\NavigationMenu;
 use Hyde\Framework\Features\Navigation\DocumentationSidebar;
 use Hyde\Framework\Features\Navigation\NavigationMenuGenerator;
-use Hyde\Framework\Features\Navigation\GeneratesMainNavigationMenu;
 
 /**
  * High-level broad-spectrum tests for the automatic navigation configurations, testing various setups.
@@ -1248,7 +1248,7 @@ public function __construct(TestCase $test, $sidebar = false)
     {
         $this->items = $sidebar
             ? NavigationMenuGenerator::handle(DocumentationSidebar::class)->getItems()
-            : GeneratesMainNavigationMenu::handle()->getItems();
+            : NavigationMenuGenerator::handle(NavigationMenu::class)->getItems();
 
         $this->test = $test;
     }
diff --git a/packages/framework/tests/Feature/NavigationMenuTest.php b/packages/framework/tests/Feature/NavigationMenuTest.php
index 15c00178129..7dfce49320d 100644
--- a/packages/framework/tests/Feature/NavigationMenuTest.php
+++ b/packages/framework/tests/Feature/NavigationMenuTest.php
@@ -12,7 +12,7 @@
 use Hyde\Pages\MarkdownPage;
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Collection;
-use Hyde\Framework\Features\Navigation\GeneratesMainNavigationMenu;
+use Hyde\Framework\Features\Navigation\NavigationMenuGenerator;
 
 /**
  * @covers \Hyde\Framework\Features\Navigation\GeneratesMainNavigationMenu
@@ -271,6 +271,6 @@ public function testCanAddItemsToMainNavigationMenuResolvedFromContainer()
 
     protected function createNavigationMenu(): NavigationMenu
     {
-        return GeneratesMainNavigationMenu::handle();
+        return NavigationMenuGenerator::handle(NavigationMenu::class);
     }
 }

From f1786340742ec5bee60099f454013f16ba15e07f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 20:58:40 +0100
Subject: [PATCH 0557/1422] Remove coverage annotations for old generators

---
 .../tests/Feature/AutomaticNavigationConfigurationsTest.php     | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 8c17b45ce9a..c555fc9890a 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -28,8 +28,6 @@
  * @covers \Hyde\Framework\Factories\NavigationDataFactory
  * @covers \Hyde\Framework\Features\Navigation\NavigationMenuGenerator
  * @covers \Hyde\Framework\Features\Navigation\DocumentationSidebar
- * @covers \Hyde\Framework\Features\Navigation\GeneratesDocumentationSidebarMenu
- * @covers \Hyde\Framework\Features\Navigation\GeneratesMainNavigationMenu
  * @covers \Hyde\Framework\Features\Navigation\NavItem
  */
 class AutomaticNavigationConfigurationsTest extends TestCase

From 93056d3ffeeca585245b8a5e93ac75e1503965d2 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 20:59:24 +0100
Subject: [PATCH 0558/1422] Remove coverage annotation for old generator

---
 packages/framework/tests/Feature/NavigationMenuTest.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/framework/tests/Feature/NavigationMenuTest.php b/packages/framework/tests/Feature/NavigationMenuTest.php
index 7dfce49320d..22b32988d6b 100644
--- a/packages/framework/tests/Feature/NavigationMenuTest.php
+++ b/packages/framework/tests/Feature/NavigationMenuTest.php
@@ -15,7 +15,6 @@
 use Hyde\Framework\Features\Navigation\NavigationMenuGenerator;
 
 /**
- * @covers \Hyde\Framework\Features\Navigation\GeneratesMainNavigationMenu
  * @covers \Hyde\Framework\Features\Navigation\NavigationMenu
  *
  * @see \Hyde\Framework\Testing\Unit\NavigationMenuUnitTest

From 647aec057c83cf3b08dc188361d83c4e2ef5a1be Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 20:59:50 +0100
Subject: [PATCH 0559/1422] Delete GeneratesDocumentationSidebarMenu.php

---
 .../GeneratesDocumentationSidebarMenu.php           | 13 -------------
 1 file changed, 13 deletions(-)
 delete mode 100644 packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
deleted file mode 100644
index 07c3d77b86b..00000000000
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Hyde\Framework\Features\Navigation;
-
-/**
- * @experimental This class may change significantly before its release.
- */
-class GeneratesDocumentationSidebarMenu
-{
-    //
-}

From 0668a817aee0e90dedaa1cdf3a28365c6acd7ef6 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 21:00:01 +0100
Subject: [PATCH 0560/1422] Delete GeneratesMainNavigationMenu.php

---
 .../Navigation/GeneratesMainNavigationMenu.php      | 13 -------------
 1 file changed, 13 deletions(-)
 delete mode 100644 packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
deleted file mode 100644
index 99e50dce6d5..00000000000
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Hyde\Framework\Features\Navigation;
-
-/**
- * @experimental This class may change significantly before its release.
- */
-class GeneratesMainNavigationMenu
-{
-    //
-}

From 1185f289224dd6dca3690685d22db689a0ad4f37 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 21:03:03 +0100
Subject: [PATCH 0561/1422] Assert the type is one of two supported menus

The ternary logic used in the class requires that only one of these two classes are used
---
 .../Framework/Features/Navigation/NavigationMenuGenerator.php   | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
index 45c6986ab99..93dd3fd7b3a 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
@@ -37,6 +37,8 @@ class NavigationMenuGenerator
     /** @param class-string<\Hyde\Framework\Features\Navigation\NavigationMenu> $menuType */
     protected function __construct(string $menuType)
     {
+        assert(in_array($menuType, [NavigationMenu::class, DocumentationSidebar::class]));
+
         $this->menuType = $menuType;
 
         $this->items = new Collection();

From cc2acab7ad506c0e9881e30c4ee0a060585e6030 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 21:03:16 +0100
Subject: [PATCH 0562/1422] Import used functions

---
 .../Framework/Features/Navigation/NavigationMenuGenerator.php   | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
index 93dd3fd7b3a..55366fc2561 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
@@ -14,7 +14,9 @@
 use Hyde\Foundation\Kernel\RouteCollection;
 
 use function filled;
+use function assert;
 use function collect;
+use function in_array;
 use function strtolower;
 
 /**

From 1d77ae10351d9899f480d3554fad983f2e616d81 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 21:05:38 +0100
Subject: [PATCH 0563/1422] Cover the new generator class

---
 packages/framework/tests/Feature/NavigationMenuTest.php          | 1 +
 .../tests/Feature/Services/DocumentationSidebarTest.php          | 1 +
 2 files changed, 2 insertions(+)

diff --git a/packages/framework/tests/Feature/NavigationMenuTest.php b/packages/framework/tests/Feature/NavigationMenuTest.php
index 22b32988d6b..1114c5735d4 100644
--- a/packages/framework/tests/Feature/NavigationMenuTest.php
+++ b/packages/framework/tests/Feature/NavigationMenuTest.php
@@ -16,6 +16,7 @@
 
 /**
  * @covers \Hyde\Framework\Features\Navigation\NavigationMenu
+ * @covers \Hyde\Framework\Features\Navigation\NavigationMenuGenerator
  *
  * @see \Hyde\Framework\Testing\Unit\NavigationMenuUnitTest
  */
diff --git a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
index c7d79c3faad..6cecf8bfb13 100644
--- a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
+++ b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
@@ -18,6 +18,7 @@
 
 /**
  * @covers \Hyde\Framework\Features\Navigation\DocumentationSidebar
+ * @covers \Hyde\Framework\Features\Navigation\NavigationMenuGenerator
  * @covers \Hyde\Framework\Factories\Concerns\HasFactory
  * @covers \Hyde\Framework\Factories\NavigationDataFactory
  * @covers \Hyde\Framework\Features\Navigation\NavItem

From ca328ccd00f7282d7c02cd217ead5af12ead6738 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 21:05:50 +0100
Subject: [PATCH 0564/1422] Cover the main menu class

---
 .../tests/Feature/AutomaticNavigationConfigurationsTest.php      | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index c555fc9890a..d16bf60aee3 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -28,6 +28,7 @@
  * @covers \Hyde\Framework\Factories\NavigationDataFactory
  * @covers \Hyde\Framework\Features\Navigation\NavigationMenuGenerator
  * @covers \Hyde\Framework\Features\Navigation\DocumentationSidebar
+ * @covers \Hyde\Framework\Features\Navigation\NavigationMenu
  * @covers \Hyde\Framework\Features\Navigation\NavItem
  */
 class AutomaticNavigationConfigurationsTest extends TestCase

From 447b65bb419716689e9f7946cb82c2076a097f8d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 21:17:25 +0100
Subject: [PATCH 0565/1422] Add additional priority test

---
 .../AutomaticNavigationConfigurationsTest.php | 29 +++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index d16bf60aee3..e50c9015afc 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -1028,6 +1028,35 @@ public function testSidebarGroupsAreSortedByLowestFoundPriorityInEachGroup()
         ]);
     }
 
+    public function testSidebarGroupsAreSortedByLowestFoundPriorityInEachGroupUnlessGroupPriorityIsLower()
+    {
+        $this->assertSidebarEquals([
+            'A', 'B', 'C',
+        ], [
+            new DocumentationPage('foo', ['navigation.group' => 'a', 'navigation.priority' => 10]),
+            new DocumentationPage('bar', ['navigation.group' => 'b', 'navigation.priority' => 20]),
+            new DocumentationPage('baz', ['navigation.group' => 'c', 'navigation.priority' => 30]),
+        ]);
+
+        $this->assertSidebarEquals([
+            'C', 'B', 'A',
+        ], [
+            new DocumentationPage('foo', ['navigation.group' => 'a', 'navigation.priority' => 30]),
+            new DocumentationPage('bar', ['navigation.group' => 'b', 'navigation.priority' => 20]),
+            new DocumentationPage('baz', ['navigation.group' => 'c', 'navigation.priority' => 10]),
+        ]);
+
+        config(['docs.sidebar_order' => ['a' => 5]]);
+
+        $this->assertSidebarEquals([
+            'A', 'C', 'B',
+        ], [
+            new DocumentationPage('foo', ['navigation.group' => 'a', 'navigation.priority' => 30]),
+            new DocumentationPage('bar', ['navigation.group' => 'b', 'navigation.priority' => 20]),
+            new DocumentationPage('baz', ['navigation.group' => 'c', 'navigation.priority' => 10]),
+        ]);
+    }
+
     public function testAllSidebarItemsArePlacedInGroupsWhenAtLeastOneItemIsGrouped()
     {
         $this->assertSidebarEquals([

From 097f69b2256f8f8fc37071d21b1d141ec72cb7d9 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 21:22:44 +0100
Subject: [PATCH 0566/1422] Only apply dynamic priority for sidebar groups

---
 .../framework/src/Framework/Features/Navigation/NavItem.php  | 5 +++--
 packages/framework/tests/Unit/NavItemTest.php                | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 309271bd21e..d8156963f27 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -4,6 +4,7 @@
 
 namespace Hyde\Framework\Features\Navigation;
 
+use Hyde\Pages\DocumentationPage;
 use Hyde\Foundation\Facades\Routes;
 use Hyde\Hyde;
 use Hyde\Support\Models\Route;
@@ -137,11 +138,11 @@ public function getLabel(): string
     /**
      * Get the priority to determine the order of the navigation item.
      *
-     * For dropdowns, this is the priority of the lowest priority child, unless the dropdown has a lower priority.
+     * For sidebar groups, this is the priority of the lowest priority child, unless the dropdown has a lower priority.
      */
     public function getPriority(): int
     {
-        if ($this->hasChildren()) {
+        if ($this->hasChildren() && $this->children[0]->getDestination()->getPage() instanceof DocumentationPage) {
             return min($this->priority, collect($this->getChildren())->min(fn (NavItem $child): int => $child->getPriority()));
         }
 
diff --git a/packages/framework/tests/Unit/NavItemTest.php b/packages/framework/tests/Unit/NavItemTest.php
index 68145381e30..f2caf94538c 100644
--- a/packages/framework/tests/Unit/NavItemTest.php
+++ b/packages/framework/tests/Unit/NavItemTest.php
@@ -278,7 +278,7 @@ public function testDropdownFacadeWithChildren()
 
         $item = NavItem::dropdown('foo', $children);
         $this->assertSame($children, $item->getChildren());
-        $this->assertSame(500, $item->getPriority());
+        $this->assertSame(999, $item->getPriority());
     }
 
     public function testDropdownFacadeWithCustomPriority()

From a1e66bb2fd3b6f8794c5bf1127999e70e46c0979 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 21:27:05 +0100
Subject: [PATCH 0567/1422] Replace instanceof with class constant comparison

---
 .../framework/src/Framework/Features/Navigation/NavItem.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index d8156963f27..37c19993917 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -142,7 +142,7 @@ public function getLabel(): string
      */
     public function getPriority(): int
     {
-        if ($this->hasChildren() && $this->children[0]->getDestination()->getPage() instanceof DocumentationPage) {
+        if ($this->hasChildren() && $this->children[0]->getDestination()->getPageClass() === DocumentationPage::class) {
             return min($this->priority, collect($this->getChildren())->min(fn (NavItem $child): int => $child->getPriority()));
         }
 

From 120777beeea9fc821ab4dcae2e0f228a182819e2 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 21:34:36 +0100
Subject: [PATCH 0568/1422] Import used function

---
 packages/framework/src/Framework/Features/Navigation/NavItem.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 37c19993917..fbca2681c6c 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -12,6 +12,7 @@
 use Stringable;
 use Hyde\Support\Models\ExternalRoute;
 
+use function min;
 use function collect;
 use function is_string;
 

From 6a3d8fb86c83cf948beec90a6822e90fb5ad8147 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 21:38:21 +0100
Subject: [PATCH 0569/1422] Add design note to todo

---
 .../framework/src/Framework/Features/Navigation/NavItem.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index fbca2681c6c..69b8b18bac3 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -213,6 +213,6 @@ protected static function normalizeGroupKey(?string $group): ?string
 
     protected static function makeIdentifier(string $label): string
     {
-        return Str::slug($label); // Todo: If it's a dropdown based on a subdirectory, we should use the subdirectory as the identifier
+        return Str::slug($label); // Todo: If it's a dropdown based on a subdirectory, we should use the subdirectory as the identifier (start by making a test to see if it's even possible to add a differing label)
     }
 }

From 7d59d30d750918ddfb485430c874e85bebd35723 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 22 Feb 2024 11:54:15 +0100
Subject: [PATCH 0570/1422] Test can mix subdirectory dropdowns with front
 matter dropdowns

---
 .../AutomaticNavigationConfigurationsTest.php        | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index e50c9015afc..cb57c06cc37 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -532,6 +532,18 @@ public function testConflictingSubdirectoryAndFrontMatterDropdownConfigurationGi
         ]);
     }
 
+    public function testCanMixSubdirectoryDropdownsWithFrontMatterDropdowns()
+    {
+        config(['hyde.navigation.subdirectories' => 'dropdown']);
+
+        $this->assertMenuEquals([
+            ['label' => 'Foo', 'children' => ['Bar', 'Baz']],
+        ], [
+            new MarkdownPage('foo/bar'),
+            new MarkdownPage('foo/baz', ['navigation.group' => 'foo']),
+        ]);
+    }
+
     // Documentation sidebar menu tests
 
     public function testSidebarWithPages()

From 04718d4f59faca75487a7d601ca7ef997c2222dc Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 22 Feb 2024 11:55:32 +0100
Subject: [PATCH 0571/1422] Test can mix subdirectory groups with front matter
 groups

---
 .../Feature/AutomaticNavigationConfigurationsTest.php  | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index cb57c06cc37..14fc325dd9b 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -1080,6 +1080,16 @@ public function testAllSidebarItemsArePlacedInGroupsWhenAtLeastOneItemIsGrouped(
         ]);
     }
 
+    public function testSidebarCanMixSubdirectoryGroupsWithFrontMatterGroups()
+    {
+        $this->assertSidebarEquals([
+            ['label' => 'Foo', 'children' => ['Bar', 'Baz']],
+        ], [
+            new DocumentationPage('foo/bar'),
+            new DocumentationPage('foo/baz', ['navigation.group' => 'foo']),
+        ]);
+    }
+
     // Priority tests
 
     public function testMainNavigationDropdownPriorityCanBeSetInConfig()

From ac4e6892bfd883730dcfac5ca9c11c925380bf38 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 22 Feb 2024 12:07:20 +0100
Subject: [PATCH 0572/1422] Inline deprecated helper method

---
 .../Navigation/DocumentationSidebar.php       |  6 --
 .../Services/DocumentationSidebarTest.php     | 65 ++++++++++---------
 .../tests/Feature/SidebarViewTest.php         | 11 ++--
 3 files changed, 39 insertions(+), 43 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 03829479837..f0943a3b088 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -15,12 +15,6 @@ class DocumentationSidebar extends NavigationMenu
     /** @var \Illuminate\Support\Collection<string, \Hyde\Framework\Features\Navigation\NavItem> */
     protected Collection $items;
 
-    /** @deprecated Will be moved to an action */
-    public static function create(): static
-    {
-        return NavigationMenuGenerator::handle(DocumentationSidebar::class);
-    }
-
     public function hasGroups(): bool
     {
         return $this->getItems()->contains(fn (NavItem $item): bool => $item->hasChildren());
diff --git a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
index 6cecf8bfb13..b83d3226c83 100644
--- a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
+++ b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
@@ -15,6 +15,7 @@
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\File;
+use Hyde\Framework\Features\Navigation\NavigationMenuGenerator;
 
 /**
  * @covers \Hyde\Framework\Features\Navigation\DocumentationSidebar
@@ -41,7 +42,7 @@ protected function tearDown(): void
 
     public function testSidebarCanBeCreated()
     {
-        $sidebar = DocumentationSidebar::create();
+        $sidebar = NavigationMenuGenerator::handle(DocumentationSidebar::class);
 
         $this->assertInstanceOf(DocumentationSidebar::class, $sidebar);
     }
@@ -50,7 +51,7 @@ public function testSidebarItemsAreAddedAutomatically()
     {
         $this->createTestFiles();
 
-        $sidebar = DocumentationSidebar::create();
+        $sidebar = NavigationMenuGenerator::handle(DocumentationSidebar::class);
 
         $this->assertCount(5, $sidebar->getItems());
     }
@@ -60,7 +61,7 @@ public function testIndexPageIsRemovedFromSidebar()
         $this->createTestFiles();
         Filesystem::touch('_docs/index.md');
 
-        $sidebar = DocumentationSidebar::create();
+        $sidebar = NavigationMenuGenerator::handle(DocumentationSidebar::class);
         $this->assertCount(5, $sidebar->getItems());
     }
 
@@ -69,7 +70,7 @@ public function testFilesWithFrontMatterHiddenSetToTrueAreRemovedFromSidebar()
         $this->createTestFiles();
         File::put(Hyde::path('_docs/test.md'), "---\nnavigation:\n    hidden: true\n---\n\n# Foo");
 
-        $sidebar = DocumentationSidebar::create();
+        $sidebar = NavigationMenuGenerator::handle(DocumentationSidebar::class);
         $this->assertCount(5, $sidebar->getItems());
     }
 
@@ -86,7 +87,7 @@ public function testSidebarIsOrderedAlphabeticallyWhenNoOrderIsSetInConfig()
                 NavItem::fromRoute(Routes::get('docs/b'), priority: 999),
                 NavItem::fromRoute(Routes::get('docs/c'), priority: 999),
             ]),
-            DocumentationSidebar::create()->getItems()
+            NavigationMenuGenerator::handle(DocumentationSidebar::class)->getItems()
         );
     }
 
@@ -107,7 +108,7 @@ public function testSidebarIsOrderedByPriorityWhenPriorityIsSetInConfig()
                 NavItem::fromRoute(Routes::get('docs/b'), priority: 250 + 251),
                 NavItem::fromRoute(Routes::get('docs/a'), priority: 250 + 252),
             ]),
-            DocumentationSidebar::create()->getItems()
+            NavigationMenuGenerator::handle(DocumentationSidebar::class)->getItems()
         );
     }
 
@@ -115,7 +116,7 @@ public function testSidebarItemPriorityCanBeSetInFrontMatter()
     {
         $this->makePage('foo', ['navigation.priority' => 25]);
 
-        $this->assertEquals(25, DocumentationSidebar::create()->getItems()->first()->getPriority());
+        $this->assertEquals(25, NavigationMenuGenerator::handle(DocumentationSidebar::class)->getItems()->first()->getPriority());
     }
 
     public function testSidebarItemPrioritySetInConfigOverridesFrontMatter()
@@ -124,7 +125,7 @@ public function testSidebarItemPrioritySetInConfigOverridesFrontMatter()
 
         Config::set('docs.sidebar_order', ['foo']);
 
-        $this->assertEquals(25, DocumentationSidebar::create()->getItems()->first()->getPriority());
+        $this->assertEquals(25, NavigationMenuGenerator::handle(DocumentationSidebar::class)->getItems()->first()->getPriority());
     }
 
     public function testSidebarPrioritiesCanBeSetInBothFrontMatterAndConfig()
@@ -146,26 +147,26 @@ public function testSidebarPrioritiesCanBeSetInBothFrontMatterAndConfig()
                 NavItem::fromRoute(Routes::get('docs/second'), priority: 250 + 252),
                 NavItem::fromRoute(Routes::get('docs/third'), priority: 250 + 300),
             ]),
-            DocumentationSidebar::create()->getItems()
+            NavigationMenuGenerator::handle(DocumentationSidebar::class)->getItems()
         );
     }
 
     public function testGroupCanBeSetInFrontMatter()
     {
         $this->makePage('foo', ['navigation.group' => 'bar']);
-        $this->assertEquals('bar', collect(DocumentationSidebar::create()->getItems()->first()->getChildren())->first()->getGroup());
+        $this->assertEquals('bar', collect(NavigationMenuGenerator::handle(DocumentationSidebar::class)->getItems()->first()->getChildren())->first()->getGroup());
     }
 
     public function testHasGroupsReturnsFalseWhenThereAreNoGroups()
     {
-        $this->assertFalse(DocumentationSidebar::create()->hasGroups());
+        $this->assertFalse(NavigationMenuGenerator::handle(DocumentationSidebar::class)->hasGroups());
     }
 
     public function testHasGroupsReturnsTrueWhenThereAreGroups()
     {
         $this->makePage('foo', ['navigation.group' => 'bar']);
 
-        $this->assertTrue(DocumentationSidebar::create()->hasGroups());
+        $this->assertTrue(NavigationMenuGenerator::handle(DocumentationSidebar::class)->hasGroups());
     }
 
     public function testHasGroupsReturnsTrueWhenThereAreMultipleGroups()
@@ -173,7 +174,7 @@ public function testHasGroupsReturnsTrueWhenThereAreMultipleGroups()
         $this->makePage('foo', ['navigation.group' => 'bar']);
         $this->makePage('bar', ['navigation.group' => 'baz']);
 
-        $this->assertTrue(DocumentationSidebar::create()->hasGroups());
+        $this->assertTrue(NavigationMenuGenerator::handle(DocumentationSidebar::class)->hasGroups());
     }
 
     public function testHasGroupsReturnsTrueWhenThereAreMultipleGroupsMixedWithDefaults()
@@ -182,7 +183,7 @@ public function testHasGroupsReturnsTrueWhenThereAreMultipleGroupsMixedWithDefau
         $this->makePage('bar', ['navigation.group' => 'baz']);
         $this->makePage('baz');
 
-        $this->assertTrue(DocumentationSidebar::create()->hasGroups());
+        $this->assertTrue(NavigationMenuGenerator::handle(DocumentationSidebar::class)->hasGroups());
     }
 
     public function testGetItemsInGroupDoesNotIncludeDocsIndex()
@@ -192,26 +193,26 @@ public function testGetItemsInGroupDoesNotIncludeDocsIndex()
 
         $this->assertEquals(
             collect([NavItem::fromRoute(Routes::get('docs/foo'), priority: 999)]),
-            DocumentationSidebar::create()->getItems()
+            NavigationMenuGenerator::handle(DocumentationSidebar::class)->getItems()
         );
     }
 
     public function testIsGroupActiveReturnsFalseWhenSuppliedGroupIsNotActive()
     {
         Render::setPage(new DocumentationPage(matter: ['navigation.group' => 'foo']));
-        $this->assertFalse(DocumentationSidebar::create()->isGroupActive('bar'));
+        $this->assertFalse(NavigationMenuGenerator::handle(DocumentationSidebar::class)->isGroupActive('bar'));
     }
 
     public function testIsGroupActiveReturnsTrueWhenSuppliedGroupIsActive()
     {
         Render::setPage(new DocumentationPage(matter: ['navigation.group' => 'foo']));
-        $this->assertTrue(DocumentationSidebar::create()->isGroupActive('foo'));
+        $this->assertTrue(NavigationMenuGenerator::handle(DocumentationSidebar::class)->isGroupActive('foo'));
     }
 
     public function testIsGroupActiveReturnsTrueForDifferingCasing()
     {
         Render::setPage(new DocumentationPage(matter: ['navigation.group' => 'Foo Bar']));
-        $this->assertTrue(DocumentationSidebar::create()->isGroupActive('foo-bar'));
+        $this->assertTrue(NavigationMenuGenerator::handle(DocumentationSidebar::class)->isGroupActive('foo-bar'));
     }
 
     public function testIsGroupActiveReturnsTrueFirstGroupOfIndexPage()
@@ -222,9 +223,9 @@ public function testIsGroupActiveReturnsTrueFirstGroupOfIndexPage()
         $this->makePage('baz', ['navigation.group' => 'baz']);
 
         Render::setPage(DocumentationPage::get('index'));
-        $this->assertTrue(DocumentationSidebar::create()->isGroupActive('bar'));
-        $this->assertFalse(DocumentationSidebar::create()->isGroupActive('foo'));
-        $this->assertFalse(DocumentationSidebar::create()->isGroupActive('baz'));
+        $this->assertTrue(NavigationMenuGenerator::handle(DocumentationSidebar::class)->isGroupActive('bar'));
+        $this->assertFalse(NavigationMenuGenerator::handle(DocumentationSidebar::class)->isGroupActive('foo'));
+        $this->assertFalse(NavigationMenuGenerator::handle(DocumentationSidebar::class)->isGroupActive('baz'));
     }
 
     public function testIsGroupActiveReturnsTrueFirstSortedGroupOfIndexPage()
@@ -235,9 +236,9 @@ public function testIsGroupActiveReturnsTrueFirstSortedGroupOfIndexPage()
         $this->makePage('baz', ['navigation.group' => 'baz', 'navigation.priority' => 3]);
 
         Render::setPage(DocumentationPage::get('index'));
-        $this->assertTrue(DocumentationSidebar::create()->isGroupActive('foo'));
-        $this->assertFalse(DocumentationSidebar::create()->isGroupActive('bar'));
-        $this->assertFalse(DocumentationSidebar::create()->isGroupActive('baz'));
+        $this->assertTrue(NavigationMenuGenerator::handle(DocumentationSidebar::class)->isGroupActive('foo'));
+        $this->assertFalse(NavigationMenuGenerator::handle(DocumentationSidebar::class)->isGroupActive('bar'));
+        $this->assertFalse(NavigationMenuGenerator::handle(DocumentationSidebar::class)->isGroupActive('baz'));
     }
 
     public function testAutomaticIndexPageGroupExpansionRespectsCustomNavigationMenuSettings()
@@ -248,9 +249,9 @@ public function testAutomaticIndexPageGroupExpansionRespectsCustomNavigationMenu
         $this->makePage('baz', ['navigation.group' => 'baz', 'navigation.priority' => 3]);
 
         Render::setPage(DocumentationPage::get('index'));
-        $this->assertFalse(DocumentationSidebar::create()->isGroupActive('foo'));
-        $this->assertFalse(DocumentationSidebar::create()->isGroupActive('bar'));
-        $this->assertTrue(DocumentationSidebar::create()->isGroupActive('baz'));
+        $this->assertFalse(NavigationMenuGenerator::handle(DocumentationSidebar::class)->isGroupActive('foo'));
+        $this->assertFalse(NavigationMenuGenerator::handle(DocumentationSidebar::class)->isGroupActive('bar'));
+        $this->assertTrue(NavigationMenuGenerator::handle(DocumentationSidebar::class)->isGroupActive('baz'));
     }
 
     public function testCanHaveMultipleGroupedPagesWithTheSameNameLabels()
@@ -258,7 +259,7 @@ public function testCanHaveMultipleGroupedPagesWithTheSameNameLabels()
         $this->makePage('foo', ['navigation.group' => 'foo', 'navigation.label' => 'Foo']);
         $this->makePage('bar', ['navigation.group' => 'bar', 'navigation.label' => 'Foo']);
 
-        $sidebar = DocumentationSidebar::create();
+        $sidebar = NavigationMenuGenerator::handle(DocumentationSidebar::class);
         $this->assertCount(2, $sidebar->getItems());
 
         $this->assertEquals(
@@ -279,7 +280,7 @@ public function testDuplicateLabelsWithinTheSameGroupAreNotRemoved()
         $this->makePage('foo', ['navigation.group' => 'foo', 'navigation.label' => 'Foo']);
         $this->makePage('bar', ['navigation.group' => 'foo', 'navigation.label' => 'Foo']);
 
-        $sidebar = DocumentationSidebar::create();
+        $sidebar = NavigationMenuGenerator::handle(DocumentationSidebar::class);
         $this->assertCount(1, $sidebar->getItems());
 
         $this->assertEquals(
@@ -298,13 +299,13 @@ public function testIsGroupActiveForIndexPageWithNoGroups()
         $this->makePage('index');
 
         Render::setPage(DocumentationPage::get('index'));
-        $this->assertFalse(DocumentationSidebar::create()->isGroupActive('foo'));
+        $this->assertFalse(NavigationMenuGenerator::handle(DocumentationSidebar::class)->isGroupActive('foo'));
     }
 
     public function testIndexPageAddedToSidebarWhenItIsTheOnlyPage()
     {
         Filesystem::touch('_docs/index.md');
-        $sidebar = DocumentationSidebar::create();
+        $sidebar = NavigationMenuGenerator::handle(DocumentationSidebar::class);
 
         $this->assertCount(1, $sidebar->getItems());
         $this->assertEquals(
@@ -317,7 +318,7 @@ public function testIndexPageNotAddedToSidebarWhenOtherPagesExist()
     {
         $this->createTestFiles(1);
         Filesystem::touch('_docs/index.md');
-        $sidebar = DocumentationSidebar::create();
+        $sidebar = NavigationMenuGenerator::handle(DocumentationSidebar::class);
 
         $this->assertCount(1, $sidebar->getItems());
         $this->assertEquals(
diff --git a/packages/framework/tests/Feature/SidebarViewTest.php b/packages/framework/tests/Feature/SidebarViewTest.php
index 2dcd7646d91..deab74d376d 100644
--- a/packages/framework/tests/Feature/SidebarViewTest.php
+++ b/packages/framework/tests/Feature/SidebarViewTest.php
@@ -11,6 +11,7 @@
 use Hyde\Testing\TestCase;
 use Illuminate\Contracts\View\View;
 use Throwable;
+use Hyde\Framework\Features\Navigation\NavigationMenuGenerator;
 
 use function config;
 use function file_put_contents;
@@ -49,7 +50,7 @@ public function testBaseSidebar()
             ->allGood();
 
         $this->assertViewWasRendered(view('hyde::components.docs.sidebar-items', [
-            'sidebar' => DocumentationSidebar::create(),
+            'sidebar' => NavigationMenuGenerator::handle(DocumentationSidebar::class),
         ]));
 
         $this->assertViewWasRendered(view('hyde::components.docs.sidebar-brand'));
@@ -102,7 +103,7 @@ public function testBaseSidebarWithItems()
             ->allGood();
 
         $this->assertViewWasRendered(view('hyde::components.docs.sidebar-items', [
-            'sidebar' => DocumentationSidebar::create(),
+            'sidebar' => NavigationMenuGenerator::handle(DocumentationSidebar::class),
         ]));
     }
 
@@ -130,7 +131,7 @@ public function testSidebarWithGroupedItems()
             ->allGood();
 
         $this->assertViewWasRendered(view('hyde::components.docs.sidebar-items', [
-            'sidebar' => DocumentationSidebar::create(),
+            'sidebar' => NavigationMenuGenerator::handle(DocumentationSidebar::class),
             'grouped' => true,
         ]));
 
@@ -162,7 +163,7 @@ public function testSidebarWithNonCollapsibleGroupedItems()
             ->allGood();
 
         $this->assertViewWasRendered(view('hyde::components.docs.sidebar-items', [
-            'sidebar' => DocumentationSidebar::create(),
+            'sidebar' => NavigationMenuGenerator::handle(DocumentationSidebar::class),
             'grouped' => true,
         ]));
 
@@ -187,7 +188,7 @@ public function testSidebarWithMixedGroupedAndUngroupedItems()
             ->allGood();
 
         $this->assertViewWasRendered(view('hyde::components.docs.sidebar-items', [
-            'sidebar' => DocumentationSidebar::create(),
+            'sidebar' => NavigationMenuGenerator::handle(DocumentationSidebar::class),
             'grouped' => true,
         ]));
 

From 7f9b0c6adde2a89525261ed925bb69c66e268098 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 22 Feb 2024 12:12:46 +0100
Subject: [PATCH 0573/1422] Split out base navigation menu class from main menu
 class

---
 .../Providers/NavigationServiceProvider.php   |  4 +--
 .../Navigation/DocumentationSidebar.php       |  1 -
 .../Navigation/MainNavigationMenu.php         | 10 +++++++
 .../Features/Navigation/NavigationMenu.php    |  2 +-
 .../Navigation/NavigationMenuGenerator.php    |  4 +--
 .../AutomaticNavigationConfigurationsTest.php |  6 ++--
 .../tests/Feature/NavigationManagerTest.php   |  6 ++--
 .../tests/Feature/NavigationMenuTest.php      | 10 +++----
 .../tests/Unit/NavigationMenuUnitTest.php     | 28 +++++++++----------
 .../Unit/Views/NavigationBrandViewTest.php    |  4 +--
 10 files changed, 42 insertions(+), 33 deletions(-)
 create mode 100644 packages/framework/src/Framework/Features/Navigation/MainNavigationMenu.php

diff --git a/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php b/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php
index 4e62984f336..857588c3dd3 100644
--- a/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php
+++ b/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php
@@ -6,7 +6,7 @@
 
 use Hyde\Foundation\HydeKernel;
 use Illuminate\Support\ServiceProvider;
-use Hyde\Framework\Features\Navigation\NavigationMenu;
+use Hyde\Framework\Features\Navigation\MainNavigationMenu;
 use Hyde\Framework\Features\Navigation\NavigationManager;
 use Hyde\Framework\Features\Navigation\DocumentationSidebar;
 use Hyde\Framework\Features\Navigation\NavigationMenuGenerator;
@@ -22,7 +22,7 @@ public function register(): void
         $this->app->alias(NavigationManager::class, 'navigation');
 
         $this->app->make(HydeKernel::class)->booted(function () {
-            $this->app->make(NavigationManager::class)->registerMenu('main', NavigationMenuGenerator::handle(NavigationMenu::class));
+            $this->app->make(NavigationManager::class)->registerMenu('main', NavigationMenuGenerator::handle(MainNavigationMenu::class));
             $this->app->make(NavigationManager::class)->registerMenu('sidebar', NavigationMenuGenerator::handle(DocumentationSidebar::class));
         });
     }
diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index f0943a3b088..60bf526c7aa 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -9,7 +9,6 @@
 use Illuminate\Support\Collection;
 use Illuminate\Support\Str;
 
-/** @deprecated Use the new NavigationMenu class instead */
 class DocumentationSidebar extends NavigationMenu
 {
     /** @var \Illuminate\Support\Collection<string, \Hyde\Framework\Features\Navigation\NavItem> */
diff --git a/packages/framework/src/Framework/Features/Navigation/MainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/MainNavigationMenu.php
new file mode 100644
index 00000000000..96b228fa967
--- /dev/null
+++ b/packages/framework/src/Framework/Features/Navigation/MainNavigationMenu.php
@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Hyde\Framework\Features\Navigation;
+
+class MainNavigationMenu extends NavigationMenu
+{
+    //
+}
diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
index 23e3ba7b3f3..986dd7076be 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
@@ -15,7 +15,7 @@
  * @example `$menu = app('navigation')->getMenu('main');` for the main navigation menu.
  * @example `$menu = app('navigation')->getMenu('sidebar');` for the documentation sidebar.
  */
-class NavigationMenu
+abstract class NavigationMenu
 {
     /** @var \Illuminate\Support\Collection<\Hyde\Framework\Features\Navigation\NavItem> */
     protected Collection $items;
diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
index 55366fc2561..bd31784144e 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
@@ -39,7 +39,7 @@ class NavigationMenuGenerator
     /** @param class-string<\Hyde\Framework\Features\Navigation\NavigationMenu> $menuType */
     protected function __construct(string $menuType)
     {
-        assert(in_array($menuType, [NavigationMenu::class, DocumentationSidebar::class]));
+        assert(in_array($menuType, [MainNavigationMenu::class, DocumentationSidebar::class]));
 
         $this->menuType = $menuType;
 
@@ -55,7 +55,7 @@ protected function __construct(string $menuType)
     }
 
     /** @param class-string<\Hyde\Framework\Features\Navigation\NavigationMenu> $menuType */
-    public static function handle(string $menuType): NavigationMenu|DocumentationSidebar
+    public static function handle(string $menuType): MainNavigationMenu|DocumentationSidebar
     {
         $menu = new static($menuType);
 
diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 14fc325dd9b..2c9e9a27288 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -18,7 +18,7 @@
 use Illuminate\Support\Collection;
 use Hyde\Foundation\Kernel\RouteCollection;
 use Hyde\Framework\Features\Navigation\NavItem;
-use Hyde\Framework\Features\Navigation\NavigationMenu;
+use Hyde\Framework\Features\Navigation\MainNavigationMenu;
 use Hyde\Framework\Features\Navigation\DocumentationSidebar;
 use Hyde\Framework\Features\Navigation\NavigationMenuGenerator;
 
@@ -28,7 +28,7 @@
  * @covers \Hyde\Framework\Factories\NavigationDataFactory
  * @covers \Hyde\Framework\Features\Navigation\NavigationMenuGenerator
  * @covers \Hyde\Framework\Features\Navigation\DocumentationSidebar
- * @covers \Hyde\Framework\Features\Navigation\NavigationMenu
+ * @covers \Hyde\Framework\Features\Navigation\MainNavigationMenu
  * @covers \Hyde\Framework\Features\Navigation\NavItem
  */
 class AutomaticNavigationConfigurationsTest extends TestCase
@@ -1298,7 +1298,7 @@ public function __construct(TestCase $test, $sidebar = false)
     {
         $this->items = $sidebar
             ? NavigationMenuGenerator::handle(DocumentationSidebar::class)->getItems()
-            : NavigationMenuGenerator::handle(NavigationMenu::class)->getItems();
+            : NavigationMenuGenerator::handle(MainNavigationMenu::class)->getItems();
 
         $this->test = $test;
     }
diff --git a/packages/framework/tests/Feature/NavigationManagerTest.php b/packages/framework/tests/Feature/NavigationManagerTest.php
index 97f2c1b83a9..41558e14a69 100644
--- a/packages/framework/tests/Feature/NavigationManagerTest.php
+++ b/packages/framework/tests/Feature/NavigationManagerTest.php
@@ -5,7 +5,7 @@
 namespace Hyde\Framework\Testing\Feature;
 
 use Hyde\Framework\Features\Navigation\NavigationManager;
-use Hyde\Framework\Features\Navigation\NavigationMenu;
+use Hyde\Framework\Features\Navigation\MainNavigationMenu;
 use Hyde\Testing\TestCase;
 
 /**
@@ -17,7 +17,7 @@ public function testCanRegisterMenu()
     {
         $manager = new NavigationManager();
 
-        $menu = $this->createMock(NavigationMenu::class);
+        $menu = $this->createMock(MainNavigationMenu::class);
         $manager->registerMenu('foo', $menu);
 
         $reflection = new \ReflectionClass($manager);
@@ -33,7 +33,7 @@ public function testCanGetMenu()
     {
         $manager = new NavigationManager();
 
-        $menu = $this->createMock(NavigationMenu::class);
+        $menu = $this->createMock(MainNavigationMenu::class);
         $manager->registerMenu('foo', $menu);
 
         $retrievedMenu = $manager->getMenu('foo');
diff --git a/packages/framework/tests/Feature/NavigationMenuTest.php b/packages/framework/tests/Feature/NavigationMenuTest.php
index 1114c5735d4..aed4d880f64 100644
--- a/packages/framework/tests/Feature/NavigationMenuTest.php
+++ b/packages/framework/tests/Feature/NavigationMenuTest.php
@@ -7,7 +7,7 @@
 use Hyde\Support\Models\Route;
 use Hyde\Foundation\Facades\Routes;
 use Hyde\Support\Models\ExternalRoute;
-use Hyde\Framework\Features\Navigation\NavigationMenu;
+use Hyde\Framework\Features\Navigation\MainNavigationMenu;
 use Hyde\Framework\Features\Navigation\NavItem;
 use Hyde\Pages\MarkdownPage;
 use Hyde\Testing\TestCase;
@@ -15,7 +15,7 @@
 use Hyde\Framework\Features\Navigation\NavigationMenuGenerator;
 
 /**
- * @covers \Hyde\Framework\Features\Navigation\NavigationMenu
+ * @covers \Hyde\Framework\Features\Navigation\MainNavigationMenu
  * @covers \Hyde\Framework\Features\Navigation\NavigationMenuGenerator
  *
  * @see \Hyde\Framework\Testing\Unit\NavigationMenuUnitTest
@@ -24,7 +24,7 @@ class NavigationMenuTest extends TestCase
 {
     public function testConstructor()
     {
-        $this->assertInstanceOf(NavigationMenu::class, $this->createNavigationMenu());
+        $this->assertInstanceOf(MainNavigationMenu::class, $this->createNavigationMenu());
     }
 
     public function testGenerateMethodCreatesCollectionOfNavItems()
@@ -269,8 +269,8 @@ public function testCanAddItemsToMainNavigationMenuResolvedFromContainer()
         $this->assertSame('Foo', $navigation->getItems()->last()->getLabel());
     }
 
-    protected function createNavigationMenu(): NavigationMenu
+    protected function createNavigationMenu(): MainNavigationMenu
     {
-        return NavigationMenuGenerator::handle(NavigationMenu::class);
+        return NavigationMenuGenerator::handle(MainNavigationMenu::class);
     }
 }
diff --git a/packages/framework/tests/Unit/NavigationMenuUnitTest.php b/packages/framework/tests/Unit/NavigationMenuUnitTest.php
index 5242dd9f317..dc935d49329 100644
--- a/packages/framework/tests/Unit/NavigationMenuUnitTest.php
+++ b/packages/framework/tests/Unit/NavigationMenuUnitTest.php
@@ -8,10 +8,10 @@
 use Illuminate\Support\Collection;
 use Hyde\Support\Models\ExternalRoute;
 use Hyde\Framework\Features\Navigation\NavItem;
-use Hyde\Framework\Features\Navigation\NavigationMenu;
+use Hyde\Framework\Features\Navigation\MainNavigationMenu;
 
 /**
- * @covers \Hyde\Framework\Features\Navigation\NavigationMenu
+ * @covers \Hyde\Framework\Features\Navigation\MainNavigationMenu
  *
  * @see \Hyde\Framework\Testing\Feature\NavigationMenuTest
  */
@@ -19,56 +19,56 @@ class NavigationMenuUnitTest extends UnitTestCase
 {
     public function testCanConstruct()
     {
-        $this->assertInstanceOf(NavigationMenu::class, new NavigationMenu());
+        $this->assertInstanceOf(MainNavigationMenu::class, new MainNavigationMenu());
     }
 
     public function testCanConstructWithItemsArray()
     {
-        $this->assertInstanceOf(NavigationMenu::class, new NavigationMenu($this->getItems()));
+        $this->assertInstanceOf(MainNavigationMenu::class, new MainNavigationMenu($this->getItems()));
     }
 
     public function testCanConstructWithItemsArrayable()
     {
-        $this->assertInstanceOf(NavigationMenu::class, new NavigationMenu(collect($this->getItems())));
+        $this->assertInstanceOf(MainNavigationMenu::class, new MainNavigationMenu(collect($this->getItems())));
     }
 
     public function testGetItemsReturnsCollection()
     {
-        $this->assertInstanceOf(Collection::class, (new NavigationMenu())->getItems());
+        $this->assertInstanceOf(Collection::class, (new MainNavigationMenu())->getItems());
     }
 
     public function testGetItemsReturnsCollectionWhenSuppliedArray()
     {
-        $this->assertInstanceOf(Collection::class, (new NavigationMenu($this->getItems()))->getItems());
+        $this->assertInstanceOf(Collection::class, (new MainNavigationMenu($this->getItems()))->getItems());
     }
 
     public function testGetItemsReturnsCollectionWhenSuppliedArrayable()
     {
-        $this->assertInstanceOf(Collection::class, (new NavigationMenu(collect($this->getItems())))->getItems());
+        $this->assertInstanceOf(Collection::class, (new MainNavigationMenu(collect($this->getItems())))->getItems());
     }
 
     public function testGetItemsReturnsItems()
     {
         $items = $this->getItems();
 
-        $this->assertSame($items, (new NavigationMenu($items))->getItems()->all());
+        $this->assertSame($items, (new MainNavigationMenu($items))->getItems()->all());
     }
 
     public function testGetItemsReturnsItemsWhenSuppliedArrayable()
     {
         $items = $this->getItems();
 
-        $this->assertSame($items, (new NavigationMenu(collect($items)))->getItems()->all());
+        $this->assertSame($items, (new MainNavigationMenu(collect($items)))->getItems()->all());
     }
 
     public function testGetItemsReturnsEmptyArrayWhenNoItems()
     {
-        $this->assertSame([], (new NavigationMenu())->getItems()->all());
+        $this->assertSame([], (new MainNavigationMenu())->getItems()->all());
     }
 
     public function testCanAddItems()
     {
-        $menu = new NavigationMenu();
+        $menu = new MainNavigationMenu();
         $item = new NavItem(new ExternalRoute('/'), 'Home');
 
         $menu->add($item);
@@ -79,7 +79,7 @@ public function testCanAddItems()
 
     public function testItemsAreInTheOrderTheyWereAddedWhenThereAreNoCustomPriorities()
     {
-        $menu = new NavigationMenu();
+        $menu = new MainNavigationMenu();
         $item1 = new NavItem(new ExternalRoute('/'), 'Home');
         $item2 = new NavItem(new ExternalRoute('/about'), 'About');
         $item3 = new NavItem(new ExternalRoute('/contact'), 'Contact');
@@ -93,7 +93,7 @@ public function testItemsAreInTheOrderTheyWereAddedWhenThereAreNoCustomPrioritie
 
     public function testItemsAreSortedByPriority()
     {
-        $menu = new NavigationMenu();
+        $menu = new MainNavigationMenu();
         $item1 = new NavItem(new ExternalRoute('/'), 'Home', 100);
         $item2 = new NavItem(new ExternalRoute('/about'), 'About', 200);
         $item3 = new NavItem(new ExternalRoute('/contact'), 'Contact', 300);
diff --git a/packages/framework/tests/Unit/Views/NavigationBrandViewTest.php b/packages/framework/tests/Unit/Views/NavigationBrandViewTest.php
index 47fe6c7c640..a12a053b608 100644
--- a/packages/framework/tests/Unit/Views/NavigationBrandViewTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationBrandViewTest.php
@@ -4,7 +4,7 @@
 
 namespace Hyde\Framework\Testing\Unit\Views;
 
-use Hyde\Framework\Features\Navigation\NavigationMenu;
+use Hyde\Framework\Features\Navigation\MainNavigationMenu;
 use Hyde\Testing\TestCase;
 
 /**
@@ -22,7 +22,7 @@ protected function setUp(): void
     protected function render(): string
     {
         return view('hyde::components.navigation.navigation-brand', [
-            'navigation' => new NavigationMenu(),
+            'navigation' => new MainNavigationMenu(),
         ])->render();
     }
 

From c9ba7f2f195cb17cd56a06cf60ab0e5d0ea04c14 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 22 Feb 2024 13:05:22 +0100
Subject: [PATCH 0574/1422] Deprecate NavigationManager

---
 .../src/Framework/Features/Navigation/NavigationManager.php     | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationManager.php b/packages/framework/src/Framework/Features/Navigation/NavigationManager.php
index 7fc836be42c..9313fb65bd0 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationManager.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationManager.php
@@ -8,6 +8,8 @@
 
 /**
  * Manages the navigation menus for the project.
+ *
+ * @deprecated Move to extension
  */
 class NavigationManager
 {

From 4c5e39a5fe11f5645ac1e2f28e2d644c2274a6ca Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 22 Feb 2024 13:59:51 +0100
Subject: [PATCH 0575/1422] Remove redundant property already inherited by
 parent

---
 .../Framework/Features/Navigation/DocumentationSidebar.php    | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 60bf526c7aa..3928e2847f6 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -6,14 +6,10 @@
 
 use Hyde\Pages\DocumentationPage;
 use Hyde\Support\Facades\Render;
-use Illuminate\Support\Collection;
 use Illuminate\Support\Str;
 
 class DocumentationSidebar extends NavigationMenu
 {
-    /** @var \Illuminate\Support\Collection<string, \Hyde\Framework\Features\Navigation\NavItem> */
-    protected Collection $items;
-
     public function hasGroups(): bool
     {
         return $this->getItems()->contains(fn (NavItem $item): bool => $item->hasChildren());

From 90a231e1d6f86230ea9d5b686334649a3a9a383b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 22 Feb 2024 14:01:24 +0100
Subject: [PATCH 0576/1422] Add coverage annotations

---
 .../tests/Feature/AutomaticNavigationConfigurationsTest.php      | 1 +
 packages/framework/tests/Feature/NavigationMenuTest.php          | 1 +
 .../tests/Feature/Services/DocumentationSidebarTest.php          | 1 +
 packages/framework/tests/Unit/NavigationMenuUnitTest.php         | 1 +
 4 files changed, 4 insertions(+)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 2c9e9a27288..c00e56054b6 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -29,6 +29,7 @@
  * @covers \Hyde\Framework\Features\Navigation\NavigationMenuGenerator
  * @covers \Hyde\Framework\Features\Navigation\DocumentationSidebar
  * @covers \Hyde\Framework\Features\Navigation\MainNavigationMenu
+ * @covers \Hyde\Framework\Features\Navigation\NavigationMenu
  * @covers \Hyde\Framework\Features\Navigation\NavItem
  */
 class AutomaticNavigationConfigurationsTest extends TestCase
diff --git a/packages/framework/tests/Feature/NavigationMenuTest.php b/packages/framework/tests/Feature/NavigationMenuTest.php
index aed4d880f64..a4ba8a92ce8 100644
--- a/packages/framework/tests/Feature/NavigationMenuTest.php
+++ b/packages/framework/tests/Feature/NavigationMenuTest.php
@@ -15,6 +15,7 @@
 use Hyde\Framework\Features\Navigation\NavigationMenuGenerator;
 
 /**
+ * @covers \Hyde\Framework\Features\Navigation\NavigationMenu
  * @covers \Hyde\Framework\Features\Navigation\MainNavigationMenu
  * @covers \Hyde\Framework\Features\Navigation\NavigationMenuGenerator
  *
diff --git a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
index b83d3226c83..2e3fcbe6344 100644
--- a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
+++ b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
@@ -20,6 +20,7 @@
 /**
  * @covers \Hyde\Framework\Features\Navigation\DocumentationSidebar
  * @covers \Hyde\Framework\Features\Navigation\NavigationMenuGenerator
+ * @covers \Hyde\Framework\Features\Navigation\NavigationMenu
  * @covers \Hyde\Framework\Factories\Concerns\HasFactory
  * @covers \Hyde\Framework\Factories\NavigationDataFactory
  * @covers \Hyde\Framework\Features\Navigation\NavItem
diff --git a/packages/framework/tests/Unit/NavigationMenuUnitTest.php b/packages/framework/tests/Unit/NavigationMenuUnitTest.php
index dc935d49329..1b0f9a08a58 100644
--- a/packages/framework/tests/Unit/NavigationMenuUnitTest.php
+++ b/packages/framework/tests/Unit/NavigationMenuUnitTest.php
@@ -11,6 +11,7 @@
 use Hyde\Framework\Features\Navigation\MainNavigationMenu;
 
 /**
+ * @covers \Hyde\Framework\Features\Navigation\NavigationMenu
  * @covers \Hyde\Framework\Features\Navigation\MainNavigationMenu
  *
  * @see \Hyde\Framework\Testing\Feature\NavigationMenuTest

From b17b7e3476a5f2f5ef621bd4a2f1715fdf508cbe Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 22 Feb 2024 14:07:26 +0100
Subject: [PATCH 0577/1422] Add static menu container access shorthands

---
 .../Navigation/DocumentationSidebar.php       |  7 ++++++
 .../Navigation/MainNavigationMenu.php         |  7 +++++-
 .../tests/Feature/NavigationManagerTest.php   | 24 +++++++++++++++++++
 3 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 3928e2847f6..e8aeec5cab6 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -8,8 +8,15 @@
 use Hyde\Support\Facades\Render;
 use Illuminate\Support\Str;
 
+use function app;
+
 class DocumentationSidebar extends NavigationMenu
 {
+    public static function get(): static
+    {
+        return app('navigation')->getMenu('sidebar');
+    }
+
     public function hasGroups(): bool
     {
         return $this->getItems()->contains(fn (NavItem $item): bool => $item->hasChildren());
diff --git a/packages/framework/src/Framework/Features/Navigation/MainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/MainNavigationMenu.php
index 96b228fa967..b94dc0778ab 100644
--- a/packages/framework/src/Framework/Features/Navigation/MainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/MainNavigationMenu.php
@@ -4,7 +4,12 @@
 
 namespace Hyde\Framework\Features\Navigation;
 
+use function app;
+
 class MainNavigationMenu extends NavigationMenu
 {
-    //
+    public static function get(): static
+    {
+        return app('navigation')->getMenu('main');
+    }
 }
diff --git a/packages/framework/tests/Feature/NavigationManagerTest.php b/packages/framework/tests/Feature/NavigationManagerTest.php
index 41558e14a69..b39e299f039 100644
--- a/packages/framework/tests/Feature/NavigationManagerTest.php
+++ b/packages/framework/tests/Feature/NavigationManagerTest.php
@@ -6,9 +6,13 @@
 
 use Hyde\Framework\Features\Navigation\NavigationManager;
 use Hyde\Framework\Features\Navigation\MainNavigationMenu;
+use Hyde\Framework\Features\Navigation\DocumentationSidebar;
 use Hyde\Testing\TestCase;
 
 /**
+ * @covers \Hyde\Framework\Features\Navigation\NavigationMenu
+ * @covers \Hyde\Framework\Features\Navigation\MainNavigationMenu
+ * @covers \Hyde\Framework\Features\Navigation\DocumentationSidebar
  * @covers \Hyde\Framework\Features\Navigation\NavigationManager
  */
 class NavigationManagerTest extends TestCase
@@ -48,4 +52,24 @@ public function testGetMenuThrowsExceptionForNonExistentMenu()
         $this->expectException(\Exception::class);
         $manager->getMenu('foo');
     }
+
+    public function testCanGetMainNavigationMenuFromContainer()
+    {
+        $this->assertInstanceOf(MainNavigationMenu::class, app('navigation')->getMenu('main'));
+    }
+
+    public function testCanGetDocumentationSidebarFromContainer()
+    {
+        $this->assertInstanceOf(DocumentationSidebar::class, app('navigation')->getMenu('sidebar'));
+    }
+
+    public function testCanGetMainNavigationMenuFromContainerUsingShorthand()
+    {
+        $this->assertSame(MainNavigationMenu::get(), app('navigation')->getMenu('main'));
+    }
+
+    public function testCanGetDocumentationSidebarFromContainerUsingShorthand()
+    {
+        $this->assertSame(DocumentationSidebar::get(), app('navigation')->getMenu('sidebar'));
+    }
 }

From e4957b863746b631c671d6b149767f62aa94fbb3 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 22 Feb 2024 16:17:35 +0100
Subject: [PATCH 0578/1422] Throw when trying to get uninitialized menu before
 boot

---
 .../src/Framework/Features/Navigation/NavigationManager.php  | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationManager.php b/packages/framework/src/Framework/Features/Navigation/NavigationManager.php
index 9313fb65bd0..624953fb886 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationManager.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationManager.php
@@ -33,9 +33,8 @@ public function registerMenu(string $name, NavigationMenu $menu): void
      */
     public function getMenu(string $name): NavigationMenu
     {
-        if (! Hyde::isBooted()) {
-            // Todo: This could be an anti-pattern so we may consider throwing an exception instead.
-            Hyde::boot();
+        if (! Hyde::isBooted() && ! isset($this->menus[$name])) {
+            throw new \Exception('Cannot get navigation menu before the Hyde Kernel is booted.');
         }
 
         return $this->menus[$name];

From b910e765ddf22b599fdd2f8b9831328fc9f4fa01 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 22 Feb 2024 16:17:39 +0100
Subject: [PATCH 0579/1422] Revert "Throw when trying to get uninitialized menu
 before boot"

This reverts commit e4957b863746b631c671d6b149767f62aa94fbb3.
---
 .../src/Framework/Features/Navigation/NavigationManager.php  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationManager.php b/packages/framework/src/Framework/Features/Navigation/NavigationManager.php
index 624953fb886..9313fb65bd0 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationManager.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationManager.php
@@ -33,8 +33,9 @@ public function registerMenu(string $name, NavigationMenu $menu): void
      */
     public function getMenu(string $name): NavigationMenu
     {
-        if (! Hyde::isBooted() && ! isset($this->menus[$name])) {
-            throw new \Exception('Cannot get navigation menu before the Hyde Kernel is booted.');
+        if (! Hyde::isBooted()) {
+            // Todo: This could be an anti-pattern so we may consider throwing an exception instead.
+            Hyde::boot();
         }
 
         return $this->menus[$name];

From d6e5e3e56fb4a8e11136bc6e3e2635c9f50fd1ae Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 22 Feb 2024 16:19:21 +0100
Subject: [PATCH 0580/1422] Bind menus directly into the service container

---
 .../Foundation/Providers/NavigationServiceProvider.php    | 8 ++++++++
 .../framework/tests/Feature/NavigationManagerTest.php     | 8 ++++----
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php b/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php
index 857588c3dd3..0ab3d60dc35 100644
--- a/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php
+++ b/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php
@@ -22,6 +22,14 @@ public function register(): void
         $this->app->alias(NavigationManager::class, 'navigation');
 
         $this->app->make(HydeKernel::class)->booted(function () {
+            $this->app->singleton(MainNavigationMenu::class, function () {
+                return NavigationMenuGenerator::handle(MainNavigationMenu::class);
+            });
+
+            $this->app->singleton(DocumentationSidebar::class, function () {
+                return NavigationMenuGenerator::handle(DocumentationSidebar::class);
+            });
+
             $this->app->make(NavigationManager::class)->registerMenu('main', NavigationMenuGenerator::handle(MainNavigationMenu::class));
             $this->app->make(NavigationManager::class)->registerMenu('sidebar', NavigationMenuGenerator::handle(DocumentationSidebar::class));
         });
diff --git a/packages/framework/tests/Feature/NavigationManagerTest.php b/packages/framework/tests/Feature/NavigationManagerTest.php
index b39e299f039..573d2c64fa1 100644
--- a/packages/framework/tests/Feature/NavigationManagerTest.php
+++ b/packages/framework/tests/Feature/NavigationManagerTest.php
@@ -55,21 +55,21 @@ public function testGetMenuThrowsExceptionForNonExistentMenu()
 
     public function testCanGetMainNavigationMenuFromContainer()
     {
-        $this->assertInstanceOf(MainNavigationMenu::class, app('navigation')->getMenu('main'));
+        $this->assertInstanceOf(MainNavigationMenu::class, app(MainNavigationMenu::class));
     }
 
     public function testCanGetDocumentationSidebarFromContainer()
     {
-        $this->assertInstanceOf(DocumentationSidebar::class, app('navigation')->getMenu('sidebar'));
+        $this->assertInstanceOf(DocumentationSidebar::class, app(DocumentationSidebar::class));
     }
 
     public function testCanGetMainNavigationMenuFromContainerUsingShorthand()
     {
-        $this->assertSame(MainNavigationMenu::get(), app('navigation')->getMenu('main'));
+        $this->assertSame(MainNavigationMenu::get(), app(MainNavigationMenu::class));
     }
 
     public function testCanGetDocumentationSidebarFromContainerUsingShorthand()
     {
-        $this->assertSame(DocumentationSidebar::get(), app('navigation')->getMenu('sidebar'));
+        $this->assertSame(DocumentationSidebar::get(), app(DocumentationSidebar::class));
     }
 }

From 91f8ce931a3452475efdb2ad345ff76646524101 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 22 Feb 2024 16:27:13 +0100
Subject: [PATCH 0581/1422] Add initial null menu bindings

---
 .../src/Foundation/Providers/NavigationServiceProvider.php    | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php b/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php
index 0ab3d60dc35..216dd7cb92d 100644
--- a/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php
+++ b/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php
@@ -21,6 +21,10 @@ public function register(): void
 
         $this->app->alias(NavigationManager::class, 'navigation');
 
+        // Initially bind these to null, so that the container doesn't try to return them before the kernel has booted.
+        $this->app->singleton(MainNavigationMenu::class, fn () => null);
+        $this->app->singleton(DocumentationSidebar::class, fn () => null);
+
         $this->app->make(HydeKernel::class)->booted(function () {
             $this->app->singleton(MainNavigationMenu::class, function () {
                 return NavigationMenuGenerator::handle(MainNavigationMenu::class);

From 02296abad22c96e4763cfb3b90a128bcb8176430 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 22 Feb 2024 16:28:00 +0100
Subject: [PATCH 0582/1422] Boot the kernel for each test

---
 .../framework/tests/Feature/NavigationManagerTest.php    | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/packages/framework/tests/Feature/NavigationManagerTest.php b/packages/framework/tests/Feature/NavigationManagerTest.php
index 573d2c64fa1..0954a35a12e 100644
--- a/packages/framework/tests/Feature/NavigationManagerTest.php
+++ b/packages/framework/tests/Feature/NavigationManagerTest.php
@@ -4,6 +4,7 @@
 
 namespace Hyde\Framework\Testing\Feature;
 
+use Hyde\Hyde;
 use Hyde\Framework\Features\Navigation\NavigationManager;
 use Hyde\Framework\Features\Navigation\MainNavigationMenu;
 use Hyde\Framework\Features\Navigation\DocumentationSidebar;
@@ -55,21 +56,29 @@ public function testGetMenuThrowsExceptionForNonExistentMenu()
 
     public function testCanGetMainNavigationMenuFromContainer()
     {
+        Hyde::boot();
+
         $this->assertInstanceOf(MainNavigationMenu::class, app(MainNavigationMenu::class));
     }
 
     public function testCanGetDocumentationSidebarFromContainer()
     {
+        Hyde::boot();
+
         $this->assertInstanceOf(DocumentationSidebar::class, app(DocumentationSidebar::class));
     }
 
     public function testCanGetMainNavigationMenuFromContainerUsingShorthand()
     {
+        Hyde::boot();
+
         $this->assertSame(MainNavigationMenu::get(), app(MainNavigationMenu::class));
     }
 
     public function testCanGetDocumentationSidebarFromContainerUsingShorthand()
     {
+        Hyde::boot();
+
         $this->assertSame(DocumentationSidebar::get(), app(DocumentationSidebar::class));
     }
 }

From 643eadf690feadcd120e8e44c2c312ce191ac500 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 22 Feb 2024 16:28:49 +0100
Subject: [PATCH 0583/1422] Test container menus are null before kernel is
 booted

---
 packages/framework/tests/Feature/NavigationManagerTest.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/packages/framework/tests/Feature/NavigationManagerTest.php b/packages/framework/tests/Feature/NavigationManagerTest.php
index 0954a35a12e..e1ae84fe154 100644
--- a/packages/framework/tests/Feature/NavigationManagerTest.php
+++ b/packages/framework/tests/Feature/NavigationManagerTest.php
@@ -54,6 +54,12 @@ public function testGetMenuThrowsExceptionForNonExistentMenu()
         $manager->getMenu('foo');
     }
 
+    public function testContainerMenusAreNullBeforeKernelIsBooted()
+    {
+        $this->assertNull(app(MainNavigationMenu::class));
+        $this->assertNull(app(DocumentationSidebar::class));
+    }
+
     public function testCanGetMainNavigationMenuFromContainer()
     {
         Hyde::boot();

From c9414b5dcbe6acf96852146df61e3b3b657b7e46 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 22 Feb 2024 16:29:29 +0100
Subject: [PATCH 0584/1422] Get direct instance from container

---
 .../src/Framework/Features/Navigation/DocumentationSidebar.php  | 2 +-
 .../src/Framework/Features/Navigation/MainNavigationMenu.php    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index e8aeec5cab6..ace9b349e71 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -14,7 +14,7 @@ class DocumentationSidebar extends NavigationMenu
 {
     public static function get(): static
     {
-        return app('navigation')->getMenu('sidebar');
+        return app(static::class);
     }
 
     public function hasGroups(): bool
diff --git a/packages/framework/src/Framework/Features/Navigation/MainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/MainNavigationMenu.php
index b94dc0778ab..b63f85e7720 100644
--- a/packages/framework/src/Framework/Features/Navigation/MainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/MainNavigationMenu.php
@@ -10,6 +10,6 @@ class MainNavigationMenu extends NavigationMenu
 {
     public static function get(): static
     {
-        return app('navigation')->getMenu('main');
+        return app(static::class);
     }
 }

From 4349a4618eb76da137f7fd959ee0f65bfb41204f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 22 Feb 2024 16:31:08 +0100
Subject: [PATCH 0585/1422] Remove now unnecessary method overrides

---
 .../Framework/Features/Navigation/DocumentationSidebar.php | 7 -------
 .../Framework/Features/Navigation/MainNavigationMenu.php   | 7 +------
 2 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index ace9b349e71..3928e2847f6 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -8,15 +8,8 @@
 use Hyde\Support\Facades\Render;
 use Illuminate\Support\Str;
 
-use function app;
-
 class DocumentationSidebar extends NavigationMenu
 {
-    public static function get(): static
-    {
-        return app(static::class);
-    }
-
     public function hasGroups(): bool
     {
         return $this->getItems()->contains(fn (NavItem $item): bool => $item->hasChildren());
diff --git a/packages/framework/src/Framework/Features/Navigation/MainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/MainNavigationMenu.php
index b63f85e7720..96b228fa967 100644
--- a/packages/framework/src/Framework/Features/Navigation/MainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/MainNavigationMenu.php
@@ -4,12 +4,7 @@
 
 namespace Hyde\Framework\Features\Navigation;
 
-use function app;
-
 class MainNavigationMenu extends NavigationMenu
 {
-    public static function get(): static
-    {
-        return app(static::class);
-    }
+    //
 }

From 544fdfd051e65c70bf89918e242c7be112872f2c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 22 Feb 2024 16:32:57 +0100
Subject: [PATCH 0586/1422] Revert "Remove now unnecessary method overrides"

This reverts commit 4349a4618eb76da137f7fd959ee0f65bfb41204f.
---
 .../Framework/Features/Navigation/DocumentationSidebar.php | 7 +++++++
 .../Framework/Features/Navigation/MainNavigationMenu.php   | 7 ++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 3928e2847f6..ace9b349e71 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -8,8 +8,15 @@
 use Hyde\Support\Facades\Render;
 use Illuminate\Support\Str;
 
+use function app;
+
 class DocumentationSidebar extends NavigationMenu
 {
+    public static function get(): static
+    {
+        return app(static::class);
+    }
+
     public function hasGroups(): bool
     {
         return $this->getItems()->contains(fn (NavItem $item): bool => $item->hasChildren());
diff --git a/packages/framework/src/Framework/Features/Navigation/MainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/MainNavigationMenu.php
index 96b228fa967..b63f85e7720 100644
--- a/packages/framework/src/Framework/Features/Navigation/MainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/MainNavigationMenu.php
@@ -4,7 +4,12 @@
 
 namespace Hyde\Framework\Features\Navigation;
 
+use function app;
+
 class MainNavigationMenu extends NavigationMenu
 {
-    //
+    public static function get(): static
+    {
+        return app(static::class);
+    }
 }

From 96756656eb06469edbbe96b39ac71c803bb0ebf6 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 22 Feb 2024 16:33:37 +0100
Subject: [PATCH 0587/1422] Move shared method to parent class

---
 .../Framework/Features/Navigation/DocumentationSidebar.php | 7 -------
 .../Framework/Features/Navigation/MainNavigationMenu.php   | 7 +------
 .../src/Framework/Features/Navigation/NavigationMenu.php   | 5 +++++
 3 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index ace9b349e71..3928e2847f6 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -8,15 +8,8 @@
 use Hyde\Support\Facades\Render;
 use Illuminate\Support\Str;
 
-use function app;
-
 class DocumentationSidebar extends NavigationMenu
 {
-    public static function get(): static
-    {
-        return app(static::class);
-    }
-
     public function hasGroups(): bool
     {
         return $this->getItems()->contains(fn (NavItem $item): bool => $item->hasChildren());
diff --git a/packages/framework/src/Framework/Features/Navigation/MainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/MainNavigationMenu.php
index b63f85e7720..96b228fa967 100644
--- a/packages/framework/src/Framework/Features/Navigation/MainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/MainNavigationMenu.php
@@ -4,12 +4,7 @@
 
 namespace Hyde\Framework\Features\Navigation;
 
-use function app;
-
 class MainNavigationMenu extends NavigationMenu
 {
-    public static function get(): static
-    {
-        return app(static::class);
-    }
+    //
 }
diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
index 986dd7076be..66434248648 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
@@ -17,6 +17,11 @@
  */
 abstract class NavigationMenu
 {
+    public static function get(): static
+    {
+        return app(static::class);
+    }
+
     /** @var \Illuminate\Support\Collection<\Hyde\Framework\Features\Navigation\NavItem> */
     protected Collection $items;
 

From 596ca0b60715130756dd60fc93b22b82d7b3b956 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 22 Feb 2024 16:36:33 +0100
Subject: [PATCH 0588/1422] Add menu aliases

---
 .../Providers/NavigationServiceProvider.php   |  3 +++
 .../tests/Feature/NavigationManagerTest.php   | 23 +++++++++++++++++++
 2 files changed, 26 insertions(+)

diff --git a/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php b/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php
index 216dd7cb92d..5b5beae1ac0 100644
--- a/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php
+++ b/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php
@@ -34,6 +34,9 @@ public function register(): void
                 return NavigationMenuGenerator::handle(DocumentationSidebar::class);
             });
 
+            $this->app->alias(MainNavigationMenu::class, 'navigation.main');
+            $this->app->alias(DocumentationSidebar::class, 'navigation.sidebar');
+
             $this->app->make(NavigationManager::class)->registerMenu('main', NavigationMenuGenerator::handle(MainNavigationMenu::class));
             $this->app->make(NavigationManager::class)->registerMenu('sidebar', NavigationMenuGenerator::handle(DocumentationSidebar::class));
         });
diff --git a/packages/framework/tests/Feature/NavigationManagerTest.php b/packages/framework/tests/Feature/NavigationManagerTest.php
index e1ae84fe154..b7a57cbedaf 100644
--- a/packages/framework/tests/Feature/NavigationManagerTest.php
+++ b/packages/framework/tests/Feature/NavigationManagerTest.php
@@ -9,6 +9,7 @@
 use Hyde\Framework\Features\Navigation\MainNavigationMenu;
 use Hyde\Framework\Features\Navigation\DocumentationSidebar;
 use Hyde\Testing\TestCase;
+use Illuminate\Contracts\Container\BindingResolutionException;
 
 /**
  * @covers \Hyde\Framework\Features\Navigation\NavigationMenu
@@ -60,6 +61,14 @@ public function testContainerMenusAreNullBeforeKernelIsBooted()
         $this->assertNull(app(DocumentationSidebar::class));
     }
 
+    public function testCannotGetContainerMenusByAliasBeforeKernelIsBooted()
+    {
+        $this->expectException(BindingResolutionException::class);
+
+        $this->assertNull(app('navigation.main'));
+        $this->assertNull(app('navigation.sidebar'));
+    }
+
     public function testCanGetMainNavigationMenuFromContainer()
     {
         Hyde::boot();
@@ -87,4 +96,18 @@ public function testCanGetDocumentationSidebarFromContainerUsingShorthand()
 
         $this->assertSame(DocumentationSidebar::get(), app(DocumentationSidebar::class));
     }
+
+    public function testCanGetMainNavigationMenuFromContainerUsingAlias()
+    {
+        Hyde::boot();
+
+        $this->assertSame(app(MainNavigationMenu::class), app('navigation.main'));
+    }
+
+    public function testCanGetDocumentationSidebarFromContainerUsingAlias()
+    {
+        Hyde::boot();
+
+        $this->assertSame(app(DocumentationSidebar::class), app('navigation.sidebar'));
+    }
 }

From a60def55317cb595400ecedbef43fa8029a4a30a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 22 Feb 2024 16:37:57 +0100
Subject: [PATCH 0589/1422] Use the new container aliases to get menus

---
 .../resources/views/components/docs/sidebar.blade.php         | 2 +-
 .../framework/resources/views/layouts/navigation.blade.php    | 2 +-
 .../src/Framework/Features/Navigation/NavigationMenu.php      | 4 ++--
 packages/framework/tests/Feature/NavigationMenuTest.php       | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/framework/resources/views/components/docs/sidebar.blade.php b/packages/framework/resources/views/components/docs/sidebar.blade.php
index f4f3d9c2cb3..9cd5dad15c4 100644
--- a/packages/framework/resources/views/components/docs/sidebar.blade.php
+++ b/packages/framework/resources/views/components/docs/sidebar.blade.php
@@ -4,7 +4,7 @@
     </header>
     <nav id="sidebar-navigation" class="p-2 overflow-y-auto border-y border-gray-300 dark:border-[#1b2533] h-full">
         @include('hyde::components.docs.sidebar-items', [
-            'sidebar' => app('navigation')->getMenu('sidebar'),
+            'sidebar' => app('navigation.sidebar'),
         ])
     </nav>
     @if(config('docs.sidebar.footer', true) !== false)
diff --git a/packages/framework/resources/views/layouts/navigation.blade.php b/packages/framework/resources/views/layouts/navigation.blade.php
index d7f8edcde5b..a2d05aeb00b 100644
--- a/packages/framework/resources/views/layouts/navigation.blade.php
+++ b/packages/framework/resources/views/layouts/navigation.blade.php
@@ -1,5 +1,5 @@
 @php
-    $navigation = app('navigation')->getMenu('main');
+    $navigation = app('navigation.main');
 @endphp
 
 <nav aria-label="Main navigation" id="main-navigation" class="flex flex-wrap items-center justify-between p-4 shadow-lg sm:shadow-xl md:shadow-none dark:bg-gray-800">
diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
index 66434248648..892aaf909f7 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
@@ -12,8 +12,8 @@
  *
  * The automatic navigation menus are stored within the service container and can be resolved by their identifiers.
  *
- * @example `$menu = app('navigation')->getMenu('main');` for the main navigation menu.
- * @example `$menu = app('navigation')->getMenu('sidebar');` for the documentation sidebar.
+ * @example `$menu = app('navigation.main');` for the main navigation menu.
+ * @example `$menu = app('navigation.sidebar');` for the documentation sidebar.
  */
 abstract class NavigationMenu
 {
diff --git a/packages/framework/tests/Feature/NavigationMenuTest.php b/packages/framework/tests/Feature/NavigationMenuTest.php
index a4ba8a92ce8..62cf68d6aa2 100644
--- a/packages/framework/tests/Feature/NavigationMenuTest.php
+++ b/packages/framework/tests/Feature/NavigationMenuTest.php
@@ -258,12 +258,12 @@ public function testPagesInDropdownsDoNotGetAddedToTheMainNavigation()
 
     public function testCanGetMenuFromServiceContainer()
     {
-        $this->assertEquals($this->createNavigationMenu(), app('navigation')->getMenu('main'));
+        $this->assertEquals($this->createNavigationMenu(), app('navigation.main'));
     }
 
     public function testCanAddItemsToMainNavigationMenuResolvedFromContainer()
     {
-        $navigation = app('navigation')->getMenu('main');
+        $navigation = app('navigation.main');
         $navigation->add(new NavItem(new ExternalRoute('/foo'), 'Foo'));
 
         $this->assertCount(2, $navigation->getItems());

From 5f9a8fcf3e1df1595c228ca84d636ae9e222661b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 22 Feb 2024 16:41:44 +0100
Subject: [PATCH 0590/1422] Boot kernel for unit test

---
 packages/framework/tests/Unit/Views/NavigationMenuViewTest.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/tests/Unit/Views/NavigationMenuViewTest.php b/packages/framework/tests/Unit/Views/NavigationMenuViewTest.php
index be7fe698976..0d9145a99de 100644
--- a/packages/framework/tests/Unit/Views/NavigationMenuViewTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationMenuViewTest.php
@@ -18,6 +18,8 @@ protected function setUp(): void
         parent::setUp();
         $this->mockRoute();
         $this->mockPage();
+
+        Hyde::boot();
     }
 
     protected function render(): string

From 75942a0a88a6553c7e53cac02f4fd6fa2b86ba28 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 22 Feb 2024 16:42:14 +0100
Subject: [PATCH 0591/1422] Clarify code comment

---
 .../src/Foundation/Providers/NavigationServiceProvider.php      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php b/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php
index 5b5beae1ac0..81c13db5393 100644
--- a/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php
+++ b/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php
@@ -21,7 +21,7 @@ public function register(): void
 
         $this->app->alias(NavigationManager::class, 'navigation');
 
-        // Initially bind these to null, so that the container doesn't try to return them before the kernel has booted.
+        // Initially bind these to null, so that the container doesn't try to return empty menus before the kernel has booted.
         $this->app->singleton(MainNavigationMenu::class, fn () => null);
         $this->app->singleton(DocumentationSidebar::class, fn () => null);
 

From 06f0db4ce406950d3abebe03f6c423000aa94807 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 22 Feb 2024 16:43:45 +0100
Subject: [PATCH 0592/1422] Boot kernel for test

---
 packages/framework/tests/Feature/NavigationMenuTest.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/framework/tests/Feature/NavigationMenuTest.php b/packages/framework/tests/Feature/NavigationMenuTest.php
index 62cf68d6aa2..0666afeb8b8 100644
--- a/packages/framework/tests/Feature/NavigationMenuTest.php
+++ b/packages/framework/tests/Feature/NavigationMenuTest.php
@@ -4,6 +4,7 @@
 
 namespace Hyde\Framework\Testing\Feature;
 
+use Hyde\Hyde;
 use Hyde\Support\Models\Route;
 use Hyde\Foundation\Facades\Routes;
 use Hyde\Support\Models\ExternalRoute;
@@ -263,6 +264,8 @@ public function testCanGetMenuFromServiceContainer()
 
     public function testCanAddItemsToMainNavigationMenuResolvedFromContainer()
     {
+        Hyde::boot();
+
         $navigation = app('navigation.main');
         $navigation->add(new NavItem(new ExternalRoute('/foo'), 'Foo'));
 

From fb7a8d56464cc770140409d761b77185d305dd41 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 22 Feb 2024 16:56:59 +0100
Subject: [PATCH 0593/1422] Extract fluent testing helper

---
 .../tests/Feature/NavigationManagerTest.php   | 27 ++++++++-----------
 1 file changed, 11 insertions(+), 16 deletions(-)

diff --git a/packages/framework/tests/Feature/NavigationManagerTest.php b/packages/framework/tests/Feature/NavigationManagerTest.php
index b7a57cbedaf..eedafee570d 100644
--- a/packages/framework/tests/Feature/NavigationManagerTest.php
+++ b/packages/framework/tests/Feature/NavigationManagerTest.php
@@ -71,43 +71,38 @@ public function testCannotGetContainerMenusByAliasBeforeKernelIsBooted()
 
     public function testCanGetMainNavigationMenuFromContainer()
     {
-        Hyde::boot();
-
-        $this->assertInstanceOf(MainNavigationMenu::class, app(MainNavigationMenu::class));
+        $this->booted()->assertInstanceOf(MainNavigationMenu::class, app(MainNavigationMenu::class));
     }
 
     public function testCanGetDocumentationSidebarFromContainer()
     {
-        Hyde::boot();
-
-        $this->assertInstanceOf(DocumentationSidebar::class, app(DocumentationSidebar::class));
+        $this->booted()->assertInstanceOf(DocumentationSidebar::class, app(DocumentationSidebar::class));
     }
 
     public function testCanGetMainNavigationMenuFromContainerUsingShorthand()
     {
-        Hyde::boot();
-
-        $this->assertSame(MainNavigationMenu::get(), app(MainNavigationMenu::class));
+        $this->booted()->assertSame(MainNavigationMenu::get(), app(MainNavigationMenu::class));
     }
 
     public function testCanGetDocumentationSidebarFromContainerUsingShorthand()
     {
-        Hyde::boot();
-
-        $this->assertSame(DocumentationSidebar::get(), app(DocumentationSidebar::class));
+        $this->booted()->assertSame(DocumentationSidebar::get(), app(DocumentationSidebar::class));
     }
 
     public function testCanGetMainNavigationMenuFromContainerUsingAlias()
     {
-        Hyde::boot();
-
-        $this->assertSame(app(MainNavigationMenu::class), app('navigation.main'));
+        $this->booted()->assertSame(app(MainNavigationMenu::class), app('navigation.main'));
     }
 
     public function testCanGetDocumentationSidebarFromContainerUsingAlias()
+    {
+        $this->booted()->assertSame(app(DocumentationSidebar::class), app('navigation.sidebar'));
+    }
+
+    protected function booted(): self
     {
         Hyde::boot();
 
-        $this->assertSame(app(DocumentationSidebar::class), app('navigation.sidebar'));
+        return $this;
     }
 }

From d8192cdeb1ecfa7b05d656ee1c58859289525867 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 22 Feb 2024 16:57:02 +0100
Subject: [PATCH 0594/1422] Lazy boot menus

Revert "Extract fluent testing helper"

This reverts commit 1a8112ec68000253509b4099857ac58ecc3d2fa9.

Revert "Boot kernel for test"

This reverts commit 06f0db4ce406950d3abebe03f6c423000aa94807.

Revert "Boot kernel for unit test"

This reverts commit 5f9a8fcf3e1df1595c228ca84d636ae9e222661b.

Revert "Boot the kernel for each test"

This reverts commit 02296abad22c96e4763cfb3b90a128bcb8176430.
---
 .../Features/Navigation/NavigationMenu.php    |  5 +++++
 .../tests/Feature/NavigationManagerTest.php   | 20 ++++++-------------
 .../tests/Feature/NavigationMenuTest.php      |  3 ---
 .../Unit/Views/NavigationMenuViewTest.php     |  2 --
 4 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
index 892aaf909f7..5704a5e8a3a 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
@@ -4,6 +4,7 @@
 
 namespace Hyde\Framework\Features\Navigation;
 
+use Hyde\Hyde;
 use Illuminate\Support\Collection;
 use Illuminate\Contracts\Support\Arrayable;
 
@@ -19,6 +20,10 @@ abstract class NavigationMenu
 {
     public static function get(): static
     {
+        if (! Hyde::isBooted()) {
+            Hyde::boot();
+        }
+
         return app(static::class);
     }
 
diff --git a/packages/framework/tests/Feature/NavigationManagerTest.php b/packages/framework/tests/Feature/NavigationManagerTest.php
index eedafee570d..3a702824fb6 100644
--- a/packages/framework/tests/Feature/NavigationManagerTest.php
+++ b/packages/framework/tests/Feature/NavigationManagerTest.php
@@ -4,7 +4,6 @@
 
 namespace Hyde\Framework\Testing\Feature;
 
-use Hyde\Hyde;
 use Hyde\Framework\Features\Navigation\NavigationManager;
 use Hyde\Framework\Features\Navigation\MainNavigationMenu;
 use Hyde\Framework\Features\Navigation\DocumentationSidebar;
@@ -71,38 +70,31 @@ public function testCannotGetContainerMenusByAliasBeforeKernelIsBooted()
 
     public function testCanGetMainNavigationMenuFromContainer()
     {
-        $this->booted()->assertInstanceOf(MainNavigationMenu::class, app(MainNavigationMenu::class));
+        $this->assertInstanceOf(MainNavigationMenu::class, app(MainNavigationMenu::class));
     }
 
     public function testCanGetDocumentationSidebarFromContainer()
     {
-        $this->booted()->assertInstanceOf(DocumentationSidebar::class, app(DocumentationSidebar::class));
+        $this->assertInstanceOf(DocumentationSidebar::class, app(DocumentationSidebar::class));
     }
 
     public function testCanGetMainNavigationMenuFromContainerUsingShorthand()
     {
-        $this->booted()->assertSame(MainNavigationMenu::get(), app(MainNavigationMenu::class));
+        $this->assertSame(MainNavigationMenu::get(), app(MainNavigationMenu::class));
     }
 
     public function testCanGetDocumentationSidebarFromContainerUsingShorthand()
     {
-        $this->booted()->assertSame(DocumentationSidebar::get(), app(DocumentationSidebar::class));
+        $this->assertSame(DocumentationSidebar::get(), app(DocumentationSidebar::class));
     }
 
     public function testCanGetMainNavigationMenuFromContainerUsingAlias()
     {
-        $this->booted()->assertSame(app(MainNavigationMenu::class), app('navigation.main'));
+        $this->assertSame(app(MainNavigationMenu::class), app('navigation.main'));
     }
 
     public function testCanGetDocumentationSidebarFromContainerUsingAlias()
     {
-        $this->booted()->assertSame(app(DocumentationSidebar::class), app('navigation.sidebar'));
-    }
-
-    protected function booted(): self
-    {
-        Hyde::boot();
-
-        return $this;
+        $this->assertSame(app(DocumentationSidebar::class), app('navigation.sidebar'));
     }
 }
diff --git a/packages/framework/tests/Feature/NavigationMenuTest.php b/packages/framework/tests/Feature/NavigationMenuTest.php
index 0666afeb8b8..62cf68d6aa2 100644
--- a/packages/framework/tests/Feature/NavigationMenuTest.php
+++ b/packages/framework/tests/Feature/NavigationMenuTest.php
@@ -4,7 +4,6 @@
 
 namespace Hyde\Framework\Testing\Feature;
 
-use Hyde\Hyde;
 use Hyde\Support\Models\Route;
 use Hyde\Foundation\Facades\Routes;
 use Hyde\Support\Models\ExternalRoute;
@@ -264,8 +263,6 @@ public function testCanGetMenuFromServiceContainer()
 
     public function testCanAddItemsToMainNavigationMenuResolvedFromContainer()
     {
-        Hyde::boot();
-
         $navigation = app('navigation.main');
         $navigation->add(new NavItem(new ExternalRoute('/foo'), 'Foo'));
 
diff --git a/packages/framework/tests/Unit/Views/NavigationMenuViewTest.php b/packages/framework/tests/Unit/Views/NavigationMenuViewTest.php
index 0d9145a99de..be7fe698976 100644
--- a/packages/framework/tests/Unit/Views/NavigationMenuViewTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationMenuViewTest.php
@@ -18,8 +18,6 @@ protected function setUp(): void
         parent::setUp();
         $this->mockRoute();
         $this->mockPage();
-
-        Hyde::boot();
     }
 
     protected function render(): string

From ff17137e710c055db60781be35b452a434ceee81 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 22 Feb 2024 17:05:11 +0100
Subject: [PATCH 0595/1422] Revert "Lazy boot menus"

This reverts commit a74659788806a4e42d9d072fca66defcb2a96f67.
---
 .../Features/Navigation/NavigationMenu.php    |  5 -----
 .../tests/Feature/NavigationManagerTest.php   | 20 +++++++++++++------
 .../tests/Feature/NavigationMenuTest.php      |  3 +++
 .../Unit/Views/NavigationMenuViewTest.php     |  2 ++
 4 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
index 5704a5e8a3a..892aaf909f7 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
@@ -4,7 +4,6 @@
 
 namespace Hyde\Framework\Features\Navigation;
 
-use Hyde\Hyde;
 use Illuminate\Support\Collection;
 use Illuminate\Contracts\Support\Arrayable;
 
@@ -20,10 +19,6 @@ abstract class NavigationMenu
 {
     public static function get(): static
     {
-        if (! Hyde::isBooted()) {
-            Hyde::boot();
-        }
-
         return app(static::class);
     }
 
diff --git a/packages/framework/tests/Feature/NavigationManagerTest.php b/packages/framework/tests/Feature/NavigationManagerTest.php
index 3a702824fb6..eedafee570d 100644
--- a/packages/framework/tests/Feature/NavigationManagerTest.php
+++ b/packages/framework/tests/Feature/NavigationManagerTest.php
@@ -4,6 +4,7 @@
 
 namespace Hyde\Framework\Testing\Feature;
 
+use Hyde\Hyde;
 use Hyde\Framework\Features\Navigation\NavigationManager;
 use Hyde\Framework\Features\Navigation\MainNavigationMenu;
 use Hyde\Framework\Features\Navigation\DocumentationSidebar;
@@ -70,31 +71,38 @@ public function testCannotGetContainerMenusByAliasBeforeKernelIsBooted()
 
     public function testCanGetMainNavigationMenuFromContainer()
     {
-        $this->assertInstanceOf(MainNavigationMenu::class, app(MainNavigationMenu::class));
+        $this->booted()->assertInstanceOf(MainNavigationMenu::class, app(MainNavigationMenu::class));
     }
 
     public function testCanGetDocumentationSidebarFromContainer()
     {
-        $this->assertInstanceOf(DocumentationSidebar::class, app(DocumentationSidebar::class));
+        $this->booted()->assertInstanceOf(DocumentationSidebar::class, app(DocumentationSidebar::class));
     }
 
     public function testCanGetMainNavigationMenuFromContainerUsingShorthand()
     {
-        $this->assertSame(MainNavigationMenu::get(), app(MainNavigationMenu::class));
+        $this->booted()->assertSame(MainNavigationMenu::get(), app(MainNavigationMenu::class));
     }
 
     public function testCanGetDocumentationSidebarFromContainerUsingShorthand()
     {
-        $this->assertSame(DocumentationSidebar::get(), app(DocumentationSidebar::class));
+        $this->booted()->assertSame(DocumentationSidebar::get(), app(DocumentationSidebar::class));
     }
 
     public function testCanGetMainNavigationMenuFromContainerUsingAlias()
     {
-        $this->assertSame(app(MainNavigationMenu::class), app('navigation.main'));
+        $this->booted()->assertSame(app(MainNavigationMenu::class), app('navigation.main'));
     }
 
     public function testCanGetDocumentationSidebarFromContainerUsingAlias()
     {
-        $this->assertSame(app(DocumentationSidebar::class), app('navigation.sidebar'));
+        $this->booted()->assertSame(app(DocumentationSidebar::class), app('navigation.sidebar'));
+    }
+
+    protected function booted(): self
+    {
+        Hyde::boot();
+
+        return $this;
     }
 }
diff --git a/packages/framework/tests/Feature/NavigationMenuTest.php b/packages/framework/tests/Feature/NavigationMenuTest.php
index 62cf68d6aa2..0666afeb8b8 100644
--- a/packages/framework/tests/Feature/NavigationMenuTest.php
+++ b/packages/framework/tests/Feature/NavigationMenuTest.php
@@ -4,6 +4,7 @@
 
 namespace Hyde\Framework\Testing\Feature;
 
+use Hyde\Hyde;
 use Hyde\Support\Models\Route;
 use Hyde\Foundation\Facades\Routes;
 use Hyde\Support\Models\ExternalRoute;
@@ -263,6 +264,8 @@ public function testCanGetMenuFromServiceContainer()
 
     public function testCanAddItemsToMainNavigationMenuResolvedFromContainer()
     {
+        Hyde::boot();
+
         $navigation = app('navigation.main');
         $navigation->add(new NavItem(new ExternalRoute('/foo'), 'Foo'));
 
diff --git a/packages/framework/tests/Unit/Views/NavigationMenuViewTest.php b/packages/framework/tests/Unit/Views/NavigationMenuViewTest.php
index be7fe698976..0d9145a99de 100644
--- a/packages/framework/tests/Unit/Views/NavigationMenuViewTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationMenuViewTest.php
@@ -18,6 +18,8 @@ protected function setUp(): void
         parent::setUp();
         $this->mockRoute();
         $this->mockPage();
+
+        Hyde::boot();
     }
 
     protected function render(): string

From dee5a44a6bfaef9c5291c3f63f7ec173ef64bdf3 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 22 Feb 2024 17:08:10 +0100
Subject: [PATCH 0596/1422] Boot the kernel

---
 packages/framework/tests/Feature/DarkmodeFeatureTest.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/framework/tests/Feature/DarkmodeFeatureTest.php b/packages/framework/tests/Feature/DarkmodeFeatureTest.php
index a1d710d25bd..bd5168d390e 100644
--- a/packages/framework/tests/Feature/DarkmodeFeatureTest.php
+++ b/packages/framework/tests/Feature/DarkmodeFeatureTest.php
@@ -4,6 +4,7 @@
 
 namespace Hyde\Framework\Testing\Feature;
 
+use Hyde\Hyde;
 use Hyde\Facades\Features;
 use Hyde\Pages\DocumentationPage;
 use Hyde\Testing\TestCase;
@@ -38,6 +39,8 @@ public function testHasDarkmode()
 
     public function testLayoutHasToggleButtonAndScriptWhenEnabled()
     {
+        Hyde::boot();
+
         Config::set('hyde.features', [
             Features::markdownPages(),
             Features::bladePages(),
@@ -75,6 +78,8 @@ public function testDocumentationPageHasToggleButtonAndScriptWhenEnabled()
 
     public function testDarkModeThemeButtonIsHiddenInLayoutsWhenDisabled()
     {
+        Hyde::boot();
+
         Config::set('hyde.features', [
             Features::markdownPages(),
             Features::bladePages(),

From fce0950092d61836eab7f94ad4ca21a81976d913 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 22 Feb 2024 17:57:19 +0100
Subject: [PATCH 0597/1422] Add method description

---
 .../src/Framework/Features/Navigation/NavigationMenu.php       | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
index 892aaf909f7..25c7b092058 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
@@ -17,6 +17,9 @@
  */
 abstract class NavigationMenu
 {
+    /**
+     * Get the navigation menu instance from the service container.
+     */
     public static function get(): static
     {
         return app(static::class);

From a25423e19bf961491cdf0f1de49f2fab16bc283e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 22 Feb 2024 18:01:16 +0100
Subject: [PATCH 0598/1422] Remove menu manager binding from container

---
 .../Providers/NavigationServiceProvider.php      |  6 ------
 .../tests/Feature/HydeServiceProviderTest.php    | 16 ----------------
 2 files changed, 22 deletions(-)

diff --git a/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php b/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php
index 81c13db5393..948ecc47535 100644
--- a/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php
+++ b/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php
@@ -15,12 +15,6 @@ class NavigationServiceProvider extends ServiceProvider
 {
     public function register(): void
     {
-        $this->app->singleton(NavigationManager::class, function () {
-            return new NavigationManager();
-        });
-
-        $this->app->alias(NavigationManager::class, 'navigation');
-
         // Initially bind these to null, so that the container doesn't try to return empty menus before the kernel has booted.
         $this->app->singleton(MainNavigationMenu::class, fn () => null);
         $this->app->singleton(DocumentationSidebar::class, fn () => null);
diff --git a/packages/framework/tests/Feature/HydeServiceProviderTest.php b/packages/framework/tests/Feature/HydeServiceProviderTest.php
index 6ad340537de..83e437c4acc 100644
--- a/packages/framework/tests/Feature/HydeServiceProviderTest.php
+++ b/packages/framework/tests/Feature/HydeServiceProviderTest.php
@@ -4,8 +4,6 @@
 
 namespace Hyde\Framework\Testing\Feature;
 
-use Hyde\Framework\Features\Navigation\NavigationManager;
-
 use function app;
 use function array_map;
 use function basename;
@@ -329,18 +327,4 @@ public function testOutputDirectoriesCanBeSetUsingKebabCaseClassNames()
         $this->assertEquals('foo', MarkdownPost::outputDirectory());
         $this->assertEquals('foo', DocumentationPage::outputDirectory());
     }
-
-    public function testNavigationManagerIsRegisteredAsSingleton()
-    {
-        $this->assertTrue($this->app->bound(NavigationManager::class));
-        $this->assertInstanceOf(NavigationManager::class, $this->app->make(NavigationManager::class));
-        $this->assertSame($this->app->make(NavigationManager::class), $this->app->make(NavigationManager::class));
-    }
-
-    public function testProviderRegistersNavigationManagerAlias()
-    {
-        $this->assertTrue($this->app->bound('navigation'));
-        $this->assertInstanceOf(NavigationManager::class, $this->app->make('navigation'));
-        $this->assertSame($this->app->make(NavigationManager::class), $this->app->make('navigation'));
-    }
 }

From 6c8e1ac812ef3288cf77b4c2283b69834d2727fd Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 22 Feb 2024 18:01:51 +0100
Subject: [PATCH 0599/1422] Remove menu manager registrations

---
 .../src/Foundation/Providers/NavigationServiceProvider.php    | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php b/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php
index 948ecc47535..6d9937fdf59 100644
--- a/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php
+++ b/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php
@@ -7,7 +7,6 @@
 use Hyde\Foundation\HydeKernel;
 use Illuminate\Support\ServiceProvider;
 use Hyde\Framework\Features\Navigation\MainNavigationMenu;
-use Hyde\Framework\Features\Navigation\NavigationManager;
 use Hyde\Framework\Features\Navigation\DocumentationSidebar;
 use Hyde\Framework\Features\Navigation\NavigationMenuGenerator;
 
@@ -30,9 +29,6 @@ public function register(): void
 
             $this->app->alias(MainNavigationMenu::class, 'navigation.main');
             $this->app->alias(DocumentationSidebar::class, 'navigation.sidebar');
-
-            $this->app->make(NavigationManager::class)->registerMenu('main', NavigationMenuGenerator::handle(MainNavigationMenu::class));
-            $this->app->make(NavigationManager::class)->registerMenu('sidebar', NavigationMenuGenerator::handle(DocumentationSidebar::class));
         });
     }
 }

From aad20361384c1b50f44b384f2afa660d2f3c024d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 22 Feb 2024 18:04:22 +0100
Subject: [PATCH 0600/1422] Strictly type the closure returms

---
 .../src/Foundation/Providers/NavigationServiceProvider.php  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php b/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php
index 6d9937fdf59..f338c3caad9 100644
--- a/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php
+++ b/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php
@@ -18,12 +18,12 @@ public function register(): void
         $this->app->singleton(MainNavigationMenu::class, fn () => null);
         $this->app->singleton(DocumentationSidebar::class, fn () => null);
 
-        $this->app->make(HydeKernel::class)->booted(function () {
-            $this->app->singleton(MainNavigationMenu::class, function () {
+        $this->app->make(HydeKernel::class)->booted(function (): void {
+            $this->app->singleton(MainNavigationMenu::class, function (): MainNavigationMenu {
                 return NavigationMenuGenerator::handle(MainNavigationMenu::class);
             });
 
-            $this->app->singleton(DocumentationSidebar::class, function () {
+            $this->app->singleton(DocumentationSidebar::class, function (): DocumentationSidebar {
                 return NavigationMenuGenerator::handle(DocumentationSidebar::class);
             });
 

From 0a4e1c114e097ef12f31d03182e9d0dfb1ae8391 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 22 Feb 2024 18:09:19 +0100
Subject: [PATCH 0601/1422] Simplify container bindings

Being able to do app(MainNavigationMenu::class) instead of MainNavigationMenu::get() offers little value. It does have some benefit compared to using the aliases as the former can probably get better IDE support, but since the idea behind the alias is convenience I don't think it's worth it since the static method offers full type support. We also don't need the initial null bindings as the string versions throw an exception instead of trying to resolve the classes. It does mean the static get method breaks but that's fine as I will revert that next
---
 .../Providers/NavigationServiceProvider.php   | 11 ++------
 .../tests/Feature/NavigationManagerTest.php   | 26 ++++---------------
 2 files changed, 7 insertions(+), 30 deletions(-)

diff --git a/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php b/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php
index f338c3caad9..02af9f13ec1 100644
--- a/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php
+++ b/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php
@@ -14,21 +14,14 @@ class NavigationServiceProvider extends ServiceProvider
 {
     public function register(): void
     {
-        // Initially bind these to null, so that the container doesn't try to return empty menus before the kernel has booted.
-        $this->app->singleton(MainNavigationMenu::class, fn () => null);
-        $this->app->singleton(DocumentationSidebar::class, fn () => null);
-
         $this->app->make(HydeKernel::class)->booted(function (): void {
-            $this->app->singleton(MainNavigationMenu::class, function (): MainNavigationMenu {
+            $this->app->singleton('navigation.main', function (): MainNavigationMenu {
                 return NavigationMenuGenerator::handle(MainNavigationMenu::class);
             });
 
-            $this->app->singleton(DocumentationSidebar::class, function (): DocumentationSidebar {
+            $this->app->singleton('navigation.sidebar', function (): DocumentationSidebar {
                 return NavigationMenuGenerator::handle(DocumentationSidebar::class);
             });
-
-            $this->app->alias(MainNavigationMenu::class, 'navigation.main');
-            $this->app->alias(DocumentationSidebar::class, 'navigation.sidebar');
         });
     }
 }
diff --git a/packages/framework/tests/Feature/NavigationManagerTest.php b/packages/framework/tests/Feature/NavigationManagerTest.php
index eedafee570d..e46f88757b3 100644
--- a/packages/framework/tests/Feature/NavigationManagerTest.php
+++ b/packages/framework/tests/Feature/NavigationManagerTest.php
@@ -55,13 +55,7 @@ public function testGetMenuThrowsExceptionForNonExistentMenu()
         $manager->getMenu('foo');
     }
 
-    public function testContainerMenusAreNullBeforeKernelIsBooted()
-    {
-        $this->assertNull(app(MainNavigationMenu::class));
-        $this->assertNull(app(DocumentationSidebar::class));
-    }
-
-    public function testCannotGetContainerMenusByAliasBeforeKernelIsBooted()
+    public function testCannotGetContainerMenusBeforeKernelIsBooted()
     {
         $this->expectException(BindingResolutionException::class);
 
@@ -71,32 +65,22 @@ public function testCannotGetContainerMenusByAliasBeforeKernelIsBooted()
 
     public function testCanGetMainNavigationMenuFromContainer()
     {
-        $this->booted()->assertInstanceOf(MainNavigationMenu::class, app(MainNavigationMenu::class));
+        $this->booted()->assertInstanceOf(MainNavigationMenu::class, app('navigation.main'));
     }
 
     public function testCanGetDocumentationSidebarFromContainer()
     {
-        $this->booted()->assertInstanceOf(DocumentationSidebar::class, app(DocumentationSidebar::class));
+        $this->booted()->assertInstanceOf(DocumentationSidebar::class, app('navigation.sidebar'));
     }
 
     public function testCanGetMainNavigationMenuFromContainerUsingShorthand()
     {
-        $this->booted()->assertSame(MainNavigationMenu::get(), app(MainNavigationMenu::class));
+        $this->booted()->assertSame(MainNavigationMenu::get(), app('navigation.main'));
     }
 
     public function testCanGetDocumentationSidebarFromContainerUsingShorthand()
     {
-        $this->booted()->assertSame(DocumentationSidebar::get(), app(DocumentationSidebar::class));
-    }
-
-    public function testCanGetMainNavigationMenuFromContainerUsingAlias()
-    {
-        $this->booted()->assertSame(app(MainNavigationMenu::class), app('navigation.main'));
-    }
-
-    public function testCanGetDocumentationSidebarFromContainerUsingAlias()
-    {
-        $this->booted()->assertSame(app(DocumentationSidebar::class), app('navigation.sidebar'));
+        $this->booted()->assertSame(DocumentationSidebar::get(), app('navigation.sidebar'));
     }
 
     protected function booted(): self

From 6f0ddf754a6dc15ef586ca83516629d37ae00019 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 22 Feb 2024 18:10:50 +0100
Subject: [PATCH 0602/1422] Revert "Move shared method to parent class"

This reverts commit 96756656eb06469edbbe96b39ac71c803bb0ebf6.
---
 .../Features/Navigation/DocumentationSidebar.php       | 10 ++++++++++
 .../Features/Navigation/MainNavigationMenu.php         | 10 +++++++++-
 .../Framework/Features/Navigation/NavigationMenu.php   |  8 --------
 3 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 3928e2847f6..3f2d3d54480 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -8,8 +8,18 @@
 use Hyde\Support\Facades\Render;
 use Illuminate\Support\Str;
 
+use function app;
+
 class DocumentationSidebar extends NavigationMenu
 {
+    /**
+     * Get the navigation menu instance from the service container.
+     */
+    public static function get(): static
+    {
+        return app('navigation.sidebar');
+    }
+
     public function hasGroups(): bool
     {
         return $this->getItems()->contains(fn (NavItem $item): bool => $item->hasChildren());
diff --git a/packages/framework/src/Framework/Features/Navigation/MainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/MainNavigationMenu.php
index 96b228fa967..e9f6f1a8dff 100644
--- a/packages/framework/src/Framework/Features/Navigation/MainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/MainNavigationMenu.php
@@ -4,7 +4,15 @@
 
 namespace Hyde\Framework\Features\Navigation;
 
+use function app;
+
 class MainNavigationMenu extends NavigationMenu
 {
-    //
+    /**
+     * Get the navigation menu instance from the service container.
+     */
+    public static function get(): static
+    {
+        return app('navigation.main');
+    }
 }
diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
index 25c7b092058..1de04be10df 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
@@ -17,14 +17,6 @@
  */
 abstract class NavigationMenu
 {
-    /**
-     * Get the navigation menu instance from the service container.
-     */
-    public static function get(): static
-    {
-        return app(static::class);
-    }
-
     /** @var \Illuminate\Support\Collection<\Hyde\Framework\Features\Navigation\NavItem> */
     protected Collection $items;
 

From c0a02077975042daa49935e1bb5782c0b2020cf7 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 22 Feb 2024 18:14:54 +0100
Subject: [PATCH 0603/1422] Revert "Add method description"

This reverts commit fce0950092d61836eab7f94ad4ca21a81976d913.
---
 .../src/Framework/Features/Navigation/MainNavigationMenu.php   | 3 ---
 .../src/Framework/Features/Navigation/NavigationMenu.php       | 3 ---
 2 files changed, 6 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/MainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/MainNavigationMenu.php
index e9f6f1a8dff..e6681c42ffd 100644
--- a/packages/framework/src/Framework/Features/Navigation/MainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/MainNavigationMenu.php
@@ -8,9 +8,6 @@
 
 class MainNavigationMenu extends NavigationMenu
 {
-    /**
-     * Get the navigation menu instance from the service container.
-     */
     public static function get(): static
     {
         return app('navigation.main');
diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
index 1de04be10df..84779c79eb9 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
@@ -20,9 +20,6 @@ abstract class NavigationMenu
     /** @var \Illuminate\Support\Collection<\Hyde\Framework\Features\Navigation\NavItem> */
     protected Collection $items;
 
-    /**
-     * Create a new navigation menu instance.
-     */
     public function __construct(Arrayable|array $items = [])
     {
         $this->items = new Collection();

From a89814ce54ba7ee502b1b2a72348ae4de0b83086 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 22 Feb 2024 18:17:20 +0100
Subject: [PATCH 0604/1422] Revert "Extract fluent testing helper"

This reverts commit fb7a8d56464cc770140409d761b77185d305dd41.
---
 .../tests/Feature/NavigationManagerTest.php   | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/packages/framework/tests/Feature/NavigationManagerTest.php b/packages/framework/tests/Feature/NavigationManagerTest.php
index e46f88757b3..d78ed77f32f 100644
--- a/packages/framework/tests/Feature/NavigationManagerTest.php
+++ b/packages/framework/tests/Feature/NavigationManagerTest.php
@@ -65,28 +65,29 @@ public function testCannotGetContainerMenusBeforeKernelIsBooted()
 
     public function testCanGetMainNavigationMenuFromContainer()
     {
-        $this->booted()->assertInstanceOf(MainNavigationMenu::class, app('navigation.main'));
+        Hyde::boot();
+
+        $this->assertInstanceOf(MainNavigationMenu::class, app('navigation.main'));
     }
 
     public function testCanGetDocumentationSidebarFromContainer()
     {
-        $this->booted()->assertInstanceOf(DocumentationSidebar::class, app('navigation.sidebar'));
+        Hyde::boot();
+
+        $this->assertInstanceOf(DocumentationSidebar::class, app('navigation.sidebar'));
     }
 
     public function testCanGetMainNavigationMenuFromContainerUsingShorthand()
     {
-        $this->booted()->assertSame(MainNavigationMenu::get(), app('navigation.main'));
-    }
+        Hyde::boot();
 
-    public function testCanGetDocumentationSidebarFromContainerUsingShorthand()
-    {
-        $this->booted()->assertSame(DocumentationSidebar::get(), app('navigation.sidebar'));
+        $this->assertSame(MainNavigationMenu::get(), app('navigation.main'));
     }
 
-    protected function booted(): self
+    public function testCanGetDocumentationSidebarFromContainerUsingShorthand()
     {
         Hyde::boot();
 
-        return $this;
+        $this->assertSame(DocumentationSidebar::get(), app('navigation.sidebar'));
     }
 }

From c9b1127f3cd6d31c319c77c04bc3b152e3a7bcb8 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 22 Feb 2024 18:18:12 +0100
Subject: [PATCH 0605/1422] Move service container binding tests to menu test

---
 .../AutomaticNavigationConfigurationsTest.php | 40 +++++++++++++++++++
 .../tests/Feature/NavigationManagerTest.php   | 39 ------------------
 2 files changed, 40 insertions(+), 39 deletions(-)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index c00e56054b6..e483d3ef0c4 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -4,6 +4,7 @@
 
 namespace Hyde\Framework\Testing\Feature;
 
+use Hyde\Hyde;
 use Hyde\Pages\HtmlPage;
 use Hyde\Pages\BladePage;
 use Hyde\Testing\TestCase;
@@ -20,6 +21,7 @@
 use Hyde\Framework\Features\Navigation\NavItem;
 use Hyde\Framework\Features\Navigation\MainNavigationMenu;
 use Hyde\Framework\Features\Navigation\DocumentationSidebar;
+use Illuminate\Contracts\Container\BindingResolutionException;
 use Hyde\Framework\Features\Navigation\NavigationMenuGenerator;
 
 /**
@@ -1221,6 +1223,44 @@ public function testSidebarGroupCasingUsingFrontMatter()
         $this->assertSidebarEquals(['Hello World'], [new DocumentationPage('foo', ['navigation.group' => 'hello world'])]);
     }
 
+    // Service container binding tests
+
+    public function testCannotGetContainerMenusBeforeKernelIsBooted()
+    {
+        $this->expectException(BindingResolutionException::class);
+
+        $this->assertNull(app('navigation.main'));
+        $this->assertNull(app('navigation.sidebar'));
+    }
+
+    public function testCanGetMainNavigationMenuFromContainer()
+    {
+        Hyde::boot();
+
+        $this->assertInstanceOf(MainNavigationMenu::class, app('navigation.main'));
+    }
+
+    public function testCanGetDocumentationSidebarFromContainer()
+    {
+        Hyde::boot();
+
+        $this->assertInstanceOf(DocumentationSidebar::class, app('navigation.sidebar'));
+    }
+
+    public function testCanGetMainNavigationMenuFromContainerUsingShorthand()
+    {
+        Hyde::boot();
+
+        $this->assertSame(MainNavigationMenu::get(), app('navigation.main'));
+    }
+
+    public function testCanGetDocumentationSidebarFromContainerUsingShorthand()
+    {
+        Hyde::boot();
+
+        $this->assertSame(DocumentationSidebar::get(), app('navigation.sidebar'));
+    }
+
     // Testing helpers
 
     protected function assertSidebarEquals(array $expected, array $menuPages): void
diff --git a/packages/framework/tests/Feature/NavigationManagerTest.php b/packages/framework/tests/Feature/NavigationManagerTest.php
index d78ed77f32f..e4be9383d8e 100644
--- a/packages/framework/tests/Feature/NavigationManagerTest.php
+++ b/packages/framework/tests/Feature/NavigationManagerTest.php
@@ -4,12 +4,9 @@
 
 namespace Hyde\Framework\Testing\Feature;
 
-use Hyde\Hyde;
 use Hyde\Framework\Features\Navigation\NavigationManager;
 use Hyde\Framework\Features\Navigation\MainNavigationMenu;
-use Hyde\Framework\Features\Navigation\DocumentationSidebar;
 use Hyde\Testing\TestCase;
-use Illuminate\Contracts\Container\BindingResolutionException;
 
 /**
  * @covers \Hyde\Framework\Features\Navigation\NavigationMenu
@@ -54,40 +51,4 @@ public function testGetMenuThrowsExceptionForNonExistentMenu()
         $this->expectException(\Exception::class);
         $manager->getMenu('foo');
     }
-
-    public function testCannotGetContainerMenusBeforeKernelIsBooted()
-    {
-        $this->expectException(BindingResolutionException::class);
-
-        $this->assertNull(app('navigation.main'));
-        $this->assertNull(app('navigation.sidebar'));
-    }
-
-    public function testCanGetMainNavigationMenuFromContainer()
-    {
-        Hyde::boot();
-
-        $this->assertInstanceOf(MainNavigationMenu::class, app('navigation.main'));
-    }
-
-    public function testCanGetDocumentationSidebarFromContainer()
-    {
-        Hyde::boot();
-
-        $this->assertInstanceOf(DocumentationSidebar::class, app('navigation.sidebar'));
-    }
-
-    public function testCanGetMainNavigationMenuFromContainerUsingShorthand()
-    {
-        Hyde::boot();
-
-        $this->assertSame(MainNavigationMenu::get(), app('navigation.main'));
-    }
-
-    public function testCanGetDocumentationSidebarFromContainerUsingShorthand()
-    {
-        Hyde::boot();
-
-        $this->assertSame(DocumentationSidebar::get(), app('navigation.sidebar'));
-    }
 }

From 2fe9ca81d46cc351bb67ce1faae58e57e2046dff Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 22 Feb 2024 18:25:11 +0100
Subject: [PATCH 0606/1422] Revert "Move service container binding tests to
 menu test"

This reverts commit c9b1127f3cd6d31c319c77c04bc3b152e3a7bcb8.
---
 .../AutomaticNavigationConfigurationsTest.php | 40 -------------------
 .../tests/Feature/NavigationManagerTest.php   | 39 ++++++++++++++++++
 2 files changed, 39 insertions(+), 40 deletions(-)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index e483d3ef0c4..c00e56054b6 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -4,7 +4,6 @@
 
 namespace Hyde\Framework\Testing\Feature;
 
-use Hyde\Hyde;
 use Hyde\Pages\HtmlPage;
 use Hyde\Pages\BladePage;
 use Hyde\Testing\TestCase;
@@ -21,7 +20,6 @@
 use Hyde\Framework\Features\Navigation\NavItem;
 use Hyde\Framework\Features\Navigation\MainNavigationMenu;
 use Hyde\Framework\Features\Navigation\DocumentationSidebar;
-use Illuminate\Contracts\Container\BindingResolutionException;
 use Hyde\Framework\Features\Navigation\NavigationMenuGenerator;
 
 /**
@@ -1223,44 +1221,6 @@ public function testSidebarGroupCasingUsingFrontMatter()
         $this->assertSidebarEquals(['Hello World'], [new DocumentationPage('foo', ['navigation.group' => 'hello world'])]);
     }
 
-    // Service container binding tests
-
-    public function testCannotGetContainerMenusBeforeKernelIsBooted()
-    {
-        $this->expectException(BindingResolutionException::class);
-
-        $this->assertNull(app('navigation.main'));
-        $this->assertNull(app('navigation.sidebar'));
-    }
-
-    public function testCanGetMainNavigationMenuFromContainer()
-    {
-        Hyde::boot();
-
-        $this->assertInstanceOf(MainNavigationMenu::class, app('navigation.main'));
-    }
-
-    public function testCanGetDocumentationSidebarFromContainer()
-    {
-        Hyde::boot();
-
-        $this->assertInstanceOf(DocumentationSidebar::class, app('navigation.sidebar'));
-    }
-
-    public function testCanGetMainNavigationMenuFromContainerUsingShorthand()
-    {
-        Hyde::boot();
-
-        $this->assertSame(MainNavigationMenu::get(), app('navigation.main'));
-    }
-
-    public function testCanGetDocumentationSidebarFromContainerUsingShorthand()
-    {
-        Hyde::boot();
-
-        $this->assertSame(DocumentationSidebar::get(), app('navigation.sidebar'));
-    }
-
     // Testing helpers
 
     protected function assertSidebarEquals(array $expected, array $menuPages): void
diff --git a/packages/framework/tests/Feature/NavigationManagerTest.php b/packages/framework/tests/Feature/NavigationManagerTest.php
index e4be9383d8e..d78ed77f32f 100644
--- a/packages/framework/tests/Feature/NavigationManagerTest.php
+++ b/packages/framework/tests/Feature/NavigationManagerTest.php
@@ -4,9 +4,12 @@
 
 namespace Hyde\Framework\Testing\Feature;
 
+use Hyde\Hyde;
 use Hyde\Framework\Features\Navigation\NavigationManager;
 use Hyde\Framework\Features\Navigation\MainNavigationMenu;
+use Hyde\Framework\Features\Navigation\DocumentationSidebar;
 use Hyde\Testing\TestCase;
+use Illuminate\Contracts\Container\BindingResolutionException;
 
 /**
  * @covers \Hyde\Framework\Features\Navigation\NavigationMenu
@@ -51,4 +54,40 @@ public function testGetMenuThrowsExceptionForNonExistentMenu()
         $this->expectException(\Exception::class);
         $manager->getMenu('foo');
     }
+
+    public function testCannotGetContainerMenusBeforeKernelIsBooted()
+    {
+        $this->expectException(BindingResolutionException::class);
+
+        $this->assertNull(app('navigation.main'));
+        $this->assertNull(app('navigation.sidebar'));
+    }
+
+    public function testCanGetMainNavigationMenuFromContainer()
+    {
+        Hyde::boot();
+
+        $this->assertInstanceOf(MainNavigationMenu::class, app('navigation.main'));
+    }
+
+    public function testCanGetDocumentationSidebarFromContainer()
+    {
+        Hyde::boot();
+
+        $this->assertInstanceOf(DocumentationSidebar::class, app('navigation.sidebar'));
+    }
+
+    public function testCanGetMainNavigationMenuFromContainerUsingShorthand()
+    {
+        Hyde::boot();
+
+        $this->assertSame(MainNavigationMenu::get(), app('navigation.main'));
+    }
+
+    public function testCanGetDocumentationSidebarFromContainerUsingShorthand()
+    {
+        Hyde::boot();
+
+        $this->assertSame(DocumentationSidebar::get(), app('navigation.sidebar'));
+    }
 }

From 5afae61f036e124f9bea9c395272ff1bd9a8c1a3 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 22 Feb 2024 18:25:52 +0100
Subject: [PATCH 0607/1422] Move service container binding tests to provider
 test

---
 .../tests/Feature/HydeServiceProviderTest.php | 40 +++++++++++++++++++
 .../tests/Feature/NavigationManagerTest.php   | 39 ------------------
 2 files changed, 40 insertions(+), 39 deletions(-)

diff --git a/packages/framework/tests/Feature/HydeServiceProviderTest.php b/packages/framework/tests/Feature/HydeServiceProviderTest.php
index 83e437c4acc..9c895230082 100644
--- a/packages/framework/tests/Feature/HydeServiceProviderTest.php
+++ b/packages/framework/tests/Feature/HydeServiceProviderTest.php
@@ -4,6 +4,10 @@
 
 namespace Hyde\Framework\Testing\Feature;
 
+use Hyde\Framework\Features\Navigation\MainNavigationMenu;
+use Hyde\Framework\Features\Navigation\DocumentationSidebar;
+use Illuminate\Contracts\Container\BindingResolutionException;
+
 use function app;
 use function array_map;
 use function basename;
@@ -327,4 +331,40 @@ public function testOutputDirectoriesCanBeSetUsingKebabCaseClassNames()
         $this->assertEquals('foo', MarkdownPost::outputDirectory());
         $this->assertEquals('foo', DocumentationPage::outputDirectory());
     }
+
+    public function testCannotGetContainerMenusBeforeKernelIsBooted()
+    {
+        $this->expectException(BindingResolutionException::class);
+
+        $this->assertNull(app('navigation.main'));
+        $this->assertNull(app('navigation.sidebar'));
+    }
+
+    public function testCanGetMainNavigationMenuFromContainer()
+    {
+        Hyde::boot();
+
+        $this->assertInstanceOf(MainNavigationMenu::class, app('navigation.main'));
+    }
+
+    public function testCanGetDocumentationSidebarFromContainer()
+    {
+        Hyde::boot();
+
+        $this->assertInstanceOf(DocumentationSidebar::class, app('navigation.sidebar'));
+    }
+
+    public function testCanGetMainNavigationMenuFromContainerUsingShorthand()
+    {
+        Hyde::boot();
+
+        $this->assertSame(MainNavigationMenu::get(), app('navigation.main'));
+    }
+
+    public function testCanGetDocumentationSidebarFromContainerUsingShorthand()
+    {
+        Hyde::boot();
+
+        $this->assertSame(DocumentationSidebar::get(), app('navigation.sidebar'));
+    }
 }
diff --git a/packages/framework/tests/Feature/NavigationManagerTest.php b/packages/framework/tests/Feature/NavigationManagerTest.php
index d78ed77f32f..e4be9383d8e 100644
--- a/packages/framework/tests/Feature/NavigationManagerTest.php
+++ b/packages/framework/tests/Feature/NavigationManagerTest.php
@@ -4,12 +4,9 @@
 
 namespace Hyde\Framework\Testing\Feature;
 
-use Hyde\Hyde;
 use Hyde\Framework\Features\Navigation\NavigationManager;
 use Hyde\Framework\Features\Navigation\MainNavigationMenu;
-use Hyde\Framework\Features\Navigation\DocumentationSidebar;
 use Hyde\Testing\TestCase;
-use Illuminate\Contracts\Container\BindingResolutionException;
 
 /**
  * @covers \Hyde\Framework\Features\Navigation\NavigationMenu
@@ -54,40 +51,4 @@ public function testGetMenuThrowsExceptionForNonExistentMenu()
         $this->expectException(\Exception::class);
         $manager->getMenu('foo');
     }
-
-    public function testCannotGetContainerMenusBeforeKernelIsBooted()
-    {
-        $this->expectException(BindingResolutionException::class);
-
-        $this->assertNull(app('navigation.main'));
-        $this->assertNull(app('navigation.sidebar'));
-    }
-
-    public function testCanGetMainNavigationMenuFromContainer()
-    {
-        Hyde::boot();
-
-        $this->assertInstanceOf(MainNavigationMenu::class, app('navigation.main'));
-    }
-
-    public function testCanGetDocumentationSidebarFromContainer()
-    {
-        Hyde::boot();
-
-        $this->assertInstanceOf(DocumentationSidebar::class, app('navigation.sidebar'));
-    }
-
-    public function testCanGetMainNavigationMenuFromContainerUsingShorthand()
-    {
-        Hyde::boot();
-
-        $this->assertSame(MainNavigationMenu::get(), app('navigation.main'));
-    }
-
-    public function testCanGetDocumentationSidebarFromContainerUsingShorthand()
-    {
-        Hyde::boot();
-
-        $this->assertSame(DocumentationSidebar::get(), app('navigation.sidebar'));
-    }
 }

From 172cb8643e174eb258afd5f9be718522b9c6532f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 22 Feb 2024 18:28:04 +0100
Subject: [PATCH 0608/1422] Swap wrong order of expected/actual

---
 packages/framework/tests/Feature/HydeServiceProviderTest.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/tests/Feature/HydeServiceProviderTest.php b/packages/framework/tests/Feature/HydeServiceProviderTest.php
index 9c895230082..955e0e21be5 100644
--- a/packages/framework/tests/Feature/HydeServiceProviderTest.php
+++ b/packages/framework/tests/Feature/HydeServiceProviderTest.php
@@ -358,13 +358,13 @@ public function testCanGetMainNavigationMenuFromContainerUsingShorthand()
     {
         Hyde::boot();
 
-        $this->assertSame(MainNavigationMenu::get(), app('navigation.main'));
+        $this->assertSame(app('navigation.main'), MainNavigationMenu::get());
     }
 
     public function testCanGetDocumentationSidebarFromContainerUsingShorthand()
     {
         Hyde::boot();
 
-        $this->assertSame(DocumentationSidebar::get(), app('navigation.sidebar'));
+        $this->assertSame(app('navigation.sidebar'), DocumentationSidebar::get());
     }
 }

From 06d88e895950f8fb109a13061d824dcd234d8e3a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 22 Feb 2024 18:28:18 +0100
Subject: [PATCH 0609/1422] Clean up test

---
 packages/framework/tests/Feature/HydeServiceProviderTest.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/tests/Feature/HydeServiceProviderTest.php b/packages/framework/tests/Feature/HydeServiceProviderTest.php
index 955e0e21be5..5704cdc160e 100644
--- a/packages/framework/tests/Feature/HydeServiceProviderTest.php
+++ b/packages/framework/tests/Feature/HydeServiceProviderTest.php
@@ -336,8 +336,8 @@ public function testCannotGetContainerMenusBeforeKernelIsBooted()
     {
         $this->expectException(BindingResolutionException::class);
 
-        $this->assertNull(app('navigation.main'));
-        $this->assertNull(app('navigation.sidebar'));
+        app('navigation.main');
+        app('navigation.sidebar');
     }
 
     public function testCanGetMainNavigationMenuFromContainer()

From 730c4276bfa984cac40b0cd4b5bebd6d3ea48dd8 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 22 Feb 2024 18:29:07 +0100
Subject: [PATCH 0610/1422] Split out test

---
 .../framework/tests/Feature/HydeServiceProviderTest.php   | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/packages/framework/tests/Feature/HydeServiceProviderTest.php b/packages/framework/tests/Feature/HydeServiceProviderTest.php
index 5704cdc160e..5472304f46c 100644
--- a/packages/framework/tests/Feature/HydeServiceProviderTest.php
+++ b/packages/framework/tests/Feature/HydeServiceProviderTest.php
@@ -332,11 +332,17 @@ public function testOutputDirectoriesCanBeSetUsingKebabCaseClassNames()
         $this->assertEquals('foo', DocumentationPage::outputDirectory());
     }
 
-    public function testCannotGetContainerMenusBeforeKernelIsBooted()
+    public function testCannotMainNavigationMenuFromContainerBeforeKernelIsBooted()
     {
         $this->expectException(BindingResolutionException::class);
 
         app('navigation.main');
+    }
+
+    public function testCannotDocumentationSidebarFromContainerBeforeKernelIsBooted()
+    {
+        $this->expectException(BindingResolutionException::class);
+
         app('navigation.sidebar');
     }
 

From 7a281c0c90ef3cf54ae4f1bab9c0b9b2342036dd Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 22 Feb 2024 18:41:36 +0100
Subject: [PATCH 0611/1422] Delete NavigationManagerTest.php

---
 .../tests/Feature/NavigationManagerTest.php   | 54 -------------------
 1 file changed, 54 deletions(-)
 delete mode 100644 packages/framework/tests/Feature/NavigationManagerTest.php

diff --git a/packages/framework/tests/Feature/NavigationManagerTest.php b/packages/framework/tests/Feature/NavigationManagerTest.php
deleted file mode 100644
index e4be9383d8e..00000000000
--- a/packages/framework/tests/Feature/NavigationManagerTest.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Hyde\Framework\Testing\Feature;
-
-use Hyde\Framework\Features\Navigation\NavigationManager;
-use Hyde\Framework\Features\Navigation\MainNavigationMenu;
-use Hyde\Testing\TestCase;
-
-/**
- * @covers \Hyde\Framework\Features\Navigation\NavigationMenu
- * @covers \Hyde\Framework\Features\Navigation\MainNavigationMenu
- * @covers \Hyde\Framework\Features\Navigation\DocumentationSidebar
- * @covers \Hyde\Framework\Features\Navigation\NavigationManager
- */
-class NavigationManagerTest extends TestCase
-{
-    public function testCanRegisterMenu()
-    {
-        $manager = new NavigationManager();
-
-        $menu = $this->createMock(MainNavigationMenu::class);
-        $manager->registerMenu('foo', $menu);
-
-        $reflection = new \ReflectionClass($manager);
-        $property = $reflection->getProperty('menus');
-
-        $menus = $property->getValue($manager);
-
-        $this->assertArrayHasKey('foo', $menus);
-        $this->assertSame($menu, $menus['foo']);
-    }
-
-    public function testCanGetMenu()
-    {
-        $manager = new NavigationManager();
-
-        $menu = $this->createMock(MainNavigationMenu::class);
-        $manager->registerMenu('foo', $menu);
-
-        $retrievedMenu = $manager->getMenu('foo');
-
-        $this->assertSame($menu, $retrievedMenu);
-    }
-
-    public function testGetMenuThrowsExceptionForNonExistentMenu()
-    {
-        $manager = new NavigationManager();
-
-        $this->expectException(\Exception::class);
-        $manager->getMenu('foo');
-    }
-}

From 805849b66379a584007376191e918fdecf793fb4 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 22 Feb 2024 18:41:38 +0100
Subject: [PATCH 0612/1422] Delete NavigationManager.php

---
 .../Features/Navigation/NavigationManager.php | 43 -------------------
 1 file changed, 43 deletions(-)
 delete mode 100644 packages/framework/src/Framework/Features/Navigation/NavigationManager.php

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationManager.php b/packages/framework/src/Framework/Features/Navigation/NavigationManager.php
deleted file mode 100644
index 9313fb65bd0..00000000000
--- a/packages/framework/src/Framework/Features/Navigation/NavigationManager.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Hyde\Framework\Features\Navigation;
-
-use Hyde\Hyde;
-
-/**
- * Manages the navigation menus for the project.
- *
- * @deprecated Move to extension
- */
-class NavigationManager
-{
-    /**
-     * The menus that are available for the project, keyed by their name identifier.
-     *
-     * @var array<string, \Hyde\Framework\Features\Navigation\NavigationMenu>
-     */
-    protected array $menus = [];
-
-    /**
-     * Register a new menu for the project.
-     */
-    public function registerMenu(string $name, NavigationMenu $menu): void
-    {
-        $this->menus[$name] = $menu;
-    }
-
-    /**
-     * Get a menu by its name.
-     */
-    public function getMenu(string $name): NavigationMenu
-    {
-        if (! Hyde::isBooted()) {
-            // Todo: This could be an anti-pattern so we may consider throwing an exception instead.
-            Hyde::boot();
-        }
-
-        return $this->menus[$name];
-    }
-}

From f19e288a6bd572cf2d51f0e459d7ebeb1a0d8c26 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 22 Feb 2024 18:42:40 +0100
Subject: [PATCH 0613/1422] Add missing part of test names

---
 packages/framework/tests/Feature/HydeServiceProviderTest.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/tests/Feature/HydeServiceProviderTest.php b/packages/framework/tests/Feature/HydeServiceProviderTest.php
index 5472304f46c..c20ebac254e 100644
--- a/packages/framework/tests/Feature/HydeServiceProviderTest.php
+++ b/packages/framework/tests/Feature/HydeServiceProviderTest.php
@@ -332,14 +332,14 @@ public function testOutputDirectoriesCanBeSetUsingKebabCaseClassNames()
         $this->assertEquals('foo', DocumentationPage::outputDirectory());
     }
 
-    public function testCannotMainNavigationMenuFromContainerBeforeKernelIsBooted()
+    public function testCannotGetMainNavigationMenuFromContainerBeforeKernelIsBooted()
     {
         $this->expectException(BindingResolutionException::class);
 
         app('navigation.main');
     }
 
-    public function testCannotDocumentationSidebarFromContainerBeforeKernelIsBooted()
+    public function testCannotGetDocumentationSidebarFromContainerBeforeKernelIsBooted()
     {
         $this->expectException(BindingResolutionException::class);
 

From 7b8e90bac290ac49f03d712c42794cb53d781d47 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 22 Feb 2024 19:41:10 +0100
Subject: [PATCH 0614/1422] Breaking: Change configuration option
 `sidebar_order` to `sidebar.order`

Breaking: This changes the configuration option `docs.sidebar_order` to `docs.sidebar.order` in order to normalize the configuration API.
---
 config/docs.php                               | 44 +++++++++----------
 docs/creating-content/documentation-pages.md  | 10 +++--
 docs/digging-deeper/customization.md          |  2 +-
 docs/digging-deeper/navigation.md             | 24 +++++-----
 packages/framework/config/docs.php            | 44 +++++++++----------
 .../Factories/NavigationDataFactory.php       |  2 +-
 .../Navigation/NavigationMenuGenerator.php    |  2 +-
 .../AutomaticNavigationConfigurationsTest.php | 22 +++++-----
 .../Services/DocumentationSidebarTest.php     |  8 ++--
 .../Unit/NavigationDataFactoryUnitTest.php    |  8 ++--
 10 files changed, 85 insertions(+), 81 deletions(-)

diff --git a/config/docs.php b/config/docs.php
index fab400e973d..652695339b6 100644
--- a/config/docs.php
+++ b/config/docs.php
@@ -33,29 +33,29 @@
         // Should the sidebar footer be shown? You can also set this to a string
         // of Markdown to show in the footer. Set to `false` to disable.
         'footer' => true,
-    ],
-
-    /*
-    |--------------------------------------------------------------------------
-    | Sidebar Page Order
-    |--------------------------------------------------------------------------
-    |
-    | In the generated Documentation pages the navigation links in the sidebar
-    | default to sort alphabetically. You can reorder the page identifiers
-    | in the list below, and the links will get sorted in that order.
-    |
-    | The items will get a priority of 500 plus the order its found in the list.
-    | Pages without a priority will fall back to the default priority of 999.
-    |
-    | You can also set explicit priorities in front matter or by specifying
-    | a value to the array key in the list to override the inferred value.
-    |
-    */
 
-    'sidebar_order' => [
-        'readme',
-        'installation',
-        'getting-started',
+        /*
+        |--------------------------------------------------------------------------
+        | Sidebar Page Order
+        |--------------------------------------------------------------------------
+        |
+        | In the generated Documentation pages the navigation links in the sidebar
+        | default to sort alphabetically. You can reorder the page identifiers
+        | in the list below, and the links will get sorted in that order.
+        |
+        | The items will get a priority of 500 plus the order its found in the list.
+        | Pages without a priority will fall back to the default priority of 999.
+        |
+        | You can also set explicit priorities in front matter or by specifying
+        | a value to the array key in the list to override the inferred value.
+        |
+        */
+
+        'order' => [
+            'readme',
+            'installation',
+            'getting-started',
+        ],
     ],
 
     /*
diff --git a/docs/creating-content/documentation-pages.md b/docs/creating-content/documentation-pages.md
index 005d2f324ba..9bbcedc205b 100644
--- a/docs/creating-content/documentation-pages.md
+++ b/docs/creating-content/documentation-pages.md
@@ -223,10 +223,12 @@ To quickly arrange the order of items in the sidebar, you can reorder the page i
 Link items without an entry here will fall back to the default priority of 999, putting them last.
 
 ```php
-'sidebar_order' => [
-    'readme',
-    'installation',
-    'getting-started',
+'sidebar' => [
+    'order' => [
+        'readme',
+        'installation',
+        'getting-started',
+    ],
 ]
 ```
 
diff --git a/docs/digging-deeper/customization.md b/docs/digging-deeper/customization.md
index 8f8c455bc60..0ec2b9c934d 100644
--- a/docs/digging-deeper/customization.md
+++ b/docs/digging-deeper/customization.md
@@ -259,7 +259,7 @@ Learn more in the [Navigation Menu](navigation) documentation.
 
 #### Customizing the documentation sidebar
 
-- To customize the sidebar, use the setting `sidebar_order` in the `docs.php` config.
+- To customize the sidebar, use the setting `sidebar.order` in the `docs.php` config.
 - When customizing the sidebar, can use the route key, or just the [page identifier](core-concepts#page-identifiers) of the page.
 
 Learn more in the [Documentation Pages](documentation-pages) documentation.
diff --git a/docs/digging-deeper/navigation.md b/docs/digging-deeper/navigation.md
index 4d201775d42..f36a2f9a761 100644
--- a/docs/digging-deeper/navigation.md
+++ b/docs/digging-deeper/navigation.md
@@ -122,12 +122,12 @@ Next up, let's look at how to customize the navigation menus using the config fi
 - To customize the navigation menu, use the setting `navigation.order` in the `hyde.php` config.
 - When customizing the navigation menu, you should use the [route key](core-concepts#route-keys) of the page.
 
-- To customize the sidebar, use the setting `sidebar_order` in the `docs.php` config.
+- To customize the sidebar, use the setting `sidebar.order` in the `docs.php` config.
 - When customizing the sidebar, can use the route key, or just the [page identifier](core-concepts#page-identifiers) of the page.
 
 ### Changing the priorities
 
-The `navigation.order` and `sidebar_order` settings allow you to customize the order of the pages in the navigation menus.
+The `navigation.order` and `sidebar.order` settings allow you to customize the order of the pages in the navigation menus.
 
 #### Basic syntax for changing the priorities
 
@@ -149,10 +149,12 @@ The offset is added to make it easier to place pages earlier in the list using f
 ```php
 // filepath: config/docs.php
 
-'sidebar_order' => [
-    'readme', // Gets priority 500
-    'installation', // Gets priority 501
-    'getting-started', // Gets priority 502
+'sidebar' => [
+    'order' => [
+        'readme', // Gets priority 500
+        'installation', // Gets priority 501
+        'getting-started', // Gets priority 502
+    ]
 ]
 ```
 
@@ -175,10 +177,12 @@ You can also specify explicit priorities by adding a value to the array key:
 ```php
 // filepath: config/docs.php
 
-'sidebar_order' => [
-    'readme' => 10, // Gets priority 10
-    'installation' => 15, // Gets priority 15
-    'getting-started' => 20, // Gets priority 20
+'sidebar' => [
+    'order' => [
+        'readme' => 10, // Gets priority 10
+        'installation' => 15, // Gets priority 15
+        'getting-started' => 20, // Gets priority 20
+    ]
 ]
 ```
 
diff --git a/packages/framework/config/docs.php b/packages/framework/config/docs.php
index fab400e973d..652695339b6 100644
--- a/packages/framework/config/docs.php
+++ b/packages/framework/config/docs.php
@@ -33,29 +33,29 @@
         // Should the sidebar footer be shown? You can also set this to a string
         // of Markdown to show in the footer. Set to `false` to disable.
         'footer' => true,
-    ],
-
-    /*
-    |--------------------------------------------------------------------------
-    | Sidebar Page Order
-    |--------------------------------------------------------------------------
-    |
-    | In the generated Documentation pages the navigation links in the sidebar
-    | default to sort alphabetically. You can reorder the page identifiers
-    | in the list below, and the links will get sorted in that order.
-    |
-    | The items will get a priority of 500 plus the order its found in the list.
-    | Pages without a priority will fall back to the default priority of 999.
-    |
-    | You can also set explicit priorities in front matter or by specifying
-    | a value to the array key in the list to override the inferred value.
-    |
-    */
 
-    'sidebar_order' => [
-        'readme',
-        'installation',
-        'getting-started',
+        /*
+        |--------------------------------------------------------------------------
+        | Sidebar Page Order
+        |--------------------------------------------------------------------------
+        |
+        | In the generated Documentation pages the navigation links in the sidebar
+        | default to sort alphabetically. You can reorder the page identifiers
+        | in the list below, and the links will get sorted in that order.
+        |
+        | The items will get a priority of 500 plus the order its found in the list.
+        | Pages without a priority will fall back to the default priority of 999.
+        |
+        | You can also set explicit priorities in front matter or by specifying
+        | a value to the array key in the list to override the inferred value.
+        |
+        */
+
+        'order' => [
+            'readme',
+            'installation',
+            'getting-started',
+        ],
     ],
 
     /*
diff --git a/packages/framework/src/Framework/Factories/NavigationDataFactory.php b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
index 0fb46e79da2..7d02a193d4e 100644
--- a/packages/framework/src/Framework/Factories/NavigationDataFactory.php
+++ b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
@@ -160,7 +160,7 @@ private function searchForPriorityInConfigs(): ?int
     private function searchForPriorityInSidebarConfig(): ?int
     {
         /** @var array<string>|array<string, int> $config */
-        $config = Config::getArray('docs.sidebar_order', []);
+        $config = Config::getArray('docs.sidebar.order', []);
 
         return
             // For consistency with the navigation config.
diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
index bd31784144e..b490ac19bc2 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
@@ -182,7 +182,7 @@ protected function searchForGroupLabelInConfig(string $groupKey): ?string
 
     protected function searchForGroupPriorityInConfig(string $groupKey): ?int
     {
-        $key = $this->generatesSidebar ? 'docs.sidebar_order' : 'hyde.navigation.order';
+        $key = $this->generatesSidebar ? 'docs.sidebar.order' : 'hyde.navigation.order';
 
         return Config::getArray($key, [])[$groupKey] ?? null;
     }
diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index c00e56054b6..98541a8be20 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -745,9 +745,7 @@ public function testSidebarWithFrontMatterGroupAndCategory()
 
     public function testSidebarWithConfigOrder()
     {
-        // TODO should be sidebar.order instead of docs.sidebar_order
-
-        config(['docs.sidebar_order' => ['first', 'second', 'third']]);
+        config(['docs.sidebar.order' => ['first', 'second', 'third']]);
 
         $this->assertSidebarEquals(['First', 'Second', 'Third'], [
             new DocumentationPage('first'),
@@ -755,7 +753,7 @@ public function testSidebarWithConfigOrder()
             new DocumentationPage('third'),
         ]);
 
-        config(['docs.sidebar_order' => ['third', 'second', 'first']]);
+        config(['docs.sidebar.order' => ['third', 'second', 'first']]);
 
         $this->assertSidebarEquals(['Third', 'Second', 'First'], [
             new DocumentationPage('first'),
@@ -776,7 +774,7 @@ public function testSidebarWithConfigOrderHasInferredPriorities()
             new DocumentationPage('third'),
         ]);
 
-        config(['docs.sidebar_order' => ['first', 'second', 'third']]);
+        config(['docs.sidebar.order' => ['first', 'second', 'third']]);
 
         $this->assertSidebarEquals([
             ['priority' => 500],
@@ -791,7 +789,7 @@ public function testSidebarWithConfigOrderHasInferredPriorities()
 
     public function testSidebarWithExplicitConfigOrder()
     {
-        config(['docs.sidebar_order' => ['first' => 1, 'second' => 2, 'third' => 3]]);
+        config(['docs.sidebar.order' => ['first' => 1, 'second' => 2, 'third' => 3]]);
 
         $this->assertSidebarEquals(['First', 'Second', 'Third'], [
             new DocumentationPage('first'),
@@ -799,7 +797,7 @@ public function testSidebarWithExplicitConfigOrder()
             new DocumentationPage('third'),
         ]);
 
-        config(['docs.sidebar_order' => ['first' => 3, 'second' => 2, 'third' => 1]]);
+        config(['docs.sidebar.order' => ['first' => 3, 'second' => 2, 'third' => 1]]);
 
         $this->assertSidebarEquals(['Third', 'Second', 'First'], [
             new DocumentationPage('first'),
@@ -807,7 +805,7 @@ public function testSidebarWithExplicitConfigOrder()
             new DocumentationPage('third'),
         ]);
 
-        config(['docs.sidebar_order' => ['first' => 1, 'second' => 2, 'third' => 3]]);
+        config(['docs.sidebar.order' => ['first' => 1, 'second' => 2, 'third' => 3]]);
 
         $this->assertSidebarEquals([
             ['label' => 'First', 'priority' => 1],
@@ -822,7 +820,7 @@ public function testSidebarWithExplicitConfigOrder()
 
     public function testSidebarWithMixedConfigOrders()
     {
-        config(['docs.sidebar_order' => ['foo', 'bar' => 650]]);
+        config(['docs.sidebar.order' => ['foo', 'bar' => 650]]);
 
         $this->assertSidebarEquals([
             ['label' => 'Foo', 'priority' => 500],
@@ -1059,7 +1057,7 @@ public function testSidebarGroupsAreSortedByLowestFoundPriorityInEachGroupUnless
             new DocumentationPage('baz', ['navigation.group' => 'c', 'navigation.priority' => 10]),
         ]);
 
-        config(['docs.sidebar_order' => ['a' => 5]]);
+        config(['docs.sidebar.order' => ['a' => 5]]);
 
         $this->assertSidebarEquals([
             'A', 'C', 'B',
@@ -1117,7 +1115,7 @@ public function testMainNavigationDropdownPriorityCanBeSetInConfigUsingDiffering
 
     public function testSidebarGroupPriorityCanBeSetInConfig()
     {
-        config(['docs.sidebar_order' => ['foo' => 500]]);
+        config(['docs.sidebar.order' => ['foo' => 500]]);
 
         $this->assertSidebarEquals(
             [['label' => 'Foo', 'priority' => 500]],
@@ -1127,7 +1125,7 @@ public function testSidebarGroupPriorityCanBeSetInConfig()
 
     public function testSidebarGroupPriorityCanBeSetInConfigUsingDifferingCases()
     {
-        config(['docs.sidebar_order' => ['hello-world' => 500]]);
+        config(['docs.sidebar.order' => ['hello-world' => 500]]);
 
         $expected = [['label' => 'Hello World', 'priority' => 500]];
         $this->assertSidebarEquals($expected, [new DocumentationPage('Hello World/bar')]);
diff --git a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
index 2e3fcbe6344..3bb0b2b6545 100644
--- a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
+++ b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
@@ -77,7 +77,7 @@ public function testFilesWithFrontMatterHiddenSetToTrueAreRemovedFromSidebar()
 
     public function testSidebarIsOrderedAlphabeticallyWhenNoOrderIsSetInConfig()
     {
-        Config::set('docs.sidebar_order', []);
+        Config::set('docs.sidebar.order', []);
         Filesystem::touch('_docs/a.md');
         Filesystem::touch('_docs/b.md');
         Filesystem::touch('_docs/c.md');
@@ -94,7 +94,7 @@ public function testSidebarIsOrderedAlphabeticallyWhenNoOrderIsSetInConfig()
 
     public function testSidebarIsOrderedByPriorityWhenPriorityIsSetInConfig()
     {
-        Config::set('docs.sidebar_order', [
+        Config::set('docs.sidebar.order', [
             'c',
             'b',
             'a',
@@ -124,14 +124,14 @@ public function testSidebarItemPrioritySetInConfigOverridesFrontMatter()
     {
         $this->makePage('foo', ['navigation.priority' => 25]);
 
-        Config::set('docs.sidebar_order', ['foo']);
+        Config::set('docs.sidebar.order', ['foo']);
 
         $this->assertEquals(25, NavigationMenuGenerator::handle(DocumentationSidebar::class)->getItems()->first()->getPriority());
     }
 
     public function testSidebarPrioritiesCanBeSetInBothFrontMatterAndConfig()
     {
-        Config::set('docs.sidebar_order', [
+        Config::set('docs.sidebar.order', [
             'first',
             'third',
             'second',
diff --git a/packages/framework/tests/Unit/NavigationDataFactoryUnitTest.php b/packages/framework/tests/Unit/NavigationDataFactoryUnitTest.php
index a118c695723..9674273bf75 100644
--- a/packages/framework/tests/Unit/NavigationDataFactoryUnitTest.php
+++ b/packages/framework/tests/Unit/NavigationDataFactoryUnitTest.php
@@ -74,7 +74,7 @@ public function testSearchForPriorityInNavigationConfigForMarkdownPageSupportsMi
 
     public function testSearchForPriorityInNavigationConfigForDocumentationPageWithListConfig()
     {
-        self::mockConfig(['docs.sidebar_order' => [
+        self::mockConfig(['docs.sidebar.order' => [
             'foo' => 15,
             'bar' => 10,
         ]]);
@@ -88,7 +88,7 @@ public function testSearchForPriorityInNavigationConfigForDocumentationPageWithL
 
     public function testSearchForPriorityInNavigationConfigForDocumentationPageWithKeyedConfig()
     {
-        self::mockConfig(['docs.sidebar_order' => [
+        self::mockConfig(['docs.sidebar.order' => [
             'foo',
             'bar' => 10,
             'baz',
@@ -109,7 +109,7 @@ public function testSearchForPriorityInNavigationConfigForDocumentationPageWithK
 
     public function testSearchForPriorityInNavigationConfigForDocumentationPageSupportsMixingKeyedAndListConfig()
     {
-        self::mockConfig(['docs.sidebar_order' => [
+        self::mockConfig(['docs.sidebar.order' => [
             'foo',
             'bar' => 10,
             'baz',
@@ -130,7 +130,7 @@ public function testSearchForPriorityInNavigationConfigForDocumentationPageSuppo
 
     public function testRouteKeysCanBeUsedForDocumentationSidebarPriorities()
     {
-        self::mockConfig(['docs.sidebar_order' => [
+        self::mockConfig(['docs.sidebar.order' => [
             'key/foo',
             'key/bar',
             'baz',

From 255aa0e18b4e258998129bd04fa82b5378e901be Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 22 Feb 2024 19:54:07 +0100
Subject: [PATCH 0615/1422] Breaking: Change configuration option
 `table_of_contents` to `sidebar.table_of_contents`

Breaking: This changes the configuration option `docs.table_of_contents` to `docs.sidebar.table_of_contents` in order to normalize the configuration API.
---
 config/docs.php                               | 31 ++++++++++---------
 docs/creating-content/documentation-pages.md  | 12 ++++---
 packages/framework/config/docs.php            | 31 ++++++++++---------
 .../components/docs/sidebar-item.blade.php    |  2 +-
 .../Actions/GeneratesTableOfContents.php      |  4 +--
 .../framework/src/Pages/DocumentationPage.php |  2 +-
 .../tests/Feature/MarkdownServiceTest.php     |  2 +-
 .../tests/Unit/DocumentationPageTest.php      |  4 +--
 8 files changed, 46 insertions(+), 42 deletions(-)

diff --git a/config/docs.php b/config/docs.php
index 652695339b6..93bbc751dc2 100644
--- a/config/docs.php
+++ b/config/docs.php
@@ -56,23 +56,24 @@
             'installation',
             'getting-started',
         ],
-    ],
 
-    /*
-    |--------------------------------------------------------------------------
-    | Table of Contents Settings
-    |--------------------------------------------------------------------------
-    |
-    | The Hyde Documentation Module comes with a fancy Sidebar that, by default,
-    | has a Table of Contents included. Here, you can configure its behavior,
-    | content, look and feel. You can also disable the feature completely.
-    |
-    */
+        /*
+        |--------------------------------------------------------------------------
+        | Table of Contents Settings
+        |--------------------------------------------------------------------------
+        |
+        | The Hyde Documentation Module comes with a fancy Sidebar that, by default,
+        | has a Table of Contents included. Here, you can configure its behavior,
+        | content, look and feel. You can also disable the feature completely.
+        |
+        */
+
+        'table_of_contents' => [
+            'enabled' => true,
+            'min_heading_level' => 2,
+            'max_heading_level' => 4,
+        ],
 
-    'table_of_contents' => [
-        'enabled' => true,
-        'min_heading_level' => 2,
-        'max_heading_level' => 4,
     ],
 
     /*
diff --git a/docs/creating-content/documentation-pages.md b/docs/creating-content/documentation-pages.md
index 9bbcedc205b..c978fa30447 100644
--- a/docs/creating-content/documentation-pages.md
+++ b/docs/creating-content/documentation-pages.md
@@ -258,11 +258,13 @@ In the `config/docs.php` file you can configure the behaviour, content, and the
 You can also disable the feature completely.
 
 ```php
-'table_of_contents' => [
-    'enabled' => true,
-    'min_heading_level' => 2,
-    'max_heading_level' => 4,
-    'smooth_page_scrolling' => true,
+'sidebar' => [
+    'table_of_contents' => [
+        'enabled' => true,
+        'min_heading_level' => 2,
+        'max_heading_level' => 4,
+        'smooth_page_scrolling' => true,
+    ],
 ],
 ```
 
diff --git a/packages/framework/config/docs.php b/packages/framework/config/docs.php
index 652695339b6..93bbc751dc2 100644
--- a/packages/framework/config/docs.php
+++ b/packages/framework/config/docs.php
@@ -56,23 +56,24 @@
             'installation',
             'getting-started',
         ],
-    ],
 
-    /*
-    |--------------------------------------------------------------------------
-    | Table of Contents Settings
-    |--------------------------------------------------------------------------
-    |
-    | The Hyde Documentation Module comes with a fancy Sidebar that, by default,
-    | has a Table of Contents included. Here, you can configure its behavior,
-    | content, look and feel. You can also disable the feature completely.
-    |
-    */
+        /*
+        |--------------------------------------------------------------------------
+        | Table of Contents Settings
+        |--------------------------------------------------------------------------
+        |
+        | The Hyde Documentation Module comes with a fancy Sidebar that, by default,
+        | has a Table of Contents included. Here, you can configure its behavior,
+        | content, look and feel. You can also disable the feature completely.
+        |
+        */
+
+        'table_of_contents' => [
+            'enabled' => true,
+            'min_heading_level' => 2,
+            'max_heading_level' => 4,
+        ],
 
-    'table_of_contents' => [
-        'enabled' => true,
-        'min_heading_level' => 2,
-        'max_heading_level' => 4,
     ],
 
     /*
diff --git a/packages/framework/resources/views/components/docs/sidebar-item.blade.php b/packages/framework/resources/views/components/docs/sidebar-item.blade.php
index 012947357c0..bf97a15f88d 100644
--- a/packages/framework/resources/views/components/docs/sidebar-item.blade.php
+++ b/packages/framework/resources/views/components/docs/sidebar-item.blade.php
@@ -12,7 +12,7 @@
             {{ $item->getLabel() }}
         </a>
 
-        @if(config('docs.table_of_contents.enabled', true))
+        @if(config('docs.sidebar.table_of_contents.enabled', true))
             <span class="sr-only">Table of contents</span>
             {!! ($page->getTableOfContents()) !!}
         @endif
diff --git a/packages/framework/src/Framework/Actions/GeneratesTableOfContents.php b/packages/framework/src/Framework/Actions/GeneratesTableOfContents.php
index 0a68d1b032b..2889b0fe419 100644
--- a/packages/framework/src/Framework/Actions/GeneratesTableOfContents.php
+++ b/packages/framework/src/Framework/Actions/GeneratesTableOfContents.php
@@ -35,8 +35,8 @@ public function execute(): string
                 'position' => 'placeholder',
                 'placeholder' => '[[START_TOC]]',
                 'style' => 'bullet',
-                'min_heading_level' => Config::getInt('docs.table_of_contents.min_heading_level', 2),
-                'max_heading_level' => Config::getInt('docs.table_of_contents.max_heading_level', 4),
+                'min_heading_level' => Config::getInt('docs.sidebar.table_of_contents.min_heading_level', 2),
+                'max_heading_level' => Config::getInt('docs.sidebar.table_of_contents.max_heading_level', 4),
                 'normalize' => 'relative',
             ],
             'heading_permalink' => [
diff --git a/packages/framework/src/Pages/DocumentationPage.php b/packages/framework/src/Pages/DocumentationPage.php
index c9df40fe15c..6ca14b5b9b8 100644
--- a/packages/framework/src/Pages/DocumentationPage.php
+++ b/packages/framework/src/Pages/DocumentationPage.php
@@ -51,7 +51,7 @@ public function getOnlineSourcePath(): string|false
 
     public static function hasTableOfContents(): bool
     {
-        return Config::getBool('docs.table_of_contents.enabled', true);
+        return Config::getBool('docs.sidebar.table_of_contents.enabled', true);
     }
 
     /**
diff --git a/packages/framework/tests/Feature/MarkdownServiceTest.php b/packages/framework/tests/Feature/MarkdownServiceTest.php
index d3c68a835ef..aac0df233e0 100644
--- a/packages/framework/tests/Feature/MarkdownServiceTest.php
+++ b/packages/framework/tests/Feature/MarkdownServiceTest.php
@@ -192,7 +192,7 @@ public function testMethodCanEnablePermalinksIsAutomaticallyForDocumentationPage
     {
         $service = new MarkdownServiceTestClass(pageClass: DocumentationPage::class);
 
-        Config::set('docs.table_of_contents.enabled', true);
+        Config::set('docs.sidebar.table_of_contents.enabled', true);
 
         $this->assertTrue($service->canEnablePermalinks());
     }
diff --git a/packages/framework/tests/Unit/DocumentationPageTest.php b/packages/framework/tests/Unit/DocumentationPageTest.php
index b725e59477a..9304a4955c1 100644
--- a/packages/framework/tests/Unit/DocumentationPageTest.php
+++ b/packages/framework/tests/Unit/DocumentationPageTest.php
@@ -195,10 +195,10 @@ public function testHasTableOfContents()
     {
         $this->assertIsBool(DocumentationPage::hasTableOfContents());
 
-        Config::set('docs.table_of_contents.enabled', true);
+        Config::set('docs.sidebar.table_of_contents.enabled', true);
         $this->assertTrue(DocumentationPage::hasTableOfContents());
 
-        Config::set('docs.table_of_contents.enabled', false);
+        Config::set('docs.sidebar.table_of_contents.enabled', false);
         $this->assertFalse(DocumentationPage::hasTableOfContents());
     }
 

From 57a013e7936690b0e73cce9a8ea3bb8b5f6da8a9 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 22 Feb 2024 21:12:27 +0100
Subject: [PATCH 0616/1422] Implement skipped tests

---
 .../AutomaticNavigationConfigurationsTest.php | 25 ++++++++++++++-----
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 98541a8be20..e6f8926327e 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -545,6 +545,18 @@ public function testCanMixSubdirectoryDropdownsWithFrontMatterDropdowns()
         ]);
     }
 
+    public function testMainMenuAutomaticDropdownLabelsCanBeSetInConfig()
+    {
+        config(['hyde.navigation.subdirectories' => 'dropdown']);
+        config(['hyde.navigation.labels' => ['foo' => 'Bar']]);
+
+        $this->assertMenuEquals([
+            ['label' => 'Bar', 'children' => ['Bar']],
+        ], [
+            new MarkdownPage('foo/bar'),
+        ]);
+    }
+
     // Documentation sidebar menu tests
 
     public function testSidebarWithPages()
@@ -846,14 +858,15 @@ public function testSidebarWithConfigLabels()
         ]);
     }
 
-    public function testSidebarDropdownLabelsCanBeSetInConfig()
+    public function testSidebarGroupLabelsCanBeSetInConfig()
     {
-        $this->markTestSkipped('Not yet implemented');
-    }
+        config(['docs.sidebar_group_labels' => ['foo' => 'Bar']]);
 
-    public function testSidebarAutomaticDropdownLabelsCanBeSetInConfig()
-    {
-        $this->markTestSkipped('Not yet implemented');
+        $this->assertSidebarEquals([
+            ['label' => 'Bar', 'children' => ['Bar']],
+        ], [
+            new DocumentationPage('foo/bar'),
+        ]);
     }
 
     public function testSidebarWithConfigHidden()

From af79a2c591795fa3b3a2a18829613239dd08e269 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 23 Feb 2024 11:05:34 +0100
Subject: [PATCH 0617/1422] Support setting sidebar labels in config

---
 .../Factories/NavigationDataFactory.php       | 21 +++++++++++++++++--
 .../AutomaticNavigationConfigurationsTest.php |  2 --
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/packages/framework/src/Framework/Factories/NavigationDataFactory.php b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
index 7d02a193d4e..2503fa0c027 100644
--- a/packages/framework/src/Framework/Factories/NavigationDataFactory.php
+++ b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
@@ -73,7 +73,7 @@ public function toArray(): array
     protected function makeLabel(): ?string
     {
         return $this->searchForLabelInFrontMatter()
-            ?? $this->searchForLabelInConfig()
+            ?? $this->searchForLabelInConfigs()
             ?? $this->getMatter('title')
             ?? $this->title;
     }
@@ -139,7 +139,14 @@ private function searchForPriorityInFrontMatter(): ?int
             ?? $this->getMatter('navigation.order');
     }
 
-    private function searchForLabelInConfig(): ?string
+    private function searchForLabelInConfigs(): ?string
+    {
+        return $this->isInstanceOf(DocumentationPage::class)
+            ? $this->searchForLabelInSidebarConfig()
+            : $this->searchForLabelInNavigationConfig();
+    }
+
+    private function searchForLabelInNavigationConfig(): ?string
     {
         /** @var array<string, string> $config */
         $config = Config::getArray('hyde.navigation.labels', [
@@ -150,6 +157,16 @@ private function searchForLabelInConfig(): ?string
         return $config[$this->routeKey] ?? null;
     }
 
+    private function searchForLabelInSidebarConfig(): ?string
+    {
+        /** @var array<string>|array<string, string> $config */
+        $config = Config::getArray('docs.sidebar.labels', [
+            DocumentationPage::homeRouteName() => 'Docs',
+        ]);
+
+        return $config[$this->routeKey] ?? $config[$this->identifier] ?? null;
+    }
+
     private function searchForPriorityInConfigs(): ?int
     {
         return $this->isInstanceOf(DocumentationPage::class)
diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index e6f8926327e..319769282fc 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -847,8 +847,6 @@ public function testSidebarWithMixedConfigOrders()
 
     public function testSidebarWithConfigLabels()
     {
-        $this->markTestSkipped('Not supported (yet?)');
-
         config(['docs.sidebar.labels' => ['foo' => 'First', 'bar' => 'Second', 'baz' => 'Third']]);
 
         $this->assertSidebarEquals(['First', 'Second', 'Third'], [

From 3431ebebd606c4def6aff696f20414d01f5b7330 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 23 Feb 2024 11:25:06 +0100
Subject: [PATCH 0618/1422] Generate tests from patch using GPT 4

---
 .../Unit/NavigationDataFactoryUnitTest.php    | 52 +++++++++++++++++++
 1 file changed, 52 insertions(+)

diff --git a/packages/framework/tests/Unit/NavigationDataFactoryUnitTest.php b/packages/framework/tests/Unit/NavigationDataFactoryUnitTest.php
index 9674273bf75..1b764372e0c 100644
--- a/packages/framework/tests/Unit/NavigationDataFactoryUnitTest.php
+++ b/packages/framework/tests/Unit/NavigationDataFactoryUnitTest.php
@@ -146,6 +146,53 @@ public function testRouteKeysCanBeUsedForDocumentationSidebarPriorities()
         $this->assertSame(502, $factory->makePriority());
     }
 
+    public function testSearchForLabelInNavigationConfigForMarkdownPage()
+    {
+        self::mockConfig([
+            'hyde.navigation.labels' => [
+                'foo' => 'Foo Label',
+                'bar' => 'Bar Label',
+            ],
+        ]);
+
+        $factory = new NavigationConfigTestClass($this->makeCoreDataObject(routeKey: 'foo'));
+        $this->assertSame('Foo Label', $factory->makeLabel());
+
+        $factory = new NavigationConfigTestClass($this->makeCoreDataObject(routeKey: 'bar'));
+        $this->assertSame('Bar Label', $factory->makeLabel());
+    }
+
+    public function testSearchForLabelInSidebarConfigForDocumentationPage()
+    {
+        self::mockConfig([
+            'docs.sidebar.labels' => [
+                'foo' => 'Documentation Foo Label',
+                'bar' => 'Documentation Bar Label',
+            ],
+        ]);
+
+        $factory = new NavigationConfigTestClass($this->makeCoreDataObject(routeKey: 'foo', pageClass: DocumentationPage::class));
+        $this->assertSame('Documentation Foo Label', $factory->makeLabel());
+
+        $factory = new NavigationConfigTestClass($this->makeCoreDataObject(routeKey: 'bar', pageClass: DocumentationPage::class));
+        $this->assertSame('Documentation Bar Label', $factory->makeLabel());
+    }
+
+    public function testLabelFallbackToTitleIfNotDefinedInConfig()
+    {
+        self::mockConfig([
+            'hyde.navigation.labels' => [],
+            'docs.sidebar.labels' => [],
+        ]);
+
+        // Assuming the title fallback is correctly set in front matter or title property
+        $frontMatter = new FrontMatter(['title' => 'Fallback Title']);
+        $coreDataObject = new CoreDataObject($frontMatter, new Markdown(), MarkdownPage::class, '', '', '', 'undefinedKey');
+
+        $factory = new NavigationConfigTestClass($coreDataObject);
+        $this->assertSame('Fallback Title', $factory->makeLabel());
+    }
+
     protected function makeCoreDataObject(string $identifier = '', string $routeKey = '', string $pageClass = MarkdownPage::class): CoreDataObject
     {
         return new CoreDataObject(new FrontMatter(), new Markdown(), $pageClass, $identifier, '', '', $routeKey);
@@ -163,4 +210,9 @@ public function makePriority(): int
     {
         return parent::makePriority();
     }
+
+    public function makeLabel(): ?string
+    {
+        return parent::makeLabel();
+    }
 }

From 7adb3435e1bce47829b679d5a2171502f85b2f39 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 23 Feb 2024 12:22:41 +0100
Subject: [PATCH 0619/1422] Support setting sidebar hidden state in config

---
 .../Factories/NavigationDataFactory.php          | 16 +++++++++++++++-
 .../AutomaticNavigationConfigurationsTest.php    |  2 --
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/packages/framework/src/Framework/Factories/NavigationDataFactory.php b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
index 2503fa0c027..6a40d250ece 100644
--- a/packages/framework/src/Framework/Factories/NavigationDataFactory.php
+++ b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
@@ -91,7 +91,7 @@ protected function makeHidden(): bool
     {
         return $this->isInstanceOf(MarkdownPost::class)
             || $this->searchForHiddenInFrontMatter()
-            || $this->isPageHiddenInNavigationConfiguration()
+            || $this->searchForHiddenInConfigs()
             || $this->isNonDocumentationPageInHiddenSubdirectory();
     }
 
@@ -120,11 +120,25 @@ private function searchForHiddenInFrontMatter(): ?bool
             ?? $this->invert($this->getMatter('navigation.visible'));
     }
 
+    private function searchForHiddenInConfigs(): ?bool
+    {
+        return $this->isInstanceOf(DocumentationPage::class)
+            ? $this->isPageHiddenInSidebarConfiguration()
+            : $this->isPageHiddenInNavigationConfiguration();
+    }
+
     private function isPageHiddenInNavigationConfiguration(): ?bool
     {
         return in_array($this->routeKey, Config::getArray('hyde.navigation.exclude', ['404']));
     }
 
+    private function isPageHiddenInSidebarConfiguration(): ?bool
+    {
+        $config = Config::getArray('docs.sidebar.exclude', ['404']);
+
+        return in_array($this->routeKey, $config) || in_array($this->identifier, $config);
+    }
+
     private function isNonDocumentationPageInHiddenSubdirectory(): bool
     {
         return ! $this->isInstanceOf(DocumentationPage::class)
diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 319769282fc..16436394c3e 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -869,8 +869,6 @@ public function testSidebarGroupLabelsCanBeSetInConfig()
 
     public function testSidebarWithConfigHidden()
     {
-        $this->markTestSkipped('Not supported (yet?)');
-
         config(['docs.sidebar.exclude' => ['foo', 'bar', 'baz']]);
 
         $this->assertSidebarEquals([], [

From 2f0c88cba582a210463964430297753697acf884 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 23 Feb 2024 12:31:13 +0100
Subject: [PATCH 0620/1422] Add auxiliary check to allow hiding docs index from
 main navigation

For backwards compatibility we keep this desired logic
---
 .../framework/src/Framework/Factories/NavigationDataFactory.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Factories/NavigationDataFactory.php b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
index 6a40d250ece..c6c62d3c9e1 100644
--- a/packages/framework/src/Framework/Factories/NavigationDataFactory.php
+++ b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
@@ -136,7 +136,7 @@ private function isPageHiddenInSidebarConfiguration(): ?bool
     {
         $config = Config::getArray('docs.sidebar.exclude', ['404']);
 
-        return in_array($this->routeKey, $config) || in_array($this->identifier, $config);
+        return in_array($this->routeKey, $config) || in_array($this->identifier, $config) || $this->isPageHiddenInNavigationConfiguration();
     }
 
     private function isNonDocumentationPageInHiddenSubdirectory(): bool

From f4606cc8edef4ba7d03ff90fd7a5cfbba3f68844 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 23 Feb 2024 12:32:32 +0100
Subject: [PATCH 0621/1422] Generate tests from patch using GPT 4

---
 .../Unit/NavigationDataFactoryUnitTest.php    | 49 +++++++++++++++++++
 1 file changed, 49 insertions(+)

diff --git a/packages/framework/tests/Unit/NavigationDataFactoryUnitTest.php b/packages/framework/tests/Unit/NavigationDataFactoryUnitTest.php
index 1b764372e0c..85719ae6611 100644
--- a/packages/framework/tests/Unit/NavigationDataFactoryUnitTest.php
+++ b/packages/framework/tests/Unit/NavigationDataFactoryUnitTest.php
@@ -193,6 +193,50 @@ public function testLabelFallbackToTitleIfNotDefinedInConfig()
         $this->assertSame('Fallback Title', $factory->makeLabel());
     }
 
+    public function testPageIsHiddenBasedOnNavigationConfiguration()
+    {
+        self::mockConfig(['hyde.navigation.exclude' => ['hiddenPage']]);
+
+        $factory = new NavigationConfigTestClass($this->makeCoreDataObject(routeKey: 'hiddenPage'));
+        $this->assertTrue($factory->makeHidden());
+
+        $factory = new NavigationConfigTestClass($this->makeCoreDataObject(routeKey: 'visiblePage'));
+        $this->assertFalse($factory->makeHidden());
+    }
+
+    public function testPageIsHiddenBasedOnSidebarConfigurationForDocumentationPage()
+    {
+        self::mockConfig(['docs.sidebar.exclude' => ['hiddenDocPage']]);
+
+        $factory = new NavigationConfigTestClass($this->makeCoreDataObject('hiddenDocPage', pageClass: DocumentationPage::class));
+        $this->assertTrue($factory->makeHidden());
+
+        $factory = new NavigationConfigTestClass($this->makeCoreDataObject('visibleDocPage', pageClass: DocumentationPage::class));
+        $this->assertFalse($factory->makeHidden());
+    }
+
+    public function testSearchForHiddenInConfigsSelectsCorrectConfigurationBasedOnPageType()
+    {
+        self::mockConfig([
+            'hyde.navigation.exclude' => ['hiddenPage'],
+            'docs.sidebar.exclude' => ['hiddenDocPage'],
+        ]);
+
+        // Test for a Markdown page, should use navigation.exclude config
+        $factory = new NavigationConfigTestClass($this->makeCoreDataObject(routeKey: 'hiddenPage'));
+        $this->assertTrue($factory->makeHidden());
+
+        $factory = new NavigationConfigTestClass($this->makeCoreDataObject(routeKey: 'visiblePage'));
+        $this->assertFalse($factory->makeHidden());
+
+        // Test for a Documentation page, should use docs.sidebar.exclude config
+        $factory = new NavigationConfigTestClass($this->makeCoreDataObject('hiddenDocPage', pageClass: DocumentationPage::class));
+        $this->assertTrue($factory->makeHidden());
+
+        $factory = new NavigationConfigTestClass($this->makeCoreDataObject('visibleDocPage', pageClass: DocumentationPage::class));
+        $this->assertFalse($factory->makeHidden());
+    }
+
     protected function makeCoreDataObject(string $identifier = '', string $routeKey = '', string $pageClass = MarkdownPage::class): CoreDataObject
     {
         return new CoreDataObject(new FrontMatter(), new Markdown(), $pageClass, $identifier, '', '', $routeKey);
@@ -215,4 +259,9 @@ public function makeLabel(): ?string
     {
         return parent::makeLabel();
     }
+
+    public function makeHidden(): bool
+    {
+        return parent::makeHidden();
+    }
 }

From b93174f9926b8ddfecb7b7c7504e09ba1dc68710 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 23 Feb 2024 12:32:38 +0100
Subject: [PATCH 0622/1422] Document reasoning behind code

---
 .../src/Framework/Factories/NavigationDataFactory.php       | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Factories/NavigationDataFactory.php b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
index c6c62d3c9e1..e131e6adb21 100644
--- a/packages/framework/src/Framework/Factories/NavigationDataFactory.php
+++ b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
@@ -136,7 +136,11 @@ private function isPageHiddenInSidebarConfiguration(): ?bool
     {
         $config = Config::getArray('docs.sidebar.exclude', ['404']);
 
-        return in_array($this->routeKey, $config) || in_array($this->identifier, $config) || $this->isPageHiddenInNavigationConfiguration();
+        return
+            // Check if the page is hidden from the sidebar by route key or identifier.
+            (in_array($this->routeKey, $config) || in_array($this->identifier, $config))
+            // Check if the page is hidden from the main navigation by its route key.
+            || $this->isPageHiddenInNavigationConfiguration();
     }
 
     private function isNonDocumentationPageInHiddenSubdirectory(): bool

From 956b5e387c7b19731cc3623aee2ad3495facd4c6 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 23 Feb 2024 21:03:06 +0100
Subject: [PATCH 0623/1422] Clarify test method name

---
 .../tests/Feature/AutomaticNavigationConfigurationsTest.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 16436394c3e..4687c25118a 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -407,7 +407,7 @@ public function testMainNavigationDropdownLabelsCanBeSetInConfig()
         $this->markTestSkipped('Not yet implemented');
     }
 
-    public function testMainNavigationAutomaticDropdownLabelsCanBeSetInConfig()
+    public function testMainNavigationAutomaticSubdirectoryDropdownLabelsCanBeSetInConfig()
     {
         $this->markTestSkipped('Not yet implemented');
     }

From aa55e5f3b1f953c8d95a657c5e86aa1c2ef78305 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 23 Feb 2024 21:20:40 +0100
Subject: [PATCH 0624/1422] Implement test

---
 .../Feature/AutomaticNavigationConfigurationsTest.php      | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 4687c25118a..064f1a9b50c 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -404,7 +404,12 @@ public function testMainNavigationMenuWithConfigLabels()
 
     public function testMainNavigationDropdownLabelsCanBeSetInConfig()
     {
-        $this->markTestSkipped('Not yet implemented');
+        config(['hyde.navigation.subdirectories' => 'dropdown']); // TODO This should NOT be necessary when using front matter
+        config(['hyde.navigation.labels' => ['foo' => 'Bar']]);
+
+        $this->assertMenuEquals(['Bar'], [
+            new MarkdownPage('child', ['navigation.group' => 'foo']),
+        ]);
     }
 
     public function testMainNavigationAutomaticSubdirectoryDropdownLabelsCanBeSetInConfig()

From 98459bbf1919ba908ab4451a3a07064b662dc510 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 23 Feb 2024 21:21:00 +0100
Subject: [PATCH 0625/1422] Change test data to be clearer

Foo be confusing sometimes
---
 .../tests/Feature/AutomaticNavigationConfigurationsTest.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 064f1a9b50c..f3012979fe0 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -405,10 +405,10 @@ public function testMainNavigationMenuWithConfigLabels()
     public function testMainNavigationDropdownLabelsCanBeSetInConfig()
     {
         config(['hyde.navigation.subdirectories' => 'dropdown']); // TODO This should NOT be necessary when using front matter
-        config(['hyde.navigation.labels' => ['foo' => 'Bar']]);
+        config(['hyde.navigation.labels' => ['hello' => 'World']]);
 
-        $this->assertMenuEquals(['Bar'], [
-            new MarkdownPage('child', ['navigation.group' => 'foo']),
+        $this->assertMenuEquals(['World'], [
+            new MarkdownPage('foo', ['navigation.group' => 'Hello']),
         ]);
     }
 

From aa4fc0f4eaef9d3776582889a61180c3b2d6ac5b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 23 Feb 2024 21:22:54 +0100
Subject: [PATCH 0626/1422] Implement test

---
 .../Feature/AutomaticNavigationConfigurationsTest.php      | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index f3012979fe0..8c8142bbcea 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -414,7 +414,12 @@ public function testMainNavigationDropdownLabelsCanBeSetInConfig()
 
     public function testMainNavigationAutomaticSubdirectoryDropdownLabelsCanBeSetInConfig()
     {
-        $this->markTestSkipped('Not yet implemented');
+        config(['hyde.navigation.subdirectories' => 'dropdown']);
+        config(['hyde.navigation.labels' => ['hello' => 'World']]);
+
+        $this->assertMenuEquals(['World'], [
+            new MarkdownPage('hello/world'),
+        ]);
     }
 
     public function testMainNavigationMenuWithConfigHidden()

From 6dd834b38efa8520c464dc2d908c50d0dc98b6af Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 24 Feb 2024 13:26:24 +0100
Subject: [PATCH 0627/1422] Clarify helper method name

---
 .../Framework/Features/Navigation/DocumentationSidebar.php    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 3f2d3d54480..042f8186f44 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -33,12 +33,12 @@ public function hasGroups(): bool
     public function isGroupActive(string $group): bool
     {
         $groupMatchesCurrentPageGroup = Str::slug(Render::getPage()->navigationMenuGroup()) === $group;
-        $currentPageIsIndexPageAndShouldBeActive = $this->isPageIndexPage() && $this->shouldIndexPageBeActive($group);
+        $currentPageIsIndexPageAndShouldBeActive = $this->isCurrentPageIndexPage() && $this->shouldIndexPageBeActive($group);
 
         return $groupMatchesCurrentPageGroup || $currentPageIsIndexPageAndShouldBeActive;
     }
 
-    private function isPageIndexPage(): bool
+    private function isCurrentPageIndexPage(): bool
     {
         return Render::getPage()->getRoute()->is(DocumentationPage::homeRouteName());
     }

From 3f68b03631c433b1c25982179646d32ce14dd6d1 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 24 Feb 2024 13:29:33 +0100
Subject: [PATCH 0628/1422] Remove unnecessary type annotation comment

---
 .../resources/views/components/docs/sidebar-items.blade.php      | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/framework/resources/views/components/docs/sidebar-items.blade.php b/packages/framework/resources/views/components/docs/sidebar-items.blade.php
index 615ea53dcd4..9f7bfc12451 100644
--- a/packages/framework/resources/views/components/docs/sidebar-items.blade.php
+++ b/packages/framework/resources/views/components/docs/sidebar-items.blade.php
@@ -1,4 +1,3 @@
-@php /** @var \Hyde\Framework\Features\Navigation\DocumentationSidebar $sidebar */ @endphp
 @if(! $sidebar->hasGroups())
     <ul id="sidebar-items" role="list" class="pl-2">
         @foreach ($sidebar->getItems() as $item)

From 1f433e30f28d42f9dfc41a280c5a911c84fc3323 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 24 Feb 2024 13:36:29 +0100
Subject: [PATCH 0629/1422] Create DocumentationSidebarUnitTest.php

---
 .../tests/Unit/DocumentationSidebarUnitTest.php | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 packages/framework/tests/Unit/DocumentationSidebarUnitTest.php

diff --git a/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php b/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
new file mode 100644
index 00000000000..a12224bee2a
--- /dev/null
+++ b/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
@@ -0,0 +1,17 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Hyde\Framework\Testing\Unit;
+
+use Hyde\Testing\UnitTestCase;
+
+/**
+ * @covers \Hyde\Framework\Features\Navigation\DocumentationSidebar
+ *
+ * @see \Hyde\Framework\Testing\Feature\Services\DocumentationSidebarTest
+ */
+class DocumentationSidebarUnitTest extends UnitTestCase
+{
+    //
+}

From e35d45807e66e1ca29917103d7a6192628ced5de Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 24 Feb 2024 13:37:02 +0100
Subject: [PATCH 0630/1422] Link to unit test

---
 .../tests/Feature/Services/DocumentationSidebarTest.php         | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
index 3bb0b2b6545..35de82258a4 100644
--- a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
+++ b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
@@ -24,6 +24,8 @@
  * @covers \Hyde\Framework\Factories\Concerns\HasFactory
  * @covers \Hyde\Framework\Factories\NavigationDataFactory
  * @covers \Hyde\Framework\Features\Navigation\NavItem
+ *
+ * @see \Hyde\Framework\Testing\Unit\DocumentationSidebarUnitTest
  */
 class DocumentationSidebarTest extends TestCase
 {

From 5323caf22b08ff370035b6060645e93a96096647 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 24 Feb 2024 13:40:51 +0100
Subject: [PATCH 0631/1422] Copy over and adapt unit tests from navigation menu
 unit test

---
 .../Unit/DocumentationSidebarUnitTest.php     | 101 +++++++++++++++++-
 1 file changed, 100 insertions(+), 1 deletion(-)

diff --git a/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php b/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
index a12224bee2a..f8123b073e3 100644
--- a/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
+++ b/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
@@ -5,6 +5,10 @@
 namespace Hyde\Framework\Testing\Unit;
 
 use Hyde\Testing\UnitTestCase;
+use Illuminate\Support\Collection;
+use Hyde\Support\Models\ExternalRoute;
+use Hyde\Framework\Features\Navigation\NavItem;
+use Hyde\Framework\Features\Navigation\DocumentationSidebar;
 
 /**
  * @covers \Hyde\Framework\Features\Navigation\DocumentationSidebar
@@ -13,5 +17,100 @@
  */
 class DocumentationSidebarUnitTest extends UnitTestCase
 {
-    //
+    public function testCanConstruct()
+    {
+        $this->assertInstanceOf(DocumentationSidebar::class, new DocumentationSidebar());
+    }
+
+    public function testCanConstructWithItemsArray()
+    {
+        $this->assertInstanceOf(DocumentationSidebar::class, new DocumentationSidebar($this->getItems()));
+    }
+
+    public function testCanConstructWithItemsArrayable()
+    {
+        $this->assertInstanceOf(DocumentationSidebar::class, new DocumentationSidebar(collect($this->getItems())));
+    }
+
+    public function testGetItemsReturnsCollection()
+    {
+        $this->assertInstanceOf(Collection::class, (new DocumentationSidebar())->getItems());
+    }
+
+    public function testGetItemsReturnsCollectionWhenSuppliedArray()
+    {
+        $this->assertInstanceOf(Collection::class, (new DocumentationSidebar($this->getItems()))->getItems());
+    }
+
+    public function testGetItemsReturnsCollectionWhenSuppliedArrayable()
+    {
+        $this->assertInstanceOf(Collection::class, (new DocumentationSidebar(collect($this->getItems())))->getItems());
+    }
+
+    public function testGetItemsReturnsItems()
+    {
+        $items = $this->getItems();
+
+        $this->assertSame($items, (new DocumentationSidebar($items))->getItems()->all());
+    }
+
+    public function testGetItemsReturnsItemsWhenSuppliedArrayable()
+    {
+        $items = $this->getItems();
+
+        $this->assertSame($items, (new DocumentationSidebar(collect($items)))->getItems()->all());
+    }
+
+    public function testGetItemsReturnsEmptyArrayWhenNoItems()
+    {
+        $this->assertSame([], (new DocumentationSidebar())->getItems()->all());
+    }
+
+    public function testCanAddItems()
+    {
+        $menu = new DocumentationSidebar();
+        $item = new NavItem(new ExternalRoute('/'), 'Home');
+
+        $menu->add($item);
+
+        $this->assertCount(1, $menu->getItems());
+        $this->assertSame($item, $menu->getItems()->first());
+    }
+
+    public function testItemsAreInTheOrderTheyWereAddedWhenThereAreNoCustomPriorities()
+    {
+        $menu = new DocumentationSidebar();
+        $item1 = new NavItem(new ExternalRoute('/'), 'Home');
+        $item2 = new NavItem(new ExternalRoute('/about'), 'About');
+        $item3 = new NavItem(new ExternalRoute('/contact'), 'Contact');
+
+        $menu->add($item1);
+        $menu->add($item2);
+        $menu->add($item3);
+
+        $this->assertSame([$item1, $item2, $item3], $menu->getItems()->all());
+    }
+
+    public function testItemsAreSortedByPriority()
+    {
+        $menu = new DocumentationSidebar();
+        $item1 = new NavItem(new ExternalRoute('/'), 'Home', 100);
+        $item2 = new NavItem(new ExternalRoute('/about'), 'About', 200);
+        $item3 = new NavItem(new ExternalRoute('/contact'), 'Contact', 300);
+
+        $menu->add($item3);
+        $menu->add($item1);
+        $menu->add($item2);
+
+        $this->assertSame([$item1, $item2, $item3], $menu->getItems()->all());
+    }
+
+    protected function getItems(): array
+    {
+        return [
+            new NavItem(new ExternalRoute('/'), 'Home'),
+            new NavItem(new ExternalRoute('/about'), 'About'),
+            new NavItem(new ExternalRoute('/contact'), 'Contact'),
+        ];
+    }
 }

From a41b5aa1dc9977c2b909f232439c87bf02d5f37e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 24 Feb 2024 13:46:35 +0100
Subject: [PATCH 0632/1422] Extract testing helper method

---
 .../Unit/DocumentationSidebarUnitTest.php     | 25 +++++++++++--------
 .../tests/Unit/NavigationMenuUnitTest.php     | 25 +++++++++++--------
 2 files changed, 30 insertions(+), 20 deletions(-)

diff --git a/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php b/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
index f8123b073e3..0b5f6e170b8 100644
--- a/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
+++ b/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
@@ -69,7 +69,7 @@ public function testGetItemsReturnsEmptyArrayWhenNoItems()
     public function testCanAddItems()
     {
         $menu = new DocumentationSidebar();
-        $item = new NavItem(new ExternalRoute('/'), 'Home');
+        $item = $this->item('/', 'Home');
 
         $menu->add($item);
 
@@ -80,9 +80,9 @@ public function testCanAddItems()
     public function testItemsAreInTheOrderTheyWereAddedWhenThereAreNoCustomPriorities()
     {
         $menu = new DocumentationSidebar();
-        $item1 = new NavItem(new ExternalRoute('/'), 'Home');
-        $item2 = new NavItem(new ExternalRoute('/about'), 'About');
-        $item3 = new NavItem(new ExternalRoute('/contact'), 'Contact');
+        $item1 = $this->item('/', 'Home');
+        $item2 = $this->item('/about', 'About');
+        $item3 = $this->item('/contact', 'Contact');
 
         $menu->add($item1);
         $menu->add($item2);
@@ -94,9 +94,9 @@ public function testItemsAreInTheOrderTheyWereAddedWhenThereAreNoCustomPrioritie
     public function testItemsAreSortedByPriority()
     {
         $menu = new DocumentationSidebar();
-        $item1 = new NavItem(new ExternalRoute('/'), 'Home', 100);
-        $item2 = new NavItem(new ExternalRoute('/about'), 'About', 200);
-        $item3 = new NavItem(new ExternalRoute('/contact'), 'Contact', 300);
+        $item1 = $this->item('/', 'Home', 100);
+        $item2 = $this->item('/about', 'About', 200);
+        $item3 = $this->item('/contact', 'Contact', 300);
 
         $menu->add($item3);
         $menu->add($item1);
@@ -108,9 +108,14 @@ public function testItemsAreSortedByPriority()
     protected function getItems(): array
     {
         return [
-            new NavItem(new ExternalRoute('/'), 'Home'),
-            new NavItem(new ExternalRoute('/about'), 'About'),
-            new NavItem(new ExternalRoute('/contact'), 'Contact'),
+            $this->item('/', 'Home'),
+            $this->item('/about', 'About'),
+            $this->item('/contact', 'Contact'),
         ];
     }
+
+    protected function item(string $destination, string $label, int $priority = 500): NavItem
+    {
+        return new NavItem(new ExternalRoute($destination), $label, $priority);
+    }
 }
diff --git a/packages/framework/tests/Unit/NavigationMenuUnitTest.php b/packages/framework/tests/Unit/NavigationMenuUnitTest.php
index 1b0f9a08a58..aa654e3cf2b 100644
--- a/packages/framework/tests/Unit/NavigationMenuUnitTest.php
+++ b/packages/framework/tests/Unit/NavigationMenuUnitTest.php
@@ -70,7 +70,7 @@ public function testGetItemsReturnsEmptyArrayWhenNoItems()
     public function testCanAddItems()
     {
         $menu = new MainNavigationMenu();
-        $item = new NavItem(new ExternalRoute('/'), 'Home');
+        $item = $this->item('/', 'Home');
 
         $menu->add($item);
 
@@ -81,9 +81,9 @@ public function testCanAddItems()
     public function testItemsAreInTheOrderTheyWereAddedWhenThereAreNoCustomPriorities()
     {
         $menu = new MainNavigationMenu();
-        $item1 = new NavItem(new ExternalRoute('/'), 'Home');
-        $item2 = new NavItem(new ExternalRoute('/about'), 'About');
-        $item3 = new NavItem(new ExternalRoute('/contact'), 'Contact');
+        $item1 = $this->item('/', 'Home');
+        $item2 = $this->item('/about', 'About');
+        $item3 = $this->item('/contact', 'Contact');
 
         $menu->add($item1);
         $menu->add($item2);
@@ -95,9 +95,9 @@ public function testItemsAreInTheOrderTheyWereAddedWhenThereAreNoCustomPrioritie
     public function testItemsAreSortedByPriority()
     {
         $menu = new MainNavigationMenu();
-        $item1 = new NavItem(new ExternalRoute('/'), 'Home', 100);
-        $item2 = new NavItem(new ExternalRoute('/about'), 'About', 200);
-        $item3 = new NavItem(new ExternalRoute('/contact'), 'Contact', 300);
+        $item1 = $this->item('/', 'Home', 100);
+        $item2 = $this->item('/about', 'About', 200);
+        $item3 = $this->item('/contact', 'Contact', 300);
 
         $menu->add($item3);
         $menu->add($item1);
@@ -109,9 +109,14 @@ public function testItemsAreSortedByPriority()
     protected function getItems(): array
     {
         return [
-            new NavItem(new ExternalRoute('/'), 'Home'),
-            new NavItem(new ExternalRoute('/about'), 'About'),
-            new NavItem(new ExternalRoute('/contact'), 'Contact'),
+            $this->item('/', 'Home'),
+            $this->item('/about', 'About'),
+            $this->item('/contact', 'Contact'),
         ];
     }
+
+    protected function item(string $destination, string $label, int $priority = 500): NavItem
+    {
+        return new NavItem(new ExternalRoute($destination), $label, $priority);
+    }
 }

From 29b14d6ea425972f7c92092e85ad3f356b751a05 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 24 Feb 2024 13:54:51 +0100
Subject: [PATCH 0633/1422] Cover base class

---
 packages/framework/tests/Unit/DocumentationSidebarUnitTest.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php b/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
index 0b5f6e170b8..cce704cd337 100644
--- a/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
+++ b/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
@@ -12,6 +12,7 @@
 
 /**
  * @covers \Hyde\Framework\Features\Navigation\DocumentationSidebar
+ * @covers \Hyde\Framework\Features\Navigation\NavigationMenu
  *
  * @see \Hyde\Framework\Testing\Feature\Services\DocumentationSidebarTest
  */

From e5a298976487cfde3ba8a730f18d78355034bc24 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 24 Feb 2024 13:55:07 +0100
Subject: [PATCH 0634/1422] Update test data to better suit subject

---
 .../Unit/DocumentationSidebarUnitTest.php     | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php b/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
index cce704cd337..b8db1d1ad6f 100644
--- a/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
+++ b/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
@@ -70,7 +70,7 @@ public function testGetItemsReturnsEmptyArrayWhenNoItems()
     public function testCanAddItems()
     {
         $menu = new DocumentationSidebar();
-        $item = $this->item('/', 'Home');
+        $item = $this->item('/', 'Docs');
 
         $menu->add($item);
 
@@ -81,9 +81,9 @@ public function testCanAddItems()
     public function testItemsAreInTheOrderTheyWereAddedWhenThereAreNoCustomPriorities()
     {
         $menu = new DocumentationSidebar();
-        $item1 = $this->item('/', 'Home');
-        $item2 = $this->item('/about', 'About');
-        $item3 = $this->item('/contact', 'Contact');
+        $item1 = $this->item('/', 'Docs');
+        $item2 = $this->item('/installation', 'Installation');
+        $item3 = $this->item('/getting-started', 'Getting Started');
 
         $menu->add($item1);
         $menu->add($item2);
@@ -95,9 +95,9 @@ public function testItemsAreInTheOrderTheyWereAddedWhenThereAreNoCustomPrioritie
     public function testItemsAreSortedByPriority()
     {
         $menu = new DocumentationSidebar();
-        $item1 = $this->item('/', 'Home', 100);
-        $item2 = $this->item('/about', 'About', 200);
-        $item3 = $this->item('/contact', 'Contact', 300);
+        $item1 = $this->item('/', 'Docs', 100);
+        $item2 = $this->item('/installation', 'Installation', 200);
+        $item3 = $this->item('/getting-started', 'Getting Started', 300);
 
         $menu->add($item3);
         $menu->add($item1);
@@ -109,9 +109,9 @@ public function testItemsAreSortedByPriority()
     protected function getItems(): array
     {
         return [
-            $this->item('/', 'Home'),
-            $this->item('/about', 'About'),
-            $this->item('/contact', 'Contact'),
+            $this->item('/', 'Docs'),
+            $this->item('/installation', 'Installation'),
+            $this->item('/getting-started', 'Getting Started'),
         ];
     }
 

From b3aad5a8e1baf17049dd94e78ebfd2c1f846843d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 24 Feb 2024 13:56:01 +0100
Subject: [PATCH 0635/1422] Format test code

---
 packages/framework/tests/Unit/DocumentationSidebarUnitTest.php | 3 +++
 packages/framework/tests/Unit/NavigationMenuUnitTest.php       | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php b/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
index b8db1d1ad6f..2fd02cfd2cc 100644
--- a/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
+++ b/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
@@ -70,6 +70,7 @@ public function testGetItemsReturnsEmptyArrayWhenNoItems()
     public function testCanAddItems()
     {
         $menu = new DocumentationSidebar();
+
         $item = $this->item('/', 'Docs');
 
         $menu->add($item);
@@ -81,6 +82,7 @@ public function testCanAddItems()
     public function testItemsAreInTheOrderTheyWereAddedWhenThereAreNoCustomPriorities()
     {
         $menu = new DocumentationSidebar();
+
         $item1 = $this->item('/', 'Docs');
         $item2 = $this->item('/installation', 'Installation');
         $item3 = $this->item('/getting-started', 'Getting Started');
@@ -95,6 +97,7 @@ public function testItemsAreInTheOrderTheyWereAddedWhenThereAreNoCustomPrioritie
     public function testItemsAreSortedByPriority()
     {
         $menu = new DocumentationSidebar();
+
         $item1 = $this->item('/', 'Docs', 100);
         $item2 = $this->item('/installation', 'Installation', 200);
         $item3 = $this->item('/getting-started', 'Getting Started', 300);
diff --git a/packages/framework/tests/Unit/NavigationMenuUnitTest.php b/packages/framework/tests/Unit/NavigationMenuUnitTest.php
index aa654e3cf2b..5a9d765ea1c 100644
--- a/packages/framework/tests/Unit/NavigationMenuUnitTest.php
+++ b/packages/framework/tests/Unit/NavigationMenuUnitTest.php
@@ -70,6 +70,7 @@ public function testGetItemsReturnsEmptyArrayWhenNoItems()
     public function testCanAddItems()
     {
         $menu = new MainNavigationMenu();
+
         $item = $this->item('/', 'Home');
 
         $menu->add($item);
@@ -81,6 +82,7 @@ public function testCanAddItems()
     public function testItemsAreInTheOrderTheyWereAddedWhenThereAreNoCustomPriorities()
     {
         $menu = new MainNavigationMenu();
+
         $item1 = $this->item('/', 'Home');
         $item2 = $this->item('/about', 'About');
         $item3 = $this->item('/contact', 'Contact');
@@ -95,6 +97,7 @@ public function testItemsAreInTheOrderTheyWereAddedWhenThereAreNoCustomPrioritie
     public function testItemsAreSortedByPriority()
     {
         $menu = new MainNavigationMenu();
+
         $item1 = $this->item('/', 'Home', 100);
         $item2 = $this->item('/about', 'About', 200);
         $item3 = $this->item('/contact', 'Contact', 300);

From 86487fb9982bac1c7278dae6801cd1955af3d809 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 24 Feb 2024 14:11:26 +0100
Subject: [PATCH 0636/1422] Add todo

---
 .../framework/src/Framework/Features/Navigation/NavItem.php     | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 69b8b18bac3..487f5c78135 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -206,6 +206,8 @@ public function addChild(NavItem $item): void
         $this->children[] = $item;
     }
 
+    // Todo add method to add multiple children at once?
+
     protected static function normalizeGroupKey(?string $group): ?string
     {
         return $group ? Str::slug($group) : null;

From 6d91c3171882d043822ab4470846398901c4228d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 24 Feb 2024 14:12:05 +0100
Subject: [PATCH 0637/1422] Make `NavItem::addChild` method fluent

---
 .../src/Framework/Features/Navigation/NavItem.php         | 4 +++-
 packages/framework/tests/Unit/NavItemTest.php             | 8 ++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 487f5c78135..5be8695d751 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -199,11 +199,13 @@ public function isCurrent(): bool
     /**
      * Add a navigation item to the children of the navigation item.
      */
-    public function addChild(NavItem $item): void
+    public function addChild(NavItem $item): static
     {
         // Todo: Ensure that the item has a group identifier by creating it from the label if it doesn't exist?
 
         $this->children[] = $item;
+
+        return $this;
     }
 
     // Todo add method to add multiple children at once?
diff --git a/packages/framework/tests/Unit/NavItemTest.php b/packages/framework/tests/Unit/NavItemTest.php
index f2caf94538c..754d536f1ac 100644
--- a/packages/framework/tests/Unit/NavItemTest.php
+++ b/packages/framework/tests/Unit/NavItemTest.php
@@ -396,4 +396,12 @@ public function testCanAddItemToDropdown()
 
         $this->assertSame([$child], $parent->getChildren());
     }
+
+    public function testAddChildMethodReturnsSelf()
+    {
+        $parent = new NavItem(new Route(new MarkdownPage()), 'Parent', 500, 'foo');
+        $child = new NavItem(new Route(new MarkdownPage()), 'Child', 500, 'foo');
+
+        $this->assertSame($parent, $parent->addChild($child));
+    }
 }

From 14c40a8eba8b94b7812bdfdd02ca8fbb77220bb5 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 24 Feb 2024 14:14:49 +0100
Subject: [PATCH 0638/1422] Unit test has groups method

---
 .../Unit/DocumentationSidebarUnitTest.php     | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php b/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
index 2fd02cfd2cc..30aee410386 100644
--- a/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
+++ b/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
@@ -5,6 +5,7 @@
 namespace Hyde\Framework\Testing\Unit;
 
 use Hyde\Testing\UnitTestCase;
+use Hyde\Pages\DocumentationPage;
 use Illuminate\Support\Collection;
 use Hyde\Support\Models\ExternalRoute;
 use Hyde\Framework\Features\Navigation\NavItem;
@@ -109,6 +110,25 @@ public function testItemsAreSortedByPriority()
         $this->assertSame([$item1, $item2, $item3], $menu->getItems()->all());
     }
 
+    public function testHasGroupsReturnsFalseWhenNoItemsHaveChildren()
+    {
+        $this->assertFalse((new DocumentationSidebar())->hasGroups());
+    }
+
+    public function testHasGroupsReturnsTrueWhenAtLeastOneItemHasChildren()
+    {
+        self::mockConfig();
+        self::setupKernel();
+
+        $page = new DocumentationPage('foo');
+        $child = new DocumentationPage('bar');
+        $menu = new DocumentationSidebar([
+            NavItem::fromRoute($page->getRoute())->addChild(NavItem::fromRoute($child->getRoute())),
+        ]);
+
+        $this->assertTrue($menu->hasGroups());
+    }
+
     protected function getItems(): array
     {
         return [

From ae36b95f4c4ec1fcbeea0ba798fc9cbf2b56c91d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 24 Feb 2024 14:18:38 +0100
Subject: [PATCH 0639/1422] Categorize tests

---
 .../framework/tests/Unit/DocumentationSidebarUnitTest.php     | 4 ++++
 packages/framework/tests/Unit/NavigationMenuUnitTest.php      | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php b/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
index 30aee410386..f4cba3feb81 100644
--- a/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
+++ b/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
@@ -19,6 +19,8 @@
  */
 class DocumentationSidebarUnitTest extends UnitTestCase
 {
+    // Base menu tests
+
     public function testCanConstruct()
     {
         $this->assertInstanceOf(DocumentationSidebar::class, new DocumentationSidebar());
@@ -110,6 +112,8 @@ public function testItemsAreSortedByPriority()
         $this->assertSame([$item1, $item2, $item3], $menu->getItems()->all());
     }
 
+    // Sidebar specific tests
+
     public function testHasGroupsReturnsFalseWhenNoItemsHaveChildren()
     {
         $this->assertFalse((new DocumentationSidebar())->hasGroups());
diff --git a/packages/framework/tests/Unit/NavigationMenuUnitTest.php b/packages/framework/tests/Unit/NavigationMenuUnitTest.php
index 5a9d765ea1c..60948237682 100644
--- a/packages/framework/tests/Unit/NavigationMenuUnitTest.php
+++ b/packages/framework/tests/Unit/NavigationMenuUnitTest.php
@@ -18,6 +18,8 @@
  */
 class NavigationMenuUnitTest extends UnitTestCase
 {
+    // Base menu tests
+
     public function testCanConstruct()
     {
         $this->assertInstanceOf(MainNavigationMenu::class, new MainNavigationMenu());

From b456e324c6f87d4194e8e21997ec9ac2c6fc9e3b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 24 Feb 2024 14:19:04 +0100
Subject: [PATCH 0640/1422] Add test crosslinks

---
 packages/framework/tests/Unit/DocumentationSidebarUnitTest.php | 1 +
 packages/framework/tests/Unit/NavigationMenuUnitTest.php       | 1 +
 2 files changed, 2 insertions(+)

diff --git a/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php b/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
index f4cba3feb81..f6278a9291b 100644
--- a/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
+++ b/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
@@ -16,6 +16,7 @@
  * @covers \Hyde\Framework\Features\Navigation\NavigationMenu
  *
  * @see \Hyde\Framework\Testing\Feature\Services\DocumentationSidebarTest
+ * @see \Hyde\Framework\Testing\Unit\NavigationMenuUnitTest
  */
 class DocumentationSidebarUnitTest extends UnitTestCase
 {
diff --git a/packages/framework/tests/Unit/NavigationMenuUnitTest.php b/packages/framework/tests/Unit/NavigationMenuUnitTest.php
index 60948237682..648bb55a092 100644
--- a/packages/framework/tests/Unit/NavigationMenuUnitTest.php
+++ b/packages/framework/tests/Unit/NavigationMenuUnitTest.php
@@ -15,6 +15,7 @@
  * @covers \Hyde\Framework\Features\Navigation\MainNavigationMenu
  *
  * @see \Hyde\Framework\Testing\Feature\NavigationMenuTest
+ * @see \Hyde\Framework\Testing\Unit\DocumentationSidebarUnitTest
  */
 class NavigationMenuUnitTest extends UnitTestCase
 {

From f01159a59d936865b470cace8e3ea690c585fcfe Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 24 Feb 2024 14:20:11 +0100
Subject: [PATCH 0641/1422] Test get method resolves instance from service
 container

---
 .../framework/tests/Unit/DocumentationSidebarUnitTest.php  | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php b/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
index f6278a9291b..6b0a4e75484 100644
--- a/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
+++ b/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
@@ -115,6 +115,13 @@ public function testItemsAreSortedByPriority()
 
     // Sidebar specific tests
 
+    public function testGetMethodResolvesInstanceFromServiceContainer()
+    {
+        app()->instance('navigation.sidebar', $instance = new DocumentationSidebar());
+
+        $this->assertSame($instance, DocumentationSidebar::get());
+    }
+
     public function testHasGroupsReturnsFalseWhenNoItemsHaveChildren()
     {
         $this->assertFalse((new DocumentationSidebar())->hasGroups());

From 36493489eb5dd7f9a4d63a50bc35d5d7ba83ff8c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 24 Feb 2024 14:28:56 +0100
Subject: [PATCH 0642/1422] Add child constructor

---
 .../Framework/Features/Navigation/DocumentationSidebar.php  | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 042f8186f44..4300899ecdf 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -6,6 +6,7 @@
 
 use Hyde\Pages\DocumentationPage;
 use Hyde\Support\Facades\Render;
+use Illuminate\Contracts\Support\Arrayable;
 use Illuminate\Support\Str;
 
 use function app;
@@ -20,6 +21,11 @@ public static function get(): static
         return app('navigation.sidebar');
     }
 
+    public function __construct(Arrayable|array $items = [])
+    {
+        parent::__construct($items);
+    }
+
     public function hasGroups(): bool
     {
         return $this->getItems()->contains(fn (NavItem $item): bool => $item->hasChildren());

From 1718f53390ecb9c87bd6e9d6bc8545ca0f4f9796 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 24 Feb 2024 14:31:27 +0100
Subject: [PATCH 0643/1422] Add config accessor to the sidebar class

---
 .../Navigation/DocumentationSidebar.php       |  6 ++++++
 .../Unit/DocumentationSidebarUnitTest.php     | 21 +++++++++++++++++++
 2 files changed, 27 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 4300899ecdf..dab898839fa 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -4,6 +4,7 @@
 
 namespace Hyde\Framework\Features\Navigation;
 
+use Hyde\Facades\Config;
 use Hyde\Pages\DocumentationPage;
 use Hyde\Support\Facades\Render;
 use Illuminate\Contracts\Support\Arrayable;
@@ -26,6 +27,11 @@ public function __construct(Arrayable|array $items = [])
         parent::__construct($items);
     }
 
+    public function isCollapsible(): bool
+    {
+        return Config::getBool('docs.sidebar.collapsible', true);
+    }
+
     public function hasGroups(): bool
     {
         return $this->getItems()->contains(fn (NavItem $item): bool => $item->hasChildren());
diff --git a/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php b/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
index 6b0a4e75484..71ebb676c4f 100644
--- a/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
+++ b/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
@@ -122,6 +122,27 @@ public function testGetMethodResolvesInstanceFromServiceContainer()
         $this->assertSame($instance, DocumentationSidebar::get());
     }
 
+    public function testIsCollapsibleReturnsTrueByDefault()
+    {
+        self::mockConfig();
+
+        $this->assertTrue((new DocumentationSidebar())->isCollapsible());
+    }
+
+    public function testIsCollapsibleReturnsTrueWhenConfigIsTrue()
+    {
+        self::mockConfig(['docs.sidebar.collapsible' => true]);
+
+        $this->assertTrue((new DocumentationSidebar())->isCollapsible());
+    }
+
+    public function testIsCollapsibleReturnsFalseWhenConfigIsFalse()
+    {
+        self::mockConfig(['docs.sidebar.collapsible' => false]);
+
+        $this->assertFalse((new DocumentationSidebar())->isCollapsible());
+    }
+
     public function testHasGroupsReturnsFalseWhenNoItemsHaveChildren()
     {
         $this->assertFalse((new DocumentationSidebar())->hasGroups());

From 2fe21b8b368827b772527118dfafa52fdb85be8a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 24 Feb 2024 15:12:26 +0100
Subject: [PATCH 0644/1422] Use sidebar accessor method

---
 .../resources/views/components/docs/sidebar-items.blade.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/resources/views/components/docs/sidebar-items.blade.php b/packages/framework/resources/views/components/docs/sidebar-items.blade.php
index 9f7bfc12451..c029cfe468a 100644
--- a/packages/framework/resources/views/components/docs/sidebar-items.blade.php
+++ b/packages/framework/resources/views/components/docs/sidebar-items.blade.php
@@ -6,7 +6,7 @@
     </ul>
 @else
     <ul id="sidebar-items" role="list">
-        @php ($collapsible = config('docs.sidebar.collapsible', true))
+        @php ($collapsible = $sidebar->isCollapsible())
         @foreach ($sidebar->getItems() as $group)
             <li class="sidebar-group" role="listitem" @if($collapsible) x-data="{ groupOpen: {{ $sidebar->isGroupActive($group->getIdentifier()) ? 'true' : 'false' }} }" @endif>
                 <header @class(['sidebar-group-header p-2 px-4 -ml-2 flex justify-between items-center', 'group hover:bg-black/10' => $collapsible]) @if($collapsible) @click="groupOpen = ! groupOpen" @endif>

From 0de41c6d263dc99b51330aa0beca84f678118e67 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 24 Feb 2024 15:12:41 +0100
Subject: [PATCH 0645/1422] Inline Blade variable

---
 .../views/components/docs/sidebar-items.blade.php     | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/packages/framework/resources/views/components/docs/sidebar-items.blade.php b/packages/framework/resources/views/components/docs/sidebar-items.blade.php
index c029cfe468a..2485420d786 100644
--- a/packages/framework/resources/views/components/docs/sidebar-items.blade.php
+++ b/packages/framework/resources/views/components/docs/sidebar-items.blade.php
@@ -6,16 +6,15 @@
     </ul>
 @else
     <ul id="sidebar-items" role="list">
-        @php ($collapsible = $sidebar->isCollapsible())
         @foreach ($sidebar->getItems() as $group)
-            <li class="sidebar-group" role="listitem" @if($collapsible) x-data="{ groupOpen: {{ $sidebar->isGroupActive($group->getIdentifier()) ? 'true' : 'false' }} }" @endif>
-                <header @class(['sidebar-group-header p-2 px-4 -ml-2 flex justify-between items-center', 'group hover:bg-black/10' => $collapsible]) @if($collapsible) @click="groupOpen = ! groupOpen" @endif>
-                    <h4 @class(['sidebar-group-heading text-base font-semibold', 'cursor-pointer dark:group-hover:text-white' => $collapsible])>{{ $group->getLabel() }}</h4>
-                    @if($collapsible)
+            <li class="sidebar-group" role="listitem" @if($sidebar->isCollapsible()) x-data="{ groupOpen: {{ $sidebar->isGroupActive($group->getIdentifier()) ? 'true' : 'false' }} }" @endif>
+                <header @class(['sidebar-group-header p-2 px-4 -ml-2 flex justify-between items-center', 'group hover:bg-black/10' => $sidebar->isCollapsible()]) @if($sidebar->isCollapsible()) @click="groupOpen = ! groupOpen" @endif>
+                    <h4 @class(['sidebar-group-heading text-base font-semibold', 'cursor-pointer dark:group-hover:text-white' => $sidebar->isCollapsible()])>{{ $group->getLabel() }}</h4>
+                    @if($sidebar->isCollapsible())
                         @include('hyde::components.docs.sidebar-group-toggle-button')
                     @endif
                 </header>
-                <ul class="sidebar-group-items ml-4 px-2 mb-2" role="list" @if($collapsible) x-show="groupOpen" @endif>
+                <ul class="sidebar-group-items ml-4 px-2 mb-2" role="list" @if($sidebar->isCollapsible()) x-show="groupOpen" @endif>
                     @foreach ($group->getChildren() as $item)
                         @include('hyde::components.docs.sidebar-item', ['grouped' => true])
                     @endforeach

From 381ada17cda32dce1cafe79198d94ef41c3ef046 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 24 Feb 2024 17:58:30 +0100
Subject: [PATCH 0646/1422] Remove unnecessary type annotation comment

---
 .../resources/views/components/docs/sidebar-item.blade.php       | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/framework/resources/views/components/docs/sidebar-item.blade.php b/packages/framework/resources/views/components/docs/sidebar-item.blade.php
index bf97a15f88d..caa2472f043 100644
--- a/packages/framework/resources/views/components/docs/sidebar-item.blade.php
+++ b/packages/framework/resources/views/components/docs/sidebar-item.blade.php
@@ -1,4 +1,3 @@
-@php /** @var \Hyde\Framework\Features\Navigation\NavItem $item */ @endphp
 @props(['grouped' => false])
 <li @class(['sidebar-item -ml-4 pl-4', $grouped
         ? 'active -ml-8 pl-8 bg-black/5 dark:bg-black/10'

From 959654c4900def9f30f2e9fe12275149c2343508 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 24 Feb 2024 18:00:24 +0100
Subject: [PATCH 0647/1422] Remove unnecessary parentheses

---
 .../resources/views/components/docs/sidebar-item.blade.php      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/resources/views/components/docs/sidebar-item.blade.php b/packages/framework/resources/views/components/docs/sidebar-item.blade.php
index caa2472f043..cb0274b5304 100644
--- a/packages/framework/resources/views/components/docs/sidebar-item.blade.php
+++ b/packages/framework/resources/views/components/docs/sidebar-item.blade.php
@@ -13,7 +13,7 @@
 
         @if(config('docs.sidebar.table_of_contents.enabled', true))
             <span class="sr-only">Table of contents</span>
-            {!! ($page->getTableOfContents()) !!}
+            {!! $page->getTableOfContents() !!}
         @endif
     @else
         <a href="{{ $item->getDestination() }}" @class([$grouped

From 0e56c4b3b527543a3923287777acfc862459b028 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 24 Feb 2024 18:02:55 +0100
Subject: [PATCH 0648/1422] Add config accessor for the sidebar footer state

---
 .../Navigation/DocumentationSidebar.php       |  5 +++++
 .../Unit/DocumentationSidebarUnitTest.php     | 21 +++++++++++++++++++
 2 files changed, 26 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index dab898839fa..b75d3382bbe 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -32,6 +32,11 @@ public function isCollapsible(): bool
         return Config::getBool('docs.sidebar.collapsible', true);
     }
 
+    public function hasFooter(): bool
+    {
+        return Config::getBool('docs.sidebar.footer', true);
+    }
+
     public function hasGroups(): bool
     {
         return $this->getItems()->contains(fn (NavItem $item): bool => $item->hasChildren());
diff --git a/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php b/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
index 71ebb676c4f..b2c9d2451c2 100644
--- a/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
+++ b/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
@@ -143,6 +143,27 @@ public function testIsCollapsibleReturnsFalseWhenConfigIsFalse()
         $this->assertFalse((new DocumentationSidebar())->isCollapsible());
     }
 
+    public function testHasFooterReturnsTrueByDefault()
+    {
+        self::mockConfig();
+
+        $this->assertTrue((new DocumentationSidebar())->hasFooter());
+    }
+
+    public function testHasFooterReturnsTrueWhenConfigIsTrue()
+    {
+        self::mockConfig(['docs.sidebar.footer' => true]);
+
+        $this->assertTrue((new DocumentationSidebar())->hasFooter());
+    }
+
+    public function testHasFooterReturnsFalseWhenConfigIsFalse()
+    {
+        self::mockConfig(['docs.sidebar.footer' => false]);
+
+        $this->assertFalse((new DocumentationSidebar())->hasFooter());
+    }
+
     public function testHasGroupsReturnsFalseWhenNoItemsHaveChildren()
     {
         $this->assertFalse((new DocumentationSidebar())->hasGroups());

From afb462697fb076b05cd0233a1bea45df7871e1d9 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 24 Feb 2024 18:09:26 +0100
Subject: [PATCH 0649/1422] Ensure compatibility with string values

Uses strict typing, though it could also return a bool cast to make 'false' and '' be false, but I prefer strict typing and want to nudge people to use false if they explicably want the sidebar footer to be disabled.
---
 .../Framework/Features/Navigation/DocumentationSidebar.php | 5 +++++
 .../framework/tests/Unit/DocumentationSidebarUnitTest.php  | 7 +++++++
 2 files changed, 12 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index b75d3382bbe..763ab097f60 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -11,6 +11,7 @@
 use Illuminate\Support\Str;
 
 use function app;
+use function is_string;
 
 class DocumentationSidebar extends NavigationMenu
 {
@@ -34,6 +35,10 @@ public function isCollapsible(): bool
 
     public function hasFooter(): bool
     {
+        if (is_string(Config::get('docs.sidebar.footer'))) {
+            return true;
+        }
+
         return Config::getBool('docs.sidebar.footer', true);
     }
 
diff --git a/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php b/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
index b2c9d2451c2..a3d8db53a54 100644
--- a/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
+++ b/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
@@ -150,6 +150,13 @@ public function testHasFooterReturnsTrueByDefault()
         $this->assertTrue((new DocumentationSidebar())->hasFooter());
     }
 
+    public function testHasFooterReturnsTrueWhenConfigIsString()
+    {
+        self::mockConfig(['docs.sidebar.footer' => 'Some footer content']);
+
+        $this->assertTrue((new DocumentationSidebar())->hasFooter());
+    }
+
     public function testHasFooterReturnsTrueWhenConfigIsTrue()
     {
         self::mockConfig(['docs.sidebar.footer' => true]);

From 89598f3dcb57de427ebb4fb36c7a1664f10298b1 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 24 Feb 2024 18:11:26 +0100
Subject: [PATCH 0650/1422] Use the footer state accessor

---
 .../framework/resources/views/components/docs/sidebar.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/resources/views/components/docs/sidebar.blade.php b/packages/framework/resources/views/components/docs/sidebar.blade.php
index 9cd5dad15c4..866b1813714 100644
--- a/packages/framework/resources/views/components/docs/sidebar.blade.php
+++ b/packages/framework/resources/views/components/docs/sidebar.blade.php
@@ -7,7 +7,7 @@
             'sidebar' => app('navigation.sidebar'),
         ])
     </nav>
-    @if(config('docs.sidebar.footer', true) !== false)
+    @if(app('navigation.sidebar')->hasFooter())
         <footer id="sidebar-footer" class="h-16 p-4 w-full bottom-0 left-0 text-center leading-8">
             @include('hyde::components.docs.sidebar-footer-text')
         </footer>

From 923d0301e3d673dae9e28adf9ad6a439ff76bd7c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 24 Feb 2024 18:12:06 +0100
Subject: [PATCH 0651/1422] Set default value

---
 .../src/Framework/Features/Navigation/DocumentationSidebar.php  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 763ab097f60..92dbd6cd5d8 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -35,7 +35,7 @@ public function isCollapsible(): bool
 
     public function hasFooter(): bool
     {
-        if (is_string(Config::get('docs.sidebar.footer'))) {
+        if (is_string(Config::get('docs.sidebar.footer', true))) {
             return true;
         }
 

From b5223fcd81c175e565f59a89647faeb985f6211f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 24 Feb 2024 19:44:21 +0100
Subject: [PATCH 0652/1422] Add footer config accessor

---
 .../Navigation/DocumentationSidebar.php       |  5 ++++
 .../Unit/DocumentationSidebarUnitTest.php     | 28 +++++++++++++++++++
 2 files changed, 33 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 92dbd6cd5d8..426f708e509 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -23,6 +23,11 @@ public static function get(): static
         return app('navigation.sidebar');
     }
 
+    public function getFooter(): bool|string
+    {
+        return Config::get('docs.sidebar.footer', true);
+    }
+
     public function __construct(Arrayable|array $items = [])
     {
         parent::__construct($items);
diff --git a/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php b/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
index a3d8db53a54..e85a7aca302 100644
--- a/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
+++ b/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
@@ -122,6 +122,34 @@ public function testGetMethodResolvesInstanceFromServiceContainer()
         $this->assertSame($instance, DocumentationSidebar::get());
     }
 
+    public function testGetFooterReturnsTrueByDefault()
+    {
+        self::mockConfig();
+
+        $this->assertTrue((new DocumentationSidebar())->getFooter());
+    }
+
+    public function testGetFooterReturnsStringWhenConfigIsString()
+    {
+        self::mockConfig(['docs.sidebar.footer' => 'Some footer content']);
+
+        $this->assertSame('Some footer content', (new DocumentationSidebar())->getFooter());
+    }
+
+    public function testGetFooterReturnsTrueWhenConfigIsTrue()
+    {
+        self::mockConfig(['docs.sidebar.footer' => true]);
+
+        $this->assertTrue((new DocumentationSidebar())->getFooter());
+    }
+
+    public function testGetFooterReturnsFalseWhenConfigIsFalse()
+    {
+        self::mockConfig(['docs.sidebar.footer' => false]);
+
+        $this->assertFalse((new DocumentationSidebar())->getFooter());
+    }
+
     public function testIsCollapsibleReturnsTrueByDefault()
     {
         self::mockConfig();

From bd773d7087d63d760fcd009c351a9deba5c337ef Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 24 Feb 2024 19:56:02 +0100
Subject: [PATCH 0653/1422] Get data through sidebar instance

---
 .../components/docs/sidebar-footer-text.blade.php    |  4 ++--
 .../views/components/docs/sidebar.blade.php          |  4 +++-
 .../Feature/Views/SidebarFooterTextViewTest.php      | 12 +++++++++---
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/packages/framework/resources/views/components/docs/sidebar-footer-text.blade.php b/packages/framework/resources/views/components/docs/sidebar-footer-text.blade.php
index 6b49ca39bb1..49e2218fbdb 100644
--- a/packages/framework/resources/views/components/docs/sidebar-footer-text.blade.php
+++ b/packages/framework/resources/views/components/docs/sidebar-footer-text.blade.php
@@ -1,7 +1,7 @@
 <p>
-    @if(is_bool(config('docs.sidebar.footer', true)))
+    @if(is_bool($sidebar->getFooter())))
         <a href="{{ Hyde::relativeLink('index.html') }}">Back to home page</a>
     @else
-        {{ Hyde::markdown(config('docs.sidebar.footer')) }}
+        {{ Hyde::markdown($sidebar->getFooter()) }}
     @endif
 </p>
\ No newline at end of file
diff --git a/packages/framework/resources/views/components/docs/sidebar.blade.php b/packages/framework/resources/views/components/docs/sidebar.blade.php
index 866b1813714..dcd158d993f 100644
--- a/packages/framework/resources/views/components/docs/sidebar.blade.php
+++ b/packages/framework/resources/views/components/docs/sidebar.blade.php
@@ -9,7 +9,9 @@
     </nav>
     @if(app('navigation.sidebar')->hasFooter())
         <footer id="sidebar-footer" class="h-16 p-4 w-full bottom-0 left-0 text-center leading-8">
-            @include('hyde::components.docs.sidebar-footer-text')
+            @include('hyde::components.docs.sidebar-footer-text', [
+            'sidebar' => app('navigation.sidebar'),
+        ])
         </footer>
     @endif
 </aside>
\ No newline at end of file
diff --git a/packages/framework/tests/Feature/Views/SidebarFooterTextViewTest.php b/packages/framework/tests/Feature/Views/SidebarFooterTextViewTest.php
index e4d5c21e9a3..f575483e0c9 100644
--- a/packages/framework/tests/Feature/Views/SidebarFooterTextViewTest.php
+++ b/packages/framework/tests/Feature/Views/SidebarFooterTextViewTest.php
@@ -7,6 +7,7 @@
 use Hyde\Facades\Config;
 use Hyde\Testing\TestCase;
 use Hyde\Testing\TestsBladeViews;
+use Hyde\Framework\Features\Navigation\DocumentationSidebar;
 
 class SidebarFooterTextViewTest extends TestCase
 {
@@ -14,7 +15,7 @@ class SidebarFooterTextViewTest extends TestCase
 
     public function testSidebarFooterTextViewWithDefaultConfig()
     {
-        $view = $this->test(view('hyde::components.docs.sidebar-footer-text'));
+        $view = $this->test(view('hyde::components.docs.sidebar-footer-text', $this->withSidebar()));
 
         $view->assertSeeHtml('<a href="index.html">Back to home page</a>');
     }
@@ -23,7 +24,7 @@ public function testSidebarFooterTextViewWhenConfigOptionIsTrue()
     {
         Config::set('docs.sidebar.footer', true);
 
-        $view = $this->test(view('hyde::components.docs.sidebar-footer-text'));
+        $view = $this->test(view('hyde::components.docs.sidebar-footer-text', $this->withSidebar()));
 
         $view->assertSeeHtml('<a href="index.html">Back to home page</a>');
     }
@@ -32,7 +33,7 @@ public function testSidebarFooterTextViewWhenConfigOptionIsMarkdownString()
     {
         Config::set('docs.sidebar.footer', 'Your Markdown String Here');
 
-        $view = $this->test(view('hyde::components.docs.sidebar-footer-text'));
+        $view = $this->test(view('hyde::components.docs.sidebar-footer-text', $this->withSidebar()));
 
         $view->assertSeeText('Your Markdown String Here');
     }
@@ -43,4 +44,9 @@ public function testSidebarFooterTextViewWhenConfigOptionIsFalse()
 
         $this->assertTrue(true);
     }
+
+    protected function withSidebar(): array
+    {
+        return ['sidebar' => new DocumentationSidebar()];
+    }
 }

From e5a8ad7fd3e4d6a0e261e9d7d93e37b5322b2386 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 24 Feb 2024 21:09:37 +0100
Subject: [PATCH 0654/1422] Initialize sidebar instance

---
 .../views/components/docs/sidebar.blade.php       | 11 +++++------
 .../framework/tests/Feature/SidebarViewTest.php   | 15 ++++++---------
 2 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/packages/framework/resources/views/components/docs/sidebar.blade.php b/packages/framework/resources/views/components/docs/sidebar.blade.php
index dcd158d993f..06a76534214 100644
--- a/packages/framework/resources/views/components/docs/sidebar.blade.php
+++ b/packages/framework/resources/views/components/docs/sidebar.blade.php
@@ -1,17 +1,16 @@
+@php
+$sidebar = app('navigation.sidebar');
+@endphp
 <aside id="sidebar" x-cloak :class="sidebarOpen ? 'visible left-0' : 'invisible -left-64 md:visible md:left-0'" class="bg-gray-100 dark:bg-gray-800 dark:text-gray-200 h-screen w-64 fixed z-30 md:flex flex-col shadow-lg md:shadow-none transition-all duration-300">
     <header id="sidebar-header" class="h-16">
         @include('hyde::components.docs.sidebar-brand')
     </header>
     <nav id="sidebar-navigation" class="p-2 overflow-y-auto border-y border-gray-300 dark:border-[#1b2533] h-full">
-        @include('hyde::components.docs.sidebar-items', [
-            'sidebar' => app('navigation.sidebar'),
-        ])
+        @include('hyde::components.docs.sidebar-items')
     </nav>
     @if(app('navigation.sidebar')->hasFooter())
         <footer id="sidebar-footer" class="h-16 p-4 w-full bottom-0 left-0 text-center leading-8">
-            @include('hyde::components.docs.sidebar-footer-text', [
-            'sidebar' => app('navigation.sidebar'),
-        ])
+            @include('hyde::components.docs.sidebar-footer-text')
         </footer>
     @endif
 </aside>
\ No newline at end of file
diff --git a/packages/framework/tests/Feature/SidebarViewTest.php b/packages/framework/tests/Feature/SidebarViewTest.php
index a7b83594db7..0c338671485 100644
--- a/packages/framework/tests/Feature/SidebarViewTest.php
+++ b/packages/framework/tests/Feature/SidebarViewTest.php
@@ -43,9 +43,7 @@ public function testBaseSidebar()
             ->assertDontSee('<li class="sidebar-item')
             ->allGood();
 
-        $this->assertViewWasRendered(view('hyde::components.docs.sidebar-items', [
-            'sidebar' => NavigationMenuGenerator::handle(DocumentationSidebar::class),
-        ]));
+        $this->assertViewWasRendered(view('hyde::components.docs.sidebar-items'));
 
         $this->assertViewWasRendered(view('hyde::components.docs.sidebar-brand'));
         $this->assertViewWasRendered(view('hyde::components.docs.sidebar-footer-text'));
@@ -96,9 +94,7 @@ public function testBaseSidebarWithItems()
             ->assertSeeHtml('<li class="sidebar-item')
             ->allGood();
 
-        $this->assertViewWasRendered(view('hyde::components.docs.sidebar-items', [
-            'sidebar' => NavigationMenuGenerator::handle(DocumentationSidebar::class),
-        ]));
+        $this->assertViewWasRendered(view('hyde::components.docs.sidebar-items'));
     }
 
     public function testSidebarWithGroupedItems()
@@ -125,7 +121,6 @@ public function testSidebarWithGroupedItems()
             ->allGood();
 
         $this->assertViewWasRendered(view('hyde::components.docs.sidebar-items', [
-            'sidebar' => NavigationMenuGenerator::handle(DocumentationSidebar::class),
             'grouped' => true,
         ]));
 
@@ -157,7 +152,6 @@ public function testSidebarWithNonCollapsibleGroupedItems()
             ->allGood();
 
         $this->assertViewWasRendered(view('hyde::components.docs.sidebar-items', [
-            'sidebar' => NavigationMenuGenerator::handle(DocumentationSidebar::class),
             'grouped' => true,
         ]));
 
@@ -182,7 +176,6 @@ public function testSidebarWithMixedGroupedAndUngroupedItems()
             ->allGood();
 
         $this->assertViewWasRendered(view('hyde::components.docs.sidebar-items', [
-            'sidebar' => NavigationMenuGenerator::handle(DocumentationSidebar::class),
             'grouped' => true,
         ]));
 
@@ -191,6 +184,10 @@ public function testSidebarWithMixedGroupedAndUngroupedItems()
 
     protected function renderComponent(View $view): self
     {
+        $sidebar = NavigationMenuGenerator::handle(DocumentationSidebar::class);
+        app()->instance('navigation.sidebar', $sidebar);
+        view()->share('sidebar', $sidebar);
+
         try {
             $this->html = $view->render();
             /** @noinspection LaravelFunctionsInspection */

From aa05542b629ec557f65a3d75f471e726052ca2bd Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 25 Feb 2024 11:29:34 +0100
Subject: [PATCH 0655/1422] Cherry pick unit test from
 https://github.com/hydephp/develop/pull/1587

---
 .../Unit/DocumentationSidebarUnitTest.php     | 142 ++++++++++++++++++
 1 file changed, 142 insertions(+)
 create mode 100644 packages/framework/tests/Unit/DocumentationSidebarUnitTest.php

diff --git a/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php b/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
new file mode 100644
index 00000000000..76d95bc8193
--- /dev/null
+++ b/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
@@ -0,0 +1,142 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Hyde\Framework\Testing\Unit;
+
+use Hyde\Testing\UnitTestCase;
+use Illuminate\Support\Collection;
+use Hyde\Support\Models\ExternalRoute;
+use Hyde\Framework\Features\Navigation\NavItem;
+use Hyde\Framework\Features\Navigation\DocumentationSidebar;
+
+/**
+ * @covers \Hyde\Framework\Features\Navigation\DocumentationSidebar
+ * @covers \Hyde\Framework\Features\Navigation\NavigationMenu
+ *
+ * @see \Hyde\Framework\Testing\Feature\Services\DocumentationSidebarTest
+ * @see \Hyde\Framework\Testing\Unit\NavigationMenuUnitTest
+ */
+class DocumentationSidebarUnitTest extends UnitTestCase
+{
+    // Base menu tests
+
+    public function testCanConstruct()
+    {
+        $this->assertInstanceOf(DocumentationSidebar::class, new DocumentationSidebar());
+    }
+
+    public function testCanConstructWithItemsArray()
+    {
+        $this->assertInstanceOf(DocumentationSidebar::class, new DocumentationSidebar($this->getItems()));
+    }
+
+    public function testCanConstructWithItemsArrayable()
+    {
+        $this->assertInstanceOf(DocumentationSidebar::class, new DocumentationSidebar(collect($this->getItems())));
+    }
+
+    public function testGetItemsReturnsCollection()
+    {
+        $this->assertInstanceOf(Collection::class, (new DocumentationSidebar())->getItems());
+    }
+
+    public function testGetItemsReturnsCollectionWhenSuppliedArray()
+    {
+        $this->assertInstanceOf(Collection::class, (new DocumentationSidebar($this->getItems()))->getItems());
+    }
+
+    public function testGetItemsReturnsCollectionWhenSuppliedArrayable()
+    {
+        $this->assertInstanceOf(Collection::class, (new DocumentationSidebar(collect($this->getItems())))->getItems());
+    }
+
+    public function testGetItemsReturnsItems()
+    {
+        $items = $this->getItems();
+
+        $this->assertSame($items, (new DocumentationSidebar($items))->getItems()->all());
+    }
+
+    public function testGetItemsReturnsItemsWhenSuppliedArrayable()
+    {
+        $items = $this->getItems();
+
+        $this->assertSame($items, (new DocumentationSidebar(collect($items)))->getItems()->all());
+    }
+
+    public function testGetItemsReturnsEmptyArrayWhenNoItems()
+    {
+        $this->assertSame([], (new DocumentationSidebar())->getItems()->all());
+    }
+
+    public function testCanAddItems()
+    {
+        $menu = new DocumentationSidebar();
+
+        $item = $this->item('/', 'Docs');
+
+        $menu->add($item);
+
+        $this->assertCount(1, $menu->getItems());
+        $this->assertSame($item, $menu->getItems()->first());
+    }
+
+    public function testItemsAreInTheOrderTheyWereAddedWhenThereAreNoCustomPriorities()
+    {
+        $menu = new DocumentationSidebar();
+
+        $item1 = $this->item('/', 'Docs');
+        $item2 = $this->item('/installation', 'Installation');
+        $item3 = $this->item('/getting-started', 'Getting Started');
+
+        $menu->add($item1);
+        $menu->add($item2);
+        $menu->add($item3);
+
+        $this->assertSame([$item1, $item2, $item3], $menu->getItems()->all());
+    }
+
+    public function testItemsAreSortedByPriority()
+    {
+        $menu = new DocumentationSidebar();
+
+        $item1 = $this->item('/', 'Docs', 100);
+        $item2 = $this->item('/installation', 'Installation', 200);
+        $item3 = $this->item('/getting-started', 'Getting Started', 300);
+
+        $menu->add($item3);
+        $menu->add($item1);
+        $menu->add($item2);
+
+        $this->assertSame([$item1, $item2, $item3], $menu->getItems()->all());
+    }
+
+    // Sidebar specific tests
+
+    public function testGetMethodResolvesInstanceFromServiceContainer()
+    {
+        app()->instance('navigation.sidebar', $instance = new DocumentationSidebar());
+
+        $this->assertSame($instance, DocumentationSidebar::get());
+    }
+
+    public function testHasGroupsReturnsFalseWhenNoItemsHaveChildren()
+    {
+        $this->assertFalse((new DocumentationSidebar())->hasGroups());
+    }
+
+    protected function getItems(): array
+    {
+        return [
+            $this->item('/', 'Docs'),
+            $this->item('/installation', 'Installation'),
+            $this->item('/getting-started', 'Getting Started'),
+        ];
+    }
+
+    protected function item(string $destination, string $label, int $priority = 500): NavItem
+    {
+        return new NavItem(new ExternalRoute($destination), $label, $priority);
+    }
+}

From 9cf28093b73c8762398bdc59bb9e6c7161658028 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 25 Feb 2024 11:30:14 +0100
Subject: [PATCH 0656/1422] Cherry pick changes to unit test from
 https://github.com/hydephp/develop/pull/1587

---
 .../tests/Unit/NavigationMenuUnitTest.php     | 31 +++++++++++++------
 1 file changed, 21 insertions(+), 10 deletions(-)

diff --git a/packages/framework/tests/Unit/NavigationMenuUnitTest.php b/packages/framework/tests/Unit/NavigationMenuUnitTest.php
index 1b0f9a08a58..648bb55a092 100644
--- a/packages/framework/tests/Unit/NavigationMenuUnitTest.php
+++ b/packages/framework/tests/Unit/NavigationMenuUnitTest.php
@@ -15,9 +15,12 @@
  * @covers \Hyde\Framework\Features\Navigation\MainNavigationMenu
  *
  * @see \Hyde\Framework\Testing\Feature\NavigationMenuTest
+ * @see \Hyde\Framework\Testing\Unit\DocumentationSidebarUnitTest
  */
 class NavigationMenuUnitTest extends UnitTestCase
 {
+    // Base menu tests
+
     public function testCanConstruct()
     {
         $this->assertInstanceOf(MainNavigationMenu::class, new MainNavigationMenu());
@@ -70,7 +73,8 @@ public function testGetItemsReturnsEmptyArrayWhenNoItems()
     public function testCanAddItems()
     {
         $menu = new MainNavigationMenu();
-        $item = new NavItem(new ExternalRoute('/'), 'Home');
+
+        $item = $this->item('/', 'Home');
 
         $menu->add($item);
 
@@ -81,9 +85,10 @@ public function testCanAddItems()
     public function testItemsAreInTheOrderTheyWereAddedWhenThereAreNoCustomPriorities()
     {
         $menu = new MainNavigationMenu();
-        $item1 = new NavItem(new ExternalRoute('/'), 'Home');
-        $item2 = new NavItem(new ExternalRoute('/about'), 'About');
-        $item3 = new NavItem(new ExternalRoute('/contact'), 'Contact');
+
+        $item1 = $this->item('/', 'Home');
+        $item2 = $this->item('/about', 'About');
+        $item3 = $this->item('/contact', 'Contact');
 
         $menu->add($item1);
         $menu->add($item2);
@@ -95,9 +100,10 @@ public function testItemsAreInTheOrderTheyWereAddedWhenThereAreNoCustomPrioritie
     public function testItemsAreSortedByPriority()
     {
         $menu = new MainNavigationMenu();
-        $item1 = new NavItem(new ExternalRoute('/'), 'Home', 100);
-        $item2 = new NavItem(new ExternalRoute('/about'), 'About', 200);
-        $item3 = new NavItem(new ExternalRoute('/contact'), 'Contact', 300);
+
+        $item1 = $this->item('/', 'Home', 100);
+        $item2 = $this->item('/about', 'About', 200);
+        $item3 = $this->item('/contact', 'Contact', 300);
 
         $menu->add($item3);
         $menu->add($item1);
@@ -109,9 +115,14 @@ public function testItemsAreSortedByPriority()
     protected function getItems(): array
     {
         return [
-            new NavItem(new ExternalRoute('/'), 'Home'),
-            new NavItem(new ExternalRoute('/about'), 'About'),
-            new NavItem(new ExternalRoute('/contact'), 'Contact'),
+            $this->item('/', 'Home'),
+            $this->item('/about', 'About'),
+            $this->item('/contact', 'Contact'),
         ];
     }
+
+    protected function item(string $destination, string $label, int $priority = 500): NavItem
+    {
+        return new NavItem(new ExternalRoute($destination), $label, $priority);
+    }
 }

From 71fb1d782e4b9ccb67cec26855897121ed807c6b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 25 Feb 2024 11:32:03 +0100
Subject: [PATCH 0657/1422] Use the resolved sidebar instance

---
 .../framework/resources/views/components/docs/sidebar.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/resources/views/components/docs/sidebar.blade.php b/packages/framework/resources/views/components/docs/sidebar.blade.php
index 06a76534214..35b845b1366 100644
--- a/packages/framework/resources/views/components/docs/sidebar.blade.php
+++ b/packages/framework/resources/views/components/docs/sidebar.blade.php
@@ -8,7 +8,7 @@
     <nav id="sidebar-navigation" class="p-2 overflow-y-auto border-y border-gray-300 dark:border-[#1b2533] h-full">
         @include('hyde::components.docs.sidebar-items')
     </nav>
-    @if(app('navigation.sidebar')->hasFooter())
+    @if($sidebar->hasFooter())
         <footer id="sidebar-footer" class="h-16 p-4 w-full bottom-0 left-0 text-center leading-8">
             @include('hyde::components.docs.sidebar-footer-text')
         </footer>

From d4358caa78e6280ef04249fcabfeb770f2733c77 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 25 Feb 2024 11:36:58 +0100
Subject: [PATCH 0658/1422] Update IDE helper file with sidebar variable

---
 _ide_helper.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/_ide_helper.php b/_ide_helper.php
index 7d868d7bbb5..8cc231f850f 100644
--- a/_ide_helper.php
+++ b/_ide_helper.php
@@ -22,6 +22,11 @@
 /** @var string $routeKey The route key for the page being compiled/previewed */
 $routeKey = \Hyde\Support\Facades\Render::getRouteKey();
 
+// Variables available only to some page types
+
+/** @var \Hyde\Framework\Features\Navigation\DocumentationSidebar $sidebar */
+$sidebar = app('navigation.sidebar');
+
 // Facades (aliased in app/config.php)
 
 /** @mixin \Hyde\Foundation\HydeKernel */

From 6643a4abaa7035037d4fcef4e27dadbb9ec9d7a1 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 25 Feb 2024 15:33:28 +0100
Subject: [PATCH 0659/1422] Fix method order

---
 .../Features/Navigation/DocumentationSidebar.php          | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 426f708e509..9197247b4e5 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -23,14 +23,14 @@ public static function get(): static
         return app('navigation.sidebar');
     }
 
-    public function getFooter(): bool|string
+    public function __construct(Arrayable|array $items = [])
     {
-        return Config::get('docs.sidebar.footer', true);
+        parent::__construct($items);
     }
 
-    public function __construct(Arrayable|array $items = [])
+    public function getFooter(): bool|string
     {
-        parent::__construct($items);
+        return Config::get('docs.sidebar.footer', true);
     }
 
     public function isCollapsible(): bool

From 28831efcdcc864567b77ce5900570dfef703bcc7 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 25 Feb 2024 15:33:46 +0100
Subject: [PATCH 0660/1422] Move down method

---
 .../Features/Navigation/DocumentationSidebar.php       | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 9197247b4e5..0c76bf0d97a 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -33,11 +33,6 @@ public function getFooter(): bool|string
         return Config::get('docs.sidebar.footer', true);
     }
 
-    public function isCollapsible(): bool
-    {
-        return Config::getBool('docs.sidebar.collapsible', true);
-    }
-
     public function hasFooter(): bool
     {
         if (is_string(Config::get('docs.sidebar.footer', true))) {
@@ -47,6 +42,11 @@ public function hasFooter(): bool
         return Config::getBool('docs.sidebar.footer', true);
     }
 
+    public function isCollapsible(): bool
+    {
+        return Config::getBool('docs.sidebar.collapsible', true);
+    }
+
     public function hasGroups(): bool
     {
         return $this->getItems()->contains(fn (NavItem $item): bool => $item->hasChildren());

From 08bc6feee34a94a9140c78af2542c5b0cf312b23 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 25 Feb 2024 18:07:11 +0100
Subject: [PATCH 0661/1422] Add footer text accessor

---
 .../Navigation/DocumentationSidebar.php       | 11 ++++++++++
 .../Unit/DocumentationSidebarUnitTest.php     | 21 +++++++++++++++++++
 2 files changed, 32 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 0c76bf0d97a..e42ce5e5db7 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -33,6 +33,17 @@ public function getFooter(): bool|string
         return Config::get('docs.sidebar.footer', true);
     }
 
+    public function getFooterText(): ?string
+    {
+        $option = Config::get('docs.sidebar.footer', true);
+
+        if (is_string($option)) {
+            return $option;
+        }
+
+        return null;
+    }
+
     public function hasFooter(): bool
     {
         if (is_string(Config::get('docs.sidebar.footer', true))) {
diff --git a/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php b/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
index e85a7aca302..1f6aba2bb97 100644
--- a/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
+++ b/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
@@ -150,6 +150,27 @@ public function testGetFooterReturnsFalseWhenConfigIsFalse()
         $this->assertFalse((new DocumentationSidebar())->getFooter());
     }
 
+    public function testGetFooterTextReturnsStringWhenConfigIsString()
+    {
+        self::mockConfig(['docs.sidebar.footer' => 'Some footer content']);
+
+        $this->assertSame('Some footer content', (new DocumentationSidebar())->getFooterText());
+    }
+
+    public function testGetFooterTextReturnsNullWhenConfigIsTrue()
+    {
+        self::mockConfig(['docs.sidebar.footer' => true]);
+
+        $this->assertNull((new DocumentationSidebar())->getFooterText());
+    }
+
+    public function testGetFooterTextReturnsNullWhenConfigIsFalse()
+    {
+        self::mockConfig(['docs.sidebar.footer' => false]);
+
+        $this->assertNull((new DocumentationSidebar())->getFooterText());
+    }
+
     public function testIsCollapsibleReturnsTrueByDefault()
     {
         self::mockConfig();

From b9f8e3dca0ce71e46394d8f8cb1b110a1527a889 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 26 Feb 2024 11:54:08 +0100
Subject: [PATCH 0662/1422] Change default navigation footer config option to
 be the default link

Uses the link from the view, in order to simplify the API. A drawback of this is that it no longer resolves dynamic links, but given the increased visibility of the option I think the tradeoff is worth it as it makes it easier to customize.
---
 config/docs.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/config/docs.php b/config/docs.php
index 93bbc751dc2..4ac1dd70706 100644
--- a/config/docs.php
+++ b/config/docs.php
@@ -30,9 +30,8 @@
         // When using a grouped sidebar, should the groups be collapsible?
         'collapsible' => true,
 
-        // Should the sidebar footer be shown? You can also set this to a string
-        // of Markdown to show in the footer. Set to `false` to disable.
-        'footer' => true,
+        // A string of Markdown to show in the footer. Set to `false` to disable.
+        'footer' => '[Back to home page](../)',
 
         /*
         |--------------------------------------------------------------------------

From 2fcf75a4c921914949d7b9c593d809a9e67ccc07 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 26 Feb 2024 13:28:37 +0100
Subject: [PATCH 0663/1422] Massively simplify sidebar footer text handling

---
 .../docs/sidebar-footer-text.blade.php        |  8 +----
 .../Navigation/DocumentationSidebar.php       | 20 +++++------
 .../tests/Feature/SidebarViewTest.php         |  9 ++---
 .../Views/SidebarFooterTextViewTest.php       | 11 ++-----
 .../Unit/DocumentationSidebarUnitTest.php     | 33 ++++---------------
 ...veLinksAcrossPagesRetainsIntegrityTest.php |  2 +-
 6 files changed, 23 insertions(+), 60 deletions(-)

diff --git a/packages/framework/resources/views/components/docs/sidebar-footer-text.blade.php b/packages/framework/resources/views/components/docs/sidebar-footer-text.blade.php
index 49e2218fbdb..ddc7e711303 100644
--- a/packages/framework/resources/views/components/docs/sidebar-footer-text.blade.php
+++ b/packages/framework/resources/views/components/docs/sidebar-footer-text.blade.php
@@ -1,7 +1 @@
-<p>
-    @if(is_bool($sidebar->getFooter())))
-        <a href="{{ Hyde::relativeLink('index.html') }}">Back to home page</a>
-    @else
-        {{ Hyde::markdown($sidebar->getFooter()) }}
-    @endif
-</p>
\ No newline at end of file
+{{ Hyde::markdown($sidebar->getFooter()) }}
diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index e42ce5e5db7..600d1503abd 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -28,29 +28,25 @@ public function __construct(Arrayable|array $items = [])
         parent::__construct($items);
     }
 
-    public function getFooter(): bool|string
+    public function getFooter(): ?string
     {
-        return Config::get('docs.sidebar.footer', true);
-    }
-
-    public function getFooterText(): ?string
-    {
-        $option = Config::get('docs.sidebar.footer', true);
+        $option = Config::get('docs.sidebar.footer', '[Back to home page](../)');
 
         if (is_string($option)) {
             return $option;
         }
 
+        if ($option === true) {
+            /** @deprecated Backwards compatibility */
+            return '[Back to home page](../)';
+        }
+
         return null;
     }
 
     public function hasFooter(): bool
     {
-        if (is_string(Config::get('docs.sidebar.footer', true))) {
-            return true;
-        }
-
-        return Config::getBool('docs.sidebar.footer', true);
+        return $this->getFooter() !== null;
     }
 
     public function isCollapsible(): bool
diff --git a/packages/framework/tests/Feature/SidebarViewTest.php b/packages/framework/tests/Feature/SidebarViewTest.php
index 0c338671485..522d25de033 100644
--- a/packages/framework/tests/Feature/SidebarViewTest.php
+++ b/packages/framework/tests/Feature/SidebarViewTest.php
@@ -37,7 +37,7 @@ public function testBaseSidebar()
             ->assertSeeHtml('<ul id="sidebar-items" role="list"')
             ->assertSeeHtml('<nav id="sidebar-navigation"')
             ->assertSeeHtml('<footer id="sidebar-footer"')
-            ->assertSeeHtml('<a href="index.html">Back to home page</a>')
+            ->assertSeeHtml('<a href="../">Back to home page</a>')
             ->assertSeeHtml('<span class="sr-only">Toggle dark theme</span>')
             ->assertDontSee('<a href="docs/index.html">')
             ->assertDontSee('<li class="sidebar-item')
@@ -53,9 +53,10 @@ public function testBaseSidebarWithoutFooter()
     {
         config(['docs.sidebar.footer' => false]);
 
-        $this->renderComponent(view('hyde::components.docs.sidebar'));
-
-        $this->assertViewWasNotRendered(view('hyde::components.docs.sidebar-footer-text'));
+        $this->renderComponent(view('hyde::components.docs.sidebar'))
+            ->assertDontSee('<footer id="sidebar-footer"')
+            ->assertDontSee('Back to home page')
+            ->allGood();
     }
 
     public function testBaseSidebarWithCustomFooterText()
diff --git a/packages/framework/tests/Feature/Views/SidebarFooterTextViewTest.php b/packages/framework/tests/Feature/Views/SidebarFooterTextViewTest.php
index f575483e0c9..7e9f407289b 100644
--- a/packages/framework/tests/Feature/Views/SidebarFooterTextViewTest.php
+++ b/packages/framework/tests/Feature/Views/SidebarFooterTextViewTest.php
@@ -17,7 +17,7 @@ public function testSidebarFooterTextViewWithDefaultConfig()
     {
         $view = $this->test(view('hyde::components.docs.sidebar-footer-text', $this->withSidebar()));
 
-        $view->assertSeeHtml('<a href="index.html">Back to home page</a>');
+        $view->assertSeeHtml('<a href="../">Back to home page</a>');
     }
 
     public function testSidebarFooterTextViewWhenConfigOptionIsTrue()
@@ -26,7 +26,7 @@ public function testSidebarFooterTextViewWhenConfigOptionIsTrue()
 
         $view = $this->test(view('hyde::components.docs.sidebar-footer-text', $this->withSidebar()));
 
-        $view->assertSeeHtml('<a href="index.html">Back to home page</a>');
+        $view->assertSeeHtml('<a href="../">Back to home page</a>');
     }
 
     public function testSidebarFooterTextViewWhenConfigOptionIsMarkdownString()
@@ -38,13 +38,6 @@ public function testSidebarFooterTextViewWhenConfigOptionIsMarkdownString()
         $view->assertSeeText('Your Markdown String Here');
     }
 
-    public function testSidebarFooterTextViewWhenConfigOptionIsFalse()
-    {
-        // This state is handled earlier in the component by the sidebar component so we don't need to test it here.
-
-        $this->assertTrue(true);
-    }
-
     protected function withSidebar(): array
     {
         return ['sidebar' => new DocumentationSidebar()];
diff --git a/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php b/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
index 1f6aba2bb97..41d658162b7 100644
--- a/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
+++ b/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
@@ -122,11 +122,11 @@ public function testGetMethodResolvesInstanceFromServiceContainer()
         $this->assertSame($instance, DocumentationSidebar::get());
     }
 
-    public function testGetFooterReturnsTrueByDefault()
+    public function testGetFooterReturnsBackLinkByDefault()
     {
         self::mockConfig();
 
-        $this->assertTrue((new DocumentationSidebar())->getFooter());
+        $this->assertSame('[Back to home page](../)', (new DocumentationSidebar())->getFooter());
     }
 
     public function testGetFooterReturnsStringWhenConfigIsString()
@@ -136,39 +136,18 @@ public function testGetFooterReturnsStringWhenConfigIsString()
         $this->assertSame('Some footer content', (new DocumentationSidebar())->getFooter());
     }
 
-    public function testGetFooterReturnsTrueWhenConfigIsTrue()
+    public function testGetFooterReturnsBackLinkWhenConfigIsTrue()
     {
         self::mockConfig(['docs.sidebar.footer' => true]);
 
-        $this->assertTrue((new DocumentationSidebar())->getFooter());
+        $this->assertSame('[Back to home page](../)', (new DocumentationSidebar())->getFooter());
     }
 
-    public function testGetFooterReturnsFalseWhenConfigIsFalse()
+    public function testGetFooterReturnsNullWhenConfigIsFalse()
     {
         self::mockConfig(['docs.sidebar.footer' => false]);
 
-        $this->assertFalse((new DocumentationSidebar())->getFooter());
-    }
-
-    public function testGetFooterTextReturnsStringWhenConfigIsString()
-    {
-        self::mockConfig(['docs.sidebar.footer' => 'Some footer content']);
-
-        $this->assertSame('Some footer content', (new DocumentationSidebar())->getFooterText());
-    }
-
-    public function testGetFooterTextReturnsNullWhenConfigIsTrue()
-    {
-        self::mockConfig(['docs.sidebar.footer' => true]);
-
-        $this->assertNull((new DocumentationSidebar())->getFooterText());
-    }
-
-    public function testGetFooterTextReturnsNullWhenConfigIsFalse()
-    {
-        self::mockConfig(['docs.sidebar.footer' => false]);
-
-        $this->assertNull((new DocumentationSidebar())->getFooterText());
+        $this->assertNull((new DocumentationSidebar())->getFooter());
     }
 
     public function testIsCollapsibleReturnsTrueByDefault()
diff --git a/packages/framework/tests/Unit/RelativeLinksAcrossPagesRetainsIntegrityTest.php b/packages/framework/tests/Unit/RelativeLinksAcrossPagesRetainsIntegrityTest.php
index c263016b94f..facec7a3cc6 100644
--- a/packages/framework/tests/Unit/RelativeLinksAcrossPagesRetainsIntegrityTest.php
+++ b/packages/framework/tests/Unit/RelativeLinksAcrossPagesRetainsIntegrityTest.php
@@ -93,7 +93,7 @@ public function testRelativeLinksAcrossPagesRetainsIntegrity()
             '<link rel="stylesheet" href="../media/app.css">',
             '<a href="../docs/index.html">',
             '<a href="../docs/docs.html"',
-            '<a href="../index.html">Back to home page</a>',
+            '<a href="../">Back to home page</a>',
         ]);
     }
 }

From ca62c8c906f9b2394240d2224aa09daae1ae7219 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 26 Feb 2024 16:39:38 +0100
Subject: [PATCH 0664/1422] Pass sidebar instance as component variable

---
 .../resources/views/components/docs/sidebar.blade.php          | 3 ---
 packages/framework/resources/views/layouts/docs.blade.php      | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/packages/framework/resources/views/components/docs/sidebar.blade.php b/packages/framework/resources/views/components/docs/sidebar.blade.php
index 35b845b1366..0196551d310 100644
--- a/packages/framework/resources/views/components/docs/sidebar.blade.php
+++ b/packages/framework/resources/views/components/docs/sidebar.blade.php
@@ -1,6 +1,3 @@
-@php
-$sidebar = app('navigation.sidebar');
-@endphp
 <aside id="sidebar" x-cloak :class="sidebarOpen ? 'visible left-0' : 'invisible -left-64 md:visible md:left-0'" class="bg-gray-100 dark:bg-gray-800 dark:text-gray-200 h-screen w-64 fixed z-30 md:flex flex-col shadow-lg md:shadow-none transition-all duration-300">
     <header id="sidebar-header" class="h-16">
         @include('hyde::components.docs.sidebar-brand')
diff --git a/packages/framework/resources/views/layouts/docs.blade.php b/packages/framework/resources/views/layouts/docs.blade.php
index 3f66d821517..e6bdb4886cf 100644
--- a/packages/framework/resources/views/layouts/docs.blade.php
+++ b/packages/framework/resources/views/layouts/docs.blade.php
@@ -8,7 +8,7 @@
 
     @include('hyde::components.skip-to-content-button')
     @include('hyde::components.docs.mobile-navigation')
-    @include('hyde::components.docs.sidebar')
+    @include('hyde::components.docs.sidebar', ['sidebar' => app('navigation.sidebar')])
 
     <main id="content" class="dark:bg-gray-900 min-h-screen bg-gray-50 md:bg-white absolute top-16 md:top-0 w-screen md:left-64 md:w-[calc(100vw_-_16rem)]">
         @include('hyde::components.docs.documentation-article')

From ee594f0eaaf1b4220a7719658b1ecdd8cf0a043b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 26 Feb 2024 17:10:02 +0100
Subject: [PATCH 0665/1422] Add sidebar header accessor

---
 .../Features/Navigation/DocumentationSidebar.php   |  5 +++++
 .../tests/Unit/DocumentationSidebarUnitTest.php    | 14 ++++++++++++++
 2 files changed, 19 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 600d1503abd..11cb904cc7c 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -28,6 +28,11 @@ public function __construct(Arrayable|array $items = [])
         parent::__construct($items);
     }
 
+    public function getHeader(): string
+    {
+        return Config::get('docs.sidebar.header', 'Documentation');
+    }
+
     public function getFooter(): ?string
     {
         $option = Config::get('docs.sidebar.footer', '[Back to home page](../)');
diff --git a/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php b/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
index 41d658162b7..fc3b74ea55f 100644
--- a/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
+++ b/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
@@ -122,6 +122,20 @@ public function testGetMethodResolvesInstanceFromServiceContainer()
         $this->assertSame($instance, DocumentationSidebar::get());
     }
 
+    public function testGetHeaderReturnsDefaultWhenNotConfigured()
+    {
+        self::mockConfig();
+
+        $this->assertSame('Documentation', (new DocumentationSidebar())->getHeader());
+    }
+
+    public function testGetHeaderReturnsConfiguredValue()
+    {
+        self::mockConfig(['docs.sidebar.header' => 'Some header']);
+
+        $this->assertSame('Some header', (new DocumentationSidebar())->getHeader());
+    }
+
     public function testGetFooterReturnsBackLinkByDefault()
     {
         self::mockConfig();

From 8d28069dafab3c12409d58a2739ecda5dc6f0367 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 26 Feb 2024 17:12:40 +0100
Subject: [PATCH 0666/1422] Use sidebar header accessor

---
 .../views/components/docs/sidebar-brand.blade.php         | 4 ++--
 .../tests/Feature/Views/SidebarBrandViewTest.php          | 8 ++++++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/packages/framework/resources/views/components/docs/sidebar-brand.blade.php b/packages/framework/resources/views/components/docs/sidebar-brand.blade.php
index ad693a85c96..e150f86e133 100644
--- a/packages/framework/resources/views/components/docs/sidebar-brand.blade.php
+++ b/packages/framework/resources/views/components/docs/sidebar-brand.blade.php
@@ -2,10 +2,10 @@
     <strong class="px-2">
         @if(DocumentationPage::home())
             <a href="{{ DocumentationPage::home() }}">
-                {{ config('docs.sidebar.header', 'Documentation') }}
+                {{  $sidebar->getHeader() }}
             </a>
         @else
-            {{ config('docs.sidebar.header', 'Documentation') }}
+            {{ $sidebar->getHeader() }}
         @endif
     </strong>
     <x-hyde::navigation.theme-toggle-button class="opacity-75 hover:opacity-100"/>
diff --git a/packages/framework/tests/Feature/Views/SidebarBrandViewTest.php b/packages/framework/tests/Feature/Views/SidebarBrandViewTest.php
index 10b840bf5e4..1086a1b40f6 100644
--- a/packages/framework/tests/Feature/Views/SidebarBrandViewTest.php
+++ b/packages/framework/tests/Feature/Views/SidebarBrandViewTest.php
@@ -9,6 +9,7 @@
 use Hyde\Foundation\HydeKernel;
 use Hyde\Testing\TestsBladeViews;
 use Hyde\Pages\DocumentationPage;
+use Hyde\Framework\Features\Navigation\DocumentationSidebar;
 
 class SidebarBrandViewTest extends TestCase
 {
@@ -68,4 +69,11 @@ public function testSidebarBrandViewWithoutDarkmodeFeature()
         $view->assertSee('HydePHP Docs');
         $view->assertDontSee('theme-toggle-button');
     }
+
+    protected function testViewData(): array
+    {
+        return [
+            'sidebar' => new DocumentationSidebar(),
+        ];
+    }
 }

From d12b00147f4853b75f08d0999d84e5b7374dbdd8 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 27 Feb 2024 19:03:32 +0100
Subject: [PATCH 0667/1422] Change void testing helper to return instance

---
 .../Feature/AutomaticNavigationConfigurationsTest.php     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 8c8142bbcea..8a0109e4f13 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -1240,14 +1240,14 @@ public function testSidebarGroupCasingUsingFrontMatter()
 
     // Testing helpers
 
-    protected function assertSidebarEquals(array $expected, array $menuPages): void
+    protected function assertSidebarEquals(array $expected, array $menuPages): AssertableNavigationMenu
     {
-        $this->sidebar($menuPages)->assertEquals($expected);
+        return $this->sidebar($menuPages)->assertEquals($expected);
     }
 
-    protected function assertMenuEquals(array $expected, array $menuPages): void
+    protected function assertMenuEquals(array $expected, array $menuPages): AssertableNavigationMenu
     {
-        $this->menu($menuPages)->assertEquals($expected);
+        return $this->menu($menuPages)->assertEquals($expected);
     }
 
     #[NoReturn]

From e2b14c91c9612793c93b71bcc0ffc3f7a87d3243 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 27 Feb 2024 19:05:15 +0100
Subject: [PATCH 0668/1422] Add back testing helper to die with the state

---
 .../tests/Feature/AutomaticNavigationConfigurationsTest.php  | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 8a0109e4f13..fdae21d2a38 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -1334,6 +1334,11 @@ public function getState(int $index): ?TestNavItem
         return $this->state()[$index] ?? null;
     }
 
+    public function ddState(): void
+    {
+        dd($this->state());
+    }
+
     /**
      * @param  array  $expected  The expected state format
      * @param  bool  $strict  If false, missing array keys are ignored

From d02531b2c721b71441d827939d3658d2f9bef0dd Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 28 Feb 2024 11:15:10 +0100
Subject: [PATCH 0669/1422] Rename test methods names to be clearer

---
 .../tests/Feature/AutomaticNavigationConfigurationsTest.php   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index fdae21d2a38..79f42d1e1fe 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -200,7 +200,7 @@ public function testMainNavigationMenuWithFrontMatterVisible()
         ]);
     }
 
-    public function testMainNavigationMenuWithFrontMatterGroup()
+    public function testMainNavigationMenuWithExplicitFrontMatterGroupUsesDropdownsRegardlessOfConfigSetting()
     {
         // TODO: For new v2 system, this should insert a root item with the group name and the children as the pages
 
@@ -215,7 +215,7 @@ public function testMainNavigationMenuWithFrontMatterGroup()
         ]);
     }
 
-    public function testMainNavigationMenuWithFrontMatterCategory()
+    public function testMainNavigationMenuWithExplicitFrontMatterCategoryUsesDropdownsRegardlessOfConfigSetting()
     {
         // TODO: For new v2 system, this should insert a root item with the group name and the children as the pages
 

From 080d2043864b35d7851090d810a231c0c0160c5a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 28 Feb 2024 11:11:10 +0100
Subject: [PATCH 0670/1422] Move up conditional

---
 .../Features/Navigation/NavigationMenuGenerator.php       | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
index b490ac19bc2..00ed144add6 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
@@ -120,14 +120,14 @@ protected function canAddRoute(Route $route): bool
 
     protected function canGroupRoute(Route $route): bool
     {
-        if (! $this->usesGroups) {
-            return false;
-        }
-
         if (! $this->generatesSidebar) {
             return $route->getPage()->navigationMenuGroup() !== null;
         }
 
+        if (! $this->usesGroups) {
+            return false;
+        }
+
         return true;
     }
 

From 8f171ad20e19e161204a57ca5bd6e6d505dab49f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 28 Feb 2024 11:29:22 +0100
Subject: [PATCH 0671/1422] Expect root item with the group name and the
 children as the pages

---
 .../AutomaticNavigationConfigurationsTest.php        | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 79f42d1e1fe..3c9f8219b1c 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -202,12 +202,8 @@ public function testMainNavigationMenuWithFrontMatterVisible()
 
     public function testMainNavigationMenuWithExplicitFrontMatterGroupUsesDropdownsRegardlessOfConfigSetting()
     {
-        // TODO: For new v2 system, this should insert a root item with the group name and the children as the pages
-
         $this->assertMenuEquals([
-            ['label' => 'Foo', 'group' => 'group-1'],
-            ['label' => 'Bar', 'group' => 'group-1'],
-            ['label' => 'Baz', 'group' => 'group-1'],
+            ['label' => 'Group 1', 'children' => ['Foo', 'Bar', 'Baz']],
         ], [
             new MarkdownPage('foo', ['navigation.group' => 'Group 1']),
             new MarkdownPage('bar', ['navigation.group' => 'Group 1']),
@@ -217,12 +213,8 @@ public function testMainNavigationMenuWithExplicitFrontMatterGroupUsesDropdownsR
 
     public function testMainNavigationMenuWithExplicitFrontMatterCategoryUsesDropdownsRegardlessOfConfigSetting()
     {
-        // TODO: For new v2 system, this should insert a root item with the group name and the children as the pages
-
         $this->assertMenuEquals([
-            ['label' => 'Foo', 'group' => 'group-1'],
-            ['label' => 'Bar', 'group' => 'group-1'],
-            ['label' => 'Baz', 'group' => 'group-1'],
+            ['label' => 'Group 1', 'children' => ['Foo', 'Bar', 'Baz']],
         ], [
             new MarkdownPage('foo', ['navigation.category' => 'Group 1']),
             new MarkdownPage('bar', ['navigation.category' => 'Group 1']),

From 353603bb9ff22dedb1ac778b06ffac1cb3465e7a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 28 Feb 2024 11:37:19 +0100
Subject: [PATCH 0672/1422] Expect that menu items are always grouped when set
 in front matter

---
 .../Feature/AutomaticNavigationConfigurationsTest.php    | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 3c9f8219b1c..61ae342659d 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -284,7 +284,10 @@ public function testMainNavigationMenuWithFrontMatterGroupAndCategory()
     {
         // Since the main key in the navigation schema is 'group', that takes precedence over its 'category' alias
 
-        $this->assertMenuEquals(array_fill(0, 3, ['group' => 'group-1']), [
+        $this->assertMenuEquals([[
+            'label' => 'Group 1',
+            'children' => ['Foo', 'Bar', 'Baz'],
+        ]], [
             new MarkdownPage('foo', ['navigation.group' => 'Group 1', 'navigation.category' => 'Group 2']),
             new MarkdownPage('bar', ['navigation.group' => 'Group 1', 'navigation.category' => 'Group 2']),
             new MarkdownPage('baz', ['navigation.group' => 'Group 1', 'navigation.category' => 'Group 2']),
@@ -486,8 +489,8 @@ public function testMainNavigationMenuItemsWithTheSameLabelAreNotFilteredForDupl
     public function testMainNavigationMenuItemsWithSameLabelButDifferentGroupsAreNotFiltered()
     {
         $this->assertMenuEquals([
-            ['label' => 'Foo', 'group' => 'group-1'],
-            ['label' => 'Foo', 'group' => 'group-2'],
+            ['label' => 'Group 1', 'children' => ['Foo']],
+            ['label' => 'Group 2', 'children' => ['Foo']],
         ], [
             new MarkdownPage('foo', ['navigation.label' => 'Foo', 'navigation.group' => 'Group 1']),
             new MarkdownPage('bar', ['navigation.label' => 'Foo', 'navigation.group' => 'Group 2']),

From 7c754535ce9c3e673d8e7236d6fedb9eb293d310 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 28 Feb 2024 13:46:20 +0100
Subject: [PATCH 0673/1422] Remove resolved hotpatches from test

Fixed in https://github.com/hydephp/develop/pull/1597
---
 .../tests/Feature/AutomaticNavigationConfigurationsTest.php    | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 61ae342659d..ad5ac5a0712 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -399,7 +399,6 @@ public function testMainNavigationMenuWithConfigLabels()
 
     public function testMainNavigationDropdownLabelsCanBeSetInConfig()
     {
-        config(['hyde.navigation.subdirectories' => 'dropdown']); // TODO This should NOT be necessary when using front matter
         config(['hyde.navigation.labels' => ['hello' => 'World']]);
 
         $this->assertMenuEquals(['World'], [
@@ -1184,8 +1183,6 @@ public function testMainMenuNavigationGroupCasing()
 
     public function testMainMenuNavigationGroupCasingUsingFrontMatter()
     {
-        config(['hyde.navigation.subdirectories' => 'dropdown']); // TODO This should NOT be necessary when using front matter
-
         // If the user explicitly sets the group, we should respect that and assume it's already formatted correctly
 
         $this->assertMenuEquals(['Hello World'], [new MarkdownPage('foo', ['navigation.group' => 'Hello World'])]);

From e84e0f0e2e5f3942261fc5ad4e933529b71e8aeb Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 28 Feb 2024 21:53:47 +0100
Subject: [PATCH 0674/1422] Add method to add multiple children at once

---
 .../Framework/Features/Navigation/NavItem.php | 12 +++++++++-
 packages/framework/tests/Unit/NavItemTest.php | 22 +++++++++++++++++++
 2 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 5be8695d751..f80db61238c 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -208,7 +208,17 @@ public function addChild(NavItem $item): static
         return $this;
     }
 
-    // Todo add method to add multiple children at once?
+    /**
+     * Add multiple navigation items to the children of the navigation item.
+     */
+    public function addChildren(array $items): static
+    {
+        foreach ($items as $item) {
+            $this->addChild($item);
+        }
+
+        return $this;
+    }
 
     protected static function normalizeGroupKey(?string $group): ?string
     {
diff --git a/packages/framework/tests/Unit/NavItemTest.php b/packages/framework/tests/Unit/NavItemTest.php
index 754d536f1ac..0b925e936c8 100644
--- a/packages/framework/tests/Unit/NavItemTest.php
+++ b/packages/framework/tests/Unit/NavItemTest.php
@@ -404,4 +404,26 @@ public function testAddChildMethodReturnsSelf()
 
         $this->assertSame($parent, $parent->addChild($child));
     }
+
+    public function testCanAddMultipleItemsToDropdown()
+    {
+        $parent = new NavItem(new Route(new MarkdownPage()), 'Parent', 500, 'foo');
+        $child1 = new NavItem(new Route(new MarkdownPage()), 'Child 1', 500, 'foo');
+        $child2 = new NavItem(new Route(new MarkdownPage()), 'Child 2', 500, 'foo');
+
+        $this->assertSame([], $parent->getChildren());
+
+        $parent->addChildren([$child1, $child2]);
+
+        $this->assertSame([$child1, $child2], $parent->getChildren());
+    }
+
+    public function testAddChildrenMethodReturnsSelf()
+    {
+        $parent = new NavItem(new Route(new MarkdownPage()), 'Parent', 500, 'foo');
+        $child1 = new NavItem(new Route(new MarkdownPage()), 'Child 1', 500, 'foo');
+        $child2 = new NavItem(new Route(new MarkdownPage()), 'Child 2', 500, 'foo');
+
+        $this->assertSame($parent, $parent->addChildren([$child1, $child2]));
+    }
 }

From cb580ed31a70a1d14a72f31cf4c47a2bceda7901 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 28 Feb 2024 21:54:41 +0100
Subject: [PATCH 0675/1422] Update todo

---
 .../framework/src/Framework/Features/Navigation/NavItem.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index f80db61238c..89b7943214a 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -93,7 +93,7 @@ public static function forRoute(Route|string $route, ?string $label = null, ?int
     /**
      * Create a new dropdown navigation menu item.
      *
-     * @TODO: Might be more semantic to have this named something else, as it also includes sidebars groups.
+     * @TODO: Might be more semantic to have this named something else, as it also includes sidebars groups. (technically it only makes sense for the main navigation menu, but it's not enforced in the code, and the sidebar does use this method)
      *
      * @param  string  $label  The label of the dropdown item.
      * @param  array<NavItem>  $items  The items to be included in the dropdown.

From 0d53a8fb46812263de48ef5d1b5e8aa8c73f9bd2 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 29 Feb 2024 10:14:48 +0100
Subject: [PATCH 0676/1422] Create positioning priority constants in the
 navigation menu class

---
 .../src/Framework/Features/Navigation/NavigationMenu.php      | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
index 84779c79eb9..93b54bb1bfe 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
@@ -17,6 +17,10 @@
  */
 abstract class NavigationMenu
 {
+    public const FIRST = 0;
+    public const MIDDLE = 500;
+    public const LAST = 999;
+
     /** @var \Illuminate\Support\Collection<\Hyde\Framework\Features\Navigation\NavItem> */
     protected Collection $items;
 

From b37b99a36e54b3e6e36c9c0413c7157f3f58830b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 29 Feb 2024 10:16:12 +0100
Subject: [PATCH 0677/1422] Update factory to use menu class constant

---
 .../src/Framework/Factories/NavigationDataFactory.php         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Factories/NavigationDataFactory.php b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
index e131e6adb21..76f3fa6d3f6 100644
--- a/packages/framework/src/Framework/Factories/NavigationDataFactory.php
+++ b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
@@ -10,6 +10,7 @@
 use Hyde\Pages\DocumentationPage;
 use Hyde\Markdown\Models\FrontMatter;
 use Hyde\Framework\Factories\Concerns\CoreDataObject;
+use Hyde\Framework\Features\Navigation\NavigationMenu;
 use Hyde\Markdown\Contracts\FrontMatter\SubSchemas\NavigationSchema;
 
 use function basename;
@@ -30,7 +31,6 @@ class NavigationDataFactory extends Concerns\PageDataFactory implements Navigati
      */
     final public const SCHEMA = NavigationSchema::NAVIGATION_SCHEMA;
 
-    protected const FALLBACK_PRIORITY = 999;
     protected const CONFIG_OFFSET = 500;
 
     protected readonly ?string $label;
@@ -99,7 +99,7 @@ protected function makePriority(): int
     {
         return $this->searchForPriorityInFrontMatter()
             ?? $this->searchForPriorityInConfigs()
-            ?? self::FALLBACK_PRIORITY;
+            ?? NavigationMenu::LAST;
     }
 
     private function searchForLabelInFrontMatter(): ?string

From 80d6c9251e0d0f34d1e2e0a82f877df33995f97e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 29 Feb 2024 10:18:32 +0100
Subject: [PATCH 0678/1422] Use base positioning constant for priority offset

---
 .../src/Framework/Factories/NavigationDataFactory.php         | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/packages/framework/src/Framework/Factories/NavigationDataFactory.php b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
index 76f3fa6d3f6..c3bca4c8f7c 100644
--- a/packages/framework/src/Framework/Factories/NavigationDataFactory.php
+++ b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
@@ -31,8 +31,6 @@ class NavigationDataFactory extends Concerns\PageDataFactory implements Navigati
      */
     final public const SCHEMA = NavigationSchema::NAVIGATION_SCHEMA;
 
-    protected const CONFIG_OFFSET = 500;
-
     protected readonly ?string $label;
     protected readonly ?string $group;
     protected readonly ?bool $hidden;
@@ -230,7 +228,7 @@ private function parseNavigationPriorityConfig(array $config, string $pageKeyNam
 
             return $this->offset(
                 array_flip($config)[$pageKey] ?? null,
-                self::CONFIG_OFFSET
+                NavigationMenu::MIDDLE
             );
         }
 

From 4807e9ff946ea1d67cffa54ea4f52cd99f011fce Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 29 Feb 2024 10:22:54 +0100
Subject: [PATCH 0679/1422] Use priority constant

---
 .../framework/src/Framework/Features/Navigation/NavItem.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 89b7943214a..4aa3ab8f828 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -101,7 +101,7 @@ public static function forRoute(Route|string $route, ?string $label = null, ?int
      */
     public static function dropdown(string $label, array $items, ?int $priority = null): static
     {
-        return new static('', $label, $priority ?? 999, $label, $items);
+        return new static('', $label, $priority ?? NavigationMenu::LAST, $label, $items);
     }
 
     /**

From d4e94e6db78a3b30ac8bcb2e4b940de97159bedf Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 29 Feb 2024 10:25:40 +0100
Subject: [PATCH 0680/1422] Use priority constants

---
 .../framework/src/Framework/Features/Navigation/NavItem.php   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 4aa3ab8f828..5e1ece187d7 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -42,7 +42,7 @@ class NavItem implements Stringable
     /**
      * Create a new navigation menu item.
      */
-    public function __construct(Route|string $destination, string $label, int $priority = 500, ?string $group = null, array $children = [])
+    public function __construct(Route|string $destination, string $label, int $priority = NavigationMenu::MIDDLE, ?string $group = null, array $children = [])
     {
         if (is_string($destination)) {
             $destination = Routes::get($destination) ?? new ExternalRoute($destination);
@@ -72,7 +72,7 @@ public static function fromRoute(Route $route, ?string $label = null, ?int $prio
     /**
      * Create a new navigation menu item leading to an external URI.
      */
-    public static function forLink(string $href, string $label, int $priority = 500): static
+    public static function forLink(string $href, string $label, int $priority = NavigationMenu::MIDDLE): static
     {
         return new static($href, $label, $priority);
     }

From aaa17a01ca0e4cecbaaa82ba1375f8476a10ae62 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 29 Feb 2024 10:26:57 +0100
Subject: [PATCH 0681/1422] Remove first constant

---
 .../src/Framework/Features/Navigation/NavigationMenu.php         | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
index 93b54bb1bfe..81cb0da760c 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
@@ -17,7 +17,6 @@
  */
 abstract class NavigationMenu
 {
-    public const FIRST = 0;
     public const MIDDLE = 500;
     public const LAST = 999;
 

From 59175a353b1febf5a1643c884bf249ea01dc4253 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 29 Feb 2024 10:27:30 +0100
Subject: [PATCH 0682/1422] Rename middle constant to default

---
 .../src/Framework/Factories/NavigationDataFactory.php         | 2 +-
 .../framework/src/Framework/Features/Navigation/NavItem.php   | 4 ++--
 .../src/Framework/Features/Navigation/NavigationMenu.php      | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/framework/src/Framework/Factories/NavigationDataFactory.php b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
index c3bca4c8f7c..adf2eacbb78 100644
--- a/packages/framework/src/Framework/Factories/NavigationDataFactory.php
+++ b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
@@ -228,7 +228,7 @@ private function parseNavigationPriorityConfig(array $config, string $pageKeyNam
 
             return $this->offset(
                 array_flip($config)[$pageKey] ?? null,
-                NavigationMenu::MIDDLE
+                NavigationMenu::DEFAULT
             );
         }
 
diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 5e1ece187d7..94125f51ba0 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -42,7 +42,7 @@ class NavItem implements Stringable
     /**
      * Create a new navigation menu item.
      */
-    public function __construct(Route|string $destination, string $label, int $priority = NavigationMenu::MIDDLE, ?string $group = null, array $children = [])
+    public function __construct(Route|string $destination, string $label, int $priority = NavigationMenu::DEFAULT, ?string $group = null, array $children = [])
     {
         if (is_string($destination)) {
             $destination = Routes::get($destination) ?? new ExternalRoute($destination);
@@ -72,7 +72,7 @@ public static function fromRoute(Route $route, ?string $label = null, ?int $prio
     /**
      * Create a new navigation menu item leading to an external URI.
      */
-    public static function forLink(string $href, string $label, int $priority = NavigationMenu::MIDDLE): static
+    public static function forLink(string $href, string $label, int $priority = NavigationMenu::DEFAULT): static
     {
         return new static($href, $label, $priority);
     }
diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
index 81cb0da760c..979b952b95c 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
@@ -17,7 +17,7 @@
  */
 abstract class NavigationMenu
 {
-    public const MIDDLE = 500;
+    public const DEFAULT = 500;
     public const LAST = 999;
 
     /** @var \Illuminate\Support\Collection<\Hyde\Framework\Features\Navigation\NavItem> */

From 44a7adde0c6324da54d2a562f60b9f157a1333c6 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 29 Feb 2024 11:48:27 +0100
Subject: [PATCH 0683/1422] Remove todo

No longer planned
---
 .../framework/src/Framework/Features/Navigation/NavItem.php     | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 94125f51ba0..52a03092b26 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -19,8 +19,6 @@
 /**
  * Abstraction for a navigation menu item. Used by the MainNavigationMenu and DocumentationSidebar classes.
  *
- * @todo Consider splitting facade methods to actual facade class.
- *
  * You have a few options to construct a navigation menu item:
  *   1. You can supply a Route directly and explicit properties to the constructor
  *   2. You can use NavItem::fromRoute() to use data from the route

From b851af8918f34e3f95a7e6f547285c1582314f6b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 29 Feb 2024 11:50:14 +0100
Subject: [PATCH 0684/1422] Elaborate dropdown method parameter documentation

---
 .../framework/src/Framework/Features/Navigation/NavItem.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 52a03092b26..79489b46247 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -95,7 +95,7 @@ public static function forRoute(Route|string $route, ?string $label = null, ?int
      *
      * @param  string  $label  The label of the dropdown item.
      * @param  array<NavItem>  $items  The items to be included in the dropdown.
-     * @param  int|null  $priority  The priority of the dropdown item. Leave blank to use the default priority.
+     * @param  int|null  $priority  The priority of the dropdown item. Leave blank to use the default priority, which is last in the menu.
      */
     public static function dropdown(string $label, array $items, ?int $priority = null): static
     {

From 06c73286c81a2105a9e606ec8f8bd3b23908f0a4 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 29 Feb 2024 11:51:02 +0100
Subject: [PATCH 0685/1422] Change documentation wording

---
 .../framework/src/Framework/Features/Navigation/NavItem.php   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 79489b46247..50b9decf093 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -76,9 +76,9 @@ public static function forLink(string $href, string $label, int $priority = Navi
     }
 
     /**
-     * Create a new navigation menu item leading to a Route model.
+     * Create a new navigation menu item leading to a Route instance.
      *
-     * @param  \Hyde\Support\Models\Route|string<\Hyde\Support\Models\RouteKey>  $route  Route model or route key
+     * @param  \Hyde\Support\Models\Route|string<\Hyde\Support\Models\RouteKey>  $route  Route instance or route key
      * @param  int|null  $priority  Leave blank to use the priority of the route's corresponding page.
      * @param  string|null  $label  Leave blank to use the label of the route's corresponding page.
      * @param  string|null  $group  Leave blank to use the group of the route's corresponding page.

From e172453909c06fffe50f23921b8fcad03d590773 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 29 Feb 2024 11:51:42 +0100
Subject: [PATCH 0686/1422] Clarify usage documentation

---
 .../framework/src/Framework/Features/Navigation/NavItem.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 50b9decf093..43ae6e3bb58 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -31,7 +31,7 @@ class NavItem implements Stringable
     protected int $priority;
     protected ?string $group;
 
-    /** The "slugified" version of the label. */
+    /** The "slugified" version of the label used to uniquely identify the item for things like active state comparisons. */
     protected string $identifier;
 
     /** @var array<\Hyde\Framework\Features\Navigation\NavItem> */

From d2653e24523d09acb7d3415456e9e70375d0b41e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 29 Feb 2024 11:52:33 +0100
Subject: [PATCH 0687/1422] Add more code documentation

---
 .../framework/src/Framework/Features/Navigation/NavItem.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 43ae6e3bb58..4b324da512c 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -34,7 +34,11 @@ class NavItem implements Stringable
     /** The "slugified" version of the label used to uniquely identify the item for things like active state comparisons. */
     protected string $identifier;
 
-    /** @var array<\Hyde\Framework\Features\Navigation\NavItem> */
+    /**
+     * Navigation items can be turned into dropdowns or sidebar groups by adding children.
+     *
+     * @var array<\Hyde\Framework\Features\Navigation\NavItem>
+     */
     protected array $children;
 
     /**

From df90de8c9a6fb9d34a8c67015025fef2593d4ed6 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 29 Feb 2024 11:52:52 +0100
Subject: [PATCH 0688/1422] Revert "Add more code documentation"

This reverts commit d2653e24523d09acb7d3415456e9e70375d0b41e.
---
 .../framework/src/Framework/Features/Navigation/NavItem.php | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 4b324da512c..43ae6e3bb58 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -34,11 +34,7 @@ class NavItem implements Stringable
     /** The "slugified" version of the label used to uniquely identify the item for things like active state comparisons. */
     protected string $identifier;
 
-    /**
-     * Navigation items can be turned into dropdowns or sidebar groups by adding children.
-     *
-     * @var array<\Hyde\Framework\Features\Navigation\NavItem>
-     */
+    /** @var array<\Hyde\Framework\Features\Navigation\NavItem> */
     protected array $children;
 
     /**

From df04558ec731205a90e5f4a62569ebb7d537c7ef Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 29 Feb 2024 11:54:22 +0100
Subject: [PATCH 0689/1422] Add code documentation to class description

---
 .../framework/src/Framework/Features/Navigation/NavItem.php     | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 43ae6e3bb58..ce298a39ba1 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -23,6 +23,8 @@
  *   1. You can supply a Route directly and explicit properties to the constructor
  *   2. You can use NavItem::fromRoute() to use data from the route
  *   3. You can use NavItem::forLink() for an external or un-routed link
+ *
+ * Navigation items can be turned into dropdowns or sidebar groups by adding children.
  */
 class NavItem implements Stringable
 {

From 6aafad56c642d4c2e152a7f5f03e3e51f96aec3b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 29 Feb 2024 11:54:33 +0100
Subject: [PATCH 0690/1422] Add notes about parent destination state

---
 .../framework/src/Framework/Features/Navigation/NavItem.php     | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index ce298a39ba1..87938516e73 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -25,6 +25,8 @@
  *   3. You can use NavItem::forLink() for an external or un-routed link
  *
  * Navigation items can be turned into dropdowns or sidebar groups by adding children.
+ * Note that doing so will mean that any link on the parent will no longer be clickable,
+ * as clicking the parent label will open the dropdown instead of leading to the destination.
  */
 class NavItem implements Stringable
 {

From 635d553245923bce0dbe7eef1e5de7f0d585df24 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 29 Feb 2024 11:58:13 +0100
Subject: [PATCH 0691/1422] Fix improper access to protected property

---
 packages/framework/resources/views/layouts/navigation.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/resources/views/layouts/navigation.blade.php b/packages/framework/resources/views/layouts/navigation.blade.php
index a2d05aeb00b..060e228eb0b 100644
--- a/packages/framework/resources/views/layouts/navigation.blade.php
+++ b/packages/framework/resources/views/layouts/navigation.blade.php
@@ -36,7 +36,7 @@
             @foreach ($navigation->getItems() as $item)
                 <li class="md:mx-2">
                     @if($item->hasChildren())
-                        <x-hyde::navigation.dropdown :label="$item->label" :items="$item->getChildren()"/>
+                        <x-hyde::navigation.dropdown :label="$item->getLabel()" :items="$item->getChildren()"/>
                     @else
                         @include('hyde::components.navigation.navigation-link')
                     @endif

From 7cace47b5f2faac24cc50712e0d1b8edf0d31644 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 29 Feb 2024 12:35:19 +0100
Subject: [PATCH 0692/1422] Remove destinations from items with children for a
 clearer state

These can't be clicked to returning null makes it clearer that the destination is disabled (for example when adding children to an existing instance)
---
 .../framework/src/Framework/Features/Navigation/NavItem.php | 6 +++++-
 packages/framework/tests/Unit/NavItemTest.php               | 4 ++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 87938516e73..a1132d02950 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -117,8 +117,12 @@ public function __toString(): string
     /**
      * Get the destination route of the navigation item.
      */
-    public function getDestination(): Route
+    public function getDestination(): ?Route
     {
+        if ($this->hasChildren()) {
+            return null;
+        }
+
         return $this->destination;
     }
 
diff --git a/packages/framework/tests/Unit/NavItemTest.php b/packages/framework/tests/Unit/NavItemTest.php
index 0b925e936c8..4e864540cd7 100644
--- a/packages/framework/tests/Unit/NavItemTest.php
+++ b/packages/framework/tests/Unit/NavItemTest.php
@@ -86,7 +86,7 @@ public function testCanConstructWithChildren()
         $item = new NavItem($route, 'Test', 500, null, $children);
 
         $this->assertSame('Test', $item->getLabel());
-        $this->assertSame($route, $item->getDestination());
+        $this->assertNull($item->getDestination());
         $this->assertSame(500, $item->getPriority());
 
         $this->assertCount(2, $item->getChildren());
@@ -111,7 +111,7 @@ public function testCanConstructWithChildrenWithoutRoute()
         $item = new NavItem('', 'Test', 500, null, $children);
 
         $this->assertSame('Test', $item->getLabel());
-        $this->assertSame('', $item->getDestination()->getLink());
+        $this->assertNull($item->getDestination());
 
         $this->assertCount(2, $item->getChildren());
         $this->assertSame($children, $item->getChildren());

From 4047320ee268b68a229b50f8ffbe046725a3827c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 29 Feb 2024 13:44:27 +0100
Subject: [PATCH 0693/1422] Remove todo for an issue I don't think is possible

---
 .../framework/src/Framework/Features/Navigation/NavItem.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index a1132d02950..b1d09fb2621 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -233,6 +233,6 @@ protected static function normalizeGroupKey(?string $group): ?string
 
     protected static function makeIdentifier(string $label): string
     {
-        return Str::slug($label); // Todo: If it's a dropdown based on a subdirectory, we should use the subdirectory as the identifier (start by making a test to see if it's even possible to add a differing label)
+        return Str::slug($label);
     }
 }

From 5405db0d94f90be0469a56ab182dc313fdbabeef Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 29 Feb 2024 13:49:03 +0100
Subject: [PATCH 0694/1422] Coalesce assign parent group when added child group
 is null

---
 .../Framework/Features/Navigation/NavItem.php |  2 +-
 packages/framework/tests/Unit/NavItemTest.php | 22 +++++++++++++++++++
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index b1d09fb2621..e6ecb310e8d 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -207,7 +207,7 @@ public function isCurrent(): bool
      */
     public function addChild(NavItem $item): static
     {
-        // Todo: Ensure that the item has a group identifier by creating it from the label if it doesn't exist?
+        $item->group ??= $this->group;
 
         $this->children[] = $item;
 
diff --git a/packages/framework/tests/Unit/NavItemTest.php b/packages/framework/tests/Unit/NavItemTest.php
index 4e864540cd7..b5ff9c6c0b7 100644
--- a/packages/framework/tests/Unit/NavItemTest.php
+++ b/packages/framework/tests/Unit/NavItemTest.php
@@ -426,4 +426,26 @@ public function testAddChildrenMethodReturnsSelf()
 
         $this->assertSame($parent, $parent->addChildren([$child1, $child2]));
     }
+
+    public function testAddingAnItemWithAGroupKeyKeepsTheSetGroupKey()
+    {
+        $parent = new NavItem(new Route(new MarkdownPage()), 'Parent', 500, 'foo');
+        $child = new NavItem(new Route(new MarkdownPage()), 'Child', 500, 'bar');
+
+        $parent->addChild($child);
+
+        $this->assertSame('foo', $parent->getGroup());
+        $this->assertSame('bar', $child->getGroup());
+    }
+
+    public function testAddingAnItemWithNoGroupKeyUsesParentIdentifier()
+    {
+        $parent = new NavItem(new Route(new MarkdownPage()), 'Parent', 500, 'foo');
+        $child = new NavItem(new Route(new MarkdownPage()), 'Child', 500);
+
+        $parent->addChild($child);
+
+        $this->assertSame('foo', $parent->getGroup());
+        $this->assertSame('foo', $child->getGroup());
+    }
 }

From 439d9c6992c6102d0c5202a40a57752c6feb2eca Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 29 Feb 2024 18:37:09 +0100
Subject: [PATCH 0695/1422] Rename NavItem `dropdown` method to `forGroup`

Also considered using "grouped" but "forGroup" matches the other facade methods.
---
 .../framework/src/Framework/Features/Navigation/NavItem.php | 4 +---
 .../Features/Navigation/NavigationMenuGenerator.php         | 2 +-
 packages/framework/tests/Feature/NavigationMenuTest.php     | 4 ++--
 .../tests/Feature/Services/DocumentationSidebarTest.php     | 6 +++---
 packages/framework/tests/Unit/NavItemTest.php               | 6 +++---
 5 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index e6ecb310e8d..ab4ca0bcabd 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -95,13 +95,11 @@ public static function forRoute(Route|string $route, ?string $label = null, ?int
     /**
      * Create a new dropdown navigation menu item.
      *
-     * @TODO: Might be more semantic to have this named something else, as it also includes sidebars groups. (technically it only makes sense for the main navigation menu, but it's not enforced in the code, and the sidebar does use this method)
-     *
      * @param  string  $label  The label of the dropdown item.
      * @param  array<NavItem>  $items  The items to be included in the dropdown.
      * @param  int|null  $priority  The priority of the dropdown item. Leave blank to use the default priority, which is last in the menu.
      */
-    public static function dropdown(string $label, array $items, ?int $priority = null): static
+    public static function forGroup(string $label, array $items, ?int $priority = null): static
     {
         return new static('', $label, $priority ?? NavigationMenu::LAST, $label, $items);
     }
diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
index 00ed144add6..bf82a3bbd5c 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
@@ -160,7 +160,7 @@ protected function createGroupItem(string $groupKey, string $groupName): NavItem
 
         $priority = $this->searchForGroupPriorityInConfig($groupKey);
 
-        return NavItem::dropdown($this->normalizeGroupLabel($label), [], $priority);
+        return NavItem::forGroup($this->normalizeGroupLabel($label), [], $priority);
     }
 
     protected function normalizeGroupLabel(string $label): string
diff --git a/packages/framework/tests/Feature/NavigationMenuTest.php b/packages/framework/tests/Feature/NavigationMenuTest.php
index 0666afeb8b8..2163dce6d6d 100644
--- a/packages/framework/tests/Feature/NavigationMenuTest.php
+++ b/packages/framework/tests/Feature/NavigationMenuTest.php
@@ -230,7 +230,7 @@ public function testPagesInSubdirectoriesAreNotAddedToTheNavigationMenuWithConfi
         $menu = $this->createNavigationMenu();
         $expected = collect([
             NavItem::fromRoute(Routes::get('index')),
-            NavItem::dropdown('Foo', [
+            NavItem::forGroup('Foo', [
                 NavItem::fromRoute(Routes::get('foo/bar')),
             ]),
         ]);
@@ -251,7 +251,7 @@ public function testPagesInDropdownsDoNotGetAddedToTheMainNavigation()
         $this->assertEquals([
             NavItem::fromRoute(Routes::get('index')),
             NavItem::fromRoute((new MarkdownPage('foo'))->getRoute()),
-            NavItem::dropdown('Bar', [
+            NavItem::forGroup('Bar', [
                 NavItem::fromRoute((new MarkdownPage('bar/baz'))->getRoute()),
             ]),
         ], $menu->getItems()->all());
diff --git a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
index 35de82258a4..b2da470a8c5 100644
--- a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
+++ b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
@@ -267,10 +267,10 @@ public function testCanHaveMultipleGroupedPagesWithTheSameNameLabels()
 
         $this->assertEquals(
             collect([
-                NavItem::dropdown('Bar', [
+                NavItem::forGroup('Bar', [
                     NavItem::fromRoute(Routes::get('docs/bar'), priority: 999),
                 ]),
-                NavItem::dropdown('Foo', [
+                NavItem::forGroup('Foo', [
                     NavItem::fromRoute(Routes::get('docs/foo'), priority: 999),
                 ]),
             ]),
@@ -288,7 +288,7 @@ public function testDuplicateLabelsWithinTheSameGroupAreNotRemoved()
 
         $this->assertEquals(
             collect([
-                NavItem::dropdown('Foo', [
+                NavItem::forGroup('Foo', [
                     NavItem::fromRoute(Routes::get('docs/bar'), priority: 999),
                     NavItem::fromRoute(Routes::get('docs/foo'), priority: 999),
                 ]),
diff --git a/packages/framework/tests/Unit/NavItemTest.php b/packages/framework/tests/Unit/NavItemTest.php
index b5ff9c6c0b7..1816633e0d1 100644
--- a/packages/framework/tests/Unit/NavItemTest.php
+++ b/packages/framework/tests/Unit/NavItemTest.php
@@ -263,7 +263,7 @@ public function testRouteBasedNavItemDestinationsAreResolvedRelatively()
 
     public function testDropdownFacade()
     {
-        $item = NavItem::dropdown('foo', []);
+        $item = NavItem::forGroup('foo', []);
 
         $this->assertSame('foo', $item->getLabel());
         $this->assertSame([], $item->getChildren());
@@ -276,14 +276,14 @@ public function testDropdownFacadeWithChildren()
             new NavItem(new Route(new MarkdownPage()), 'bar'),
         ];
 
-        $item = NavItem::dropdown('foo', $children);
+        $item = NavItem::forGroup('foo', $children);
         $this->assertSame($children, $item->getChildren());
         $this->assertSame(999, $item->getPriority());
     }
 
     public function testDropdownFacadeWithCustomPriority()
     {
-        $item = NavItem::dropdown('foo', [], 500);
+        $item = NavItem::forGroup('foo', [], 500);
 
         $this->assertSame(500, $item->getPriority());
     }

From 37cb4a83441be2099d592427b2e81c11303dfeff Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 29 Feb 2024 18:56:02 +0100
Subject: [PATCH 0696/1422] Call static method statically

---
 .../framework/src/Framework/Features/Navigation/NavItem.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index ab4ca0bcabd..0394d192294 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -54,7 +54,7 @@ public function __construct(Route|string $destination, string $label, int $prior
         $this->label = $label;
         $this->priority = $priority;
         $this->group = static::normalizeGroupKey($group);
-        $this->identifier = $this->makeIdentifier($label);
+        $this->identifier = static::makeIdentifier($label);
         $this->children = $children;
     }
 

From e28ae7c8ba55a6507f021f3955f41d025734e05e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 29 Feb 2024 18:56:49 +0100
Subject: [PATCH 0697/1422] Use explicit cast for equality comparison

---
 .../framework/src/Framework/Features/Navigation/NavItem.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 0394d192294..18ee08de286 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -197,7 +197,7 @@ public function hasChildren(): bool
      */
     public function isCurrent(): bool
     {
-        return Hyde::currentRoute()->getLink() === (string) $this->destination;
+        return Hyde::currentRoute()->getLink() === $this->destination->getLink();
     }
 
     /**

From 228e3d4d59d15751332f32ec0f25d828f26be8a0 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 29 Feb 2024 18:57:28 +0100
Subject: [PATCH 0698/1422] Use existing helper for equality comparison

---
 .../framework/src/Framework/Features/Navigation/NavItem.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 18ee08de286..50e2c563bf7 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -197,7 +197,7 @@ public function hasChildren(): bool
      */
     public function isCurrent(): bool
     {
-        return Hyde::currentRoute()->getLink() === $this->destination->getLink();
+        return $this->destination->is(Hyde::currentRoute());
     }
 
     /**

From 734c95e4f157ffd201b85444986868acbb6ab0b1 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 29 Feb 2024 19:04:52 +0100
Subject: [PATCH 0699/1422] Revert "Use existing helper for equality
 comparison"

This reverts commit 228e3d4d59d15751332f32ec0f25d828f26be8a0 as existing helper depends on route keys which do not exist on external routes.
---
 .../framework/src/Framework/Features/Navigation/NavItem.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 50e2c563bf7..18ee08de286 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -197,7 +197,7 @@ public function hasChildren(): bool
      */
     public function isCurrent(): bool
     {
-        return $this->destination->is(Hyde::currentRoute());
+        return Hyde::currentRoute()->getLink() === $this->destination->getLink();
     }
 
     /**

From faa87b4c403ba0797853b23482dcc7462560874b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 29 Feb 2024 19:05:28 +0100
Subject: [PATCH 0700/1422] Clarify method description context

---
 .../framework/src/Framework/Features/Navigation/NavItem.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 18ee08de286..17a8a750186 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -193,7 +193,7 @@ public function hasChildren(): bool
     }
 
     /**
-     * Check if the NavItem instance is the current page.
+     * Check if the NavItem instance is the current page being rendered.
      */
     public function isCurrent(): bool
     {

From 8c43c4f63670de6999cad50ce1d7758380812925 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 29 Feb 2024 19:07:11 +0100
Subject: [PATCH 0701/1422] Move fallback value to default parameter value

---
 .../framework/src/Framework/Features/Navigation/NavItem.php   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 17a8a750186..b6181fb08e8 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -99,9 +99,9 @@ public static function forRoute(Route|string $route, ?string $label = null, ?int
      * @param  array<NavItem>  $items  The items to be included in the dropdown.
      * @param  int|null  $priority  The priority of the dropdown item. Leave blank to use the default priority, which is last in the menu.
      */
-    public static function forGroup(string $label, array $items, ?int $priority = null): static
+    public static function forGroup(string $label, array $items, ?int $priority = NavigationMenu::LAST): static
     {
-        return new static('', $label, $priority ?? NavigationMenu::LAST, $label, $items);
+        return new static('', $label, $priority, $label, $items);
     }
 
     /**

From 2d90f7cdc4801a6961586820fd3a623deb6968e1 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 29 Feb 2024 19:07:52 +0100
Subject: [PATCH 0702/1422] Remove null type support from facade helper method

---
 .../framework/src/Framework/Features/Navigation/NavItem.php   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index b6181fb08e8..37686076f92 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -97,9 +97,9 @@ public static function forRoute(Route|string $route, ?string $label = null, ?int
      *
      * @param  string  $label  The label of the dropdown item.
      * @param  array<NavItem>  $items  The items to be included in the dropdown.
-     * @param  int|null  $priority  The priority of the dropdown item. Leave blank to use the default priority, which is last in the menu.
+     * @param  int  $priority  The priority of the dropdown item. Leave blank to use the default priority, which is last in the menu.
      */
-    public static function forGroup(string $label, array $items, ?int $priority = NavigationMenu::LAST): static
+    public static function forGroup(string $label, array $items, int $priority = NavigationMenu::LAST): static
     {
         return new static('', $label, $priority, $label, $items);
     }

From 9042071b6848715807e3ad3a294aeca42cf34ad6 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 29 Feb 2024 19:11:23 +0100
Subject: [PATCH 0703/1422] Revert "Remove null type support from facade helper
 method"

This reverts commit 2d90f7cdc4801a6961586820fd3a623deb6968e1.
---
 .../framework/src/Framework/Features/Navigation/NavItem.php   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 37686076f92..b6181fb08e8 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -97,9 +97,9 @@ public static function forRoute(Route|string $route, ?string $label = null, ?int
      *
      * @param  string  $label  The label of the dropdown item.
      * @param  array<NavItem>  $items  The items to be included in the dropdown.
-     * @param  int  $priority  The priority of the dropdown item. Leave blank to use the default priority, which is last in the menu.
+     * @param  int|null  $priority  The priority of the dropdown item. Leave blank to use the default priority, which is last in the menu.
      */
-    public static function forGroup(string $label, array $items, int $priority = NavigationMenu::LAST): static
+    public static function forGroup(string $label, array $items, ?int $priority = NavigationMenu::LAST): static
     {
         return new static('', $label, $priority, $label, $items);
     }

From 12ac55f81d7eb5eb117355b2b8ad3a3ca3627212 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 29 Feb 2024 19:11:26 +0100
Subject: [PATCH 0704/1422] Revert "Move fallback value to default parameter
 value"

This reverts commit 8c43c4f63670de6999cad50ce1d7758380812925.
---
 .../framework/src/Framework/Features/Navigation/NavItem.php   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index b6181fb08e8..17a8a750186 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -99,9 +99,9 @@ public static function forRoute(Route|string $route, ?string $label = null, ?int
      * @param  array<NavItem>  $items  The items to be included in the dropdown.
      * @param  int|null  $priority  The priority of the dropdown item. Leave blank to use the default priority, which is last in the menu.
      */
-    public static function forGroup(string $label, array $items, ?int $priority = NavigationMenu::LAST): static
+    public static function forGroup(string $label, array $items, ?int $priority = null): static
     {
-        return new static('', $label, $priority, $label, $items);
+        return new static('', $label, $priority ?? NavigationMenu::LAST, $label, $items);
     }
 
     /**

From 1eb85a6ba139d899b61a7ac9d065bf3d895c6f33 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 29 Feb 2024 19:15:30 +0100
Subject: [PATCH 0705/1422] Move up method in source

---
 .../Framework/Features/Navigation/NavItem.php    | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 17a8a750186..0b7f2e29cc1 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -71,14 +71,6 @@ public static function fromRoute(Route $route, ?string $label = null, ?int $prio
         );
     }
 
-    /**
-     * Create a new navigation menu item leading to an external URI.
-     */
-    public static function forLink(string $href, string $label, int $priority = NavigationMenu::DEFAULT): static
-    {
-        return new static($href, $label, $priority);
-    }
-
     /**
      * Create a new navigation menu item leading to a Route instance.
      *
@@ -92,6 +84,14 @@ public static function forRoute(Route|string $route, ?string $label = null, ?int
         return static::fromRoute($route instanceof Route ? $route : Routes::getOrFail($route), $label, $priority, $group);
     }
 
+    /**
+     * Create a new navigation menu item leading to an external URI.
+     */
+    public static function forLink(string $href, string $label, int $priority = NavigationMenu::DEFAULT): static
+    {
+        return new static($href, $label, $priority);
+    }
+
     /**
      * Create a new dropdown navigation menu item.
      *

From 6af588a94ea443c173bfeb85afcb069341f84d36 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 29 Feb 2024 19:17:22 +0100
Subject: [PATCH 0706/1422] Deprecate `NavItem::fromRoute()` method

We don't need two methods that do almost the same thing. I'm going to merge them, keeping the name of the other one to match the other similar helpers.
---
 .../framework/src/Framework/Features/Navigation/NavItem.php     | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 0b7f2e29cc1..429c4180153 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -60,6 +60,8 @@ public function __construct(Route|string $destination, string $label, int $prior
 
     /**
      * Create a new navigation menu item from a route.
+     *
+     * @deprecated Use NavItem::forRoute() instead.
      */
     public static function fromRoute(Route $route, ?string $label = null, ?int $priority = null, ?string $group = null): static
     {

From 6ddd33ed1770d770de9c9d5cfcb5d010f47dafe7 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 29 Feb 2024 19:18:48 +0100
Subject: [PATCH 0707/1422] Inline usage of deprecated method for merged
 replacement

---
 .../src/Framework/Features/Navigation/NavItem.php          | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 429c4180153..08fd6cb011d 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -83,7 +83,12 @@ public static function fromRoute(Route $route, ?string $label = null, ?int $prio
      */
     public static function forRoute(Route|string $route, ?string $label = null, ?int $priority = null, ?string $group = null): static
     {
-        return static::fromRoute($route instanceof Route ? $route : Routes::getOrFail($route), $label, $priority, $group);
+        return new static(
+            $route instanceof Route ? $route : Routes::getOrFail($route),
+            $label ?? $route instanceof Route ? $route : Routes::getOrFail($route)->getPage()->navigationMenuLabel(),
+            $priority ?? $route instanceof Route ? $route : Routes::getOrFail($route)->getPage()->navigationMenuPriority(),
+            $group ?? $route instanceof Route ? $route : Routes::getOrFail($route)->getPage()->navigationMenuGroup(),
+        );
     }
 
     /**

From b67d9a5304e3028862a585519699ed905b29a2c8 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 29 Feb 2024 19:22:27 +0100
Subject: [PATCH 0708/1422] Revert "Inline usage of deprecated method for
 merged replacement"

This reverts commit 6ddd33ed1770d770de9c9d5cfcb5d010f47dafe7.
---
 .../src/Framework/Features/Navigation/NavItem.php          | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 08fd6cb011d..429c4180153 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -83,12 +83,7 @@ public static function fromRoute(Route $route, ?string $label = null, ?int $prio
      */
     public static function forRoute(Route|string $route, ?string $label = null, ?int $priority = null, ?string $group = null): static
     {
-        return new static(
-            $route instanceof Route ? $route : Routes::getOrFail($route),
-            $label ?? $route instanceof Route ? $route : Routes::getOrFail($route)->getPage()->navigationMenuLabel(),
-            $priority ?? $route instanceof Route ? $route : Routes::getOrFail($route)->getPage()->navigationMenuPriority(),
-            $group ?? $route instanceof Route ? $route : Routes::getOrFail($route)->getPage()->navigationMenuGroup(),
-        );
+        return static::fromRoute($route instanceof Route ? $route : Routes::getOrFail($route), $label, $priority, $group);
     }
 
     /**

From 83235f0ee946819cec5836b8fcaaefa8cdaa1f99 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 29 Feb 2024 19:27:37 +0100
Subject: [PATCH 0709/1422] Introduce local variable

---
 .../framework/src/Framework/Features/Navigation/NavItem.php   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 429c4180153..42e351ba0f1 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -83,7 +83,9 @@ public static function fromRoute(Route $route, ?string $label = null, ?int $prio
      */
     public static function forRoute(Route|string $route, ?string $label = null, ?int $priority = null, ?string $group = null): static
     {
-        return static::fromRoute($route instanceof Route ? $route : Routes::getOrFail($route), $label, $priority, $group);
+        $route = $route instanceof Route ? $route : Routes::getOrFail($route);
+
+        return static::fromRoute($route, $label, $priority, $group);
     }
 
     /**

From f14bc66a3573ea5b59fe6712a180257b718a10e2 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 29 Feb 2024 19:27:58 +0100
Subject: [PATCH 0710/1422] Reinline usage of deprecated method for merged
 replacement

---
 .../src/Framework/Features/Navigation/NavItem.php          | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 42e351ba0f1..7198c985f4a 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -85,7 +85,12 @@ public static function forRoute(Route|string $route, ?string $label = null, ?int
     {
         $route = $route instanceof Route ? $route : Routes::getOrFail($route);
 
-        return static::fromRoute($route, $label, $priority, $group);
+        return new static(
+            $route,
+            $label ?? $route->getPage()->navigationMenuLabel(),
+            $priority ?? $route->getPage()->navigationMenuPriority(),
+            $group ?? $route->getPage()->navigationMenuGroup(),
+        );
     }
 
     /**

From 870e00400c132c8e290726e5d3e929eb0a7aeb7a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 29 Feb 2024 19:40:32 +0100
Subject: [PATCH 0711/1422] Update deprecated method to point to replacement

---
 .../src/Framework/Features/Navigation/NavItem.php          | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 7198c985f4a..e10ce0feffd 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -65,12 +65,7 @@ public function __construct(Route|string $destination, string $label, int $prior
      */
     public static function fromRoute(Route $route, ?string $label = null, ?int $priority = null, ?string $group = null): static
     {
-        return new static(
-            $route,
-            $label ?? $route->getPage()->navigationMenuLabel(),
-            $priority ?? $route->getPage()->navigationMenuPriority(),
-            $group ?? $route->getPage()->navigationMenuGroup(),
-        );
+        return static::forRoute($route, $label, $priority, $group);
     }
 
     /**

From 1edb2f2255da8cec7060edddd9dff94114e2b54c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 29 Feb 2024 19:50:07 +0100
Subject: [PATCH 0712/1422] Replace all usages of `fromRoute` with `forRoute`

---
 .../Navigation/NavigationMenuGenerator.php    |  6 +--
 .../tests/Feature/NavigationMenuTest.php      | 44 +++++++++----------
 .../Services/DocumentationSidebarTest.php     | 32 +++++++-------
 .../Unit/DocumentationSidebarUnitTest.php     |  2 +-
 .../tests/Unit/NavItemIsCurrentHelperTest.php | 26 +++++------
 packages/framework/tests/Unit/NavItemTest.php | 24 +++++-----
 6 files changed, 67 insertions(+), 67 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
index bf82a3bbd5c..342a696d96b 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
@@ -71,7 +71,7 @@ protected function generate(): void
                 if ($this->canGroupRoute($route)) {
                     $this->addRouteToGroup($route);
                 } else {
-                    $this->items->put($route->getRouteKey(), NavItem::fromRoute($route));
+                    $this->items->put($route->getRouteKey(), NavItem::forRoute($route));
                 }
             }
         });
@@ -79,7 +79,7 @@ protected function generate(): void
         if ($this->generatesSidebar) {
             // If there are no pages other than the index page, we add it to the sidebar so that it's not empty
             if ($this->items->count() === 0 && DocumentationPage::home() !== null) {
-                $this->items->push(NavItem::fromRoute(DocumentationPage::home()));
+                $this->items->push(NavItem::forRoute(DocumentationPage::home()));
             }
         } else {
             collect(Config::getArray('hyde.navigation.custom', []))->each(function (NavItem $item): void {
@@ -133,7 +133,7 @@ protected function canGroupRoute(Route $route): bool
 
     protected function addRouteToGroup(Route $route): void
     {
-        $item = NavItem::fromRoute($route);
+        $item = NavItem::forRoute($route);
 
         $groupName = $this->generatesSidebar ? ($item->getGroup() ?? 'Other') : $item->getGroup();
 
diff --git a/packages/framework/tests/Feature/NavigationMenuTest.php b/packages/framework/tests/Feature/NavigationMenuTest.php
index 2163dce6d6d..2bd704cc40e 100644
--- a/packages/framework/tests/Feature/NavigationMenuTest.php
+++ b/packages/framework/tests/Feature/NavigationMenuTest.php
@@ -38,7 +38,7 @@ public function testGenerateMethodCreatesCollectionOfNavItems()
     public function testGetItemsReturnsItems()
     {
         $this->assertEquals(collect([
-            NavItem::fromRoute(Routes::get('index')),
+            NavItem::forRoute(Routes::get('index')),
         ]), $this->createNavigationMenu()->getItems());
     }
 
@@ -67,9 +67,9 @@ public function testCreatedCollectionIsSortedByNavigationMenuPriority()
         $menu = $this->createNavigationMenu();
 
         $expected = collect([
-            NavItem::fromRoute(Routes::get('index')),
-            NavItem::fromRoute(Routes::get('foo')),
-            NavItem::fromRoute(Routes::get('docs/index')),
+            NavItem::forRoute(Routes::get('index')),
+            NavItem::forRoute(Routes::get('foo')),
+            NavItem::forRoute(Routes::get('docs/index')),
         ]);
 
         $this->assertCount(count($expected), $menu->getItems());
@@ -83,8 +83,8 @@ public function testIsSortedAutomaticallyWhenUsingNavigationMenuCreate()
         $menu = $this->createNavigationMenu();
 
         $expected = collect([
-            NavItem::fromRoute(Routes::get('index')),
-            NavItem::fromRoute(Routes::get('foo')),
+            NavItem::forRoute(Routes::get('index')),
+            NavItem::forRoute(Routes::get('foo')),
         ]);
 
         $this->assertCount(count($expected), $menu->getItems());
@@ -98,7 +98,7 @@ public function testExternalLinkCanBeAddedInConfig()
         $menu = $this->createNavigationMenu();
 
         $expected = collect([
-            NavItem::fromRoute(Routes::get('index')),
+            NavItem::forRoute(Routes::get('index')),
             NavItem::forLink('https://example.com', 'foo'),
         ]);
 
@@ -113,7 +113,7 @@ public function testPathLinkCanBeAddedInConfig()
         $menu = $this->createNavigationMenu();
 
         $expected = collect([
-            NavItem::fromRoute(Routes::get('index')),
+            NavItem::forRoute(Routes::get('index')),
             NavItem::forLink('foo', 'foo'),
         ]);
 
@@ -131,7 +131,7 @@ public function testDuplicatesAreNotRemovedWhenAddingInConfig()
         $menu = $this->createNavigationMenu();
 
         $expected = collect([
-            NavItem::fromRoute(Routes::get('index')),
+            NavItem::forRoute(Routes::get('index')),
             NavItem::forLink('foo', 'foo'),
             NavItem::forLink('foo', 'foo'),
         ]);
@@ -150,7 +150,7 @@ public function testDuplicatesAreNotRemovedWhenAddingInConfigRegardlessOfDestina
         $menu = $this->createNavigationMenu();
 
         $expected = collect([
-            NavItem::fromRoute(Routes::get('index')),
+            NavItem::forRoute(Routes::get('index')),
             NavItem::forLink('foo', 'foo'),
             NavItem::forLink('bar', 'foo'),
         ]);
@@ -168,9 +168,9 @@ public function testConfigItemsTakePrecedenceOverGeneratedItems()
         $menu = $this->createNavigationMenu();
 
         $expected = collect([
-            NavItem::fromRoute(Routes::get('index')),
+            NavItem::forRoute(Routes::get('index')),
             NavItem::forLink('bar', 'Foo'),
-            NavItem::fromRoute(Routes::get('foo')),
+            NavItem::forRoute(Routes::get('foo')),
         ]);
 
         $this->assertCount(count($expected), $menu->getItems());
@@ -185,8 +185,8 @@ public function testDocumentationPagesThatAreNotIndexAreNotAddedToTheMenu()
         $menu = $this->createNavigationMenu();
 
         $expected = collect([
-            NavItem::fromRoute(Routes::get('index')),
-            NavItem::fromRoute(Routes::get('docs/index')),
+            NavItem::forRoute(Routes::get('index')),
+            NavItem::forRoute(Routes::get('docs/index')),
         ]);
 
         $this->assertCount(count($expected), $menu->getItems());
@@ -199,7 +199,7 @@ public function testPagesInSubdirectoriesAreNotAddedToTheNavigationMenu()
         $this->file('_pages/foo/bar.md');
 
         $menu = $this->createNavigationMenu();
-        $expected = collect([NavItem::fromRoute(Routes::get('index'))]);
+        $expected = collect([NavItem::forRoute(Routes::get('index'))]);
 
         $this->assertCount(count($expected), $menu->getItems());
         $this->assertEquals($expected, $menu->getItems());
@@ -213,8 +213,8 @@ public function testPagesInSubdirectoriesCanBeAddedToTheNavigationMenuWithConfig
 
         $menu = $this->createNavigationMenu();
         $expected = collect([
-            NavItem::fromRoute(Routes::get('index')),
-            NavItem::fromRoute(Routes::get('foo/bar')),
+            NavItem::forRoute(Routes::get('index')),
+            NavItem::forRoute(Routes::get('foo/bar')),
         ]);
 
         $this->assertCount(count($expected), $menu->getItems());
@@ -229,9 +229,9 @@ public function testPagesInSubdirectoriesAreNotAddedToTheNavigationMenuWithConfi
 
         $menu = $this->createNavigationMenu();
         $expected = collect([
-            NavItem::fromRoute(Routes::get('index')),
+            NavItem::forRoute(Routes::get('index')),
             NavItem::forGroup('Foo', [
-                NavItem::fromRoute(Routes::get('foo/bar')),
+                NavItem::forRoute(Routes::get('foo/bar')),
             ]),
         ]);
 
@@ -249,10 +249,10 @@ public function testPagesInDropdownsDoNotGetAddedToTheMainNavigation()
 
         $this->assertCount(3, $menu->getItems());
         $this->assertEquals([
-            NavItem::fromRoute(Routes::get('index')),
-            NavItem::fromRoute((new MarkdownPage('foo'))->getRoute()),
+            NavItem::forRoute(Routes::get('index')),
+            NavItem::forRoute((new MarkdownPage('foo'))->getRoute()),
             NavItem::forGroup('Bar', [
-                NavItem::fromRoute((new MarkdownPage('bar/baz'))->getRoute()),
+                NavItem::forRoute((new MarkdownPage('bar/baz'))->getRoute()),
             ]),
         ], $menu->getItems()->all());
     }
diff --git a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
index b2da470a8c5..5195d1f3fdc 100644
--- a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
+++ b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
@@ -86,9 +86,9 @@ public function testSidebarIsOrderedAlphabeticallyWhenNoOrderIsSetInConfig()
 
         $this->assertEquals(
             collect([
-                NavItem::fromRoute(Routes::get('docs/a'), priority: 999),
-                NavItem::fromRoute(Routes::get('docs/b'), priority: 999),
-                NavItem::fromRoute(Routes::get('docs/c'), priority: 999),
+                NavItem::forRoute(Routes::get('docs/a'), priority: 999),
+                NavItem::forRoute(Routes::get('docs/b'), priority: 999),
+                NavItem::forRoute(Routes::get('docs/c'), priority: 999),
             ]),
             NavigationMenuGenerator::handle(DocumentationSidebar::class)->getItems()
         );
@@ -107,9 +107,9 @@ public function testSidebarIsOrderedByPriorityWhenPriorityIsSetInConfig()
 
         $this->assertEquals(
             collect([
-                NavItem::fromRoute(Routes::get('docs/c'), priority: 250 + 250),
-                NavItem::fromRoute(Routes::get('docs/b'), priority: 250 + 251),
-                NavItem::fromRoute(Routes::get('docs/a'), priority: 250 + 252),
+                NavItem::forRoute(Routes::get('docs/c'), priority: 250 + 250),
+                NavItem::forRoute(Routes::get('docs/b'), priority: 250 + 251),
+                NavItem::forRoute(Routes::get('docs/a'), priority: 250 + 252),
             ]),
             NavigationMenuGenerator::handle(DocumentationSidebar::class)->getItems()
         );
@@ -146,9 +146,9 @@ public function testSidebarPrioritiesCanBeSetInBothFrontMatterAndConfig()
 
         $this->assertEquals(
             collect([
-                NavItem::fromRoute(Routes::get('docs/first'), priority: 250 + 250),
-                NavItem::fromRoute(Routes::get('docs/second'), priority: 250 + 252),
-                NavItem::fromRoute(Routes::get('docs/third'), priority: 250 + 300),
+                NavItem::forRoute(Routes::get('docs/first'), priority: 250 + 250),
+                NavItem::forRoute(Routes::get('docs/second'), priority: 250 + 252),
+                NavItem::forRoute(Routes::get('docs/third'), priority: 250 + 300),
             ]),
             NavigationMenuGenerator::handle(DocumentationSidebar::class)->getItems()
         );
@@ -195,7 +195,7 @@ public function testGetItemsInGroupDoesNotIncludeDocsIndex()
         Filesystem::touch('_docs/index.md');
 
         $this->assertEquals(
-            collect([NavItem::fromRoute(Routes::get('docs/foo'), priority: 999)]),
+            collect([NavItem::forRoute(Routes::get('docs/foo'), priority: 999)]),
             NavigationMenuGenerator::handle(DocumentationSidebar::class)->getItems()
         );
     }
@@ -268,10 +268,10 @@ public function testCanHaveMultipleGroupedPagesWithTheSameNameLabels()
         $this->assertEquals(
             collect([
                 NavItem::forGroup('Bar', [
-                    NavItem::fromRoute(Routes::get('docs/bar'), priority: 999),
+                    NavItem::forRoute(Routes::get('docs/bar'), priority: 999),
                 ]),
                 NavItem::forGroup('Foo', [
-                    NavItem::fromRoute(Routes::get('docs/foo'), priority: 999),
+                    NavItem::forRoute(Routes::get('docs/foo'), priority: 999),
                 ]),
             ]),
             $sidebar->getItems()
@@ -289,8 +289,8 @@ public function testDuplicateLabelsWithinTheSameGroupAreNotRemoved()
         $this->assertEquals(
             collect([
                 NavItem::forGroup('Foo', [
-                    NavItem::fromRoute(Routes::get('docs/bar'), priority: 999),
-                    NavItem::fromRoute(Routes::get('docs/foo'), priority: 999),
+                    NavItem::forRoute(Routes::get('docs/bar'), priority: 999),
+                    NavItem::forRoute(Routes::get('docs/foo'), priority: 999),
                 ]),
             ]),
             $sidebar->getItems()
@@ -312,7 +312,7 @@ public function testIndexPageAddedToSidebarWhenItIsTheOnlyPage()
 
         $this->assertCount(1, $sidebar->getItems());
         $this->assertEquals(
-            collect([NavItem::fromRoute(Routes::get('docs/index'))]),
+            collect([NavItem::forRoute(Routes::get('docs/index'))]),
             $sidebar->getItems()
         );
     }
@@ -325,7 +325,7 @@ public function testIndexPageNotAddedToSidebarWhenOtherPagesExist()
 
         $this->assertCount(1, $sidebar->getItems());
         $this->assertEquals(
-            collect([NavItem::fromRoute(Routes::get('docs/test-0'))]),
+            collect([NavItem::forRoute(Routes::get('docs/test-0'))]),
             $sidebar->getItems()
         );
     }
diff --git a/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php b/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
index fc3b74ea55f..ee75d74d943 100644
--- a/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
+++ b/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
@@ -226,7 +226,7 @@ public function testHasGroupsReturnsTrueWhenAtLeastOneItemHasChildren()
         $page = new DocumentationPage('foo');
         $child = new DocumentationPage('bar');
         $menu = new DocumentationSidebar([
-            NavItem::fromRoute($page->getRoute())->addChild(NavItem::fromRoute($child->getRoute())),
+            NavItem::forRoute($page->getRoute())->addChild(NavItem::forRoute($child->getRoute())),
         ]);
 
         $this->assertTrue($menu->hasGroups());
diff --git a/packages/framework/tests/Unit/NavItemIsCurrentHelperTest.php b/packages/framework/tests/Unit/NavItemIsCurrentHelperTest.php
index d9500006247..97aa4de6f6f 100644
--- a/packages/framework/tests/Unit/NavItemIsCurrentHelperTest.php
+++ b/packages/framework/tests/Unit/NavItemIsCurrentHelperTest.php
@@ -34,19 +34,19 @@ protected function tearDown(): void
     public function testIsCurrent()
     {
         $this->mockRenderData($this->makeRoute('foo'));
-        $this->assertFalse(NavItem::fromRoute($this->makeRoute('bar'))->isCurrent());
+        $this->assertFalse(NavItem::forRoute($this->makeRoute('bar'))->isCurrent());
     }
 
     public function testIsCurrentWhenCurrent()
     {
         $this->mockRenderData($this->makeRoute('foo'));
-        $this->assertTrue(NavItem::fromRoute($this->makeRoute('foo'))->isCurrent());
+        $this->assertTrue(NavItem::forRoute($this->makeRoute('foo'))->isCurrent());
     }
 
     public function testIsCurrentUsingCurrentRoute()
     {
         $this->mockRenderData($this->makeRoute('index'));
-        $this->assertTrue(NavItem::fromRoute(Routes::get('index'))->isCurrent());
+        $this->assertTrue(NavItem::forRoute(Routes::get('index'))->isCurrent());
     }
 
     public function testIsCurrentUsingCurrentLink()
@@ -58,13 +58,13 @@ public function testIsCurrentUsingCurrentLink()
     public function testIsCurrentWhenNotCurrent()
     {
         $this->mockRenderData($this->makeRoute('foo'));
-        $this->assertFalse(NavItem::fromRoute($this->makeRoute('bar'))->isCurrent());
+        $this->assertFalse(NavItem::forRoute($this->makeRoute('bar'))->isCurrent());
     }
 
     public function testIsCurrentUsingNotCurrentRoute()
     {
         $this->mockRenderData($this->makeRoute('foo'));
-        $this->assertFalse(NavItem::fromRoute(Routes::get('index'))->isCurrent());
+        $this->assertFalse(NavItem::forRoute(Routes::get('index'))->isCurrent());
     }
 
     public function testIsCurrentUsingNotCurrentLink()
@@ -76,49 +76,49 @@ public function testIsCurrentUsingNotCurrentLink()
     public function testIsCurrentWithNestedCurrentPage()
     {
         $this->mockRenderData($this->makeRoute('foo/bar'));
-        $this->assertFalse(NavItem::fromRoute($this->makeRoute('bar'))->isCurrent());
+        $this->assertFalse(NavItem::forRoute($this->makeRoute('bar'))->isCurrent());
     }
 
     public function testIsCurrentWhenCurrentWithNestedCurrentPage()
     {
         $this->mockRenderData($this->makeRoute('foo/bar'));
-        $this->assertTrue(NavItem::fromRoute($this->makeRoute('foo/bar'))->isCurrent());
+        $this->assertTrue(NavItem::forRoute($this->makeRoute('foo/bar'))->isCurrent());
     }
 
     public function testIsCurrentWithNestedCurrentPageWhenNested()
     {
         $this->mockRenderData($this->makeRoute('foo/bar'));
-        $this->assertTrue(NavItem::fromRoute($this->makeRoute('foo/bar'))->isCurrent());
+        $this->assertTrue(NavItem::forRoute($this->makeRoute('foo/bar'))->isCurrent());
     }
 
     public function testIsCurrentWhenCurrentWithNestedCurrentPageWhenNested()
     {
         $this->mockRenderData($this->makeRoute('foo/bar'));
-        $this->assertFalse(NavItem::fromRoute($this->makeRoute('foo/baz'))->isCurrent());
+        $this->assertFalse(NavItem::forRoute($this->makeRoute('foo/baz'))->isCurrent());
     }
 
     public function testIsCurrentWithNestedCurrentPageWhenVeryNested()
     {
         $this->mockRenderData($this->makeRoute('foo/bar/baz'));
-        $this->assertTrue(NavItem::fromRoute($this->makeRoute('foo/bar/baz'))->isCurrent());
+        $this->assertTrue(NavItem::forRoute($this->makeRoute('foo/bar/baz'))->isCurrent());
     }
 
     public function testIsCurrentWhenCurrentWithNestedCurrentPageWhenVeryNested()
     {
         $this->mockRenderData($this->makeRoute('foo/bar/baz'));
-        $this->assertFalse(NavItem::fromRoute($this->makeRoute('foo/baz/bar'))->isCurrent());
+        $this->assertFalse(NavItem::forRoute($this->makeRoute('foo/baz/bar'))->isCurrent());
     }
 
     public function testIsCurrentWithNestedCurrentPageWhenVeryDifferingNested()
     {
         $this->mockRenderData($this->makeRoute('foo'));
-        $this->assertFalse(NavItem::fromRoute($this->makeRoute('foo/bar/baz'))->isCurrent());
+        $this->assertFalse(NavItem::forRoute($this->makeRoute('foo/bar/baz'))->isCurrent());
     }
 
     public function testIsCurrentWithNestedCurrentPageWhenVeryDifferingNestedInverse()
     {
         $this->mockRenderData($this->makeRoute('foo/bar/baz'));
-        $this->assertFalse(NavItem::fromRoute($this->makeRoute('foo'))->isCurrent());
+        $this->assertFalse(NavItem::forRoute($this->makeRoute('foo'))->isCurrent());
     }
 
     public function testIsCurrentUsingCurrentLinkWithNestedCurrentPage()
diff --git a/packages/framework/tests/Unit/NavItemTest.php b/packages/framework/tests/Unit/NavItemTest.php
index 1816633e0d1..525dad28367 100644
--- a/packages/framework/tests/Unit/NavItemTest.php
+++ b/packages/framework/tests/Unit/NavItemTest.php
@@ -169,7 +169,7 @@ public function testGetChildrenWithNoChildren()
     public function testFromRoute()
     {
         $route = new Route(new MarkdownPage());
-        $item = NavItem::fromRoute($route);
+        $item = NavItem::forRoute($route);
 
         $this->assertSame($route, $item->getDestination());
     }
@@ -178,7 +178,7 @@ public function testToString()
     {
         Render::shouldReceive('getRouteKey')->once()->andReturn('index');
 
-        $this->assertSame('index.html', (string) NavItem::fromRoute(Routes::get('index')));
+        $this->assertSame('index.html', (string) NavItem::forRoute(Routes::get('index')));
     }
 
     public function testForLink()
@@ -241,24 +241,24 @@ public function testRouteBasedNavItemDestinationsAreResolvedRelatively()
             'getRouteKey' => 'foo',
         ]));
 
-        $this->assertSame('foo.html', (string) NavItem::fromRoute(new Route(new InMemoryPage('foo'))));
-        $this->assertSame('foo/bar.html', (string) NavItem::fromRoute(new Route(new InMemoryPage('foo/bar'))));
+        $this->assertSame('foo.html', (string) NavItem::forRoute(new Route(new InMemoryPage('foo'))));
+        $this->assertSame('foo/bar.html', (string) NavItem::forRoute(new Route(new InMemoryPage('foo/bar'))));
 
         Render::swap(Mockery::mock(RenderData::class, [
             'getRoute' => new Route(new InMemoryPage('foo/bar')),
             'getRouteKey' => 'foo/bar',
         ]));
 
-        $this->assertSame('../foo.html', (string) NavItem::fromRoute(new Route(new InMemoryPage('foo'))));
-        $this->assertSame('../foo/bar.html', (string) NavItem::fromRoute(new Route(new InMemoryPage('foo/bar'))));
+        $this->assertSame('../foo.html', (string) NavItem::forRoute(new Route(new InMemoryPage('foo'))));
+        $this->assertSame('../foo/bar.html', (string) NavItem::forRoute(new Route(new InMemoryPage('foo/bar'))));
 
         Render::swap(Mockery::mock(RenderData::class, [
             'getRoute' => new Route(new InMemoryPage('foo/bar/baz')),
             'getRouteKey' => 'foo/bar/baz',
         ]));
 
-        $this->assertSame('../../foo.html', (string) NavItem::fromRoute(new Route(new InMemoryPage('foo'))));
-        $this->assertSame('../../foo/bar.html', (string) NavItem::fromRoute(new Route(new InMemoryPage('foo/bar'))));
+        $this->assertSame('../../foo.html', (string) NavItem::forRoute(new Route(new InMemoryPage('foo'))));
+        $this->assertSame('../../foo/bar.html', (string) NavItem::forRoute(new Route(new InMemoryPage('foo/bar'))));
     }
 
     public function testDropdownFacade()
@@ -309,8 +309,8 @@ public function testIsCurrent()
             'getRoute' => new Route(new InMemoryPage('foo')),
             'getRouteKey' => 'foo',
         ]));
-        $this->assertTrue(NavItem::fromRoute(new Route(new InMemoryPage('foo')))->isCurrent());
-        $this->assertFalse(NavItem::fromRoute(new Route(new InMemoryPage('bar')))->isCurrent());
+        $this->assertTrue(NavItem::forRoute(new Route(new InMemoryPage('foo')))->isCurrent());
+        $this->assertFalse(NavItem::forRoute(new Route(new InMemoryPage('bar')))->isCurrent());
     }
 
     public function testIsCurrentWithExternalRoute()
@@ -335,7 +335,7 @@ public function testGetGroupWithGroup()
 
     public function testGetGroupFromRouteWithGroup()
     {
-        $this->assertSame('foo', NavItem::fromRoute(new Route(new MarkdownPage(matter: ['navigation.group' => 'foo'])))->getGroup());
+        $this->assertSame('foo', NavItem::forRoute(new Route(new MarkdownPage(matter: ['navigation.group' => 'foo'])))->getGroup());
     }
 
     public function testGetGroupForRouteWithGroup()
@@ -367,7 +367,7 @@ public function testIdentifierWithCustomLabel()
 
     public function testIdentifierFromRouteKey()
     {
-        $item = NavItem::fromRoute(Routes::get('index'));
+        $item = NavItem::forRoute(Routes::get('index'));
         $this->assertSame('home', $item->getIdentifier());
     }
 

From e9cbf99d60f746da1592defc18410aa0406ab10c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 29 Feb 2024 20:39:46 +0100
Subject: [PATCH 0713/1422] Breaking: Remove method `NavItem::fromRoute()`

---
 .../src/Framework/Features/Navigation/NavItem.php      | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index e10ce0feffd..8db55c61800 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -58,16 +58,6 @@ public function __construct(Route|string $destination, string $label, int $prior
         $this->children = $children;
     }
 
-    /**
-     * Create a new navigation menu item from a route.
-     *
-     * @deprecated Use NavItem::forRoute() instead.
-     */
-    public static function fromRoute(Route $route, ?string $label = null, ?int $priority = null, ?string $group = null): static
-    {
-        return static::forRoute($route, $label, $priority, $group);
-    }
-
     /**
      * Create a new navigation menu item leading to a Route instance.
      *

From 5970a041a45879e218392a5d04c7e9f0156be331 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 29 Feb 2024 20:51:26 +0100
Subject: [PATCH 0714/1422] Annotate child array generics

---
 .../framework/src/Framework/Features/Navigation/NavItem.php   | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 8db55c61800..15761616734 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -43,6 +43,8 @@ class NavItem implements Stringable
 
     /**
      * Create a new navigation menu item.
+     *
+     * @param  array<\Hyde\Framework\Features\Navigation\NavItem>  $children
      */
     public function __construct(Route|string $destination, string $label, int $priority = NavigationMenu::DEFAULT, ?string $group = null, array $children = [])
     {
@@ -208,6 +210,8 @@ public function addChild(NavItem $item): static
 
     /**
      * Add multiple navigation items to the children of the navigation item.
+     *
+     * @param  array<\Hyde\Framework\Features\Navigation\NavItem>  $items
      */
     public function addChildren(array $items): static
     {

From 87dbc8029904cb5f19c528c575af77081926c7d8 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 29 Feb 2024 21:10:34 +0100
Subject: [PATCH 0715/1422] Update `NavItem::$destination` property to be
 nullable

---
 .../framework/src/Framework/Features/Navigation/NavItem.php   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 15761616734..8d7c0c9b57b 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -30,7 +30,7 @@
  */
 class NavItem implements Stringable
 {
-    protected Route $destination;
+    protected ?Route $destination;
     protected string $label;
     protected int $priority;
     protected ?string $group;
@@ -46,7 +46,7 @@ class NavItem implements Stringable
      *
      * @param  array<\Hyde\Framework\Features\Navigation\NavItem>  $children
      */
-    public function __construct(Route|string $destination, string $label, int $priority = NavigationMenu::DEFAULT, ?string $group = null, array $children = [])
+    public function __construct(Route|string|null $destination, string $label, int $priority = NavigationMenu::DEFAULT, ?string $group = null, array $children = [])
     {
         if (is_string($destination)) {
             $destination = Routes::get($destination) ?? new ExternalRoute($destination);

From ab95f50e5217dd8f4896db8a096b2f40cfe09586 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 29 Feb 2024 21:30:19 +0100
Subject: [PATCH 0716/1422] Set destination to null when creating group items

---
 .../framework/src/Framework/Features/Navigation/NavItem.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 8d7c0c9b57b..7bd1b7dc451 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -97,7 +97,7 @@ public static function forLink(string $href, string $label, int $priority = Navi
      */
     public static function forGroup(string $label, array $items, ?int $priority = null): static
     {
-        return new static('', $label, $priority ?? NavigationMenu::LAST, $label, $items);
+        return new static(null, $label, $priority ?? NavigationMenu::LAST, $label, $items);
     }
 
     /**

From fa9c01d05deab0984d7d6794fb0a2e07e6eb85a8 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 29 Feb 2024 21:38:05 +0100
Subject: [PATCH 0717/1422] Document null state reasoning

---
 .../framework/src/Framework/Features/Navigation/NavItem.php    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 7bd1b7dc451..bd2925125cf 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -27,6 +27,7 @@
  * Navigation items can be turned into dropdowns or sidebar groups by adding children.
  * Note that doing so will mean that any link on the parent will no longer be clickable,
  * as clicking the parent label will open the dropdown instead of leading to the destination.
+ * For this reason, dropdown items will have their destination set to null.
  */
 class NavItem implements Stringable
 {
@@ -109,7 +110,7 @@ public function __toString(): string
     }
 
     /**
-     * Get the destination route of the navigation item.
+     * Get the destination route of the navigation item. For dropdowns, this will return null.
      */
     public function getDestination(): ?Route
     {

From f1d9ca7fdb8f4f99f40af54b9efaef5b7eb2ebba Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 29 Feb 2024 21:41:32 +0100
Subject: [PATCH 0718/1422] Enforce group destination null state when adding
 children

Provides a consistent state
---
 packages/framework/src/Framework/Features/Navigation/NavItem.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index bd2925125cf..cf385c108c9 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -205,6 +205,7 @@ public function addChild(NavItem $item): static
         $item->group ??= $this->group;
 
         $this->children[] = $item;
+        $this->destination = null;
 
         return $this;
     }

From c12f3de85d422708d9f0567f1df9c7a19eeacc88 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 29 Feb 2024 21:41:40 +0100
Subject: [PATCH 0719/1422] Document null state enforcement

---
 .../framework/src/Framework/Features/Navigation/NavItem.php     | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index cf385c108c9..c963e0dc6fc 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -199,6 +199,8 @@ public function isCurrent(): bool
 
     /**
      * Add a navigation item to the children of the navigation item.
+     *
+     * This will turn the parent item into a dropdown. Its destination will be set to null.
      */
     public function addChild(NavItem $item): static
     {

From 7c08dc66edee0824861e0e70b1ea184ea8932dd5 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 29 Feb 2024 21:57:14 +0100
Subject: [PATCH 0720/1422] Construct children using helper to enforce type
 state

---
 .../framework/src/Framework/Features/Navigation/NavItem.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index c963e0dc6fc..77047479849 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -58,7 +58,7 @@ public function __construct(Route|string|null $destination, string $label, int $
         $this->priority = $priority;
         $this->group = static::normalizeGroupKey($group);
         $this->identifier = static::makeIdentifier($label);
-        $this->children = $children;
+        $this->addChildren($children);
     }
 
     /**

From 46dd08dd0ad2ab210bf3b6c01649e2c97b605504 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 29 Feb 2024 22:05:06 +0100
Subject: [PATCH 0721/1422] Ensure children are constructed

---
 .../framework/src/Framework/Features/Navigation/NavItem.php   | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 77047479849..e09a420f998 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -206,6 +206,10 @@ public function addChild(NavItem $item): static
     {
         $item->group ??= $this->group;
 
+        if (!isset($this->children)) {
+            $this->children = [];
+        }
+
         $this->children[] = $item;
         $this->destination = null;
 

From abf031618c82ac91f4bd7a610aaaa9b4f4d31f83 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 1 Mar 2024 12:02:12 +0100
Subject: [PATCH 0722/1422] Revert "Ensure children are constructed"

This reverts commit 46dd08dd0ad2ab210bf3b6c01649e2c97b605504.
---
 .../framework/src/Framework/Features/Navigation/NavItem.php   | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index e09a420f998..77047479849 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -206,10 +206,6 @@ public function addChild(NavItem $item): static
     {
         $item->group ??= $this->group;
 
-        if (!isset($this->children)) {
-            $this->children = [];
-        }
-
         $this->children[] = $item;
         $this->destination = null;
 

From 5b43c7c0eaeb3aedbe0bdca2e9d42e3932ddb573 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 1 Mar 2024 12:02:39 +0100
Subject: [PATCH 0723/1422] Initialize children property

---
 .../framework/src/Framework/Features/Navigation/NavItem.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 77047479849..31ccb67b004 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -40,7 +40,7 @@ class NavItem implements Stringable
     protected string $identifier;
 
     /** @var array<\Hyde\Framework\Features\Navigation\NavItem> */
-    protected array $children;
+    protected array $children = [];
 
     /**
      * Create a new navigation menu item.

From aeff6c45919f135da7e4032e76214a2107c91294 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 1 Mar 2024 12:04:40 +0100
Subject: [PATCH 0724/1422] Remove redundant null return for null type

---
 .../framework/src/Framework/Features/Navigation/NavItem.php   | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 31ccb67b004..d71e642c7e6 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -114,10 +114,6 @@ public function __toString(): string
      */
     public function getDestination(): ?Route
     {
-        if ($this->hasChildren()) {
-            return null;
-        }
-
         return $this->destination;
     }
 

From c76ec470fd9f48305e08e2d8b72e22d091bbf95b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 1 Mar 2024 12:12:28 +0100
Subject: [PATCH 0725/1422] Add default value to method signature

---
 .../framework/src/Framework/Features/Navigation/NavItem.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index d71e642c7e6..cbec59c07ba 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -96,7 +96,7 @@ public static function forLink(string $href, string $label, int $priority = Navi
      * @param  array<NavItem>  $items  The items to be included in the dropdown.
      * @param  int|null  $priority  The priority of the dropdown item. Leave blank to use the default priority, which is last in the menu.
      */
-    public static function forGroup(string $label, array $items, ?int $priority = null): static
+    public static function forGroup(string $label, array $items, ?int $priority = NavigationMenu::LAST): static
     {
         return new static(null, $label, $priority ?? NavigationMenu::LAST, $label, $items);
     }

From edb8b50f9f073d67a351b64b510fe7e2b181dcf4 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 1 Mar 2024 12:37:41 +0100
Subject: [PATCH 0726/1422] Add null coalesce to default priority in generator

---
 .../Framework/Features/Navigation/NavigationMenuGenerator.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
index 342a696d96b..b407234ff98 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
@@ -160,7 +160,7 @@ protected function createGroupItem(string $groupKey, string $groupName): NavItem
 
         $priority = $this->searchForGroupPriorityInConfig($groupKey);
 
-        return NavItem::forGroup($this->normalizeGroupLabel($label), [], $priority);
+        return NavItem::forGroup($this->normalizeGroupLabel($label), [], $priority ?? NavigationMenu::LAST);
     }
 
     protected function normalizeGroupLabel(string $label): string

From 305b53bb328c1bd377888af4ed2ec7024ccc357e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 1 Mar 2024 12:38:27 +0100
Subject: [PATCH 0727/1422] Remove null coalesce moved to default value

---
 .../framework/src/Framework/Features/Navigation/NavItem.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index cbec59c07ba..577ebbe19fd 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -98,7 +98,7 @@ public static function forLink(string $href, string $label, int $priority = Navi
      */
     public static function forGroup(string $label, array $items, ?int $priority = NavigationMenu::LAST): static
     {
-        return new static(null, $label, $priority ?? NavigationMenu::LAST, $label, $items);
+        return new static(null, $label, $priority, $label, $items);
     }
 
     /**

From 4036c3c3174e497ca3388440624c19fca825f346 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 1 Mar 2024 12:49:55 +0100
Subject: [PATCH 0728/1422] Remove nullable priority parameter type

---
 .../framework/src/Framework/Features/Navigation/NavItem.php   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 577ebbe19fd..c487e8094a2 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -94,9 +94,9 @@ public static function forLink(string $href, string $label, int $priority = Navi
      *
      * @param  string  $label  The label of the dropdown item.
      * @param  array<NavItem>  $items  The items to be included in the dropdown.
-     * @param  int|null  $priority  The priority of the dropdown item. Leave blank to use the default priority, which is last in the menu.
+     * @param  int  $priority  The priority of the dropdown item. Leave blank to use the default priority, which is last in the menu.
      */
-    public static function forGroup(string $label, array $items, ?int $priority = NavigationMenu::LAST): static
+    public static function forGroup(string $label, array $items, int $priority = NavigationMenu::LAST): static
     {
         return new static(null, $label, $priority, $label, $items);
     }

From 418db0055b95d065628c03290f85d3a680647da2 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 1 Mar 2024 13:02:18 +0100
Subject: [PATCH 0729/1422] Document constructor

---
 .../framework/src/Framework/Features/Navigation/NavItem.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index c487e8094a2..4132e9bd2f6 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -45,7 +45,11 @@ class NavItem implements Stringable
     /**
      * Create a new navigation menu item.
      *
-     * @param  array<\Hyde\Framework\Features\Navigation\NavItem>  $children
+     * @param  \Hyde\Support\Models\Route|string|null  $destination  Route instance, route key, or external URI. For dropdowns/groups, this should be null.
+     * @param  string  $label  The label of the navigation item.
+     * @param  int  $priority  The priority to determine the order of the navigation item.
+     * @param  string|null  $group  The dropdown/group identifier of the navigation item, if any.
+     * @param  array<\Hyde\Framework\Features\Navigation\NavItem>  $children  If the item is a dropdown, these are the items to be included in the dropdown.
      */
     public function __construct(Route|string|null $destination, string $label, int $priority = NavigationMenu::DEFAULT, ?string $group = null, array $children = [])
     {

From e6c8cc252bb2c8d42b667db456911d9e1661be82 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 1 Mar 2024 15:05:42 +0100
Subject: [PATCH 0730/1422] Rename protected `$destination` property to
 `$route`

---
 .../src/Framework/Features/Navigation/NavItem.php    | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 4132e9bd2f6..a3e08699405 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -31,7 +31,7 @@
  */
 class NavItem implements Stringable
 {
-    protected ?Route $destination;
+    protected ?Route $route;
     protected string $label;
     protected int $priority;
     protected ?string $group;
@@ -57,7 +57,7 @@ public function __construct(Route|string|null $destination, string $label, int $
             $destination = Routes::get($destination) ?? new ExternalRoute($destination);
         }
 
-        $this->destination = $destination;
+        $this->route = $destination;
         $this->label = $label;
         $this->priority = $priority;
         $this->group = static::normalizeGroupKey($group);
@@ -118,7 +118,7 @@ public function __toString(): string
      */
     public function getDestination(): ?Route
     {
-        return $this->destination;
+        return $this->route;
     }
 
     /**
@@ -126,7 +126,7 @@ public function getDestination(): ?Route
      */
     public function getLink(): string
     {
-        return (string) $this->destination;
+        return (string) $this->route;
     }
 
     /**
@@ -194,7 +194,7 @@ public function hasChildren(): bool
      */
     public function isCurrent(): bool
     {
-        return Hyde::currentRoute()->getLink() === $this->destination->getLink();
+        return Hyde::currentRoute()->getLink() === $this->route->getLink();
     }
 
     /**
@@ -207,7 +207,7 @@ public function addChild(NavItem $item): static
         $item->group ??= $this->group;
 
         $this->children[] = $item;
-        $this->destination = null;
+        $this->route = null;
 
         return $this;
     }

From 0d74b95b043f8dccc0c6cb75d648e50f4fcd3f1a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 1 Mar 2024 15:06:21 +0100
Subject: [PATCH 0731/1422] Breaking: Rename `NavItem` method `getDestination`
 to `getRoute`

Since the destination property in v2 is normalized to always be a route it no longer makes sense to have a divergent name for it.
---
 .../components/docs/sidebar-item.blade.php    |  4 +--
 .../Framework/Features/Navigation/NavItem.php |  4 +--
 packages/framework/tests/Unit/NavItemTest.php | 32 +++++++++----------
 3 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/packages/framework/resources/views/components/docs/sidebar-item.blade.php b/packages/framework/resources/views/components/docs/sidebar-item.blade.php
index cb0274b5304..6ffdf19c025 100644
--- a/packages/framework/resources/views/components/docs/sidebar-item.blade.php
+++ b/packages/framework/resources/views/components/docs/sidebar-item.blade.php
@@ -4,7 +4,7 @@
         : 'active bg-black/5 dark:bg-black/10' => $item->isCurrent()
     ]) role="listitem">
     @if($item->isCurrent())
-        <a href="{{ $item->getDestination() }}" aria-current="true" @class([$grouped
+        <a href="{{ $item->getRoute() }}" aria-current="true" @class([$grouped
             ? '-ml-8 pl-4 py-1 px-2 block text-indigo-600 dark:text-indigo-400 dark:font-medium border-l-[0.325rem] border-indigo-500 transition-colors duration-300 ease-in-out hover:bg-black/10'
             : '-ml-4 p-2 block hover:bg-black/5 dark:hover:bg-black/10 text-indigo-600 dark:text-indigo-400 dark:font-medium border-l-[0.325rem] border-indigo-500 transition-colors duration-300 ease-in-out'
         ])>
@@ -16,7 +16,7 @@
             {!! $page->getTableOfContents() !!}
         @endif
     @else
-        <a href="{{ $item->getDestination() }}" @class([$grouped
+        <a href="{{ $item->getRoute() }}" @class([$grouped
             ? '-ml-8 pl-4 py-1 px-2 block border-l-[0.325rem] border-transparent transition-colors duration-300 ease-in-out hover:bg-black/10'
             : 'block -ml-4 p-2 border-l-[0.325rem] border-transparent hover:bg-black/5 dark:hover:bg-black/10'
         ])>
diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index a3e08699405..ec15982bc4f 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -116,7 +116,7 @@ public function __toString(): string
     /**
      * Get the destination route of the navigation item. For dropdowns, this will return null.
      */
-    public function getDestination(): ?Route
+    public function getRoute(): ?Route
     {
         return $this->route;
     }
@@ -144,7 +144,7 @@ public function getLabel(): string
      */
     public function getPriority(): int
     {
-        if ($this->hasChildren() && $this->children[0]->getDestination()->getPageClass() === DocumentationPage::class) {
+        if ($this->hasChildren() && $this->children[0]->getRoute()->getPageClass() === DocumentationPage::class) {
             return min($this->priority, collect($this->getChildren())->min(fn (NavItem $child): int => $child->getPriority()));
         }
 
diff --git a/packages/framework/tests/Unit/NavItemTest.php b/packages/framework/tests/Unit/NavItemTest.php
index 525dad28367..eeb3294fd7c 100644
--- a/packages/framework/tests/Unit/NavItemTest.php
+++ b/packages/framework/tests/Unit/NavItemTest.php
@@ -44,36 +44,36 @@ public function testConstruct()
         $route = new Route(new MarkdownPage());
         $item = new NavItem($route, 'Test', 500);
 
-        $this->assertSame($route, $item->getDestination());
+        $this->assertSame($route, $item->getRoute());
     }
 
     public function testPassingRouteInstanceToConstructorUsesRouteInstance()
     {
         $route = new Route(new MarkdownPage());
-        $this->assertSame($route, (new NavItem($route, 'Home'))->getDestination());
+        $this->assertSame($route, (new NavItem($route, 'Home'))->getRoute());
     }
 
     public function testPassingRouteKeyToConstructorUsesRouteInstance()
     {
         $route = Routes::get('index');
 
-        $this->assertSame($route, (new NavItem('index', 'Home'))->getDestination());
+        $this->assertSame($route, (new NavItem('index', 'Home'))->getRoute());
     }
 
     public function testPassingUrlToConstructorUsesExternalRoute()
     {
         $item = new NavItem('https://example.com', 'Home');
-        $this->assertInstanceOf(ExternalRoute::class, $item->getDestination());
-        $this->assertEquals(new ExternalRoute('https://example.com'), $item->getDestination());
-        $this->assertSame('https://example.com', (string) $item->getDestination());
+        $this->assertInstanceOf(ExternalRoute::class, $item->getRoute());
+        $this->assertEquals(new ExternalRoute('https://example.com'), $item->getRoute());
+        $this->assertSame('https://example.com', (string) $item->getRoute());
     }
 
     public function testPassingUnknownRouteKeyToConstructorUsesExternalRoute()
     {
         $item = new NavItem('foo', 'Home');
-        $this->assertInstanceOf(ExternalRoute::class, $item->getDestination());
-        $this->assertEquals(new ExternalRoute('foo'), $item->getDestination());
-        $this->assertSame('foo', (string) $item->getDestination());
+        $this->assertInstanceOf(ExternalRoute::class, $item->getRoute());
+        $this->assertEquals(new ExternalRoute('foo'), $item->getRoute());
+        $this->assertSame('foo', (string) $item->getRoute());
     }
 
     public function testCanConstructWithChildren()
@@ -86,7 +86,7 @@ public function testCanConstructWithChildren()
         $item = new NavItem($route, 'Test', 500, null, $children);
 
         $this->assertSame('Test', $item->getLabel());
-        $this->assertNull($item->getDestination());
+        $this->assertNull($item->getRoute());
         $this->assertSame(500, $item->getPriority());
 
         $this->assertCount(2, $item->getChildren());
@@ -111,7 +111,7 @@ public function testCanConstructWithChildrenWithoutRoute()
         $item = new NavItem('', 'Test', 500, null, $children);
 
         $this->assertSame('Test', $item->getLabel());
-        $this->assertNull($item->getDestination());
+        $this->assertNull($item->getRoute());
 
         $this->assertCount(2, $item->getChildren());
         $this->assertSame($children, $item->getChildren());
@@ -122,7 +122,7 @@ public function testGetDestination()
         $route = new Route(new InMemoryPage('foo'));
         $navItem = new NavItem($route, 'Page', 500);
 
-        $this->assertSame($route, $navItem->getDestination());
+        $this->assertSame($route, $navItem->getRoute());
     }
 
     public function testGetLink()
@@ -171,7 +171,7 @@ public function testFromRoute()
         $route = new Route(new MarkdownPage());
         $item = NavItem::forRoute($route);
 
-        $this->assertSame($route, $item->getDestination());
+        $this->assertSame($route, $item->getRoute());
     }
 
     public function testToString()
@@ -185,7 +185,7 @@ public function testForLink()
     {
         $item = NavItem::forLink('foo', 'bar');
 
-        $this->assertEquals(new ExternalRoute('foo'), $item->getDestination());
+        $this->assertEquals(new ExternalRoute('foo'), $item->getRoute());
         $this->assertSame('bar', $item->getLabel());
         $this->assertSame(500, $item->getPriority());
     }
@@ -200,7 +200,7 @@ public function testForRoute()
         $route = Routes::get('404');
         $item = NavItem::forRoute($route, 'foo');
 
-        $this->assertSame($route, $item->getDestination());
+        $this->assertSame($route, $item->getRoute());
         $this->assertSame('foo', $item->getLabel());
         $this->assertSame(999, $item->getPriority());
     }
@@ -210,7 +210,7 @@ public function testForIndexRoute()
         $route = Routes::get('index');
         $item = NavItem::forRoute($route, 'foo');
 
-        $this->assertSame($route, $item->getDestination());
+        $this->assertSame($route, $item->getRoute());
         $this->assertSame('foo', $item->getLabel());
         $this->assertSame(0, $item->getPriority());
     }

From 64c3e0e6fc9eeff4a33eaba012b4551071126521 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 1 Mar 2024 15:18:48 +0100
Subject: [PATCH 0732/1422] Breaking: Rename `NavItem` method `isCurrent` to
 `isActive`

While the method is implemented by using the `currentRoute` helper, the actual end usage is to compare active state, so it makes more sense for this to use that in the name.

   - `isActive()` is more common and may be more intuitive to other developers, as it explicitly suggests that the method is checking if the item is active.
   - `isCurrent()` is also clear, but it might be slightly less common in this context. It still conveys the intended meaning effectively.
---
 .../components/docs/sidebar-item.blade.php    |  4 +-
 .../navigation/navigation-link.blade.php      |  4 +-
 .../Framework/Features/Navigation/NavItem.php |  2 +-
 ...Test.php => NavItemIsActiveHelperTest.php} | 70 +++++++++----------
 packages/framework/tests/Unit/NavItemTest.php | 10 +--
 5 files changed, 45 insertions(+), 45 deletions(-)
 rename packages/framework/tests/Unit/{NavItemIsCurrentHelperTest.php => NavItemIsActiveHelperTest.php} (90%)

diff --git a/packages/framework/resources/views/components/docs/sidebar-item.blade.php b/packages/framework/resources/views/components/docs/sidebar-item.blade.php
index 6ffdf19c025..cab03d7c3f3 100644
--- a/packages/framework/resources/views/components/docs/sidebar-item.blade.php
+++ b/packages/framework/resources/views/components/docs/sidebar-item.blade.php
@@ -1,9 +1,9 @@
 @props(['grouped' => false])
 <li @class(['sidebar-item -ml-4 pl-4', $grouped
         ? 'active -ml-8 pl-8 bg-black/5 dark:bg-black/10'
-        : 'active bg-black/5 dark:bg-black/10' => $item->isCurrent()
+        : 'active bg-black/5 dark:bg-black/10' => $item->isActive()
     ]) role="listitem">
-    @if($item->isCurrent())
+    @if($item->isActive())
         <a href="{{ $item->getRoute() }}" aria-current="true" @class([$grouped
             ? '-ml-8 pl-4 py-1 px-2 block text-indigo-600 dark:text-indigo-400 dark:font-medium border-l-[0.325rem] border-indigo-500 transition-colors duration-300 ease-in-out hover:bg-black/10'
             : '-ml-4 p-2 block hover:bg-black/5 dark:hover:bg-black/10 text-indigo-600 dark:text-indigo-400 dark:font-medium border-l-[0.325rem] border-indigo-500 transition-colors duration-300 ease-in-out'
diff --git a/packages/framework/resources/views/components/navigation/navigation-link.blade.php b/packages/framework/resources/views/components/navigation/navigation-link.blade.php
index dbb5407245a..048faaa6cba 100644
--- a/packages/framework/resources/views/components/navigation/navigation-link.blade.php
+++ b/packages/framework/resources/views/components/navigation/navigation-link.blade.php
@@ -1,4 +1,4 @@
-<a href="{{ $item }}" {!! $item->isCurrent() ? 'aria-current="page"' : '' !!} @class([
+<a href="{{ $item }}" {!! $item->isActive() ? 'aria-current="page"' : '' !!} @class([
     'block my-2 md:my-0 md:inline-block py-1 text-gray-700 hover:text-gray-900 dark:text-gray-100',
-    'border-l-4 border-indigo-500 md:border-none font-medium -ml-6 pl-5 md:ml-0 md:pl-0 bg-gray-100 dark:bg-gray-800 md:bg-transparent dark:md:bg-transparent' => $item->isCurrent()
+    'border-l-4 border-indigo-500 md:border-none font-medium -ml-6 pl-5 md:ml-0 md:pl-0 bg-gray-100 dark:bg-gray-800 md:bg-transparent dark:md:bg-transparent' => $item->isActive()
 ])>{{ $item->getLabel() }}</a>
\ No newline at end of file
diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index ec15982bc4f..6601a7a0027 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -192,7 +192,7 @@ public function hasChildren(): bool
     /**
      * Check if the NavItem instance is the current page being rendered.
      */
-    public function isCurrent(): bool
+    public function isActive(): bool
     {
         return Hyde::currentRoute()->getLink() === $this->route->getLink();
     }
diff --git a/packages/framework/tests/Unit/NavItemIsCurrentHelperTest.php b/packages/framework/tests/Unit/NavItemIsActiveHelperTest.php
similarity index 90%
rename from packages/framework/tests/Unit/NavItemIsCurrentHelperTest.php
rename to packages/framework/tests/Unit/NavItemIsActiveHelperTest.php
index 97aa4de6f6f..bbd6d82b4d2 100644
--- a/packages/framework/tests/Unit/NavItemIsCurrentHelperTest.php
+++ b/packages/framework/tests/Unit/NavItemIsActiveHelperTest.php
@@ -18,7 +18,7 @@
  *
  * @see \Hyde\Framework\Testing\Unit\NavItemTest
  */
-class NavItemIsCurrentHelperTest extends UnitTestCase
+class NavItemIsActiveHelperTest extends UnitTestCase
 {
     public static function setUpBeforeClass(): void
     {
@@ -34,205 +34,205 @@ protected function tearDown(): void
     public function testIsCurrent()
     {
         $this->mockRenderData($this->makeRoute('foo'));
-        $this->assertFalse(NavItem::forRoute($this->makeRoute('bar'))->isCurrent());
+        $this->assertFalse(NavItem::forRoute($this->makeRoute('bar'))->isActive());
     }
 
     public function testIsCurrentWhenCurrent()
     {
         $this->mockRenderData($this->makeRoute('foo'));
-        $this->assertTrue(NavItem::forRoute($this->makeRoute('foo'))->isCurrent());
+        $this->assertTrue(NavItem::forRoute($this->makeRoute('foo'))->isActive());
     }
 
     public function testIsCurrentUsingCurrentRoute()
     {
         $this->mockRenderData($this->makeRoute('index'));
-        $this->assertTrue(NavItem::forRoute(Routes::get('index'))->isCurrent());
+        $this->assertTrue(NavItem::forRoute(Routes::get('index'))->isActive());
     }
 
     public function testIsCurrentUsingCurrentLink()
     {
         $this->mockRenderData($this->makeRoute('index'));
-        $this->assertTrue(NavItem::forLink('index.html', 'Home')->isCurrent());
+        $this->assertTrue(NavItem::forLink('index.html', 'Home')->isActive());
     }
 
     public function testIsCurrentWhenNotCurrent()
     {
         $this->mockRenderData($this->makeRoute('foo'));
-        $this->assertFalse(NavItem::forRoute($this->makeRoute('bar'))->isCurrent());
+        $this->assertFalse(NavItem::forRoute($this->makeRoute('bar'))->isActive());
     }
 
     public function testIsCurrentUsingNotCurrentRoute()
     {
         $this->mockRenderData($this->makeRoute('foo'));
-        $this->assertFalse(NavItem::forRoute(Routes::get('index'))->isCurrent());
+        $this->assertFalse(NavItem::forRoute(Routes::get('index'))->isActive());
     }
 
     public function testIsCurrentUsingNotCurrentLink()
     {
         $this->mockRenderData($this->makeRoute('foo'));
-        $this->assertFalse(NavItem::forLink('index.html', 'Home')->isCurrent());
+        $this->assertFalse(NavItem::forLink('index.html', 'Home')->isActive());
     }
 
     public function testIsCurrentWithNestedCurrentPage()
     {
         $this->mockRenderData($this->makeRoute('foo/bar'));
-        $this->assertFalse(NavItem::forRoute($this->makeRoute('bar'))->isCurrent());
+        $this->assertFalse(NavItem::forRoute($this->makeRoute('bar'))->isActive());
     }
 
     public function testIsCurrentWhenCurrentWithNestedCurrentPage()
     {
         $this->mockRenderData($this->makeRoute('foo/bar'));
-        $this->assertTrue(NavItem::forRoute($this->makeRoute('foo/bar'))->isCurrent());
+        $this->assertTrue(NavItem::forRoute($this->makeRoute('foo/bar'))->isActive());
     }
 
     public function testIsCurrentWithNestedCurrentPageWhenNested()
     {
         $this->mockRenderData($this->makeRoute('foo/bar'));
-        $this->assertTrue(NavItem::forRoute($this->makeRoute('foo/bar'))->isCurrent());
+        $this->assertTrue(NavItem::forRoute($this->makeRoute('foo/bar'))->isActive());
     }
 
     public function testIsCurrentWhenCurrentWithNestedCurrentPageWhenNested()
     {
         $this->mockRenderData($this->makeRoute('foo/bar'));
-        $this->assertFalse(NavItem::forRoute($this->makeRoute('foo/baz'))->isCurrent());
+        $this->assertFalse(NavItem::forRoute($this->makeRoute('foo/baz'))->isActive());
     }
 
     public function testIsCurrentWithNestedCurrentPageWhenVeryNested()
     {
         $this->mockRenderData($this->makeRoute('foo/bar/baz'));
-        $this->assertTrue(NavItem::forRoute($this->makeRoute('foo/bar/baz'))->isCurrent());
+        $this->assertTrue(NavItem::forRoute($this->makeRoute('foo/bar/baz'))->isActive());
     }
 
     public function testIsCurrentWhenCurrentWithNestedCurrentPageWhenVeryNested()
     {
         $this->mockRenderData($this->makeRoute('foo/bar/baz'));
-        $this->assertFalse(NavItem::forRoute($this->makeRoute('foo/baz/bar'))->isCurrent());
+        $this->assertFalse(NavItem::forRoute($this->makeRoute('foo/baz/bar'))->isActive());
     }
 
     public function testIsCurrentWithNestedCurrentPageWhenVeryDifferingNested()
     {
         $this->mockRenderData($this->makeRoute('foo'));
-        $this->assertFalse(NavItem::forRoute($this->makeRoute('foo/bar/baz'))->isCurrent());
+        $this->assertFalse(NavItem::forRoute($this->makeRoute('foo/bar/baz'))->isActive());
     }
 
     public function testIsCurrentWithNestedCurrentPageWhenVeryDifferingNestedInverse()
     {
         $this->mockRenderData($this->makeRoute('foo/bar/baz'));
-        $this->assertFalse(NavItem::forRoute($this->makeRoute('foo'))->isCurrent());
+        $this->assertFalse(NavItem::forRoute($this->makeRoute('foo'))->isActive());
     }
 
     public function testIsCurrentUsingCurrentLinkWithNestedCurrentPage()
     {
         $this->mockRenderData($this->makeRoute('foo/bar'));
-        $this->assertFalse(NavItem::forLink('foo/bar.html', 'foo')->isCurrent());
+        $this->assertFalse(NavItem::forLink('foo/bar.html', 'foo')->isActive());
     }
 
     public function testIsCurrentUsingNotCurrentLinkWithNestedCurrentPage()
     {
         $this->mockRenderData($this->makeRoute('foo/bar'));
-        $this->assertFalse(NavItem::forLink('foo.html', 'foo')->isCurrent());
+        $this->assertFalse(NavItem::forLink('foo.html', 'foo')->isActive());
     }
 
     public function testIsCurrentWhenCurrentWithNestedCurrentPageAndSubjectPage()
     {
         $this->mockRenderData($this->makeRoute('foo/bar'));
-        $this->assertFalse(NavItem::forLink('foo/bar.html', 'foo')->isCurrent());
+        $this->assertFalse(NavItem::forLink('foo/bar.html', 'foo')->isActive());
     }
 
     public function testIsCurrentWhenNotCurrentWithNestedCurrentPageAndSubjectPage()
     {
         $this->mockRenderData($this->makeRoute('foo/bar'));
-        $this->assertFalse(NavItem::forLink('foo/baz.html', 'foo')->isCurrent());
+        $this->assertFalse(NavItem::forLink('foo/baz.html', 'foo')->isActive());
     }
 
     public function testIsCurrentWithNestedCurrentPageWhenNestedUsingLinkItem()
     {
         $this->mockRenderData($this->makeRoute('foo/bar'));
-        $this->assertFalse(NavItem::forLink('foo/bar.html', 'foo')->isCurrent());
+        $this->assertFalse(NavItem::forLink('foo/bar.html', 'foo')->isActive());
     }
 
     public function testIsCurrentWhenCurrentWithNestedCurrentPageWhenNestedUsingLinkItem()
     {
         $this->mockRenderData($this->makeRoute('foo/bar'));
-        $this->assertFalse(NavItem::forLink('foo/baz.html', 'foo')->isCurrent());
+        $this->assertFalse(NavItem::forLink('foo/baz.html', 'foo')->isActive());
     }
 
     public function testIsCurrentWithNestedCurrentPageWhenVeryNestedUsingLinkItem()
     {
         $this->mockRenderData($this->makeRoute('foo/bar/baz'));
-        $this->assertFalse(NavItem::forLink('foo/bar/baz.html', 'foo')->isCurrent());
+        $this->assertFalse(NavItem::forLink('foo/bar/baz.html', 'foo')->isActive());
     }
 
     public function testIsCurrentWhenCurrentWithNestedCurrentPageWhenVeryNestedUsingLinkItem()
     {
         $this->mockRenderData($this->makeRoute('foo/bar/baz'));
-        $this->assertFalse(NavItem::forLink('foo/baz/bar.html', 'foo')->isCurrent());
+        $this->assertFalse(NavItem::forLink('foo/baz/bar.html', 'foo')->isActive());
     }
 
     public function testIsCurrentWithNestedCurrentPageWhenVeryDifferingNestedUsingLinkItem()
     {
         $this->mockRenderData($this->makeRoute('foo'));
-        $this->assertFalse(NavItem::forLink('foo/bar/baz.html', 'foo')->isCurrent());
+        $this->assertFalse(NavItem::forLink('foo/bar/baz.html', 'foo')->isActive());
     }
 
     public function testIsCurrentWithNestedCurrentPageWhenVeryDifferingNestedInverseUsingLinkItem()
     {
         $this->mockRenderData($this->makeRoute('foo/bar/baz'));
-        $this->assertFalse(NavItem::forLink('foo.html', 'foo')->isCurrent());
+        $this->assertFalse(NavItem::forLink('foo.html', 'foo')->isActive());
     }
 
     public function testIsCurrentWithNestedCurrentPageWhenNestedUsingPrettyLinkItem()
     {
         $this->mockRenderData($this->makeRoute('foo/bar'));
-        $this->assertFalse(NavItem::forLink('foo/bar', 'foo')->isCurrent());
+        $this->assertFalse(NavItem::forLink('foo/bar', 'foo')->isActive());
     }
 
     public function testIsCurrentWhenCurrentWithNestedCurrentPageWhenNestedUsingPrettyLinkItem()
     {
         $this->mockRenderData($this->makeRoute('foo/bar'));
-        $this->assertFalse(NavItem::forLink('foo/baz', 'foo')->isCurrent());
+        $this->assertFalse(NavItem::forLink('foo/baz', 'foo')->isActive());
     }
 
     public function testIsCurrentWithNestedCurrentPageWhenVeryNestedUsingPrettyLinkItem()
     {
         $this->mockRenderData($this->makeRoute('foo/bar/baz'));
-        $this->assertFalse(NavItem::forLink('foo/bar/baz', 'foo')->isCurrent());
+        $this->assertFalse(NavItem::forLink('foo/bar/baz', 'foo')->isActive());
     }
 
     public function testIsCurrentWhenCurrentWithNestedCurrentPageWhenVeryNestedUsingPrettyLinkItem()
     {
         $this->mockRenderData($this->makeRoute('foo/bar/baz'));
-        $this->assertFalse(NavItem::forLink('foo/baz/bar', 'foo')->isCurrent());
+        $this->assertFalse(NavItem::forLink('foo/baz/bar', 'foo')->isActive());
     }
 
     public function testIsCurrentWithNestedCurrentPageWhenVeryDifferingNestedUsingPrettyLinkItem()
     {
         $this->mockRenderData($this->makeRoute('foo'));
-        $this->assertFalse(NavItem::forLink('foo/bar/baz', 'foo')->isCurrent());
+        $this->assertFalse(NavItem::forLink('foo/bar/baz', 'foo')->isActive());
     }
 
     public function testIsCurrentWithNestedCurrentPageWhenVeryDifferingNestedInverseUsingPrettyLinkItem()
     {
         $this->mockRenderData($this->makeRoute('foo/bar/baz'));
-        $this->assertFalse(NavItem::forLink('foo', 'foo')->isCurrent());
+        $this->assertFalse(NavItem::forLink('foo', 'foo')->isActive());
     }
 
     public function testIsCurrentWithAbsoluteLink()
     {
         $this->mockRenderData($this->makeRoute('foo'));
-        $this->assertFalse(NavItem::forLink('/foo', 'foo')->isCurrent());
+        $this->assertFalse(NavItem::forLink('/foo', 'foo')->isActive());
     }
 
     public function testIsCurrentWithNestedCurrentPageWhenNestedUsingAbsoluteLinkItem()
     {
         $this->mockRenderData($this->makeRoute('foo/bar'));
-        $this->assertFalse(NavItem::forLink('/foo/bar', 'foo')->isCurrent());
+        $this->assertFalse(NavItem::forLink('/foo/bar', 'foo')->isActive());
     }
 
     public function testIsCurrentWhenCurrentWithNestedCurrentPageWhenNestedUsingAbsoluteLinkItem()
     {
         $this->mockRenderData($this->makeRoute('foo/bar/baz'));
-        $this->assertFalse(NavItem::forLink('/foo/bar/baz', 'foo')->isCurrent());
+        $this->assertFalse(NavItem::forLink('/foo/bar/baz', 'foo')->isActive());
     }
 
     protected function mockRenderData(Route $route): void
diff --git a/packages/framework/tests/Unit/NavItemTest.php b/packages/framework/tests/Unit/NavItemTest.php
index eeb3294fd7c..614f24baef3 100644
--- a/packages/framework/tests/Unit/NavItemTest.php
+++ b/packages/framework/tests/Unit/NavItemTest.php
@@ -22,7 +22,7 @@
  *
  * @covers \Hyde\Framework\Features\Navigation\NavItem
  *
- * @see \Hyde\Framework\Testing\Unit\NavItemIsCurrentHelperTest
+ * @see \Hyde\Framework\Testing\Unit\NavItemIsActiveHelperTest
  */
 class NavItemTest extends UnitTestCase
 {
@@ -309,8 +309,8 @@ public function testIsCurrent()
             'getRoute' => new Route(new InMemoryPage('foo')),
             'getRouteKey' => 'foo',
         ]));
-        $this->assertTrue(NavItem::forRoute(new Route(new InMemoryPage('foo')))->isCurrent());
-        $this->assertFalse(NavItem::forRoute(new Route(new InMemoryPage('bar')))->isCurrent());
+        $this->assertTrue(NavItem::forRoute(new Route(new InMemoryPage('foo')))->isActive());
+        $this->assertFalse(NavItem::forRoute(new Route(new InMemoryPage('bar')))->isActive());
     }
 
     public function testIsCurrentWithExternalRoute()
@@ -319,8 +319,8 @@ public function testIsCurrentWithExternalRoute()
             'getRoute' => new Route(new InMemoryPage('foo')),
             'getRouteKey' => 'foo',
         ]));
-        $this->assertFalse(NavItem::forLink('foo', 'bar')->isCurrent());
-        $this->assertFalse(NavItem::forLink('https://example.com', 'bar')->isCurrent());
+        $this->assertFalse(NavItem::forLink('foo', 'bar')->isActive());
+        $this->assertFalse(NavItem::forLink('https://example.com', 'bar')->isActive());
     }
 
     public function testGetGroupWithNoGroup()

From f17a412c77f2480862797816a00ec111600a96d4 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 1 Mar 2024 15:23:47 +0100
Subject: [PATCH 0733/1422] Breaking: Rename `NavItem` method `getGroup` to
 `getGroupIdentifier`

Renames `getGroup()` to `getGroupIdentifier()` to clarify the purpose of the method.
---
 .../Framework/Features/Navigation/NavItem.php |  2 +-
 .../Navigation/NavigationMenuGenerator.php    |  2 +-
 .../AutomaticNavigationConfigurationsTest.php |  2 +-
 .../Services/DocumentationSidebarTest.php     |  2 +-
 packages/framework/tests/Unit/NavItemTest.php | 20 +++++++++----------
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 6601a7a0027..631183c8ed0 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -156,7 +156,7 @@ public function getPriority(): int
      *
      * For sidebars this is the category key, for navigation menus this is the dropdown key.
      */
-    public function getGroup(): ?string
+    public function getGroupIdentifier(): ?string
     {
         return $this->group;
     }
diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
index b407234ff98..fdc5cf33415 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
@@ -135,7 +135,7 @@ protected function addRouteToGroup(Route $route): void
     {
         $item = NavItem::forRoute($route);
 
-        $groupName = $this->generatesSidebar ? ($item->getGroup() ?? 'Other') : $item->getGroup();
+        $groupName = $this->generatesSidebar ? ($item->getGroupIdentifier() ?? 'Other') : $item->getGroupIdentifier();
 
         $groupItem = $this->getOrCreateGroupItem($groupName);
 
diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index ad5ac5a0712..8c20c50acda 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -1317,7 +1317,7 @@ public function __construct(TestCase $test, $sidebar = false)
     public function state(): array
     {
         return $this->items->map(function (NavItem $item): TestNavItem {
-            return new TestNavItem($item->getLabel(), $item->getGroup(), $item->getPriority(), $item->getChildren());
+            return new TestNavItem($item->getLabel(), $item->getGroupIdentifier(), $item->getPriority(), $item->getChildren());
         })->toArray();
     }
 
diff --git a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
index 5195d1f3fdc..89c4d055e7d 100644
--- a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
+++ b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
@@ -157,7 +157,7 @@ public function testSidebarPrioritiesCanBeSetInBothFrontMatterAndConfig()
     public function testGroupCanBeSetInFrontMatter()
     {
         $this->makePage('foo', ['navigation.group' => 'bar']);
-        $this->assertEquals('bar', collect(NavigationMenuGenerator::handle(DocumentationSidebar::class)->getItems()->first()->getChildren())->first()->getGroup());
+        $this->assertEquals('bar', collect(NavigationMenuGenerator::handle(DocumentationSidebar::class)->getItems()->first()->getChildren())->first()->getGroupIdentifier());
     }
 
     public function testHasGroupsReturnsFalseWhenThereAreNoGroups()
diff --git a/packages/framework/tests/Unit/NavItemTest.php b/packages/framework/tests/Unit/NavItemTest.php
index 614f24baef3..607e976911a 100644
--- a/packages/framework/tests/Unit/NavItemTest.php
+++ b/packages/framework/tests/Unit/NavItemTest.php
@@ -146,7 +146,7 @@ public function testGetPriority()
     public function testGetGroup()
     {
         $navItem = new NavItem(new Route(new InMemoryPage('foo')), 'Page', 500);
-        $this->assertNull($navItem->getGroup());
+        $this->assertNull($navItem->getGroupIdentifier());
     }
 
     public function testGetChildren()
@@ -325,28 +325,28 @@ public function testIsCurrentWithExternalRoute()
 
     public function testGetGroupWithNoGroup()
     {
-        $this->assertNull((new NavItem(new Route(new MarkdownPage()), 'Test', 500))->getGroup());
+        $this->assertNull((new NavItem(new Route(new MarkdownPage()), 'Test', 500))->getGroupIdentifier());
     }
 
     public function testGetGroupWithGroup()
     {
-        $this->assertSame('foo', (new NavItem(new Route(new MarkdownPage()), 'Test', 500, 'foo'))->getGroup());
+        $this->assertSame('foo', (new NavItem(new Route(new MarkdownPage()), 'Test', 500, 'foo'))->getGroupIdentifier());
     }
 
     public function testGetGroupFromRouteWithGroup()
     {
-        $this->assertSame('foo', NavItem::forRoute(new Route(new MarkdownPage(matter: ['navigation.group' => 'foo'])))->getGroup());
+        $this->assertSame('foo', NavItem::forRoute(new Route(new MarkdownPage(matter: ['navigation.group' => 'foo'])))->getGroupIdentifier());
     }
 
     public function testGetGroupForRouteWithGroup()
     {
-        $this->assertSame('foo', NavItem::forRoute(new Route(new MarkdownPage(matter: ['navigation.group' => 'foo'])), 'foo')->getGroup());
+        $this->assertSame('foo', NavItem::forRoute(new Route(new MarkdownPage(matter: ['navigation.group' => 'foo'])), 'foo')->getGroupIdentifier());
     }
 
     public function testGroupKeysAreNormalized()
     {
         $item = new NavItem(new Route(new MarkdownPage()), 'Test', 500, 'Foo Bar');
-        $this->assertSame('foo-bar', $item->getGroup());
+        $this->assertSame('foo-bar', $item->getGroupIdentifier());
     }
 
     public function testIdentifier()
@@ -434,8 +434,8 @@ public function testAddingAnItemWithAGroupKeyKeepsTheSetGroupKey()
 
         $parent->addChild($child);
 
-        $this->assertSame('foo', $parent->getGroup());
-        $this->assertSame('bar', $child->getGroup());
+        $this->assertSame('foo', $parent->getGroupIdentifier());
+        $this->assertSame('bar', $child->getGroupIdentifier());
     }
 
     public function testAddingAnItemWithNoGroupKeyUsesParentIdentifier()
@@ -445,7 +445,7 @@ public function testAddingAnItemWithNoGroupKeyUsesParentIdentifier()
 
         $parent->addChild($child);
 
-        $this->assertSame('foo', $parent->getGroup());
-        $this->assertSame('foo', $child->getGroup());
+        $this->assertSame('foo', $parent->getGroupIdentifier());
+        $this->assertSame('foo', $child->getGroupIdentifier());
     }
 }

From 9646b5b55ec05d4ab1ca04f6754cf33206dcfd31 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 1 Mar 2024 17:02:54 +0100
Subject: [PATCH 0734/1422] Breaking: Rename `NavItem` method `getLink` to
 `getUrl`

Renames `getLink()` to `getUrl()` for clarity on what the method returns.
---
 .../framework/src/Framework/Features/Navigation/NavItem.php | 4 ++--
 packages/framework/tests/Unit/NavItemTest.php               | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 631183c8ed0..b6d245d1cb2 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -110,7 +110,7 @@ public static function forGroup(string $label, array $items, int $priority = Nav
      */
     public function __toString(): string
     {
-        return $this->getLink();
+        return $this->getUrl();
     }
 
     /**
@@ -124,7 +124,7 @@ public function getRoute(): ?Route
     /**
      * Resolve the destination link of the navigation item.
      */
-    public function getLink(): string
+    public function getUrl(): string
     {
         return (string) $this->route;
     }
diff --git a/packages/framework/tests/Unit/NavItemTest.php b/packages/framework/tests/Unit/NavItemTest.php
index 607e976911a..5ecc2bb8d32 100644
--- a/packages/framework/tests/Unit/NavItemTest.php
+++ b/packages/framework/tests/Unit/NavItemTest.php
@@ -95,8 +95,8 @@ public function testCanConstructWithChildren()
         $this->assertSame('Foo', $item->getChildren()[0]->getLabel());
         $this->assertSame('Bar', $item->getChildren()[1]->getLabel());
 
-        $this->assertSame('foo.html', $item->getChildren()[0]->getLink());
-        $this->assertSame('bar.html', $item->getChildren()[1]->getLink());
+        $this->assertSame('foo.html', $item->getChildren()[0]->getUrl());
+        $this->assertSame('bar.html', $item->getChildren()[1]->getUrl());
 
         $this->assertSame(500, $item->getChildren()[0]->getPriority());
         $this->assertSame(500, $item->getChildren()[1]->getPriority());
@@ -128,7 +128,7 @@ public function testGetDestination()
     public function testGetLink()
     {
         $navItem = new NavItem(new Route(new InMemoryPage('foo')), 'Page', 500);
-        $this->assertSame('foo.html', $navItem->getLink());
+        $this->assertSame('foo.html', $navItem->getUrl());
     }
 
     public function testGetLabel()

From b40f49d29ea1827b8abeb3cfb9572dfc5e28682e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 1 Mar 2024 16:04:35 +0100
Subject: [PATCH 0735/1422] Create NavGroupItem.php

---
 .../src/Framework/Features/Navigation/NavGroupItem.php | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 packages/framework/src/Framework/Features/Navigation/NavGroupItem.php

diff --git a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
new file mode 100644
index 00000000000..29a95c96912
--- /dev/null
+++ b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Hyde\Framework\Features\Navigation;
+
+class NavGroupItem
+{
+    //
+}

From e56696e6c7d40f542661350e069ff51e51436d65 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 1 Mar 2024 16:51:58 +0100
Subject: [PATCH 0736/1422] Class `NavGroupItem` extends `NavItem`

---
 .../src/Framework/Features/Navigation/NavGroupItem.php          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
index 29a95c96912..cef48c39482 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
@@ -4,7 +4,7 @@
 
 namespace Hyde\Framework\Features\Navigation;
 
-class NavGroupItem
+class NavGroupItem extends NavItem
 {
     //
 }

From 2ba269ea8bf1105d43dc45662ec57e648c4c3d63 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 1 Mar 2024 21:11:02 +0100
Subject: [PATCH 0737/1422] Begin move of child items array to child class

---
 .../src/Framework/Features/Navigation/NavGroupItem.php     | 7 ++++++-
 .../src/Framework/Features/Navigation/NavItem.php          | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
index cef48c39482..2bd4f505a5e 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
@@ -6,5 +6,10 @@
 
 class NavGroupItem extends NavItem
 {
-    //
+    /**
+     * @deprecated Rename to $items
+     *
+     * @var array<\Hyde\Framework\Features\Navigation\NavItem>
+     */
+    protected array $children = [];
 }
diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index b6d245d1cb2..3b2e836ee8b 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -39,7 +39,7 @@ class NavItem implements Stringable
     /** The "slugified" version of the label used to uniquely identify the item for things like active state comparisons. */
     protected string $identifier;
 
-    /** @var array<\Hyde\Framework\Features\Navigation\NavItem> */
+    /** @deprecated Use NavGroupItem::$items instead */
     protected array $children = [];
 
     /**

From f469ab266a86c5a2fadb2e0270ba52c13c1bf170 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 1 Mar 2024 21:22:29 +0100
Subject: [PATCH 0738/1422] Update static group constructor to point to new
 class

---
 .../framework/src/Framework/Features/Navigation/NavItem.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 3b2e836ee8b..178695f313c 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -102,7 +102,7 @@ public static function forLink(string $href, string $label, int $priority = Navi
      */
     public static function forGroup(string $label, array $items, int $priority = NavigationMenu::LAST): static
     {
-        return new static(null, $label, $priority, $label, $items);
+        return new NavGroupItem(null, $label, $priority, $label, $items);
     }
 
     /**

From d64e6c06e57c1ff85946f489d62bde509a691bb5 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 1 Mar 2024 21:26:37 +0100
Subject: [PATCH 0739/1422] Move getChildren method to child class

---
 .../Framework/Features/Navigation/NavGroupItem.php   | 12 ++++++++++++
 .../src/Framework/Features/Navigation/NavItem.php    | 12 ------------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
index 2bd4f505a5e..32a8b3dbab1 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
@@ -12,4 +12,16 @@ class NavGroupItem extends NavItem
      * @var array<\Hyde\Framework\Features\Navigation\NavItem>
      */
     protected array $children = [];
+
+    /**
+     * Get the children of the navigation item.
+     *
+     * For the main navigation menu, this stores any dropdown items.
+     *
+     * @return array<\Hyde\Framework\Features\Navigation\NavItem>
+     */
+    public function getChildren(): array
+    {
+        return $this->children;
+    }
 }
diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 178695f313c..4440159f4be 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -169,18 +169,6 @@ public function getIdentifier(): string
         return $this->identifier;
     }
 
-    /**
-     * Get the children of the navigation item.
-     *
-     * For the main navigation menu, this stores any dropdown items.
-     *
-     * @return array<\Hyde\Framework\Features\Navigation\NavItem>
-     */
-    public function getChildren(): array
-    {
-        return $this->children;
-    }
-
     /**
      * Check if the NavItem instance has children.
      */

From f30baaf9b7f5fe86b3dc42c55390da30e3c47df9 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 1 Mar 2024 21:29:30 +0100
Subject: [PATCH 0740/1422] Add temporary deprecated compatibility

---
 .../src/Framework/Features/Navigation/NavItem.php         | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 4440159f4be..1cb7976c60a 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -169,6 +169,14 @@ public function getIdentifier(): string
         return $this->identifier;
     }
 
+    /**
+     * @deprecated Should not be called on this class
+     */
+    public function getChildren(): array
+    {
+        return $this->children;
+    }
+
     /**
      * Check if the NavItem instance has children.
      */

From 3fa5fdf6b85d0b6e3c7ab0e389826a20d3f5527c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 1 Mar 2024 21:31:47 +0100
Subject: [PATCH 0741/1422] Begin hasChildren method move

---
 .../src/Framework/Features/Navigation/NavGroupItem.php    | 8 ++++++++
 .../src/Framework/Features/Navigation/NavItem.php         | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
index 32a8b3dbab1..7180f9d0fad 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
@@ -24,4 +24,12 @@ public function getChildren(): array
     {
         return $this->children;
     }
+
+    /**
+     * Check if the NavItem instance has children.
+     */
+    public function hasChildren(): bool
+    {
+        return count($this->children) > 0;
+    }
 }
diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 1cb7976c60a..0da63796bc4 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -178,7 +178,7 @@ public function getChildren(): array
     }
 
     /**
-     * Check if the NavItem instance has children.
+     * @deprecated Should not be called on this class
      */
     public function hasChildren(): bool
     {

From c55ded4dbda866cb0ef88fe623c00d9e03d54d11 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 1 Mar 2024 21:32:58 +0100
Subject: [PATCH 0742/1422] Begin addChild method move

---
 .../Features/Navigation/NavGroupItem.php          | 15 +++++++++++++++
 .../src/Framework/Features/Navigation/NavItem.php |  4 +---
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
index 7180f9d0fad..9fe41aaf1b2 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
@@ -32,4 +32,19 @@ public function hasChildren(): bool
     {
         return count($this->children) > 0;
     }
+
+    /**
+     * Add a navigation item to the children of the navigation item.
+     *
+     * This will turn the parent item into a dropdown. Its destination will be set to null.
+     */
+    public function addChild(NavItem $item): static
+    {
+        $item->group ??= $this->group;
+
+        $this->children[] = $item;
+        $this->route = null;
+
+        return $this;
+    }
 }
diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 0da63796bc4..32f7f2547e1 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -194,9 +194,7 @@ public function isActive(): bool
     }
 
     /**
-     * Add a navigation item to the children of the navigation item.
-     *
-     * This will turn the parent item into a dropdown. Its destination will be set to null.
+     * @deprecated Should not be called on this class
      */
     public function addChild(NavItem $item): static
     {

From 10480ccb4d538dcdf65809b249527de7c1e9656b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 1 Mar 2024 21:33:25 +0100
Subject: [PATCH 0743/1422] Begin addChildren method move

---
 .../Framework/Features/Navigation/NavGroupItem.php | 14 ++++++++++++++
 .../src/Framework/Features/Navigation/NavItem.php  |  4 +---
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
index 9fe41aaf1b2..71cc89bc3fc 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
@@ -47,4 +47,18 @@ public function addChild(NavItem $item): static
 
         return $this;
     }
+
+    /**
+     * Add multiple navigation items to the children of the navigation item.
+     *
+     * @param  array<\Hyde\Framework\Features\Navigation\NavItem>  $items
+     */
+    public function addChildren(array $items): static
+    {
+        foreach ($items as $item) {
+            $this->addChild($item);
+        }
+
+        return $this;
+    }
 }
diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 32f7f2547e1..7405c2548f7 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -207,9 +207,7 @@ public function addChild(NavItem $item): static
     }
 
     /**
-     * Add multiple navigation items to the children of the navigation item.
-     *
-     * @param  array<\Hyde\Framework\Features\Navigation\NavItem>  $items
+     * @deprecated Should not be called on this class
      */
     public function addChildren(array $items): static
     {

From 12512e5df4a2d3eaa45a4786672bb3adf5d12d74 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 1 Mar 2024 21:33:54 +0100
Subject: [PATCH 0744/1422] Add todo

---
 .../src/Framework/Features/Navigation/NavGroupItem.php         | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
index 71cc89bc3fc..edd892493ab 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
@@ -4,6 +4,9 @@
 
 namespace Hyde\Framework\Features\Navigation;
 
+/**
+ * @todo Consider extracting trait for shared code with navigation menu class
+ */
 class NavGroupItem extends NavItem
 {
     /**

From 9996039a993111c4b81c8c3177cfdc79853aaa1a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 1 Mar 2024 21:35:47 +0100
Subject: [PATCH 0745/1422] Create initial child constructor

---
 .../src/Framework/Features/Navigation/NavGroupItem.php      | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
index edd892493ab..65c12f08be6 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
@@ -16,6 +16,12 @@ class NavGroupItem extends NavItem
      */
     protected array $children = [];
 
+    public function __construct(string $label, int $priority = NavigationMenu::DEFAULT, array $children = [])
+    {
+        parent::__construct(null, $label, $priority, $label);
+        $this->children = $children;
+    }
+
     /**
      * Get the children of the navigation item.
      *

From eceb24b8d1457375d6709e280f18669d6dae995c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 1 Mar 2024 21:40:11 +0100
Subject: [PATCH 0746/1422] Fix constructor call

---
 .../framework/src/Framework/Features/Navigation/NavItem.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 7405c2548f7..c0dd042a613 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -102,7 +102,7 @@ public static function forLink(string $href, string $label, int $priority = Navi
      */
     public static function forGroup(string $label, array $items, int $priority = NavigationMenu::LAST): static
     {
-        return new NavGroupItem(null, $label, $priority, $label, $items);
+        return new NavGroupItem($label, $priority, $items);
     }
 
     /**

From a4c04085d0a9d1b1797acac56dad3638f7ac05ce Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 1 Mar 2024 21:40:15 +0100
Subject: [PATCH 0747/1422] Normalize label as group key

---
 .../src/Framework/Features/Navigation/NavGroupItem.php          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
index 65c12f08be6..61bd32caa77 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
@@ -18,7 +18,7 @@ class NavGroupItem extends NavItem
 
     public function __construct(string $label, int $priority = NavigationMenu::DEFAULT, array $children = [])
     {
-        parent::__construct(null, $label, $priority, $label);
+        parent::__construct(null, $label, $priority, static::normalizeGroupKey($label));
         $this->children = $children;
     }
 

From 5822bf7381c0d05a0c2e63b822f833f99b4bb336 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 1 Mar 2024 21:44:13 +0100
Subject: [PATCH 0748/1422] Add children using method

---
 .../src/Framework/Features/Navigation/NavGroupItem.php          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
index 61bd32caa77..bd1fb1adef7 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
@@ -19,7 +19,7 @@ class NavGroupItem extends NavItem
     public function __construct(string $label, int $priority = NavigationMenu::DEFAULT, array $children = [])
     {
         parent::__construct(null, $label, $priority, static::normalizeGroupKey($label));
-        $this->children = $children;
+        $this->addChildren($children);
     }
 
     /**

From b4928c51bf00fe46427a782623951be8b32a3b1d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 1 Mar 2024 21:44:34 +0100
Subject: [PATCH 0749/1422] Remove child constructor from base class

---
 packages/framework/src/Framework/Features/Navigation/NavItem.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index c0dd042a613..8e41a4c3567 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -62,7 +62,6 @@ public function __construct(Route|string|null $destination, string $label, int $
         $this->priority = $priority;
         $this->group = static::normalizeGroupKey($group);
         $this->identifier = static::makeIdentifier($label);
-        $this->addChildren($children);
     }
 
     /**

From fadcc4639cffc056cc4f17be0c1da869e8b3043c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 2 Mar 2024 11:46:54 +0100
Subject: [PATCH 0750/1422] Revert "Remove child constructor from base class"

This reverts commit b4928c51bf00fe46427a782623951be8b32a3b1d.
---
 packages/framework/src/Framework/Features/Navigation/NavItem.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 8e41a4c3567..c0dd042a613 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -62,6 +62,7 @@ public function __construct(Route|string|null $destination, string $label, int $
         $this->priority = $priority;
         $this->group = static::normalizeGroupKey($group);
         $this->identifier = static::makeIdentifier($label);
+        $this->addChildren($children);
     }
 
     /**

From 5d7330681bb6f1d720dd95087e947a437d9b8381 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 2 Mar 2024 11:49:28 +0100
Subject: [PATCH 0751/1422] Deprecate child parameter

---
 .../framework/src/Framework/Features/Navigation/NavItem.php   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index c0dd042a613..4d7ce432adf 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -5,6 +5,7 @@
 namespace Hyde\Framework\Features\Navigation;
 
 use Hyde\Pages\DocumentationPage;
+use JetBrains\PhpStorm\Deprecated;
 use Hyde\Foundation\Facades\Routes;
 use Hyde\Hyde;
 use Hyde\Support\Models\Route;
@@ -49,9 +50,8 @@ class NavItem implements Stringable
      * @param  string  $label  The label of the navigation item.
      * @param  int  $priority  The priority to determine the order of the navigation item.
      * @param  string|null  $group  The dropdown/group identifier of the navigation item, if any.
-     * @param  array<\Hyde\Framework\Features\Navigation\NavItem>  $children  If the item is a dropdown, these are the items to be included in the dropdown.
      */
-    public function __construct(Route|string|null $destination, string $label, int $priority = NavigationMenu::DEFAULT, ?string $group = null, array $children = [])
+    public function __construct(Route|string|null $destination, string $label, int $priority = NavigationMenu::DEFAULT, ?string $group = null, #[Deprecated] array $children = [])
     {
         if (is_string($destination)) {
             $destination = Routes::get($destination) ?? new ExternalRoute($destination);

From 02e836e7b38e9bc975577b8472b3fca99819d693 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 2 Mar 2024 11:51:46 +0100
Subject: [PATCH 0752/1422] Create NavGroupItemTest.php

---
 .../framework/tests/Unit/NavGroupItemTest.php | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 packages/framework/tests/Unit/NavGroupItemTest.php

diff --git a/packages/framework/tests/Unit/NavGroupItemTest.php b/packages/framework/tests/Unit/NavGroupItemTest.php
new file mode 100644
index 00000000000..ab1d985b33e
--- /dev/null
+++ b/packages/framework/tests/Unit/NavGroupItemTest.php
@@ -0,0 +1,28 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Hyde\Framework\Testing\Unit;
+
+use Hyde\Testing\UnitTestCase;
+use Hyde\Support\Facades\Render;
+use Hyde\Support\Models\RenderData;
+
+/**
+ * @covers \Hyde\Framework\Features\Navigation\NavGroupItem
+ */
+class NavGroupItemTest extends UnitTestCase
+{
+    public static function setUpBeforeClass(): void
+    {
+        self::$hasSetUpKernel = false;
+
+        self::needsKernel();
+        self::mockConfig();
+    }
+
+    protected function setUp(): void
+    {
+        Render::swap(new RenderData());
+    }
+}

From 737734d904a171db22d34fdcb4d38b4be87b1788 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 2 Mar 2024 11:53:15 +0100
Subject: [PATCH 0753/1422] Move group specific tests to new unit test

---
 .../framework/tests/Unit/NavGroupItemTest.php | 141 ++++++++++++++++++
 packages/framework/tests/Unit/NavItemTest.php | 137 -----------------
 2 files changed, 141 insertions(+), 137 deletions(-)

diff --git a/packages/framework/tests/Unit/NavGroupItemTest.php b/packages/framework/tests/Unit/NavGroupItemTest.php
index ab1d985b33e..68cda33f6cd 100644
--- a/packages/framework/tests/Unit/NavGroupItemTest.php
+++ b/packages/framework/tests/Unit/NavGroupItemTest.php
@@ -4,9 +4,13 @@
 
 namespace Hyde\Framework\Testing\Unit;
 
+use Hyde\Pages\MarkdownPage;
+use Hyde\Pages\InMemoryPage;
 use Hyde\Testing\UnitTestCase;
+use Hyde\Support\Models\Route;
 use Hyde\Support\Facades\Render;
 use Hyde\Support\Models\RenderData;
+use Hyde\Framework\Features\Navigation\NavItem;
 
 /**
  * @covers \Hyde\Framework\Features\Navigation\NavGroupItem
@@ -25,4 +29,141 @@ protected function setUp(): void
     {
         Render::swap(new RenderData());
     }
+
+    public function testCanConstructWithChildren()
+    {
+        $route = new Route(new MarkdownPage());
+        $children = [
+            new NavItem(new Route(new InMemoryPage('foo')), 'Foo', 500),
+            new NavItem(new Route(new InMemoryPage('bar')), 'Bar', 500),
+        ];
+        $item = new NavItem($route, 'Test', 500, null, $children);
+
+        $this->assertSame('Test', $item->getLabel());
+        $this->assertNull($item->getRoute());
+        $this->assertSame(500, $item->getPriority());
+
+        $this->assertCount(2, $item->getChildren());
+        $this->assertSame($children, $item->getChildren());
+
+        $this->assertSame('Foo', $item->getChildren()[0]->getLabel());
+        $this->assertSame('Bar', $item->getChildren()[1]->getLabel());
+
+        $this->assertSame('foo.html', $item->getChildren()[0]->getUrl());
+        $this->assertSame('bar.html', $item->getChildren()[1]->getUrl());
+
+        $this->assertSame(500, $item->getChildren()[0]->getPriority());
+        $this->assertSame(500, $item->getChildren()[1]->getPriority());
+    }
+
+    public function testCanConstructWithChildrenWithoutRoute()
+    {
+        $children = [
+            new NavItem(new Route(new InMemoryPage('foo')), 'Foo', 500),
+            new NavItem(new Route(new InMemoryPage('bar')), 'Bar', 500),
+        ];
+        $item = new NavItem('', 'Test', 500, null, $children);
+
+        $this->assertSame('Test', $item->getLabel());
+        $this->assertNull($item->getRoute());
+
+        $this->assertCount(2, $item->getChildren());
+        $this->assertSame($children, $item->getChildren());
+    }
+
+    public function testGetChildren()
+    {
+        $children = [
+            new NavItem(new Route(new InMemoryPage('foo')), 'Foo', 500),
+            new NavItem(new Route(new InMemoryPage('bar')), 'Bar', 500),
+        ];
+
+        $navItem = new NavItem(new Route(new InMemoryPage('foo')), 'Page', 500, null, $children);
+        $this->assertSame($children, $navItem->getChildren());
+    }
+
+    public function testGetChildrenWithNoChildren()
+    {
+        $navItem = new NavItem(new Route(new InMemoryPage('foo')), 'Page', 500);
+        $this->assertEmpty($navItem->getChildren());
+    }
+
+    public function testHasChildren()
+    {
+        $item = new NavItem(new Route(new MarkdownPage()), 'Test', 500);
+        $this->assertFalse($item->hasChildren());
+    }
+
+    public function testHasChildrenWithChildren()
+    {
+        $item = new NavItem(new Route(new MarkdownPage()), 'Test', 500, null, [
+            new NavItem(new Route(new InMemoryPage('foo')), 'Foo', 500),
+            new NavItem(new Route(new InMemoryPage('bar')), 'Bar', 500),
+        ]);
+        $this->assertTrue($item->hasChildren());
+    }
+
+    public function testCanAddMultipleItemsToDropdown()
+    {
+        $parent = new NavItem(new Route(new MarkdownPage()), 'Parent', 500, 'foo');
+        $child1 = new NavItem(new Route(new MarkdownPage()), 'Child 1', 500, 'foo');
+        $child2 = new NavItem(new Route(new MarkdownPage()), 'Child 2', 500, 'foo');
+
+        $this->assertSame([], $parent->getChildren());
+
+        $parent->addChildren([$child1, $child2]);
+
+        $this->assertSame([$child1, $child2], $parent->getChildren());
+    }
+
+    public function testAddChildrenMethodReturnsSelf()
+    {
+        $parent = new NavItem(new Route(new MarkdownPage()), 'Parent', 500, 'foo');
+        $child1 = new NavItem(new Route(new MarkdownPage()), 'Child 1', 500, 'foo');
+        $child2 = new NavItem(new Route(new MarkdownPage()), 'Child 2', 500, 'foo');
+
+        $this->assertSame($parent, $parent->addChildren([$child1, $child2]));
+    }
+
+    public function testAddingAnItemWithAGroupKeyKeepsTheSetGroupKey()
+    {
+        $parent = new NavItem(new Route(new MarkdownPage()), 'Parent', 500, 'foo');
+        $child = new NavItem(new Route(new MarkdownPage()), 'Child', 500, 'bar');
+
+        $parent->addChild($child);
+
+        $this->assertSame('foo', $parent->getGroupIdentifier());
+        $this->assertSame('bar', $child->getGroupIdentifier());
+    }
+
+    public function testAddingAnItemWithNoGroupKeyUsesParentIdentifier()
+    {
+        $parent = new NavItem(new Route(new MarkdownPage()), 'Parent', 500, 'foo');
+        $child = new NavItem(new Route(new MarkdownPage()), 'Child', 500);
+
+        $parent->addChild($child);
+
+        $this->assertSame('foo', $parent->getGroupIdentifier());
+        $this->assertSame('foo', $child->getGroupIdentifier());
+    }
+
+    public function testCanAddItemToDropdown()
+    {
+        $parent = new NavItem(new Route(new MarkdownPage()), 'Parent', 500, 'foo');
+        $child = new NavItem(new Route(new MarkdownPage()), 'Child', 500, 'foo');
+
+        $this->assertSame([], $parent->getChildren());
+
+        $parent->addChild($child);
+
+        $this->assertSame([$child], $parent->getChildren());
+    }
+
+    public function testAddChildMethodReturnsSelf()
+    {
+        $parent = new NavItem(new Route(new MarkdownPage()), 'Parent', 500, 'foo');
+        $child = new NavItem(new Route(new MarkdownPage()), 'Child', 500, 'foo');
+
+        $this->assertSame($parent, $parent->addChild($child));
+    }
 }
diff --git a/packages/framework/tests/Unit/NavItemTest.php b/packages/framework/tests/Unit/NavItemTest.php
index 5ecc2bb8d32..a56e057365b 100644
--- a/packages/framework/tests/Unit/NavItemTest.php
+++ b/packages/framework/tests/Unit/NavItemTest.php
@@ -76,47 +76,6 @@ public function testPassingUnknownRouteKeyToConstructorUsesExternalRoute()
         $this->assertSame('foo', (string) $item->getRoute());
     }
 
-    public function testCanConstructWithChildren()
-    {
-        $route = new Route(new MarkdownPage());
-        $children = [
-            new NavItem(new Route(new InMemoryPage('foo')), 'Foo', 500),
-            new NavItem(new Route(new InMemoryPage('bar')), 'Bar', 500),
-        ];
-        $item = new NavItem($route, 'Test', 500, null, $children);
-
-        $this->assertSame('Test', $item->getLabel());
-        $this->assertNull($item->getRoute());
-        $this->assertSame(500, $item->getPriority());
-
-        $this->assertCount(2, $item->getChildren());
-        $this->assertSame($children, $item->getChildren());
-
-        $this->assertSame('Foo', $item->getChildren()[0]->getLabel());
-        $this->assertSame('Bar', $item->getChildren()[1]->getLabel());
-
-        $this->assertSame('foo.html', $item->getChildren()[0]->getUrl());
-        $this->assertSame('bar.html', $item->getChildren()[1]->getUrl());
-
-        $this->assertSame(500, $item->getChildren()[0]->getPriority());
-        $this->assertSame(500, $item->getChildren()[1]->getPriority());
-    }
-
-    public function testCanConstructWithChildrenWithoutRoute()
-    {
-        $children = [
-            new NavItem(new Route(new InMemoryPage('foo')), 'Foo', 500),
-            new NavItem(new Route(new InMemoryPage('bar')), 'Bar', 500),
-        ];
-        $item = new NavItem('', 'Test', 500, null, $children);
-
-        $this->assertSame('Test', $item->getLabel());
-        $this->assertNull($item->getRoute());
-
-        $this->assertCount(2, $item->getChildren());
-        $this->assertSame($children, $item->getChildren());
-    }
-
     public function testGetDestination()
     {
         $route = new Route(new InMemoryPage('foo'));
@@ -149,23 +108,6 @@ public function testGetGroup()
         $this->assertNull($navItem->getGroupIdentifier());
     }
 
-    public function testGetChildren()
-    {
-        $children = [
-            new NavItem(new Route(new InMemoryPage('foo')), 'Foo', 500),
-            new NavItem(new Route(new InMemoryPage('bar')), 'Bar', 500),
-        ];
-
-        $navItem = new NavItem(new Route(new InMemoryPage('foo')), 'Page', 500, null, $children);
-        $this->assertSame($children, $navItem->getChildren());
-    }
-
-    public function testGetChildrenWithNoChildren()
-    {
-        $navItem = new NavItem(new Route(new InMemoryPage('foo')), 'Page', 500);
-        $this->assertEmpty($navItem->getChildren());
-    }
-
     public function testFromRoute()
     {
         $route = new Route(new MarkdownPage());
@@ -288,21 +230,6 @@ public function testDropdownFacadeWithCustomPriority()
         $this->assertSame(500, $item->getPriority());
     }
 
-    public function testHasChildren()
-    {
-        $item = new NavItem(new Route(new MarkdownPage()), 'Test', 500);
-        $this->assertFalse($item->hasChildren());
-    }
-
-    public function testHasChildrenWithChildren()
-    {
-        $item = new NavItem(new Route(new MarkdownPage()), 'Test', 500, null, [
-            new NavItem(new Route(new InMemoryPage('foo')), 'Foo', 500),
-            new NavItem(new Route(new InMemoryPage('bar')), 'Bar', 500),
-        ]);
-        $this->assertTrue($item->hasChildren());
-    }
-
     public function testIsCurrent()
     {
         Render::swap(Mockery::mock(RenderData::class, [
@@ -384,68 +311,4 @@ public function testIdentifierUsesLabelForExternalRoute()
         $item = NavItem::forLink('https://example.com', 'Foo Bar');
         $this->assertSame('foo-bar', $item->getIdentifier());
     }
-
-    public function testCanAddItemToDropdown()
-    {
-        $parent = new NavItem(new Route(new MarkdownPage()), 'Parent', 500, 'foo');
-        $child = new NavItem(new Route(new MarkdownPage()), 'Child', 500, 'foo');
-
-        $this->assertSame([], $parent->getChildren());
-
-        $parent->addChild($child);
-
-        $this->assertSame([$child], $parent->getChildren());
-    }
-
-    public function testAddChildMethodReturnsSelf()
-    {
-        $parent = new NavItem(new Route(new MarkdownPage()), 'Parent', 500, 'foo');
-        $child = new NavItem(new Route(new MarkdownPage()), 'Child', 500, 'foo');
-
-        $this->assertSame($parent, $parent->addChild($child));
-    }
-
-    public function testCanAddMultipleItemsToDropdown()
-    {
-        $parent = new NavItem(new Route(new MarkdownPage()), 'Parent', 500, 'foo');
-        $child1 = new NavItem(new Route(new MarkdownPage()), 'Child 1', 500, 'foo');
-        $child2 = new NavItem(new Route(new MarkdownPage()), 'Child 2', 500, 'foo');
-
-        $this->assertSame([], $parent->getChildren());
-
-        $parent->addChildren([$child1, $child2]);
-
-        $this->assertSame([$child1, $child2], $parent->getChildren());
-    }
-
-    public function testAddChildrenMethodReturnsSelf()
-    {
-        $parent = new NavItem(new Route(new MarkdownPage()), 'Parent', 500, 'foo');
-        $child1 = new NavItem(new Route(new MarkdownPage()), 'Child 1', 500, 'foo');
-        $child2 = new NavItem(new Route(new MarkdownPage()), 'Child 2', 500, 'foo');
-
-        $this->assertSame($parent, $parent->addChildren([$child1, $child2]));
-    }
-
-    public function testAddingAnItemWithAGroupKeyKeepsTheSetGroupKey()
-    {
-        $parent = new NavItem(new Route(new MarkdownPage()), 'Parent', 500, 'foo');
-        $child = new NavItem(new Route(new MarkdownPage()), 'Child', 500, 'bar');
-
-        $parent->addChild($child);
-
-        $this->assertSame('foo', $parent->getGroupIdentifier());
-        $this->assertSame('bar', $child->getGroupIdentifier());
-    }
-
-    public function testAddingAnItemWithNoGroupKeyUsesParentIdentifier()
-    {
-        $parent = new NavItem(new Route(new MarkdownPage()), 'Parent', 500, 'foo');
-        $child = new NavItem(new Route(new MarkdownPage()), 'Child', 500);
-
-        $parent->addChild($child);
-
-        $this->assertSame('foo', $parent->getGroupIdentifier());
-        $this->assertSame('foo', $child->getGroupIdentifier());
-    }
 }

From 8c54d451e2226ad349b8cd7632420b68e6476b05 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 2 Mar 2024 12:09:57 +0100
Subject: [PATCH 0754/1422] Begin refactoring test to use the new child class

---
 .../framework/tests/Unit/NavGroupItemTest.php | 32 +++++++++----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/packages/framework/tests/Unit/NavGroupItemTest.php b/packages/framework/tests/Unit/NavGroupItemTest.php
index 68cda33f6cd..4e6db8e7af0 100644
--- a/packages/framework/tests/Unit/NavGroupItemTest.php
+++ b/packages/framework/tests/Unit/NavGroupItemTest.php
@@ -11,6 +11,7 @@
 use Hyde\Support\Facades\Render;
 use Hyde\Support\Models\RenderData;
 use Hyde\Framework\Features\Navigation\NavItem;
+use Hyde\Framework\Features\Navigation\NavGroupItem;
 
 /**
  * @covers \Hyde\Framework\Features\Navigation\NavGroupItem
@@ -32,12 +33,11 @@ protected function setUp(): void
 
     public function testCanConstructWithChildren()
     {
-        $route = new Route(new MarkdownPage());
         $children = [
             new NavItem(new Route(new InMemoryPage('foo')), 'Foo', 500),
             new NavItem(new Route(new InMemoryPage('bar')), 'Bar', 500),
         ];
-        $item = new NavItem($route, 'Test', 500, null, $children);
+        $item = new NavGroupItem('Test', 500, $children);
 
         $this->assertSame('Test', $item->getLabel());
         $this->assertNull($item->getRoute());
@@ -62,7 +62,7 @@ public function testCanConstructWithChildrenWithoutRoute()
             new NavItem(new Route(new InMemoryPage('foo')), 'Foo', 500),
             new NavItem(new Route(new InMemoryPage('bar')), 'Bar', 500),
         ];
-        $item = new NavItem('', 'Test', 500, null, $children);
+        $item = new NavGroupItem('Test', 500, $children);
 
         $this->assertSame('Test', $item->getLabel());
         $this->assertNull($item->getRoute());
@@ -78,25 +78,25 @@ public function testGetChildren()
             new NavItem(new Route(new InMemoryPage('bar')), 'Bar', 500),
         ];
 
-        $navItem = new NavItem(new Route(new InMemoryPage('foo')), 'Page', 500, null, $children);
+        $navItem = new NavGroupItem('Page', 500, $children);
         $this->assertSame($children, $navItem->getChildren());
     }
 
     public function testGetChildrenWithNoChildren()
     {
-        $navItem = new NavItem(new Route(new InMemoryPage('foo')), 'Page', 500);
+        $navItem = new NavGroupItem('Page', 500);
         $this->assertEmpty($navItem->getChildren());
     }
 
     public function testHasChildren()
     {
-        $item = new NavItem(new Route(new MarkdownPage()), 'Test', 500);
+        $item = new NavGroupItem('Test', 500);
         $this->assertFalse($item->hasChildren());
     }
 
     public function testHasChildrenWithChildren()
     {
-        $item = new NavItem(new Route(new MarkdownPage()), 'Test', 500, null, [
+        $item = new NavGroupItem('Test', 500, [
             new NavItem(new Route(new InMemoryPage('foo')), 'Foo', 500),
             new NavItem(new Route(new InMemoryPage('bar')), 'Bar', 500),
         ]);
@@ -105,7 +105,7 @@ public function testHasChildrenWithChildren()
 
     public function testCanAddMultipleItemsToDropdown()
     {
-        $parent = new NavItem(new Route(new MarkdownPage()), 'Parent', 500, 'foo');
+        $parent = new NavGroupItem('Parent', 500);
         $child1 = new NavItem(new Route(new MarkdownPage()), 'Child 1', 500, 'foo');
         $child2 = new NavItem(new Route(new MarkdownPage()), 'Child 2', 500, 'foo');
 
@@ -118,7 +118,7 @@ public function testCanAddMultipleItemsToDropdown()
 
     public function testAddChildrenMethodReturnsSelf()
     {
-        $parent = new NavItem(new Route(new MarkdownPage()), 'Parent', 500, 'foo');
+        $parent = new NavGroupItem('Parent', 500);
         $child1 = new NavItem(new Route(new MarkdownPage()), 'Child 1', 500, 'foo');
         $child2 = new NavItem(new Route(new MarkdownPage()), 'Child 2', 500, 'foo');
 
@@ -127,29 +127,29 @@ public function testAddChildrenMethodReturnsSelf()
 
     public function testAddingAnItemWithAGroupKeyKeepsTheSetGroupKey()
     {
-        $parent = new NavItem(new Route(new MarkdownPage()), 'Parent', 500, 'foo');
+        $parent = new NavGroupItem('Parent', 500);
         $child = new NavItem(new Route(new MarkdownPage()), 'Child', 500, 'bar');
 
         $parent->addChild($child);
 
-        $this->assertSame('foo', $parent->getGroupIdentifier());
+        $this->assertSame('parent', $parent->getGroupIdentifier());
         $this->assertSame('bar', $child->getGroupIdentifier());
     }
 
     public function testAddingAnItemWithNoGroupKeyUsesParentIdentifier()
     {
-        $parent = new NavItem(new Route(new MarkdownPage()), 'Parent', 500, 'foo');
+        $parent = new NavGroupItem('Parent', 500);
         $child = new NavItem(new Route(new MarkdownPage()), 'Child', 500);
 
         $parent->addChild($child);
 
-        $this->assertSame('foo', $parent->getGroupIdentifier());
-        $this->assertSame('foo', $child->getGroupIdentifier());
+        $this->assertSame('parent', $parent->getGroupIdentifier());
+        $this->assertSame('parent', $child->getGroupIdentifier());
     }
 
     public function testCanAddItemToDropdown()
     {
-        $parent = new NavItem(new Route(new MarkdownPage()), 'Parent', 500, 'foo');
+        $parent = new NavGroupItem('Parent', 500);
         $child = new NavItem(new Route(new MarkdownPage()), 'Child', 500, 'foo');
 
         $this->assertSame([], $parent->getChildren());
@@ -161,7 +161,7 @@ public function testCanAddItemToDropdown()
 
     public function testAddChildMethodReturnsSelf()
     {
-        $parent = new NavItem(new Route(new MarkdownPage()), 'Parent', 500, 'foo');
+        $parent = new NavGroupItem('Parent', 500);
         $child = new NavItem(new Route(new MarkdownPage()), 'Child', 500, 'foo');
 
         $this->assertSame($parent, $parent->addChild($child));

From 0132df14a25ff54d151b8cdb9fb65e7b1ea52e91 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 2 Mar 2024 12:17:15 +0100
Subject: [PATCH 0755/1422] Refactor test to use normalized mock data

Co-Authored-By: GPT 3.5 Turbo <openai-machine-user@hydephp.com>
---
 .../framework/tests/Unit/NavGroupItemTest.php | 39 +++++++------------
 1 file changed, 14 insertions(+), 25 deletions(-)

diff --git a/packages/framework/tests/Unit/NavGroupItemTest.php b/packages/framework/tests/Unit/NavGroupItemTest.php
index 4e6db8e7af0..b8415b0f000 100644
--- a/packages/framework/tests/Unit/NavGroupItemTest.php
+++ b/packages/framework/tests/Unit/NavGroupItemTest.php
@@ -33,10 +33,7 @@ protected function setUp(): void
 
     public function testCanConstructWithChildren()
     {
-        $children = [
-            new NavItem(new Route(new InMemoryPage('foo')), 'Foo', 500),
-            new NavItem(new Route(new InMemoryPage('bar')), 'Bar', 500),
-        ];
+        $children = $this->createNavItems(['foo', 'bar']);
         $item = new NavGroupItem('Test', 500, $children);
 
         $this->assertSame('Test', $item->getLabel());
@@ -45,23 +42,11 @@ public function testCanConstructWithChildren()
 
         $this->assertCount(2, $item->getChildren());
         $this->assertSame($children, $item->getChildren());
-
-        $this->assertSame('Foo', $item->getChildren()[0]->getLabel());
-        $this->assertSame('Bar', $item->getChildren()[1]->getLabel());
-
-        $this->assertSame('foo.html', $item->getChildren()[0]->getUrl());
-        $this->assertSame('bar.html', $item->getChildren()[1]->getUrl());
-
-        $this->assertSame(500, $item->getChildren()[0]->getPriority());
-        $this->assertSame(500, $item->getChildren()[1]->getPriority());
     }
 
     public function testCanConstructWithChildrenWithoutRoute()
     {
-        $children = [
-            new NavItem(new Route(new InMemoryPage('foo')), 'Foo', 500),
-            new NavItem(new Route(new InMemoryPage('bar')), 'Bar', 500),
-        ];
+        $children = $this->createNavItems(['foo', 'bar']);
         $item = new NavGroupItem('Test', 500, $children);
 
         $this->assertSame('Test', $item->getLabel());
@@ -73,10 +58,7 @@ public function testCanConstructWithChildrenWithoutRoute()
 
     public function testGetChildren()
     {
-        $children = [
-            new NavItem(new Route(new InMemoryPage('foo')), 'Foo', 500),
-            new NavItem(new Route(new InMemoryPage('bar')), 'Bar', 500),
-        ];
+        $children = $this->createNavItems(['foo', 'bar']);
 
         $navItem = new NavGroupItem('Page', 500, $children);
         $this->assertSame($children, $navItem->getChildren());
@@ -96,10 +78,7 @@ public function testHasChildren()
 
     public function testHasChildrenWithChildren()
     {
-        $item = new NavGroupItem('Test', 500, [
-            new NavItem(new Route(new InMemoryPage('foo')), 'Foo', 500),
-            new NavItem(new Route(new InMemoryPage('bar')), 'Bar', 500),
-        ]);
+        $item = new NavGroupItem('Test', 500, $this->createNavItems(['foo', 'bar']));
         $this->assertTrue($item->hasChildren());
     }
 
@@ -166,4 +145,14 @@ public function testAddChildMethodReturnsSelf()
 
         $this->assertSame($parent, $parent->addChild($child));
     }
+
+    private function createNavItems(array $pages): array
+    {
+        $navItems = [];
+        foreach ($pages as $page) {
+            $navItems[] = new NavItem(new Route(new InMemoryPage($page)), ucfirst($page), 500);
+        }
+
+        return $navItems;
+    }
 }

From dcff0fd8735a04b5f109f8f53f6bd8c312bf8637 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 2 Mar 2024 12:23:48 +0100
Subject: [PATCH 0756/1422] Inline constant parameter value

---
 packages/framework/tests/Unit/NavGroupItemTest.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/tests/Unit/NavGroupItemTest.php b/packages/framework/tests/Unit/NavGroupItemTest.php
index b8415b0f000..ae1c63b952d 100644
--- a/packages/framework/tests/Unit/NavGroupItemTest.php
+++ b/packages/framework/tests/Unit/NavGroupItemTest.php
@@ -148,6 +148,7 @@ public function testAddChildMethodReturnsSelf()
 
     private function createNavItems(array $pages): array
     {
+        $pages = ['foo', 'bar'];
         $navItems = [];
         foreach ($pages as $page) {
             $navItems[] = new NavItem(new Route(new InMemoryPage($page)), ucfirst($page), 500);

From cb141dc685bcb05a8f27b0c22bb3cd7640dbef7b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 2 Mar 2024 12:23:52 +0100
Subject: [PATCH 0757/1422] Remove unused parameter

---
 packages/framework/tests/Unit/NavGroupItemTest.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/framework/tests/Unit/NavGroupItemTest.php b/packages/framework/tests/Unit/NavGroupItemTest.php
index ae1c63b952d..4f4c821779b 100644
--- a/packages/framework/tests/Unit/NavGroupItemTest.php
+++ b/packages/framework/tests/Unit/NavGroupItemTest.php
@@ -33,7 +33,7 @@ protected function setUp(): void
 
     public function testCanConstructWithChildren()
     {
-        $children = $this->createNavItems(['foo', 'bar']);
+        $children = $this->createNavItems();
         $item = new NavGroupItem('Test', 500, $children);
 
         $this->assertSame('Test', $item->getLabel());
@@ -46,7 +46,7 @@ public function testCanConstructWithChildren()
 
     public function testCanConstructWithChildrenWithoutRoute()
     {
-        $children = $this->createNavItems(['foo', 'bar']);
+        $children = $this->createNavItems();
         $item = new NavGroupItem('Test', 500, $children);
 
         $this->assertSame('Test', $item->getLabel());
@@ -58,7 +58,7 @@ public function testCanConstructWithChildrenWithoutRoute()
 
     public function testGetChildren()
     {
-        $children = $this->createNavItems(['foo', 'bar']);
+        $children = $this->createNavItems();
 
         $navItem = new NavGroupItem('Page', 500, $children);
         $this->assertSame($children, $navItem->getChildren());
@@ -78,7 +78,7 @@ public function testHasChildren()
 
     public function testHasChildrenWithChildren()
     {
-        $item = new NavGroupItem('Test', 500, $this->createNavItems(['foo', 'bar']));
+        $item = new NavGroupItem('Test', 500, $this->createNavItems());
         $this->assertTrue($item->hasChildren());
     }
 
@@ -146,7 +146,7 @@ public function testAddChildMethodReturnsSelf()
         $this->assertSame($parent, $parent->addChild($child));
     }
 
-    private function createNavItems(array $pages): array
+    private function createNavItems(): array
     {
         $pages = ['foo', 'bar'];
         $navItems = [];

From 847197d1053d74fbba6b6db04778e85e49e19517 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 2 Mar 2024 12:26:07 +0100
Subject: [PATCH 0758/1422] Inline loop

---
 packages/framework/tests/Unit/NavGroupItemTest.php | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/packages/framework/tests/Unit/NavGroupItemTest.php b/packages/framework/tests/Unit/NavGroupItemTest.php
index 4f4c821779b..a055b752e36 100644
--- a/packages/framework/tests/Unit/NavGroupItemTest.php
+++ b/packages/framework/tests/Unit/NavGroupItemTest.php
@@ -148,12 +148,8 @@ public function testAddChildMethodReturnsSelf()
 
     private function createNavItems(): array
     {
-        $pages = ['foo', 'bar'];
-        $navItems = [];
-        foreach ($pages as $page) {
-            $navItems[] = new NavItem(new Route(new InMemoryPage($page)), ucfirst($page), 500);
-        }
-
-        return $navItems;
+        return array_map(function(string $page): NavItem {
+            return new NavItem(new Route(new InMemoryPage($page)), ucfirst($page), 500);
+        }, ['foo', 'bar']);
     }
 }

From e9d46dc391f2b705fb23ba538bf67f526d81ee4d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 2 Mar 2024 12:28:08 +0100
Subject: [PATCH 0759/1422] Remove priority data not needed for test

---
 .../framework/tests/Unit/NavGroupItemTest.php  | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/packages/framework/tests/Unit/NavGroupItemTest.php b/packages/framework/tests/Unit/NavGroupItemTest.php
index a055b752e36..21e43c13414 100644
--- a/packages/framework/tests/Unit/NavGroupItemTest.php
+++ b/packages/framework/tests/Unit/NavGroupItemTest.php
@@ -66,13 +66,13 @@ public function testGetChildren()
 
     public function testGetChildrenWithNoChildren()
     {
-        $navItem = new NavGroupItem('Page', 500);
+        $navItem = new NavGroupItem('Page');
         $this->assertEmpty($navItem->getChildren());
     }
 
     public function testHasChildren()
     {
-        $item = new NavGroupItem('Test', 500);
+        $item = new NavGroupItem('Test');
         $this->assertFalse($item->hasChildren());
     }
 
@@ -84,7 +84,7 @@ public function testHasChildrenWithChildren()
 
     public function testCanAddMultipleItemsToDropdown()
     {
-        $parent = new NavGroupItem('Parent', 500);
+        $parent = new NavGroupItem('Parent');
         $child1 = new NavItem(new Route(new MarkdownPage()), 'Child 1', 500, 'foo');
         $child2 = new NavItem(new Route(new MarkdownPage()), 'Child 2', 500, 'foo');
 
@@ -97,7 +97,7 @@ public function testCanAddMultipleItemsToDropdown()
 
     public function testAddChildrenMethodReturnsSelf()
     {
-        $parent = new NavGroupItem('Parent', 500);
+        $parent = new NavGroupItem('Parent');
         $child1 = new NavItem(new Route(new MarkdownPage()), 'Child 1', 500, 'foo');
         $child2 = new NavItem(new Route(new MarkdownPage()), 'Child 2', 500, 'foo');
 
@@ -106,7 +106,7 @@ public function testAddChildrenMethodReturnsSelf()
 
     public function testAddingAnItemWithAGroupKeyKeepsTheSetGroupKey()
     {
-        $parent = new NavGroupItem('Parent', 500);
+        $parent = new NavGroupItem('Parent');
         $child = new NavItem(new Route(new MarkdownPage()), 'Child', 500, 'bar');
 
         $parent->addChild($child);
@@ -117,7 +117,7 @@ public function testAddingAnItemWithAGroupKeyKeepsTheSetGroupKey()
 
     public function testAddingAnItemWithNoGroupKeyUsesParentIdentifier()
     {
-        $parent = new NavGroupItem('Parent', 500);
+        $parent = new NavGroupItem('Parent');
         $child = new NavItem(new Route(new MarkdownPage()), 'Child', 500);
 
         $parent->addChild($child);
@@ -128,7 +128,7 @@ public function testAddingAnItemWithNoGroupKeyUsesParentIdentifier()
 
     public function testCanAddItemToDropdown()
     {
-        $parent = new NavGroupItem('Parent', 500);
+        $parent = new NavGroupItem('Parent');
         $child = new NavItem(new Route(new MarkdownPage()), 'Child', 500, 'foo');
 
         $this->assertSame([], $parent->getChildren());
@@ -140,7 +140,7 @@ public function testCanAddItemToDropdown()
 
     public function testAddChildMethodReturnsSelf()
     {
-        $parent = new NavGroupItem('Parent', 500);
+        $parent = new NavGroupItem('Parent');
         $child = new NavItem(new Route(new MarkdownPage()), 'Child', 500, 'foo');
 
         $this->assertSame($parent, $parent->addChild($child));
@@ -149,7 +149,7 @@ public function testAddChildMethodReturnsSelf()
     private function createNavItems(): array
     {
         return array_map(function(string $page): NavItem {
-            return new NavItem(new Route(new InMemoryPage($page)), ucfirst($page), 500);
+            return new NavItem(new Route(new InMemoryPage($page)), ucfirst($page));
         }, ['foo', 'bar']);
     }
 }

From f8872ac523c0f3199e4ae2e5508de4c137fa6664 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 2 Mar 2024 12:28:37 +0100
Subject: [PATCH 0760/1422] Normalize test label

---
 packages/framework/tests/Unit/NavGroupItemTest.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/framework/tests/Unit/NavGroupItemTest.php b/packages/framework/tests/Unit/NavGroupItemTest.php
index 21e43c13414..2291344ba6a 100644
--- a/packages/framework/tests/Unit/NavGroupItemTest.php
+++ b/packages/framework/tests/Unit/NavGroupItemTest.php
@@ -60,25 +60,25 @@ public function testGetChildren()
     {
         $children = $this->createNavItems();
 
-        $navItem = new NavGroupItem('Page', 500, $children);
+        $navItem = new NavGroupItem('Parent', 500, $children);
         $this->assertSame($children, $navItem->getChildren());
     }
 
     public function testGetChildrenWithNoChildren()
     {
-        $navItem = new NavGroupItem('Page');
+        $navItem = new NavGroupItem('Parent');
         $this->assertEmpty($navItem->getChildren());
     }
 
     public function testHasChildren()
     {
-        $item = new NavGroupItem('Test');
+        $item = new NavGroupItem('Parent');
         $this->assertFalse($item->hasChildren());
     }
 
     public function testHasChildrenWithChildren()
     {
-        $item = new NavGroupItem('Test', 500, $this->createNavItems());
+        $item = new NavGroupItem('Parent', 500, $this->createNavItems());
         $this->assertTrue($item->hasChildren());
     }
 

From ae4ff97df02ce24c77905b5b21b410347caf238a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 2 Mar 2024 12:29:12 +0100
Subject: [PATCH 0761/1422] Formatting

---
 packages/framework/tests/Unit/NavGroupItemTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/tests/Unit/NavGroupItemTest.php b/packages/framework/tests/Unit/NavGroupItemTest.php
index 2291344ba6a..e76e0390a7a 100644
--- a/packages/framework/tests/Unit/NavGroupItemTest.php
+++ b/packages/framework/tests/Unit/NavGroupItemTest.php
@@ -148,7 +148,7 @@ public function testAddChildMethodReturnsSelf()
 
     private function createNavItems(): array
     {
-        return array_map(function(string $page): NavItem {
+        return array_map(function (string $page): NavItem {
             return new NavItem(new Route(new InMemoryPage($page)), ucfirst($page));
         }, ['foo', 'bar']);
     }

From 09801f8734c5b1ee6a5e81bc0bbff9aaf7e43f21 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 2 Mar 2024 12:31:32 +0100
Subject: [PATCH 0762/1422] Add todo

---
 .../framework/src/Framework/Features/Navigation/NavGroupItem.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
index bd1fb1adef7..74e60331d47 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
@@ -16,6 +16,7 @@ class NavGroupItem extends NavItem
      */
     protected array $children = [];
 
+    // Todo: Consider putting children before priority as it is more commonly used
     public function __construct(string $label, int $priority = NavigationMenu::DEFAULT, array $children = [])
     {
         parent::__construct(null, $label, $priority, static::normalizeGroupKey($label));

From f8697b553ca062187307f899327197234d43f743 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 2 Mar 2024 12:41:59 +0100
Subject: [PATCH 0763/1422] Move group priority logic to new child class

---
 .../Features/Navigation/NavGroupItem.php      | 19 +++++++++++++++++++
 .../Framework/Features/Navigation/NavItem.php |  9 ---------
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
index 74e60331d47..14ebb714881 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
@@ -4,6 +4,11 @@
 
 namespace Hyde\Framework\Features\Navigation;
 
+use Hyde\Pages\DocumentationPage;
+
+use function min;
+use function collect;
+
 /**
  * @todo Consider extracting trait for shared code with navigation menu class
  */
@@ -71,4 +76,18 @@ public function addChildren(array $items): static
 
         return $this;
     }
+
+    /**
+     * Get the priority to determine the order of the navigation item.
+     *
+     * For sidebar groups, this is the priority of the lowest priority child, unless the dropdown has a lower priority.
+     */
+    public function getPriority(): int
+    {
+        if ($this->hasChildren() && $this->children[0]->getRoute()->getPageClass() === DocumentationPage::class) {
+            return min($this->priority, collect($this->getChildren())->min(fn (NavItem $child): int => $child->getPriority()));
+        }
+
+        return parent::getPriority();
+    }
 }
diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 4d7ce432adf..ed12bd60ab6 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -4,7 +4,6 @@
 
 namespace Hyde\Framework\Features\Navigation;
 
-use Hyde\Pages\DocumentationPage;
 use JetBrains\PhpStorm\Deprecated;
 use Hyde\Foundation\Facades\Routes;
 use Hyde\Hyde;
@@ -13,8 +12,6 @@
 use Stringable;
 use Hyde\Support\Models\ExternalRoute;
 
-use function min;
-use function collect;
 use function is_string;
 
 /**
@@ -139,15 +136,9 @@ public function getLabel(): string
 
     /**
      * Get the priority to determine the order of the navigation item.
-     *
-     * For sidebar groups, this is the priority of the lowest priority child, unless the dropdown has a lower priority.
      */
     public function getPriority(): int
     {
-        if ($this->hasChildren() && $this->children[0]->getRoute()->getPageClass() === DocumentationPage::class) {
-            return min($this->priority, collect($this->getChildren())->min(fn (NavItem $child): int => $child->getPriority()));
-        }
-
         return $this->priority;
     }
 

From 4e0c4ad500131b8120d601455a30c9889def57fc Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 2 Mar 2024 12:47:10 +0100
Subject: [PATCH 0764/1422] Add clarifying parentheses

---
 .../src/Framework/Features/Navigation/NavGroupItem.php          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
index 14ebb714881..b10aa1ddf8d 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
@@ -84,7 +84,7 @@ public function addChildren(array $items): static
      */
     public function getPriority(): int
     {
-        if ($this->hasChildren() && $this->children[0]->getRoute()->getPageClass() === DocumentationPage::class) {
+        if ($this->hasChildren() && ($this->children[0]->getRoute()->getPageClass() === DocumentationPage::class)) {
             return min($this->priority, collect($this->getChildren())->min(fn (NavItem $child): int => $child->getPriority()));
         }
 

From be87703d51b8b9ce1f5eb7ce2949dab04f50efd0 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 2 Mar 2024 12:49:56 +0100
Subject: [PATCH 0765/1422] Improve priority state testing

---
 .../framework/tests/Unit/NavGroupItemTest.php | 29 +++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/packages/framework/tests/Unit/NavGroupItemTest.php b/packages/framework/tests/Unit/NavGroupItemTest.php
index e76e0390a7a..8dbb849bb36 100644
--- a/packages/framework/tests/Unit/NavGroupItemTest.php
+++ b/packages/framework/tests/Unit/NavGroupItemTest.php
@@ -9,6 +9,7 @@
 use Hyde\Testing\UnitTestCase;
 use Hyde\Support\Models\Route;
 use Hyde\Support\Facades\Render;
+use Hyde\Pages\DocumentationPage;
 use Hyde\Support\Models\RenderData;
 use Hyde\Framework\Features\Navigation\NavItem;
 use Hyde\Framework\Features\Navigation\NavGroupItem;
@@ -146,6 +147,34 @@ public function testAddChildMethodReturnsSelf()
         $this->assertSame($parent, $parent->addChild($child));
     }
 
+    public function testGetPriorityUsesDefaultPriority()
+    {
+        $parent = new NavGroupItem('Parent');
+        $this->assertSame(500, $parent->getPriority());
+    }
+
+    public function testGetPriorityWithNoChildrenUsesGroupPriority()
+    {
+        $parent = new NavGroupItem('Parent');
+        $this->assertSame(500, $parent->getPriority());
+    }
+
+    public function testGetPriorityWithChildrenUsesGroupPriority()
+    {
+        $parent = new NavGroupItem('Parent');
+        $child = new NavItem(new Route(new MarkdownPage()), 'Child', 400, 'foo');
+        $parent->addChild($child);
+        $this->assertSame(500, $parent->getPriority());
+    }
+
+    public function testGetPriorityWithDocumentationPageChildrenUsesLowestPriority()
+    {
+        $parent = new NavGroupItem('Parent');
+        $child = new NavItem(new Route(new DocumentationPage()), 'Foo', 400);
+        $parent->addChild($child);
+        $this->assertSame(400, $parent->getPriority());
+    }
+
     private function createNavItems(): array
     {
         return array_map(function (string $page): NavItem {

From 59974c62107a644ed1d7da798cf74ea2c3007976 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 2 Mar 2024 12:55:36 +0100
Subject: [PATCH 0766/1422] Test get priority handles mixed child types

---
 packages/framework/tests/Unit/NavGroupItemTest.php | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/packages/framework/tests/Unit/NavGroupItemTest.php b/packages/framework/tests/Unit/NavGroupItemTest.php
index 8dbb849bb36..8862f614600 100644
--- a/packages/framework/tests/Unit/NavGroupItemTest.php
+++ b/packages/framework/tests/Unit/NavGroupItemTest.php
@@ -11,6 +11,7 @@
 use Hyde\Support\Facades\Render;
 use Hyde\Pages\DocumentationPage;
 use Hyde\Support\Models\RenderData;
+use Hyde\Foundation\HydeCoreExtension;
 use Hyde\Framework\Features\Navigation\NavItem;
 use Hyde\Framework\Features\Navigation\NavGroupItem;
 
@@ -175,6 +176,19 @@ public function testGetPriorityWithDocumentationPageChildrenUsesLowestPriority()
         $this->assertSame(400, $parent->getPriority());
     }
 
+    public function testGetPriorityHandlesMixedChildTypes()
+    {
+        $parent = new NavGroupItem('Parent');
+
+        $types = HydeCoreExtension::getPageClasses();
+        foreach ($types as $type) {
+            $child = new NavItem(new Route(new $type()), 'Child', 100);
+            $parent->addChild($child);
+        }
+
+        $this->assertSame(500, $parent->getPriority());
+    }
+
     private function createNavItems(): array
     {
         return array_map(function (string $page): NavItem {

From 765e57cbb0d5ec84020e0c2348c40002f490048b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 2 Mar 2024 13:40:57 +0100
Subject: [PATCH 0767/1422] Add todo

---
 .../framework/src/Framework/Features/Navigation/NavGroupItem.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
index b10aa1ddf8d..d1a55509d43 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
@@ -22,6 +22,7 @@ class NavGroupItem extends NavItem
     protected array $children = [];
 
     // Todo: Consider putting children before priority as it is more commonly used
+    // Todo use last priority as default for groups
     public function __construct(string $label, int $priority = NavigationMenu::DEFAULT, array $children = [])
     {
         parent::__construct(null, $label, $priority, static::normalizeGroupKey($label));

From 556eb76848ef6a25ad25a6ed3be1c9a90b1635c8 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 2 Mar 2024 13:41:07 +0100
Subject: [PATCH 0768/1422] Add todo

---
 .../src/Framework/Features/Navigation/NavGroupItem.php          | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
index d1a55509d43..8e14a6c02a5 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
@@ -82,6 +82,8 @@ public function addChildren(array $items): static
      * Get the priority to determine the order of the navigation item.
      *
      * For sidebar groups, this is the priority of the lowest priority child, unless the dropdown has a lower priority.
+     *
+     * @todo Ensure support for external URLs
      */
     public function getPriority(): int
     {

From 9e83cdc70e7ee42bdbb6bab904fd637595f43b7b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 2 Mar 2024 13:49:45 +0100
Subject: [PATCH 0769/1422] Extract helper method

---
 .../src/Framework/Features/Navigation/NavGroupItem.php     | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
index 8e14a6c02a5..70e8c9ab960 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
@@ -87,10 +87,15 @@ public function addChildren(array $items): static
      */
     public function getPriority(): int
     {
-        if ($this->hasChildren() && ($this->children[0]->getRoute()->getPageClass() === DocumentationPage::class)) {
+        if ($this->hasChildren() && $this->containsOnlyDocumentationPages()) {
             return min($this->priority, collect($this->getChildren())->min(fn (NavItem $child): int => $child->getPriority()));
         }
 
         return parent::getPriority();
     }
+
+    protected function containsOnlyDocumentationPages(): bool
+    {
+        return ($this->children[0]->getRoute()->getPageClass() === DocumentationPage::class);
+    }
 }

From c6860bd1cbf9644db7fbcb8213458c066317a292 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 2 Mar 2024 13:56:15 +0100
Subject: [PATCH 0770/1422] Add more accurate state logic

For example, if it's a main menu group we don't want to change positioning if the docs index is linked. We don't have information here about which menu type it is, so this is a fair compromise.
---
 .../src/Framework/Features/Navigation/NavGroupItem.php          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
index 70e8c9ab960..29942a09e2a 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
@@ -96,6 +96,6 @@ public function getPriority(): int
 
     protected function containsOnlyDocumentationPages(): bool
     {
-        return ($this->children[0]->getRoute()->getPageClass() === DocumentationPage::class);
+        return collect($this->getChildren())->every(fn (NavItem $child): bool => $child->getRoute()->getPageClass() === DocumentationPage::class);
     }
 }

From a1e41fc9aebb6bb602d8a3f912c2d1adc44a2c6b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 2 Mar 2024 13:58:06 +0100
Subject: [PATCH 0771/1422] Convert the arrow function to a traditional closure

---
 .../src/Framework/Features/Navigation/NavGroupItem.php        | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
index 29942a09e2a..b39e13d4e28 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
@@ -96,6 +96,8 @@ public function getPriority(): int
 
     protected function containsOnlyDocumentationPages(): bool
     {
-        return collect($this->getChildren())->every(fn (NavItem $child): bool => $child->getRoute()->getPageClass() === DocumentationPage::class);
+        return collect($this->getChildren())->every(function (NavItem $child): bool {
+            return $child->getRoute()->getPageClass() === DocumentationPage::class;
+        });
     }
 }

From 145fa3f086cf57bedb777954157ffb9180eaed4e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 2 Mar 2024 13:58:44 +0100
Subject: [PATCH 0772/1422] Return false to ensure support for external URLs

---
 .../src/Framework/Features/Navigation/NavGroupItem.php |  7 +++++--
 packages/framework/tests/Unit/NavGroupItemTest.php     | 10 ++++++++++
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
index b39e13d4e28..791d1069829 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
@@ -5,6 +5,7 @@
 namespace Hyde\Framework\Features\Navigation;
 
 use Hyde\Pages\DocumentationPage;
+use Hyde\Support\Models\ExternalRoute;
 
 use function min;
 use function collect;
@@ -82,8 +83,6 @@ public function addChildren(array $items): static
      * Get the priority to determine the order of the navigation item.
      *
      * For sidebar groups, this is the priority of the lowest priority child, unless the dropdown has a lower priority.
-     *
-     * @todo Ensure support for external URLs
      */
     public function getPriority(): int
     {
@@ -97,6 +96,10 @@ public function getPriority(): int
     protected function containsOnlyDocumentationPages(): bool
     {
         return collect($this->getChildren())->every(function (NavItem $child): bool {
+            if ($child->getRoute() instanceof ExternalRoute) {
+                return false;
+            }
+
             return $child->getRoute()->getPageClass() === DocumentationPage::class;
         });
     }
diff --git a/packages/framework/tests/Unit/NavGroupItemTest.php b/packages/framework/tests/Unit/NavGroupItemTest.php
index 8862f614600..57aff482b10 100644
--- a/packages/framework/tests/Unit/NavGroupItemTest.php
+++ b/packages/framework/tests/Unit/NavGroupItemTest.php
@@ -189,6 +189,16 @@ public function testGetPriorityHandlesMixedChildTypes()
         $this->assertSame(500, $parent->getPriority());
     }
 
+    public function testGetPriorityHandlesExternalUrlChild()
+    {
+        $parent = new NavGroupItem('Parent');
+
+        $child = new NavItem('foo', 'Child', 400);
+        $parent->addChild($child);
+
+        $this->assertSame(500, $parent->getPriority());
+    }
+
     private function createNavItems(): array
     {
         return array_map(function (string $page): NavItem {

From ecd86765787c25f2db2fc941701278d015511cfe Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 2 Mar 2024 14:00:50 +0100
Subject: [PATCH 0773/1422] Use instanceof check

Mainly for style
---
 .../src/Framework/Features/Navigation/NavGroupItem.php          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
index 791d1069829..b755d5d525e 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
@@ -100,7 +100,7 @@ protected function containsOnlyDocumentationPages(): bool
                 return false;
             }
 
-            return $child->getRoute()->getPageClass() === DocumentationPage::class;
+            return $child->getRoute()->getPage() instanceof DocumentationPage;
         });
     }
 }

From 8a3d9baae1e20ac599ce710a03a72d49811f21e5 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 2 Mar 2024 14:02:27 +0100
Subject: [PATCH 0774/1422] Simplify conditional returns

---
 .../src/Framework/Features/Navigation/NavGroupItem.php      | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
index b755d5d525e..e2374f6e5ef 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
@@ -96,11 +96,7 @@ public function getPriority(): int
     protected function containsOnlyDocumentationPages(): bool
     {
         return collect($this->getChildren())->every(function (NavItem $child): bool {
-            if ($child->getRoute() instanceof ExternalRoute) {
-                return false;
-            }
-
-            return $child->getRoute()->getPage() instanceof DocumentationPage;
+            return ! $child->getRoute() instanceof ExternalRoute && $child->getRoute()->getPage() instanceof DocumentationPage;
         });
     }
 }

From 18f30081b47082788330ea96ad41f83fd6bbcf19 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 2 Mar 2024 14:03:26 +0100
Subject: [PATCH 0775/1422] Add clarifying parentheses

---
 .../src/Framework/Features/Navigation/NavGroupItem.php          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
index e2374f6e5ef..a40f763f419 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
@@ -96,7 +96,7 @@ public function getPriority(): int
     protected function containsOnlyDocumentationPages(): bool
     {
         return collect($this->getChildren())->every(function (NavItem $child): bool {
-            return ! $child->getRoute() instanceof ExternalRoute && $child->getRoute()->getPage() instanceof DocumentationPage;
+            return (! $child->getRoute() instanceof ExternalRoute) && $child->getRoute()->getPage() instanceof DocumentationPage;
         });
     }
 }

From de7710fd00f1c84b55f26240ec1ce0c26b6d5411 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 2 Mar 2024 14:05:34 +0100
Subject: [PATCH 0776/1422] Preevaluate constant loop

---
 packages/framework/tests/Unit/NavGroupItemTest.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/framework/tests/Unit/NavGroupItemTest.php b/packages/framework/tests/Unit/NavGroupItemTest.php
index 57aff482b10..d5a3e055b52 100644
--- a/packages/framework/tests/Unit/NavGroupItemTest.php
+++ b/packages/framework/tests/Unit/NavGroupItemTest.php
@@ -201,8 +201,9 @@ public function testGetPriorityHandlesExternalUrlChild()
 
     private function createNavItems(): array
     {
-        return array_map(function (string $page): NavItem {
-            return new NavItem(new Route(new InMemoryPage($page)), ucfirst($page));
-        }, ['foo', 'bar']);
+        return [
+            new NavItem(new Route(new InMemoryPage('foo')), ucfirst('foo')),
+            new NavItem(new Route(new InMemoryPage('bar')), ucfirst('bar')),
+        ];
     }
 }

From aeb7f0553b09d167ecb8e770ef8084afe8c06b22 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 2 Mar 2024 14:05:50 +0100
Subject: [PATCH 0777/1422] Inline variable

---
 packages/framework/tests/Unit/NavGroupItemTest.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/framework/tests/Unit/NavGroupItemTest.php b/packages/framework/tests/Unit/NavGroupItemTest.php
index d5a3e055b52..4e56ec5cd0a 100644
--- a/packages/framework/tests/Unit/NavGroupItemTest.php
+++ b/packages/framework/tests/Unit/NavGroupItemTest.php
@@ -180,8 +180,7 @@ public function testGetPriorityHandlesMixedChildTypes()
     {
         $parent = new NavGroupItem('Parent');
 
-        $types = HydeCoreExtension::getPageClasses();
-        foreach ($types as $type) {
+        foreach (HydeCoreExtension::getPageClasses() as $type) {
             $child = new NavItem(new Route(new $type()), 'Child', 100);
             $parent->addChild($child);
         }

From db5d53478192ffdde48d8a38b5bee03ffeeb0be2 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 2 Mar 2024 14:07:26 +0100
Subject: [PATCH 0778/1422] Use "last" priority as default value to match
 generator

It's more common to have groups last, so we use that for the default value
---
 .../src/Framework/Features/Navigation/NavGroupItem.php |  3 +--
 packages/framework/tests/Unit/NavGroupItemTest.php     | 10 +++++-----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
index a40f763f419..83472819f87 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
@@ -23,8 +23,7 @@ class NavGroupItem extends NavItem
     protected array $children = [];
 
     // Todo: Consider putting children before priority as it is more commonly used
-    // Todo use last priority as default for groups
-    public function __construct(string $label, int $priority = NavigationMenu::DEFAULT, array $children = [])
+    public function __construct(string $label, int $priority = NavigationMenu::LAST, array $children = [])
     {
         parent::__construct(null, $label, $priority, static::normalizeGroupKey($label));
         $this->addChildren($children);
diff --git a/packages/framework/tests/Unit/NavGroupItemTest.php b/packages/framework/tests/Unit/NavGroupItemTest.php
index 4e56ec5cd0a..1266152633e 100644
--- a/packages/framework/tests/Unit/NavGroupItemTest.php
+++ b/packages/framework/tests/Unit/NavGroupItemTest.php
@@ -151,13 +151,13 @@ public function testAddChildMethodReturnsSelf()
     public function testGetPriorityUsesDefaultPriority()
     {
         $parent = new NavGroupItem('Parent');
-        $this->assertSame(500, $parent->getPriority());
+        $this->assertSame(999, $parent->getPriority());
     }
 
     public function testGetPriorityWithNoChildrenUsesGroupPriority()
     {
         $parent = new NavGroupItem('Parent');
-        $this->assertSame(500, $parent->getPriority());
+        $this->assertSame(999, $parent->getPriority());
     }
 
     public function testGetPriorityWithChildrenUsesGroupPriority()
@@ -165,7 +165,7 @@ public function testGetPriorityWithChildrenUsesGroupPriority()
         $parent = new NavGroupItem('Parent');
         $child = new NavItem(new Route(new MarkdownPage()), 'Child', 400, 'foo');
         $parent->addChild($child);
-        $this->assertSame(500, $parent->getPriority());
+        $this->assertSame(999, $parent->getPriority());
     }
 
     public function testGetPriorityWithDocumentationPageChildrenUsesLowestPriority()
@@ -185,7 +185,7 @@ public function testGetPriorityHandlesMixedChildTypes()
             $parent->addChild($child);
         }
 
-        $this->assertSame(500, $parent->getPriority());
+        $this->assertSame(999, $parent->getPriority());
     }
 
     public function testGetPriorityHandlesExternalUrlChild()
@@ -195,7 +195,7 @@ public function testGetPriorityHandlesExternalUrlChild()
         $child = new NavItem('foo', 'Child', 400);
         $parent->addChild($child);
 
-        $this->assertSame(500, $parent->getPriority());
+        $this->assertSame(999, $parent->getPriority());
     }
 
     private function createNavItems(): array

From fb2309f65ec4a05a0887a250f7c5dc57eaf9e2db Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 2 Mar 2024 14:11:47 +0100
Subject: [PATCH 0779/1422] Put children before priority as it is more commonly
 used

---
 .../src/Framework/Features/Navigation/NavGroupItem.php    | 3 +--
 .../src/Framework/Features/Navigation/NavItem.php         | 2 +-
 packages/framework/tests/Unit/NavGroupItemTest.php        | 8 ++++----
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
index 83472819f87..c73a67d8900 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
@@ -22,8 +22,7 @@ class NavGroupItem extends NavItem
      */
     protected array $children = [];
 
-    // Todo: Consider putting children before priority as it is more commonly used
-    public function __construct(string $label, int $priority = NavigationMenu::LAST, array $children = [])
+    public function __construct(string $label, array $children = [], int $priority = NavigationMenu::LAST)
     {
         parent::__construct(null, $label, $priority, static::normalizeGroupKey($label));
         $this->addChildren($children);
diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index ed12bd60ab6..8f8aec95e0c 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -99,7 +99,7 @@ public static function forLink(string $href, string $label, int $priority = Navi
      */
     public static function forGroup(string $label, array $items, int $priority = NavigationMenu::LAST): static
     {
-        return new NavGroupItem($label, $priority, $items);
+        return new NavGroupItem($label, $items, $priority);
     }
 
     /**
diff --git a/packages/framework/tests/Unit/NavGroupItemTest.php b/packages/framework/tests/Unit/NavGroupItemTest.php
index 1266152633e..5aa7161b4ac 100644
--- a/packages/framework/tests/Unit/NavGroupItemTest.php
+++ b/packages/framework/tests/Unit/NavGroupItemTest.php
@@ -36,7 +36,7 @@ protected function setUp(): void
     public function testCanConstructWithChildren()
     {
         $children = $this->createNavItems();
-        $item = new NavGroupItem('Test', 500, $children);
+        $item = new NavGroupItem('Test', $children, 500);
 
         $this->assertSame('Test', $item->getLabel());
         $this->assertNull($item->getRoute());
@@ -49,7 +49,7 @@ public function testCanConstructWithChildren()
     public function testCanConstructWithChildrenWithoutRoute()
     {
         $children = $this->createNavItems();
-        $item = new NavGroupItem('Test', 500, $children);
+        $item = new NavGroupItem('Test', $children, 500);
 
         $this->assertSame('Test', $item->getLabel());
         $this->assertNull($item->getRoute());
@@ -62,7 +62,7 @@ public function testGetChildren()
     {
         $children = $this->createNavItems();
 
-        $navItem = new NavGroupItem('Parent', 500, $children);
+        $navItem = new NavGroupItem('Parent', $children, 500);
         $this->assertSame($children, $navItem->getChildren());
     }
 
@@ -80,7 +80,7 @@ public function testHasChildren()
 
     public function testHasChildrenWithChildren()
     {
-        $item = new NavGroupItem('Parent', 500, $this->createNavItems());
+        $item = new NavGroupItem('Parent', $this->createNavItems(), 500);
         $this->assertTrue($item->hasChildren());
     }
 

From 2d03ee3d03f03323d5eb171be6d42a4379b776d8 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 2 Mar 2024 14:19:06 +0100
Subject: [PATCH 0780/1422] Add todo

---
 .../framework/src/Framework/Features/Navigation/NavGroupItem.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
index c73a67d8900..1f009847e12 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
@@ -12,6 +12,7 @@
 
 /**
  * @todo Consider extracting trait for shared code with navigation menu class
+ * @todo Consider inheritance issues with static constructors from NavItem class
  */
 class NavGroupItem extends NavItem
 {

From efda56f625fa173a1ef1e10bf19de4b5c0d2ec7f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 2 Mar 2024 14:22:12 +0100
Subject: [PATCH 0781/1422] Replace default value with named argument

---
 packages/framework/tests/Unit/NavGroupItemTest.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/framework/tests/Unit/NavGroupItemTest.php b/packages/framework/tests/Unit/NavGroupItemTest.php
index 5aa7161b4ac..21976d56dc1 100644
--- a/packages/framework/tests/Unit/NavGroupItemTest.php
+++ b/packages/framework/tests/Unit/NavGroupItemTest.php
@@ -87,8 +87,8 @@ public function testHasChildrenWithChildren()
     public function testCanAddMultipleItemsToDropdown()
     {
         $parent = new NavGroupItem('Parent');
-        $child1 = new NavItem(new Route(new MarkdownPage()), 'Child 1', 500, 'foo');
-        $child2 = new NavItem(new Route(new MarkdownPage()), 'Child 2', 500, 'foo');
+        $child1 = new NavItem(new Route(new MarkdownPage()), 'Child 1', group: 'foo');
+        $child2 = new NavItem(new Route(new MarkdownPage()), 'Child 2', group: 'foo');
 
         $this->assertSame([], $parent->getChildren());
 
@@ -100,8 +100,8 @@ public function testCanAddMultipleItemsToDropdown()
     public function testAddChildrenMethodReturnsSelf()
     {
         $parent = new NavGroupItem('Parent');
-        $child1 = new NavItem(new Route(new MarkdownPage()), 'Child 1', 500, 'foo');
-        $child2 = new NavItem(new Route(new MarkdownPage()), 'Child 2', 500, 'foo');
+        $child1 = new NavItem(new Route(new MarkdownPage()), 'Child 1', group: 'foo');
+        $child2 = new NavItem(new Route(new MarkdownPage()), 'Child 2', group: 'foo');
 
         $this->assertSame($parent, $parent->addChildren([$child1, $child2]));
     }
@@ -109,7 +109,7 @@ public function testAddChildrenMethodReturnsSelf()
     public function testAddingAnItemWithAGroupKeyKeepsTheSetGroupKey()
     {
         $parent = new NavGroupItem('Parent');
-        $child = new NavItem(new Route(new MarkdownPage()), 'Child', 500, 'bar');
+        $child = new NavItem(new Route(new MarkdownPage()), 'Child', group: 'bar');
 
         $parent->addChild($child);
 
@@ -131,7 +131,7 @@ public function testAddingAnItemWithNoGroupKeyUsesParentIdentifier()
     public function testCanAddItemToDropdown()
     {
         $parent = new NavGroupItem('Parent');
-        $child = new NavItem(new Route(new MarkdownPage()), 'Child', 500, 'foo');
+        $child = new NavItem(new Route(new MarkdownPage()), 'Child', group: 'foo');
 
         $this->assertSame([], $parent->getChildren());
 
@@ -143,7 +143,7 @@ public function testCanAddItemToDropdown()
     public function testAddChildMethodReturnsSelf()
     {
         $parent = new NavGroupItem('Parent');
-        $child = new NavItem(new Route(new MarkdownPage()), 'Child', 500, 'foo');
+        $child = new NavItem(new Route(new MarkdownPage()), 'Child', group: 'foo');
 
         $this->assertSame($parent, $parent->addChild($child));
     }

From 2d98fb08a7ba758e79e48933cea030647034c2ba Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 2 Mar 2024 14:22:22 +0100
Subject: [PATCH 0782/1422] Remove test data not affecting test

---
 packages/framework/tests/Unit/NavGroupItemTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/tests/Unit/NavGroupItemTest.php b/packages/framework/tests/Unit/NavGroupItemTest.php
index 21976d56dc1..ed7cd253c60 100644
--- a/packages/framework/tests/Unit/NavGroupItemTest.php
+++ b/packages/framework/tests/Unit/NavGroupItemTest.php
@@ -120,7 +120,7 @@ public function testAddingAnItemWithAGroupKeyKeepsTheSetGroupKey()
     public function testAddingAnItemWithNoGroupKeyUsesParentIdentifier()
     {
         $parent = new NavGroupItem('Parent');
-        $child = new NavItem(new Route(new MarkdownPage()), 'Child', 500);
+        $child = new NavItem(new Route(new MarkdownPage()), 'Child');
 
         $parent->addChild($child);
 

From fc74bba18822e41daa72bc15743f4fcc0fcf0890 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 2 Mar 2024 14:23:30 +0100
Subject: [PATCH 0783/1422] Inline local variables

---
 packages/framework/tests/Unit/NavGroupItemTest.php | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/packages/framework/tests/Unit/NavGroupItemTest.php b/packages/framework/tests/Unit/NavGroupItemTest.php
index ed7cd253c60..7f7e0de864b 100644
--- a/packages/framework/tests/Unit/NavGroupItemTest.php
+++ b/packages/framework/tests/Unit/NavGroupItemTest.php
@@ -68,14 +68,12 @@ public function testGetChildren()
 
     public function testGetChildrenWithNoChildren()
     {
-        $navItem = new NavGroupItem('Parent');
-        $this->assertEmpty($navItem->getChildren());
+        $this->assertEmpty((new NavGroupItem('Parent'))->getChildren());
     }
 
     public function testHasChildren()
     {
-        $item = new NavGroupItem('Parent');
-        $this->assertFalse($item->hasChildren());
+        $this->assertFalse((new NavGroupItem('Parent'))->hasChildren());
     }
 
     public function testHasChildrenWithChildren()
@@ -150,14 +148,12 @@ public function testAddChildMethodReturnsSelf()
 
     public function testGetPriorityUsesDefaultPriority()
     {
-        $parent = new NavGroupItem('Parent');
-        $this->assertSame(999, $parent->getPriority());
+        $this->assertSame(999, (new NavGroupItem('Parent'))->getPriority());
     }
 
     public function testGetPriorityWithNoChildrenUsesGroupPriority()
     {
-        $parent = new NavGroupItem('Parent');
-        $this->assertSame(999, $parent->getPriority());
+        $this->assertSame(999, (new NavGroupItem('Parent'))->getPriority());
     }
 
     public function testGetPriorityWithChildrenUsesGroupPriority()

From 7cc42d915df91a4443e4390e511cfc0687b926e2 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 2 Mar 2024 14:23:58 +0100
Subject: [PATCH 0784/1422] Remove unnecessary setup method

---
 packages/framework/tests/Unit/NavGroupItemTest.php | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/packages/framework/tests/Unit/NavGroupItemTest.php b/packages/framework/tests/Unit/NavGroupItemTest.php
index 7f7e0de864b..619dca2c304 100644
--- a/packages/framework/tests/Unit/NavGroupItemTest.php
+++ b/packages/framework/tests/Unit/NavGroupItemTest.php
@@ -8,9 +8,7 @@
 use Hyde\Pages\InMemoryPage;
 use Hyde\Testing\UnitTestCase;
 use Hyde\Support\Models\Route;
-use Hyde\Support\Facades\Render;
 use Hyde\Pages\DocumentationPage;
-use Hyde\Support\Models\RenderData;
 use Hyde\Foundation\HydeCoreExtension;
 use Hyde\Framework\Features\Navigation\NavItem;
 use Hyde\Framework\Features\Navigation\NavGroupItem;
@@ -28,11 +26,6 @@ public static function setUpBeforeClass(): void
         self::mockConfig();
     }
 
-    protected function setUp(): void
-    {
-        Render::swap(new RenderData());
-    }
-
     public function testCanConstructWithChildren()
     {
         $children = $this->createNavItems();

From d14f273487815231a074419913ad999a052bc300 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 2 Mar 2024 14:24:14 +0100
Subject: [PATCH 0785/1422] Remove unnecessary state modifier

---
 packages/framework/tests/Unit/NavGroupItemTest.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/framework/tests/Unit/NavGroupItemTest.php b/packages/framework/tests/Unit/NavGroupItemTest.php
index 619dca2c304..aa3f1356478 100644
--- a/packages/framework/tests/Unit/NavGroupItemTest.php
+++ b/packages/framework/tests/Unit/NavGroupItemTest.php
@@ -20,8 +20,6 @@ class NavGroupItemTest extends UnitTestCase
 {
     public static function setUpBeforeClass(): void
     {
-        self::$hasSetUpKernel = false;
-
         self::needsKernel();
         self::mockConfig();
     }

From 7ff0a934452b990a511087593b16f992e19cc21c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 2 Mar 2024 14:28:28 +0100
Subject: [PATCH 0786/1422] Split out general assertions

---
 .../framework/tests/Unit/NavGroupItemTest.php  | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/packages/framework/tests/Unit/NavGroupItemTest.php b/packages/framework/tests/Unit/NavGroupItemTest.php
index aa3f1356478..7d3ad04ad11 100644
--- a/packages/framework/tests/Unit/NavGroupItemTest.php
+++ b/packages/framework/tests/Unit/NavGroupItemTest.php
@@ -24,14 +24,24 @@ public static function setUpBeforeClass(): void
         self::mockConfig();
     }
 
-    public function testCanConstructWithChildren()
+    public function testCanConstruct()
     {
-        $children = $this->createNavItems();
-        $item = new NavGroupItem('Test', $children, 500);
+        $item = new NavGroupItem('Test');
 
         $this->assertSame('Test', $item->getLabel());
         $this->assertNull($item->getRoute());
-        $this->assertSame(500, $item->getPriority());
+        $this->assertSame(999, $item->getPriority());
+    }
+
+    public function testCanConstructWithPriority()
+    {
+        $this->assertSame(500, (new NavGroupItem('Test', priority: 500))->getPriority());
+    }
+
+    public function testCanConstructWithChildren()
+    {
+        $children = $this->createNavItems();
+        $item = new NavGroupItem('Test', $children);
 
         $this->assertCount(2, $item->getChildren());
         $this->assertSame($children, $item->getChildren());

From 0d791bf6a4d3c6a7a139848ee75a8d1e1e82437f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 2 Mar 2024 14:28:58 +0100
Subject: [PATCH 0787/1422] Remove test data not affecting test

---
 packages/framework/tests/Unit/NavGroupItemTest.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/framework/tests/Unit/NavGroupItemTest.php b/packages/framework/tests/Unit/NavGroupItemTest.php
index 7d3ad04ad11..ec8d878c965 100644
--- a/packages/framework/tests/Unit/NavGroupItemTest.php
+++ b/packages/framework/tests/Unit/NavGroupItemTest.php
@@ -50,7 +50,7 @@ public function testCanConstructWithChildren()
     public function testCanConstructWithChildrenWithoutRoute()
     {
         $children = $this->createNavItems();
-        $item = new NavGroupItem('Test', $children, 500);
+        $item = new NavGroupItem('Test', $children);
 
         $this->assertSame('Test', $item->getLabel());
         $this->assertNull($item->getRoute());
@@ -63,7 +63,7 @@ public function testGetChildren()
     {
         $children = $this->createNavItems();
 
-        $navItem = new NavGroupItem('Parent', $children, 500);
+        $navItem = new NavGroupItem('Parent', $children);
         $this->assertSame($children, $navItem->getChildren());
     }
 
@@ -79,7 +79,7 @@ public function testHasChildren()
 
     public function testHasChildrenWithChildren()
     {
-        $item = new NavGroupItem('Parent', $this->createNavItems(), 500);
+        $item = new NavGroupItem('Parent', $this->createNavItems());
         $this->assertTrue($item->hasChildren());
     }
 

From 84922f6af080e6ca3874baef302d6c8a14ded2c9 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 2 Mar 2024 14:44:44 +0100
Subject: [PATCH 0788/1422] Extract and scope down assertions for more granular
 tests

---
 .../framework/tests/Unit/NavGroupItemTest.php | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/packages/framework/tests/Unit/NavGroupItemTest.php b/packages/framework/tests/Unit/NavGroupItemTest.php
index ec8d878c965..eecbf3fee0e 100644
--- a/packages/framework/tests/Unit/NavGroupItemTest.php
+++ b/packages/framework/tests/Unit/NavGroupItemTest.php
@@ -26,11 +26,7 @@ public static function setUpBeforeClass(): void
 
     public function testCanConstruct()
     {
-        $item = new NavGroupItem('Test');
-
-        $this->assertSame('Test', $item->getLabel());
-        $this->assertNull($item->getRoute());
-        $this->assertSame(999, $item->getPriority());
+        $this->assertSame('Test', (new NavGroupItem('Test'))->getLabel());
     }
 
     public function testCanConstructWithPriority()
@@ -38,6 +34,16 @@ public function testCanConstructWithPriority()
         $this->assertSame(500, (new NavGroupItem('Test', priority: 500))->getPriority());
     }
 
+    public function testDefaultPriorityValueIsLast()
+    {
+        $this->assertSame(999, (new NavGroupItem('Test'))->getPriority());
+    }
+
+    public function testDestinationIsAlwaysNull()
+    {
+        $this->assertNull((new NavGroupItem('Test'))->getRoute());
+    }
+
     public function testCanConstructWithChildren()
     {
         $children = $this->createNavItems();
@@ -52,9 +58,6 @@ public function testCanConstructWithChildrenWithoutRoute()
         $children = $this->createNavItems();
         $item = new NavGroupItem('Test', $children);
 
-        $this->assertSame('Test', $item->getLabel());
-        $this->assertNull($item->getRoute());
-
         $this->assertCount(2, $item->getChildren());
         $this->assertSame($children, $item->getChildren());
     }

From f6f32e426a9d4eb67a09d40b11acb0397df8eb65 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 2 Mar 2024 14:44:55 +0100
Subject: [PATCH 0789/1422] Inline variable

---
 packages/framework/tests/Unit/NavGroupItemTest.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/framework/tests/Unit/NavGroupItemTest.php b/packages/framework/tests/Unit/NavGroupItemTest.php
index eecbf3fee0e..3aa944e0fd4 100644
--- a/packages/framework/tests/Unit/NavGroupItemTest.php
+++ b/packages/framework/tests/Unit/NavGroupItemTest.php
@@ -82,8 +82,7 @@ public function testHasChildren()
 
     public function testHasChildrenWithChildren()
     {
-        $item = new NavGroupItem('Parent', $this->createNavItems());
-        $this->assertTrue($item->hasChildren());
+        $this->assertTrue((new NavGroupItem('Parent', $this->createNavItems()))->hasChildren());
     }
 
     public function testCanAddMultipleItemsToDropdown()

From 7fa70c2614b10f2ae52525b20f3ae535d5b229f4 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 2 Mar 2024 14:46:10 +0100
Subject: [PATCH 0790/1422] Normalize test data strings

---
 .../framework/tests/Unit/NavGroupItemTest.php | 54 +++++++++----------
 1 file changed, 27 insertions(+), 27 deletions(-)

diff --git a/packages/framework/tests/Unit/NavGroupItemTest.php b/packages/framework/tests/Unit/NavGroupItemTest.php
index 3aa944e0fd4..1f7ce0b1122 100644
--- a/packages/framework/tests/Unit/NavGroupItemTest.php
+++ b/packages/framework/tests/Unit/NavGroupItemTest.php
@@ -26,28 +26,28 @@ public static function setUpBeforeClass(): void
 
     public function testCanConstruct()
     {
-        $this->assertSame('Test', (new NavGroupItem('Test'))->getLabel());
+        $this->assertSame('Foo', (new NavGroupItem('Foo'))->getLabel());
     }
 
     public function testCanConstructWithPriority()
     {
-        $this->assertSame(500, (new NavGroupItem('Test', priority: 500))->getPriority());
+        $this->assertSame(500, (new NavGroupItem('Foo', priority: 500))->getPriority());
     }
 
     public function testDefaultPriorityValueIsLast()
     {
-        $this->assertSame(999, (new NavGroupItem('Test'))->getPriority());
+        $this->assertSame(999, (new NavGroupItem('Foo'))->getPriority());
     }
 
     public function testDestinationIsAlwaysNull()
     {
-        $this->assertNull((new NavGroupItem('Test'))->getRoute());
+        $this->assertNull((new NavGroupItem('Foo'))->getRoute());
     }
 
     public function testCanConstructWithChildren()
     {
         $children = $this->createNavItems();
-        $item = new NavGroupItem('Test', $children);
+        $item = new NavGroupItem('Foo', $children);
 
         $this->assertCount(2, $item->getChildren());
         $this->assertSame($children, $item->getChildren());
@@ -56,7 +56,7 @@ public function testCanConstructWithChildren()
     public function testCanConstructWithChildrenWithoutRoute()
     {
         $children = $this->createNavItems();
-        $item = new NavGroupItem('Test', $children);
+        $item = new NavGroupItem('Foo', $children);
 
         $this->assertCount(2, $item->getChildren());
         $this->assertSame($children, $item->getChildren());
@@ -66,28 +66,28 @@ public function testGetChildren()
     {
         $children = $this->createNavItems();
 
-        $navItem = new NavGroupItem('Parent', $children);
+        $navItem = new NavGroupItem('Foo', $children);
         $this->assertSame($children, $navItem->getChildren());
     }
 
     public function testGetChildrenWithNoChildren()
     {
-        $this->assertEmpty((new NavGroupItem('Parent'))->getChildren());
+        $this->assertEmpty((new NavGroupItem('Foo'))->getChildren());
     }
 
     public function testHasChildren()
     {
-        $this->assertFalse((new NavGroupItem('Parent'))->hasChildren());
+        $this->assertFalse((new NavGroupItem('Foo'))->hasChildren());
     }
 
     public function testHasChildrenWithChildren()
     {
-        $this->assertTrue((new NavGroupItem('Parent', $this->createNavItems()))->hasChildren());
+        $this->assertTrue((new NavGroupItem('Foo', $this->createNavItems()))->hasChildren());
     }
 
     public function testCanAddMultipleItemsToDropdown()
     {
-        $parent = new NavGroupItem('Parent');
+        $parent = new NavGroupItem('Foo');
         $child1 = new NavItem(new Route(new MarkdownPage()), 'Child 1', group: 'foo');
         $child2 = new NavItem(new Route(new MarkdownPage()), 'Child 2', group: 'foo');
 
@@ -100,7 +100,7 @@ public function testCanAddMultipleItemsToDropdown()
 
     public function testAddChildrenMethodReturnsSelf()
     {
-        $parent = new NavGroupItem('Parent');
+        $parent = new NavGroupItem('Foo');
         $child1 = new NavItem(new Route(new MarkdownPage()), 'Child 1', group: 'foo');
         $child2 = new NavItem(new Route(new MarkdownPage()), 'Child 2', group: 'foo');
 
@@ -109,29 +109,29 @@ public function testAddChildrenMethodReturnsSelf()
 
     public function testAddingAnItemWithAGroupKeyKeepsTheSetGroupKey()
     {
-        $parent = new NavGroupItem('Parent');
+        $parent = new NavGroupItem('Foo');
         $child = new NavItem(new Route(new MarkdownPage()), 'Child', group: 'bar');
 
         $parent->addChild($child);
 
-        $this->assertSame('parent', $parent->getGroupIdentifier());
+        $this->assertSame('foo', $parent->getGroupIdentifier());
         $this->assertSame('bar', $child->getGroupIdentifier());
     }
 
-    public function testAddingAnItemWithNoGroupKeyUsesParentIdentifier()
+    public function testAddingAnItemWithNoGroupKeyUsesGroupIdentifier()
     {
-        $parent = new NavGroupItem('Parent');
-        $child = new NavItem(new Route(new MarkdownPage()), 'Child');
+        $parent = new NavGroupItem('Foo');
+        $child = new NavItem(new Route(new MarkdownPage()), 'Bar');
 
         $parent->addChild($child);
 
-        $this->assertSame('parent', $parent->getGroupIdentifier());
-        $this->assertSame('parent', $child->getGroupIdentifier());
+        $this->assertSame('foo', $parent->getGroupIdentifier());
+        $this->assertSame('foo', $child->getGroupIdentifier());
     }
 
     public function testCanAddItemToDropdown()
     {
-        $parent = new NavGroupItem('Parent');
+        $parent = new NavGroupItem('Foo');
         $child = new NavItem(new Route(new MarkdownPage()), 'Child', group: 'foo');
 
         $this->assertSame([], $parent->getChildren());
@@ -143,7 +143,7 @@ public function testCanAddItemToDropdown()
 
     public function testAddChildMethodReturnsSelf()
     {
-        $parent = new NavGroupItem('Parent');
+        $parent = new NavGroupItem('Foo');
         $child = new NavItem(new Route(new MarkdownPage()), 'Child', group: 'foo');
 
         $this->assertSame($parent, $parent->addChild($child));
@@ -151,17 +151,17 @@ public function testAddChildMethodReturnsSelf()
 
     public function testGetPriorityUsesDefaultPriority()
     {
-        $this->assertSame(999, (new NavGroupItem('Parent'))->getPriority());
+        $this->assertSame(999, (new NavGroupItem('Foo'))->getPriority());
     }
 
     public function testGetPriorityWithNoChildrenUsesGroupPriority()
     {
-        $this->assertSame(999, (new NavGroupItem('Parent'))->getPriority());
+        $this->assertSame(999, (new NavGroupItem('Foo'))->getPriority());
     }
 
     public function testGetPriorityWithChildrenUsesGroupPriority()
     {
-        $parent = new NavGroupItem('Parent');
+        $parent = new NavGroupItem('Foo');
         $child = new NavItem(new Route(new MarkdownPage()), 'Child', 400, 'foo');
         $parent->addChild($child);
         $this->assertSame(999, $parent->getPriority());
@@ -169,7 +169,7 @@ public function testGetPriorityWithChildrenUsesGroupPriority()
 
     public function testGetPriorityWithDocumentationPageChildrenUsesLowestPriority()
     {
-        $parent = new NavGroupItem('Parent');
+        $parent = new NavGroupItem('Foo');
         $child = new NavItem(new Route(new DocumentationPage()), 'Foo', 400);
         $parent->addChild($child);
         $this->assertSame(400, $parent->getPriority());
@@ -177,7 +177,7 @@ public function testGetPriorityWithDocumentationPageChildrenUsesLowestPriority()
 
     public function testGetPriorityHandlesMixedChildTypes()
     {
-        $parent = new NavGroupItem('Parent');
+        $parent = new NavGroupItem('Foo');
 
         foreach (HydeCoreExtension::getPageClasses() as $type) {
             $child = new NavItem(new Route(new $type()), 'Child', 100);
@@ -189,7 +189,7 @@ public function testGetPriorityHandlesMixedChildTypes()
 
     public function testGetPriorityHandlesExternalUrlChild()
     {
-        $parent = new NavGroupItem('Parent');
+        $parent = new NavGroupItem('Foo');
 
         $child = new NavItem('foo', 'Child', 400);
         $parent->addChild($child);

From 1d34e75031058d40e20efdbe7cd8d1b743bf5b4f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 2 Mar 2024 14:50:08 +0100
Subject: [PATCH 0791/1422] Remove unnecessary test data

---
 packages/framework/tests/Unit/NavGroupItemTest.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/framework/tests/Unit/NavGroupItemTest.php b/packages/framework/tests/Unit/NavGroupItemTest.php
index 1f7ce0b1122..5b045c224e8 100644
--- a/packages/framework/tests/Unit/NavGroupItemTest.php
+++ b/packages/framework/tests/Unit/NavGroupItemTest.php
@@ -132,7 +132,7 @@ public function testAddingAnItemWithNoGroupKeyUsesGroupIdentifier()
     public function testCanAddItemToDropdown()
     {
         $parent = new NavGroupItem('Foo');
-        $child = new NavItem(new Route(new MarkdownPage()), 'Child', group: 'foo');
+        $child = new NavItem(new Route(new MarkdownPage()), 'Bar');
 
         $this->assertSame([], $parent->getChildren());
 
@@ -144,7 +144,7 @@ public function testCanAddItemToDropdown()
     public function testAddChildMethodReturnsSelf()
     {
         $parent = new NavGroupItem('Foo');
-        $child = new NavItem(new Route(new MarkdownPage()), 'Child', group: 'foo');
+        $child = new NavItem(new Route(new MarkdownPage()), 'Bar');
 
         $this->assertSame($parent, $parent->addChild($child));
     }
@@ -162,7 +162,7 @@ public function testGetPriorityWithNoChildrenUsesGroupPriority()
     public function testGetPriorityWithChildrenUsesGroupPriority()
     {
         $parent = new NavGroupItem('Foo');
-        $child = new NavItem(new Route(new MarkdownPage()), 'Child', 400, 'foo');
+        $child = new NavItem(new Route(new MarkdownPage()), 'Bar');
         $parent->addChild($child);
         $this->assertSame(999, $parent->getPriority());
     }

From a356a179db122428d473a7e4b0ba116e723c5f1a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 2 Mar 2024 14:50:37 +0100
Subject: [PATCH 0792/1422] Clarify test method naming

---
 packages/framework/tests/Unit/NavGroupItemTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/tests/Unit/NavGroupItemTest.php b/packages/framework/tests/Unit/NavGroupItemTest.php
index 5b045c224e8..b4cf5940bd0 100644
--- a/packages/framework/tests/Unit/NavGroupItemTest.php
+++ b/packages/framework/tests/Unit/NavGroupItemTest.php
@@ -175,7 +175,7 @@ public function testGetPriorityWithDocumentationPageChildrenUsesLowestPriority()
         $this->assertSame(400, $parent->getPriority());
     }
 
-    public function testGetPriorityHandlesMixedChildTypes()
+    public function testGetPriorityUsesGroupPriorityForMixedChildTypes()
     {
         $parent = new NavGroupItem('Foo');
 

From b22a68567bc22d3d7e21651997ffc8fe040a7d9a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 2 Mar 2024 14:50:51 +0100
Subject: [PATCH 0793/1422] Clarify test method naming

---
 packages/framework/tests/Unit/NavGroupItemTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/tests/Unit/NavGroupItemTest.php b/packages/framework/tests/Unit/NavGroupItemTest.php
index b4cf5940bd0..29e2e4085e2 100644
--- a/packages/framework/tests/Unit/NavGroupItemTest.php
+++ b/packages/framework/tests/Unit/NavGroupItemTest.php
@@ -187,7 +187,7 @@ public function testGetPriorityUsesGroupPriorityForMixedChildTypes()
         $this->assertSame(999, $parent->getPriority());
     }
 
-    public function testGetPriorityHandlesExternalUrlChild()
+    public function testGetPriorityHandlesExternalUrlChildGracefully()
     {
         $parent = new NavGroupItem('Foo');
 

From 9f4ef9c0a216a973a3ac2e3f60b13eb621a8b7cc Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 2 Mar 2024 14:51:06 +0100
Subject: [PATCH 0794/1422] Normalize test value

---
 packages/framework/tests/Unit/NavGroupItemTest.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/framework/tests/Unit/NavGroupItemTest.php b/packages/framework/tests/Unit/NavGroupItemTest.php
index 29e2e4085e2..86a87d13850 100644
--- a/packages/framework/tests/Unit/NavGroupItemTest.php
+++ b/packages/framework/tests/Unit/NavGroupItemTest.php
@@ -170,9 +170,9 @@ public function testGetPriorityWithChildrenUsesGroupPriority()
     public function testGetPriorityWithDocumentationPageChildrenUsesLowestPriority()
     {
         $parent = new NavGroupItem('Foo');
-        $child = new NavItem(new Route(new DocumentationPage()), 'Foo', 400);
+        $child = new NavItem(new Route(new DocumentationPage()), 'Foo', 100);
         $parent->addChild($child);
-        $this->assertSame(400, $parent->getPriority());
+        $this->assertSame(100, $parent->getPriority());
     }
 
     public function testGetPriorityUsesGroupPriorityForMixedChildTypes()
@@ -191,7 +191,7 @@ public function testGetPriorityHandlesExternalUrlChildGracefully()
     {
         $parent = new NavGroupItem('Foo');
 
-        $child = new NavItem('foo', 'Child', 400);
+        $child = new NavItem('foo', 'Child', 100);
         $parent->addChild($child);
 
         $this->assertSame(999, $parent->getPriority());

From b74040f550c5592736dfa274dc7c4c380ee90fc6 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 2 Mar 2024 14:51:51 +0100
Subject: [PATCH 0795/1422] Simplify test assembly

---
 packages/framework/tests/Unit/NavGroupItemTest.php | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/packages/framework/tests/Unit/NavGroupItemTest.php b/packages/framework/tests/Unit/NavGroupItemTest.php
index 86a87d13850..17a87a41da9 100644
--- a/packages/framework/tests/Unit/NavGroupItemTest.php
+++ b/packages/framework/tests/Unit/NavGroupItemTest.php
@@ -189,10 +189,7 @@ public function testGetPriorityUsesGroupPriorityForMixedChildTypes()
 
     public function testGetPriorityHandlesExternalUrlChildGracefully()
     {
-        $parent = new NavGroupItem('Foo');
-
-        $child = new NavItem('foo', 'Child', 100);
-        $parent->addChild($child);
+        $parent = new NavGroupItem('Foo', [new NavItem('foo', 'Child', 100)]);
 
         $this->assertSame(999, $parent->getPriority());
     }

From 846ac42e41b83bede6ad1a820c76176add822c91 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 2 Mar 2024 14:52:13 +0100
Subject: [PATCH 0796/1422] Normalize test data

---
 packages/framework/tests/Unit/NavGroupItemTest.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/tests/Unit/NavGroupItemTest.php b/packages/framework/tests/Unit/NavGroupItemTest.php
index 17a87a41da9..6cd2cedc0ab 100644
--- a/packages/framework/tests/Unit/NavGroupItemTest.php
+++ b/packages/framework/tests/Unit/NavGroupItemTest.php
@@ -180,7 +180,7 @@ public function testGetPriorityUsesGroupPriorityForMixedChildTypes()
         $parent = new NavGroupItem('Foo');
 
         foreach (HydeCoreExtension::getPageClasses() as $type) {
-            $child = new NavItem(new Route(new $type()), 'Child', 100);
+            $child = new NavItem(new Route(new $type()), 'Bar', 100);
             $parent->addChild($child);
         }
 
@@ -189,7 +189,7 @@ public function testGetPriorityUsesGroupPriorityForMixedChildTypes()
 
     public function testGetPriorityHandlesExternalUrlChildGracefully()
     {
-        $parent = new NavGroupItem('Foo', [new NavItem('foo', 'Child', 100)]);
+        $parent = new NavGroupItem('Foo', [new NavItem('foo', 'Bar', 100)]);
 
         $this->assertSame(999, $parent->getPriority());
     }

From 87e3ad62efb45b221853731a77e1be912fbf81bc Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 2 Mar 2024 14:52:30 +0100
Subject: [PATCH 0797/1422] Normalize local test variable naming

---
 .../framework/tests/Unit/NavGroupItemTest.php | 58 +++++++++----------
 1 file changed, 29 insertions(+), 29 deletions(-)

diff --git a/packages/framework/tests/Unit/NavGroupItemTest.php b/packages/framework/tests/Unit/NavGroupItemTest.php
index 6cd2cedc0ab..6e8730df8e5 100644
--- a/packages/framework/tests/Unit/NavGroupItemTest.php
+++ b/packages/framework/tests/Unit/NavGroupItemTest.php
@@ -87,66 +87,66 @@ public function testHasChildrenWithChildren()
 
     public function testCanAddMultipleItemsToDropdown()
     {
-        $parent = new NavGroupItem('Foo');
+        $group = new NavGroupItem('Foo');
         $child1 = new NavItem(new Route(new MarkdownPage()), 'Child 1', group: 'foo');
         $child2 = new NavItem(new Route(new MarkdownPage()), 'Child 2', group: 'foo');
 
-        $this->assertSame([], $parent->getChildren());
+        $this->assertSame([], $group->getChildren());
 
-        $parent->addChildren([$child1, $child2]);
+        $group->addChildren([$child1, $child2]);
 
-        $this->assertSame([$child1, $child2], $parent->getChildren());
+        $this->assertSame([$child1, $child2], $group->getChildren());
     }
 
     public function testAddChildrenMethodReturnsSelf()
     {
-        $parent = new NavGroupItem('Foo');
+        $group = new NavGroupItem('Foo');
         $child1 = new NavItem(new Route(new MarkdownPage()), 'Child 1', group: 'foo');
         $child2 = new NavItem(new Route(new MarkdownPage()), 'Child 2', group: 'foo');
 
-        $this->assertSame($parent, $parent->addChildren([$child1, $child2]));
+        $this->assertSame($group, $group->addChildren([$child1, $child2]));
     }
 
     public function testAddingAnItemWithAGroupKeyKeepsTheSetGroupKey()
     {
-        $parent = new NavGroupItem('Foo');
+        $group = new NavGroupItem('Foo');
         $child = new NavItem(new Route(new MarkdownPage()), 'Child', group: 'bar');
 
-        $parent->addChild($child);
+        $group->addChild($child);
 
-        $this->assertSame('foo', $parent->getGroupIdentifier());
+        $this->assertSame('foo', $group->getGroupIdentifier());
         $this->assertSame('bar', $child->getGroupIdentifier());
     }
 
     public function testAddingAnItemWithNoGroupKeyUsesGroupIdentifier()
     {
-        $parent = new NavGroupItem('Foo');
+        $group = new NavGroupItem('Foo');
         $child = new NavItem(new Route(new MarkdownPage()), 'Bar');
 
-        $parent->addChild($child);
+        $group->addChild($child);
 
-        $this->assertSame('foo', $parent->getGroupIdentifier());
+        $this->assertSame('foo', $group->getGroupIdentifier());
         $this->assertSame('foo', $child->getGroupIdentifier());
     }
 
     public function testCanAddItemToDropdown()
     {
-        $parent = new NavGroupItem('Foo');
+        $group = new NavGroupItem('Foo');
         $child = new NavItem(new Route(new MarkdownPage()), 'Bar');
 
-        $this->assertSame([], $parent->getChildren());
+        $this->assertSame([], $group->getChildren());
 
-        $parent->addChild($child);
+        $group->addChild($child);
 
-        $this->assertSame([$child], $parent->getChildren());
+        $this->assertSame([$child], $group->getChildren());
     }
 
     public function testAddChildMethodReturnsSelf()
     {
-        $parent = new NavGroupItem('Foo');
+        $group = new NavGroupItem('Foo');
         $child = new NavItem(new Route(new MarkdownPage()), 'Bar');
 
-        $this->assertSame($parent, $parent->addChild($child));
+        $this->assertSame($group, $group->addChild($child));
     }
 
     public function testGetPriorityUsesDefaultPriority()
@@ -161,37 +161,37 @@ public function testGetPriorityWithNoChildrenUsesGroupPriority()
 
     public function testGetPriorityWithChildrenUsesGroupPriority()
     {
-        $parent = new NavGroupItem('Foo');
+        $group = new NavGroupItem('Foo');
         $child = new NavItem(new Route(new MarkdownPage()), 'Bar');
-        $parent->addChild($child);
-        $this->assertSame(999, $parent->getPriority());
+        $group->addChild($child);
+        $this->assertSame(999, $group->getPriority());
     }
 
     public function testGetPriorityWithDocumentationPageChildrenUsesLowestPriority()
     {
-        $parent = new NavGroupItem('Foo');
+        $group = new NavGroupItem('Foo');
         $child = new NavItem(new Route(new DocumentationPage()), 'Foo', 100);
-        $parent->addChild($child);
-        $this->assertSame(100, $parent->getPriority());
+        $group->addChild($child);
+        $this->assertSame(100, $group->getPriority());
     }
 
     public function testGetPriorityUsesGroupPriorityForMixedChildTypes()
     {
-        $parent = new NavGroupItem('Foo');
+        $group = new NavGroupItem('Foo');
 
         foreach (HydeCoreExtension::getPageClasses() as $type) {
             $child = new NavItem(new Route(new $type()), 'Bar', 100);
-            $parent->addChild($child);
+            $group->addChild($child);
         }
 
-        $this->assertSame(999, $parent->getPriority());
+        $this->assertSame(999, $group->getPriority());
     }
 
     public function testGetPriorityHandlesExternalUrlChildGracefully()
     {
-        $parent = new NavGroupItem('Foo', [new NavItem('foo', 'Bar', 100)]);
+        $group = new NavGroupItem('Foo', [new NavItem('foo', 'Bar', 100)]);
 
-        $this->assertSame(999, $parent->getPriority());
+        $this->assertSame(999, $group->getPriority());
     }
 
     private function createNavItems(): array

From 8b07dacead872f25f0f074612dd9ebbb26f4850c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 2 Mar 2024 14:53:09 +0100
Subject: [PATCH 0798/1422] Split out test

---
 packages/framework/tests/Unit/NavGroupItemTest.php | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/packages/framework/tests/Unit/NavGroupItemTest.php b/packages/framework/tests/Unit/NavGroupItemTest.php
index 6e8730df8e5..b8dcda595fb 100644
--- a/packages/framework/tests/Unit/NavGroupItemTest.php
+++ b/packages/framework/tests/Unit/NavGroupItemTest.php
@@ -187,13 +187,20 @@ public function testGetPriorityUsesGroupPriorityForMixedChildTypes()
         $this->assertSame(999, $group->getPriority());
     }
 
-    public function testGetPriorityHandlesExternalUrlChildGracefully()
+    public function testGetPriorityHandlesStringUrlChildGracefully()
     {
         $group = new NavGroupItem('Foo', [new NavItem('foo', 'Bar', 100)]);
 
         $this->assertSame(999, $group->getPriority());
     }
 
+    public function testGetPriorityHandlesExternalUrlChildGracefully()
+    {
+        $group = new NavGroupItem('Foo', [new NavItem('https://example.com', 'Bar', 100)]);
+
+        $this->assertSame(999, $group->getPriority());
+    }
+
     private function createNavItems(): array
     {
         return [

From 2b746d0f1fb967dc08e7884e14c858d9bb3b951e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 2 Mar 2024 14:53:30 +0100
Subject: [PATCH 0799/1422] Inline variables

---
 packages/framework/tests/Unit/NavGroupItemTest.php | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/packages/framework/tests/Unit/NavGroupItemTest.php b/packages/framework/tests/Unit/NavGroupItemTest.php
index b8dcda595fb..18bb62548aa 100644
--- a/packages/framework/tests/Unit/NavGroupItemTest.php
+++ b/packages/framework/tests/Unit/NavGroupItemTest.php
@@ -189,16 +189,12 @@ public function testGetPriorityUsesGroupPriorityForMixedChildTypes()
 
     public function testGetPriorityHandlesStringUrlChildGracefully()
     {
-        $group = new NavGroupItem('Foo', [new NavItem('foo', 'Bar', 100)]);
-
-        $this->assertSame(999, $group->getPriority());
+        $this->assertSame(999, (new NavGroupItem('Foo', [new NavItem('foo', 'Bar', 100)]))->getPriority());
     }
 
     public function testGetPriorityHandlesExternalUrlChildGracefully()
     {
-        $group = new NavGroupItem('Foo', [new NavItem('https://example.com', 'Bar', 100)]);
-
-        $this->assertSame(999, $group->getPriority());
+        $this->assertSame(999, (new NavGroupItem('Foo', [new NavItem('https://example.com', 'Bar', 100)]))->getPriority());
     }
 
     private function createNavItems(): array

From 64c02e313b6c339719b9347e7d4cdbaee7aa11cf Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 2 Mar 2024 14:53:47 +0100
Subject: [PATCH 0800/1422] Evaluate function call

---
 packages/framework/tests/Unit/NavGroupItemTest.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/tests/Unit/NavGroupItemTest.php b/packages/framework/tests/Unit/NavGroupItemTest.php
index 18bb62548aa..4128067c315 100644
--- a/packages/framework/tests/Unit/NavGroupItemTest.php
+++ b/packages/framework/tests/Unit/NavGroupItemTest.php
@@ -200,8 +200,8 @@ public function testGetPriorityHandlesExternalUrlChildGracefully()
     private function createNavItems(): array
     {
         return [
-            new NavItem(new Route(new InMemoryPage('foo')), ucfirst('foo')),
-            new NavItem(new Route(new InMemoryPage('bar')), ucfirst('bar')),
+            new NavItem(new Route(new InMemoryPage('foo')), 'Foo'),
+            new NavItem(new Route(new InMemoryPage('bar')), 'Bar'),
         ];
     }
 }

From 725d7c95dc468908b5d7a2643a8af3fa220d7547 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 2 Mar 2024 14:56:48 +0100
Subject: [PATCH 0801/1422] Formatting

---
 packages/framework/tests/Unit/NavGroupItemTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/tests/Unit/NavGroupItemTest.php b/packages/framework/tests/Unit/NavGroupItemTest.php
index 4128067c315..de08b8d6242 100644
--- a/packages/framework/tests/Unit/NavGroupItemTest.php
+++ b/packages/framework/tests/Unit/NavGroupItemTest.php
@@ -65,8 +65,8 @@ public function testCanConstructWithChildrenWithoutRoute()
     public function testGetChildren()
     {
         $children = $this->createNavItems();
-
         $navItem = new NavGroupItem('Foo', $children);
+
         $this->assertSame($children, $navItem->getChildren());
     }
 

From d956811b08ceeddbb51f488b73df1acc3463c89e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 2 Mar 2024 14:57:58 +0100
Subject: [PATCH 0802/1422] Normalize variable name

---
 packages/framework/tests/Unit/NavGroupItemTest.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/tests/Unit/NavGroupItemTest.php b/packages/framework/tests/Unit/NavGroupItemTest.php
index de08b8d6242..d890504f1ab 100644
--- a/packages/framework/tests/Unit/NavGroupItemTest.php
+++ b/packages/framework/tests/Unit/NavGroupItemTest.php
@@ -65,9 +65,9 @@ public function testCanConstructWithChildrenWithoutRoute()
     public function testGetChildren()
     {
         $children = $this->createNavItems();
-        $navItem = new NavGroupItem('Foo', $children);
+        $item = new NavGroupItem('Foo', $children);
 
-        $this->assertSame($children, $navItem->getChildren());
+        $this->assertSame($children, $item->getChildren());
     }
 
     public function testGetChildrenWithNoChildren()

From a6d66488d8f8ed33cc4f5bcccb54a3d03769ae69 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 2 Mar 2024 14:58:35 +0100
Subject: [PATCH 0803/1422] Remove unnecessary operations from test

---
 packages/framework/tests/Unit/NavGroupItemTest.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/packages/framework/tests/Unit/NavGroupItemTest.php b/packages/framework/tests/Unit/NavGroupItemTest.php
index d890504f1ab..31c3c64d8aa 100644
--- a/packages/framework/tests/Unit/NavGroupItemTest.php
+++ b/packages/framework/tests/Unit/NavGroupItemTest.php
@@ -101,10 +101,8 @@ public function testCanAddMultipleItemsToDropdown()
     public function testAddChildrenMethodReturnsSelf()
     {
         $group = new NavGroupItem('Foo');
-        $child1 = new NavItem(new Route(new MarkdownPage()), 'Child 1', group: 'foo');
-        $child2 = new NavItem(new Route(new MarkdownPage()), 'Child 2', group: 'foo');
 
-        $this->assertSame($group, $group->addChildren([$child1, $child2]));
+        $this->assertSame($group, $group->addChildren([]));
     }
 
     public function testAddingAnItemWithAGroupKeyKeepsTheSetGroupKey()

From fe5e598a9736e57d8866be9e56e210b5141ce1ed Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 2 Mar 2024 14:59:14 +0100
Subject: [PATCH 0804/1422] Remove unnecessary assertion

---
 packages/framework/tests/Unit/NavGroupItemTest.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/framework/tests/Unit/NavGroupItemTest.php b/packages/framework/tests/Unit/NavGroupItemTest.php
index 31c3c64d8aa..c54cef5fe03 100644
--- a/packages/framework/tests/Unit/NavGroupItemTest.php
+++ b/packages/framework/tests/Unit/NavGroupItemTest.php
@@ -91,8 +91,6 @@ public function testCanAddMultipleItemsToDropdown()
         $child1 = new NavItem(new Route(new MarkdownPage()), 'Child 1', group: 'foo');
         $child2 = new NavItem(new Route(new MarkdownPage()), 'Child 2', group: 'foo');
 
-        $this->assertSame([], $group->getChildren());
-
         $group->addChildren([$child1, $child2]);
 
         $this->assertSame([$child1, $child2], $group->getChildren());

From ff5d8df12b6cff8baf09091a5c61bc35cdc58c3d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 2 Mar 2024 14:59:55 +0100
Subject: [PATCH 0805/1422] Simplify test

---
 packages/framework/tests/Unit/NavGroupItemTest.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/packages/framework/tests/Unit/NavGroupItemTest.php b/packages/framework/tests/Unit/NavGroupItemTest.php
index c54cef5fe03..a84a8ec0286 100644
--- a/packages/framework/tests/Unit/NavGroupItemTest.php
+++ b/packages/framework/tests/Unit/NavGroupItemTest.php
@@ -91,9 +91,7 @@ public function testCanAddMultipleItemsToDropdown()
         $child1 = new NavItem(new Route(new MarkdownPage()), 'Child 1', group: 'foo');
         $child2 = new NavItem(new Route(new MarkdownPage()), 'Child 2', group: 'foo');
 
-        $group->addChildren([$child1, $child2]);
-
-        $this->assertSame([$child1, $child2], $group->getChildren());
+        $this->assertSame([$child1, $child2], $group->addChildren([$child1, $child2])->getChildren());
     }
 
     public function testAddChildrenMethodReturnsSelf()

From df730b609ae123b1f5c4d53314beebcab60abcfe Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 2 Mar 2024 15:00:50 +0100
Subject: [PATCH 0806/1422] Add missing unit test

---
 packages/framework/tests/Unit/NavGroupItemTest.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/packages/framework/tests/Unit/NavGroupItemTest.php b/packages/framework/tests/Unit/NavGroupItemTest.php
index a84a8ec0286..c7be4220dae 100644
--- a/packages/framework/tests/Unit/NavGroupItemTest.php
+++ b/packages/framework/tests/Unit/NavGroupItemTest.php
@@ -85,6 +85,14 @@ public function testHasChildrenWithChildren()
         $this->assertTrue((new NavGroupItem('Foo', $this->createNavItems()))->hasChildren());
     }
 
+    public function testCanAddItemsToDropdown()
+    {
+        $group = new NavGroupItem('Foo');
+        $child = new NavItem(new Route(new MarkdownPage()), 'Child 1', group: 'foo');
+
+        $this->assertSame([$child], $group->addChild($child)->getChildren());
+    }
+
     public function testCanAddMultipleItemsToDropdown()
     {
         $group = new NavGroupItem('Foo');

From 6aee109111f3af3997d8c4b78b1693757c0d58ce Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 2 Mar 2024 15:01:14 +0100
Subject: [PATCH 0807/1422] Introduce local variable

---
 packages/framework/tests/Unit/NavGroupItemTest.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/framework/tests/Unit/NavGroupItemTest.php b/packages/framework/tests/Unit/NavGroupItemTest.php
index c7be4220dae..23fb904c6f1 100644
--- a/packages/framework/tests/Unit/NavGroupItemTest.php
+++ b/packages/framework/tests/Unit/NavGroupItemTest.php
@@ -99,7 +99,9 @@ public function testCanAddMultipleItemsToDropdown()
         $child1 = new NavItem(new Route(new MarkdownPage()), 'Child 1', group: 'foo');
         $child2 = new NavItem(new Route(new MarkdownPage()), 'Child 2', group: 'foo');
 
-        $this->assertSame([$child1, $child2], $group->addChildren([$child1, $child2])->getChildren());
+        $items = [$child1, $child2];
+        
+        $this->assertSame($items, $group->addChildren($items)->getChildren());
     }
 
     public function testAddChildrenMethodReturnsSelf()

From b6bc915999d2d54f5fe6a4cf9d9d601e4019a88b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 2 Mar 2024 15:01:33 +0100
Subject: [PATCH 0808/1422] Inline local variables

---
 packages/framework/tests/Unit/NavGroupItemTest.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/packages/framework/tests/Unit/NavGroupItemTest.php b/packages/framework/tests/Unit/NavGroupItemTest.php
index 23fb904c6f1..d5956d56b35 100644
--- a/packages/framework/tests/Unit/NavGroupItemTest.php
+++ b/packages/framework/tests/Unit/NavGroupItemTest.php
@@ -96,11 +96,12 @@ public function testCanAddItemsToDropdown()
     public function testCanAddMultipleItemsToDropdown()
     {
         $group = new NavGroupItem('Foo');
-        $child1 = new NavItem(new Route(new MarkdownPage()), 'Child 1', group: 'foo');
-        $child2 = new NavItem(new Route(new MarkdownPage()), 'Child 2', group: 'foo');
-
-        $items = [$child1, $child2];
         
+        $items = [
+            new NavItem(new Route(new MarkdownPage()), 'Child 1', group: 'foo'),
+            new NavItem(new Route(new MarkdownPage()), 'Child 2', group: 'foo')
+        ];
+
         $this->assertSame($items, $group->addChildren($items)->getChildren());
     }
 

From 3a7eaf14a2912d31058cf2d382f0ef5f0a15c435 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 2 Mar 2024 15:02:42 +0100
Subject: [PATCH 0809/1422] Use the helper method

---
 packages/framework/tests/Unit/NavGroupItemTest.php | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/packages/framework/tests/Unit/NavGroupItemTest.php b/packages/framework/tests/Unit/NavGroupItemTest.php
index d5956d56b35..88f0d3b56f5 100644
--- a/packages/framework/tests/Unit/NavGroupItemTest.php
+++ b/packages/framework/tests/Unit/NavGroupItemTest.php
@@ -96,11 +96,7 @@ public function testCanAddItemsToDropdown()
     public function testCanAddMultipleItemsToDropdown()
     {
         $group = new NavGroupItem('Foo');
-        
-        $items = [
-            new NavItem(new Route(new MarkdownPage()), 'Child 1', group: 'foo'),
-            new NavItem(new Route(new MarkdownPage()), 'Child 2', group: 'foo')
-        ];
+        $items = $this->createNavItems();
 
         $this->assertSame($items, $group->addChildren($items)->getChildren());
     }

From f28d636a6eac176453322772bdf74413dae234ec Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 2 Mar 2024 15:03:53 +0100
Subject: [PATCH 0810/1422] Merge overlapping tests

---
 .../framework/tests/Unit/NavGroupItemTest.php    | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/packages/framework/tests/Unit/NavGroupItemTest.php b/packages/framework/tests/Unit/NavGroupItemTest.php
index 88f0d3b56f5..ef6c4ae7249 100644
--- a/packages/framework/tests/Unit/NavGroupItemTest.php
+++ b/packages/framework/tests/Unit/NavGroupItemTest.php
@@ -85,14 +85,6 @@ public function testHasChildrenWithChildren()
         $this->assertTrue((new NavGroupItem('Foo', $this->createNavItems()))->hasChildren());
     }
 
-    public function testCanAddItemsToDropdown()
-    {
-        $group = new NavGroupItem('Foo');
-        $child = new NavItem(new Route(new MarkdownPage()), 'Child 1', group: 'foo');
-
-        $this->assertSame([$child], $group->addChild($child)->getChildren());
-    }
-
     public function testCanAddMultipleItemsToDropdown()
     {
         $group = new NavGroupItem('Foo');
@@ -133,13 +125,9 @@ public function testAddingAnItemWithNoGroupKeyUsesGroupIdentifier()
     public function testCanAddItemToDropdown()
     {
         $group = new NavGroupItem('Foo');
-        $child = new NavItem(new Route(new MarkdownPage()), 'Bar');
-
-        $this->assertSame([], $group->getChildren());
-
-        $group->addChild($child);
+        $child = new NavItem(new Route(new MarkdownPage()), 'Child 1', group: 'foo');
 
-        $this->assertSame([$child], $group->getChildren());
+        $this->assertSame([$child], $group->addChild($child)->getChildren());
     }
 
     public function testAddChildMethodReturnsSelf()

From d9a9e213cc74db61b09fbaadb16767ae41e0fde3 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 2 Mar 2024 15:04:14 +0100
Subject: [PATCH 0811/1422] Reorder tests

---
 .../framework/tests/Unit/NavGroupItemTest.php | 32 +++++++++----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/packages/framework/tests/Unit/NavGroupItemTest.php b/packages/framework/tests/Unit/NavGroupItemTest.php
index ef6c4ae7249..16e78cd5910 100644
--- a/packages/framework/tests/Unit/NavGroupItemTest.php
+++ b/packages/framework/tests/Unit/NavGroupItemTest.php
@@ -85,6 +85,22 @@ public function testHasChildrenWithChildren()
         $this->assertTrue((new NavGroupItem('Foo', $this->createNavItems()))->hasChildren());
     }
 
+    public function testCanAddItemToDropdown()
+    {
+        $group = new NavGroupItem('Foo');
+        $child = new NavItem(new Route(new MarkdownPage()), 'Child 1', group: 'foo');
+
+        $this->assertSame([$child], $group->addChild($child)->getChildren());
+    }
+
+    public function testAddChildMethodReturnsSelf()
+    {
+        $group = new NavGroupItem('Foo');
+        $child = new NavItem(new Route(new MarkdownPage()), 'Bar');
+
+        $this->assertSame($group, $group->addChild($child));
+    }
+
     public function testCanAddMultipleItemsToDropdown()
     {
         $group = new NavGroupItem('Foo');
@@ -122,22 +138,6 @@ public function testAddingAnItemWithNoGroupKeyUsesGroupIdentifier()
         $this->assertSame('foo', $child->getGroupIdentifier());
     }
 
-    public function testCanAddItemToDropdown()
-    {
-        $group = new NavGroupItem('Foo');
-        $child = new NavItem(new Route(new MarkdownPage()), 'Child 1', group: 'foo');
-
-        $this->assertSame([$child], $group->addChild($child)->getChildren());
-    }
-
-    public function testAddChildMethodReturnsSelf()
-    {
-        $group = new NavGroupItem('Foo');
-        $child = new NavItem(new Route(new MarkdownPage()), 'Bar');
-
-        $this->assertSame($group, $group->addChild($child));
-    }
-
     public function testGetPriorityUsesDefaultPriority()
     {
         $this->assertSame(999, (new NavGroupItem('Foo'))->getPriority());

From d740acc0f00fcaf359a77ba11a5acf4aec65fd1c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 2 Mar 2024 15:04:43 +0100
Subject: [PATCH 0812/1422] Simplify test object

---
 packages/framework/tests/Unit/NavGroupItemTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/tests/Unit/NavGroupItemTest.php b/packages/framework/tests/Unit/NavGroupItemTest.php
index 16e78cd5910..524428e48bd 100644
--- a/packages/framework/tests/Unit/NavGroupItemTest.php
+++ b/packages/framework/tests/Unit/NavGroupItemTest.php
@@ -88,7 +88,7 @@ public function testHasChildrenWithChildren()
     public function testCanAddItemToDropdown()
     {
         $group = new NavGroupItem('Foo');
-        $child = new NavItem(new Route(new MarkdownPage()), 'Child 1', group: 'foo');
+        $child = new NavItem(new Route(new MarkdownPage()), 'Bar');
 
         $this->assertSame([$child], $group->addChild($child)->getChildren());
     }

From 75f679f8a88ccb3bc6fe167ed624b0b66eba88a5 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 2 Mar 2024 15:06:08 +0100
Subject: [PATCH 0813/1422] Clean up and improve tests

---
 packages/framework/tests/Unit/NavGroupItemTest.php | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/packages/framework/tests/Unit/NavGroupItemTest.php b/packages/framework/tests/Unit/NavGroupItemTest.php
index 524428e48bd..334011af395 100644
--- a/packages/framework/tests/Unit/NavGroupItemTest.php
+++ b/packages/framework/tests/Unit/NavGroupItemTest.php
@@ -150,17 +150,19 @@ public function testGetPriorityWithNoChildrenUsesGroupPriority()
 
     public function testGetPriorityWithChildrenUsesGroupPriority()
     {
-        $group = new NavGroupItem('Foo');
-        $child = new NavItem(new Route(new MarkdownPage()), 'Bar');
-        $group->addChild($child);
+        $group = new NavGroupItem('Foo', [new NavItem(new Route(new MarkdownPage()), 'Bar', 100)]);
+
         $this->assertSame(999, $group->getPriority());
     }
 
     public function testGetPriorityWithDocumentationPageChildrenUsesLowestPriority()
     {
-        $group = new NavGroupItem('Foo');
-        $child = new NavItem(new Route(new DocumentationPage()), 'Foo', 100);
-        $group->addChild($child);
+        $group = new NavGroupItem('Foo', [
+            new NavItem(new Route(new DocumentationPage()), 'Foo', 100),
+            new NavItem(new Route(new DocumentationPage()), 'Bar', 200),
+            new NavItem(new Route(new DocumentationPage()), 'Baz', 300),
+        ]);
+
         $this->assertSame(100, $group->getPriority());
     }
 

From 103794a042a954d6284d5b36be3b610255a3d777 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 2 Mar 2024 15:06:47 +0100
Subject: [PATCH 0814/1422] Add reverse order to improve accuracy

---
 packages/framework/tests/Unit/NavGroupItemTest.php | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/packages/framework/tests/Unit/NavGroupItemTest.php b/packages/framework/tests/Unit/NavGroupItemTest.php
index 334011af395..62fe54152b4 100644
--- a/packages/framework/tests/Unit/NavGroupItemTest.php
+++ b/packages/framework/tests/Unit/NavGroupItemTest.php
@@ -157,11 +157,19 @@ public function testGetPriorityWithChildrenUsesGroupPriority()
 
     public function testGetPriorityWithDocumentationPageChildrenUsesLowestPriority()
     {
-        $group = new NavGroupItem('Foo', [
+        $items = [
             new NavItem(new Route(new DocumentationPage()), 'Foo', 100),
             new NavItem(new Route(new DocumentationPage()), 'Bar', 200),
             new NavItem(new Route(new DocumentationPage()), 'Baz', 300),
-        ]);
+        ];
+
+        $group = new NavGroupItem('Foo', $items);
+
+        $this->assertSame(100, $group->getPriority());
+
+        $items = array_reverse($items);
+
+        $group = new NavGroupItem('Foo', $items);
 
         $this->assertSame(100, $group->getPriority());
     }

From c10ec520937405835102a218c29c32c90a5d3418 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 2 Mar 2024 15:07:06 +0100
Subject: [PATCH 0815/1422] Inline local variables

---
 packages/framework/tests/Unit/NavGroupItemTest.php | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/packages/framework/tests/Unit/NavGroupItemTest.php b/packages/framework/tests/Unit/NavGroupItemTest.php
index 62fe54152b4..30a6ba3de1c 100644
--- a/packages/framework/tests/Unit/NavGroupItemTest.php
+++ b/packages/framework/tests/Unit/NavGroupItemTest.php
@@ -163,15 +163,8 @@ public function testGetPriorityWithDocumentationPageChildrenUsesLowestPriority()
             new NavItem(new Route(new DocumentationPage()), 'Baz', 300),
         ];
 
-        $group = new NavGroupItem('Foo', $items);
-
-        $this->assertSame(100, $group->getPriority());
-
-        $items = array_reverse($items);
-
-        $group = new NavGroupItem('Foo', $items);
-
-        $this->assertSame(100, $group->getPriority());
+        $this->assertSame(100, (new NavGroupItem('Foo', $items))->getPriority());
+        $this->assertSame(100, (new NavGroupItem('Foo', array_reverse($items)))->getPriority());
     }
 
     public function testGetPriorityUsesGroupPriorityForMixedChildTypes()

From 92ed65374c81776a06c8bf9d1ff9ab384b85ce6d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 2 Mar 2024 15:13:52 +0100
Subject: [PATCH 0816/1422] Change visibility

---
 packages/framework/tests/Unit/NavGroupItemTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/tests/Unit/NavGroupItemTest.php b/packages/framework/tests/Unit/NavGroupItemTest.php
index 30a6ba3de1c..370a42e4a5d 100644
--- a/packages/framework/tests/Unit/NavGroupItemTest.php
+++ b/packages/framework/tests/Unit/NavGroupItemTest.php
@@ -189,7 +189,7 @@ public function testGetPriorityHandlesExternalUrlChildGracefully()
         $this->assertSame(999, (new NavGroupItem('Foo', [new NavItem('https://example.com', 'Bar', 100)]))->getPriority());
     }
 
-    private function createNavItems(): array
+    protected function createNavItems(): array
     {
         return [
             new NavItem(new Route(new InMemoryPage('foo')), 'Foo'),

From 0479139b2e18aa05d4c3a77b70fefc9282e81f75 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 2 Mar 2024 15:15:14 +0100
Subject: [PATCH 0817/1422] No longer construct children in base class

---
 packages/framework/src/Framework/Features/Navigation/NavItem.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 8f8aec95e0c..b0a0cdec774 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -59,7 +59,6 @@ public function __construct(Route|string|null $destination, string $label, int $
         $this->priority = $priority;
         $this->group = static::normalizeGroupKey($group);
         $this->identifier = static::makeIdentifier($label);
-        $this->addChildren($children);
     }
 
     /**

From 2b61a147a37b88f5004fb2449665881dd9b4a9ec Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 2 Mar 2024 15:20:45 +0100
Subject: [PATCH 0818/1422] Remove children parameter from base class

---
 .../framework/src/Framework/Features/Navigation/NavItem.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index b0a0cdec774..451a354f1d1 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -48,7 +48,7 @@ class NavItem implements Stringable
      * @param  int  $priority  The priority to determine the order of the navigation item.
      * @param  string|null  $group  The dropdown/group identifier of the navigation item, if any.
      */
-    public function __construct(Route|string|null $destination, string $label, int $priority = NavigationMenu::DEFAULT, ?string $group = null, #[Deprecated] array $children = [])
+    public function __construct(Route|string|null $destination, string $label, int $priority = NavigationMenu::DEFAULT, ?string $group = null)
     {
         if (is_string($destination)) {
             $destination = Routes::get($destination) ?? new ExternalRoute($destination);

From a5396d65a2fe00e42b39d2b82b6c6fbfd8a33674 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 2 Mar 2024 16:27:45 +0100
Subject: [PATCH 0819/1422] Update static constructors to use self to prevent
 inheritance issues

It does not make sense to create NavGroupItem::forRoute and ::forLink, this serves as a compromise for now.
---
 .../Features/Navigation/NavGroupItem.php       |  1 -
 .../Framework/Features/Navigation/NavItem.php  |  8 ++++----
 .../framework/tests/Unit/NavGroupItemTest.php  | 18 ++++++++++++++++++
 3 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
index 1f009847e12..c73a67d8900 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
@@ -12,7 +12,6 @@
 
 /**
  * @todo Consider extracting trait for shared code with navigation menu class
- * @todo Consider inheritance issues with static constructors from NavItem class
  */
 class NavGroupItem extends NavItem
 {
diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 451a354f1d1..0a4857480bc 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -69,11 +69,11 @@ public function __construct(Route|string|null $destination, string $label, int $
      * @param  string|null  $label  Leave blank to use the label of the route's corresponding page.
      * @param  string|null  $group  Leave blank to use the group of the route's corresponding page.
      */
-    public static function forRoute(Route|string $route, ?string $label = null, ?int $priority = null, ?string $group = null): static
+    public static function forRoute(Route|string $route, ?string $label = null, ?int $priority = null, ?string $group = null): self
     {
         $route = $route instanceof Route ? $route : Routes::getOrFail($route);
 
-        return new static(
+        return new self(
             $route,
             $label ?? $route->getPage()->navigationMenuLabel(),
             $priority ?? $route->getPage()->navigationMenuPriority(),
@@ -84,9 +84,9 @@ public static function forRoute(Route|string $route, ?string $label = null, ?int
     /**
      * Create a new navigation menu item leading to an external URI.
      */
-    public static function forLink(string $href, string $label, int $priority = NavigationMenu::DEFAULT): static
+    public static function forLink(string $href, string $label, int $priority = NavigationMenu::DEFAULT): self
     {
-        return new static($href, $label, $priority);
+        return new self($href, $label, $priority);
     }
 
     /**
diff --git a/packages/framework/tests/Unit/NavGroupItemTest.php b/packages/framework/tests/Unit/NavGroupItemTest.php
index 370a42e4a5d..8eae025f789 100644
--- a/packages/framework/tests/Unit/NavGroupItemTest.php
+++ b/packages/framework/tests/Unit/NavGroupItemTest.php
@@ -189,6 +189,24 @@ public function testGetPriorityHandlesExternalUrlChildGracefully()
         $this->assertSame(999, (new NavGroupItem('Foo', [new NavItem('https://example.com', 'Bar', 100)]))->getPriority());
     }
 
+    public function testForRoute()
+    {
+        $item = NavGroupItem::forRoute(new Route(new InMemoryPage('foo')));
+
+        $this->assertInstanceOf(NavItem::class, $item);
+        $this->assertNotInstanceOf(NavGroupItem::class, $item);
+        $this->assertSame(NavItem::class, $item::class);
+    }
+
+    public function testForLink()
+    {
+        $item = NavGroupItem::forLink('foo', 'bar');
+
+        $this->assertInstanceOf(NavItem::class, $item);
+        $this->assertNotInstanceOf(NavGroupItem::class, $item);
+        $this->assertSame(NavItem::class, $item::class);
+    }
+
     protected function createNavItems(): array
     {
         return [

From 8f0232d40bba727f9a61a6b04b1962497d94501f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 2 Mar 2024 16:30:32 +0100
Subject: [PATCH 0820/1422] Add spacing

---
 .../framework/src/Framework/Features/Navigation/NavGroupItem.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
index c73a67d8900..92ffb49b7f9 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
@@ -25,6 +25,7 @@ class NavGroupItem extends NavItem
     public function __construct(string $label, array $children = [], int $priority = NavigationMenu::LAST)
     {
         parent::__construct(null, $label, $priority, static::normalizeGroupKey($label));
+
         $this->addChildren($children);
     }
 

From f7eaa13548cad16c0bba8e37b64f5de75d8304d0 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 2 Mar 2024 16:30:42 +0100
Subject: [PATCH 0821/1422] Remove unused import

---
 packages/framework/src/Framework/Features/Navigation/NavItem.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 0a4857480bc..0e9339467f9 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -4,7 +4,6 @@
 
 namespace Hyde\Framework\Features\Navigation;
 
-use JetBrains\PhpStorm\Deprecated;
 use Hyde\Foundation\Facades\Routes;
 use Hyde\Hyde;
 use Hyde\Support\Models\Route;

From 8ffb4539e2561d4a0052e5a7e4be9c6a0834f450 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 2 Mar 2024 16:32:59 +0100
Subject: [PATCH 0822/1422] Rename children property and accessors to items

---
 .../components/docs/sidebar-items.blade.php   |  2 +-
 .../Features/Navigation/NavGroupItem.php      | 16 +++++++--------
 .../Framework/Features/Navigation/NavItem.php | 10 +++++-----
 .../AutomaticNavigationConfigurationsTest.php |  2 +-
 .../Services/DocumentationSidebarTest.php     |  2 +-
 .../framework/tests/Unit/NavGroupItemTest.php | 20 +++++++++----------
 packages/framework/tests/Unit/NavItemTest.php |  4 ++--
 7 files changed, 27 insertions(+), 29 deletions(-)

diff --git a/packages/framework/resources/views/components/docs/sidebar-items.blade.php b/packages/framework/resources/views/components/docs/sidebar-items.blade.php
index 2485420d786..b160e95ff09 100644
--- a/packages/framework/resources/views/components/docs/sidebar-items.blade.php
+++ b/packages/framework/resources/views/components/docs/sidebar-items.blade.php
@@ -15,7 +15,7 @@
                     @endif
                 </header>
                 <ul class="sidebar-group-items ml-4 px-2 mb-2" role="list" @if($sidebar->isCollapsible()) x-show="groupOpen" @endif>
-                    @foreach ($group->getChildren() as $item)
+                    @foreach ($group->getItems() as $item)
                         @include('hyde::components.docs.sidebar-item', ['grouped' => true])
                     @endforeach
                 </ul>
diff --git a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
index 92ffb49b7f9..1e4e52de7e5 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
@@ -16,11 +16,9 @@
 class NavGroupItem extends NavItem
 {
     /**
-     * @deprecated Rename to $items
-     *
      * @var array<\Hyde\Framework\Features\Navigation\NavItem>
      */
-    protected array $children = [];
+    protected array $items = [];
 
     public function __construct(string $label, array $children = [], int $priority = NavigationMenu::LAST)
     {
@@ -36,9 +34,9 @@ public function __construct(string $label, array $children = [], int $priority =
      *
      * @return array<\Hyde\Framework\Features\Navigation\NavItem>
      */
-    public function getChildren(): array
+    public function getItems(): array
     {
-        return $this->children;
+        return $this->items;
     }
 
     /**
@@ -46,7 +44,7 @@ public function getChildren(): array
      */
     public function hasChildren(): bool
     {
-        return count($this->children) > 0;
+        return count($this->items) > 0;
     }
 
     /**
@@ -58,7 +56,7 @@ public function addChild(NavItem $item): static
     {
         $item->group ??= $this->group;
 
-        $this->children[] = $item;
+        $this->items[] = $item;
         $this->route = null;
 
         return $this;
@@ -86,7 +84,7 @@ public function addChildren(array $items): static
     public function getPriority(): int
     {
         if ($this->hasChildren() && $this->containsOnlyDocumentationPages()) {
-            return min($this->priority, collect($this->getChildren())->min(fn (NavItem $child): int => $child->getPriority()));
+            return min($this->priority, collect($this->getItems())->min(fn (NavItem $child): int => $child->getPriority()));
         }
 
         return parent::getPriority();
@@ -94,7 +92,7 @@ public function getPriority(): int
 
     protected function containsOnlyDocumentationPages(): bool
     {
-        return collect($this->getChildren())->every(function (NavItem $child): bool {
+        return collect($this->getItems())->every(function (NavItem $child): bool {
             return (! $child->getRoute() instanceof ExternalRoute) && $child->getRoute()->getPage() instanceof DocumentationPage;
         });
     }
diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 0e9339467f9..40e278bda7c 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -37,7 +37,7 @@ class NavItem implements Stringable
     protected string $identifier;
 
     /** @deprecated Use NavGroupItem::$items instead */
-    protected array $children = [];
+    protected array $items = [];
 
     /**
      * Create a new navigation menu item.
@@ -161,9 +161,9 @@ public function getIdentifier(): string
     /**
      * @deprecated Should not be called on this class
      */
-    public function getChildren(): array
+    public function getItems(): array
     {
-        return $this->children;
+        return $this->items;
     }
 
     /**
@@ -171,7 +171,7 @@ public function getChildren(): array
      */
     public function hasChildren(): bool
     {
-        return count($this->children) > 0;
+        return count($this->items) > 0;
     }
 
     /**
@@ -189,7 +189,7 @@ public function addChild(NavItem $item): static
     {
         $item->group ??= $this->group;
 
-        $this->children[] = $item;
+        $this->items[] = $item;
         $this->route = null;
 
         return $this;
diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 8c20c50acda..310bb492d0b 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -1317,7 +1317,7 @@ public function __construct(TestCase $test, $sidebar = false)
     public function state(): array
     {
         return $this->items->map(function (NavItem $item): TestNavItem {
-            return new TestNavItem($item->getLabel(), $item->getGroupIdentifier(), $item->getPriority(), $item->getChildren());
+            return new TestNavItem($item->getLabel(), $item->getGroupIdentifier(), $item->getPriority(), $item->getItems());
         })->toArray();
     }
 
diff --git a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
index 89c4d055e7d..1fa84d1155d 100644
--- a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
+++ b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
@@ -157,7 +157,7 @@ public function testSidebarPrioritiesCanBeSetInBothFrontMatterAndConfig()
     public function testGroupCanBeSetInFrontMatter()
     {
         $this->makePage('foo', ['navigation.group' => 'bar']);
-        $this->assertEquals('bar', collect(NavigationMenuGenerator::handle(DocumentationSidebar::class)->getItems()->first()->getChildren())->first()->getGroupIdentifier());
+        $this->assertEquals('bar', collect(NavigationMenuGenerator::handle(DocumentationSidebar::class)->getItems()->first()->getItems())->first()->getGroupIdentifier());
     }
 
     public function testHasGroupsReturnsFalseWhenThereAreNoGroups()
diff --git a/packages/framework/tests/Unit/NavGroupItemTest.php b/packages/framework/tests/Unit/NavGroupItemTest.php
index 8eae025f789..28fa612f644 100644
--- a/packages/framework/tests/Unit/NavGroupItemTest.php
+++ b/packages/framework/tests/Unit/NavGroupItemTest.php
@@ -49,8 +49,8 @@ public function testCanConstructWithChildren()
         $children = $this->createNavItems();
         $item = new NavGroupItem('Foo', $children);
 
-        $this->assertCount(2, $item->getChildren());
-        $this->assertSame($children, $item->getChildren());
+        $this->assertCount(2, $item->getItems());
+        $this->assertSame($children, $item->getItems());
     }
 
     public function testCanConstructWithChildrenWithoutRoute()
@@ -58,21 +58,21 @@ public function testCanConstructWithChildrenWithoutRoute()
         $children = $this->createNavItems();
         $item = new NavGroupItem('Foo', $children);
 
-        $this->assertCount(2, $item->getChildren());
-        $this->assertSame($children, $item->getChildren());
+        $this->assertCount(2, $item->getItems());
+        $this->assertSame($children, $item->getItems());
     }
 
-    public function testGetChildren()
+    public function testGetItems()
     {
         $children = $this->createNavItems();
         $item = new NavGroupItem('Foo', $children);
 
-        $this->assertSame($children, $item->getChildren());
+        $this->assertSame($children, $item->getItems());
     }
 
-    public function testGetChildrenWithNoChildren()
+    public function testGetItemsWithNoItems()
     {
-        $this->assertEmpty((new NavGroupItem('Foo'))->getChildren());
+        $this->assertEmpty((new NavGroupItem('Foo'))->getItems());
     }
 
     public function testHasChildren()
@@ -90,7 +90,7 @@ public function testCanAddItemToDropdown()
         $group = new NavGroupItem('Foo');
         $child = new NavItem(new Route(new MarkdownPage()), 'Bar');
 
-        $this->assertSame([$child], $group->addChild($child)->getChildren());
+        $this->assertSame([$child], $group->addChild($child)->getItems());
     }
 
     public function testAddChildMethodReturnsSelf()
@@ -106,7 +106,7 @@ public function testCanAddMultipleItemsToDropdown()
         $group = new NavGroupItem('Foo');
         $items = $this->createNavItems();
 
-        $this->assertSame($items, $group->addChildren($items)->getChildren());
+        $this->assertSame($items, $group->addChildren($items)->getItems());
     }
 
     public function testAddChildrenMethodReturnsSelf()
diff --git a/packages/framework/tests/Unit/NavItemTest.php b/packages/framework/tests/Unit/NavItemTest.php
index a56e057365b..aeff0c59a51 100644
--- a/packages/framework/tests/Unit/NavItemTest.php
+++ b/packages/framework/tests/Unit/NavItemTest.php
@@ -208,7 +208,7 @@ public function testDropdownFacade()
         $item = NavItem::forGroup('foo', []);
 
         $this->assertSame('foo', $item->getLabel());
-        $this->assertSame([], $item->getChildren());
+        $this->assertSame([], $item->getItems());
         $this->assertSame(999, $item->getPriority());
     }
 
@@ -219,7 +219,7 @@ public function testDropdownFacadeWithChildren()
         ];
 
         $item = NavItem::forGroup('foo', $children);
-        $this->assertSame($children, $item->getChildren());
+        $this->assertSame($children, $item->getItems());
         $this->assertSame(999, $item->getPriority());
     }
 

From 4805c8e0744398efe41d2ebf03cfc9534465a38e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 3 Mar 2024 12:23:09 +0100
Subject: [PATCH 0823/1422] Collapse PHPDoc

---
 .../src/Framework/Features/Navigation/NavGroupItem.php        | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
index 1e4e52de7e5..1ec4ff87b86 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
@@ -15,9 +15,7 @@
  */
 class NavGroupItem extends NavItem
 {
-    /**
-     * @var array<\Hyde\Framework\Features\Navigation\NavItem>
-     */
+    /** @var array<\Hyde\Framework\Features\Navigation\NavItem> */
     protected array $items = [];
 
     public function __construct(string $label, array $children = [], int $priority = NavigationMenu::LAST)

From 08b7936fe850ea3159288e25e17e5682be6a1088 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 3 Mar 2024 12:26:43 +0100
Subject: [PATCH 0824/1422] Deprecate `NavGroupItem::hasChildren` method

This is no longer needed, as it does not make sense to check if a group has children. Compare the instance type instead.
---
 .../src/Framework/Features/Navigation/NavGroupItem.php          | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
index 1ec4ff87b86..0b1206f3be4 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
@@ -39,6 +39,8 @@ public function getItems(): array
 
     /**
      * Check if the NavItem instance has children.
+     *
+     * @deprecated This is no longer needed, as it does not make sense to check if a group has children. Compare the instance type instead.
      */
     public function hasChildren(): bool
     {

From a68bb5b80eef40f15caf718093deec316b00a47d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 9 Mar 2024 20:03:32 +0100
Subject: [PATCH 0825/1422] Remove tests for deprecated method

---
 packages/framework/tests/Unit/NavGroupItemTest.php | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/packages/framework/tests/Unit/NavGroupItemTest.php b/packages/framework/tests/Unit/NavGroupItemTest.php
index 28fa612f644..1f37834c191 100644
--- a/packages/framework/tests/Unit/NavGroupItemTest.php
+++ b/packages/framework/tests/Unit/NavGroupItemTest.php
@@ -75,16 +75,6 @@ public function testGetItemsWithNoItems()
         $this->assertEmpty((new NavGroupItem('Foo'))->getItems());
     }
 
-    public function testHasChildren()
-    {
-        $this->assertFalse((new NavGroupItem('Foo'))->hasChildren());
-    }
-
-    public function testHasChildrenWithChildren()
-    {
-        $this->assertTrue((new NavGroupItem('Foo', $this->createNavItems()))->hasChildren());
-    }
-
     public function testCanAddItemToDropdown()
     {
         $group = new NavGroupItem('Foo');

From 1506ac8a968e8d681fc603aee34c8cf832aa7258 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 9 Mar 2024 20:13:23 +0100
Subject: [PATCH 0826/1422] Fall back to parent class priority

For example if there are no pages
---
 .../src/Framework/Features/Navigation/NavGroupItem.php          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
index 0b1206f3be4..ff8b9c725cf 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
@@ -84,7 +84,7 @@ public function addChildren(array $items): static
     public function getPriority(): int
     {
         if ($this->hasChildren() && $this->containsOnlyDocumentationPages()) {
-            return min($this->priority, collect($this->getItems())->min(fn (NavItem $child): int => $child->getPriority()));
+            return min($this->priority, collect($this->getItems())->min(fn (NavItem $child): int => $child->getPriority())) ?? parent::getPriority();
         }
 
         return parent::getPriority();

From f1b40c80916caa712bbdb542e2159f568eda8b4e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 9 Mar 2024 20:13:37 +0100
Subject: [PATCH 0827/1422] Revert "Fall back to parent class priority"

This reverts commit 1506ac8a968e8d681fc603aee34c8cf832aa7258.
---
 .../src/Framework/Features/Navigation/NavGroupItem.php          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
index ff8b9c725cf..0b1206f3be4 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
@@ -84,7 +84,7 @@ public function addChildren(array $items): static
     public function getPriority(): int
     {
         if ($this->hasChildren() && $this->containsOnlyDocumentationPages()) {
-            return min($this->priority, collect($this->getItems())->min(fn (NavItem $child): int => $child->getPriority())) ?? parent::getPriority();
+            return min($this->priority, collect($this->getItems())->min(fn (NavItem $child): int => $child->getPriority()));
         }
 
         return parent::getPriority();

From 027952690e3c2dbc0494a840b316874565891a99 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 9 Mar 2024 20:14:10 +0100
Subject: [PATCH 0828/1422] Return false if items are empty

---
 .../src/Framework/Features/Navigation/NavGroupItem.php        | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
index 0b1206f3be4..82305efe884 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
@@ -92,6 +92,10 @@ public function getPriority(): int
 
     protected function containsOnlyDocumentationPages(): bool
     {
+        if (empty($this->getItems())) {
+            return false;
+        }
+
         return collect($this->getItems())->every(function (NavItem $child): bool {
             return (! $child->getRoute() instanceof ExternalRoute) && $child->getRoute()->getPage() instanceof DocumentationPage;
         });

From 95654afffa1189a4d4db0b79a4635f553cdc9a43 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 9 Mar 2024 20:14:27 +0100
Subject: [PATCH 0829/1422] Remove state logic that is now unnecessary

---
 .../src/Framework/Features/Navigation/NavGroupItem.php          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
index 82305efe884..8470f5f07ca 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
@@ -83,7 +83,7 @@ public function addChildren(array $items): static
      */
     public function getPriority(): int
     {
-        if ($this->hasChildren() && $this->containsOnlyDocumentationPages()) {
+        if ($this->containsOnlyDocumentationPages()) {
             return min($this->priority, collect($this->getItems())->min(fn (NavItem $child): int => $child->getPriority()));
         }
 

From 91ea31f5b17c4d7cfbb5bee947663a96e31a8860 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 9 Mar 2024 21:18:00 +0100
Subject: [PATCH 0830/1422] Use instanceof check to determine child state

---
 .../src/Framework/Features/Navigation/DocumentationSidebar.php  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 11cb904cc7c..c931dd1a34c 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -88,7 +88,7 @@ private function shouldIndexPageBeActive(string $group): bool
 
         $indexPageHasNoSetGroup = Render::getPage()->navigationMenuGroup() === null;
 
-        $firstGroupInSidebar = $this->getItems()->firstWhere(fn (NavItem $item): bool => $item->hasChildren());
+        $firstGroupInSidebar = $this->getItems()->firstWhere(fn (NavItem $item): bool => $item instanceof NavGroupItem);
 
         $groupIsTheFirstOneInSidebar = $group === $firstGroupInSidebar?->getIdentifier();
 

From 92bebfa833ec46a3f62a89580e4f4458043f2315 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 9 Mar 2024 21:32:05 +0100
Subject: [PATCH 0831/1422] Use instanceof check to determine child state

---
 .../src/Framework/Features/Navigation/DocumentationSidebar.php  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index c931dd1a34c..853d84606cb 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -61,7 +61,7 @@ public function isCollapsible(): bool
 
     public function hasGroups(): bool
     {
-        return $this->getItems()->contains(fn (NavItem $item): bool => $item->hasChildren());
+        return $this->getItems()->contains(fn (NavItem $item): bool => $item instanceof NavGroupItem);
     }
 
     /**

From 4c8780ee77e1c5c1f9a9cb477a2305af905b0e55 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 9 Mar 2024 21:58:08 +0100
Subject: [PATCH 0832/1422] Update test for new system

---
 .../framework/tests/Unit/DocumentationSidebarUnitTest.php | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php b/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
index ee75d74d943..8e1a5d3457e 100644
--- a/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
+++ b/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
@@ -5,10 +5,10 @@
 namespace Hyde\Framework\Testing\Unit;
 
 use Hyde\Testing\UnitTestCase;
-use Hyde\Pages\DocumentationPage;
 use Illuminate\Support\Collection;
 use Hyde\Support\Models\ExternalRoute;
 use Hyde\Framework\Features\Navigation\NavItem;
+use Hyde\Framework\Features\Navigation\NavGroupItem;
 use Hyde\Framework\Features\Navigation\DocumentationSidebar;
 
 /**
@@ -218,15 +218,13 @@ public function testHasGroupsReturnsFalseWhenNoItemsHaveChildren()
         $this->assertFalse((new DocumentationSidebar())->hasGroups());
     }
 
-    public function testHasGroupsReturnsTrueWhenAtLeastOneItemHasChildren()
+    public function testHasGroupsReturnsTrueWhenAtLeastOneItemIsNavGroupItemInstance()
     {
         self::mockConfig();
         self::setupKernel();
 
-        $page = new DocumentationPage('foo');
-        $child = new DocumentationPage('bar');
         $menu = new DocumentationSidebar([
-            NavItem::forRoute($page->getRoute())->addChild(NavItem::forRoute($child->getRoute())),
+            new NavGroupItem('foo', []),
         ]);
 
         $this->assertTrue($menu->hasGroups());

From e67382344f8dcde04957785c4a3b9e19a45ff7f6 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 9 Mar 2024 22:03:07 +0100
Subject: [PATCH 0833/1422] Remove `NavGroupItem::hasChildren` method

This is no longer needed, as it does not make sense to check if a group has children. Compare the instance type instead.
---
 .../src/Framework/Features/Navigation/NavGroupItem.php | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
index 8470f5f07ca..371e1b5fc6f 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
@@ -37,16 +37,6 @@ public function getItems(): array
         return $this->items;
     }
 
-    /**
-     * Check if the NavItem instance has children.
-     *
-     * @deprecated This is no longer needed, as it does not make sense to check if a group has children. Compare the instance type instead.
-     */
-    public function hasChildren(): bool
-    {
-        return count($this->items) > 0;
-    }
-
     /**
      * Add a navigation item to the children of the navigation item.
      *

From 7f8c773eb3053a9197cdbfcf40e939f37046ee1e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 10 Mar 2024 13:01:17 +0100
Subject: [PATCH 0834/1422] Remove `NavItem::addChildren` method from base
 class

Moved to the new NavGroupItem class
---
 .../src/Framework/Features/Navigation/NavItem.php    | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 40e278bda7c..4d2697f270c 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -195,18 +195,6 @@ public function addChild(NavItem $item): static
         return $this;
     }
 
-    /**
-     * @deprecated Should not be called on this class
-     */
-    public function addChildren(array $items): static
-    {
-        foreach ($items as $item) {
-            $this->addChild($item);
-        }
-
-        return $this;
-    }
-
     protected static function normalizeGroupKey(?string $group): ?string
     {
         return $group ? Str::slug($group) : null;

From ad021c58258d8791e0fd4e1be9fa51c41a6281b1 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 10 Mar 2024 13:33:53 +0100
Subject: [PATCH 0835/1422] Remove `NavItem::addChild` method from base class

Moved to the new NavGroupItem class
---
 .../src/Framework/Features/Navigation/NavItem.php   | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 4d2697f270c..8d776013aea 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -182,19 +182,6 @@ public function isActive(): bool
         return Hyde::currentRoute()->getLink() === $this->route->getLink();
     }
 
-    /**
-     * @deprecated Should not be called on this class
-     */
-    public function addChild(NavItem $item): static
-    {
-        $item->group ??= $this->group;
-
-        $this->items[] = $item;
-        $this->route = null;
-
-        return $this;
-    }
-
     protected static function normalizeGroupKey(?string $group): ?string
     {
         return $group ? Str::slug($group) : null;

From c35cb8043a93606a9a815bf452400eaf183878a1 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 10 Mar 2024 17:23:06 +0100
Subject: [PATCH 0836/1422] Remove `NavItem::hasChildren` method

Instead, compare if the NavItem in an instance of the NavGroupItem class
---
 .../resources/views/layouts/navigation.blade.php          | 2 +-
 .../src/Framework/Features/Navigation/NavItem.php         | 8 --------
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/packages/framework/resources/views/layouts/navigation.blade.php b/packages/framework/resources/views/layouts/navigation.blade.php
index 060e228eb0b..fc7aad53803 100644
--- a/packages/framework/resources/views/layouts/navigation.blade.php
+++ b/packages/framework/resources/views/layouts/navigation.blade.php
@@ -35,7 +35,7 @@
         <ul aria-label="Navigation links" class="md:flex-grow md:flex justify-end">
             @foreach ($navigation->getItems() as $item)
                 <li class="md:mx-2">
-                    @if($item->hasChildren())
+                    @if($item instanceof \Hyde\Framework\Features\Navigation\NavGroupItem)
                         <x-hyde::navigation.dropdown :label="$item->getLabel()" :items="$item->getChildren()"/>
                     @else
                         @include('hyde::components.navigation.navigation-link')
diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 8d776013aea..d503a9d4f5c 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -166,14 +166,6 @@ public function getItems(): array
         return $this->items;
     }
 
-    /**
-     * @deprecated Should not be called on this class
-     */
-    public function hasChildren(): bool
-    {
-        return count($this->items) > 0;
-    }
-
     /**
      * Check if the NavItem instance is the current page being rendered.
      */

From 86306bfce495c669117e97af15d5dff418a3906e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 10 Mar 2024 17:23:38 +0100
Subject: [PATCH 0837/1422] Get items using new method

---
 packages/framework/resources/views/layouts/navigation.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/resources/views/layouts/navigation.blade.php b/packages/framework/resources/views/layouts/navigation.blade.php
index fc7aad53803..600d310fbd6 100644
--- a/packages/framework/resources/views/layouts/navigation.blade.php
+++ b/packages/framework/resources/views/layouts/navigation.blade.php
@@ -36,7 +36,7 @@
             @foreach ($navigation->getItems() as $item)
                 <li class="md:mx-2">
                     @if($item instanceof \Hyde\Framework\Features\Navigation\NavGroupItem)
-                        <x-hyde::navigation.dropdown :label="$item->getLabel()" :items="$item->getChildren()"/>
+                        <x-hyde::navigation.dropdown :label="$item->getLabel()" :items="$item->getItems()"/>
                     @else
                         @include('hyde::components.navigation.navigation-link')
                     @endif

From d5febfd0c2fdd2929e0a98ba05dfe9ed0a9cafce Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 10 Mar 2024 17:26:21 +0100
Subject: [PATCH 0838/1422] Narrow down return types to child class

---
 .../framework/src/Framework/Features/Navigation/NavItem.php   | 2 +-
 .../Framework/Features/Navigation/NavigationMenuGenerator.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index d503a9d4f5c..d73b015d8db 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -95,7 +95,7 @@ public static function forLink(string $href, string $label, int $priority = Navi
      * @param  array<NavItem>  $items  The items to be included in the dropdown.
      * @param  int  $priority  The priority of the dropdown item. Leave blank to use the default priority, which is last in the menu.
      */
-    public static function forGroup(string $label, array $items, int $priority = NavigationMenu::LAST): static
+    public static function forGroup(string $label, array $items, int $priority = NavigationMenu::LAST): NavGroupItem
     {
         return new NavGroupItem($label, $items, $priority);
     }
diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
index fdc5cf33415..842e8e75263 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
@@ -146,7 +146,7 @@ protected function addRouteToGroup(Route $route): void
         }
     }
 
-    protected function getOrCreateGroupItem(string $groupName): NavItem
+    protected function getOrCreateGroupItem(string $groupName): NavGroupItem
     {
         $groupKey = Str::slug($groupName);
         $group = $this->items->get($groupKey);
@@ -154,7 +154,7 @@ protected function getOrCreateGroupItem(string $groupName): NavItem
         return $group ?? $this->createGroupItem($groupKey, $groupName);
     }
 
-    protected function createGroupItem(string $groupKey, string $groupName): NavItem
+    protected function createGroupItem(string $groupKey, string $groupName): NavGroupItem
     {
         $label = $this->searchForGroupLabelInConfig($groupKey) ?? $groupName;
 

From 6404ddc65d03be26fb1a4f2305df9120aead33ef Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 10 Mar 2024 17:30:21 +0100
Subject: [PATCH 0839/1422] Return instance only if it is for a group

This means that items that have the same route key as a group identifier is ignored here
---
 .../Features/Navigation/NavigationMenuGenerator.php         | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
index 842e8e75263..4c78f119be9 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
@@ -151,7 +151,11 @@ protected function getOrCreateGroupItem(string $groupName): NavGroupItem
         $groupKey = Str::slug($groupName);
         $group = $this->items->get($groupKey);
 
-        return $group ?? $this->createGroupItem($groupKey, $groupName);
+        if ($group instanceof NavGroupItem) {
+            return $group;
+        }
+
+        return $this->createGroupItem($groupKey, $groupName);
     }
 
     protected function createGroupItem(string $groupKey, string $groupName): NavGroupItem

From be43166ed6b8b4f3e8e292653b625b0ac68bcde0 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 10 Mar 2024 17:34:09 +0100
Subject: [PATCH 0840/1422] Replace conflicting navigation items with grouped
 version

---
 .../Features/Navigation/NavigationMenuGenerator.php    | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
index 4c78f119be9..0ac947cc0bd 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
@@ -153,6 +153,16 @@ protected function getOrCreateGroupItem(string $groupName): NavGroupItem
 
         if ($group instanceof NavGroupItem) {
             return $group;
+        } elseif ($group instanceof NavItem) {
+            // We are trying to add children to an existing navigation menu item,
+            // so here we create a new instance to replace the base one, this
+            // does mean we lose the destination as we can't link to them.
+
+            $item = new NavGroupItem($group->getLabel(), [], $group->getPriority());
+
+            $this->items->put($groupKey, $item);
+
+            return $item;
         }
 
         return $this->createGroupItem($groupKey, $groupName);

From fddae2c652131b66a824a8b0dc6dec6ffcfd4eee Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 10 Mar 2024 20:27:14 +0100
Subject: [PATCH 0841/1422] Add marker for needed documentation

---
 .../Framework/Features/Navigation/NavigationMenuGenerator.php  | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
index 0ac947cc0bd..f41fa696e26 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
@@ -158,6 +158,9 @@ protected function getOrCreateGroupItem(string $groupName): NavGroupItem
             // so here we create a new instance to replace the base one, this
             // does mean we lose the destination as we can't link to them.
 
+            // Todo: Add note in documentation about this behavior
+            // Example file structure: _pages/foo.md, _pages/foo/bar.md, _pages/foo/baz.md, here the link to foo will be lost.
+
             $item = new NavGroupItem($group->getLabel(), [], $group->getPriority());
 
             $this->items->put($groupKey, $item);

From 201ca2d10e66874a52f8fb892c7de7f53ade610d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 10 Mar 2024 20:35:35 +0100
Subject: [PATCH 0842/1422] Remove `NavItem::getItems` method from base class

Moved to the new NavGroupItem class
---
 .../src/Framework/Features/Navigation/NavItem.php         | 8 --------
 .../Feature/AutomaticNavigationConfigurationsTest.php     | 3 ++-
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index d73b015d8db..d7acc2016f6 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -158,14 +158,6 @@ public function getIdentifier(): string
         return $this->identifier;
     }
 
-    /**
-     * @deprecated Should not be called on this class
-     */
-    public function getItems(): array
-    {
-        return $this->items;
-    }
-
     /**
      * Check if the NavItem instance is the current page being rendered.
      */
diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 310bb492d0b..7ce6a2dcb75 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -18,6 +18,7 @@
 use Illuminate\Support\Collection;
 use Hyde\Foundation\Kernel\RouteCollection;
 use Hyde\Framework\Features\Navigation\NavItem;
+use Hyde\Framework\Features\Navigation\NavGroupItem;
 use Hyde\Framework\Features\Navigation\MainNavigationMenu;
 use Hyde\Framework\Features\Navigation\DocumentationSidebar;
 use Hyde\Framework\Features\Navigation\NavigationMenuGenerator;
@@ -1317,7 +1318,7 @@ public function __construct(TestCase $test, $sidebar = false)
     public function state(): array
     {
         return $this->items->map(function (NavItem $item): TestNavItem {
-            return new TestNavItem($item->getLabel(), $item->getGroupIdentifier(), $item->getPriority(), $item->getItems());
+            return new TestNavItem($item->getLabel(), $item->getGroupIdentifier(), $item->getPriority(), $item instanceof NavGroupItem ? $item->getItems() : []);
         })->toArray();
     }
 

From eb55ce31eb1b3b326be3c897c723d9e51e608471 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 11 Mar 2024 11:03:41 +0100
Subject: [PATCH 0843/1422] Deprecate group parameter

---
 .../src/Framework/Features/Navigation/DocumentationSidebar.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 853d84606cb..c2e83fd0f8e 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -7,6 +7,7 @@
 use Hyde\Facades\Config;
 use Hyde\Pages\DocumentationPage;
 use Hyde\Support\Facades\Render;
+use JetBrains\PhpStorm\Deprecated;
 use Illuminate\Contracts\Support\Arrayable;
 use Illuminate\Support\Str;
 
@@ -69,7 +70,7 @@ public function hasGroups(): bool
      *
      * For index pages, this will also return true for the first group in the menu, unless the index page has a specific group set.
      */
-    public function isGroupActive(string $group): bool
+    public function isGroupActive(#[Deprecated('We should be able to get all the needed data from the instance and render data')]string $group): bool
     {
         $groupMatchesCurrentPageGroup = Str::slug(Render::getPage()->navigationMenuGroup()) === $group;
         $currentPageIsIndexPageAndShouldBeActive = $this->isCurrentPageIndexPage() && $this->shouldIndexPageBeActive($group);

From 4ca2b69d0965d26488e56f797f9990b033219928 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 11 Mar 2024 11:27:24 +0100
Subject: [PATCH 0844/1422] Deprecate `isGroupActive` method

This makes more sense as a method on the NavGroupItem class.
---
 .../src/Framework/Features/Navigation/DocumentationSidebar.php  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index c2e83fd0f8e..3a77e90031e 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -69,6 +69,8 @@ public function hasGroups(): bool
      * Is a page within the group the current page? This is used to determine if the sidebar group should be open when loading the page.
      *
      * For index pages, this will also return true for the first group in the menu, unless the index page has a specific group set.
+     *
+     * @deprecated This makes more sense as a method on the NavGroupItem class.
      */
     public function isGroupActive(#[Deprecated('We should be able to get all the needed data from the instance and render data')]string $group): bool
     {

From f04a630abe3c408ecfa30357bb3d3e1b1c267222 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 11 Mar 2024 11:42:29 +0100
Subject: [PATCH 0845/1422] Revert "Deprecate `isGroupActive` method"

This reverts commit 4ca2b69d0965d26488e56f797f9990b033219928.
---
 .../src/Framework/Features/Navigation/DocumentationSidebar.php  | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 3a77e90031e..c2e83fd0f8e 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -69,8 +69,6 @@ public function hasGroups(): bool
      * Is a page within the group the current page? This is used to determine if the sidebar group should be open when loading the page.
      *
      * For index pages, this will also return true for the first group in the menu, unless the index page has a specific group set.
-     *
-     * @deprecated This makes more sense as a method on the NavGroupItem class.
      */
     public function isGroupActive(#[Deprecated('We should be able to get all the needed data from the instance and render data')]string $group): bool
     {

From a480e4e3e5b6807eed4625ef8c559e0f8dd46eb0 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 11 Mar 2024 11:42:44 +0100
Subject: [PATCH 0846/1422] Revert "Deprecate group parameter"

This reverts commit eb55ce31eb1b3b326be3c897c723d9e51e608471.
---
 .../src/Framework/Features/Navigation/DocumentationSidebar.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index c2e83fd0f8e..853d84606cb 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -7,7 +7,6 @@
 use Hyde\Facades\Config;
 use Hyde\Pages\DocumentationPage;
 use Hyde\Support\Facades\Render;
-use JetBrains\PhpStorm\Deprecated;
 use Illuminate\Contracts\Support\Arrayable;
 use Illuminate\Support\Str;
 
@@ -70,7 +69,7 @@ public function hasGroups(): bool
      *
      * For index pages, this will also return true for the first group in the menu, unless the index page has a specific group set.
      */
-    public function isGroupActive(#[Deprecated('We should be able to get all the needed data from the instance and render data')]string $group): bool
+    public function isGroupActive(string $group): bool
     {
         $groupMatchesCurrentPageGroup = Str::slug(Render::getPage()->navigationMenuGroup()) === $group;
         $currentPageIsIndexPageAndShouldBeActive = $this->isCurrentPageIndexPage() && $this->shouldIndexPageBeActive($group);

From a2df70f636696d5f66f7ffd0150299589069e099 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 11 Mar 2024 11:47:31 +0100
Subject: [PATCH 0847/1422] Document why code location is weird

---
 .../src/Framework/Features/Navigation/DocumentationSidebar.php  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 853d84606cb..8dabcbf5254 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -68,6 +68,8 @@ public function hasGroups(): bool
      * Is a page within the group the current page? This is used to determine if the sidebar group should be open when loading the page.
      *
      * For index pages, this will also return true for the first group in the menu, unless the index page has a specific group set.
+     *
+     * We have this logic here because not all NavItem instances belong to sidebars, and we need data from both.
      */
     public function isGroupActive(string $group): bool
     {

From 8f6ba5ff49131a3d84f9771b3f6399de76710af5 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 11 Mar 2024 12:44:53 +0100
Subject: [PATCH 0848/1422] Deprecate the NavItem identifier property

---
 .../framework/src/Framework/Features/Navigation/NavItem.php   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index d7acc2016f6..9b39c5fda9b 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -33,7 +33,7 @@ class NavItem implements Stringable
     protected int $priority;
     protected ?string $group;
 
-    /** The "slugified" version of the label used to uniquely identify the item for things like active state comparisons. */
+    /** @deprecated The "slugified" version of the label used to uniquely identify the item for things like active state comparisons. */
     protected string $identifier;
 
     /** @deprecated Use NavGroupItem::$items instead */
@@ -152,6 +152,8 @@ public function getGroupIdentifier(): ?string
 
     /**
      * Get the identifier of the navigation item.
+     *
+     * @deprecated This only seems to be used by groups so might want to move it there and rename it to getGroupKey to match usages
      */
     public function getIdentifier(): string
     {

From d415e910cf472f6dcc186dc5313dde9fec5ba6ed Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 11 Mar 2024 12:47:43 +0100
Subject: [PATCH 0849/1422] Use group identifier for comparison

---
 .../resources/views/components/docs/sidebar-items.blade.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/resources/views/components/docs/sidebar-items.blade.php b/packages/framework/resources/views/components/docs/sidebar-items.blade.php
index b160e95ff09..92326932f83 100644
--- a/packages/framework/resources/views/components/docs/sidebar-items.blade.php
+++ b/packages/framework/resources/views/components/docs/sidebar-items.blade.php
@@ -7,7 +7,7 @@
 @else
     <ul id="sidebar-items" role="list">
         @foreach ($sidebar->getItems() as $group)
-            <li class="sidebar-group" role="listitem" @if($sidebar->isCollapsible()) x-data="{ groupOpen: {{ $sidebar->isGroupActive($group->getIdentifier()) ? 'true' : 'false' }} }" @endif>
+            <li class="sidebar-group" role="listitem" @if($sidebar->isCollapsible()) x-data="{ groupOpen: {{ $sidebar->isGroupActive($group->getGroupIdentifier()) ? 'true' : 'false' }} }" @endif>
                 <header @class(['sidebar-group-header p-2 px-4 -ml-2 flex justify-between items-center', 'group hover:bg-black/10' => $sidebar->isCollapsible()]) @if($sidebar->isCollapsible()) @click="groupOpen = ! groupOpen" @endif>
                     <h4 @class(['sidebar-group-heading text-base font-semibold', 'cursor-pointer dark:group-hover:text-white' => $sidebar->isCollapsible()])>{{ $group->getLabel() }}</h4>
                     @if($sidebar->isCollapsible())

From b3d12375a660d0647a086c77042b683ce036f05b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 11 Mar 2024 12:55:24 +0100
Subject: [PATCH 0850/1422] Use group identifier instead of deprecated base
 identifier

---
 .../Framework/Features/Navigation/NavigationMenuGenerator.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
index f41fa696e26..b2860bd4345 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
@@ -141,8 +141,8 @@ protected function addRouteToGroup(Route $route): void
 
         $groupItem->addChild($item);
 
-        if (! $this->items->has($groupItem->getIdentifier())) {
-            $this->items->put($groupItem->getIdentifier(), $groupItem);
+        if (! $this->items->has($groupItem->getGroupIdentifier())) {
+            $this->items->put($groupItem->getGroupIdentifier(), $groupItem);
         }
     }
 

From e830cdaca6b1550b518130a9ccae73a76e65b149 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 11 Mar 2024 13:18:13 +0100
Subject: [PATCH 0851/1422] Rename NavItem method `getGroupIdentifier` to
 `getGroupKey`

Matches the documented usage better
---
 .../views/components/docs/sidebar-items.blade.php    |  2 +-
 .../src/Framework/Features/Navigation/NavItem.php    |  4 ++--
 .../Features/Navigation/NavigationMenuGenerator.php  |  6 +++---
 .../AutomaticNavigationConfigurationsTest.php        |  2 +-
 .../Feature/Services/DocumentationSidebarTest.php    |  2 +-
 packages/framework/tests/Unit/NavGroupItemTest.php   |  8 ++++----
 packages/framework/tests/Unit/NavItemTest.php        | 12 ++++++------
 7 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/packages/framework/resources/views/components/docs/sidebar-items.blade.php b/packages/framework/resources/views/components/docs/sidebar-items.blade.php
index 92326932f83..e06a90e94c5 100644
--- a/packages/framework/resources/views/components/docs/sidebar-items.blade.php
+++ b/packages/framework/resources/views/components/docs/sidebar-items.blade.php
@@ -7,7 +7,7 @@
 @else
     <ul id="sidebar-items" role="list">
         @foreach ($sidebar->getItems() as $group)
-            <li class="sidebar-group" role="listitem" @if($sidebar->isCollapsible()) x-data="{ groupOpen: {{ $sidebar->isGroupActive($group->getGroupIdentifier()) ? 'true' : 'false' }} }" @endif>
+            <li class="sidebar-group" role="listitem" @if($sidebar->isCollapsible()) x-data="{ groupOpen: {{ $sidebar->isGroupActive($group->getGroupKey()) ? 'true' : 'false' }} }" @endif>
                 <header @class(['sidebar-group-header p-2 px-4 -ml-2 flex justify-between items-center', 'group hover:bg-black/10' => $sidebar->isCollapsible()]) @if($sidebar->isCollapsible()) @click="groupOpen = ! groupOpen" @endif>
                     <h4 @class(['sidebar-group-heading text-base font-semibold', 'cursor-pointer dark:group-hover:text-white' => $sidebar->isCollapsible()])>{{ $group->getLabel() }}</h4>
                     @if($sidebar->isCollapsible())
diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 9b39c5fda9b..457341a5910 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -141,11 +141,11 @@ public function getPriority(): int
     }
 
     /**
-     * Get the group identifier of the navigation item, if any.
+     * Get the group identifier key of the navigation item, if any.
      *
      * For sidebars this is the category key, for navigation menus this is the dropdown key.
      */
-    public function getGroupIdentifier(): ?string
+    public function getGroupKey(): ?string
     {
         return $this->group;
     }
diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
index b2860bd4345..4bbc163efc0 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
@@ -135,14 +135,14 @@ protected function addRouteToGroup(Route $route): void
     {
         $item = NavItem::forRoute($route);
 
-        $groupName = $this->generatesSidebar ? ($item->getGroupIdentifier() ?? 'Other') : $item->getGroupIdentifier();
+        $groupName = $this->generatesSidebar ? ($item->getGroupKey() ?? 'Other') : $item->getGroupKey();
 
         $groupItem = $this->getOrCreateGroupItem($groupName);
 
         $groupItem->addChild($item);
 
-        if (! $this->items->has($groupItem->getGroupIdentifier())) {
-            $this->items->put($groupItem->getGroupIdentifier(), $groupItem);
+        if (! $this->items->has($groupItem->getGroupKey())) {
+            $this->items->put($groupItem->getGroupKey(), $groupItem);
         }
     }
 
diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 7ce6a2dcb75..0de6e2ee60a 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -1318,7 +1318,7 @@ public function __construct(TestCase $test, $sidebar = false)
     public function state(): array
     {
         return $this->items->map(function (NavItem $item): TestNavItem {
-            return new TestNavItem($item->getLabel(), $item->getGroupIdentifier(), $item->getPriority(), $item instanceof NavGroupItem ? $item->getItems() : []);
+            return new TestNavItem($item->getLabel(), $item->getGroupKey(), $item->getPriority(), $item instanceof NavGroupItem ? $item->getItems() : []);
         })->toArray();
     }
 
diff --git a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
index 1fa84d1155d..01aa15b3430 100644
--- a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
+++ b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
@@ -157,7 +157,7 @@ public function testSidebarPrioritiesCanBeSetInBothFrontMatterAndConfig()
     public function testGroupCanBeSetInFrontMatter()
     {
         $this->makePage('foo', ['navigation.group' => 'bar']);
-        $this->assertEquals('bar', collect(NavigationMenuGenerator::handle(DocumentationSidebar::class)->getItems()->first()->getItems())->first()->getGroupIdentifier());
+        $this->assertEquals('bar', collect(NavigationMenuGenerator::handle(DocumentationSidebar::class)->getItems()->first()->getItems())->first()->getGroupKey());
     }
 
     public function testHasGroupsReturnsFalseWhenThereAreNoGroups()
diff --git a/packages/framework/tests/Unit/NavGroupItemTest.php b/packages/framework/tests/Unit/NavGroupItemTest.php
index 1f37834c191..b8bc2caad15 100644
--- a/packages/framework/tests/Unit/NavGroupItemTest.php
+++ b/packages/framework/tests/Unit/NavGroupItemTest.php
@@ -113,8 +113,8 @@ public function testAddingAnItemWithAGroupKeyKeepsTheSetGroupKey()
 
         $group->addChild($child);
 
-        $this->assertSame('foo', $group->getGroupIdentifier());
-        $this->assertSame('bar', $child->getGroupIdentifier());
+        $this->assertSame('foo', $group->getGroupKey());
+        $this->assertSame('bar', $child->getGroupKey());
     }
 
     public function testAddingAnItemWithNoGroupKeyUsesGroupIdentifier()
@@ -124,8 +124,8 @@ public function testAddingAnItemWithNoGroupKeyUsesGroupIdentifier()
 
         $group->addChild($child);
 
-        $this->assertSame('foo', $group->getGroupIdentifier());
-        $this->assertSame('foo', $child->getGroupIdentifier());
+        $this->assertSame('foo', $group->getGroupKey());
+        $this->assertSame('foo', $child->getGroupKey());
     }
 
     public function testGetPriorityUsesDefaultPriority()
diff --git a/packages/framework/tests/Unit/NavItemTest.php b/packages/framework/tests/Unit/NavItemTest.php
index aeff0c59a51..d6362b5579d 100644
--- a/packages/framework/tests/Unit/NavItemTest.php
+++ b/packages/framework/tests/Unit/NavItemTest.php
@@ -105,7 +105,7 @@ public function testGetPriority()
     public function testGetGroup()
     {
         $navItem = new NavItem(new Route(new InMemoryPage('foo')), 'Page', 500);
-        $this->assertNull($navItem->getGroupIdentifier());
+        $this->assertNull($navItem->getGroupKey());
     }
 
     public function testFromRoute()
@@ -252,28 +252,28 @@ public function testIsCurrentWithExternalRoute()
 
     public function testGetGroupWithNoGroup()
     {
-        $this->assertNull((new NavItem(new Route(new MarkdownPage()), 'Test', 500))->getGroupIdentifier());
+        $this->assertNull((new NavItem(new Route(new MarkdownPage()), 'Test', 500))->getGroupKey());
     }
 
     public function testGetGroupWithGroup()
     {
-        $this->assertSame('foo', (new NavItem(new Route(new MarkdownPage()), 'Test', 500, 'foo'))->getGroupIdentifier());
+        $this->assertSame('foo', (new NavItem(new Route(new MarkdownPage()), 'Test', 500, 'foo'))->getGroupKey());
     }
 
     public function testGetGroupFromRouteWithGroup()
     {
-        $this->assertSame('foo', NavItem::forRoute(new Route(new MarkdownPage(matter: ['navigation.group' => 'foo'])))->getGroupIdentifier());
+        $this->assertSame('foo', NavItem::forRoute(new Route(new MarkdownPage(matter: ['navigation.group' => 'foo'])))->getGroupKey());
     }
 
     public function testGetGroupForRouteWithGroup()
     {
-        $this->assertSame('foo', NavItem::forRoute(new Route(new MarkdownPage(matter: ['navigation.group' => 'foo'])), 'foo')->getGroupIdentifier());
+        $this->assertSame('foo', NavItem::forRoute(new Route(new MarkdownPage(matter: ['navigation.group' => 'foo'])), 'foo')->getGroupKey());
     }
 
     public function testGroupKeysAreNormalized()
     {
         $item = new NavItem(new Route(new MarkdownPage()), 'Test', 500, 'Foo Bar');
-        $this->assertSame('foo-bar', $item->getGroupIdentifier());
+        $this->assertSame('foo-bar', $item->getGroupKey());
     }
 
     public function testIdentifier()

From 711ef0305b25711c2344ee091d7dee50c5bd7c39 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 11 Mar 2024 13:22:20 +0100
Subject: [PATCH 0852/1422] Improve code documentation

---
 packages/framework/src/Framework/Features/Navigation/NavItem.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 457341a5910..3a994ecf6f6 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -144,6 +144,7 @@ public function getPriority(): int
      * Get the group identifier key of the navigation item, if any.
      *
      * For sidebars this is the category key, for navigation menus this is the dropdown key.
+     * It's based on the "slugified" group label, or the subdirectory name if that is how.
      */
     public function getGroupKey(): ?string
     {

From d15b710aa6fc9a47359c920cb978c578a3590fbe Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 11 Mar 2024 13:24:33 +0100
Subject: [PATCH 0853/1422] Improve code documentation

---
 .../framework/src/Framework/Features/Navigation/NavItem.php   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 3a994ecf6f6..3ace9af6ab4 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -143,8 +143,10 @@ public function getPriority(): int
     /**
      * Get the group identifier key of the navigation item, if any.
      *
+     * When using automatic subdirectory based groups, the subdirectory name is the group key.
+     * Otherwise, the group key is a "slugified" version of the group's label.
+     *
      * For sidebars this is the category key, for navigation menus this is the dropdown key.
-     * It's based on the "slugified" group label, or the subdirectory name if that is how.
      */
     public function getGroupKey(): ?string
     {

From 029b01db18be6e044a561e595cda2f7482dacee7 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 11 Mar 2024 13:26:51 +0100
Subject: [PATCH 0854/1422] Use group key for comparison

---
 .../src/Framework/Features/Navigation/DocumentationSidebar.php  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 8dabcbf5254..8d1d2567c29 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -92,7 +92,7 @@ private function shouldIndexPageBeActive(string $group): bool
 
         $firstGroupInSidebar = $this->getItems()->firstWhere(fn (NavItem $item): bool => $item instanceof NavGroupItem);
 
-        $groupIsTheFirstOneInSidebar = $group === $firstGroupInSidebar?->getIdentifier();
+        $groupIsTheFirstOneInSidebar = $group === $firstGroupInSidebar?->getGroupKey();
 
         return $indexPageHasNoSetGroup && $groupIsTheFirstOneInSidebar;
     }

From 2352dced085ba60335a705876a598fecb307c912 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 11 Mar 2024 13:28:01 +0100
Subject: [PATCH 0855/1422] Remove unnecessary NavItem identifier feature

---
 .../Framework/Features/Navigation/NavItem.php | 14 --------
 packages/framework/tests/Unit/NavItemTest.php | 36 -------------------
 2 files changed, 50 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 3ace9af6ab4..a787d4ea25f 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -33,9 +33,6 @@ class NavItem implements Stringable
     protected int $priority;
     protected ?string $group;
 
-    /** @deprecated The "slugified" version of the label used to uniquely identify the item for things like active state comparisons. */
-    protected string $identifier;
-
     /** @deprecated Use NavGroupItem::$items instead */
     protected array $items = [];
 
@@ -57,7 +54,6 @@ public function __construct(Route|string|null $destination, string $label, int $
         $this->label = $label;
         $this->priority = $priority;
         $this->group = static::normalizeGroupKey($group);
-        $this->identifier = static::makeIdentifier($label);
     }
 
     /**
@@ -153,16 +149,6 @@ public function getGroupKey(): ?string
         return $this->group;
     }
 
-    /**
-     * Get the identifier of the navigation item.
-     *
-     * @deprecated This only seems to be used by groups so might want to move it there and rename it to getGroupKey to match usages
-     */
-    public function getIdentifier(): string
-    {
-        return $this->identifier;
-    }
-
     /**
      * Check if the NavItem instance is the current page being rendered.
      */
diff --git a/packages/framework/tests/Unit/NavItemTest.php b/packages/framework/tests/Unit/NavItemTest.php
index d6362b5579d..98093b7628e 100644
--- a/packages/framework/tests/Unit/NavItemTest.php
+++ b/packages/framework/tests/Unit/NavItemTest.php
@@ -275,40 +275,4 @@ public function testGroupKeysAreNormalized()
         $item = new NavItem(new Route(new MarkdownPage()), 'Test', 500, 'Foo Bar');
         $this->assertSame('foo-bar', $item->getGroupKey());
     }
-
-    public function testIdentifier()
-    {
-        $route = new Route(new MarkdownPage());
-        $item = new NavItem($route, 'Test', 500);
-
-        $this->assertSame('test', $item->getIdentifier());
-    }
-
-    public function testIdentifierWithCustomLabel()
-    {
-        $route = new Route(new MarkdownPage());
-        $item = new NavItem($route, 'Foo Bar', 500);
-
-        $this->assertSame('foo-bar', $item->getIdentifier());
-    }
-
-    public function testIdentifierFromRouteKey()
-    {
-        $item = NavItem::forRoute(Routes::get('index'));
-        $this->assertSame('home', $item->getIdentifier());
-    }
-
-    public function testIdentifierUsesLabelWhenRouteKeyIsFalsy()
-    {
-        $route = new Route(new MarkdownPage());
-        $item = new NavItem($route, 'Foo Bar', 500);
-
-        $this->assertSame('foo-bar', $item->getIdentifier());
-    }
-
-    public function testIdentifierUsesLabelForExternalRoute()
-    {
-        $item = NavItem::forLink('https://example.com', 'Foo Bar');
-        $this->assertSame('foo-bar', $item->getIdentifier());
-    }
 }

From cc5bad4133dad8782d1b0fe3129caa37bd2067d3 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 11 Mar 2024 16:16:34 +0100
Subject: [PATCH 0856/1422] Add todo

---
 .../src/Framework/Features/Navigation/DocumentationSidebar.php  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 8d1d2567c29..64ed8edd555 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -88,6 +88,8 @@ private function shouldIndexPageBeActive(string $group): bool
     {
         // Unless the index page has a specific group set, the first group in the sidebar should be active.
 
+        // Todo: It may make more sense to handle this logic in the view, as it's a UI concern and this is a data model.
+
         $indexPageHasNoSetGroup = Render::getPage()->navigationMenuGroup() === null;
 
         $firstGroupInSidebar = $this->getItems()->firstWhere(fn (NavItem $item): bool => $item instanceof NavGroupItem);

From c549371c057a9de367e4c526b6b86bc63cfcc8ed Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 11 Mar 2024 16:19:22 +0100
Subject: [PATCH 0857/1422] Rename `addChild` method to `addItem`

---
 .../src/Framework/Features/Navigation/NavGroupItem.php |  4 ++--
 .../Features/Navigation/NavigationMenuGenerator.php    |  2 +-
 packages/framework/tests/Unit/NavGroupItemTest.php     | 10 +++++-----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
index 371e1b5fc6f..6b61bfcf297 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
@@ -42,7 +42,7 @@ public function getItems(): array
      *
      * This will turn the parent item into a dropdown. Its destination will be set to null.
      */
-    public function addChild(NavItem $item): static
+    public function addItem(NavItem $item): static
     {
         $item->group ??= $this->group;
 
@@ -60,7 +60,7 @@ public function addChild(NavItem $item): static
     public function addChildren(array $items): static
     {
         foreach ($items as $item) {
-            $this->addChild($item);
+            $this->addItem($item);
         }
 
         return $this;
diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
index 4bbc163efc0..5aacd70441e 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
@@ -139,7 +139,7 @@ protected function addRouteToGroup(Route $route): void
 
         $groupItem = $this->getOrCreateGroupItem($groupName);
 
-        $groupItem->addChild($item);
+        $groupItem->addItem($item);
 
         if (! $this->items->has($groupItem->getGroupKey())) {
             $this->items->put($groupItem->getGroupKey(), $groupItem);
diff --git a/packages/framework/tests/Unit/NavGroupItemTest.php b/packages/framework/tests/Unit/NavGroupItemTest.php
index b8bc2caad15..ea5513813e2 100644
--- a/packages/framework/tests/Unit/NavGroupItemTest.php
+++ b/packages/framework/tests/Unit/NavGroupItemTest.php
@@ -80,7 +80,7 @@ public function testCanAddItemToDropdown()
         $group = new NavGroupItem('Foo');
         $child = new NavItem(new Route(new MarkdownPage()), 'Bar');
 
-        $this->assertSame([$child], $group->addChild($child)->getItems());
+        $this->assertSame([$child], $group->addItem($child)->getItems());
     }
 
     public function testAddChildMethodReturnsSelf()
@@ -88,7 +88,7 @@ public function testAddChildMethodReturnsSelf()
         $group = new NavGroupItem('Foo');
         $child = new NavItem(new Route(new MarkdownPage()), 'Bar');
 
-        $this->assertSame($group, $group->addChild($child));
+        $this->assertSame($group, $group->addItem($child));
     }
 
     public function testCanAddMultipleItemsToDropdown()
@@ -111,7 +111,7 @@ public function testAddingAnItemWithAGroupKeyKeepsTheSetGroupKey()
         $group = new NavGroupItem('Foo');
         $child = new NavItem(new Route(new MarkdownPage()), 'Child', group: 'bar');
 
-        $group->addChild($child);
+        $group->addItem($child);
 
         $this->assertSame('foo', $group->getGroupKey());
         $this->assertSame('bar', $child->getGroupKey());
@@ -122,7 +122,7 @@ public function testAddingAnItemWithNoGroupKeyUsesGroupIdentifier()
         $group = new NavGroupItem('Foo');
         $child = new NavItem(new Route(new MarkdownPage()), 'Bar');
 
-        $group->addChild($child);
+        $group->addItem($child);
 
         $this->assertSame('foo', $group->getGroupKey());
         $this->assertSame('foo', $child->getGroupKey());
@@ -163,7 +163,7 @@ public function testGetPriorityUsesGroupPriorityForMixedChildTypes()
 
         foreach (HydeCoreExtension::getPageClasses() as $type) {
             $child = new NavItem(new Route(new $type()), 'Bar', 100);
-            $group->addChild($child);
+            $group->addItem($child);
         }
 
         $this->assertSame(999, $group->getPriority());

From 76a50691d5a114b51d37e6930575eb16416ac8c9 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 11 Mar 2024 16:19:40 +0100
Subject: [PATCH 0858/1422] Rename `addChildren` method to `addItems`

---
 .../src/Framework/Features/Navigation/NavGroupItem.php        | 4 ++--
 packages/framework/tests/Unit/NavGroupItemTest.php            | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
index 6b61bfcf297..6b090f4750f 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
@@ -22,7 +22,7 @@ public function __construct(string $label, array $children = [], int $priority =
     {
         parent::__construct(null, $label, $priority, static::normalizeGroupKey($label));
 
-        $this->addChildren($children);
+        $this->addItems($children);
     }
 
     /**
@@ -57,7 +57,7 @@ public function addItem(NavItem $item): static
      *
      * @param  array<\Hyde\Framework\Features\Navigation\NavItem>  $items
      */
-    public function addChildren(array $items): static
+    public function addItems(array $items): static
     {
         foreach ($items as $item) {
             $this->addItem($item);
diff --git a/packages/framework/tests/Unit/NavGroupItemTest.php b/packages/framework/tests/Unit/NavGroupItemTest.php
index ea5513813e2..c76f37aa346 100644
--- a/packages/framework/tests/Unit/NavGroupItemTest.php
+++ b/packages/framework/tests/Unit/NavGroupItemTest.php
@@ -96,14 +96,14 @@ public function testCanAddMultipleItemsToDropdown()
         $group = new NavGroupItem('Foo');
         $items = $this->createNavItems();
 
-        $this->assertSame($items, $group->addChildren($items)->getItems());
+        $this->assertSame($items, $group->addItems($items)->getItems());
     }
 
     public function testAddChildrenMethodReturnsSelf()
     {
         $group = new NavGroupItem('Foo');
 
-        $this->assertSame($group, $group->addChildren([]));
+        $this->assertSame($group, $group->addItems([]));
     }
 
     public function testAddingAnItemWithAGroupKeyKeepsTheSetGroupKey()

From 1ba5848654ef2e01ebc1ef30a27be12fb8d546c3 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 11 Mar 2024 16:21:17 +0100
Subject: [PATCH 0859/1422] Change named `$children` parameter to `$items`

---
 .../src/Framework/Features/Navigation/NavGroupItem.php        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
index 6b090f4750f..792386b033e 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
@@ -18,11 +18,11 @@ class NavGroupItem extends NavItem
     /** @var array<\Hyde\Framework\Features\Navigation\NavItem> */
     protected array $items = [];
 
-    public function __construct(string $label, array $children = [], int $priority = NavigationMenu::LAST)
+    public function __construct(string $label, array $items = [], int $priority = NavigationMenu::LAST)
     {
         parent::__construct(null, $label, $priority, static::normalizeGroupKey($label));
 
-        $this->addItems($children);
+        $this->addItems($items);
     }
 
     /**

From d8ece8fdd3c317468047b14aaf0f4b396de7072c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 11 Mar 2024 16:29:29 +0100
Subject: [PATCH 0860/1422] Remove route null writing not needed for standalone
 class

Since splitting out the class this is already null from the start
---
 .../framework/src/Framework/Features/Navigation/NavGroupItem.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
index 792386b033e..4f3cb6fb1aa 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
@@ -47,7 +47,6 @@ public function addItem(NavItem $item): static
         $item->group ??= $this->group;
 
         $this->items[] = $item;
-        $this->route = null;
 
         return $this;
     }

From a1b82f0da486b9ea79821f6758b8d346a55f6c0e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 11 Mar 2024 17:06:05 +0100
Subject: [PATCH 0861/1422] Update class documentation

---
 .../Framework/Features/Navigation/NavGroupItem.php   | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
index 4f3cb6fb1aa..72bd92a3ac8 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
@@ -11,6 +11,8 @@
 use function collect;
 
 /**
+ * Abstraction for a grouped navigation menu item. For main navigation menus, this is a dropdown.
+ *
  * @todo Consider extracting trait for shared code with navigation menu class
  */
 class NavGroupItem extends NavItem
@@ -26,7 +28,7 @@ public function __construct(string $label, array $items = [], int $priority = Na
     }
 
     /**
-     * Get the children of the navigation item.
+     * Get the items of the grouped navigation item.
      *
      * For the main navigation menu, this stores any dropdown items.
      *
@@ -38,9 +40,7 @@ public function getItems(): array
     }
 
     /**
-     * Add a navigation item to the children of the navigation item.
-     *
-     * This will turn the parent item into a dropdown. Its destination will be set to null.
+     * Add a navigation item to the grouped navigation item.
      */
     public function addItem(NavItem $item): static
     {
@@ -52,7 +52,7 @@ public function addItem(NavItem $item): static
     }
 
     /**
-     * Add multiple navigation items to the children of the navigation item.
+     * Add multiple navigation items to the grouped navigation item.
      *
      * @param  array<\Hyde\Framework\Features\Navigation\NavItem>  $items
      */
@@ -66,7 +66,7 @@ public function addItems(array $items): static
     }
 
     /**
-     * Get the priority to determine the order of the navigation item.
+     * Get the priority to determine the order of the grouped navigation item.
      *
      * For sidebar groups, this is the priority of the lowest priority child, unless the dropdown has a lower priority.
      */

From a4d9207e1f714c8c2ea780f1055a1987fe19b52e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 11 Mar 2024 17:18:45 +0100
Subject: [PATCH 0862/1422] Remove unused helper method

---
 .../framework/src/Framework/Features/Navigation/NavItem.php  | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index a787d4ea25f..5f2ffe3a200 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -161,9 +161,4 @@ protected static function normalizeGroupKey(?string $group): ?string
     {
         return $group ? Str::slug($group) : null;
     }
-
-    protected static function makeIdentifier(string $label): string
-    {
-        return Str::slug($label);
-    }
 }

From 563444e11d4af9af4bb64dfe038981975a6a5f1e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 11 Mar 2024 17:18:53 +0100
Subject: [PATCH 0863/1422] Normalize documentation terms

---
 .../framework/src/Framework/Features/Navigation/NavItem.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 5f2ffe3a200..5921d6af9a6 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -42,7 +42,7 @@ class NavItem implements Stringable
      * @param  \Hyde\Support\Models\Route|string|null  $destination  Route instance, route key, or external URI. For dropdowns/groups, this should be null.
      * @param  string  $label  The label of the navigation item.
      * @param  int  $priority  The priority to determine the order of the navigation item.
-     * @param  string|null  $group  The dropdown/group identifier of the navigation item, if any.
+     * @param  string|null  $group  The dropdown/group key of the navigation item, if any.
      */
     public function __construct(Route|string|null $destination, string $label, int $priority = NavigationMenu::DEFAULT, ?string $group = null)
     {

From ff4e949556c0ae49b80d947b707fb63663362efc Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 11 Mar 2024 17:19:00 +0100
Subject: [PATCH 0864/1422] Remove outdated documentation

---
 .../framework/src/Framework/Features/Navigation/NavItem.php  | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 5921d6af9a6..d18c5b451e3 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -20,11 +20,6 @@
  *   1. You can supply a Route directly and explicit properties to the constructor
  *   2. You can use NavItem::fromRoute() to use data from the route
  *   3. You can use NavItem::forLink() for an external or un-routed link
- *
- * Navigation items can be turned into dropdowns or sidebar groups by adding children.
- * Note that doing so will mean that any link on the parent will no longer be clickable,
- * as clicking the parent label will open the dropdown instead of leading to the destination.
- * For this reason, dropdown items will have their destination set to null.
  */
 class NavItem implements Stringable
 {

From 6e7835e7614b316493d080a4c0b8b295cc0be7fc Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 11 Mar 2024 17:35:31 +0100
Subject: [PATCH 0865/1422] Update documentation order

---
 .../framework/src/Framework/Features/Navigation/NavItem.php   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index d18c5b451e3..a9cd1a6ca48 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -134,10 +134,10 @@ public function getPriority(): int
     /**
      * Get the group identifier key of the navigation item, if any.
      *
+     * For sidebars this is the category key, for navigation menus this is the dropdown key.
+     *
      * When using automatic subdirectory based groups, the subdirectory name is the group key.
      * Otherwise, the group key is a "slugified" version of the group's label.
-     *
-     * For sidebars this is the category key, for navigation menus this is the dropdown key.
      */
     public function getGroupKey(): ?string
     {

From 8b52836b6043a81485a9b79e94f71c7aa30834c2 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 11 Mar 2024 17:42:14 +0100
Subject: [PATCH 0866/1422] Create NavigationHtmlLayoutsTest.php

---
 .../Unit/Views/NavigationHtmlLayoutsTest.php      | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
new file mode 100644
index 00000000000..eeef142f3d9
--- /dev/null
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -0,0 +1,15 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Hyde\Framework\Testing\Unit\Views;
+
+use Hyde\Testing\TestCase;
+
+/**
+ * Very high level tests for navigation menu and sidebar view layouts.
+ */
+class NavigationHtmlLayoutsTest extends TestCase
+{
+    //
+}

From 50ee2c29f9d8ae9a18d8d2adb1a18752a0b0168d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 11 Mar 2024 17:43:13 +0100
Subject: [PATCH 0867/1422] Add crosslinks between similarly functioning tests

---
 .../tests/Feature/AutomaticNavigationConfigurationsTest.php     | 2 ++
 .../framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php    | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 0de6e2ee60a..fa018501b9e 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -26,6 +26,8 @@
 /**
  * High-level broad-spectrum tests for the automatic navigation configurations, testing various setups.
  *
+ * @see \Hyde\Framework\Testing\Unit\Views\NavigationHtmlLayoutsTest
+ *
  * @covers \Hyde\Framework\Factories\NavigationDataFactory
  * @covers \Hyde\Framework\Features\Navigation\NavigationMenuGenerator
  * @covers \Hyde\Framework\Features\Navigation\DocumentationSidebar
diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index eeef142f3d9..25c265ac3e2 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -8,6 +8,8 @@
 
 /**
  * Very high level tests for navigation menu and sidebar view layouts.
+ *
+ * @see \Hyde\Framework\Testing\Feature\AutomaticNavigationConfigurationsTest
  */
 class NavigationHtmlLayoutsTest extends TestCase
 {

From a4653545c4fe0128f7ed80c3052897d109c382ea Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 11 Mar 2024 17:44:54 +0100
Subject: [PATCH 0868/1422] Copy over base helpers from similar test

---
 .../Unit/Views/NavigationHtmlLayoutsTest.php   | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index 25c265ac3e2..01886830afb 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -5,6 +5,9 @@
 namespace Hyde\Framework\Testing\Unit\Views;
 
 use Hyde\Testing\TestCase;
+use Hyde\Foundation\HydeKernel;
+use Hyde\Pages\Concerns\HydePage;
+use Hyde\Framework\Testing\Feature\TestKernel;
 
 /**
  * Very high level tests for navigation menu and sidebar view layouts.
@@ -13,5 +16,18 @@
  */
 class NavigationHtmlLayoutsTest extends TestCase
 {
-    //
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->kernel = new TestKernel();
+        HydeKernel::setInstance($this->kernel);
+    }
+
+    protected function withPages(array $pages): static
+    {
+        $this->kernel->setRoutes(collect($pages)->map(fn (HydePage $page) => $page->getRoute()));
+
+        return $this;
+    }
 }

From 783543f4133746ce8d949d50a689b6ffbfcff1e1 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 11 Mar 2024 17:57:08 +0100
Subject: [PATCH 0869/1422] Move container access back to view

---
 .../resources/views/components/docs/sidebar.blade.php         | 4 ++++
 packages/framework/resources/views/layouts/docs.blade.php     | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/framework/resources/views/components/docs/sidebar.blade.php b/packages/framework/resources/views/components/docs/sidebar.blade.php
index 0196551d310..e6698715522 100644
--- a/packages/framework/resources/views/components/docs/sidebar.blade.php
+++ b/packages/framework/resources/views/components/docs/sidebar.blade.php
@@ -1,3 +1,7 @@
+@php
+    $sidebar = app('navigation.sidebar');
+@endphp
+
 <aside id="sidebar" x-cloak :class="sidebarOpen ? 'visible left-0' : 'invisible -left-64 md:visible md:left-0'" class="bg-gray-100 dark:bg-gray-800 dark:text-gray-200 h-screen w-64 fixed z-30 md:flex flex-col shadow-lg md:shadow-none transition-all duration-300">
     <header id="sidebar-header" class="h-16">
         @include('hyde::components.docs.sidebar-brand')
diff --git a/packages/framework/resources/views/layouts/docs.blade.php b/packages/framework/resources/views/layouts/docs.blade.php
index e6bdb4886cf..3f66d821517 100644
--- a/packages/framework/resources/views/layouts/docs.blade.php
+++ b/packages/framework/resources/views/layouts/docs.blade.php
@@ -8,7 +8,7 @@
 
     @include('hyde::components.skip-to-content-button')
     @include('hyde::components.docs.mobile-navigation')
-    @include('hyde::components.docs.sidebar', ['sidebar' => app('navigation.sidebar')])
+    @include('hyde::components.docs.sidebar')
 
     <main id="content" class="dark:bg-gray-900 min-h-screen bg-gray-50 md:bg-white absolute top-16 md:top-0 w-screen md:left-64 md:w-[calc(100vw_-_16rem)]">
         @include('hyde::components.docs.documentation-article')

From c95b3e333d4ac16a713f57ba598b8c4e93becb84 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 11 Mar 2024 17:47:29 +0100
Subject: [PATCH 0870/1422] Copy over test kernel

---
 .../Unit/Views/NavigationHtmlLayoutsTest.php    | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index 01886830afb..4902212f78c 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -7,7 +7,6 @@
 use Hyde\Testing\TestCase;
 use Hyde\Foundation\HydeKernel;
 use Hyde\Pages\Concerns\HydePage;
-use Hyde\Framework\Testing\Feature\TestKernel;
 
 /**
  * Very high level tests for navigation menu and sidebar view layouts.
@@ -31,3 +30,19 @@ protected function withPages(array $pages): static
         return $this;
     }
 }
+
+class TestKernel extends HydeKernel
+{
+    protected ?RouteCollection $mockRoutes = null;
+
+    public function setRoutes(Collection $routes): void
+    {
+        $this->mockRoutes = RouteCollection::make($routes);
+    }
+
+    /** @return \Hyde\Foundation\Kernel\RouteCollection<string, \Hyde\Support\Models\Route> */
+    public function routes(): RouteCollection
+    {
+        return $this->mockRoutes ?? parent::routes();
+    }
+}

From 43107a652b20c402362e82c340cef3af64965347 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 11 Mar 2024 18:02:28 +0100
Subject: [PATCH 0871/1422] Set up base testing API scaffolding

---
 .../Unit/Views/NavigationHtmlLayoutsTest.php  | 67 +++++++++++++++++++
 1 file changed, 67 insertions(+)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index 4902212f78c..328bf7fdeec 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -7,6 +7,11 @@
 use Hyde\Testing\TestCase;
 use Hyde\Foundation\HydeKernel;
 use Hyde\Pages\Concerns\HydePage;
+use Illuminate\Support\Collection;
+use Hyde\Foundation\Kernel\RouteCollection;
+use Hyde\Framework\Features\Navigation\MainNavigationMenu;
+use Hyde\Framework\Features\Navigation\DocumentationSidebar;
+use Hyde\Framework\Features\Navigation\NavigationMenuGenerator;
 
 /**
  * Very high level tests for navigation menu and sidebar view layouts.
@@ -21,6 +26,22 @@ protected function setUp(): void
 
         $this->kernel = new TestKernel();
         HydeKernel::setInstance($this->kernel);
+
+        app()->instance('navigation.main', null);
+        app()->instance('navigation.sidebar', null);
+
+        $this->mockPage();
+        $this->mockRoute();
+    }
+
+    public function testMainNavigationMenu()
+    {
+        $this->menu()->assertTrue();
+    }
+
+    public function testDocumentationSidebarMenu()
+    {
+        $this->sidebar()->assertTrue();
     }
 
     protected function withPages(array $pages): static
@@ -29,6 +50,52 @@ protected function withPages(array $pages): static
 
         return $this;
     }
+
+    protected function menu(?array $withPages = null): RenderedNavigationMenu
+    {
+        if ($withPages) {
+            $this->withPages($withPages);
+        }
+
+        $menu = NavigationMenuGenerator::handle(MainNavigationMenu::class);
+        app()->instance('navigation.main', $menu);
+
+        return new RenderedNavigationMenu($this, $this->render('hyde::layouts.navigation'));
+    }
+
+    protected function sidebar(?array $withPages = null): RenderedNavigationMenu
+    {
+        if ($withPages) {
+            $this->withPages($withPages);
+        }
+
+        $menu = NavigationMenuGenerator::handle(DocumentationSidebar::class);
+        app()->instance('navigation.sidebar', $menu);
+
+        return new RenderedNavigationMenu($this, $this->render('hyde::components.docs.sidebar'));
+    }
+
+    protected function render(string $view): string
+    {
+        return view($view)->render();
+    }
+}
+
+class RenderedNavigationMenu
+{
+    protected NavigationHtmlLayoutsTest $test;
+    protected string $html;
+
+    public function __construct(NavigationHtmlLayoutsTest $test, string $html)
+    {
+        $this->test = $test;
+        $this->html = $html;
+    }
+
+    public function assertTrue(): void
+    {
+        $this->test->assertTrue(true);
+    }
 }
 
 class TestKernel extends HydeKernel

From 173039ab9184b046874fb446f286f6314c124baa Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 11 Mar 2024 18:06:25 +0100
Subject: [PATCH 0872/1422] Add type parameter to test helper

---
 .../tests/Unit/Views/NavigationHtmlLayoutsTest.php        | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index 328bf7fdeec..2eb333c73ac 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -60,7 +60,7 @@ protected function menu(?array $withPages = null): RenderedNavigationMenu
         $menu = NavigationMenuGenerator::handle(MainNavigationMenu::class);
         app()->instance('navigation.main', $menu);
 
-        return new RenderedNavigationMenu($this, $this->render('hyde::layouts.navigation'));
+        return new RenderedNavigationMenu($this, $this->render('hyde::layouts.navigation'), MainNavigationMenu::class);
     }
 
     protected function sidebar(?array $withPages = null): RenderedNavigationMenu
@@ -72,7 +72,7 @@ protected function sidebar(?array $withPages = null): RenderedNavigationMenu
         $menu = NavigationMenuGenerator::handle(DocumentationSidebar::class);
         app()->instance('navigation.sidebar', $menu);
 
-        return new RenderedNavigationMenu($this, $this->render('hyde::components.docs.sidebar'));
+        return new RenderedNavigationMenu($this, $this->render('hyde::components.docs.sidebar'), DocumentationSidebar::class);
     }
 
     protected function render(string $view): string
@@ -85,11 +85,13 @@ class RenderedNavigationMenu
 {
     protected NavigationHtmlLayoutsTest $test;
     protected string $html;
+    protected string $type;
 
-    public function __construct(NavigationHtmlLayoutsTest $test, string $html)
+    public function __construct(NavigationHtmlLayoutsTest $test, string $html, string $type)
     {
         $this->test = $test;
         $this->html = $html;
+        $this->type = $type;
     }
 
     public function assertTrue(): void

From 59b654790f7833f1a12b2899d00dd3d648e5f7e1 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 11 Mar 2024 18:11:03 +0100
Subject: [PATCH 0873/1422] Add testing helper to die with HTML contents

---
 .../tests/Unit/Views/NavigationHtmlLayoutsTest.php   | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index 2eb333c73ac..7483c2d3717 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -4,8 +4,11 @@
 
 namespace Hyde\Framework\Testing\Unit\Views;
 
+use Hyde\Hyde;
 use Hyde\Testing\TestCase;
+use Illuminate\Support\Str;
 use Hyde\Foundation\HydeKernel;
+use JetBrains\PhpStorm\NoReturn;
 use Hyde\Pages\Concerns\HydePage;
 use Illuminate\Support\Collection;
 use Hyde\Foundation\Kernel\RouteCollection;
@@ -98,6 +101,15 @@ public function assertTrue(): void
     {
         $this->test->assertTrue(true);
     }
+
+    #[NoReturn]
+    public function dd(bool $writeHtml = true): void
+    {
+        if ($writeHtml) {
+            file_put_contents(Hyde::path(Str::kebab(class_basename($this->type)).'.html'), $this->html);
+        }
+        exit(trim($this->html)."\n\n");
+    }
 }
 
 class TestKernel extends HydeKernel

From 9fdeb6716fcf5754cb2b6a90813bf6c06baa9a34 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 11 Mar 2024 18:12:23 +0100
Subject: [PATCH 0874/1422] Add newline

---
 .../framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index 7483c2d3717..f0e150c2c75 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -108,6 +108,7 @@ public function dd(bool $writeHtml = true): void
         if ($writeHtml) {
             file_put_contents(Hyde::path(Str::kebab(class_basename($this->type)).'.html'), $this->html);
         }
+
         exit(trim($this->html)."\n\n");
     }
 }

From c68853c5cd55221db3055b27ab134997144b9bdc Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 11 Mar 2024 18:29:33 +0100
Subject: [PATCH 0875/1422] Experimental HTML parser setup

See quirks at https://stackoverflow.com/a/70303134/5700388
---
 .../Unit/Views/NavigationHtmlLayoutsTest.php  | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index f0e150c2c75..1ef83a9a8b5 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -111,6 +111,36 @@ public function dd(bool $writeHtml = true): void
 
         exit(trim($this->html)."\n\n");
     }
+
+    protected function parseHtml(): DOMDocument
+    {
+        $dom = new DOMDocument();
+        $document = $this->html;
+
+        $html = <<<HTML
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Test Document</title>
+</head>
+<body>
+    <main id="test-content">
+        $document
+    </main>
+</body>
+</html>
+HTML;
+
+        try {
+            $dom->loadHTML($html, LIBXML_HTML_NOIMPLIED | LIBXML_HTML_NODEFDTD | LIBXML_NOWARNING | LIBXML_NOERROR | LIBXML_PARSEHUGE);
+        } catch (Throwable $exception) {
+            throw $exception;
+        }
+
+        return $dom;
+    }
 }
 
 class TestKernel extends HydeKernel

From e407f2fedfcd96516a7b25c1ec802de434aa2103 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 11 Mar 2024 18:30:17 +0100
Subject: [PATCH 0876/1422] Unwrap try

---
 .../tests/Unit/Views/NavigationHtmlLayoutsTest.php          | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index 1ef83a9a8b5..276b7092eb8 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -133,11 +133,7 @@ protected function parseHtml(): DOMDocument
 </html>
 HTML;
 
-        try {
-            $dom->loadHTML($html, LIBXML_HTML_NOIMPLIED | LIBXML_HTML_NODEFDTD | LIBXML_NOWARNING | LIBXML_NOERROR | LIBXML_PARSEHUGE);
-        } catch (Throwable $exception) {
-            throw $exception;
-        }
+        $dom->loadHTML($html, LIBXML_HTML_NOIMPLIED | LIBXML_HTML_NODEFDTD | LIBXML_NOWARNING | LIBXML_NOERROR | LIBXML_PARSEHUGE);
 
         return $dom;
     }

From 374467d04b7d76b4e8ec1332c77595671f3c56b2 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 11 Mar 2024 18:30:49 +0100
Subject: [PATCH 0877/1422] Remove wrapper document

---
 .../Unit/Views/NavigationHtmlLayoutsTest.php  | 21 ++-----------------
 1 file changed, 2 insertions(+), 19 deletions(-)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index 276b7092eb8..edcc32a9f1f 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -115,25 +115,8 @@ public function dd(bool $writeHtml = true): void
     protected function parseHtml(): DOMDocument
     {
         $dom = new DOMDocument();
-        $document = $this->html;
-
-        $html = <<<HTML
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Test Document</title>
-</head>
-<body>
-    <main id="test-content">
-        $document
-    </main>
-</body>
-</html>
-HTML;
-
-        $dom->loadHTML($html, LIBXML_HTML_NOIMPLIED | LIBXML_HTML_NODEFDTD | LIBXML_NOWARNING | LIBXML_NOERROR | LIBXML_PARSEHUGE);
+
+        $dom->loadHTML($this->html, LIBXML_HTML_NOIMPLIED | LIBXML_HTML_NODEFDTD | LIBXML_NOWARNING | LIBXML_NOERROR | LIBXML_PARSEHUGE);
 
         return $dom;
     }

From 94248683b72727fadb5048c6e3c77d0feef50612 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 11 Mar 2024 18:31:01 +0100
Subject: [PATCH 0878/1422] Parse HTML into test AST

---
 .../framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index edcc32a9f1f..37b35988f0a 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -89,12 +89,15 @@ class RenderedNavigationMenu
     protected NavigationHtmlLayoutsTest $test;
     protected string $html;
     protected string $type;
+    protected DOMDocument $ast;
 
     public function __construct(NavigationHtmlLayoutsTest $test, string $html, string $type)
     {
         $this->test = $test;
         $this->html = $html;
         $this->type = $type;
+
+        $this->ast = $this->parseHtml();
     }
 
     public function assertTrue(): void

From 23b65d4dcf322defb8b887c26081935dd57f1c7b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 11 Mar 2024 18:31:13 +0100
Subject: [PATCH 0879/1422] Add noinspection tag

---
 .../framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index 37b35988f0a..f1a38e7962e 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -1,5 +1,7 @@
 <?php
 
+/** @noinspection PhpComposerExtensionStubsInspection */
+
 declare(strict_types=1);
 
 namespace Hyde\Framework\Testing\Unit\Views;

From 473654169b23f1ebea5ae2e9374b3e90659aee8a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 11 Mar 2024 18:31:32 +0100
Subject: [PATCH 0880/1422] Import class

---
 .../framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index f1a38e7962e..17562e68a0a 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -7,6 +7,7 @@
 namespace Hyde\Framework\Testing\Unit\Views;
 
 use Hyde\Hyde;
+use DOMDocument;
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Str;
 use Hyde\Foundation\HydeKernel;

From 5f425a0997847615bc72ce47b91ac0c1fe52e38f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 11 Mar 2024 18:37:20 +0100
Subject: [PATCH 0881/1422] Add base assertion

---
 .../framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index 17562e68a0a..597f3b44f98 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -101,6 +101,8 @@ public function __construct(NavigationHtmlLayoutsTest $test, string $html, strin
         $this->type = $type;
 
         $this->ast = $this->parseHtml();
+
+        $this->test->assertNotEmpty($this->html);
     }
 
     public function assertTrue(): void

From 8c30a5af4afd1dee948359804d6a3310fd1be8a2 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 11 Mar 2024 18:38:43 +0100
Subject: [PATCH 0882/1422] Readonly test data

---
 .../tests/Unit/Views/NavigationHtmlLayoutsTest.php        | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index 597f3b44f98..55390620f2b 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -89,10 +89,10 @@ protected function render(string $view): string
 
 class RenderedNavigationMenu
 {
-    protected NavigationHtmlLayoutsTest $test;
-    protected string $html;
-    protected string $type;
-    protected DOMDocument $ast;
+    protected readonly NavigationHtmlLayoutsTest $test;
+    protected readonly string $html;
+    protected readonly string $type;
+    protected readonly DOMDocument $ast;
 
     public function __construct(NavigationHtmlLayoutsTest $test, string $html, string $type)
     {

From 93cc298f357b3a68d780eaaba63ecee71bd5b61c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 11 Mar 2024 18:40:53 +0100
Subject: [PATCH 0883/1422] Refactor to split out child testing helper classes

---
 .../Unit/Views/NavigationHtmlLayoutsTest.php  | 28 +++++++++++++------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index 55390620f2b..59634351a97 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -57,7 +57,7 @@ protected function withPages(array $pages): static
         return $this;
     }
 
-    protected function menu(?array $withPages = null): RenderedNavigationMenu
+    protected function menu(?array $withPages = null): RenderedMainNavigationMenu
     {
         if ($withPages) {
             $this->withPages($withPages);
@@ -66,10 +66,10 @@ protected function menu(?array $withPages = null): RenderedNavigationMenu
         $menu = NavigationMenuGenerator::handle(MainNavigationMenu::class);
         app()->instance('navigation.main', $menu);
 
-        return new RenderedNavigationMenu($this, $this->render('hyde::layouts.navigation'), MainNavigationMenu::class);
+        return new RenderedMainNavigationMenu($this, $this->render('hyde::layouts.navigation'));
     }
 
-    protected function sidebar(?array $withPages = null): RenderedNavigationMenu
+    protected function sidebar(?array $withPages = null): RenderedDocumentationSidebarMenu
     {
         if ($withPages) {
             $this->withPages($withPages);
@@ -78,7 +78,7 @@ protected function sidebar(?array $withPages = null): RenderedNavigationMenu
         $menu = NavigationMenuGenerator::handle(DocumentationSidebar::class);
         app()->instance('navigation.sidebar', $menu);
 
-        return new RenderedNavigationMenu($this, $this->render('hyde::components.docs.sidebar'), DocumentationSidebar::class);
+        return new RenderedDocumentationSidebarMenu($this, $this->render('hyde::components.docs.sidebar'));
     }
 
     protected function render(string $view): string
@@ -87,18 +87,18 @@ protected function render(string $view): string
     }
 }
 
-class RenderedNavigationMenu
+abstract class RenderedNavigationMenu
 {
     protected readonly NavigationHtmlLayoutsTest $test;
     protected readonly string $html;
-    protected readonly string $type;
     protected readonly DOMDocument $ast;
 
-    public function __construct(NavigationHtmlLayoutsTest $test, string $html, string $type)
+    protected const TYPE = null;
+
+    public function __construct(NavigationHtmlLayoutsTest $test, string $html)
     {
         $this->test = $test;
         $this->html = $html;
-        $this->type = $type;
 
         $this->ast = $this->parseHtml();
 
@@ -114,7 +114,7 @@ public function assertTrue(): void
     public function dd(bool $writeHtml = true): void
     {
         if ($writeHtml) {
-            file_put_contents(Hyde::path(Str::kebab(class_basename($this->type)).'.html'), $this->html);
+            file_put_contents(Hyde::path(Str::kebab(class_basename(static::TYPE)).'.html'), $this->html);
         }
 
         exit(trim($this->html)."\n\n");
@@ -130,6 +130,16 @@ protected function parseHtml(): DOMDocument
     }
 }
 
+class RenderedMainNavigationMenu extends RenderedNavigationMenu
+{
+    protected const TYPE = MainNavigationMenu::class;
+}
+
+class RenderedDocumentationSidebarMenu extends RenderedNavigationMenu
+{
+    protected const TYPE = DocumentationSidebar::class;
+}
+
 class TestKernel extends HydeKernel
 {
     protected ?RouteCollection $mockRoutes = null;

From 03e08c37ef5d4d9c36d71ee1396757046b25816d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 11 Mar 2024 18:55:38 +0100
Subject: [PATCH 0884/1422] Assert has element identifiers

---
 .../tests/Unit/Views/NavigationHtmlLayoutsTest.php | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index 59634351a97..a8fdeac5f7e 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -42,12 +42,12 @@ protected function setUp(): void
 
     public function testMainNavigationMenu()
     {
-        $this->menu()->assertTrue();
+        $this->menu()->assertHasId('main-navigation');
     }
 
     public function testDocumentationSidebarMenu()
     {
-        $this->sidebar()->assertTrue();
+        $this->sidebar()->assertHasId('sidebar');
     }
 
     protected function withPages(array $pages): static
@@ -110,6 +110,16 @@ public function assertTrue(): void
         $this->test->assertTrue(true);
     }
 
+    public function assertHasId(string $id): static
+    {
+        $node = $this->ast->documentElement;
+
+        $this->test->assertTrue($node->hasAttribute('id'));
+        $this->test->assertSame($id, $node->getAttribute('id'));
+
+        return $this;
+    }
+
     #[NoReturn]
     public function dd(bool $writeHtml = true): void
     {

From fc7743605fdaf29d5382098435668ebe822817ef Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 11 Mar 2024 18:56:33 +0100
Subject: [PATCH 0885/1422] Introduce local variables

Just want cleaner diffs for now
---
 .../tests/Unit/Views/NavigationHtmlLayoutsTest.php          | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index a8fdeac5f7e..f712bd1eae5 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -42,12 +42,14 @@ protected function setUp(): void
 
     public function testMainNavigationMenu()
     {
-        $this->menu()->assertHasId('main-navigation');
+        $menu = $this->menu();
+        $menu->assertHasId('main-navigation');
     }
 
     public function testDocumentationSidebarMenu()
     {
-        $this->sidebar()->assertHasId('sidebar');
+        $sidebar = $this->sidebar();
+        $sidebar->assertHasId('sidebar');
     }
 
     protected function withPages(array $pages): static

From 6e48b26edf25665ef58799816fca1cc815151804 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 11 Mar 2024 18:57:36 +0100
Subject: [PATCH 0886/1422] Formatting

---
 .../framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index f712bd1eae5..140b1d90e2e 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -43,12 +43,14 @@ protected function setUp(): void
     public function testMainNavigationMenu()
     {
         $menu = $this->menu();
+
         $menu->assertHasId('main-navigation');
     }
 
     public function testDocumentationSidebarMenu()
     {
         $sidebar = $this->sidebar();
+
         $sidebar->assertHasId('sidebar');
     }
 

From 9cdce01d825105ae661327729100a1f225667da6 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 11 Mar 2024 19:01:38 +0100
Subject: [PATCH 0887/1422] Remove now unused testing helper

---
 .../framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index 140b1d90e2e..16b57d78324 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -109,11 +109,6 @@ public function __construct(NavigationHtmlLayoutsTest $test, string $html)
         $this->test->assertNotEmpty($this->html);
     }
 
-    public function assertTrue(): void
-    {
-        $this->test->assertTrue(true);
-    }
-
     public function assertHasId(string $id): static
     {
         $node = $this->ast->documentElement;

From a28f3d018469b7ea16180591bc089bacefce6be3 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 11 Mar 2024 19:02:41 +0100
Subject: [PATCH 0888/1422] Clean up test semantics

---
 .../Unit/Views/NavigationHtmlLayoutsTest.php    | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index 16b57d78324..b8881353401 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -42,16 +42,16 @@ protected function setUp(): void
 
     public function testMainNavigationMenu()
     {
-        $menu = $this->menu();
-
-        $menu->assertHasId('main-navigation');
+        $this->menu()
+            ->assertHasId('main-navigation')
+            ->finish();
     }
 
     public function testDocumentationSidebarMenu()
     {
-        $sidebar = $this->sidebar();
-
-        $sidebar->assertHasId('sidebar');
+        $this->sidebar()
+            ->assertHasId('sidebar')
+            ->finish();
     }
 
     protected function withPages(array $pages): static
@@ -109,6 +109,11 @@ public function __construct(NavigationHtmlLayoutsTest $test, string $html)
         $this->test->assertNotEmpty($this->html);
     }
 
+    public function finish(): void
+    {
+        // Empty method to provide cleaner diffs when using method chaining.
+    }
+
     public function assertHasId(string $id): static
     {
         $node = $this->ast->documentElement;

From 8a5e878bda9778f4bf1272d7e490d2814dbb1736 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 11 Mar 2024 19:05:24 +0100
Subject: [PATCH 0889/1422] Assert has elements

---
 .../tests/Unit/Views/NavigationHtmlLayoutsTest.php     | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index b8881353401..46afbd8c372 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -51,6 +51,9 @@ public function testDocumentationSidebarMenu()
     {
         $this->sidebar()
             ->assertHasId('sidebar')
+            ->assertHasElement('sidebar-header')
+            ->assertHasElement('sidebar-navigation')
+            ->assertHasElement('sidebar-footer')
             ->finish();
     }
 
@@ -124,6 +127,13 @@ public function assertHasId(string $id): static
         return $this;
     }
 
+    public function assertHasElement(string $id): static
+    {
+        $this->test->assertNotNull($this->ast->getElementById($id), 'Element with ID "'.$id.'" not found in the HTML.');
+
+        return $this;
+    }
+
     #[NoReturn]
     public function dd(bool $writeHtml = true): void
     {

From abcc389ce197c75a90d38ee5aa0d464a9fb4c62e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 11 Mar 2024 19:09:03 +0100
Subject: [PATCH 0890/1422] Search for the element in the entire HTML

---
 .../tests/Unit/Views/NavigationHtmlLayoutsTest.php    | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index 46afbd8c372..be9fec3d8b7 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -6,6 +6,7 @@
 
 namespace Hyde\Framework\Testing\Unit\Views;
 
+use DOMXPath;
 use Hyde\Hyde;
 use DOMDocument;
 use Hyde\Testing\TestCase;
@@ -129,7 +130,15 @@ public function assertHasId(string $id): static
 
     public function assertHasElement(string $id): static
     {
-        $this->test->assertNotNull($this->ast->getElementById($id), 'Element with ID "'.$id.'" not found in the HTML.');
+        $element = $this->ast->getElementById($id);
+
+        if ($element === null) {
+            // Search for the element in the entire HTML.
+            $xpath = new DOMXPath($this->ast);
+            $element = $xpath->query("//*[@id='$id']")->item(0);
+        }
+
+        $this->test->assertNotNull($element, 'Element with ID "'.$id.'" not found in the HTML.');
 
         return $this;
     }

From b4aed110d56aafc59741635f6a3f1d0cbe36071b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 11 Mar 2024 19:12:43 +0100
Subject: [PATCH 0891/1422] Search for elements in class usages

---
 .../framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index be9fec3d8b7..1073f699f57 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -136,6 +136,11 @@ public function assertHasElement(string $id): static
             // Search for the element in the entire HTML.
             $xpath = new DOMXPath($this->ast);
             $element = $xpath->query("//*[@id='$id']")->item(0);
+
+            if ($element === null) {
+                // See if there is an element containing the ID as a class.
+                $element = $xpath->query("//*[contains(concat(' ', normalize-space(@class), ' '), ' $id ')]")->item(0);
+            }
         }
 
         $this->test->assertNotNull($element, 'Element with ID "'.$id.'" not found in the HTML.');

From 55074a3c3a9fffbd2d6884ac94492ca7b6c11167 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 11 Mar 2024 19:13:41 +0100
Subject: [PATCH 0892/1422] Assert has more elements

---
 .../framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index 1073f699f57..9eea5633e02 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -45,6 +45,9 @@ public function testMainNavigationMenu()
     {
         $this->menu()
             ->assertHasId('main-navigation')
+            ->assertHasElement('theme-toggle-button')
+            ->assertHasElement('navigation-toggle-button')
+            ->assertHasElement('main-navigation-links')
             ->finish();
     }
 

From 1420268f0b134da3f15621639fadf941a12c4b9a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 11 Mar 2024 19:18:03 +0100
Subject: [PATCH 0893/1422] Assert has no pages

---
 .../Unit/Views/NavigationHtmlLayoutsTest.php     | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index 9eea5633e02..f7564cbb26c 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -48,6 +48,7 @@ public function testMainNavigationMenu()
             ->assertHasElement('theme-toggle-button')
             ->assertHasElement('navigation-toggle-button')
             ->assertHasElement('main-navigation-links')
+            ->assertHasNoPages()
             ->finish();
     }
 
@@ -58,6 +59,7 @@ public function testDocumentationSidebarMenu()
             ->assertHasElement('sidebar-header')
             ->assertHasElement('sidebar-navigation')
             ->assertHasElement('sidebar-footer')
+            ->assertHasNoPages()
             ->finish();
     }
 
@@ -151,6 +153,13 @@ public function assertHasElement(string $id): static
         return $this;
     }
 
+    public function assertHasNoPages(): static
+    {
+        $this->test->assertEmpty($this->getRenderedPages());
+
+        return $this;
+    }
+
     #[NoReturn]
     public function dd(bool $writeHtml = true): void
     {
@@ -169,6 +178,13 @@ protected function parseHtml(): DOMDocument
 
         return $dom;
     }
+
+    protected function getRenderedPages(): array
+    {
+        // Todo
+
+        return [];
+    }
 }
 
 class RenderedMainNavigationMenu extends RenderedNavigationMenu

From ea0cbe0aa150fc6cbe154955d30097c4a48c3946 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 11 Mar 2024 19:18:43 +0100
Subject: [PATCH 0894/1422] Convert concatenation to string interpolation and
 clean up quotes

---
 .../framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index f7564cbb26c..4eaea8a57fb 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -148,7 +148,7 @@ public function assertHasElement(string $id): static
             }
         }
 
-        $this->test->assertNotNull($element, 'Element with ID "'.$id.'" not found in the HTML.');
+        $this->test->assertNotNull($element, "Element with ID '$id' not found in the HTML.");
 
         return $this;
     }

From 9af5c230241734f5b3e4fc2a9486d6405e24818c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 11 Mar 2024 19:19:30 +0100
Subject: [PATCH 0895/1422] Remove possibly misguiding prefix

---
 .../framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index 4eaea8a57fb..a555676cfaa 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -148,7 +148,7 @@ public function assertHasElement(string $id): static
             }
         }
 
-        $this->test->assertNotNull($element, "Element with ID '$id' not found in the HTML.");
+        $this->test->assertNotNull($element, "Element with '$id' not found in the HTML.");
 
         return $this;
     }

From 7aa6c89828e9a8f4d7f6577a674defb755230bda Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 11 Mar 2024 19:22:22 +0100
Subject: [PATCH 0896/1422] Assert has more elements

---
 .../framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index a555676cfaa..73b64e8f190 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -57,8 +57,11 @@ public function testDocumentationSidebarMenu()
         $this->sidebar()
             ->assertHasId('sidebar')
             ->assertHasElement('sidebar-header')
+            ->assertHasElement('sidebar-brand')
             ->assertHasElement('sidebar-navigation')
             ->assertHasElement('sidebar-footer')
+            ->assertHasElement('theme-toggle-button')
+            ->assertHasElement('sidebar-items')
             ->assertHasNoPages()
             ->finish();
     }

From 7ea52f4d89f6929499aa793cdfcb762472139ddb Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 11 Mar 2024 19:25:55 +0100
Subject: [PATCH 0897/1422] Get rendered pages

---
 .../Unit/Views/NavigationHtmlLayoutsTest.php    | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index 73b64e8f190..ad0b690814d 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -182,11 +182,24 @@ protected function parseHtml(): DOMDocument
         return $dom;
     }
 
+    /** @return array<string, string> */
     protected function getRenderedPages(): array
     {
-        // Todo
+        $containerNodeId = static::TYPE === MainNavigationMenu::class ? 'main-navigation-links' : 'sidebar-items';
 
-        return [];
+        $this->assertHasElement($containerNodeId);
+
+        $containerNode = $this->ast->getElementById($containerNodeId);
+
+        $links = $containerNode->getElementsByTagName('a');
+
+        $pages = [];
+
+        foreach ($links as $link) {
+            $pages[$link->getAttribute('href')] = $link->textContent;
+        }
+
+        return $pages;
     }
 }
 

From 594dc2b5fd4c8ff92d475872fb22e4edd1f8e41a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 11 Mar 2024 19:26:48 +0100
Subject: [PATCH 0898/1422] Assert has page

---
 .../tests/Unit/Views/NavigationHtmlLayoutsTest.php    | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index ad0b690814d..1d3390dad8f 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -48,7 +48,7 @@ public function testMainNavigationMenu()
             ->assertHasElement('theme-toggle-button')
             ->assertHasElement('navigation-toggle-button')
             ->assertHasElement('main-navigation-links')
-            ->assertHasNoPages()
+            ->assertHasPages(['index.html' => 'Home'])
             ->finish();
     }
 
@@ -156,6 +156,15 @@ public function assertHasElement(string $id): static
         return $this;
     }
 
+    public function assertHasPages(array $pages): static
+    {
+        $renderedPages = $this->getRenderedPages();
+
+        $this->test->assertEquals($pages, $renderedPages);
+
+        return $this;
+    }
+
     public function assertHasNoPages(): static
     {
         $this->test->assertEmpty($this->getRenderedPages());

From 55b58d39a1c5c9abd9e83be7fe0dbfb2abcc29e0 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 11 Mar 2024 19:28:55 +0100
Subject: [PATCH 0899/1422] Assert same

---
 .../framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index 1d3390dad8f..cd344cc36b0 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -160,7 +160,7 @@ public function assertHasPages(array $pages): static
     {
         $renderedPages = $this->getRenderedPages();
 
-        $this->test->assertEquals($pages, $renderedPages);
+        $this->test->assertSame($pages, $renderedPages);
 
         return $this;
     }

From 99dc501769d3d16d652a36210169204a87cdc3ad Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 11 Mar 2024 19:31:30 +0100
Subject: [PATCH 0900/1422] Use no pages unless set in test

---
 .../tests/Unit/Views/NavigationHtmlLayoutsTest.php | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index cd344cc36b0..86f1e08f074 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -48,7 +48,7 @@ public function testMainNavigationMenu()
             ->assertHasElement('theme-toggle-button')
             ->assertHasElement('navigation-toggle-button')
             ->assertHasElement('main-navigation-links')
-            ->assertHasPages(['index.html' => 'Home'])
+            ->assertHasNoPages()
             ->finish();
     }
 
@@ -73,11 +73,9 @@ protected function withPages(array $pages): static
         return $this;
     }
 
-    protected function menu(?array $withPages = null): RenderedMainNavigationMenu
+    protected function menu(array $withPages = []): RenderedMainNavigationMenu
     {
-        if ($withPages) {
-            $this->withPages($withPages);
-        }
+        $this->withPages($withPages);
 
         $menu = NavigationMenuGenerator::handle(MainNavigationMenu::class);
         app()->instance('navigation.main', $menu);
@@ -85,11 +83,9 @@ protected function menu(?array $withPages = null): RenderedMainNavigationMenu
         return new RenderedMainNavigationMenu($this, $this->render('hyde::layouts.navigation'));
     }
 
-    protected function sidebar(?array $withPages = null): RenderedDocumentationSidebarMenu
+    protected function sidebar(array $withPages = []): RenderedDocumentationSidebarMenu
     {
-        if ($withPages) {
-            $this->withPages($withPages);
-        }
+        $this->withPages($withPages);
 
         $menu = NavigationMenuGenerator::handle(DocumentationSidebar::class);
         app()->instance('navigation.sidebar', $menu);

From f7f4c991c6d67e95cb46c174f69f6ab236467dc3 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 11 Mar 2024 19:36:32 +0100
Subject: [PATCH 0901/1422] Test navigation menu with pages

---
 .../Unit/Views/NavigationHtmlLayoutsTest.php  | 25 +++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index 86f1e08f074..7463fefdec5 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -9,8 +9,12 @@
 use DOMXPath;
 use Hyde\Hyde;
 use DOMDocument;
+use Hyde\Pages\HtmlPage;
+use Hyde\Pages\BladePage;
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Str;
+use Hyde\Pages\MarkdownPage;
+use Hyde\Pages\InMemoryPage;
 use Hyde\Foundation\HydeKernel;
 use JetBrains\PhpStorm\NoReturn;
 use Hyde\Pages\Concerns\HydePage;
@@ -66,6 +70,27 @@ public function testDocumentationSidebarMenu()
             ->finish();
     }
 
+    public function testNavigationMenuWithPages()
+    {
+        $pages = [
+            new MarkdownPage('index'),
+            new MarkdownPage('404'),
+            new BladePage('about'),
+            new BladePage('hidden', ['navigation.hidden' => true]),
+            new InMemoryPage('custom', ['navigation.label' => 'Label']),
+            new HtmlPage('first', ['navigation.priority' => 1]),
+        ];
+
+        $this->menu($pages)
+            ->assertHasPages([
+                'index.html' => 'Home',
+                'first.html' => 'First',
+                'about.html' => 'About',
+                'custom.html' => 'Label',
+            ])
+            ->finish();
+    }
+
     protected function withPages(array $pages): static
     {
         $this->kernel->setRoutes(collect($pages)->map(fn (HydePage $page) => $page->getRoute()));

From a11d6b9a71e25eed90c586c1b1e6232f3e6ac8ef Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 11 Mar 2024 20:00:24 +0100
Subject: [PATCH 0902/1422] Improve failure diff

---
 .../framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index 7463fefdec5..72b584d6d7e 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -181,7 +181,10 @@ public function assertHasPages(array $pages): static
     {
         $renderedPages = $this->getRenderedPages();
 
-        $this->test->assertSame($pages, $renderedPages);
+        $this->test->assertSame($pages, $renderedPages, sprintf('Rendered pages do not match expected pages: %s', json_encode([
+            'expected' => $pages,
+            'rendered' => $renderedPages,
+        ], JSON_PRETTY_PRINT)));
 
         return $this;
     }

From 2436f93245bbbebbbc6d7d707c4d4c882f3df410 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 11 Mar 2024 20:04:19 +0100
Subject: [PATCH 0903/1422] Add from page wrapper

---
 .../tests/Unit/Views/NavigationHtmlLayoutsTest.php         | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index 72b584d6d7e..a5f91da954e 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -98,6 +98,13 @@ protected function withPages(array $pages): static
         return $this;
     }
 
+    protected function fromPage(string $mockedRoute): static
+    {
+        $this->mockCurrentPage($mockedRoute);
+
+        return $this;
+    }
+
     protected function menu(array $withPages = []): RenderedMainNavigationMenu
     {
         $this->withPages($withPages);

From dd52777761bbc7c453d06acf4203f8a94bf1cf2d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 11 Mar 2024 20:04:28 +0100
Subject: [PATCH 0904/1422] Test navigation menu from nested route

---
 .../Unit/Views/NavigationHtmlLayoutsTest.php  | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index a5f91da954e..7531e57fd7c 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -91,6 +91,28 @@ public function testNavigationMenuWithPages()
             ->finish();
     }
 
+    public function testNavigationMenuFromNestedRoute()
+    {
+        $pages = [
+            new MarkdownPage('index'),
+            new MarkdownPage('404'),
+            new BladePage('about'),
+            new BladePage('hidden', ['navigation.hidden' => true]),
+            new InMemoryPage('custom', ['navigation.label' => 'Label']),
+            new HtmlPage('first', ['navigation.priority' => 1]),
+        ];
+
+        $this->fromPage('nested/page')
+            ->menu($pages)
+            ->assertHasPages([
+                '../index.html' => 'Home',
+                '../first.html' => 'First',
+                '../about.html' => 'About',
+                '../custom.html' => 'Label',
+            ])
+            ->finish();
+    }
+
     protected function withPages(array $pages): static
     {
         $this->kernel->setRoutes(collect($pages)->map(fn (HydePage $page) => $page->getRoute()));

From 209b742cf08862cb8e0a6c5d7d140fbba4f4bb58 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 11 Mar 2024 20:09:04 +0100
Subject: [PATCH 0905/1422] Extract helper for repeated array

---
 .../Unit/Views/NavigationHtmlLayoutsTest.php  | 34 ++++++++-----------
 1 file changed, 14 insertions(+), 20 deletions(-)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index 7531e57fd7c..540fbc60767 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -72,16 +72,7 @@ public function testDocumentationSidebarMenu()
 
     public function testNavigationMenuWithPages()
     {
-        $pages = [
-            new MarkdownPage('index'),
-            new MarkdownPage('404'),
-            new BladePage('about'),
-            new BladePage('hidden', ['navigation.hidden' => true]),
-            new InMemoryPage('custom', ['navigation.label' => 'Label']),
-            new HtmlPage('first', ['navigation.priority' => 1]),
-        ];
-
-        $this->menu($pages)
+        $this->menu($this->withExamplePages())
             ->assertHasPages([
                 'index.html' => 'Home',
                 'first.html' => 'First',
@@ -93,17 +84,8 @@ public function testNavigationMenuWithPages()
 
     public function testNavigationMenuFromNestedRoute()
     {
-        $pages = [
-            new MarkdownPage('index'),
-            new MarkdownPage('404'),
-            new BladePage('about'),
-            new BladePage('hidden', ['navigation.hidden' => true]),
-            new InMemoryPage('custom', ['navigation.label' => 'Label']),
-            new HtmlPage('first', ['navigation.priority' => 1]),
-        ];
-
         $this->fromPage('nested/page')
-            ->menu($pages)
+            ->menu($this->withExamplePages())
             ->assertHasPages([
                 '../index.html' => 'Home',
                 '../first.html' => 'First',
@@ -151,6 +133,18 @@ protected function render(string $view): string
     {
         return view($view)->render();
     }
+
+    protected function withExamplePages(): array
+    {
+        return [
+            new MarkdownPage('index'),
+            new MarkdownPage('404'),
+            new BladePage('about'),
+            new BladePage('hidden', ['navigation.hidden' => true]),
+            new InMemoryPage('custom', ['navigation.label' => 'Label']),
+            new HtmlPage('first', ['navigation.priority' => 1]),
+        ];
+    }
 }
 
 abstract class RenderedNavigationMenu

From 2c420ce88bf4e176d3bb7466b373834884a68774 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 11 Mar 2024 20:10:03 +0100
Subject: [PATCH 0906/1422] Arrow function experiment

---
 .../framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php  | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index 540fbc60767..c5562887d37 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -97,9 +97,7 @@ public function testNavigationMenuFromNestedRoute()
 
     protected function withPages(array $pages): static
     {
-        $this->kernel->setRoutes(collect($pages)->map(fn (HydePage $page) => $page->getRoute()));
-
-        return $this;
+        return tap($this, fn () => $this->kernel->setRoutes(collect($pages)->map(fn (HydePage $page) => $page->getRoute())));
     }
 
     protected function fromPage(string $mockedRoute): static

From 486ac395d8339ae6024496b44471a618afac6fb1 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 11 Mar 2024 20:10:06 +0100
Subject: [PATCH 0907/1422] Revert "Arrow function experiment"

This reverts commit 2c420ce88bf4e176d3bb7466b373834884a68774.
---
 .../framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index c5562887d37..540fbc60767 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -97,7 +97,9 @@ public function testNavigationMenuFromNestedRoute()
 
     protected function withPages(array $pages): static
     {
-        return tap($this, fn () => $this->kernel->setRoutes(collect($pages)->map(fn (HydePage $page) => $page->getRoute())));
+        $this->kernel->setRoutes(collect($pages)->map(fn (HydePage $page) => $page->getRoute()));
+
+        return $this;
     }
 
     protected function fromPage(string $mockedRoute): static

From 9156dedc1e0e4d0073b4e5b9492244dc4e07f756 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 11 Mar 2024 20:10:46 +0100
Subject: [PATCH 0908/1422] Inline variables

---
 .../tests/Unit/Views/NavigationHtmlLayoutsTest.php          | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index 540fbc60767..25e648c85bd 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -113,8 +113,7 @@ protected function menu(array $withPages = []): RenderedMainNavigationMenu
     {
         $this->withPages($withPages);
 
-        $menu = NavigationMenuGenerator::handle(MainNavigationMenu::class);
-        app()->instance('navigation.main', $menu);
+        app()->instance('navigation.main', NavigationMenuGenerator::handle(MainNavigationMenu::class));
 
         return new RenderedMainNavigationMenu($this, $this->render('hyde::layouts.navigation'));
     }
@@ -123,8 +122,7 @@ protected function sidebar(array $withPages = []): RenderedDocumentationSidebarM
     {
         $this->withPages($withPages);
 
-        $menu = NavigationMenuGenerator::handle(DocumentationSidebar::class);
-        app()->instance('navigation.sidebar', $menu);
+        app()->instance('navigation.sidebar', NavigationMenuGenerator::handle(DocumentationSidebar::class));
 
         return new RenderedDocumentationSidebarMenu($this, $this->render('hyde::components.docs.sidebar'));
     }

From d2a14cac3b2c03c1b17d91e03bde10f129aae017 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 11 Mar 2024 20:17:35 +0100
Subject: [PATCH 0909/1422] Add testing helper to use subdirectories as
 dropdowns

---
 .../tests/Unit/Views/NavigationHtmlLayoutsTest.php         | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index 25e648c85bd..1cc3319b45e 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -127,6 +127,13 @@ protected function sidebar(array $withPages = []): RenderedDocumentationSidebarM
         return new RenderedDocumentationSidebarMenu($this, $this->render('hyde::components.docs.sidebar'));
     }
 
+    protected function useSubdirectoriesAsDropdowns(): static
+    {
+        config(['hyde.navigation.subdirectories' => 'dropdown']);
+
+        return $this;
+    }
+
     protected function render(string $view): string
     {
         return view($view)->render();

From 37e39bae838ab231db0a83e7baece7b9ddf6af7a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 11 Mar 2024 20:19:50 +0100
Subject: [PATCH 0910/1422] Assert negative element state

---
 .../Unit/Views/NavigationHtmlLayoutsTest.php  | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index 1cc3319b45e..ba1cb62acb5 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -52,6 +52,8 @@ public function testMainNavigationMenu()
             ->assertHasElement('theme-toggle-button')
             ->assertHasElement('navigation-toggle-button')
             ->assertHasElement('main-navigation-links')
+            ->assertDoesNotHaveElement('dropdown-button')
+            ->assertDoesNotHaveElement('dropdown')
             ->assertHasNoPages()
             ->finish();
     }
@@ -205,6 +207,26 @@ public function assertHasElement(string $id): static
         return $this;
     }
 
+    public function assertDoesNotHaveElement(string $id): static
+    {
+        $element = $this->ast->getElementById($id);
+
+        if ($element === null) {
+            // Search for the element in the entire HTML.
+            $xpath = new DOMXPath($this->ast);
+            $element = $xpath->query("//*[@id='$id']")->item(0);
+
+            if ($element === null) {
+                // See if there is an element containing the ID as a class.
+                $element = $xpath->query("//*[contains(concat(' ', normalize-space(@class), ' '), ' $id ')]")->item(0);
+            }
+        }
+
+        $this->test->assertNull($element, "Element with '$id' found in the HTML.");
+
+        return $this;
+    }
+
     public function assertHasPages(array $pages): static
     {
         $renderedPages = $this->getRenderedPages();

From dc11ccc06221225a900282e5be1ea1eeee03df9e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 11 Mar 2024 20:22:16 +0100
Subject: [PATCH 0911/1422] Update assertions

---
 .../framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index ba1cb62acb5..9611dc2bfe4 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -52,8 +52,9 @@ public function testMainNavigationMenu()
             ->assertHasElement('theme-toggle-button')
             ->assertHasElement('navigation-toggle-button')
             ->assertHasElement('main-navigation-links')
-            ->assertDoesNotHaveElement('dropdown-button')
             ->assertDoesNotHaveElement('dropdown')
+            ->assertDoesNotHaveElement('dropdown-items')
+            ->assertDoesNotHaveElement('dropdown-button')
             ->assertHasNoPages()
             ->finish();
     }

From cfb5aa0de5592bcecef171ff98619072de795ae6 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 11 Mar 2024 20:22:25 +0100
Subject: [PATCH 0912/1422] Test navigation menu with dropdown pages

---
 .../Unit/Views/NavigationHtmlLayoutsTest.php  | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index 9611dc2bfe4..1ecc5467cac 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -98,6 +98,25 @@ public function testNavigationMenuFromNestedRoute()
             ->finish();
     }
 
+    public function testNavigationMenuWithDropdownPages()
+    {
+        $this->useSubdirectoriesAsDropdowns()
+           ->menu([
+               new MarkdownPage('index'),
+               new MarkdownPage('foo/bar'),
+               new MarkdownPage('foo/baz'),
+           ])
+            ->assertHasPages([
+                'index.html' => 'Home',
+                'foo/bar.html' => 'Bar',
+                'foo/baz.html' => 'Baz',
+            ])
+            ->assertHasElement('dropdown')
+            ->assertHasElement('dropdown-items')
+            ->assertHasElement('dropdown-button')
+            ->finish();
+    }
+
     protected function withPages(array $pages): static
     {
         $this->kernel->setRoutes(collect($pages)->map(fn (HydePage $page) => $page->getRoute()));

From 60bee64f49e2b464ff1c83111b9acec90b66e4dc Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 12 Mar 2024 10:17:28 +0100
Subject: [PATCH 0913/1422] Add high level textual visual testing

---
 .../Unit/Views/NavigationHtmlLayoutsTest.php  | 65 +++++++++++++++++++
 1 file changed, 65 insertions(+)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index 1ecc5467cac..8ea227431f0 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -114,6 +114,14 @@ public function testNavigationMenuWithDropdownPages()
             ->assertHasElement('dropdown')
             ->assertHasElement('dropdown-items')
             ->assertHasElement('dropdown-button')
+            ->assertItemsLookLike(<<<'HTML'
+- Home
+- Foo
+    - Bar
+    - Baz
+HTML
+
+            )
             ->finish();
     }
 
@@ -266,6 +274,30 @@ public function assertHasNoPages(): static
         return $this;
     }
 
+    public function assertLooksLike(string $expected, bool $skipHeaderRow = false): static
+    {
+        $actual = $this->makeTextRepresentation();
+
+        if ($skipHeaderRow) {
+            $actual = trim(Str::after($actual, "\n"));
+        }
+        // If expected omitted dashes, remove them from actual
+        if (! str_contains($expected, '- ')) {
+            $actual = str_replace('- ', '', $actual);
+        }
+        // If expected uses 4 spaces, replace with 2 spaces
+        $expected = str_replace('    ', '  ', $expected);
+
+        $this->test->assertSame($expected, $actual, sprintf("Actual HTML does not match expected text:\nExpected:\n%s\nActual:\n%s", $expected, $actual));
+
+        return $this;
+    }
+
+    public function assertItemsLookLike(string $expected): static
+    {
+        return $this->assertLooksLike($expected, true);
+    }
+
     #[NoReturn]
     public function dd(bool $writeHtml = true): void
     {
@@ -304,6 +336,39 @@ protected function getRenderedPages(): array
 
         return $pages;
     }
+
+    protected function makeTextRepresentation(): string
+    {
+        $html = str_replace(['<title>Open Menu</title>', '<title>Close Menu</title>'], ['Toggle menu', ''], $this->html);
+        $html = str_replace(['<li', '</li>'], ['<li-keep', '</li-keep>'], $html);
+        $html = str_replace(['<ul', '</ul>'], ['<ul-keep', '</ul-keep>'], $html);
+        $html = strip_tags($html, '<li-keep><ul-keep>');
+        $html = str_replace(['<li-keep', '</li-keep>'], ['<li', '</li>'], $html);
+        $html = str_replace(['<ul-keep', '</ul-keep>'], ['<ul', '</ul>'], $html);
+        $html = preg_replace('/<li[^>]*>/', '<li>', $html);
+        $html = preg_replace('/<ul[^>]*>/', '<ul>', $html);
+        $html = str_replace(['</li>'], '<br>', $html);
+        $html = preg_replace('/\s+/', '', $html);
+        $html = str_replace('<br>', "\n", $html);
+        $html = str_replace('<li>', '- ', $html);
+        $html = Str::replaceFirst('<ul>', "\n", $html);
+
+        // Indent each line within remaining uls
+        $innerUlCount = substr_count($html, '<ul>');
+        foreach (range(1, $innerUlCount) as $i) {
+            $html = Str::replaceFirst('</ul>', '</ul-first>', $html);
+            $innerUlContent = Str::between($html, '<ul>', '</ul-first>');
+            $id = md5($innerUlContent.$i);
+            $html = Str::replaceFirst($innerUlContent, $id, $html);
+            $innerUlContent = trim(str_replace("\n", "\n  ", $innerUlContent));
+
+            $html = str_replace('<ul>'.$id.'</ul-first>', "\n  ".$innerUlContent, $html);
+        }
+
+        $html = Str::replaceLast('</ul>', '', $html);
+
+        return trim(implode("\n", array_map('rtrim', explode("\n", $html))));
+    }
 }
 
 class RenderedMainNavigationMenu extends RenderedNavigationMenu

From 0f9daf5763452b7803ea2565f89710cde863ef28 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 12 Mar 2024 10:20:41 +0100
Subject: [PATCH 0914/1422] Nicer formatting

---
 .../tests/Unit/Views/NavigationHtmlLayoutsTest.php | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index 8ea227431f0..f4600466b89 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -115,14 +115,12 @@ public function testNavigationMenuWithDropdownPages()
             ->assertHasElement('dropdown-items')
             ->assertHasElement('dropdown-button')
             ->assertItemsLookLike(<<<'HTML'
-- Home
-- Foo
-    - Bar
-    - Baz
-HTML
-
-            )
-            ->finish();
+                - Home
+                - Foo
+                    - Bar
+                    - Baz
+                HTML
+            );
     }
 
     protected function withPages(array $pages): static

From 18c322843489639c639de72f426b84b14d2b6c9f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 12 Mar 2024 10:23:00 +0100
Subject: [PATCH 0915/1422] Formatting

---
 .../Unit/Views/NavigationHtmlLayoutsTest.php  | 29 +++++++++++++++----
 1 file changed, 24 insertions(+), 5 deletions(-)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index f4600466b89..81398b9bec7 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -24,6 +24,25 @@
 use Hyde\Framework\Features\Navigation\DocumentationSidebar;
 use Hyde\Framework\Features\Navigation\NavigationMenuGenerator;
 
+use function app;
+use function md5;
+use function view;
+use function trim;
+use function range;
+use function config;
+use function collect;
+use function sprintf;
+use function explode;
+use function implode;
+use function array_map;
+use function strip_tags;
+use function json_encode;
+use function str_replace;
+use function preg_replace;
+use function substr_count;
+use function class_basename;
+use function file_put_contents;
+
 /**
  * Very high level tests for navigation menu and sidebar view layouts.
  *
@@ -101,11 +120,11 @@ public function testNavigationMenuFromNestedRoute()
     public function testNavigationMenuWithDropdownPages()
     {
         $this->useSubdirectoriesAsDropdowns()
-           ->menu([
-               new MarkdownPage('index'),
-               new MarkdownPage('foo/bar'),
-               new MarkdownPage('foo/baz'),
-           ])
+            ->menu([
+                new MarkdownPage('index'),
+                new MarkdownPage('foo/bar'),
+                new MarkdownPage('foo/baz'),
+            ])
             ->assertHasPages([
                 'index.html' => 'Home',
                 'foo/bar.html' => 'Bar',

From 7bb7f15e51371c2bc62e91dfde91a26849f2aa88 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 12 Mar 2024 10:25:44 +0100
Subject: [PATCH 0916/1422] Add conditional

---
 .../Unit/Views/NavigationHtmlLayoutsTest.php   | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index 81398b9bec7..ea09120fd29 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -372,14 +372,16 @@ protected function makeTextRepresentation(): string
 
         // Indent each line within remaining uls
         $innerUlCount = substr_count($html, '<ul>');
-        foreach (range(1, $innerUlCount) as $i) {
-            $html = Str::replaceFirst('</ul>', '</ul-first>', $html);
-            $innerUlContent = Str::between($html, '<ul>', '</ul-first>');
-            $id = md5($innerUlContent.$i);
-            $html = Str::replaceFirst($innerUlContent, $id, $html);
-            $innerUlContent = trim(str_replace("\n", "\n  ", $innerUlContent));
-
-            $html = str_replace('<ul>'.$id.'</ul-first>', "\n  ".$innerUlContent, $html);
+        if ($innerUlCount >= 1) {
+            foreach (range(1, $innerUlCount) as $i) {
+                $html = Str::replaceFirst('</ul>', '</ul-first>', $html);
+                $innerUlContent = Str::between($html, '<ul>', '</ul-first>');
+                $id = md5($innerUlContent.$i);
+                $html = Str::replaceFirst($innerUlContent, $id, $html);
+                $innerUlContent = trim(str_replace("\n", "\n  ", $innerUlContent));
+
+                $html = str_replace('<ul>'.$id.'</ul-first>', "\n  ".$innerUlContent, $html);
+            }
         }
 
         $html = Str::replaceLast('</ul>', '', $html);

From 8424fc93ea67f60a7942283bf37c1d37de738bd3 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 12 Mar 2024 10:25:53 +0100
Subject: [PATCH 0917/1422] Add visual assertion

---
 .../tests/Unit/Views/NavigationHtmlLayoutsTest.php        | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index ea09120fd29..27216ae29c7 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -114,7 +114,13 @@ public function testNavigationMenuFromNestedRoute()
                 '../about.html' => 'About',
                 '../custom.html' => 'Label',
             ])
-            ->finish();
+            ->assertItemsLookLike(<<<'HTML'
+                - Home
+                - First
+                - About
+                - Label
+                HTML
+            );
     }
 
     public function testNavigationMenuWithDropdownPages()

From 5e9bcc22d32c9115b3b18b445f6707c3bd795ecb Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 12 Mar 2024 10:29:23 +0100
Subject: [PATCH 0918/1422] Refactor helper to be more generic

---
 .../tests/Unit/Views/NavigationHtmlLayoutsTest.php          | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index 27216ae29c7..8d283481221 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -125,7 +125,7 @@ public function testNavigationMenuFromNestedRoute()
 
     public function testNavigationMenuWithDropdownPages()
     {
-        $this->useSubdirectoriesAsDropdowns()
+        $this->useSubdirectoryConfig('dropdown')
             ->menu([
                 new MarkdownPage('index'),
                 new MarkdownPage('foo/bar'),
@@ -180,9 +180,9 @@ protected function sidebar(array $withPages = []): RenderedDocumentationSidebarM
         return new RenderedDocumentationSidebarMenu($this, $this->render('hyde::components.docs.sidebar'));
     }
 
-    protected function useSubdirectoriesAsDropdowns(): static
+    protected function useSubdirectoryConfig(string $option): static
     {
-        config(['hyde.navigation.subdirectories' => 'dropdown']);
+        config(['hyde.navigation.subdirectories' => $option]);
 
         return $this;
     }

From 9e0d31836ba1fa9694684c2ed8fed6c01edec3c8 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 12 Mar 2024 10:31:01 +0100
Subject: [PATCH 0919/1422] Test navigation menu with flat subdirectory pages

---
 .../Unit/Views/NavigationHtmlLayoutsTest.php  | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index 8d283481221..5c95c16508d 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -148,6 +148,30 @@ public function testNavigationMenuWithDropdownPages()
             );
     }
 
+    public function testNavigationMenuWithFlatSubdirectoryPages()
+    {
+        $this->useSubdirectoryConfig('flat')
+            ->menu([
+                new MarkdownPage('index'),
+                new MarkdownPage('foo/bar'),
+                new MarkdownPage('foo/baz'),
+            ])
+            ->assertHasPages([
+                'index.html' => 'Home',
+                'foo/bar.html' => 'Bar',
+                'foo/baz.html' => 'Baz',
+            ])
+            ->assertDoesNotHaveElement('dropdown')
+            ->assertDoesNotHaveElement('dropdown-items')
+            ->assertDoesNotHaveElement('dropdown-button')
+            ->assertItemsLookLike(<<<'HTML'
+                - Home
+                - Bar
+                - Baz
+                HTML
+            );
+    }
+
     protected function withPages(array $pages): static
     {
         $this->kernel->setRoutes(collect($pages)->map(fn (HydePage $page) => $page->getRoute()));

From 6ba350d04462bc56ad0485aca7b3512f18807f24 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 12 Mar 2024 10:33:27 +0100
Subject: [PATCH 0920/1422] Extract fluent assertion helpers

---
 .../Unit/Views/NavigationHtmlLayoutsTest.php  | 22 ++++++++++++++-----
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index 5c95c16508d..0b9b2a6ecd5 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -136,9 +136,7 @@ public function testNavigationMenuWithDropdownPages()
                 'foo/bar.html' => 'Bar',
                 'foo/baz.html' => 'Baz',
             ])
-            ->assertHasElement('dropdown')
-            ->assertHasElement('dropdown-items')
-            ->assertHasElement('dropdown-button')
+            ->assertHasDropdowns()
             ->assertItemsLookLike(<<<'HTML'
                 - Home
                 - Foo
@@ -161,9 +159,7 @@ public function testNavigationMenuWithFlatSubdirectoryPages()
                 'foo/bar.html' => 'Bar',
                 'foo/baz.html' => 'Baz',
             ])
-            ->assertDoesNotHaveElement('dropdown')
-            ->assertDoesNotHaveElement('dropdown-items')
-            ->assertDoesNotHaveElement('dropdown-button')
+            ->assertDoesNotHaveDropdowns()
             ->assertItemsLookLike(<<<'HTML'
                 - Home
                 - Bar
@@ -345,6 +341,20 @@ public function assertItemsLookLike(string $expected): static
         return $this->assertLooksLike($expected, true);
     }
 
+    public function assertHasDropdowns(): static
+    {
+        return $this->assertHasElement('dropdown')
+            ->assertHasElement('dropdown-items')
+            ->assertHasElement('dropdown-button');
+    }
+
+    public function assertDoesNotHaveDropdowns(): static
+    {
+        return $this->assertDoesNotHaveElement('dropdown')
+            ->assertDoesNotHaveElement('dropdown-items')
+            ->assertDoesNotHaveElement('dropdown-button');
+    }
+
     #[NoReturn]
     public function dd(bool $writeHtml = true): void
     {

From 67cec4ae5b94b9ef3efd8ab98de30611abafbe0e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 12 Mar 2024 10:36:58 +0100
Subject: [PATCH 0921/1422] Move up assertions

---
 .../framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index 0b9b2a6ecd5..6d7bf81477a 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -131,12 +131,12 @@ public function testNavigationMenuWithDropdownPages()
                 new MarkdownPage('foo/bar'),
                 new MarkdownPage('foo/baz'),
             ])
+            ->assertHasDropdowns()
             ->assertHasPages([
                 'index.html' => 'Home',
                 'foo/bar.html' => 'Bar',
                 'foo/baz.html' => 'Baz',
             ])
-            ->assertHasDropdowns()
             ->assertItemsLookLike(<<<'HTML'
                 - Home
                 - Foo
@@ -154,12 +154,12 @@ public function testNavigationMenuWithFlatSubdirectoryPages()
                 new MarkdownPage('foo/bar'),
                 new MarkdownPage('foo/baz'),
             ])
+            ->assertDoesNotHaveDropdowns()
             ->assertHasPages([
                 'index.html' => 'Home',
                 'foo/bar.html' => 'Bar',
                 'foo/baz.html' => 'Baz',
             ])
-            ->assertDoesNotHaveDropdowns()
             ->assertItemsLookLike(<<<'HTML'
                 - Home
                 - Bar

From 5c14544e83266352946628e0fff93c4cf3197fe5 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 12 Mar 2024 10:38:06 +0100
Subject: [PATCH 0922/1422] Break out method chains in helper

---
 .../Unit/Views/NavigationHtmlLayoutsTest.php     | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index 6d7bf81477a..86359ab01d9 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -343,16 +343,20 @@ public function assertItemsLookLike(string $expected): static
 
     public function assertHasDropdowns(): static
     {
-        return $this->assertHasElement('dropdown')
-            ->assertHasElement('dropdown-items')
-            ->assertHasElement('dropdown-button');
+        $this->assertHasElement('dropdown');
+        $this->assertHasElement('dropdown-items');
+        $this->assertHasElement('dropdown-button');
+
+        return $this;
     }
 
     public function assertDoesNotHaveDropdowns(): static
     {
-        return $this->assertDoesNotHaveElement('dropdown')
-            ->assertDoesNotHaveElement('dropdown-items')
-            ->assertDoesNotHaveElement('dropdown-button');
+        $this->assertDoesNotHaveElement('dropdown');
+        $this->assertDoesNotHaveElement('dropdown-items');
+        $this->assertDoesNotHaveElement('dropdown-button');
+
+        return $this;
     }
 
     #[NoReturn]

From e1f37ee84fe84221908a8eaf7c51aae3e3cd4f25 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 12 Mar 2024 10:55:31 +0100
Subject: [PATCH 0923/1422] Add helper to assert the expected dropdown
 structure

---
 .../Unit/Views/NavigationHtmlLayoutsTest.php  | 30 +++++++++++++++++--
 1 file changed, 28 insertions(+), 2 deletions(-)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index 86359ab01d9..6ae0bff989c 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -131,7 +131,7 @@ public function testNavigationMenuWithDropdownPages()
                 new MarkdownPage('foo/bar'),
                 new MarkdownPage('foo/baz'),
             ])
-            ->assertHasDropdowns()
+            ->assertHasDropdowns(['Foo'])
             ->assertHasPages([
                 'index.html' => 'Home',
                 'foo/bar.html' => 'Bar',
@@ -341,12 +341,38 @@ public function assertItemsLookLike(string $expected): static
         return $this->assertLooksLike($expected, true);
     }
 
-    public function assertHasDropdowns(): static
+    public function assertHasDropdowns(?array $dropdownLabels = null): static
     {
         $this->assertHasElement('dropdown');
         $this->assertHasElement('dropdown-items');
         $this->assertHasElement('dropdown-button');
 
+        if ($dropdownLabels) {
+            // Assert contains only the same count of dropdown labels
+
+            // Get all ul.dropdown-items elements
+            $xpath = new DOMXPath($this->ast);
+            $dropdownItems = $xpath->query('//ul[contains(concat(" ", normalize-space(@class), " "), " dropdown-items ")]');
+
+            $foundLabels = [];
+
+            foreach ($dropdownItems as $dropdownItem) {
+                // Get the preceding sibling button element
+                $button = $xpath->query('../preceding-sibling::button', $dropdownItem)->item(0);
+
+                // Get the text content of the button (label)
+                $label = $button->textContent;
+
+                // Trim and add the label to the array
+                $foundLabels[] = trim($label);
+            }
+
+            $this->test->assertSame($dropdownLabels, $foundLabels, sprintf('Rendered dropdown labels do not match expected labels: %s', json_encode([
+                'expected' => $dropdownLabels,
+                'rendered' => $foundLabels,
+            ], JSON_PRETTY_PRINT)));
+        }
+
         return $this;
     }
 

From 3c7ce81dc5f1131633ac573232518e2c6296c613 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 12 Mar 2024 11:01:59 +0100
Subject: [PATCH 0924/1422] Refactor helper and allow expected values

---
 .../Unit/Views/NavigationHtmlLayoutsTest.php  | 30 +++++++++++++------
 1 file changed, 21 insertions(+), 9 deletions(-)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index 6ae0bff989c..bd4a096fa28 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -36,10 +36,13 @@
 use function implode;
 use function array_map;
 use function strip_tags;
+use function array_keys;
 use function json_encode;
 use function str_replace;
 use function preg_replace;
 use function substr_count;
+use function array_filter;
+use function array_values;
 use function class_basename;
 use function file_put_contents;
 
@@ -131,7 +134,7 @@ public function testNavigationMenuWithDropdownPages()
                 new MarkdownPage('foo/bar'),
                 new MarkdownPage('foo/baz'),
             ])
-            ->assertHasDropdowns(['Foo'])
+            ->assertHasDropdowns(['Foo' => ['Bar', 'Baz']])
             ->assertHasPages([
                 'index.html' => 'Home',
                 'foo/bar.html' => 'Bar',
@@ -341,35 +344,44 @@ public function assertItemsLookLike(string $expected): static
         return $this->assertLooksLike($expected, true);
     }
 
-    public function assertHasDropdowns(?array $dropdownLabels = null): static
+    public function assertHasDropdowns(?array $expected = null): static
     {
         $this->assertHasElement('dropdown');
         $this->assertHasElement('dropdown-items');
         $this->assertHasElement('dropdown-button');
 
-        if ($dropdownLabels) {
+        if ($expected) {
             // Assert contains only the same count of dropdown labels
 
             // Get all ul.dropdown-items elements
             $xpath = new DOMXPath($this->ast);
             $dropdownItems = $xpath->query('//ul[contains(concat(" ", normalize-space(@class), " "), " dropdown-items ")]');
 
-            $foundLabels = [];
+            /** @var array<string, array<string> $actual */
+            $actual = [];
 
             foreach ($dropdownItems as $dropdownItem) {
                 // Get the preceding sibling button element
                 $button = $xpath->query('../preceding-sibling::button', $dropdownItem)->item(0);
 
                 // Get the text content of the button (label)
-                $label = $button->textContent;
+                $label = trim($button->textContent);
+
+                $innerText = $dropdownItem->textContent;
+                $children = array_values(array_filter(array_map('trim', explode("\n", $innerText))));
 
                 // Trim and add the label to the array
-                $foundLabels[] = trim($label);
+                $actual[$label] = $children;
+            }
+
+            // If expected is a list array then remove values from actual
+            if (array_keys($expected) === range(0, count($expected) - 1)) {
+                $actual = array_keys($actual);
             }
 
-            $this->test->assertSame($dropdownLabels, $foundLabels, sprintf('Rendered dropdown labels do not match expected labels: %s', json_encode([
-                'expected' => $dropdownLabels,
-                'rendered' => $foundLabels,
+            $this->test->assertSame($expected, $actual, sprintf('Rendered dropdown does not match expected format: %s', json_encode([
+                'expected' => $expected,
+                'rendered' => $actual,
             ], JSON_PRETTY_PRINT)));
         }
 

From 3aaef2dbec6c8e14f40e664adf03bc0456d001f1 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 12 Mar 2024 11:02:29 +0100
Subject: [PATCH 0925/1422] Use simpler array generics comparison

---
 .../framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index bd4a096fa28..1a0afdc7609 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -375,7 +375,7 @@ public function assertHasDropdowns(?array $expected = null): static
             }
 
             // If expected is a list array then remove values from actual
-            if (array_keys($expected) === range(0, count($expected) - 1)) {
+            if (array_values($expected) === $expected) {
                 $actual = array_keys($actual);
             }
 

From d72efe5908f4d572443f64318a94e812093feb88 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 12 Mar 2024 11:03:44 +0100
Subject: [PATCH 0926/1422] Clean up testing helper code

---
 .../tests/Unit/Views/NavigationHtmlLayoutsTest.php    | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index 1a0afdc7609..3c9236f4a7d 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -351,9 +351,6 @@ public function assertHasDropdowns(?array $expected = null): static
         $this->assertHasElement('dropdown-button');
 
         if ($expected) {
-            // Assert contains only the same count of dropdown labels
-
-            // Get all ul.dropdown-items elements
             $xpath = new DOMXPath($this->ast);
             $dropdownItems = $xpath->query('//ul[contains(concat(" ", normalize-space(@class), " "), " dropdown-items ")]');
 
@@ -361,20 +358,16 @@ public function assertHasDropdowns(?array $expected = null): static
             $actual = [];
 
             foreach ($dropdownItems as $dropdownItem) {
-                // Get the preceding sibling button element
                 $button = $xpath->query('../preceding-sibling::button', $dropdownItem)->item(0);
 
-                // Get the text content of the button (label)
                 $label = trim($button->textContent);
 
-                $innerText = $dropdownItem->textContent;
-                $children = array_values(array_filter(array_map('trim', explode("\n", $innerText))));
+                $children = array_values(array_filter(array_map('trim', explode("\n", $dropdownItem->textContent))));
 
-                // Trim and add the label to the array
                 $actual[$label] = $children;
             }
 
-            // If expected is a list array then remove values from actual
+            // If expected is a list array, then remove values from actual
             if (array_values($expected) === $expected) {
                 $actual = array_keys($actual);
             }

From b5e99c8b05030c4fef76f0212d1d7ef84833809c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 12 Mar 2024 12:02:48 +0100
Subject: [PATCH 0927/1422] Clean up test code

---
 .../tests/Unit/Views/NavigationHtmlLayoutsTest.php        | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index 3c9236f4a7d..f58692eadc0 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -445,17 +445,17 @@ protected function makeTextRepresentation(): string
         $html = str_replace('<li>', '- ', $html);
         $html = Str::replaceFirst('<ul>', "\n", $html);
 
-        // Indent each line within remaining uls
         $innerUlCount = substr_count($html, '<ul>');
         if ($innerUlCount >= 1) {
-            foreach (range(1, $innerUlCount) as $i) {
+            // Indent each line within the remaining UL elements
+            foreach (range(1, $innerUlCount) as $item) {
                 $html = Str::replaceFirst('</ul>', '</ul-first>', $html);
                 $innerUlContent = Str::between($html, '<ul>', '</ul-first>');
-                $id = md5($innerUlContent.$i);
+                $id = md5("$innerUlContent-$item");
                 $html = Str::replaceFirst($innerUlContent, $id, $html);
                 $innerUlContent = trim(str_replace("\n", "\n  ", $innerUlContent));
 
-                $html = str_replace('<ul>'.$id.'</ul-first>', "\n  ".$innerUlContent, $html);
+                $html = str_replace("<ul>$id</ul-first>", "\n  $innerUlContent", $html);
             }
         }
 

From a9370d605bd59a3c85a2faf328242d07fc258ef6 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 12 Mar 2024 12:18:39 +0100
Subject: [PATCH 0928/1422] Test navigation menu with hidden subdirectory pages

---
 .../Unit/Views/NavigationHtmlLayoutsTest.php   | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index f58692eadc0..39b8d4afbff 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -171,6 +171,24 @@ public function testNavigationMenuWithFlatSubdirectoryPages()
             );
     }
 
+    public function testNavigationMenuWithHiddenSubdirectoryPages()
+    {
+        $this->useSubdirectoryConfig('hidden')
+            ->menu([
+                new MarkdownPage('index'),
+                new MarkdownPage('foo/bar'),
+                new MarkdownPage('foo/baz'),
+            ])
+            ->assertDoesNotHaveDropdowns()
+            ->assertHasPages([
+                'index.html' => 'Home',
+            ])
+            ->assertItemsLookLike(<<<'HTML'
+                - Home
+                HTML
+            );
+    }
+
     protected function withPages(array $pages): static
     {
         $this->kernel->setRoutes(collect($pages)->map(fn (HydePage $page) => $page->getRoute()));

From bd7a583b42fc50eeb4f96487bfdb9eb6a9697875 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 12 Mar 2024 12:19:00 +0100
Subject: [PATCH 0929/1422] Convert to string literal

---
 .../framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index 39b8d4afbff..ee8bb704682 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -183,10 +183,7 @@ public function testNavigationMenuWithHiddenSubdirectoryPages()
             ->assertHasPages([
                 'index.html' => 'Home',
             ])
-            ->assertItemsLookLike(<<<'HTML'
-                - Home
-                HTML
-            );
+            ->assertItemsLookLike('- Home');
     }
 
     protected function withPages(array $pages): static

From 8dbd62277ae3cef7d2e966d513ce2e0096af9572 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 12 Mar 2024 13:38:51 +0100
Subject: [PATCH 0930/1422] Add edge case tests

---
 .../Unit/Views/NavigationHtmlLayoutsTest.php  | 155 ++++++++++++++++++
 1 file changed, 155 insertions(+)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index ee8bb704682..d309c22a84a 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -193,6 +193,161 @@ protected function withPages(array $pages): static
         return $this;
     }
 
+    public function testNavigationMenuWithFlatSubdirectoryPagesAndMatchingSubdirectoryPage()
+    {
+        $this->useSubdirectoryConfig('flat')
+            ->menu([
+                new MarkdownPage('index'),
+                new MarkdownPage('foo'),
+                new MarkdownPage('foo/bar'),
+                new MarkdownPage('foo/baz'),
+            ])
+            ->assertDoesNotHaveDropdowns()
+            ->assertHasPages([
+                'index.html' => 'Home',
+                'foo.html' => 'Foo',
+                'foo/bar.html' => 'Bar',
+                'foo/baz.html' => 'Baz',
+            ])
+            ->assertItemsLookLike(<<<'HTML'
+                - Home
+                - Foo
+                - Bar
+                - Baz
+                HTML
+            );
+    }
+
+    public function testNavigationMenuWithFlatSubdirectoryPagesAndMatchingSubdirectoryIndexPage()
+    {
+        $this->useSubdirectoryConfig('flat')
+            ->menu([
+                new MarkdownPage('index'),
+                new MarkdownPage('foo/index'),
+                new MarkdownPage('foo/bar'),
+                new MarkdownPage('foo/baz'),
+            ])
+            ->assertDoesNotHaveDropdowns()
+            ->assertHasPages([
+                'index.html' => 'Home',
+                'foo/index.html' => 'Foo',
+                'foo/bar.html' => 'Bar',
+                'foo/baz.html' => 'Baz',
+            ])
+            ->assertItemsLookLike(<<<'HTML'
+                - Home
+                - Foo
+                - Bar
+                - Baz
+                HTML
+            );
+    }
+
+    public function testNavigationMenuWithFlatSubdirectoryPagesAndMatchingSubdirectoryAndIndexPage()
+    {
+        $this->useSubdirectoryConfig('flat')
+            ->menu([
+                new MarkdownPage('index'),
+                new MarkdownPage('foo'),
+                new MarkdownPage('foo/index'),
+                new MarkdownPage('foo/bar'),
+                new MarkdownPage('foo/baz'),
+            ])
+            ->assertDoesNotHaveDropdowns()
+            ->assertHasPages([
+                'index.html' => 'Home',
+                'foo.html' => 'Foo',
+                'foo/index.html' => 'Foo',
+                'foo/bar.html' => 'Bar',
+                'foo/baz.html' => 'Baz',
+            ])
+            ->assertItemsLookLike(<<<'HTML'
+                - Home
+                - Foo
+                - Foo
+                - Bar
+                - Baz
+                HTML
+            );
+    }
+
+    public function testNavigationMenuWithDropdownSubdirectoryPagesAndMatchingSubdirectoryPage()
+    {
+        $this->useSubdirectoryConfig('dropdown')
+            ->menu([
+                new MarkdownPage('index'),
+                new MarkdownPage('foo'),
+                new MarkdownPage('foo/bar'),
+                new MarkdownPage('foo/baz'),
+            ])
+            ->assertHasDropdowns()
+            ->assertHasPages([
+                'index.html' => 'Home',
+                'foo/bar.html' => 'Bar',
+                'foo/baz.html' => 'Baz',
+            ])
+            ->assertItemsLookLike(<<<'HTML'
+                - Home
+                - Foo
+                    - Bar
+                    - Baz
+                HTML
+            );
+    }
+
+    public function testNavigationMenuWithDropdownSubdirectoryPagesAndMatchingSubdirectoryIndexPage()
+    {
+        $this->useSubdirectoryConfig('dropdown')
+            ->menu([
+                new MarkdownPage('index'),
+                new MarkdownPage('foo/index'),
+                new MarkdownPage('foo/bar'),
+                new MarkdownPage('foo/baz'),
+            ])
+            ->assertHasDropdowns()
+            ->assertHasPages([
+                'index.html' => 'Home',
+                'foo/index.html' => 'Foo',
+                'foo/bar.html' => 'Bar',
+                'foo/baz.html' => 'Baz',
+            ])
+            ->assertItemsLookLike(<<<'HTML'
+                - Home
+                - Foo
+                    - Foo
+                    - Bar
+                    - Baz
+                HTML
+            );
+    }
+
+    public function testNavigationMenuWithDropdownSubdirectoryPagesAndMatchingSubdirectoryAndIndexPage()
+    {
+        $this->useSubdirectoryConfig('dropdown')
+            ->menu([
+                new MarkdownPage('index'),
+                new MarkdownPage('foo'),
+                new MarkdownPage('foo/index'),
+                new MarkdownPage('foo/bar'),
+                new MarkdownPage('foo/baz'),
+            ])
+            ->assertHasDropdowns()
+            ->assertHasPages([
+                'index.html' => 'Home',
+                'foo/index.html' => 'Foo',
+                'foo/bar.html' => 'Bar',
+                'foo/baz.html' => 'Baz',
+            ])
+            ->assertItemsLookLike(<<<'HTML'
+                - Home
+                - Foo
+                    - Foo
+                    - Bar
+                    - Baz
+                HTML
+            );
+    }
+
     protected function fromPage(string $mockedRoute): static
     {
         $this->mockCurrentPage($mockedRoute);

From f646820b28bd91f4716f35410fdc87f734f1959d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 12 Mar 2024 13:41:25 +0100
Subject: [PATCH 0931/1422] Clean up test endings

---
 .../tests/Unit/Views/NavigationHtmlLayoutsTest.php       | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index d309c22a84a..ee6cf6ca667 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -77,8 +77,7 @@ public function testMainNavigationMenu()
             ->assertDoesNotHaveElement('dropdown')
             ->assertDoesNotHaveElement('dropdown-items')
             ->assertDoesNotHaveElement('dropdown-button')
-            ->assertHasNoPages()
-            ->finish();
+            ->assertHasNoPages();
     }
 
     public function testDocumentationSidebarMenu()
@@ -91,8 +90,7 @@ public function testDocumentationSidebarMenu()
             ->assertHasElement('sidebar-footer')
             ->assertHasElement('theme-toggle-button')
             ->assertHasElement('sidebar-items')
-            ->assertHasNoPages()
-            ->finish();
+            ->assertHasNoPages();
     }
 
     public function testNavigationMenuWithPages()
@@ -103,8 +101,7 @@ public function testNavigationMenuWithPages()
                 'first.html' => 'First',
                 'about.html' => 'About',
                 'custom.html' => 'Label',
-            ])
-            ->finish();
+            ]);
     }
 
     public function testNavigationMenuFromNestedRoute()

From 06d282abace8e58e8a4339e2f54d017ea933c20b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 12 Mar 2024 13:46:13 +0100
Subject: [PATCH 0932/1422] Unescape slashes for testing dump

---
 .../framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index ee6cf6ca667..8f7e783754c 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -475,7 +475,7 @@ public function assertHasPages(array $pages): static
         $this->test->assertSame($pages, $renderedPages, sprintf('Rendered pages do not match expected pages: %s', json_encode([
             'expected' => $pages,
             'rendered' => $renderedPages,
-        ], JSON_PRETTY_PRINT)));
+        ], JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES)));
 
         return $this;
     }
@@ -542,7 +542,7 @@ public function assertHasDropdowns(?array $expected = null): static
             $this->test->assertSame($expected, $actual, sprintf('Rendered dropdown does not match expected format: %s', json_encode([
                 'expected' => $expected,
                 'rendered' => $actual,
-            ], JSON_PRETTY_PRINT)));
+            ], JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES)));
         }
 
         return $this;

From 5c74c657f4d97ff71e6f29709edf371a9aa802d5 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 12 Mar 2024 13:47:54 +0100
Subject: [PATCH 0933/1422] Trim text content

---
 .../framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index 8f7e783754c..71425de59d9 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -590,7 +590,7 @@ protected function getRenderedPages(): array
         $pages = [];
 
         foreach ($links as $link) {
-            $pages[$link->getAttribute('href')] = $link->textContent;
+            $pages[$link->getAttribute('href')] = trim($link->textContent);
         }
 
         return $pages;

From 293d0ddc0226266a3cf1de31b7e7a0ce0f2c5c79 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 12 Mar 2024 13:50:15 +0100
Subject: [PATCH 0934/1422] Extract helper to print serialized array

---
 .../tests/Unit/Views/NavigationHtmlLayoutsTest.php  | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index 71425de59d9..1212fb151e5 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -472,10 +472,10 @@ public function assertHasPages(array $pages): static
     {
         $renderedPages = $this->getRenderedPages();
 
-        $this->test->assertSame($pages, $renderedPages, sprintf('Rendered pages do not match expected pages: %s', json_encode([
+        $this->test->assertSame($pages, $renderedPages, sprintf('Rendered pages do not match expected pages: %s', $this->printSerializedArray([
             'expected' => $pages,
             'rendered' => $renderedPages,
-        ], JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES)));
+        ])));
 
         return $this;
     }
@@ -539,10 +539,10 @@ public function assertHasDropdowns(?array $expected = null): static
                 $actual = array_keys($actual);
             }
 
-            $this->test->assertSame($expected, $actual, sprintf('Rendered dropdown does not match expected format: %s', json_encode([
+            $this->test->assertSame($expected, $actual, sprintf('Rendered dropdown does not match expected format: %s', $this->printSerializedArray([
                 'expected' => $expected,
                 'rendered' => $actual,
-            ], JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES)));
+            ])));
         }
 
         return $this;
@@ -630,6 +630,11 @@ protected function makeTextRepresentation(): string
 
         return trim(implode("\n", array_map('rtrim', explode("\n", $html))));
     }
+
+    protected function printSerializedArray(array $data): string|false
+    {
+        return json_encode($data, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES);
+    }
 }
 
 class RenderedMainNavigationMenu extends RenderedNavigationMenu

From 22bab9a6d622b90768245320c35bd173679113a4 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 12 Mar 2024 13:57:13 +0100
Subject: [PATCH 0935/1422] Convert JSON to PHP array syntax

---
 .../tests/Unit/Views/NavigationHtmlLayoutsTest.php | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index 1212fb151e5..3bdfece36fe 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -633,7 +633,19 @@ protected function makeTextRepresentation(): string
 
     protected function printSerializedArray(array $data): string|false
     {
-        return json_encode($data, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES);
+        $string = json_encode($data, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES);
+
+        // Convert JSON to PHP array syntax
+
+        $string = str_replace(['{', '}'], ['[', ']'], $string);
+        $string = str_replace('": "', "' => '", $string);
+        $string = str_replace('": [', "' => [", $string);
+        $string = str_replace('"', "'", $string);
+        $string = str_replace("'\n", "',\n", $string);
+        $string = str_replace(']', '],', $string);
+        $string = str_replace(',,', ',', $string);
+
+        return rtrim($string, ',');
     }
 }
 

From 2f6f1c43d378cae1e1c47fd7f2a99ce8ec66e8a5 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 12 Mar 2024 13:59:30 +0100
Subject: [PATCH 0936/1422] Fix return type

---
 .../framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index 3bdfece36fe..d9c30f34d7a 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -631,7 +631,7 @@ protected function makeTextRepresentation(): string
         return trim(implode("\n", array_map('rtrim', explode("\n", $html))));
     }
 
-    protected function printSerializedArray(array $data): string|false
+    protected function printSerializedArray(array $data): string
     {
         $string = json_encode($data, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES);
 

From 62b119f2e2dda6a43919b427b7992a825b5c629f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 12 Mar 2024 13:59:43 +0100
Subject: [PATCH 0937/1422] Formatting

---
 .../framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php     | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index d9c30f34d7a..1e462acbea8 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -636,7 +636,6 @@ protected function printSerializedArray(array $data): string
         $string = json_encode($data, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES);
 
         // Convert JSON to PHP array syntax
-
         $string = str_replace(['{', '}'], ['[', ']'], $string);
         $string = str_replace('": "', "' => '", $string);
         $string = str_replace('": [', "' => [", $string);

From fbe47bb18258312e757402c152d6b8d34326913b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 12 Mar 2024 13:59:51 +0100
Subject: [PATCH 0938/1422] Formatting

---
 .../framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index 1e462acbea8..49ed52cf589 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -29,6 +29,7 @@
 use function view;
 use function trim;
 use function range;
+use function rtrim;
 use function config;
 use function collect;
 use function sprintf;

From 7553c7cef1c5d6c2e1b413d18309b88fa119b6fb Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 12 Mar 2024 14:07:53 +0100
Subject: [PATCH 0939/1422] Strip documentation footer with header row

---
 .../framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index 49ed52cf589..75f9471fbbf 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -494,6 +494,9 @@ public function assertLooksLike(string $expected, bool $skipHeaderRow = false):
 
         if ($skipHeaderRow) {
             $actual = trim(Str::after($actual, "\n"));
+            if (str_contains($actual, 'Backtohomepage')) {
+                $actual = trim(str_replace('Backtohomepage', '', $actual));
+            }
         }
         // If expected omitted dashes, remove them from actual
         if (! str_contains($expected, '- ')) {

From 21de28ae57161f52c56f44cc7d7f8485324fbbce Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 12 Mar 2024 14:40:10 +0100
Subject: [PATCH 0940/1422] Update helper to better handle sidebars

---
 .../tests/Unit/Views/NavigationHtmlLayoutsTest.php          | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index 75f9471fbbf..424f0c5d576 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -494,8 +494,8 @@ public function assertLooksLike(string $expected, bool $skipHeaderRow = false):
 
         if ($skipHeaderRow) {
             $actual = trim(Str::after($actual, "\n"));
-            if (str_contains($actual, 'Backtohomepage')) {
-                $actual = trim(str_replace('Backtohomepage', '', $actual));
+            if (str_contains($actual, 'Back to home page')) {
+                $actual = trim(str_replace('Back to home page', '', $actual));
             }
         }
         // If expected omitted dashes, remove them from actual
@@ -632,6 +632,8 @@ protected function makeTextRepresentation(): string
 
         $html = Str::replaceLast('</ul>', '', $html);
 
+        $html = str_replace(['HydePHPDocs', 'Toggledarktheme', 'Togglemenu', 'Backtohomepage'], ['HydePHP Docs', ' Toggle theme', 'Toggle menu', 'Back to home page'], $html);
+
         return trim(implode("\n", array_map('rtrim', explode("\n", $html))));
     }
 

From dbe1eb99b42bafa6685cc846f381baf27f703ce9 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 12 Mar 2024 14:41:43 +0100
Subject: [PATCH 0941/1422] Add more sidebar tests

---
 .../Unit/Views/NavigationHtmlLayoutsTest.php  | 44 +++++++++++++++++++
 1 file changed, 44 insertions(+)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index 424f0c5d576..b114709b690 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -18,6 +18,7 @@
 use Hyde\Foundation\HydeKernel;
 use JetBrains\PhpStorm\NoReturn;
 use Hyde\Pages\Concerns\HydePage;
+use Hyde\Pages\DocumentationPage;
 use Illuminate\Support\Collection;
 use Hyde\Foundation\Kernel\RouteCollection;
 use Hyde\Framework\Features\Navigation\MainNavigationMenu;
@@ -346,6 +347,49 @@ public function testNavigationMenuWithDropdownSubdirectoryPagesAndMatchingSubdir
             );
     }
 
+    public function testSidebarWithPages()
+    {
+        $this->sidebar([
+            new DocumentationPage('index'),
+            new DocumentationPage('foo'),
+            new DocumentationPage('bar'),
+            new DocumentationPage('baz'),
+        ])
+        ->assertHasPages([
+            'docs/foo.html' => 'Foo',
+            'docs/bar.html' => 'Bar',
+            'docs/baz.html' => 'Baz',
+        ])
+        ->assertItemsLookLike(<<<'HTML'
+            Foo
+            Bar
+            Baz
+            HTML
+        );
+    }
+
+    public function testSidebarFromNestedRoute()
+    {
+        $this->fromPage('nested/page')
+            ->sidebar([
+                new DocumentationPage('index'),
+                new DocumentationPage('foo'),
+                new DocumentationPage('bar'),
+                new DocumentationPage('baz'),
+            ])
+            ->assertHasPages([
+                '../docs/foo.html' => 'Foo',
+                '../docs/bar.html' => 'Bar',
+                '../docs/baz.html' => 'Baz',
+            ])
+            ->assertItemsLookLike(<<<'HTML'
+                - Foo
+                - Bar
+                - Baz
+                HTML
+            );
+    }
+
     protected function fromPage(string $mockedRoute): static
     {
         $this->mockCurrentPage($mockedRoute);

From 47d37f039b6ef9cdde86ec710204fdbcb9223d14 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 12 Mar 2024 15:00:17 +0100
Subject: [PATCH 0942/1422] Move specialized assertions to test child class

---
 .../Unit/Views/NavigationHtmlLayoutsTest.php  | 92 +++++++++----------
 1 file changed, 46 insertions(+), 46 deletions(-)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index b114709b690..cc629e468ac 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -559,52 +559,6 @@ public function assertItemsLookLike(string $expected): static
         return $this->assertLooksLike($expected, true);
     }
 
-    public function assertHasDropdowns(?array $expected = null): static
-    {
-        $this->assertHasElement('dropdown');
-        $this->assertHasElement('dropdown-items');
-        $this->assertHasElement('dropdown-button');
-
-        if ($expected) {
-            $xpath = new DOMXPath($this->ast);
-            $dropdownItems = $xpath->query('//ul[contains(concat(" ", normalize-space(@class), " "), " dropdown-items ")]');
-
-            /** @var array<string, array<string> $actual */
-            $actual = [];
-
-            foreach ($dropdownItems as $dropdownItem) {
-                $button = $xpath->query('../preceding-sibling::button', $dropdownItem)->item(0);
-
-                $label = trim($button->textContent);
-
-                $children = array_values(array_filter(array_map('trim', explode("\n", $dropdownItem->textContent))));
-
-                $actual[$label] = $children;
-            }
-
-            // If expected is a list array, then remove values from actual
-            if (array_values($expected) === $expected) {
-                $actual = array_keys($actual);
-            }
-
-            $this->test->assertSame($expected, $actual, sprintf('Rendered dropdown does not match expected format: %s', $this->printSerializedArray([
-                'expected' => $expected,
-                'rendered' => $actual,
-            ])));
-        }
-
-        return $this;
-    }
-
-    public function assertDoesNotHaveDropdowns(): static
-    {
-        $this->assertDoesNotHaveElement('dropdown');
-        $this->assertDoesNotHaveElement('dropdown-items');
-        $this->assertDoesNotHaveElement('dropdown-button');
-
-        return $this;
-    }
-
     #[NoReturn]
     public function dd(bool $writeHtml = true): void
     {
@@ -701,6 +655,52 @@ protected function printSerializedArray(array $data): string
 class RenderedMainNavigationMenu extends RenderedNavigationMenu
 {
     protected const TYPE = MainNavigationMenu::class;
+
+    public function assertHasDropdowns(?array $expected = null): static
+    {
+        $this->assertHasElement('dropdown');
+        $this->assertHasElement('dropdown-items');
+        $this->assertHasElement('dropdown-button');
+
+        if ($expected) {
+            $xpath = new DOMXPath($this->ast);
+            $dropdownItems = $xpath->query('//ul[contains(concat(" ", normalize-space(@class), " "), " dropdown-items ")]');
+
+            /** @var array<string, array<string> $actual */
+            $actual = [];
+
+            foreach ($dropdownItems as $dropdownItem) {
+                $button = $xpath->query('../preceding-sibling::button', $dropdownItem)->item(0);
+
+                $label = trim($button->textContent);
+
+                $children = array_values(array_filter(array_map('trim', explode("\n", $dropdownItem->textContent))));
+
+                $actual[$label] = $children;
+            }
+
+            // If expected is a list array, then remove values from actual
+            if (array_values($expected) === $expected) {
+                $actual = array_keys($actual);
+            }
+
+            $this->test->assertSame($expected, $actual, sprintf('Rendered dropdown does not match expected format: %s', $this->printSerializedArray([
+                'expected' => $expected,
+                'rendered' => $actual,
+            ])));
+        }
+
+        return $this;
+    }
+
+    public function assertDoesNotHaveDropdowns(): static
+    {
+        $this->assertDoesNotHaveElement('dropdown');
+        $this->assertDoesNotHaveElement('dropdown-items');
+        $this->assertDoesNotHaveElement('dropdown-button');
+
+        return $this;
+    }
 }
 
 class RenderedDocumentationSidebarMenu extends RenderedNavigationMenu

From 4427d63dc8ab199b862152b58cb607670ba79d55 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 12 Mar 2024 15:05:12 +0100
Subject: [PATCH 0943/1422] Test sidebar with grouped pages

---
 .../Unit/Views/NavigationHtmlLayoutsTest.php  | 42 +++++++++++++++++++
 1 file changed, 42 insertions(+)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index cc629e468ac..bf90b7980bd 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -390,6 +390,26 @@ public function testSidebarFromNestedRoute()
             );
     }
 
+    public function testSidebarWithGroupedPages()
+    {
+        $this->sidebar([
+            new DocumentationPage('index'),
+            new DocumentationPage('foo/bar'),
+            new DocumentationPage('foo/baz'),
+        ])
+            ->assertHasGroups()
+            ->assertHasPages([
+                'docs/bar.html' => 'Bar',
+                'docs/baz.html' => 'Baz',
+            ])
+            ->assertItemsLookLike(<<<'HTML'
+                - Foo
+                    - Bar
+                    - Baz
+                HTML
+            );
+    }
+
     protected function fromPage(string $mockedRoute): static
     {
         $this->mockCurrentPage($mockedRoute);
@@ -706,6 +726,28 @@ public function assertDoesNotHaveDropdowns(): static
 class RenderedDocumentationSidebarMenu extends RenderedNavigationMenu
 {
     protected const TYPE = DocumentationSidebar::class;
+
+    public function assertHasGroups(): static
+    {
+        $this->assertHasElement('sidebar-group');
+        $this->assertHasElement('sidebar-group-items');
+        $this->assertHasElement('sidebar-group-heading');
+        $this->assertHasElement('sidebar-group-header');
+        $this->assertHasElement('sidebar-group-toggle');
+
+        return $this;
+    }
+
+    public function assertHasNoGroups(): static
+    {
+        $this->assertDoesNotHaveElement('sidebar-group');
+        $this->assertDoesNotHaveElement('sidebar-group-items');
+        $this->assertDoesNotHaveElement('sidebar-group-heading');
+        $this->assertDoesNotHaveElement('sidebar-group-header');
+        $this->assertDoesNotHaveElement('sidebar-group-toggle');
+
+        return $this;
+    }
 }
 
 class TestKernel extends HydeKernel

From fcb0e1481d0439ce4468adf5a0127ccce8abb648 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 12 Mar 2024 15:06:34 +0100
Subject: [PATCH 0944/1422] Formatting

---
 .../Unit/Views/NavigationHtmlLayoutsTest.php  | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index bf90b7980bd..d55ace4c6bb 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -397,17 +397,17 @@ public function testSidebarWithGroupedPages()
             new DocumentationPage('foo/bar'),
             new DocumentationPage('foo/baz'),
         ])
-            ->assertHasGroups()
-            ->assertHasPages([
-                'docs/bar.html' => 'Bar',
-                'docs/baz.html' => 'Baz',
-            ])
-            ->assertItemsLookLike(<<<'HTML'
-                - Foo
-                    - Bar
-                    - Baz
-                HTML
-            );
+        ->assertHasGroups()
+        ->assertHasPages([
+            'docs/bar.html' => 'Bar',
+            'docs/baz.html' => 'Baz',
+        ])
+        ->assertItemsLookLike(<<<'HTML'
+            - Foo
+                - Bar
+                - Baz
+            HTML
+        );
     }
 
     protected function fromPage(string $mockedRoute): static

From 69453a64a14695f3aed11fab681de8185364146f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 12 Mar 2024 15:08:02 +0100
Subject: [PATCH 0945/1422] Test sidebar with grouped pages without flattened
 output paths

---
 .../Unit/Views/NavigationHtmlLayoutsTest.php  | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index d55ace4c6bb..2eea236c674 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -410,6 +410,27 @@ public function testSidebarWithGroupedPages()
         );
     }
 
+    public function testSidebarWithGroupedPagesWithoutFlattenedOutputPaths()
+    {
+        $this->withoutFlattenedOutputPaths()
+            ->sidebar([
+                new DocumentationPage('index'),
+                new DocumentationPage('foo/bar'),
+                new DocumentationPage('foo/baz'),
+            ])
+            ->assertHasGroups()
+            ->assertHasPages([
+                'docs/foo/bar.html' => 'Bar',
+                'docs/foo/baz.html' => 'Baz',
+            ])
+            ->assertItemsLookLike(<<<'HTML'
+            - Foo
+                - Bar
+                - Baz
+            HTML
+            );
+    }
+
     protected function fromPage(string $mockedRoute): static
     {
         $this->mockCurrentPage($mockedRoute);
@@ -442,6 +463,13 @@ protected function useSubdirectoryConfig(string $option): static
         return $this;
     }
 
+    protected function withoutFlattenedOutputPaths(): static
+    {
+        config(['docs.flattened_output_paths' => false]);
+
+        return $this;
+    }
+
     protected function render(string $view): string
     {
         return view($view)->render();

From 28786ecfab7348420b918079f91dcae6b107020d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 12 Mar 2024 15:34:11 +0100
Subject: [PATCH 0946/1422] Remove extra space from code

---
 .../resources/views/components/docs/sidebar-brand.blade.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/resources/views/components/docs/sidebar-brand.blade.php b/packages/framework/resources/views/components/docs/sidebar-brand.blade.php
index e150f86e133..e56ce6b88b7 100644
--- a/packages/framework/resources/views/components/docs/sidebar-brand.blade.php
+++ b/packages/framework/resources/views/components/docs/sidebar-brand.blade.php
@@ -2,7 +2,7 @@
     <strong class="px-2">
         @if(DocumentationPage::home())
             <a href="{{ DocumentationPage::home() }}">
-                {{  $sidebar->getHeader() }}
+                {{ $sidebar->getHeader() }}
             </a>
         @else
             {{ $sidebar->getHeader() }}

From 167b4d3def2c8619422b240fd58e22ce38c6d409 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 12 Mar 2024 19:18:09 +0100
Subject: [PATCH 0947/1422] Add helper to assert element text state

---
 .../Unit/Views/NavigationHtmlLayoutsTest.php      | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index 2eea236c674..04b1bc495d6 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -8,6 +8,7 @@
 
 use DOMXPath;
 use Hyde\Hyde;
+use DOMElement;
 use DOMDocument;
 use Hyde\Pages\HtmlPage;
 use Hyde\Pages\BladePage;
@@ -37,6 +38,7 @@
 use function explode;
 use function implode;
 use function array_map;
+use function is_string;
 use function strip_tags;
 use function array_keys;
 use function json_encode;
@@ -561,6 +563,19 @@ public function assertDoesNotHaveElement(string $id): static
         return $this;
     }
 
+    public function assertElementTextIs(DOMElement|string $element, string $expected): static
+    {
+        if (is_string($element)) {
+            $this->assertHasElement($element);
+
+            $element = $this->ast->getElementById($element);
+        }
+
+        $this->test->assertSame($expected, trim($element->textContent));
+
+        return $this;
+    }
+
     public function assertHasPages(array $pages): static
     {
         $renderedPages = $this->getRenderedPages();

From e539081e874903957136aaa270f5c7d19b66ecd6 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 12 Mar 2024 19:28:11 +0100
Subject: [PATCH 0948/1422] Add an element ID for the main navigation menu
 brand

---
 packages/framework/resources/views/layouts/navigation.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/resources/views/layouts/navigation.blade.php b/packages/framework/resources/views/layouts/navigation.blade.php
index 600d310fbd6..b04ccc9df87 100644
--- a/packages/framework/resources/views/layouts/navigation.blade.php
+++ b/packages/framework/resources/views/layouts/navigation.blade.php
@@ -3,7 +3,7 @@
 @endphp
 
 <nav aria-label="Main navigation" id="main-navigation" class="flex flex-wrap items-center justify-between p-4 shadow-lg sm:shadow-xl md:shadow-none dark:bg-gray-800">
-    <div class="flex flex-grow items-center flex-shrink-0 text-gray-700 dark:text-gray-200">
+    <div id="main-navigation-brand" class="flex flex-grow items-center flex-shrink-0 text-gray-700 dark:text-gray-200">
         @include('hyde::components.navigation.navigation-brand')
 
         <div class="ml-auto">

From 7b3192d6905464a5f743b7a6d851d081b0b52a93 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 12 Mar 2024 19:31:40 +0100
Subject: [PATCH 0949/1422] Test header states

---
 .../Unit/Views/NavigationHtmlLayoutsTest.php  | 31 +++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index 04b1bc495d6..a04b1ce80e6 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -433,6 +433,16 @@ public function testSidebarWithGroupedPagesWithoutFlattenedOutputPaths()
             );
     }
 
+    public function testMenuHeader()
+    {
+        $this->menu()->assertHeaderIs('HydePHP');
+    }
+
+    public function testSidebarHeader()
+    {
+        $this->sidebar()->assertHeaderIs('HydePHP Docs');
+    }
+
     protected function fromPage(string $mockedRoute): static
     {
         $this->mockCurrentPage($mockedRoute);
@@ -622,6 +632,27 @@ public function assertItemsLookLike(string $expected): static
         return $this->assertLooksLike($expected, true);
     }
 
+    public function assertHeaderIs(string $expected): static
+    {
+        if (static::TYPE === DocumentationSidebar::class) {
+            $elementId = 'sidebar-brand';
+            $nodeName = 'strong';
+        } else {
+            $elementId = 'main-navigation-brand';
+            $nodeName = 'a';
+        }
+
+        $this->assertHasElement($elementId);
+
+        $element = $this->ast->getElementById($elementId)->getElementsByTagName($nodeName)->item(0);
+
+        $this->test->assertNotNull($element, "No <$nodeName> element found in menu header");
+
+        $this->assertElementTextIs($element, $expected);
+
+        return $this;
+    }
+
     #[NoReturn]
     public function dd(bool $writeHtml = true): void
     {

From 60464546ef4b4f485c7a5d977f43f2e2ca418305 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 12 Mar 2024 20:55:50 +0100
Subject: [PATCH 0950/1422] Test custom brands

---
 .../Unit/Views/NavigationHtmlLayoutsTest.php      | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index a04b1ce80e6..11fdfee12c2 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -11,6 +11,7 @@
 use DOMElement;
 use DOMDocument;
 use Hyde\Pages\HtmlPage;
+use Hyde\Facades\Config;
 use Hyde\Pages\BladePage;
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Str;
@@ -443,6 +444,20 @@ public function testSidebarHeader()
         $this->sidebar()->assertHeaderIs('HydePHP Docs');
     }
 
+    public function testCustomMenuHeader()
+    {
+        Config::set('hyde.name', 'Example');
+
+        $this->menu()->assertHeaderIs('Example');
+    }
+
+    public function testCustomSidebarHeader()
+    {
+        Config::set('docs.sidebar.header', 'Documentation');
+
+        $this->sidebar()->assertHeaderIs('Documentation');
+    }
+
     protected function fromPage(string $mockedRoute): static
     {
         $this->mockCurrentPage($mockedRoute);

From e07c0d4b03cffa37ea1d1e4d2ede39ec99ac8980 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 12 Mar 2024 20:56:55 +0100
Subject: [PATCH 0951/1422] Extract helper method

---
 .../Unit/Views/NavigationHtmlLayoutsTest.php  | 49 ++++++++++---------
 1 file changed, 25 insertions(+), 24 deletions(-)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index 11fdfee12c2..1e360956527 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -358,17 +358,17 @@ public function testSidebarWithPages()
             new DocumentationPage('bar'),
             new DocumentationPage('baz'),
         ])
-        ->assertHasPages([
-            'docs/foo.html' => 'Foo',
-            'docs/bar.html' => 'Bar',
-            'docs/baz.html' => 'Baz',
-        ])
-        ->assertItemsLookLike(<<<'HTML'
+            ->assertHasPages([
+                'docs/foo.html' => 'Foo',
+                'docs/bar.html' => 'Bar',
+                'docs/baz.html' => 'Baz',
+            ])
+            ->assertItemsLookLike(<<<'HTML'
             Foo
             Bar
             Baz
             HTML
-        );
+            );
     }
 
     public function testSidebarFromNestedRoute()
@@ -395,32 +395,24 @@ public function testSidebarFromNestedRoute()
 
     public function testSidebarWithGroupedPages()
     {
-        $this->sidebar([
-            new DocumentationPage('index'),
-            new DocumentationPage('foo/bar'),
-            new DocumentationPage('foo/baz'),
-        ])
-        ->assertHasGroups()
-        ->assertHasPages([
-            'docs/bar.html' => 'Bar',
-            'docs/baz.html' => 'Baz',
-        ])
-        ->assertItemsLookLike(<<<'HTML'
+        $this->sidebar($this->withSidebarPages())
+            ->assertHasGroups()
+            ->assertHasPages([
+                'docs/bar.html' => 'Bar',
+                'docs/baz.html' => 'Baz',
+            ])
+            ->assertItemsLookLike(<<<'HTML'
             - Foo
                 - Bar
                 - Baz
             HTML
-        );
+            );
     }
 
     public function testSidebarWithGroupedPagesWithoutFlattenedOutputPaths()
     {
         $this->withoutFlattenedOutputPaths()
-            ->sidebar([
-                new DocumentationPage('index'),
-                new DocumentationPage('foo/bar'),
-                new DocumentationPage('foo/baz'),
-            ])
+            ->sidebar($this->withSidebarPages())
             ->assertHasGroups()
             ->assertHasPages([
                 'docs/foo/bar.html' => 'Bar',
@@ -513,6 +505,15 @@ protected function withExamplePages(): array
             new HtmlPage('first', ['navigation.priority' => 1]),
         ];
     }
+
+    protected function withSidebarPages(): array
+    {
+        return [
+            new DocumentationPage('index'),
+            new DocumentationPage('foo/bar'),
+            new DocumentationPage('foo/baz'),
+        ];
+    }
 }
 
 abstract class RenderedNavigationMenu

From 93ab7ee3a8f0cd016f9c074ed885487f5d87a0d5 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 12 Mar 2024 20:58:14 +0100
Subject: [PATCH 0952/1422] Reorder tests to move up baseline assertions

---
 .../Unit/Views/NavigationHtmlLayoutsTest.php  | 90 +++++++++----------
 1 file changed, 45 insertions(+), 45 deletions(-)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index 1e360956527..e0bf64c9fd5 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -109,6 +109,51 @@ public function testNavigationMenuWithPages()
             ]);
     }
 
+    public function testSidebarWithPages()
+    {
+        $this->sidebar([
+            new DocumentationPage('index'),
+            new DocumentationPage('foo'),
+            new DocumentationPage('bar'),
+            new DocumentationPage('baz'),
+        ])
+            ->assertHasPages([
+                'docs/foo.html' => 'Foo',
+                'docs/bar.html' => 'Bar',
+                'docs/baz.html' => 'Baz',
+            ])
+            ->assertItemsLookLike(<<<'HTML'
+            Foo
+            Bar
+            Baz
+            HTML
+            );
+    }
+
+    public function testMenuHeader()
+    {
+        $this->menu()->assertHeaderIs('HydePHP');
+    }
+
+    public function testSidebarHeader()
+    {
+        $this->sidebar()->assertHeaderIs('HydePHP Docs');
+    }
+
+    public function testCustomMenuHeader()
+    {
+        Config::set('hyde.name', 'Example');
+
+        $this->menu()->assertHeaderIs('Example');
+    }
+
+    public function testCustomSidebarHeader()
+    {
+        Config::set('docs.sidebar.header', 'Documentation');
+
+        $this->sidebar()->assertHeaderIs('Documentation');
+    }
+
     public function testNavigationMenuFromNestedRoute()
     {
         $this->fromPage('nested/page')
@@ -350,27 +395,6 @@ public function testNavigationMenuWithDropdownSubdirectoryPagesAndMatchingSubdir
             );
     }
 
-    public function testSidebarWithPages()
-    {
-        $this->sidebar([
-            new DocumentationPage('index'),
-            new DocumentationPage('foo'),
-            new DocumentationPage('bar'),
-            new DocumentationPage('baz'),
-        ])
-            ->assertHasPages([
-                'docs/foo.html' => 'Foo',
-                'docs/bar.html' => 'Bar',
-                'docs/baz.html' => 'Baz',
-            ])
-            ->assertItemsLookLike(<<<'HTML'
-            Foo
-            Bar
-            Baz
-            HTML
-            );
-    }
-
     public function testSidebarFromNestedRoute()
     {
         $this->fromPage('nested/page')
@@ -426,30 +450,6 @@ public function testSidebarWithGroupedPagesWithoutFlattenedOutputPaths()
             );
     }
 
-    public function testMenuHeader()
-    {
-        $this->menu()->assertHeaderIs('HydePHP');
-    }
-
-    public function testSidebarHeader()
-    {
-        $this->sidebar()->assertHeaderIs('HydePHP Docs');
-    }
-
-    public function testCustomMenuHeader()
-    {
-        Config::set('hyde.name', 'Example');
-
-        $this->menu()->assertHeaderIs('Example');
-    }
-
-    public function testCustomSidebarHeader()
-    {
-        Config::set('docs.sidebar.header', 'Documentation');
-
-        $this->sidebar()->assertHeaderIs('Documentation');
-    }
-
     protected function fromPage(string $mockedRoute): static
     {
         $this->mockCurrentPage($mockedRoute);

From f3df5375b1ec1c63392a1c7961a47d0f4c434fd1 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 12 Mar 2024 20:59:07 +0100
Subject: [PATCH 0953/1422] Rename testing helper to match usage

---
 .../tests/Unit/Views/NavigationHtmlLayoutsTest.php          | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index e0bf64c9fd5..7f514191f0a 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -419,7 +419,7 @@ public function testSidebarFromNestedRoute()
 
     public function testSidebarWithGroupedPages()
     {
-        $this->sidebar($this->withSidebarPages())
+        $this->sidebar($this->withGroupedSidebarPages())
             ->assertHasGroups()
             ->assertHasPages([
                 'docs/bar.html' => 'Bar',
@@ -436,7 +436,7 @@ public function testSidebarWithGroupedPages()
     public function testSidebarWithGroupedPagesWithoutFlattenedOutputPaths()
     {
         $this->withoutFlattenedOutputPaths()
-            ->sidebar($this->withSidebarPages())
+            ->sidebar($this->withGroupedSidebarPages())
             ->assertHasGroups()
             ->assertHasPages([
                 'docs/foo/bar.html' => 'Bar',
@@ -506,7 +506,7 @@ protected function withExamplePages(): array
         ];
     }
 
-    protected function withSidebarPages(): array
+    protected function withGroupedSidebarPages(): array
     {
         return [
             new DocumentationPage('index'),

From 2f0e1ad4a6ff464a60f04444e91dfc768315a6b5 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 12 Mar 2024 20:59:48 +0100
Subject: [PATCH 0954/1422] Extract new testing helper

---
 .../Unit/Views/NavigationHtmlLayoutsTest.php    | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index 7f514191f0a..9d241a3cd3b 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -111,12 +111,7 @@ public function testNavigationMenuWithPages()
 
     public function testSidebarWithPages()
     {
-        $this->sidebar([
-            new DocumentationPage('index'),
-            new DocumentationPage('foo'),
-            new DocumentationPage('bar'),
-            new DocumentationPage('baz'),
-        ])
+        $this->sidebar($this->withSidebarPages())
             ->assertHasPages([
                 'docs/foo.html' => 'Foo',
                 'docs/bar.html' => 'Bar',
@@ -506,6 +501,16 @@ protected function withExamplePages(): array
         ];
     }
 
+    protected function withSidebarPages(): array
+    {
+        return [
+            new DocumentationPage('index'),
+            new DocumentationPage('foo'),
+            new DocumentationPage('bar'),
+            new DocumentationPage('baz'),
+        ];
+    }
+
     protected function withGroupedSidebarPages(): array
     {
         return [

From 7170be2fdaeeb4647fb22788e31d05fa65fb739e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 12 Mar 2024 21:00:16 +0100
Subject: [PATCH 0955/1422] Format string syntax

---
 .../tests/Unit/Views/NavigationHtmlLayoutsTest.php        | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index 9d241a3cd3b..c69bb6cfe48 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -118,10 +118,10 @@ public function testSidebarWithPages()
                 'docs/baz.html' => 'Baz',
             ])
             ->assertItemsLookLike(<<<'HTML'
-            Foo
-            Bar
-            Baz
-            HTML
+                Foo
+                Bar
+                Baz
+                HTML
             );
     }
 

From c6c7351de930e2599af48f56cf4d73c98372ef72 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 12 Mar 2024 21:07:49 +0100
Subject: [PATCH 0956/1422] Add replacement for another test quirk

---
 .../framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index c69bb6cfe48..da08e313b53 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -745,7 +745,7 @@ protected function makeTextRepresentation(): string
 
         $html = Str::replaceLast('</ul>', '', $html);
 
-        $html = str_replace(['HydePHPDocs', 'Toggledarktheme', 'Togglemenu', 'Backtohomepage'], ['HydePHP Docs', ' Toggle theme', 'Toggle menu', 'Back to home page'], $html);
+        $html = str_replace(['HydePHPDocs', 'themeToggle', 'Toggledarktheme', 'Togglemenu', 'Backtohomepage'], ['HydePHP Docs', 'theme Toggle', ' Toggle theme', 'Toggle menu', 'Back to home page'], $html);
 
         return trim(implode("\n", array_map('rtrim', explode("\n", $html))));
     }

From d2956930e4ce1dbeca1160537b0a13725de2fb61 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 12 Mar 2024 21:08:01 +0100
Subject: [PATCH 0957/1422] Assert on full menu state

---
 .../framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index da08e313b53..c23eaa8474f 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -117,10 +117,12 @@ public function testSidebarWithPages()
                 'docs/bar.html' => 'Bar',
                 'docs/baz.html' => 'Baz',
             ])
-            ->assertItemsLookLike(<<<'HTML'
+            ->assertLooksLike(<<<'HTML'
+                HydePHP Docs Toggle theme
                 Foo
                 Bar
                 Baz
+                Back to home page
                 HTML
             );
     }

From a991d8b26beb27fe2067153370b1070c4df5d141 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 12 Mar 2024 21:08:07 +0100
Subject: [PATCH 0958/1422] Add menu state assertion

---
 .../tests/Unit/Views/NavigationHtmlLayoutsTest.php     | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index c23eaa8474f..34315d4aca8 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -106,7 +106,15 @@ public function testNavigationMenuWithPages()
                 'first.html' => 'First',
                 'about.html' => 'About',
                 'custom.html' => 'Label',
-            ]);
+            ])
+            ->assertLooksLike(<<<'HTML'
+                HydePHP Toggle theme Toggle menu
+                - Home
+                - First
+                - About
+                - Label
+                HTML
+            );
     }
 
     public function testSidebarWithPages()

From a8d8c46f424736c99fb82fdcb30d48306d37b7b8 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 12 Mar 2024 21:08:37 +0100
Subject: [PATCH 0959/1422] Split comma-separated values into multiple lines

---
 .../tests/Unit/Views/NavigationHtmlLayoutsTest.php          | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index 34315d4aca8..0628d7fa79b 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -755,7 +755,11 @@ protected function makeTextRepresentation(): string
 
         $html = Str::replaceLast('</ul>', '', $html);
 
-        $html = str_replace(['HydePHPDocs', 'themeToggle', 'Toggledarktheme', 'Togglemenu', 'Backtohomepage'], ['HydePHP Docs', 'theme Toggle', ' Toggle theme', 'Toggle menu', 'Back to home page'], $html);
+        $html = str_replace(
+            ['HydePHPDocs', 'themeToggle', 'Toggledarktheme', 'Togglemenu', 'Backtohomepage'],
+            ['HydePHP Docs', 'theme Toggle', ' Toggle theme', 'Toggle menu', 'Back to home page'],
+            $html
+        );
 
         return trim(implode("\n", array_map('rtrim', explode("\n", $html))));
     }

From 68077c260a19babe09daf84df210f17aef5f5da9 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 12 Mar 2024 21:10:51 +0100
Subject: [PATCH 0960/1422] Supress spell check inspection for statement

---
 .../framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index 0628d7fa79b..fe5edf60dd9 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -755,6 +755,7 @@ protected function makeTextRepresentation(): string
 
         $html = Str::replaceLast('</ul>', '', $html);
 
+        /** @noinspection SpellCheckingInspection */
         $html = str_replace(
             ['HydePHPDocs', 'themeToggle', 'Toggledarktheme', 'Togglemenu', 'Backtohomepage'],
             ['HydePHP Docs', 'theme Toggle', ' Toggle theme', 'Toggle menu', 'Back to home page'],

From 3b53a49bd23d9e9426d68ae0263abdf124746c48 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 12 Mar 2024 21:12:34 +0100
Subject: [PATCH 0961/1422] Update test class abstract documentation

---
 .../framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index fe5edf60dd9..4025cdf5efa 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -54,6 +54,9 @@
 /**
  * Very high level tests for navigation menu and sidebar view layouts.
  *
+ * These tests provide a sort of structural visual testing that can signal smoke
+ * before end-to-end testing kicks in, as they take a long time to set up and run.
+ *
  * @see \Hyde\Framework\Testing\Feature\AutomaticNavigationConfigurationsTest
  */
 class NavigationHtmlLayoutsTest extends TestCase

From e6049b8a5fedc627ea68756248f33836ab83d0cc Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 13 Mar 2024 08:54:01 +0100
Subject: [PATCH 0962/1422] Add sidebar header scope hook

---
 .../tests/Unit/Views/NavigationHtmlLayoutsTest.php       | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index 4025cdf5efa..b3e56c08e3b 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -840,6 +840,8 @@ class RenderedDocumentationSidebarMenu extends RenderedNavigationMenu
 {
     protected const TYPE = DocumentationSidebar::class;
 
+    protected bool $scopeToHeader = false;
+
     public function assertHasGroups(): static
     {
         $this->assertHasElement('sidebar-group');
@@ -861,6 +863,13 @@ public function assertHasNoGroups(): static
 
         return $this;
     }
+    
+    public function header(): static
+    {
+        $this->scopeToHeader = true;
+
+        return $this;
+    }
 }
 
 class TestKernel extends HydeKernel

From 24d8fd26717aa3ef73261212cc02e041016dc2dc Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 13 Mar 2024 08:56:37 +0100
Subject: [PATCH 0963/1422] Add helper to get asserted element

---
 .../tests/Unit/Views/NavigationHtmlLayoutsTest.php        | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index b3e56c08e3b..cadca7379f3 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -697,6 +697,14 @@ public function dd(bool $writeHtml = true): void
         exit(trim($this->html)."\n\n");
     }
 
+    /** Get an element node and assert it is not null */
+    protected function getAssertedElement(string $id): DOMElement
+    {
+        $this->assertHasElement($id);
+
+        return $this->ast->getElementById($id);
+    }
+
     protected function parseHtml(): DOMDocument
     {
         $dom = new DOMDocument();

From e76774b615f766d3192ee6c45be3507fff1ea015 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 13 Mar 2024 09:00:54 +0100
Subject: [PATCH 0964/1422] Add helper to assert theme toggle button state

---
 .../Unit/Views/NavigationHtmlLayoutsTest.php  | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index cadca7379f3..a3486ee4ce6 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -871,7 +871,24 @@ public function assertHasNoGroups(): static
 
         return $this;
     }
-    
+
+    public function assertHasThemeToggleButton(): static
+    {
+        if (! $this->scopeToHeader) {
+            $this->assertHasElement('theme-toggle-button');
+        } else {
+            $header = $this->getAssertedElement('sidebar-header');
+
+            $xpath = new DOMXPath($this->ast);
+            $header = $xpath->query('.//button[contains(concat(" ", normalize-space(@class), " "), " theme-toggle-button ")]', $header)->item(0);
+
+            $this->test->assertNotNull($header, 'No theme toggle button found in sidebar header');
+            $this->test->assertSame('Toggle dark theme', trim($header->textContent));
+        }
+
+        return $this;
+    }
+
     public function header(): static
     {
         $this->scopeToHeader = true;

From e06d6feb19f8654ae17649aa77d2e3cd4361b0c1 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 13 Mar 2024 09:01:01 +0100
Subject: [PATCH 0965/1422] Test sidebar header has theme toggle button

---
 .../framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index a3486ee4ce6..915b255619f 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -162,6 +162,11 @@ public function testCustomSidebarHeader()
         $this->sidebar()->assertHeaderIs('Documentation');
     }
 
+    public function testSidebarHeaderHasThemeToggleButton()
+    {
+        $this->sidebar()->header()->assertHasThemeToggleButton();
+    }
+
     public function testNavigationMenuFromNestedRoute()
     {
         $this->fromPage('nested/page')

From 3e7d268391196865fa00f4c353fa44ffd67d79b7 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 13 Mar 2024 09:03:35 +0100
Subject: [PATCH 0966/1422] Test inverse toggle button state

---
 .../Unit/Views/NavigationHtmlLayoutsTest.php  | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index 915b255619f..52ccaa3e8b1 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -14,6 +14,7 @@
 use Hyde\Facades\Config;
 use Hyde\Pages\BladePage;
 use Hyde\Testing\TestCase;
+use Hyde\Facades\Features;
 use Illuminate\Support\Str;
 use Hyde\Pages\MarkdownPage;
 use Hyde\Pages\InMemoryPage;
@@ -167,6 +168,13 @@ public function testSidebarHeaderHasThemeToggleButton()
         $this->sidebar()->header()->assertHasThemeToggleButton();
     }
 
+    public function testSidebarHeaderDoesNotHaveThemeToggleButtonWhenDarkmodeIsDisabled()
+    {
+        Features::mock('darkmode', false);
+
+        $this->sidebar()->header()->assertDoesNotHaveThemeToggleButton();
+    }
+
     public function testNavigationMenuFromNestedRoute()
     {
         $this->fromPage('nested/page')
@@ -894,6 +902,22 @@ public function assertHasThemeToggleButton(): static
         return $this;
     }
 
+    public function assertDoesNotHaveThemeToggleButton(): static
+    {
+        if (! $this->scopeToHeader) {
+            $this->assertDoesNotHaveElement('theme-toggle-button');
+        } else {
+            $header = $this->getAssertedElement('sidebar-header');
+
+            $xpath = new DOMXPath($this->ast);
+            $header = $xpath->query('.//button[contains(concat(" ", normalize-space(@class), " "), " theme-toggle-button ")]', $header)->item(0);
+
+            $this->test->assertNull($header, 'Theme toggle button found in sidebar header');
+        }
+
+        return $this;
+    }
+
     public function header(): static
     {
         $this->scopeToHeader = true;

From 2145e5b8cceeb8654aa8d9b5ba2e6c89b9bcc403 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 13 Mar 2024 17:17:03 +0100
Subject: [PATCH 0967/1422] Test sidebar without grouped pages

---
 .../Unit/Views/NavigationHtmlLayoutsTest.php    | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index 52ccaa3e8b1..b34f0d78af2 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -438,6 +438,23 @@ public function testSidebarFromNestedRoute()
             );
     }
 
+    public function testSidebarWithoutGroupedPages()
+    {
+        $this->sidebar($this->withSidebarPages())
+            ->assertHasNoGroups()
+            ->assertHasPages([
+                'docs/foo.html' => 'Foo',
+                'docs/bar.html' => 'Bar',
+                'docs/baz.html' => 'Baz',
+            ])
+            ->assertItemsLookLike(<<<'HTML'
+                - Foo
+                - Bar
+                - Baz
+                HTML
+            );
+    }
+
     public function testSidebarWithGroupedPages()
     {
         $this->sidebar($this->withGroupedSidebarPages())

From 894a865fa461fcc71ee2ead257ee710cff2e9bea Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 13 Mar 2024 17:25:10 +0100
Subject: [PATCH 0968/1422] Include navigation link as Blade component instead
 of include

Looks more consistent with the dropdown include just above, and we can use attributes
---
 packages/framework/resources/views/layouts/navigation.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/resources/views/layouts/navigation.blade.php b/packages/framework/resources/views/layouts/navigation.blade.php
index b04ccc9df87..663bb8a4567 100644
--- a/packages/framework/resources/views/layouts/navigation.blade.php
+++ b/packages/framework/resources/views/layouts/navigation.blade.php
@@ -38,7 +38,7 @@
                     @if($item instanceof \Hyde\Framework\Features\Navigation\NavGroupItem)
                         <x-hyde::navigation.dropdown :label="$item->getLabel()" :items="$item->getItems()"/>
                     @else
-                        @include('hyde::components.navigation.navigation-link')
+                        <x-hyde::navigation.link :item="$item"/>
                     @endif
                 </li>
             @endforeach

From 52f2d0c39b717205207b37a89ac5b381dbf2ca25 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 13 Mar 2024 17:27:35 +0100
Subject: [PATCH 0969/1422] Fix component name

---
 packages/framework/resources/views/layouts/navigation.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/resources/views/layouts/navigation.blade.php b/packages/framework/resources/views/layouts/navigation.blade.php
index 663bb8a4567..a55e64b5ea1 100644
--- a/packages/framework/resources/views/layouts/navigation.blade.php
+++ b/packages/framework/resources/views/layouts/navigation.blade.php
@@ -38,7 +38,7 @@
                     @if($item instanceof \Hyde\Framework\Features\Navigation\NavGroupItem)
                         <x-hyde::navigation.dropdown :label="$item->getLabel()" :items="$item->getItems()"/>
                     @else
-                        <x-hyde::navigation.link :item="$item"/>
+                        <x-hyde::navigation.navigation-link :item="$item"/>
                     @endif
                 </li>
             @endforeach

From 6ba9eaf7006362ddb7b2e3566479725329a212f6 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 13 Mar 2024 17:43:16 +0100
Subject: [PATCH 0970/1422] Add CSS class hooks for the navigation link states

Adds a styling hook, and makes it more readable and testable
---
 .../navigation/navigation-link.blade.php          |  4 ++--
 .../tests/Unit/Views/NavigationLinkViewTest.php   | 15 +++++++++++++++
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/packages/framework/resources/views/components/navigation/navigation-link.blade.php b/packages/framework/resources/views/components/navigation/navigation-link.blade.php
index 048faaa6cba..207172ff4ea 100644
--- a/packages/framework/resources/views/components/navigation/navigation-link.blade.php
+++ b/packages/framework/resources/views/components/navigation/navigation-link.blade.php
@@ -1,4 +1,4 @@
 <a href="{{ $item }}" {!! $item->isActive() ? 'aria-current="page"' : '' !!} @class([
-    'block my-2 md:my-0 md:inline-block py-1 text-gray-700 hover:text-gray-900 dark:text-gray-100',
-    'border-l-4 border-indigo-500 md:border-none font-medium -ml-6 pl-5 md:ml-0 md:pl-0 bg-gray-100 dark:bg-gray-800 md:bg-transparent dark:md:bg-transparent' => $item->isActive()
+    'navigation-link block my-2 md:my-0 md:inline-block py-1 text-gray-700 hover:text-gray-900 dark:text-gray-100',
+    'navigation-link-active border-l-4 border-indigo-500 md:border-none font-medium -ml-6 pl-5 md:ml-0 md:pl-0 bg-gray-100 dark:bg-gray-800 md:bg-transparent dark:md:bg-transparent' => $item->isActive()
 ])>{{ $item->getLabel() }}</a>
\ No newline at end of file
diff --git a/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php b/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
index 1018d2ae3c0..53b3a14b553 100644
--- a/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
@@ -48,4 +48,19 @@ public function testComponentHasAriaCurrentWhenCurrentRouteMatches()
         $this->mockRoute(Routes::get('index'));
         $this->assertStringContainsString('aria-current="page"', $this->render(NavItem::forRoute(Routes::get('index'), 'Home')));
     }
+
+    public function testComponentDoesNotHaveActiveClassWhenNotActive()
+    {
+        $render = $this->render(NavItem::forRoute(Routes::get('index'), 'Home'));
+        $this->assertStringContainsString('navigation-link ', $render);
+        $this->assertStringNotContainsString('navigation-link-active', $render);
+    }
+
+    public function testComponentHasActiveClassWhenActive()
+    {
+        $this->mockRoute(Routes::get('index'));
+        $render = $this->render(NavItem::forRoute(Routes::get('index'), 'Home'));
+        $this->assertStringContainsString('navigation-link ', $render);
+        $this->assertStringContainsString('navigation-link-active', $render);
+    }
 }

From c61eef919422b886f75b78aef654da42da7c397f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 13 Mar 2024 21:20:35 +0100
Subject: [PATCH 0971/1422] Include dropdown navigation item as Blade component

Normalizes with https://github.com/hydephp/develop/commit/894a865fa461fcc71ee2ead257ee710cff2e9bea
---
 .../resources/views/components/navigation/dropdown.blade.php    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/resources/views/components/navigation/dropdown.blade.php b/packages/framework/resources/views/components/navigation/dropdown.blade.php
index 52d03fcc9c0..b0c8de89a0d 100644
--- a/packages/framework/resources/views/components/navigation/dropdown.blade.php
+++ b/packages/framework/resources/views/components/navigation/dropdown.blade.php
@@ -9,7 +9,7 @@
             @isset($items)
                 @foreach ($items as $item)
                     <li class="whitespace-nowrap">
-                        @include('hyde::components.navigation.navigation-link')
+                        <x-hyde::navigation.navigation-link :item="$item"/>
                     </li>
                 @endforeach
             @else

From 759c63a9354b6ff3955fb73fea0ad9e700441286 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 13 Mar 2024 21:23:44 +0100
Subject: [PATCH 0972/1422] Refactor component to use attribute merging

Create attribute bag in test setup
Update test to expect cleaner HTML output
---
 .../views/components/navigation/navigation-link.blade.php   | 6 ++++--
 .../framework/tests/Unit/Views/NavigationLinkViewTest.php   | 2 ++
 .../framework/tests/Unit/Views/NavigationMenuViewTest.php   | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/packages/framework/resources/views/components/navigation/navigation-link.blade.php b/packages/framework/resources/views/components/navigation/navigation-link.blade.php
index 207172ff4ea..0460e6fb38f 100644
--- a/packages/framework/resources/views/components/navigation/navigation-link.blade.php
+++ b/packages/framework/resources/views/components/navigation/navigation-link.blade.php
@@ -1,4 +1,6 @@
-<a href="{{ $item }}" {!! $item->isActive() ? 'aria-current="page"' : '' !!} @class([
+<a href="{{ $item }}" {{ ($attributes->except('item')->class([
     'navigation-link block my-2 md:my-0 md:inline-block py-1 text-gray-700 hover:text-gray-900 dark:text-gray-100',
     'navigation-link-active border-l-4 border-indigo-500 md:border-none font-medium -ml-6 pl-5 md:ml-0 md:pl-0 bg-gray-100 dark:bg-gray-800 md:bg-transparent dark:md:bg-transparent' => $item->isActive()
-])>{{ $item->getLabel() }}</a>
\ No newline at end of file
+])->merge([
+    'aria-current' => ($item->isActive() ? 'page' : false),
+])) }}>{{ $item->getLabel() }}</a>
\ No newline at end of file
diff --git a/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php b/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
index 53b3a14b553..14aa79c074a 100644
--- a/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
@@ -5,6 +5,7 @@
 namespace Hyde\Framework\Testing\Unit\Views;
 
 use Hyde\Foundation\Facades\Routes;
+use Illuminate\View\ComponentAttributeBag;
 use Hyde\Framework\Features\Navigation\NavItem;
 use Hyde\Testing\TestCase;
 
@@ -24,6 +25,7 @@ protected function render(?NavItem $item = null): string
     {
         return view('hyde::components.navigation.navigation-link', [
             'item' => $item ?? NavItem::forLink('foo.html', 'Foo'),
+            'attributes' => new ComponentAttributeBag(),
         ])->render();
     }
 
diff --git a/packages/framework/tests/Unit/Views/NavigationMenuViewTest.php b/packages/framework/tests/Unit/Views/NavigationMenuViewTest.php
index a40d6782b33..18d9bfd7cbf 100644
--- a/packages/framework/tests/Unit/Views/NavigationMenuViewTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationMenuViewTest.php
@@ -73,7 +73,7 @@ public function testNavigationMenuWithRootPages()
         $contents = $foo->compile();
 
         $this->assertStringContainsString('<a href="foo.html" aria-current="page" class="', $contents);
-        $this->assertStringContainsString('<a href="bar.html"  class="', $contents);
+        $this->assertStringContainsString('<a href="bar.html" class="', $contents);
     }
 
     public function testNavigationMenuWithDropdownPages()

From 5710b1ad98e01b96db0b7029e8cbbb9dc1e225d1 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 13 Mar 2024 21:30:28 +0100
Subject: [PATCH 0973/1422] Test inverse attribute state

---
 .../framework/tests/Unit/Views/NavigationLinkViewTest.php  | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php b/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
index 14aa79c074a..e33adbdb413 100644
--- a/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
@@ -39,6 +39,13 @@ public function testComponentUsesTitle()
         $this->assertStringContainsString('Foo', $this->render());
     }
 
+    public function testComponentDoesNotHaveCurrentAttributesWhenCurrentRouteDoesNotMatch()
+    {
+        $render = $this->render(NavItem::forRoute(Routes::get('index'), 'Home'));
+        $this->assertStringNotContainsString('current', $render);
+        $this->assertStringNotContainsString('aria-current="page"', $render);
+    }
+
     public function testComponentIsCurrentWhenCurrentRouteMatches()
     {
         $this->mockRoute(Routes::get('index'));

From 5ffeac4a96f31528c2b4b82a471367eb23a42fd3 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 13 Mar 2024 21:31:45 +0100
Subject: [PATCH 0974/1422] Remove unnecessary parentheses

---
 .../views/components/navigation/navigation-link.blade.php   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/framework/resources/views/components/navigation/navigation-link.blade.php b/packages/framework/resources/views/components/navigation/navigation-link.blade.php
index 0460e6fb38f..60ce617081d 100644
--- a/packages/framework/resources/views/components/navigation/navigation-link.blade.php
+++ b/packages/framework/resources/views/components/navigation/navigation-link.blade.php
@@ -1,6 +1,6 @@
-<a href="{{ $item }}" {{ ($attributes->except('item')->class([
+<a href="{{ $item }}" {{ $attributes->except('item')->class([
     'navigation-link block my-2 md:my-0 md:inline-block py-1 text-gray-700 hover:text-gray-900 dark:text-gray-100',
     'navigation-link-active border-l-4 border-indigo-500 md:border-none font-medium -ml-6 pl-5 md:ml-0 md:pl-0 bg-gray-100 dark:bg-gray-800 md:bg-transparent dark:md:bg-transparent' => $item->isActive()
 ])->merge([
-    'aria-current' => ($item->isActive() ? 'page' : false),
-])) }}>{{ $item->getLabel() }}</a>
\ No newline at end of file
+    'aria-current' => $item->isActive() ? 'page' : false,
+]) }}>{{ $item->getLabel() }}</a>
\ No newline at end of file

From b62cd6bf9fefb5e846c6cb0360ac709b12affa64 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 13 Mar 2024 22:42:46 +0100
Subject: [PATCH 0975/1422] Add testing helper to assert HTML attribute state

---
 packages/testing/src/Support/TestView.php | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/packages/testing/src/Support/TestView.php b/packages/testing/src/Support/TestView.php
index 8bb446c3ebc..d3581efb59f 100644
--- a/packages/testing/src/Support/TestView.php
+++ b/packages/testing/src/Support/TestView.php
@@ -34,6 +34,18 @@ public function assertSeeHtmlIgnoringFormatting(string $value): static
         return $this;
     }
 
+    /**
+     * Assert that the HTML attribute value is contained within the view.
+     *
+     * @return $this
+     */
+    public function assertAttributeIs(string $attributeName, string $expectedValue): static
+    {
+        PHPUnit::assertStringContainsString($attributeName.'="'.$expectedValue.'"', $this->rendered);
+
+        return $this;
+    }
+
     protected function trimNewlinesAndIndentation(string $value): string
     {
         return str_replace(['    ', "\t", "\n", "\r"], '', $value);

From f26f910e66a105733cf260256d23d81d05b8829f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 13 Mar 2024 22:44:23 +0100
Subject: [PATCH 0976/1422] Add testing helper to assert HTML content literals

---
 packages/testing/src/Support/TestView.php | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/packages/testing/src/Support/TestView.php b/packages/testing/src/Support/TestView.php
index d3581efb59f..4e04a247a7d 100644
--- a/packages/testing/src/Support/TestView.php
+++ b/packages/testing/src/Support/TestView.php
@@ -46,6 +46,18 @@ public function assertAttributeIs(string $attributeName, string $expectedValue):
         return $this;
     }
 
+    /**
+     * Assert that the given text is equals the view's text content.
+     *
+     * @return $this
+     */
+    public function assertTextIs(string $value): static
+    {
+        PHPUnit::assertSame($value, strip_tags($this->rendered));
+
+        return $this;
+    }
+
     protected function trimNewlinesAndIndentation(string $value): string
     {
         return str_replace(['    ', "\t", "\n", "\r"], '', $value);

From 90419b2808591ec60f56523ad9c141f79de14dbd Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 13 Mar 2024 22:45:47 +0100
Subject: [PATCH 0977/1422] Begin refactoring test to use more fluent assertion
 helpers

---
 .../tests/Unit/Views/NavigationLinkViewTest.php   | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php b/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
index 1018d2ae3c0..6c0a25a6113 100644
--- a/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
@@ -4,6 +4,8 @@
 
 namespace Hyde\Framework\Testing\Unit\Views;
 
+use Hyde\Testing\TestsBladeViews;
+use Hyde\Testing\Support\TestView;
 use Hyde\Foundation\Facades\Routes;
 use Hyde\Framework\Features\Navigation\NavItem;
 use Hyde\Testing\TestCase;
@@ -13,6 +15,8 @@
  */
 class NavigationLinkViewTest extends TestCase
 {
+    use TestsBladeViews;
+
     protected function setUp(): void
     {
         parent::setUp();
@@ -27,14 +31,21 @@ protected function render(?NavItem $item = null): string
         ])->render();
     }
 
+    protected function testView(?NavItem $item = null): TestView
+    {
+        return $this->test(view('hyde::components.navigation.navigation-link', [
+            'item' => $item ?? NavItem::forLink('foo.html', 'Foo'),
+        ]));
+    }
+
     public function testComponentLinksToRouteDestination()
     {
-        $this->assertStringContainsString('href="foo.html"', $this->render());
+        $this->testView()->assertAttributeIs('href', 'foo.html');
     }
 
     public function testComponentUsesTitle()
     {
-        $this->assertStringContainsString('Foo', $this->render());
+        $this->testView()->assertTextIs('Foo');
     }
 
     public function testComponentIsCurrentWhenCurrentRouteMatches()

From 6a474091b1afd4211cddf97b15138df1e9749a00 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 14 Mar 2024 11:39:39 +0100
Subject: [PATCH 0978/1422] Add testing helper to make NavItem for page

---
 .../framework/tests/Unit/Views/NavigationLinkViewTest.php  | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php b/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
index 93146650502..3d050d2e75a 100644
--- a/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
@@ -4,6 +4,8 @@
 
 namespace Hyde\Framework\Testing\Unit\Views;
 
+use Hyde\Pages\InMemoryPage;
+use Hyde\Support\Models\Route;
 use Hyde\Testing\TestsBladeViews;
 use Hyde\Testing\Support\TestView;
 use Hyde\Foundation\Facades\Routes;
@@ -41,6 +43,11 @@ protected function testView(?NavItem $item = null): TestView
         ]));
     }
 
+    protected function makeNavItemForPage(): NavItem
+    {
+        return NavItem::forRoute(new Route(new InMemoryPage('foo')), 'Foo');
+    }
+
     public function testComponentLinksToRouteDestination()
     {
         $this->testView()->assertAttributeIs('href', 'foo.html');

From 2cd3da2085c5e34cfb64c176457ddbf833629f5c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 14 Mar 2024 11:39:54 +0100
Subject: [PATCH 0979/1422] Add improved assertion output

---
 packages/testing/src/Support/TestView.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/testing/src/Support/TestView.php b/packages/testing/src/Support/TestView.php
index 4e04a247a7d..d75cea1a980 100644
--- a/packages/testing/src/Support/TestView.php
+++ b/packages/testing/src/Support/TestView.php
@@ -41,7 +41,7 @@ public function assertSeeHtmlIgnoringFormatting(string $value): static
      */
     public function assertAttributeIs(string $attributeName, string $expectedValue): static
     {
-        PHPUnit::assertStringContainsString($attributeName.'="'.$expectedValue.'"', $this->rendered);
+        PHPUnit::assertStringContainsString($attributeName.'="'.$expectedValue.'"', $this->rendered, "The attribute '$attributeName' with value '$expectedValue' was not found.");
 
         return $this;
     }

From d5f33f643e321277d0e883998d2602948f96fc8c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 14 Mar 2024 11:40:03 +0100
Subject: [PATCH 0980/1422] Test component resolves relative links for routes

---
 .../framework/tests/Unit/Views/NavigationLinkViewTest.php   | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php b/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
index 3d050d2e75a..6a1bbb0e490 100644
--- a/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
@@ -53,6 +53,12 @@ public function testComponentLinksToRouteDestination()
         $this->testView()->assertAttributeIs('href', 'foo.html');
     }
 
+    public function testComponentResolvesRelativeLinksForRoutes()
+    {
+        $this->mockCurrentPage('foo/bar');
+        $this->testView($this->makeNavItemForPage())->assertAttributeIs('href', '../foo.html');
+    }
+
     public function testComponentUsesTitle()
     {
         $this->testView()->assertTextIs('Foo');

From a4c0f9ec0e86134259c2869bf926e09b069167f8 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 14 Mar 2024 17:19:44 +0100
Subject: [PATCH 0981/1422] Simplify test data handling

---
 .../tests/Unit/Views/NavigationLinkViewTest.php          | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php b/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
index 6a1bbb0e490..0117567081a 100644
--- a/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
@@ -38,16 +38,11 @@ protected function render(?NavItem $item = null): string
     protected function testView(?NavItem $item = null): TestView
     {
         return $this->test(view('hyde::components.navigation.navigation-link', [
-            'item' => $item ?? NavItem::forLink('foo.html', 'Foo'),
+            'item' => $item ?? NavItem::forRoute(new Route(new InMemoryPage('foo')), 'Foo'),
             'attributes' => new ComponentAttributeBag(),
         ]));
     }
 
-    protected function makeNavItemForPage(): NavItem
-    {
-        return NavItem::forRoute(new Route(new InMemoryPage('foo')), 'Foo');
-    }
-
     public function testComponentLinksToRouteDestination()
     {
         $this->testView()->assertAttributeIs('href', 'foo.html');
@@ -56,7 +51,7 @@ public function testComponentLinksToRouteDestination()
     public function testComponentResolvesRelativeLinksForRoutes()
     {
         $this->mockCurrentPage('foo/bar');
-        $this->testView($this->makeNavItemForPage())->assertAttributeIs('href', '../foo.html');
+        $this->testView()->assertAttributeIs('href', '../foo.html');
     }
 
     public function testComponentUsesTitle()

From c042cf7edcf395930182ba9b85db436f576df2ab Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 14 Mar 2024 21:06:27 +0100
Subject: [PATCH 0982/1422] Add more attribute assertion helpers

---
 packages/testing/src/Support/TestView.php | 26 +++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/packages/testing/src/Support/TestView.php b/packages/testing/src/Support/TestView.php
index d75cea1a980..c0ac4979328 100644
--- a/packages/testing/src/Support/TestView.php
+++ b/packages/testing/src/Support/TestView.php
@@ -41,11 +41,37 @@ public function assertSeeHtmlIgnoringFormatting(string $value): static
      */
     public function assertAttributeIs(string $attributeName, string $expectedValue): static
     {
+        static::assertHasAttribute($attributeName);
+
         PHPUnit::assertStringContainsString($attributeName.'="'.$expectedValue.'"', $this->rendered, "The attribute '$attributeName' with value '$expectedValue' was not found.");
 
         return $this;
     }
 
+    /**
+     * Assert that the HTML attribute is present within the view.
+     *
+     * @return $this
+     */
+    public function assertHasAttribute(string $attributeName): static
+    {
+        PHPUnit::assertStringContainsString($attributeName.'="', $this->rendered, "The attribute '$attributeName' was not found.");
+
+        return $this;
+    }
+
+    /**
+     * Assert that the HTML attribute is not present within the view.
+     *
+     * @return $this
+     */
+    public function assertDoesNotHaveAttribute(string $attributeName): static
+    {
+        PHPUnit::assertStringNotContainsString($attributeName.'="', $this->rendered, "The attribute '$attributeName' was found.");
+
+        return $this;
+    }
+
     /**
      * Assert that the given text is equals the view's text content.
      *

From b7fb433c58b0c86ddda81d1613dc6437fa6daeef Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 14 Mar 2024 21:08:38 +0100
Subject: [PATCH 0983/1422] Refactor test to use fluent assertions

---
 .../framework/tests/Unit/Views/NavigationLinkViewTest.php   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php b/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
index 0117567081a..64914a8934a 100644
--- a/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
@@ -61,9 +61,9 @@ public function testComponentUsesTitle()
 
     public function testComponentDoesNotHaveCurrentAttributesWhenCurrentRouteDoesNotMatch()
     {
-        $render = $this->render(NavItem::forRoute(Routes::get('index'), 'Home'));
-        $this->assertStringNotContainsString('current', $render);
-        $this->assertStringNotContainsString('aria-current="page"', $render);
+        $this->testView()
+            ->assertDontSee('current')
+            ->assertDoesNotHaveAttribute('aria-current');
     }
 
     public function testComponentIsCurrentWhenCurrentRouteMatches()

From 7b1868e30c7b2f44f40f00eb0421228061c5c799 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 14 Mar 2024 21:15:04 +0100
Subject: [PATCH 0984/1422] Add testing helper to dump and die with HTML state

---
 packages/testing/src/Support/TestView.php | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/packages/testing/src/Support/TestView.php b/packages/testing/src/Support/TestView.php
index c0ac4979328..428f85cc0b5 100644
--- a/packages/testing/src/Support/TestView.php
+++ b/packages/testing/src/Support/TestView.php
@@ -4,6 +4,9 @@
 
 namespace Hyde\Testing\Support;
 
+use Hyde\Hyde;
+use Illuminate\Support\Str;
+use JetBrains\PhpStorm\NoReturn;
 use Illuminate\Testing\Assert as PHPUnit;
 
 class TestView extends \Illuminate\Testing\TestView
@@ -84,6 +87,17 @@ public function assertTextIs(string $value): static
         return $this;
     }
 
+    #[NoReturn]
+    public function dd(bool $writeHtml = true): void
+    {
+        if ($writeHtml) {
+            $viewName = Str::after(Str::after(basename(class_basename($this->view->getName())), '.'), '.');
+            file_put_contents(Hyde::path(Str::kebab($viewName.'.html')), $this->rendered);
+        }
+
+        exit(trim($this->rendered)."\n\n");
+    }
+
     protected function trimNewlinesAndIndentation(string $value): string
     {
         return str_replace(['    ', "\t", "\n", "\r"], '', $value);

From 282d1feb4aa648ff3ca58fc5929ca76fdf653268 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 14 Mar 2024 21:37:32 +0100
Subject: [PATCH 0985/1422] Refactor test to use fluent assertions

---
 .../framework/tests/Unit/Views/NavigationLinkViewTest.php   | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php b/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
index 64914a8934a..378075c49e7 100644
--- a/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
@@ -68,8 +68,10 @@ public function testComponentDoesNotHaveCurrentAttributesWhenCurrentRouteDoesNot
 
     public function testComponentIsCurrentWhenCurrentRouteMatches()
     {
-        $this->mockRoute(Routes::get('index'));
-        $this->assertStringContainsString('current', $this->render(NavItem::forRoute(Routes::get('index'), 'Home')));
+        $this->mockCurrentPage('foo');
+        $this->testView()
+            ->assertSee('current')
+            ->assertAttributeIs('aria-current', 'page');
     }
 
     public function testComponentHasAriaCurrentWhenCurrentRouteMatches()

From add2390407fbbd41e24f9f680c4b88873fc289d5 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 14 Mar 2024 21:40:24 +0100
Subject: [PATCH 0986/1422] Use helper method fluently

---
 .../framework/tests/Unit/Views/NavigationLinkViewTest.php     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php b/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
index 378075c49e7..d70e5f78ebd 100644
--- a/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
@@ -68,8 +68,8 @@ public function testComponentDoesNotHaveCurrentAttributesWhenCurrentRouteDoesNot
 
     public function testComponentIsCurrentWhenCurrentRouteMatches()
     {
-        $this->mockCurrentPage('foo');
-        $this->testView()
+        $this->mockCurrentPage('foo')
+            ->testView()
             ->assertSee('current')
             ->assertAttributeIs('aria-current', 'page');
     }

From 68d46fffab7738e034605773e5ec72ec477523de Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 15 Mar 2024 13:38:06 +0100
Subject: [PATCH 0987/1422] Update testing helper to automatically parse
 attributes

Adds an option to use this with just the full attribute string
---
 packages/testing/src/Support/TestView.php | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/packages/testing/src/Support/TestView.php b/packages/testing/src/Support/TestView.php
index 428f85cc0b5..924db972f3c 100644
--- a/packages/testing/src/Support/TestView.php
+++ b/packages/testing/src/Support/TestView.php
@@ -42,8 +42,15 @@ public function assertSeeHtmlIgnoringFormatting(string $value): static
      *
      * @return $this
      */
-    public function assertAttributeIs(string $attributeName, string $expectedValue): static
+    public function assertAttributeIs(string $attribute, ?string $expectedValue = null): static
     {
+        if ($expectedValue === null) {
+            [$attributeName, $expectedValue] = explode('=', $attribute);
+            $expectedValue = trim($expectedValue, '"');
+        } else {
+            $attributeName = $attribute;
+        }
+
         static::assertHasAttribute($attributeName);
 
         PHPUnit::assertStringContainsString($attributeName.'="'.$expectedValue.'"', $this->rendered, "The attribute '$attributeName' with value '$expectedValue' was not found.");

From cd1e567f9208592e21807fce5a3539b6504ec815 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 15 Mar 2024 13:38:19 +0100
Subject: [PATCH 0988/1422] Use shorthand attribute testing syntax

---
 packages/framework/tests/Unit/Views/NavigationLinkViewTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php b/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
index d70e5f78ebd..b55552c25f3 100644
--- a/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
@@ -71,7 +71,7 @@ public function testComponentIsCurrentWhenCurrentRouteMatches()
         $this->mockCurrentPage('foo')
             ->testView()
             ->assertSee('current')
-            ->assertAttributeIs('aria-current', 'page');
+            ->assertAttributeIs('aria-current="page"');
     }
 
     public function testComponentHasAriaCurrentWhenCurrentRouteMatches()

From 2a1c9cc270123f4d605b787a801df2c69aa9bef5 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 15 Mar 2024 13:45:43 +0100
Subject: [PATCH 0989/1422] Add assertion

---
 packages/framework/tests/Unit/Views/NavigationLinkViewTest.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php b/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
index b55552c25f3..e7c7a534fe8 100644
--- a/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
@@ -71,6 +71,7 @@ public function testComponentIsCurrentWhenCurrentRouteMatches()
         $this->mockCurrentPage('foo')
             ->testView()
             ->assertSee('current')
+            ->assertHasAttribute('aria-current')
             ->assertAttributeIs('aria-current="page"');
     }
 

From 322862bb07d10ed18e48b67161204e2909c1bd7f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 15 Mar 2024 13:45:55 +0100
Subject: [PATCH 0990/1422] Remove duplicated test case

---
 .../framework/tests/Unit/Views/NavigationLinkViewTest.php   | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php b/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
index e7c7a534fe8..ebe46e90c88 100644
--- a/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
@@ -75,12 +75,6 @@ public function testComponentIsCurrentWhenCurrentRouteMatches()
             ->assertAttributeIs('aria-current="page"');
     }
 
-    public function testComponentHasAriaCurrentWhenCurrentRouteMatches()
-    {
-        $this->mockRoute(Routes::get('index'));
-        $this->assertStringContainsString('aria-current="page"', $this->render(NavItem::forRoute(Routes::get('index'), 'Home')));
-    }
-
     public function testComponentDoesNotHaveActiveClassWhenNotActive()
     {
         $render = $this->render(NavItem::forRoute(Routes::get('index'), 'Home'));

From cc071eb781b698fde89769078353939a25a9ca97 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 15 Mar 2024 13:49:47 +0100
Subject: [PATCH 0991/1422] Refactor tests to use fluent assertions

---
 .../tests/Unit/Views/NavigationLinkViewTest.php   | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php b/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
index ebe46e90c88..e0f7be81ba6 100644
--- a/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
@@ -8,7 +8,6 @@
 use Hyde\Support\Models\Route;
 use Hyde\Testing\TestsBladeViews;
 use Hyde\Testing\Support\TestView;
-use Hyde\Foundation\Facades\Routes;
 use Illuminate\View\ComponentAttributeBag;
 use Hyde\Framework\Features\Navigation\NavItem;
 use Hyde\Testing\TestCase;
@@ -77,16 +76,16 @@ public function testComponentIsCurrentWhenCurrentRouteMatches()
 
     public function testComponentDoesNotHaveActiveClassWhenNotActive()
     {
-        $render = $this->render(NavItem::forRoute(Routes::get('index'), 'Home'));
-        $this->assertStringContainsString('navigation-link ', $render);
-        $this->assertStringNotContainsString('navigation-link-active', $render);
+        $this->testView()
+            ->assertSee('navigation-link ')
+            ->assertDontSee('navigation-link-active');
     }
 
     public function testComponentHasActiveClassWhenActive()
     {
-        $this->mockRoute(Routes::get('index'));
-        $render = $this->render(NavItem::forRoute(Routes::get('index'), 'Home'));
-        $this->assertStringContainsString('navigation-link ', $render);
-        $this->assertStringContainsString('navigation-link-active', $render);
+        $this->mockCurrentPage('foo')
+            ->testView()
+            ->assertSee('navigation-link ')
+            ->assertSee('navigation-link-active');
     }
 }

From c66c5c89695f6fa8f27d9be470b92dcc0437f39a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 15 Mar 2024 13:51:11 +0100
Subject: [PATCH 0992/1422] Remove unused testing helper

---
 .../framework/tests/Unit/Views/NavigationLinkViewTest.php | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php b/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
index e0f7be81ba6..db942123aa7 100644
--- a/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
@@ -26,14 +26,6 @@ protected function setUp(): void
         $this->mockPage();
     }
 
-    protected function render(?NavItem $item = null): string
-    {
-        return view('hyde::components.navigation.navigation-link', [
-            'item' => $item ?? NavItem::forLink('foo.html', 'Foo'),
-            'attributes' => new ComponentAttributeBag(),
-        ])->render();
-    }
-
     protected function testView(?NavItem $item = null): TestView
     {
         return $this->test(view('hyde::components.navigation.navigation-link', [

From b451eff6d5e20c188fea772241c1247574e6c4d0 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 15 Mar 2024 13:51:58 +0100
Subject: [PATCH 0993/1422] Remove unused parameter from testing helper method

---
 .../framework/tests/Unit/Views/NavigationLinkViewTest.php     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php b/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
index db942123aa7..d17ec5bd926 100644
--- a/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
@@ -26,10 +26,10 @@ protected function setUp(): void
         $this->mockPage();
     }
 
-    protected function testView(?NavItem $item = null): TestView
+    protected function testView(): TestView
     {
         return $this->test(view('hyde::components.navigation.navigation-link', [
-            'item' => $item ?? NavItem::forRoute(new Route(new InMemoryPage('foo')), 'Foo'),
+            'item' => NavItem::forRoute(new Route(new InMemoryPage('foo')), 'Foo'),
             'attributes' => new ComponentAttributeBag(),
         ]));
     }

From fbb5bfdbda3d202b734dd7af885553976a29ea5e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 15 Mar 2024 13:57:13 +0100
Subject: [PATCH 0994/1422] Add testing helpers to assert CSS class states

---
 packages/testing/src/Support/TestView.php | 32 +++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/packages/testing/src/Support/TestView.php b/packages/testing/src/Support/TestView.php
index 924db972f3c..92aa98c331c 100644
--- a/packages/testing/src/Support/TestView.php
+++ b/packages/testing/src/Support/TestView.php
@@ -82,6 +82,30 @@ public function assertDoesNotHaveAttribute(string $attributeName): static
         return $this;
     }
 
+    /**
+     * Assert that the given CSS class is contained within the view.
+     *
+     * @return $this
+     */
+    public function assertHasClass(string $class): static
+    {
+        PHPUnit::assertContains($class, $this->findClasses(), "The class '$class' was not found.");
+
+        return $this;
+    }
+
+    /**
+     * Assert that the given CSS class is not contained within the view.
+     *
+     * @return $this
+     */
+    public function assertDoesNotHaveClass(string $class): static
+    {
+        PHPUnit::assertNotContains($class, $this->findClasses(), "The class '$class' was found.");
+
+        return $this;
+    }
+
     /**
      * Assert that the given text is equals the view's text content.
      *
@@ -109,4 +133,12 @@ protected function trimNewlinesAndIndentation(string $value): string
     {
         return str_replace(['    ', "\t", "\n", "\r"], '', $value);
     }
+
+    /** @return array<string> */
+    protected function findClasses(): array
+    {
+        preg_match_all('/class="([^"]+)"/', $this->rendered, $matches);
+
+        return explode(' ', $matches[1][0]);
+    }
 }

From d5411eb91af90a5bd05f678301e225db96abfe10 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 15 Mar 2024 14:00:46 +0100
Subject: [PATCH 0995/1422] Use new class state helpers

---
 .../framework/tests/Unit/Views/NavigationLinkViewTest.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php b/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
index d17ec5bd926..b2a2b01c0e5 100644
--- a/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
@@ -69,15 +69,15 @@ public function testComponentIsCurrentWhenCurrentRouteMatches()
     public function testComponentDoesNotHaveActiveClassWhenNotActive()
     {
         $this->testView()
-            ->assertSee('navigation-link ')
-            ->assertDontSee('navigation-link-active');
+            ->assertHasClass('navigation-link')
+            ->assertDoesNotHaveClass('navigation-link-active');
     }
 
     public function testComponentHasActiveClassWhenActive()
     {
         $this->mockCurrentPage('foo')
             ->testView()
-            ->assertSee('navigation-link ')
-            ->assertSee('navigation-link-active');
+            ->assertHasClass('navigation-link')
+            ->assertHasClass('navigation-link-active');
     }
 }

From fd1c68a5eb5c5a57f829e637542c1aa82fb803a4 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 15 Mar 2024 14:03:05 +0100
Subject: [PATCH 0996/1422] Clean up and normalize test semantics

---
 .../tests/Unit/Views/NavigationLinkViewTest.php   | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php b/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
index b2a2b01c0e5..10febbd13cf 100644
--- a/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
@@ -36,13 +36,14 @@ protected function testView(): TestView
 
     public function testComponentLinksToRouteDestination()
     {
-        $this->testView()->assertAttributeIs('href', 'foo.html');
+        $this->testView()->assertAttributeIs('href="foo.html"');
     }
 
     public function testComponentResolvesRelativeLinksForRoutes()
     {
         $this->mockCurrentPage('foo/bar');
-        $this->testView()->assertAttributeIs('href', '../foo.html');
+
+        $this->testView()->assertAttributeIs('href="../foo.html"');
     }
 
     public function testComponentUsesTitle()
@@ -59,8 +60,9 @@ public function testComponentDoesNotHaveCurrentAttributesWhenCurrentRouteDoesNot
 
     public function testComponentIsCurrentWhenCurrentRouteMatches()
     {
-        $this->mockCurrentPage('foo')
-            ->testView()
+        $this->mockCurrentPage('foo');
+
+        $this->testView()
             ->assertSee('current')
             ->assertHasAttribute('aria-current')
             ->assertAttributeIs('aria-current="page"');
@@ -75,8 +77,9 @@ public function testComponentDoesNotHaveActiveClassWhenNotActive()
 
     public function testComponentHasActiveClassWhenActive()
     {
-        $this->mockCurrentPage('foo')
-            ->testView()
+        $this->mockCurrentPage('foo');
+
+        $this->testView()
             ->assertHasClass('navigation-link')
             ->assertHasClass('navigation-link-active');
     }

From b0d4331f7698228d62a439571fcb5ebcf71402b7 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 15 Mar 2024 14:09:53 +0100
Subject: [PATCH 0997/1422] Add testing helper to assert element state

---
 packages/testing/src/Support/TestView.php | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/packages/testing/src/Support/TestView.php b/packages/testing/src/Support/TestView.php
index 92aa98c331c..1867c2f0b64 100644
--- a/packages/testing/src/Support/TestView.php
+++ b/packages/testing/src/Support/TestView.php
@@ -37,6 +37,20 @@ public function assertSeeHtmlIgnoringFormatting(string $value): static
         return $this;
     }
 
+    /**
+     * Assert that the given HTML element is contained within the view.
+     *
+     * @return $this
+     */
+    public function assertHasElement(string $element): static
+    {
+        $element = trim($element, '</>');
+
+        PHPUnit::assertStringContainsString("<$element", $this->rendered, "The element '$element' was not found.");
+
+        return $this;
+    }
+
     /**
      * Assert that the HTML attribute value is contained within the view.
      *

From 8449237f8ef57bf279e6ff517b5cb34fe9d2e59f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 15 Mar 2024 14:10:01 +0100
Subject: [PATCH 0998/1422] Test component renders

---
 .../framework/tests/Unit/Views/NavigationLinkViewTest.php    | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php b/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
index 10febbd13cf..8609cdb82c7 100644
--- a/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
@@ -34,6 +34,11 @@ protected function testView(): TestView
         ]));
     }
 
+    public function testComponentRenders()
+    {
+        $this->testView()->assertHasElement('<a>');
+    }
+
     public function testComponentLinksToRouteDestination()
     {
         $this->testView()->assertAttributeIs('href="foo.html"');

From 2439b721776d550c340ca7e2c65aa216330d3dfc Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 15 Mar 2024 21:44:28 +0100
Subject: [PATCH 0999/1422] Create SidebarItemsViewTest.php

---
 .../tests/Unit/Views/SidebarItemsViewTest.php  | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 packages/framework/tests/Unit/Views/SidebarItemsViewTest.php

diff --git a/packages/framework/tests/Unit/Views/SidebarItemsViewTest.php b/packages/framework/tests/Unit/Views/SidebarItemsViewTest.php
new file mode 100644
index 00000000000..c2deb985986
--- /dev/null
+++ b/packages/framework/tests/Unit/Views/SidebarItemsViewTest.php
@@ -0,0 +1,18 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Hyde\Framework\Testing\Unit\Views;
+
+use Hyde\Testing\TestCase;
+use Hyde\Testing\TestsBladeViews;
+
+/**
+ * @see resources/views/components/docs/sidebar-items.blade.php
+ */
+class SidebarItemsViewTest extends TestCase
+{
+    use TestsBladeViews;
+
+    //
+}

From 4f7dd3b5ebe2e58a6f9944ee8c1c9de28b051c7f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 15 Mar 2024 21:49:40 +0100
Subject: [PATCH 1000/1422] Add testing helper to assert if an HTML ID is
 present

---
 packages/testing/src/Support/TestView.php | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/packages/testing/src/Support/TestView.php b/packages/testing/src/Support/TestView.php
index 1867c2f0b64..ed697e6b1fc 100644
--- a/packages/testing/src/Support/TestView.php
+++ b/packages/testing/src/Support/TestView.php
@@ -96,6 +96,20 @@ public function assertDoesNotHaveAttribute(string $attributeName): static
         return $this;
     }
 
+    /**
+     * Assert that the given HTML ID is contained within the view.
+     *
+     * @return $this
+     */
+    public function assertHasId(string $id): static
+    {
+        $id = trim($id, '#');
+
+        PHPUnit::assertStringContainsString("id=\"$id\"", $this->rendered, "The id '$id' was not found.");
+
+        return $this;
+    }
+
     /**
      * Assert that the given CSS class is contained within the view.
      *

From 1d5e1f77a43d8c682366a229362d2492c95ebe13 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 15 Mar 2024 21:50:06 +0100
Subject: [PATCH 1001/1422] Update testing helper to fluently direct assertions

---
 packages/testing/src/Support/TestView.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/testing/src/Support/TestView.php b/packages/testing/src/Support/TestView.php
index ed697e6b1fc..22f0e4dac2e 100644
--- a/packages/testing/src/Support/TestView.php
+++ b/packages/testing/src/Support/TestView.php
@@ -46,6 +46,10 @@ public function assertHasElement(string $element): static
     {
         $element = trim($element, '</>');
 
+        if (str_starts_with($element, '#')) {
+            return $this->assertHasId($element);
+        }
+
         PHPUnit::assertStringContainsString("<$element", $this->rendered, "The element '$element' was not found.");
 
         return $this;

From 4fa8deab206ee06022acf5b9a842ebb6a15858ce Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 15 Mar 2024 21:52:29 +0100
Subject: [PATCH 1002/1422] Set up testing helper

---
 .../tests/Unit/Views/SidebarItemsViewTest.php          | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/packages/framework/tests/Unit/Views/SidebarItemsViewTest.php b/packages/framework/tests/Unit/Views/SidebarItemsViewTest.php
index c2deb985986..cbbbff820cc 100644
--- a/packages/framework/tests/Unit/Views/SidebarItemsViewTest.php
+++ b/packages/framework/tests/Unit/Views/SidebarItemsViewTest.php
@@ -6,6 +6,9 @@
 
 use Hyde\Testing\TestCase;
 use Hyde\Testing\TestsBladeViews;
+use Hyde\Testing\Support\TestView;
+use Hyde\Framework\Features\Navigation\DocumentationSidebar;
+use Hyde\Framework\Features\Navigation\NavigationMenuGenerator;
 
 /**
  * @see resources/views/components/docs/sidebar-items.blade.php
@@ -14,5 +17,10 @@ class SidebarItemsViewTest extends TestCase
 {
     use TestsBladeViews;
 
-    //
+    protected function testView(): TestView
+    {
+        return $this->test(view('hyde::components.docs.sidebar-items', [
+            'sidebar' => NavigationMenuGenerator::handle(DocumentationSidebar::class),
+        ]));
+    }
 }

From 2d9ae2aff3f0deb5b4477b4b2a5197fbe9d470cf Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 15 Mar 2024 21:54:07 +0100
Subject: [PATCH 1003/1422] Test component renders

---
 packages/framework/tests/Unit/Views/SidebarItemsViewTest.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/framework/tests/Unit/Views/SidebarItemsViewTest.php b/packages/framework/tests/Unit/Views/SidebarItemsViewTest.php
index cbbbff820cc..f95afd79b97 100644
--- a/packages/framework/tests/Unit/Views/SidebarItemsViewTest.php
+++ b/packages/framework/tests/Unit/Views/SidebarItemsViewTest.php
@@ -23,4 +23,9 @@ protected function testView(): TestView
             'sidebar' => NavigationMenuGenerator::handle(DocumentationSidebar::class),
         ]));
     }
+
+    public function testComponentRenders()
+    {
+        $this->testView()->assertHasElement('#sidebar-items');
+    }
 }

From 3ebd20f8260d63f5c10511f6ed61cf583895a4d8 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 15 Mar 2024 21:59:00 +0100
Subject: [PATCH 1004/1422] Mock route

---
 packages/framework/tests/Unit/Views/SidebarItemsViewTest.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/tests/Unit/Views/SidebarItemsViewTest.php b/packages/framework/tests/Unit/Views/SidebarItemsViewTest.php
index f95afd79b97..e06fc42cff1 100644
--- a/packages/framework/tests/Unit/Views/SidebarItemsViewTest.php
+++ b/packages/framework/tests/Unit/Views/SidebarItemsViewTest.php
@@ -19,6 +19,8 @@ class SidebarItemsViewTest extends TestCase
 
     protected function testView(): TestView
     {
+        $this->mockRoute();
+
         return $this->test(view('hyde::components.docs.sidebar-items', [
             'sidebar' => NavigationMenuGenerator::handle(DocumentationSidebar::class),
         ]));

From 2eeed5f01a279c382920d37792d14ba0126412ba Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 15 Mar 2024 21:59:39 +0100
Subject: [PATCH 1005/1422] Add a route to populate testing sidebar

---
 packages/framework/tests/Unit/Views/SidebarItemsViewTest.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/framework/tests/Unit/Views/SidebarItemsViewTest.php b/packages/framework/tests/Unit/Views/SidebarItemsViewTest.php
index e06fc42cff1..43978cc5d11 100644
--- a/packages/framework/tests/Unit/Views/SidebarItemsViewTest.php
+++ b/packages/framework/tests/Unit/Views/SidebarItemsViewTest.php
@@ -4,8 +4,11 @@
 
 namespace Hyde\Framework\Testing\Unit\Views;
 
+use Hyde\Hyde;
 use Hyde\Testing\TestCase;
+use Hyde\Support\Models\Route;
 use Hyde\Testing\TestsBladeViews;
+use Hyde\Pages\DocumentationPage;
 use Hyde\Testing\Support\TestView;
 use Hyde\Framework\Features\Navigation\DocumentationSidebar;
 use Hyde\Framework\Features\Navigation\NavigationMenuGenerator;
@@ -21,6 +24,8 @@ protected function testView(): TestView
     {
         $this->mockRoute();
 
+        Hyde::routes()->addRoute(new Route(new DocumentationPage('foo')));
+
         return $this->test(view('hyde::components.docs.sidebar-items', [
             'sidebar' => NavigationMenuGenerator::handle(DocumentationSidebar::class),
         ]));

From a0c0726c63abfa204a6527a0c3d31fe02befcb94 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 15 Mar 2024 22:01:39 +0100
Subject: [PATCH 1006/1422] Add type annotation to view

---
 .../resources/views/components/docs/sidebar-items.blade.php  | 1 +
 packages/framework/tests/Unit/Views/SidebarItemsViewTest.php | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/packages/framework/resources/views/components/docs/sidebar-items.blade.php b/packages/framework/resources/views/components/docs/sidebar-items.blade.php
index e06a90e94c5..f0d4cb553f0 100644
--- a/packages/framework/resources/views/components/docs/sidebar-items.blade.php
+++ b/packages/framework/resources/views/components/docs/sidebar-items.blade.php
@@ -6,6 +6,7 @@
     </ul>
 @else
     <ul id="sidebar-items" role="list">
+        @php /** @var \Hyde\Framework\Features\Navigation\NavGroupItem $group */ @endphp
         @foreach ($sidebar->getItems() as $group)
             <li class="sidebar-group" role="listitem" @if($sidebar->isCollapsible()) x-data="{ groupOpen: {{ $sidebar->isGroupActive($group->getGroupKey()) ? 'true' : 'false' }} }" @endif>
                 <header @class(['sidebar-group-header p-2 px-4 -ml-2 flex justify-between items-center', 'group hover:bg-black/10' => $sidebar->isCollapsible()]) @if($sidebar->isCollapsible()) @click="groupOpen = ! groupOpen" @endif>
diff --git a/packages/framework/tests/Unit/Views/SidebarItemsViewTest.php b/packages/framework/tests/Unit/Views/SidebarItemsViewTest.php
index 43978cc5d11..2039f889c2d 100644
--- a/packages/framework/tests/Unit/Views/SidebarItemsViewTest.php
+++ b/packages/framework/tests/Unit/Views/SidebarItemsViewTest.php
@@ -35,4 +35,9 @@ public function testComponentRenders()
     {
         $this->testView()->assertHasElement('#sidebar-items');
     }
+
+    public function testTypeAnnotationIsNotPresentInHtml()
+    {
+        $this->testView()->assertDontSee('@var')->assertDontSee('$group');
+    }
 }

From 12dfbc4db36d2d5a89d1c583b783f8cc7601c45b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 15 Mar 2024 22:09:40 +0100
Subject: [PATCH 1007/1422] Add more mock pages to test

---
 packages/framework/tests/Unit/Views/SidebarItemsViewTest.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/tests/Unit/Views/SidebarItemsViewTest.php b/packages/framework/tests/Unit/Views/SidebarItemsViewTest.php
index 2039f889c2d..08bec5bfdfc 100644
--- a/packages/framework/tests/Unit/Views/SidebarItemsViewTest.php
+++ b/packages/framework/tests/Unit/Views/SidebarItemsViewTest.php
@@ -25,6 +25,8 @@ protected function testView(): TestView
         $this->mockRoute();
 
         Hyde::routes()->addRoute(new Route(new DocumentationPage('foo')));
+        Hyde::routes()->addRoute(new Route(new DocumentationPage('bar')));
+        Hyde::routes()->addRoute(new Route(new DocumentationPage('baz')));
 
         return $this->test(view('hyde::components.docs.sidebar-items', [
             'sidebar' => NavigationMenuGenerator::handle(DocumentationSidebar::class),

From 361325f93418c1917ffd4875b37f1c2391f51791 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 15 Mar 2024 22:21:21 +0100
Subject: [PATCH 1008/1422] Move mock route call to setup

---
 .../framework/tests/Unit/Views/SidebarItemsViewTest.php    | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/framework/tests/Unit/Views/SidebarItemsViewTest.php b/packages/framework/tests/Unit/Views/SidebarItemsViewTest.php
index 08bec5bfdfc..f684d4fea52 100644
--- a/packages/framework/tests/Unit/Views/SidebarItemsViewTest.php
+++ b/packages/framework/tests/Unit/Views/SidebarItemsViewTest.php
@@ -20,10 +20,15 @@ class SidebarItemsViewTest extends TestCase
 {
     use TestsBladeViews;
 
-    protected function testView(): TestView
+    protected function setUp(): void
     {
+        parent::setUp();
+
         $this->mockRoute();
+    }
 
+    protected function testView(): TestView
+    {
         Hyde::routes()->addRoute(new Route(new DocumentationPage('foo')));
         Hyde::routes()->addRoute(new Route(new DocumentationPage('bar')));
         Hyde::routes()->addRoute(new Route(new DocumentationPage('baz')));

From 5d459401ea151ed23310803f368dc781afe54bfc Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 16 Mar 2024 09:53:17 +0100
Subject: [PATCH 1009/1422] Test high level active states

Granular logic belongs in child tests
---
 .../tests/Unit/Views/SidebarItemsViewTest.php | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/packages/framework/tests/Unit/Views/SidebarItemsViewTest.php b/packages/framework/tests/Unit/Views/SidebarItemsViewTest.php
index f684d4fea52..fe0e3846fa2 100644
--- a/packages/framework/tests/Unit/Views/SidebarItemsViewTest.php
+++ b/packages/framework/tests/Unit/Views/SidebarItemsViewTest.php
@@ -43,6 +43,26 @@ public function testComponentRenders()
         $this->testView()->assertHasElement('#sidebar-items');
     }
 
+    public function testViewDoesNotContainActiveStateWhenNoPageIsActive()
+    {
+        $this->testView()
+            ->assertDontSee('active')
+            ->assertDontSee('Table of contents')
+            ->assertDoesNotHaveAttribute('aria-current');
+    }
+
+    public function testViewContainsActiveStateWhenPageIsActive()
+    {
+        $this->mockCurrentPage('docs/foo');
+        $this->mockPage(new DocumentationPage('foo'));
+
+        $this->testView()
+            ->assertSee('active')
+            ->assertSee('Table of contents')
+            ->assertHasAttribute('aria-current')
+            ->assertAttributeIs('aria-current="true"');
+    }
+
     public function testTypeAnnotationIsNotPresentInHtml()
     {
         $this->testView()->assertDontSee('@var')->assertDontSee('$group');

From 627a3f261f8b591a848f17e6cc1a87025482ef75 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 16 Mar 2024 09:54:13 +0100
Subject: [PATCH 1010/1422] Assert see list item class

---
 packages/framework/tests/Unit/Views/SidebarItemsViewTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/tests/Unit/Views/SidebarItemsViewTest.php b/packages/framework/tests/Unit/Views/SidebarItemsViewTest.php
index fe0e3846fa2..7594b96b5e3 100644
--- a/packages/framework/tests/Unit/Views/SidebarItemsViewTest.php
+++ b/packages/framework/tests/Unit/Views/SidebarItemsViewTest.php
@@ -40,7 +40,7 @@ protected function testView(): TestView
 
     public function testComponentRenders()
     {
-        $this->testView()->assertHasElement('#sidebar-items');
+        $this->testView()->assertHasElement('#sidebar-items')->assertSee('sidebar-item');
     }
 
     public function testViewDoesNotContainActiveStateWhenNoPageIsActive()

From 668961af4a27d28ca322677fc8de9c20713c885c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 16 Mar 2024 09:56:29 +0100
Subject: [PATCH 1011/1422] Add testing helper to assert string occurrence
 count

---
 packages/testing/src/Support/TestView.php | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/packages/testing/src/Support/TestView.php b/packages/testing/src/Support/TestView.php
index 22f0e4dac2e..30085b3c1b4 100644
--- a/packages/testing/src/Support/TestView.php
+++ b/packages/testing/src/Support/TestView.php
@@ -37,6 +37,20 @@ public function assertSeeHtmlIgnoringFormatting(string $value): static
         return $this;
     }
 
+    /**
+     * Assert that the given string is contained exactly `$times` within the view.
+     *
+     * @return $this
+     */
+    public function assertSeeTimes(string $value, int $times = 1): static
+    {
+        $count = substr_count($this->rendered, $value);
+
+        PHPUnit::assertSame($times, $count, "The string '$value' was found $count times, expected $times.");
+
+        return $this;
+    }
+
     /**
      * Assert that the given HTML element is contained within the view.
      *

From f04a46f69fe965d601b971f911e990ee8f10f48d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 16 Mar 2024 09:56:41 +0100
Subject: [PATCH 1012/1422] Assert see times

---
 packages/framework/tests/Unit/Views/SidebarItemsViewTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/tests/Unit/Views/SidebarItemsViewTest.php b/packages/framework/tests/Unit/Views/SidebarItemsViewTest.php
index 7594b96b5e3..8ed2a1a57aa 100644
--- a/packages/framework/tests/Unit/Views/SidebarItemsViewTest.php
+++ b/packages/framework/tests/Unit/Views/SidebarItemsViewTest.php
@@ -40,7 +40,7 @@ protected function testView(): TestView
 
     public function testComponentRenders()
     {
-        $this->testView()->assertHasElement('#sidebar-items')->assertSee('sidebar-item');
+        $this->testView()->assertHasElement('#sidebar-items')->assertSeeTimes('sidebar-item ', 3);
     }
 
     public function testViewDoesNotContainActiveStateWhenNoPageIsActive()

From ce51a65dd7b129a5deec8c57430de42e50d4ba51 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 16 Mar 2024 09:58:43 +0100
Subject: [PATCH 1013/1422] Use clearer assertion string

---
 packages/framework/tests/Unit/Views/SidebarItemsViewTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/tests/Unit/Views/SidebarItemsViewTest.php b/packages/framework/tests/Unit/Views/SidebarItemsViewTest.php
index 8ed2a1a57aa..8b29db4ce08 100644
--- a/packages/framework/tests/Unit/Views/SidebarItemsViewTest.php
+++ b/packages/framework/tests/Unit/Views/SidebarItemsViewTest.php
@@ -40,7 +40,7 @@ protected function testView(): TestView
 
     public function testComponentRenders()
     {
-        $this->testView()->assertHasElement('#sidebar-items')->assertSeeTimes('sidebar-item ', 3);
+        $this->testView()->assertHasElement('#sidebar-items')->assertSeeTimes('listitem', 3);
     }
 
     public function testViewDoesNotContainActiveStateWhenNoPageIsActive()

From 7a3ca45277d338b2bb7a4a6636cb3fc700209242 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 16 Mar 2024 10:01:10 +0100
Subject: [PATCH 1014/1422] Add fluent assertion shorthand method

---
 packages/testing/src/Support/TestView.php | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/packages/testing/src/Support/TestView.php b/packages/testing/src/Support/TestView.php
index 30085b3c1b4..2a582a45fc5 100644
--- a/packages/testing/src/Support/TestView.php
+++ b/packages/testing/src/Support/TestView.php
@@ -51,6 +51,16 @@ public function assertSeeTimes(string $value, int $times = 1): static
         return $this;
     }
 
+    /**
+     * Assert that the given string is contained exactly once within the view.
+     *
+     * @return $this
+     */
+    public function assertSeeOnce(string $value): static
+    {
+        return $this->assertSeeTimes($value, 1);
+    }
+
     /**
      * Assert that the given HTML element is contained within the view.
      *

From be2bc014c5754df51da1fce334b946ba297b4d86 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 16 Mar 2024 10:01:20 +0100
Subject: [PATCH 1015/1422] Remove redundant argument

---
 packages/testing/src/Support/TestView.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/testing/src/Support/TestView.php b/packages/testing/src/Support/TestView.php
index 2a582a45fc5..9ee68e7dac1 100644
--- a/packages/testing/src/Support/TestView.php
+++ b/packages/testing/src/Support/TestView.php
@@ -58,7 +58,7 @@ public function assertSeeTimes(string $value, int $times = 1): static
      */
     public function assertSeeOnce(string $value): static
     {
-        return $this->assertSeeTimes($value, 1);
+        return $this->assertSeeTimes($value);
     }
 
     /**

From 9c27a98007095a77bd845d996c54981be04fe7a9 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 16 Mar 2024 10:02:16 +0100
Subject: [PATCH 1016/1422] Assert see once

---
 packages/framework/tests/Unit/Views/SidebarItemsViewTest.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/tests/Unit/Views/SidebarItemsViewTest.php b/packages/framework/tests/Unit/Views/SidebarItemsViewTest.php
index 8b29db4ce08..3545491e9ac 100644
--- a/packages/framework/tests/Unit/Views/SidebarItemsViewTest.php
+++ b/packages/framework/tests/Unit/Views/SidebarItemsViewTest.php
@@ -57,8 +57,8 @@ public function testViewContainsActiveStateWhenPageIsActive()
         $this->mockPage(new DocumentationPage('foo'));
 
         $this->testView()
-            ->assertSee('active')
-            ->assertSee('Table of contents')
+            ->assertSeeOnce('active')
+            ->assertSeeOnce('Table of contents')
             ->assertHasAttribute('aria-current')
             ->assertAttributeIs('aria-current="true"');
     }

From 147618a9902bc4ec255da7e552cc092079fd6ea1 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 18 Mar 2024 19:51:51 +0100
Subject: [PATCH 1017/1422] Breaking: Rename HTML ID `#searchMenu` to
 `#search-menu`

---
 .../resources/views/components/docs/search-widget.blade.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/resources/views/components/docs/search-widget.blade.php b/packages/framework/resources/views/components/docs/search-widget.blade.php
index b44d81327c0..8badf9517fc 100644
--- a/packages/framework/resources/views/components/docs/search-widget.blade.php
+++ b/packages/framework/resources/views/components/docs/search-widget.blade.php
@@ -26,7 +26,7 @@ class="block md:hidden fixed bottom-4 right-4 z-10 rounded-full p-2 opacity-75 h
 
 <div id="search-window-container" x-show="searchWindowOpen" x-cloak role="dialog"
      class="z-30 fixed top-0 left-0 w-screen h-screen flex flex-col items-center px-8 py-24 md:py-16">
-    <aside x-on:click.away="searchWindowOpen = false" id="searchMenu"
+    <aside x-on:click.away="searchWindowOpen = false" id="search-menu"
            class="prose dark:prose-invert bg-white dark:bg-gray-800  z-50 p-4 rounded-lg overflow-y-hidden min-h-[300px] max-h-[75vh] w-[70ch] max-w-full cursor-auto ">
         <header class="flex justify-between pb-3 mb-3 border-b dark:border-gray-700 md:hidden">
             <strong>Search the documentation site</strong>

From 5a71241232502a1035eb57aa555dcfb6c67ba794 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 18 Mar 2024 19:55:01 +0100
Subject: [PATCH 1018/1422] Breaking: Rename HTML ID `#searchMenuButton` to
 `#search-menu-button`

---
 .../resources/views/components/docs/search-widget.blade.php     | 2 +-
 .../resources/views/pages/documentation-search.blade.php        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/resources/views/components/docs/search-widget.blade.php b/packages/framework/resources/views/components/docs/search-widget.blade.php
index 8badf9517fc..6a258d07479 100644
--- a/packages/framework/resources/views/components/docs/search-widget.blade.php
+++ b/packages/framework/resources/views/components/docs/search-widget.blade.php
@@ -1,4 +1,4 @@
-<button id="searchMenuButton" x-on:click="searchWindowOpen = ! searchWindowOpen"
+<button id="search-menu-button" x-on:click="searchWindowOpen = ! searchWindowOpen"
         :title="searchWindowOpen ? 'Close search window' : 'Open search window'; $nextTick(() => { setTimeout(() => { document.getElementById('search-input').focus(); }); });"
         class="absolute right-4 top-4 mr-4 z-10 opacity-75 hover:opacity-100 hidden md:block"
         aria-label="Toggle search window">
diff --git a/packages/framework/resources/views/pages/documentation-search.blade.php b/packages/framework/resources/views/pages/documentation-search.blade.php
index d30b4b7da16..c50683276d6 100644
--- a/packages/framework/resources/views/pages/documentation-search.blade.php
+++ b/packages/framework/resources/views/pages/documentation-search.blade.php
@@ -1,7 +1,7 @@
 @extends('hyde::layouts.docs')
 @section('content')
     <h1>Search the documentation site</h1>
-    <style>#searchMenuButton, .edit-page-link {
+    <style>#search-menu-button, .edit-page-link {
             display: none !important;
         }
 

From be0f780dbee28aa51a22a3f32808e0254c35630f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 18 Mar 2024 19:55:53 +0100
Subject: [PATCH 1019/1422] Breaking: Rename HTML ID `#searchMenuButtonMobile`
 to `#search-menu-button-mobile`

---
 .../resources/views/components/docs/search-widget.blade.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/resources/views/components/docs/search-widget.blade.php b/packages/framework/resources/views/components/docs/search-widget.blade.php
index 6a258d07479..43f3ee46928 100644
--- a/packages/framework/resources/views/components/docs/search-widget.blade.php
+++ b/packages/framework/resources/views/components/docs/search-widget.blade.php
@@ -14,7 +14,7 @@ class="absolute right-4 top-4 mr-4 z-10 opacity-75 hover:opacity-100 hidden md:b
         </svg>
     </span>
 </button>
-<button id="searchMenuButtonMobile" x-on:click="searchWindowOpen = ! searchWindowOpen"
+<button id="search-menu-button-mobile" x-on:click="searchWindowOpen = ! searchWindowOpen"
         :title="searchWindowOpen ? 'Close search window' : 'Open search window'; $nextTick(() => { setTimeout(() => { document.getElementById('search-input').focus(); }); });"
         class="block md:hidden fixed bottom-4 right-4 z-10 rounded-full p-2 opacity-75 hover:opacity-100 fill-black bg-gray-200 dark:fill-gray-200 dark:bg-gray-700"
         aria-label="Toggle search menu">

From 111fa9cfddf9cfb2b2dfd9cd6a7e8742733f4a43 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 18 Mar 2024 19:57:56 +0100
Subject: [PATCH 1020/1422] Update RELEASE_NOTES.md

---
 RELEASE_NOTES.md | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index c892160609f..336aaf694bf 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -69,6 +69,17 @@ If you have previously used this method directly and expected a string to be ret
 
 If you want to retain the previous state where a string is always returned, you can use the new `NavItem::getLink()` method instead, which will resolve the route immediately.
 
+### HTML ID changes
+
+Some HTML IDs have been renamed to follow a more consistent naming convention.
+
+If you have used any of the following selectors in custom code you wrote yourself, you will need to update to use the new changed IDs.
+
+- Rename HTML ID `#searchMenu` to `#search-menu`
+- Rename HTML ID `#searchMenuButton` to `#search-menu-button`
+- Rename HTML ID `#searchMenuButtonMobile` to `#search-menu-button-mobile`
+
+
 ### New documentation search implementation
 
 As the new documentation search implementation brings changes to their code API you may need to adapt your code

From c6855f06542da6df9c00960a3d2b040c4ce5d378 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 18 Mar 2024 19:59:29 +0100
Subject: [PATCH 1021/1422] Update RELEASE_NOTES.md

---
 RELEASE_NOTES.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 336aaf694bf..01955fff841 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -75,6 +75,7 @@ Some HTML IDs have been renamed to follow a more consistent naming convention.
 
 If you have used any of the following selectors in custom code you wrote yourself, you will need to update to use the new changed IDs.
 
+#### https://github.com/hydephp/develop/pull/1622
 - Rename HTML ID `#searchMenu` to `#search-menu`
 - Rename HTML ID `#searchMenuButton` to `#search-menu-button`
 - Rename HTML ID `#searchMenuButtonMobile` to `#search-menu-button-mobile`

From 686d1b9a40ce680a5deef97f004099ff4f7d4505 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 19 Mar 2024 12:12:47 +0100
Subject: [PATCH 1022/1422] Remove low priority todo

This would not reduce complexity, just move it to the view where it is harder to test
---
 .../src/Framework/Features/Navigation/DocumentationSidebar.php  | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 64ed8edd555..8d1d2567c29 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -88,8 +88,6 @@ private function shouldIndexPageBeActive(string $group): bool
     {
         // Unless the index page has a specific group set, the first group in the sidebar should be active.
 
-        // Todo: It may make more sense to handle this logic in the view, as it's a UI concern and this is a data model.
-
         $indexPageHasNoSetGroup = Render::getPage()->navigationMenuGroup() === null;
 
         $firstGroupInSidebar = $this->getItems()->firstWhere(fn (NavItem $item): bool => $item instanceof NavGroupItem);

From 965ea5ccefe0b9babad0dda5c2a95ae9fb761c37 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 19 Mar 2024 12:13:44 +0100
Subject: [PATCH 1023/1422] Clarify code documentation

---
 .../src/Framework/Features/Navigation/DocumentationSidebar.php  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 8d1d2567c29..ba3926e83db 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -86,7 +86,7 @@ private function isCurrentPageIndexPage(): bool
 
     private function shouldIndexPageBeActive(string $group): bool
     {
-        // Unless the index page has a specific group set, the first group in the sidebar should be active.
+        // Unless the index page has a specific group set, the first group in the sidebar should be active when on the index page.
 
         $indexPageHasNoSetGroup = Render::getPage()->navigationMenuGroup() === null;
 

From 5a36521ce397b0cd4b7085f38b4fa73789c606c9 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 20 Mar 2024 16:43:49 +0100
Subject: [PATCH 1024/1422] Remove deprecated backwards compatibility

I'd rather ship another breaking change than introduce a deprecation in a new major version
---
 .../Navigation/DocumentationSidebar.php       |  5 ----
 .../Views/SidebarFooterTextViewTest.php       |  9 ------
 .../Unit/DocumentationSidebarUnitTest.php     | 28 -------------------
 3 files changed, 42 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index ba3926e83db..0698d8c9790 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -41,11 +41,6 @@ public function getFooter(): ?string
             return $option;
         }
 
-        if ($option === true) {
-            /** @deprecated Backwards compatibility */
-            return '[Back to home page](../)';
-        }
-
         return null;
     }
 
diff --git a/packages/framework/tests/Feature/Views/SidebarFooterTextViewTest.php b/packages/framework/tests/Feature/Views/SidebarFooterTextViewTest.php
index 717997f5442..a2347c3ad66 100644
--- a/packages/framework/tests/Feature/Views/SidebarFooterTextViewTest.php
+++ b/packages/framework/tests/Feature/Views/SidebarFooterTextViewTest.php
@@ -20,15 +20,6 @@ public function testSidebarFooterTextViewWithDefaultConfig()
         $view->assertSeeHtml('<a href="../">Back to home page</a>');
     }
 
-    public function testSidebarFooterTextViewWhenConfigOptionIsTrue()
-    {
-        Config::set('docs.sidebar.footer', true);
-
-        $view = $this->view(view('hyde::components.docs.sidebar-footer-text', $this->withSidebar()));
-
-        $view->assertSeeHtml('<a href="../">Back to home page</a>');
-    }
-
     public function testSidebarFooterTextViewWhenConfigOptionIsMarkdownString()
     {
         Config::set('docs.sidebar.footer', 'Your Markdown String Here');
diff --git a/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php b/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
index 8e1a5d3457e..968515677bd 100644
--- a/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
+++ b/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
@@ -150,20 +150,6 @@ public function testGetFooterReturnsStringWhenConfigIsString()
         $this->assertSame('Some footer content', (new DocumentationSidebar())->getFooter());
     }
 
-    public function testGetFooterReturnsBackLinkWhenConfigIsTrue()
-    {
-        self::mockConfig(['docs.sidebar.footer' => true]);
-
-        $this->assertSame('[Back to home page](../)', (new DocumentationSidebar())->getFooter());
-    }
-
-    public function testGetFooterReturnsNullWhenConfigIsFalse()
-    {
-        self::mockConfig(['docs.sidebar.footer' => false]);
-
-        $this->assertNull((new DocumentationSidebar())->getFooter());
-    }
-
     public function testIsCollapsibleReturnsTrueByDefault()
     {
         self::mockConfig();
@@ -199,20 +185,6 @@ public function testHasFooterReturnsTrueWhenConfigIsString()
         $this->assertTrue((new DocumentationSidebar())->hasFooter());
     }
 
-    public function testHasFooterReturnsTrueWhenConfigIsTrue()
-    {
-        self::mockConfig(['docs.sidebar.footer' => true]);
-
-        $this->assertTrue((new DocumentationSidebar())->hasFooter());
-    }
-
-    public function testHasFooterReturnsFalseWhenConfigIsFalse()
-    {
-        self::mockConfig(['docs.sidebar.footer' => false]);
-
-        $this->assertFalse((new DocumentationSidebar())->hasFooter());
-    }
-
     public function testHasGroupsReturnsFalseWhenNoItemsHaveChildren()
     {
         $this->assertFalse((new DocumentationSidebar())->hasGroups());

From 51ccdf9b776a741840dce4b8e80c955b9115bc7d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 20 Mar 2024 16:55:12 +0100
Subject: [PATCH 1025/1422] Simplify method return

---
 .../Features/Navigation/DocumentationSidebar.php          | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 0698d8c9790..bec3d72f6d5 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -35,13 +35,7 @@ public function getHeader(): string
 
     public function getFooter(): ?string
     {
-        $option = Config::get('docs.sidebar.footer', '[Back to home page](../)');
-
-        if (is_string($option)) {
-            return $option;
-        }
-
-        return null;
+        return Config::getNullableString('docs.sidebar.footer', '[Back to home page](../)');
     }
 
     public function hasFooter(): bool

From ea180812679bb94ae2543d52851709de268438a9 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 20 Mar 2024 17:02:53 +0100
Subject: [PATCH 1026/1422] Support setting sidebar footer to false to disable
 it

Revert "Simplify method return"

This reverts commit 51ccdf9b776a741840dce4b8e80c955b9115bc7d.

Apply fixes from StyleCI
---
 .../Features/Navigation/DocumentationSidebar.php   |  8 +++++++-
 .../tests/Unit/DocumentationSidebarUnitTest.php    | 14 ++++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index bec3d72f6d5..0698d8c9790 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -35,7 +35,13 @@ public function getHeader(): string
 
     public function getFooter(): ?string
     {
-        return Config::getNullableString('docs.sidebar.footer', '[Back to home page](../)');
+        $option = Config::get('docs.sidebar.footer', '[Back to home page](../)');
+
+        if (is_string($option)) {
+            return $option;
+        }
+
+        return null;
     }
 
     public function hasFooter(): bool
diff --git a/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php b/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
index 968515677bd..c74453e4ba5 100644
--- a/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
+++ b/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
@@ -150,6 +150,13 @@ public function testGetFooterReturnsStringWhenConfigIsString()
         $this->assertSame('Some footer content', (new DocumentationSidebar())->getFooter());
     }
 
+    public function testGetFooterReturnsNullWhenConfigIsFalse()
+    {
+        self::mockConfig(['docs.sidebar.footer' => false]);
+
+        $this->assertNull((new DocumentationSidebar())->getFooter());
+    }
+
     public function testIsCollapsibleReturnsTrueByDefault()
     {
         self::mockConfig();
@@ -185,6 +192,13 @@ public function testHasFooterReturnsTrueWhenConfigIsString()
         $this->assertTrue((new DocumentationSidebar())->hasFooter());
     }
 
+    public function testHasFooterReturnsFalseWhenConfigIsFalse()
+    {
+        self::mockConfig(['docs.sidebar.footer' => false]);
+
+        $this->assertFalse((new DocumentationSidebar())->hasFooter());
+    }
+
     public function testHasGroupsReturnsFalseWhenNoItemsHaveChildren()
     {
         $this->assertFalse((new DocumentationSidebar())->hasGroups());

From dc6090f1570ce617aace88530deca9aff8f7a2a6 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 20 Mar 2024 19:53:29 +0100
Subject: [PATCH 1027/1422] Set default group value to null

---
 .../framework/src/Framework/Features/Navigation/NavItem.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index a9cd1a6ca48..b0a04173ca6 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -26,7 +26,7 @@ class NavItem implements Stringable
     protected ?Route $route;
     protected string $label;
     protected int $priority;
-    protected ?string $group;
+    protected ?string $group = null;
 
     /** @deprecated Use NavGroupItem::$items instead */
     protected array $items = [];

From 8bb37e61ce9c47cf6274fa1a07758de7dbace23c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 20 Mar 2024 19:50:17 +0100
Subject: [PATCH 1028/1422] Only construct group if it is not null

---
 .../framework/src/Framework/Features/Navigation/NavItem.php  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index b0a04173ca6..69f26975cf0 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -48,7 +48,10 @@ public function __construct(Route|string|null $destination, string $label, int $
         $this->route = $destination;
         $this->label = $label;
         $this->priority = $priority;
-        $this->group = static::normalizeGroupKey($group);
+
+        if ($group !== null) {
+            $this->group = static::normalizeGroupKey($group);
+        }
     }
 
     /**

From fdf5b0e498d928f152510f8b4dcaefe71da05c57 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 20 Mar 2024 19:50:48 +0100
Subject: [PATCH 1029/1422] Remove null handling from normalization helper

---
 .../framework/src/Framework/Features/Navigation/NavItem.php   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 69f26975cf0..884dde190b9 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -155,8 +155,8 @@ public function isActive(): bool
         return Hyde::currentRoute()->getLink() === $this->route->getLink();
     }
 
-    protected static function normalizeGroupKey(?string $group): ?string
+    protected static function normalizeGroupKey(string $group): string
     {
-        return $group ? Str::slug($group) : null;
+        return Str::slug($group);
     }
 }

From 40a1e1f5609e0ee1b98f06869de7ea294f4f9bb3 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 20 Mar 2024 19:55:43 +0100
Subject: [PATCH 1030/1422] Remove deprecated items array

---
 .../framework/src/Framework/Features/Navigation/NavItem.php    | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 884dde190b9..eecd7b6d380 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -28,9 +28,6 @@ class NavItem implements Stringable
     protected int $priority;
     protected ?string $group = null;
 
-    /** @deprecated Use NavGroupItem::$items instead */
-    protected array $items = [];
-
     /**
      * Create a new navigation menu item.
      *

From 4d96b3cbe37e5256a3a83485ad033b7813d50705 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 20 Mar 2024 19:59:58 +0100
Subject: [PATCH 1031/1422] Make normalization helper public

---
 .../src/Framework/Features/Navigation/NavItem.php        | 2 +-
 packages/framework/tests/Unit/NavItemTest.php            | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index eecd7b6d380..665df77770c 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -152,7 +152,7 @@ public function isActive(): bool
         return Hyde::currentRoute()->getLink() === $this->route->getLink();
     }
 
-    protected static function normalizeGroupKey(string $group): string
+    public static function normalizeGroupKey(string $group): string
     {
         return Str::slug($group);
     }
diff --git a/packages/framework/tests/Unit/NavItemTest.php b/packages/framework/tests/Unit/NavItemTest.php
index 98093b7628e..413e4d8c265 100644
--- a/packages/framework/tests/Unit/NavItemTest.php
+++ b/packages/framework/tests/Unit/NavItemTest.php
@@ -275,4 +275,13 @@ public function testGroupKeysAreNormalized()
         $item = new NavItem(new Route(new MarkdownPage()), 'Test', 500, 'Foo Bar');
         $this->assertSame('foo-bar', $item->getGroupKey());
     }
+
+    public function testNormalizeGroupKeyCreatesSlugs()
+    {
+        $this->assertSame('foo-bar', NavItem::normalizeGroupKey('Foo Bar'));
+        $this->assertSame('foo-bar', NavItem::normalizeGroupKey('foo bar'));
+        $this->assertSame('foo-bar', NavItem::normalizeGroupKey('foo_bar'));
+        $this->assertSame('foo-bar', NavItem::normalizeGroupKey('foo-bar'));
+        $this->assertSame('foo-bar', NavItem::normalizeGroupKey(' foo bar '));
+    }
 }

From bc566258efedda25152ea093532ac10e5e9e9f26 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 20 Mar 2024 20:00:31 +0100
Subject: [PATCH 1032/1422] Use publicized normalization helper

---
 .../src/Framework/Features/Navigation/DocumentationSidebar.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 0698d8c9790..28bb987b15c 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -8,7 +8,6 @@
 use Hyde\Pages\DocumentationPage;
 use Hyde\Support\Facades\Render;
 use Illuminate\Contracts\Support\Arrayable;
-use Illuminate\Support\Str;
 
 use function app;
 use function is_string;
@@ -68,7 +67,7 @@ public function hasGroups(): bool
      */
     public function isGroupActive(string $group): bool
     {
-        $groupMatchesCurrentPageGroup = Str::slug(Render::getPage()->navigationMenuGroup()) === $group;
+        $groupMatchesCurrentPageGroup = NavItem::normalizeGroupKey(Render::getPage()->navigationMenuGroup()) === $group;
         $currentPageIsIndexPageAndShouldBeActive = $this->isCurrentPageIndexPage() && $this->shouldIndexPageBeActive($group);
 
         return $groupMatchesCurrentPageGroup || $currentPageIsIndexPageAndShouldBeActive;

From e81c079936ba5c5187d947af8a06d5b5b0226add Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 20 Mar 2024 20:02:27 +0100
Subject: [PATCH 1033/1422] Revert "Remove null handling from normalization
 helper"

This reverts commit fdf5b0e498d928f152510f8b4dcaefe71da05c57.
---
 .../framework/src/Framework/Features/Navigation/NavItem.php   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 665df77770c..7354e76d588 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -152,8 +152,8 @@ public function isActive(): bool
         return Hyde::currentRoute()->getLink() === $this->route->getLink();
     }
 
-    public static function normalizeGroupKey(string $group): string
+    public static function normalizeGroupKey(?string $group): ?string
     {
-        return Str::slug($group);
+        return $group ? Str::slug($group) : null;
     }
 }

From c6256c1bfa244404b0ea3f9d3202bcd84e76183c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 20 Mar 2024 20:02:52 +0100
Subject: [PATCH 1034/1422] Test normalize group key returns null for null

---
 packages/framework/tests/Unit/NavItemTest.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/framework/tests/Unit/NavItemTest.php b/packages/framework/tests/Unit/NavItemTest.php
index 413e4d8c265..d38214d425e 100644
--- a/packages/framework/tests/Unit/NavItemTest.php
+++ b/packages/framework/tests/Unit/NavItemTest.php
@@ -284,4 +284,9 @@ public function testNormalizeGroupKeyCreatesSlugs()
         $this->assertSame('foo-bar', NavItem::normalizeGroupKey('foo-bar'));
         $this->assertSame('foo-bar', NavItem::normalizeGroupKey(' foo bar '));
     }
+
+    public function testNormalizeGroupKeyReturnsNullForNull()
+    {
+        $this->assertNull(NavItem::normalizeGroupKey(null));
+    }
 }

From bccdb4a9aca1f80682bd92096fca1f3b0fb249fa Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 20 Mar 2024 20:04:20 +0100
Subject: [PATCH 1035/1422] Document conditional return type

---
 packages/framework/src/Framework/Features/Navigation/NavItem.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 7354e76d588..b6e4eec5ffa 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -152,6 +152,7 @@ public function isActive(): bool
         return Hyde::currentRoute()->getLink() === $this->route->getLink();
     }
 
+    /** @return ($group is null ? null : string) */
     public static function normalizeGroupKey(?string $group): ?string
     {
         return $group ? Str::slug($group) : null;

From c0de62e6b8cbb17ca26c55890165771c11eb7007 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 20 Mar 2024 20:09:26 +0100
Subject: [PATCH 1036/1422] Refactor complex boolean returns to inline variable

---
 .../Framework/Features/Navigation/DocumentationSidebar.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 28bb987b15c..28e9f273d85 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -68,9 +68,12 @@ public function hasGroups(): bool
     public function isGroupActive(string $group): bool
     {
         $groupMatchesCurrentPageGroup = NavItem::normalizeGroupKey(Render::getPage()->navigationMenuGroup()) === $group;
-        $currentPageIsIndexPageAndShouldBeActive = $this->isCurrentPageIndexPage() && $this->shouldIndexPageBeActive($group);
 
-        return $groupMatchesCurrentPageGroup || $currentPageIsIndexPageAndShouldBeActive;
+        if ($this->isCurrentPageIndexPage()) {
+            return $this->shouldIndexPageBeActive($group) || $groupMatchesCurrentPageGroup;
+        }
+
+        return $groupMatchesCurrentPageGroup;
     }
 
     private function isCurrentPageIndexPage(): bool

From a08e0a09634d3c4359393599c724b2787f037358 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 20 Mar 2024 20:13:07 +0100
Subject: [PATCH 1037/1422] Remove unnecessary filtering logic

We know that this is only called for sidebars with groups, and we also know all root items are then groups, so we just need the first one
---
 .../src/Framework/Features/Navigation/DocumentationSidebar.php  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 28e9f273d85..174626238c4 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -87,7 +87,7 @@ private function shouldIndexPageBeActive(string $group): bool
 
         $indexPageHasNoSetGroup = Render::getPage()->navigationMenuGroup() === null;
 
-        $firstGroupInSidebar = $this->getItems()->firstWhere(fn (NavItem $item): bool => $item instanceof NavGroupItem);
+        $firstGroupInSidebar = $this->getItems()->first();
 
         $groupIsTheFirstOneInSidebar = $group === $firstGroupInSidebar?->getGroupKey();
 

From b17ffc964ab91cb1d7cbdb8893a4fd83d3944bef Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 20 Mar 2024 20:20:02 +0100
Subject: [PATCH 1038/1422] Remove null safe operator for evaluated state

---
 .../src/Framework/Features/Navigation/DocumentationSidebar.php  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 174626238c4..8a8f58f704f 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -89,7 +89,7 @@ private function shouldIndexPageBeActive(string $group): bool
 
         $firstGroupInSidebar = $this->getItems()->first();
 
-        $groupIsTheFirstOneInSidebar = $group === $firstGroupInSidebar?->getGroupKey();
+        $groupIsTheFirstOneInSidebar = $group === $firstGroupInSidebar->getGroupKey();
 
         return $indexPageHasNoSetGroup && $groupIsTheFirstOneInSidebar;
     }

From 6c1201122d72ac0e0472a806613d45a7db98d15b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 20 Mar 2024 20:20:36 +0100
Subject: [PATCH 1039/1422] Use first or fail to conform state

---
 .../src/Framework/Features/Navigation/DocumentationSidebar.php  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 8a8f58f704f..9625bb9ee71 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -87,7 +87,7 @@ private function shouldIndexPageBeActive(string $group): bool
 
         $indexPageHasNoSetGroup = Render::getPage()->navigationMenuGroup() === null;
 
-        $firstGroupInSidebar = $this->getItems()->first();
+        $firstGroupInSidebar = $this->getItems()->firstOrFail();
 
         $groupIsTheFirstOneInSidebar = $group === $firstGroupInSidebar->getGroupKey();
 

From b8adcf9bd6d4042b53d1c1f5e303646cac8a70ce Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 20 Mar 2024 20:24:09 +0100
Subject: [PATCH 1040/1422] Replace return expression with conditional early
 return

---
 .../Framework/Features/Navigation/DocumentationSidebar.php  | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 9625bb9ee71..1ad0ad2c6fc 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -85,12 +85,14 @@ private function shouldIndexPageBeActive(string $group): bool
     {
         // Unless the index page has a specific group set, the first group in the sidebar should be active when on the index page.
 
-        $indexPageHasNoSetGroup = Render::getPage()->navigationMenuGroup() === null;
+        if (Render::getPage()->navigationMenuGroup() !== null) {
+            return false;
+        }
 
         $firstGroupInSidebar = $this->getItems()->firstOrFail();
 
         $groupIsTheFirstOneInSidebar = $group === $firstGroupInSidebar->getGroupKey();
 
-        return $indexPageHasNoSetGroup && $groupIsTheFirstOneInSidebar;
+        return $groupIsTheFirstOneInSidebar;
     }
 }

From 2bcbb5ac3a2dfc653b4a0e3aadda9268d6895e20 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 20 Mar 2024 20:24:47 +0100
Subject: [PATCH 1041/1422] Inline variable

---
 .../Framework/Features/Navigation/DocumentationSidebar.php    | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 1ad0ad2c6fc..85ea0f434dc 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -91,8 +91,6 @@ private function shouldIndexPageBeActive(string $group): bool
 
         $firstGroupInSidebar = $this->getItems()->firstOrFail();
 
-        $groupIsTheFirstOneInSidebar = $group === $firstGroupInSidebar->getGroupKey();
-
-        return $groupIsTheFirstOneInSidebar;
+        return $group === $firstGroupInSidebar->getGroupKey();
     }
 }

From f92df80179ff39525f2f00f056fc922d729dfd78 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 20 Mar 2024 20:44:24 +0100
Subject: [PATCH 1042/1422] Clarify code comment language

---
 .../src/Framework/Features/Navigation/DocumentationSidebar.php  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 85ea0f434dc..578346c6190 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -83,7 +83,7 @@ private function isCurrentPageIndexPage(): bool
 
     private function shouldIndexPageBeActive(string $group): bool
     {
-        // Unless the index page has a specific group set, the first group in the sidebar should be active when on the index page.
+        // Unless the index page has a specific group set, the first group in the sidebar should be active visiting the index page.
 
         if (Render::getPage()->navigationMenuGroup() !== null) {
             return false;

From eaa9ff9a2e817f864e5e642f96a31b3f8194b345 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 20 Mar 2024 20:44:51 +0100
Subject: [PATCH 1043/1422] Use more fluent boolean logic

---
 .../src/Framework/Features/Navigation/DocumentationSidebar.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 578346c6190..85c502e5006 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -10,6 +10,7 @@
 use Illuminate\Contracts\Support\Arrayable;
 
 use function app;
+use function filled;
 use function is_string;
 
 class DocumentationSidebar extends NavigationMenu
@@ -85,7 +86,7 @@ private function shouldIndexPageBeActive(string $group): bool
     {
         // Unless the index page has a specific group set, the first group in the sidebar should be active visiting the index page.
 
-        if (Render::getPage()->navigationMenuGroup() !== null) {
+        if (filled(Render::getPage()->navigationMenuGroup())) {
             return false;
         }
 

From 598ff30d2fcfb8f78ff258efd84aff18902ecf80 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 20 Mar 2024 20:50:10 +0100
Subject: [PATCH 1044/1422] Fix grammar

---
 .../src/Framework/Features/Navigation/DocumentationSidebar.php  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 85c502e5006..a788f745e91 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -84,7 +84,7 @@ private function isCurrentPageIndexPage(): bool
 
     private function shouldIndexPageBeActive(string $group): bool
     {
-        // Unless the index page has a specific group set, the first group in the sidebar should be active visiting the index page.
+        // Unless the index page has a specific group set, the first group in the sidebar should be active when visiting the index page.
 
         if (filled(Render::getPage()->navigationMenuGroup())) {
             return false;

From 9c0954e3052f70eeb62b9e54fcb390c930a6c893 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 20 Mar 2024 20:50:18 +0100
Subject: [PATCH 1045/1422] Inline variable

---
 .../Framework/Features/Navigation/DocumentationSidebar.php    | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index a788f745e91..1795a691f5c 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -90,8 +90,6 @@ private function shouldIndexPageBeActive(string $group): bool
             return false;
         }
 
-        $firstGroupInSidebar = $this->getItems()->firstOrFail();
-
-        return $group === $firstGroupInSidebar->getGroupKey();
+        return $group === $this->getItems()->firstOrFail()->getGroupKey();
     }
 }

From 564be4fffe18c4a440f0bc0a9b0b3265edb372f1 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 20 Mar 2024 20:50:33 +0100
Subject: [PATCH 1046/1422] Clearer language

---
 .../src/Framework/Features/Navigation/DocumentationSidebar.php  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 1795a691f5c..0da7e4a4ed6 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -84,7 +84,7 @@ private function isCurrentPageIndexPage(): bool
 
     private function shouldIndexPageBeActive(string $group): bool
     {
-        // Unless the index page has a specific group set, the first group in the sidebar should be active when visiting the index page.
+        // Unless the index page has a specific group set, the first group in the sidebar should be open when visiting the index page.
 
         if (filled(Render::getPage()->navigationMenuGroup())) {
             return false;

From 4aca10cd210fb4fa2184c0d8f09e7dd69fc8fc01 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 20 Mar 2024 20:55:48 +0100
Subject: [PATCH 1047/1422] Mark method as internal

---
 .../src/Framework/Features/Navigation/DocumentationSidebar.php  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 0da7e4a4ed6..c8bc17c9340 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -62,6 +62,8 @@ public function hasGroups(): bool
     /**
      * Is a page within the group the current page? This is used to determine if the sidebar group should be open when loading the page.
      *
+     * @internal This method is used in the sidebar view to determine if a group should be open, and is not intended to be used in other contexts.
+     *
      * For index pages, this will also return true for the first group in the menu, unless the index page has a specific group set.
      *
      * We have this logic here because not all NavItem instances belong to sidebars, and we need data from both.

From b3cf0108dab7b73ea8127ea5717cc69c6bb01115 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 20 Mar 2024 21:06:06 +0100
Subject: [PATCH 1048/1422] Breaking: Rename class NavItem to NavigationItem

---
 RELEASE_NOTES.md                              |  10 +-
 config/hyde.php                               |   2 +-
 docs/digging-deeper/navigation.md             |  18 +--
 packages/framework/config/hyde.php            |   2 +-
 .../views/layouts/navigation.blade.php        |   6 +-
 .../Navigation/DocumentationSidebar.php       |   6 +-
 .../Features/Navigation/NavGroupItem.php      |  14 +--
 .../{NavItem.php => NavigationItem.php}       |  10 +-
 .../Features/Navigation/NavigationMenu.php    |   8 +-
 .../Navigation/NavigationMenuGenerator.php    |  14 +--
 .../AutomaticNavigationConfigurationsTest.php |  16 +--
 .../tests/Feature/NavigationMenuTest.php      |  84 ++++++-------
 .../Services/DocumentationSidebarTest.php     |  42 +++----
 .../Unit/DocumentationSidebarUnitTest.php     |   6 +-
 .../framework/tests/Unit/NavGroupItemTest.php |  46 +++----
 ...p => NavigationItemIsActiveHelperTest.php} |  76 ++++++------
 ...NavItemTest.php => NavigationItemTest.php} | 112 +++++++++---------
 .../tests/Unit/NavigationMenuUnitTest.php     |   6 +-
 .../Unit/Views/NavigationLinkViewTest.php     |   4 +-
 19 files changed, 242 insertions(+), 240 deletions(-)
 rename packages/framework/src/Framework/Features/Navigation/{NavItem.php => NavigationItem.php} (93%)
 rename packages/framework/tests/Unit/{NavItemIsActiveHelperTest.php => NavigationItemIsActiveHelperTest.php} (65%)
 rename packages/framework/tests/Unit/{NavItemTest.php => NavigationItemTest.php} (54%)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 01955fff841..1c7e3aa81e5 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -12,15 +12,15 @@ This serves two purposes:
 ### Added
 - Added a new `\Hyde\Framework\Actions\PreBuildTasks\TransferMediaAssets` build task handle media assets transfers for site builds.
 - Added a new `ExternalRoute` class to represent external routes.
-- Added a new `NavItem::getLink()` method contain the previous `NavItem::getDestination()` logic, to return the link URL.
+- Added a new `NavigationItem::getLink()` method contain the previous `NavigationItem::getDestination()` logic, to return the link URL.
 
 ### Changed
 - Changed how the documentation search is generated, to be an `InMemoryPage` instead of a post-build task.
 - Media asset files are now copied using the new build task instead of the deprecated `BuildService::transferMediaAssets()` method.
 - Minor: The documentation article component now supports disabling the semantic rendering using a falsy value in https://github.com/hydephp/develop/pull/1566
 - Navigation menu items are now no longer filtered by duplicates (meaning two items with the same label can now exist in the same menu) in https://github.com/hydephp/develop/pull/1573
-- Breaking: The `NavItem` class now always stores the destination as a `Route` instance.
-- Breaking: The `NavItem::getDestination()` method now returns its `Route` instance.
+- Breaking: The `NavigationItem` class now always stores the destination as a `Route` instance.
+- Breaking: The `NavigationItem::getDestination()` method now returns its `Route` instance.
 
 ### Deprecated
 - for soon-to-be removed features.
@@ -63,11 +63,11 @@ For more information, see https://github.com/hydephp/develop/pull/1498.
 
 ### Navigation item changes
 
-The `NavItem::getDestination()` method now returns its `Route` instance. This allows for deferring the route evaluation.
+The `NavigationItem::getDestination()` method now returns its `Route` instance. This allows for deferring the route evaluation.
 
 If you have previously used this method directly and expected a string to be returned, you may need to adapt your code to handle the new return type.
 
-If you want to retain the previous state where a string is always returned, you can use the new `NavItem::getLink()` method instead, which will resolve the route immediately.
+If you want to retain the previous state where a string is always returned, you can use the new `NavigationItem::getLink()` method instead, which will resolve the route immediately.
 
 ### HTML ID changes
 
diff --git a/config/hyde.php b/config/hyde.php
index 9cbbe1cceb3..65fa6d4394f 100644
--- a/config/hyde.php
+++ b/config/hyde.php
@@ -350,7 +350,7 @@
         // To get started quickly, you can uncomment the defaults here.
         // See the documentation link above for more information.
         'custom' => [
-            // NavItem::forLink('https://github.com/hydephp/hyde', 'GitHub', 200),
+            // NavigationItem::forLink('https://github.com/hydephp/hyde', 'GitHub', 200),
         ],
 
         // How should pages in subdirectories be displayed in the menu?
diff --git a/docs/digging-deeper/navigation.md b/docs/digging-deeper/navigation.md
index f36a2f9a761..761506488f2 100644
--- a/docs/digging-deeper/navigation.md
+++ b/docs/digging-deeper/navigation.md
@@ -230,18 +230,18 @@ To remove items from being automatically added, simply add the page's route key
 
 ### Adding Custom Navigation Menu Links
 
-You can easily add custom navigation menu links similar to how we add Authors. Simply add a `NavItem` model to the `navigation.custom` array.
+You can easily add custom navigation menu links similar to how we add Authors. Simply add a `NavigationItem` model to the `navigation.custom` array.
 
-When linking to an external site, you should use the `NavItem::forLink()` method facade. The first two arguments are the
+When linking to an external site, you should use the `NavigationItem::forLink()` method facade. The first two arguments are the
 destination and label, both required. The third argument is the priority, which is optional, and defaults to `500`.
 
 ```php
 // filepath config/hyde.php
-use Hyde\Framework\Features\Navigation\NavItem;
+use Hyde\Framework\Features\Navigation\NavigationItem;
 
 'navigation' => [
     'custom' => [
-        NavItem::forLink('https://github.com/hydephp/hyde', 'GitHub', 200),
+        NavigationItem::forLink('https://github.com/hydephp/hyde', 'GitHub', 200),
     ]
 ]
 ```
@@ -314,14 +314,14 @@ use Hyde\Framework\Features\Navigation\BaseNavigationMenu;
 Within the `BaseNavigationMenu` class, you will find the main logic for how the menus are generated,
 while the child implementations contain the extra logic tailored for their specific use cases.
 
-All the navigation menus store the menu items in their `$items` array containing instances of the `NavItem` class.
+All the navigation menus store the menu items in their `$items` array containing instances of the `NavigationItem` class.
 
-The `NavItem` class is a simple class that contains the label and URL of the menu item and is used to represent each item in the menu.
-Dropdowns are represented by `DropdownNavItem` instances, which extend the `NavItem` class and contain an array of additional `NavItem` instances.
+The `NavigationItem` class is a simple class that contains the label and URL of the menu item and is used to represent each item in the menu.
+Dropdowns are represented by `DropdownNavigationItem` instances, which extend the `NavigationItem` class and contain an array of additional `NavigationItem` instances.
 
 ```php
-use Hyde\Framework\Features\Navigation\NavItem;
-use Hyde\Framework\Features\Navigation\DropdownNavItem;
+use Hyde\Framework\Features\Navigation\NavigationItem;
+use Hyde\Framework\Features\Navigation\DropdownNavigationItem;
 ```
 
 ## The Navigation API
diff --git a/packages/framework/config/hyde.php b/packages/framework/config/hyde.php
index 9cbbe1cceb3..65fa6d4394f 100644
--- a/packages/framework/config/hyde.php
+++ b/packages/framework/config/hyde.php
@@ -350,7 +350,7 @@
         // To get started quickly, you can uncomment the defaults here.
         // See the documentation link above for more information.
         'custom' => [
-            // NavItem::forLink('https://github.com/hydephp/hyde', 'GitHub', 200),
+            // NavigationItem::forLink('https://github.com/hydephp/hyde', 'GitHub', 200),
         ],
 
         // How should pages in subdirectories be displayed in the menu?
diff --git a/packages/framework/resources/views/layouts/navigation.blade.php b/packages/framework/resources/views/layouts/navigation.blade.php
index a55e64b5ea1..65b50f43bf0 100644
--- a/packages/framework/resources/views/layouts/navigation.blade.php
+++ b/packages/framework/resources/views/layouts/navigation.blade.php
@@ -17,13 +17,15 @@
             <svg x-show="! navigationOpen" title="Open Navigation Menu" class="dark:fill-gray-200"
                  style="display: block;"
                  id="open-main-navigation-menu-icon" xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 0 24 24"
-                 width="24"><title>Open Menu</title>
+                 width="24">
+                <title>Open Menu</title>
                 <path d="M0 0h24v24H0z" fill="none"/>
                 <path d="M3 18h18v-2H3v2zm0-5h18v-2H3v2zm0-7v2h18V6H3z"/>
             </svg>
             <svg x-show="navigationOpen" title="Close Navigation Menu" class="dark:fill-gray-200" style="display: none;"
                  id="close-main-navigation-menu-icon" xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 0 24 24"
-                 width="24"><title>Close Menu</title>
+                 width="24">
+                <title>Close Menu</title>
                 <path d="M0 0h24v24H0z" fill="none"></path>
                 <path d="M19 6.41L17.59 5 12 10.59 6.41 5 5 6.41 10.59 12 5 17.59 6.41 19 12 13.41 17.59 19 19 17.59 13.41 12z"></path>
             </svg>
diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index c8bc17c9340..73a1300e338 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -56,7 +56,7 @@ public function isCollapsible(): bool
 
     public function hasGroups(): bool
     {
-        return $this->getItems()->contains(fn (NavItem $item): bool => $item instanceof NavGroupItem);
+        return $this->getItems()->contains(fn (NavigationItem $item): bool => $item instanceof NavGroupItem);
     }
 
     /**
@@ -66,11 +66,11 @@ public function hasGroups(): bool
      *
      * For index pages, this will also return true for the first group in the menu, unless the index page has a specific group set.
      *
-     * We have this logic here because not all NavItem instances belong to sidebars, and we need data from both.
+     * We have this logic here because not all NavigationItem instances belong to sidebars, and we need data from both.
      */
     public function isGroupActive(string $group): bool
     {
-        $groupMatchesCurrentPageGroup = NavItem::normalizeGroupKey(Render::getPage()->navigationMenuGroup()) === $group;
+        $groupMatchesCurrentPageGroup = NavigationItem::normalizeGroupKey(Render::getPage()->navigationMenuGroup()) === $group;
 
         if ($this->isCurrentPageIndexPage()) {
             return $this->shouldIndexPageBeActive($group) || $groupMatchesCurrentPageGroup;
diff --git a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
index 72bd92a3ac8..78f41e30440 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
@@ -15,9 +15,9 @@
  *
  * @todo Consider extracting trait for shared code with navigation menu class
  */
-class NavGroupItem extends NavItem
+class NavGroupItem extends NavigationItem
 {
-    /** @var array<\Hyde\Framework\Features\Navigation\NavItem> */
+    /** @var array<\Hyde\Framework\Features\Navigation\NavigationItem> */
     protected array $items = [];
 
     public function __construct(string $label, array $items = [], int $priority = NavigationMenu::LAST)
@@ -32,7 +32,7 @@ public function __construct(string $label, array $items = [], int $priority = Na
      *
      * For the main navigation menu, this stores any dropdown items.
      *
-     * @return array<\Hyde\Framework\Features\Navigation\NavItem>
+     * @return array<\Hyde\Framework\Features\Navigation\NavigationItem>
      */
     public function getItems(): array
     {
@@ -42,7 +42,7 @@ public function getItems(): array
     /**
      * Add a navigation item to the grouped navigation item.
      */
-    public function addItem(NavItem $item): static
+    public function addItem(NavigationItem $item): static
     {
         $item->group ??= $this->group;
 
@@ -54,7 +54,7 @@ public function addItem(NavItem $item): static
     /**
      * Add multiple navigation items to the grouped navigation item.
      *
-     * @param  array<\Hyde\Framework\Features\Navigation\NavItem>  $items
+     * @param  array<\Hyde\Framework\Features\Navigation\NavigationItem>  $items
      */
     public function addItems(array $items): static
     {
@@ -73,7 +73,7 @@ public function addItems(array $items): static
     public function getPriority(): int
     {
         if ($this->containsOnlyDocumentationPages()) {
-            return min($this->priority, collect($this->getItems())->min(fn (NavItem $child): int => $child->getPriority()));
+            return min($this->priority, collect($this->getItems())->min(fn (NavigationItem $child): int => $child->getPriority()));
         }
 
         return parent::getPriority();
@@ -85,7 +85,7 @@ protected function containsOnlyDocumentationPages(): bool
             return false;
         }
 
-        return collect($this->getItems())->every(function (NavItem $child): bool {
+        return collect($this->getItems())->every(function (NavigationItem $child): bool {
             return (! $child->getRoute() instanceof ExternalRoute) && $child->getRoute()->getPage() instanceof DocumentationPage;
         });
     }
diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
similarity index 93%
rename from packages/framework/src/Framework/Features/Navigation/NavItem.php
rename to packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index b6e4eec5ffa..c5c38c09227 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -18,10 +18,10 @@
  *
  * You have a few options to construct a navigation menu item:
  *   1. You can supply a Route directly and explicit properties to the constructor
- *   2. You can use NavItem::fromRoute() to use data from the route
- *   3. You can use NavItem::forLink() for an external or un-routed link
+ *   2. You can use NavigationItem::fromRoute() to use data from the route
+ *   3. You can use NavigationItem::forLink() for an external or un-routed link
  */
-class NavItem implements Stringable
+class NavigationItem implements Stringable
 {
     protected ?Route $route;
     protected string $label;
@@ -83,7 +83,7 @@ public static function forLink(string $href, string $label, int $priority = Navi
      * Create a new dropdown navigation menu item.
      *
      * @param  string  $label  The label of the dropdown item.
-     * @param  array<NavItem>  $items  The items to be included in the dropdown.
+     * @param  array<NavigationItem>  $items  The items to be included in the dropdown.
      * @param  int  $priority  The priority of the dropdown item. Leave blank to use the default priority, which is last in the menu.
      */
     public static function forGroup(string $label, array $items, int $priority = NavigationMenu::LAST): NavGroupItem
@@ -145,7 +145,7 @@ public function getGroupKey(): ?string
     }
 
     /**
-     * Check if the NavItem instance is the current page being rendered.
+     * Check if the NavigationItem instance is the current page being rendered.
      */
     public function isActive(): bool
     {
diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
index 979b952b95c..6876e1c003f 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
@@ -20,7 +20,7 @@ abstract class NavigationMenu
     public const DEFAULT = 500;
     public const LAST = 999;
 
-    /** @var \Illuminate\Support\Collection<\Hyde\Framework\Features\Navigation\NavItem> */
+    /** @var \Illuminate\Support\Collection<\Hyde\Framework\Features\Navigation\NavigationItem> */
     protected Collection $items;
 
     public function __construct(Arrayable|array $items = [])
@@ -41,7 +41,7 @@ public function __construct(Arrayable|array $items = [])
      *
      * Items are automatically sorted by their priority, falling back to the order they were added.
      *
-     * @return \Illuminate\Support\Collection<\Hyde\Framework\Features\Navigation\NavItem>
+     * @return \Illuminate\Support\Collection<\Hyde\Framework\Features\Navigation\NavigationItem>
      */
     public function getItems(): Collection
     {
@@ -49,13 +49,13 @@ public function getItems(): Collection
         // so any sorting we do in generator actions will only be partial. This way, we can ensure
         // that the items are always freshly sorted by their priorities when they are retrieved.
 
-        return $this->items->sortBy(fn (NavItem $item) => $item->getPriority())->values();
+        return $this->items->sortBy(fn (NavigationItem $item) => $item->getPriority())->values();
     }
 
     /**
      * Add a navigation item to the navigation menu.
      */
-    public function add(NavItem $item): void
+    public function add(NavigationItem $item): void
     {
         $this->items->push($item);
     }
diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
index 5aacd70441e..fa15161c649 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
@@ -24,7 +24,7 @@
  */
 class NavigationMenuGenerator
 {
-    /** @var \Illuminate\Support\Collection<string, \Hyde\Framework\Features\Navigation\NavItem> */
+    /** @var \Illuminate\Support\Collection<string, \Hyde\Framework\Features\Navigation\NavigationItem> */
     protected Collection $items;
 
     /** @var \Hyde\Foundation\Kernel\RouteCollection<string, \Hyde\Support\Models\Route> */
@@ -71,7 +71,7 @@ protected function generate(): void
                 if ($this->canGroupRoute($route)) {
                     $this->addRouteToGroup($route);
                 } else {
-                    $this->items->put($route->getRouteKey(), NavItem::forRoute($route));
+                    $this->items->put($route->getRouteKey(), NavigationItem::forRoute($route));
                 }
             }
         });
@@ -79,10 +79,10 @@ protected function generate(): void
         if ($this->generatesSidebar) {
             // If there are no pages other than the index page, we add it to the sidebar so that it's not empty
             if ($this->items->count() === 0 && DocumentationPage::home() !== null) {
-                $this->items->push(NavItem::forRoute(DocumentationPage::home()));
+                $this->items->push(NavigationItem::forRoute(DocumentationPage::home()));
             }
         } else {
-            collect(Config::getArray('hyde.navigation.custom', []))->each(function (NavItem $item): void {
+            collect(Config::getArray('hyde.navigation.custom', []))->each(function (NavigationItem $item): void {
                 // Since these were added explicitly by the user, we can assume they should always be shown
                 $this->items->push($item);
             });
@@ -133,7 +133,7 @@ protected function canGroupRoute(Route $route): bool
 
     protected function addRouteToGroup(Route $route): void
     {
-        $item = NavItem::forRoute($route);
+        $item = NavigationItem::forRoute($route);
 
         $groupName = $this->generatesSidebar ? ($item->getGroupKey() ?? 'Other') : $item->getGroupKey();
 
@@ -153,7 +153,7 @@ protected function getOrCreateGroupItem(string $groupName): NavGroupItem
 
         if ($group instanceof NavGroupItem) {
             return $group;
-        } elseif ($group instanceof NavItem) {
+        } elseif ($group instanceof NavigationItem) {
             // We are trying to add children to an existing navigation menu item,
             // so here we create a new instance to replace the base one, this
             // does mean we lose the destination as we can't link to them.
@@ -177,7 +177,7 @@ protected function createGroupItem(string $groupKey, string $groupName): NavGrou
 
         $priority = $this->searchForGroupPriorityInConfig($groupKey);
 
-        return NavItem::forGroup($this->normalizeGroupLabel($label), [], $priority ?? NavigationMenu::LAST);
+        return NavigationItem::forGroup($this->normalizeGroupLabel($label), [], $priority ?? NavigationMenu::LAST);
     }
 
     protected function normalizeGroupLabel(string $label): string
diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index fa018501b9e..844c05ad9f2 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -17,7 +17,7 @@
 use Hyde\Support\Models\Redirect;
 use Illuminate\Support\Collection;
 use Hyde\Foundation\Kernel\RouteCollection;
-use Hyde\Framework\Features\Navigation\NavItem;
+use Hyde\Framework\Features\Navigation\NavigationItem;
 use Hyde\Framework\Features\Navigation\NavGroupItem;
 use Hyde\Framework\Features\Navigation\MainNavigationMenu;
 use Hyde\Framework\Features\Navigation\DocumentationSidebar;
@@ -33,7 +33,7 @@
  * @covers \Hyde\Framework\Features\Navigation\DocumentationSidebar
  * @covers \Hyde\Framework\Features\Navigation\MainNavigationMenu
  * @covers \Hyde\Framework\Features\Navigation\NavigationMenu
- * @covers \Hyde\Framework\Features\Navigation\NavItem
+ * @covers \Hyde\Framework\Features\Navigation\NavigationItem
  */
 class AutomaticNavigationConfigurationsTest extends TestCase
 {
@@ -1281,7 +1281,7 @@ protected function sidebar(?array $withPages = null): AssertableNavigationMenu
     }
 }
 
-class TestNavItem
+class TestNavigationItem
 {
     public readonly string $label;
     public readonly ?string $group;
@@ -1293,7 +1293,7 @@ public function __construct(string $label, ?string $group, int $priority, array
         $this->label = $label;
         $this->group = $group;
         $this->priority = $priority;
-        $this->children = collect($children)->map(fn (NavItem $child) => $child->getLabel())->toArray();
+        $this->children = collect($children)->map(fn (NavigationItem $child) => $child->getLabel())->toArray();
     }
 
     public static function properties(): array
@@ -1319,12 +1319,12 @@ public function __construct(TestCase $test, $sidebar = false)
     /** A simplified serialized format for comparisons */
     public function state(): array
     {
-        return $this->items->map(function (NavItem $item): TestNavItem {
-            return new TestNavItem($item->getLabel(), $item->getGroupKey(), $item->getPriority(), $item instanceof NavGroupItem ? $item->getItems() : []);
+        return $this->items->map(function (NavigationItem $item): TestNavigationItem {
+            return new TestNavigationItem($item->getLabel(), $item->getGroupKey(), $item->getPriority(), $item instanceof NavGroupItem ? $item->getItems() : []);
         })->toArray();
     }
 
-    public function getState(int $index): ?TestNavItem
+    public function getState(int $index): ?TestNavigationItem
     {
         return $this->state()[$index] ?? null;
     }
@@ -1345,7 +1345,7 @@ public function assertEquals(array $expected, bool $strict = false): static
                 $item = ['label' => $item];
             }
 
-            foreach (TestNavItem::properties() as $property) {
+            foreach (TestNavigationItem::properties() as $property) {
                 if ($this->getState($index) !== null) {
                     if (isset($item[$property])) {
                         $a = $item[$property];
diff --git a/packages/framework/tests/Feature/NavigationMenuTest.php b/packages/framework/tests/Feature/NavigationMenuTest.php
index 2bd704cc40e..bfe6d4a7435 100644
--- a/packages/framework/tests/Feature/NavigationMenuTest.php
+++ b/packages/framework/tests/Feature/NavigationMenuTest.php
@@ -9,7 +9,7 @@
 use Hyde\Foundation\Facades\Routes;
 use Hyde\Support\Models\ExternalRoute;
 use Hyde\Framework\Features\Navigation\MainNavigationMenu;
-use Hyde\Framework\Features\Navigation\NavItem;
+use Hyde\Framework\Features\Navigation\NavigationItem;
 use Hyde\Pages\MarkdownPage;
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Collection;
@@ -29,16 +29,16 @@ public function testConstructor()
         $this->assertInstanceOf(MainNavigationMenu::class, $this->createNavigationMenu());
     }
 
-    public function testGenerateMethodCreatesCollectionOfNavItems()
+    public function testGenerateMethodCreatesCollectionOfNavigationItems()
     {
         $this->assertInstanceOf(Collection::class, $this->createNavigationMenu()->getItems());
-        $this->assertContainsOnlyInstancesOf(NavItem::class, $this->createNavigationMenu()->getItems());
+        $this->assertContainsOnlyInstancesOf(NavigationItem::class, $this->createNavigationMenu()->getItems());
     }
 
     public function testGetItemsReturnsItems()
     {
         $this->assertEquals(collect([
-            NavItem::forRoute(Routes::get('index')),
+            NavigationItem::forRoute(Routes::get('index')),
         ]), $this->createNavigationMenu()->getItems());
     }
 
@@ -67,9 +67,9 @@ public function testCreatedCollectionIsSortedByNavigationMenuPriority()
         $menu = $this->createNavigationMenu();
 
         $expected = collect([
-            NavItem::forRoute(Routes::get('index')),
-            NavItem::forRoute(Routes::get('foo')),
-            NavItem::forRoute(Routes::get('docs/index')),
+            NavigationItem::forRoute(Routes::get('index')),
+            NavigationItem::forRoute(Routes::get('foo')),
+            NavigationItem::forRoute(Routes::get('docs/index')),
         ]);
 
         $this->assertCount(count($expected), $menu->getItems());
@@ -83,8 +83,8 @@ public function testIsSortedAutomaticallyWhenUsingNavigationMenuCreate()
         $menu = $this->createNavigationMenu();
 
         $expected = collect([
-            NavItem::forRoute(Routes::get('index')),
-            NavItem::forRoute(Routes::get('foo')),
+            NavigationItem::forRoute(Routes::get('index')),
+            NavigationItem::forRoute(Routes::get('foo')),
         ]);
 
         $this->assertCount(count($expected), $menu->getItems());
@@ -93,13 +93,13 @@ public function testIsSortedAutomaticallyWhenUsingNavigationMenuCreate()
 
     public function testExternalLinkCanBeAddedInConfig()
     {
-        config(['hyde.navigation.custom' => [NavItem::forLink('https://example.com', 'foo')]]);
+        config(['hyde.navigation.custom' => [NavigationItem::forLink('https://example.com', 'foo')]]);
 
         $menu = $this->createNavigationMenu();
 
         $expected = collect([
-            NavItem::forRoute(Routes::get('index')),
-            NavItem::forLink('https://example.com', 'foo'),
+            NavigationItem::forRoute(Routes::get('index')),
+            NavigationItem::forLink('https://example.com', 'foo'),
         ]);
 
         $this->assertCount(count($expected), $menu->getItems());
@@ -108,13 +108,13 @@ public function testExternalLinkCanBeAddedInConfig()
 
     public function testPathLinkCanBeAddedInConfig()
     {
-        config(['hyde.navigation.custom' => [NavItem::forLink('foo', 'foo')]]);
+        config(['hyde.navigation.custom' => [NavigationItem::forLink('foo', 'foo')]]);
 
         $menu = $this->createNavigationMenu();
 
         $expected = collect([
-            NavItem::forRoute(Routes::get('index')),
-            NavItem::forLink('foo', 'foo'),
+            NavigationItem::forRoute(Routes::get('index')),
+            NavigationItem::forLink('foo', 'foo'),
         ]);
 
         $this->assertCount(count($expected), $menu->getItems());
@@ -124,16 +124,16 @@ public function testPathLinkCanBeAddedInConfig()
     public function testDuplicatesAreNotRemovedWhenAddingInConfig()
     {
         config(['hyde.navigation.custom' => [
-            NavItem::forLink('foo', 'foo'),
-            NavItem::forLink('foo', 'foo'),
+            NavigationItem::forLink('foo', 'foo'),
+            NavigationItem::forLink('foo', 'foo'),
         ]]);
 
         $menu = $this->createNavigationMenu();
 
         $expected = collect([
-            NavItem::forRoute(Routes::get('index')),
-            NavItem::forLink('foo', 'foo'),
-            NavItem::forLink('foo', 'foo'),
+            NavigationItem::forRoute(Routes::get('index')),
+            NavigationItem::forLink('foo', 'foo'),
+            NavigationItem::forLink('foo', 'foo'),
         ]);
 
         $this->assertCount(count($expected), $menu->getItems());
@@ -143,16 +143,16 @@ public function testDuplicatesAreNotRemovedWhenAddingInConfig()
     public function testDuplicatesAreNotRemovedWhenAddingInConfigRegardlessOfDestination()
     {
         config(['hyde.navigation.custom' => [
-            NavItem::forLink('foo', 'foo'),
-            NavItem::forLink('bar', 'foo'),
+            NavigationItem::forLink('foo', 'foo'),
+            NavigationItem::forLink('bar', 'foo'),
         ]]);
 
         $menu = $this->createNavigationMenu();
 
         $expected = collect([
-            NavItem::forRoute(Routes::get('index')),
-            NavItem::forLink('foo', 'foo'),
-            NavItem::forLink('bar', 'foo'),
+            NavigationItem::forRoute(Routes::get('index')),
+            NavigationItem::forLink('foo', 'foo'),
+            NavigationItem::forLink('bar', 'foo'),
         ]);
 
         $this->assertCount(count($expected), $menu->getItems());
@@ -163,14 +163,14 @@ public function testConfigItemsTakePrecedenceOverGeneratedItems()
     {
         $this->file('_pages/foo.md');
 
-        config(['hyde.navigation.custom' => [NavItem::forLink('bar', 'Foo')]]);
+        config(['hyde.navigation.custom' => [NavigationItem::forLink('bar', 'Foo')]]);
 
         $menu = $this->createNavigationMenu();
 
         $expected = collect([
-            NavItem::forRoute(Routes::get('index')),
-            NavItem::forLink('bar', 'Foo'),
-            NavItem::forRoute(Routes::get('foo')),
+            NavigationItem::forRoute(Routes::get('index')),
+            NavigationItem::forLink('bar', 'Foo'),
+            NavigationItem::forRoute(Routes::get('foo')),
         ]);
 
         $this->assertCount(count($expected), $menu->getItems());
@@ -185,8 +185,8 @@ public function testDocumentationPagesThatAreNotIndexAreNotAddedToTheMenu()
         $menu = $this->createNavigationMenu();
 
         $expected = collect([
-            NavItem::forRoute(Routes::get('index')),
-            NavItem::forRoute(Routes::get('docs/index')),
+            NavigationItem::forRoute(Routes::get('index')),
+            NavigationItem::forRoute(Routes::get('docs/index')),
         ]);
 
         $this->assertCount(count($expected), $menu->getItems());
@@ -199,7 +199,7 @@ public function testPagesInSubdirectoriesAreNotAddedToTheNavigationMenu()
         $this->file('_pages/foo/bar.md');
 
         $menu = $this->createNavigationMenu();
-        $expected = collect([NavItem::forRoute(Routes::get('index'))]);
+        $expected = collect([NavigationItem::forRoute(Routes::get('index'))]);
 
         $this->assertCount(count($expected), $menu->getItems());
         $this->assertEquals($expected, $menu->getItems());
@@ -213,8 +213,8 @@ public function testPagesInSubdirectoriesCanBeAddedToTheNavigationMenuWithConfig
 
         $menu = $this->createNavigationMenu();
         $expected = collect([
-            NavItem::forRoute(Routes::get('index')),
-            NavItem::forRoute(Routes::get('foo/bar')),
+            NavigationItem::forRoute(Routes::get('index')),
+            NavigationItem::forRoute(Routes::get('foo/bar')),
         ]);
 
         $this->assertCount(count($expected), $menu->getItems());
@@ -229,9 +229,9 @@ public function testPagesInSubdirectoriesAreNotAddedToTheNavigationMenuWithConfi
 
         $menu = $this->createNavigationMenu();
         $expected = collect([
-            NavItem::forRoute(Routes::get('index')),
-            NavItem::forGroup('Foo', [
-                NavItem::forRoute(Routes::get('foo/bar')),
+            NavigationItem::forRoute(Routes::get('index')),
+            NavigationItem::forGroup('Foo', [
+                NavigationItem::forRoute(Routes::get('foo/bar')),
             ]),
         ]);
 
@@ -249,10 +249,10 @@ public function testPagesInDropdownsDoNotGetAddedToTheMainNavigation()
 
         $this->assertCount(3, $menu->getItems());
         $this->assertEquals([
-            NavItem::forRoute(Routes::get('index')),
-            NavItem::forRoute((new MarkdownPage('foo'))->getRoute()),
-            NavItem::forGroup('Bar', [
-                NavItem::forRoute((new MarkdownPage('bar/baz'))->getRoute()),
+            NavigationItem::forRoute(Routes::get('index')),
+            NavigationItem::forRoute((new MarkdownPage('foo'))->getRoute()),
+            NavigationItem::forGroup('Bar', [
+                NavigationItem::forRoute((new MarkdownPage('bar/baz'))->getRoute()),
             ]),
         ], $menu->getItems()->all());
     }
@@ -267,7 +267,7 @@ public function testCanAddItemsToMainNavigationMenuResolvedFromContainer()
         Hyde::boot();
 
         $navigation = app('navigation.main');
-        $navigation->add(new NavItem(new ExternalRoute('/foo'), 'Foo'));
+        $navigation->add(new NavigationItem(new ExternalRoute('/foo'), 'Foo'));
 
         $this->assertCount(2, $navigation->getItems());
         $this->assertSame('Foo', $navigation->getItems()->last()->getLabel());
diff --git a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
index 01aa15b3430..f5bbafa28ef 100644
--- a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
+++ b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
@@ -8,7 +8,7 @@
 use Hyde\Foundation\Facades\Routes;
 use Hyde\Framework\Actions\ConvertsArrayToFrontMatter;
 use Hyde\Framework\Features\Navigation\DocumentationSidebar;
-use Hyde\Framework\Features\Navigation\NavItem;
+use Hyde\Framework\Features\Navigation\NavigationItem;
 use Hyde\Hyde;
 use Hyde\Pages\DocumentationPage;
 use Hyde\Support\Facades\Render;
@@ -23,7 +23,7 @@
  * @covers \Hyde\Framework\Features\Navigation\NavigationMenu
  * @covers \Hyde\Framework\Factories\Concerns\HasFactory
  * @covers \Hyde\Framework\Factories\NavigationDataFactory
- * @covers \Hyde\Framework\Features\Navigation\NavItem
+ * @covers \Hyde\Framework\Features\Navigation\NavigationItem
  *
  * @see \Hyde\Framework\Testing\Unit\DocumentationSidebarUnitTest
  */
@@ -86,9 +86,9 @@ public function testSidebarIsOrderedAlphabeticallyWhenNoOrderIsSetInConfig()
 
         $this->assertEquals(
             collect([
-                NavItem::forRoute(Routes::get('docs/a'), priority: 999),
-                NavItem::forRoute(Routes::get('docs/b'), priority: 999),
-                NavItem::forRoute(Routes::get('docs/c'), priority: 999),
+                NavigationItem::forRoute(Routes::get('docs/a'), priority: 999),
+                NavigationItem::forRoute(Routes::get('docs/b'), priority: 999),
+                NavigationItem::forRoute(Routes::get('docs/c'), priority: 999),
             ]),
             NavigationMenuGenerator::handle(DocumentationSidebar::class)->getItems()
         );
@@ -107,9 +107,9 @@ public function testSidebarIsOrderedByPriorityWhenPriorityIsSetInConfig()
 
         $this->assertEquals(
             collect([
-                NavItem::forRoute(Routes::get('docs/c'), priority: 250 + 250),
-                NavItem::forRoute(Routes::get('docs/b'), priority: 250 + 251),
-                NavItem::forRoute(Routes::get('docs/a'), priority: 250 + 252),
+                NavigationItem::forRoute(Routes::get('docs/c'), priority: 250 + 250),
+                NavigationItem::forRoute(Routes::get('docs/b'), priority: 250 + 251),
+                NavigationItem::forRoute(Routes::get('docs/a'), priority: 250 + 252),
             ]),
             NavigationMenuGenerator::handle(DocumentationSidebar::class)->getItems()
         );
@@ -146,9 +146,9 @@ public function testSidebarPrioritiesCanBeSetInBothFrontMatterAndConfig()
 
         $this->assertEquals(
             collect([
-                NavItem::forRoute(Routes::get('docs/first'), priority: 250 + 250),
-                NavItem::forRoute(Routes::get('docs/second'), priority: 250 + 252),
-                NavItem::forRoute(Routes::get('docs/third'), priority: 250 + 300),
+                NavigationItem::forRoute(Routes::get('docs/first'), priority: 250 + 250),
+                NavigationItem::forRoute(Routes::get('docs/second'), priority: 250 + 252),
+                NavigationItem::forRoute(Routes::get('docs/third'), priority: 250 + 300),
             ]),
             NavigationMenuGenerator::handle(DocumentationSidebar::class)->getItems()
         );
@@ -195,7 +195,7 @@ public function testGetItemsInGroupDoesNotIncludeDocsIndex()
         Filesystem::touch('_docs/index.md');
 
         $this->assertEquals(
-            collect([NavItem::forRoute(Routes::get('docs/foo'), priority: 999)]),
+            collect([NavigationItem::forRoute(Routes::get('docs/foo'), priority: 999)]),
             NavigationMenuGenerator::handle(DocumentationSidebar::class)->getItems()
         );
     }
@@ -267,11 +267,11 @@ public function testCanHaveMultipleGroupedPagesWithTheSameNameLabels()
 
         $this->assertEquals(
             collect([
-                NavItem::forGroup('Bar', [
-                    NavItem::forRoute(Routes::get('docs/bar'), priority: 999),
+                NavigationItem::forGroup('Bar', [
+                    NavigationItem::forRoute(Routes::get('docs/bar'), priority: 999),
                 ]),
-                NavItem::forGroup('Foo', [
-                    NavItem::forRoute(Routes::get('docs/foo'), priority: 999),
+                NavigationItem::forGroup('Foo', [
+                    NavigationItem::forRoute(Routes::get('docs/foo'), priority: 999),
                 ]),
             ]),
             $sidebar->getItems()
@@ -288,9 +288,9 @@ public function testDuplicateLabelsWithinTheSameGroupAreNotRemoved()
 
         $this->assertEquals(
             collect([
-                NavItem::forGroup('Foo', [
-                    NavItem::forRoute(Routes::get('docs/bar'), priority: 999),
-                    NavItem::forRoute(Routes::get('docs/foo'), priority: 999),
+                NavigationItem::forGroup('Foo', [
+                    NavigationItem::forRoute(Routes::get('docs/bar'), priority: 999),
+                    NavigationItem::forRoute(Routes::get('docs/foo'), priority: 999),
                 ]),
             ]),
             $sidebar->getItems()
@@ -312,7 +312,7 @@ public function testIndexPageAddedToSidebarWhenItIsTheOnlyPage()
 
         $this->assertCount(1, $sidebar->getItems());
         $this->assertEquals(
-            collect([NavItem::forRoute(Routes::get('docs/index'))]),
+            collect([NavigationItem::forRoute(Routes::get('docs/index'))]),
             $sidebar->getItems()
         );
     }
@@ -325,7 +325,7 @@ public function testIndexPageNotAddedToSidebarWhenOtherPagesExist()
 
         $this->assertCount(1, $sidebar->getItems());
         $this->assertEquals(
-            collect([NavItem::forRoute(Routes::get('docs/test-0'))]),
+            collect([NavigationItem::forRoute(Routes::get('docs/test-0'))]),
             $sidebar->getItems()
         );
     }
diff --git a/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php b/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
index c74453e4ba5..b4c88dbb64b 100644
--- a/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
+++ b/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
@@ -7,7 +7,7 @@
 use Hyde\Testing\UnitTestCase;
 use Illuminate\Support\Collection;
 use Hyde\Support\Models\ExternalRoute;
-use Hyde\Framework\Features\Navigation\NavItem;
+use Hyde\Framework\Features\Navigation\NavigationItem;
 use Hyde\Framework\Features\Navigation\NavGroupItem;
 use Hyde\Framework\Features\Navigation\DocumentationSidebar;
 
@@ -225,8 +225,8 @@ protected function getItems(): array
         ];
     }
 
-    protected function item(string $destination, string $label, int $priority = 500): NavItem
+    protected function item(string $destination, string $label, int $priority = 500): NavigationItem
     {
-        return new NavItem(new ExternalRoute($destination), $label, $priority);
+        return new NavigationItem(new ExternalRoute($destination), $label, $priority);
     }
 }
diff --git a/packages/framework/tests/Unit/NavGroupItemTest.php b/packages/framework/tests/Unit/NavGroupItemTest.php
index c76f37aa346..2f98bb102f9 100644
--- a/packages/framework/tests/Unit/NavGroupItemTest.php
+++ b/packages/framework/tests/Unit/NavGroupItemTest.php
@@ -10,7 +10,7 @@
 use Hyde\Support\Models\Route;
 use Hyde\Pages\DocumentationPage;
 use Hyde\Foundation\HydeCoreExtension;
-use Hyde\Framework\Features\Navigation\NavItem;
+use Hyde\Framework\Features\Navigation\NavigationItem;
 use Hyde\Framework\Features\Navigation\NavGroupItem;
 
 /**
@@ -46,7 +46,7 @@ public function testDestinationIsAlwaysNull()
 
     public function testCanConstructWithChildren()
     {
-        $children = $this->createNavItems();
+        $children = $this->createNavigationItems();
         $item = new NavGroupItem('Foo', $children);
 
         $this->assertCount(2, $item->getItems());
@@ -55,7 +55,7 @@ public function testCanConstructWithChildren()
 
     public function testCanConstructWithChildrenWithoutRoute()
     {
-        $children = $this->createNavItems();
+        $children = $this->createNavigationItems();
         $item = new NavGroupItem('Foo', $children);
 
         $this->assertCount(2, $item->getItems());
@@ -64,7 +64,7 @@ public function testCanConstructWithChildrenWithoutRoute()
 
     public function testGetItems()
     {
-        $children = $this->createNavItems();
+        $children = $this->createNavigationItems();
         $item = new NavGroupItem('Foo', $children);
 
         $this->assertSame($children, $item->getItems());
@@ -78,7 +78,7 @@ public function testGetItemsWithNoItems()
     public function testCanAddItemToDropdown()
     {
         $group = new NavGroupItem('Foo');
-        $child = new NavItem(new Route(new MarkdownPage()), 'Bar');
+        $child = new NavigationItem(new Route(new MarkdownPage()), 'Bar');
 
         $this->assertSame([$child], $group->addItem($child)->getItems());
     }
@@ -86,7 +86,7 @@ public function testCanAddItemToDropdown()
     public function testAddChildMethodReturnsSelf()
     {
         $group = new NavGroupItem('Foo');
-        $child = new NavItem(new Route(new MarkdownPage()), 'Bar');
+        $child = new NavigationItem(new Route(new MarkdownPage()), 'Bar');
 
         $this->assertSame($group, $group->addItem($child));
     }
@@ -94,7 +94,7 @@ public function testAddChildMethodReturnsSelf()
     public function testCanAddMultipleItemsToDropdown()
     {
         $group = new NavGroupItem('Foo');
-        $items = $this->createNavItems();
+        $items = $this->createNavigationItems();
 
         $this->assertSame($items, $group->addItems($items)->getItems());
     }
@@ -109,7 +109,7 @@ public function testAddChildrenMethodReturnsSelf()
     public function testAddingAnItemWithAGroupKeyKeepsTheSetGroupKey()
     {
         $group = new NavGroupItem('Foo');
-        $child = new NavItem(new Route(new MarkdownPage()), 'Child', group: 'bar');
+        $child = new NavigationItem(new Route(new MarkdownPage()), 'Child', group: 'bar');
 
         $group->addItem($child);
 
@@ -120,7 +120,7 @@ public function testAddingAnItemWithAGroupKeyKeepsTheSetGroupKey()
     public function testAddingAnItemWithNoGroupKeyUsesGroupIdentifier()
     {
         $group = new NavGroupItem('Foo');
-        $child = new NavItem(new Route(new MarkdownPage()), 'Bar');
+        $child = new NavigationItem(new Route(new MarkdownPage()), 'Bar');
 
         $group->addItem($child);
 
@@ -140,7 +140,7 @@ public function testGetPriorityWithNoChildrenUsesGroupPriority()
 
     public function testGetPriorityWithChildrenUsesGroupPriority()
     {
-        $group = new NavGroupItem('Foo', [new NavItem(new Route(new MarkdownPage()), 'Bar', 100)]);
+        $group = new NavGroupItem('Foo', [new NavigationItem(new Route(new MarkdownPage()), 'Bar', 100)]);
 
         $this->assertSame(999, $group->getPriority());
     }
@@ -148,9 +148,9 @@ public function testGetPriorityWithChildrenUsesGroupPriority()
     public function testGetPriorityWithDocumentationPageChildrenUsesLowestPriority()
     {
         $items = [
-            new NavItem(new Route(new DocumentationPage()), 'Foo', 100),
-            new NavItem(new Route(new DocumentationPage()), 'Bar', 200),
-            new NavItem(new Route(new DocumentationPage()), 'Baz', 300),
+            new NavigationItem(new Route(new DocumentationPage()), 'Foo', 100),
+            new NavigationItem(new Route(new DocumentationPage()), 'Bar', 200),
+            new NavigationItem(new Route(new DocumentationPage()), 'Baz', 300),
         ];
 
         $this->assertSame(100, (new NavGroupItem('Foo', $items))->getPriority());
@@ -162,7 +162,7 @@ public function testGetPriorityUsesGroupPriorityForMixedChildTypes()
         $group = new NavGroupItem('Foo');
 
         foreach (HydeCoreExtension::getPageClasses() as $type) {
-            $child = new NavItem(new Route(new $type()), 'Bar', 100);
+            $child = new NavigationItem(new Route(new $type()), 'Bar', 100);
             $group->addItem($child);
         }
 
@@ -171,37 +171,37 @@ public function testGetPriorityUsesGroupPriorityForMixedChildTypes()
 
     public function testGetPriorityHandlesStringUrlChildGracefully()
     {
-        $this->assertSame(999, (new NavGroupItem('Foo', [new NavItem('foo', 'Bar', 100)]))->getPriority());
+        $this->assertSame(999, (new NavGroupItem('Foo', [new NavigationItem('foo', 'Bar', 100)]))->getPriority());
     }
 
     public function testGetPriorityHandlesExternalUrlChildGracefully()
     {
-        $this->assertSame(999, (new NavGroupItem('Foo', [new NavItem('https://example.com', 'Bar', 100)]))->getPriority());
+        $this->assertSame(999, (new NavGroupItem('Foo', [new NavigationItem('https://example.com', 'Bar', 100)]))->getPriority());
     }
 
     public function testForRoute()
     {
         $item = NavGroupItem::forRoute(new Route(new InMemoryPage('foo')));
 
-        $this->assertInstanceOf(NavItem::class, $item);
+        $this->assertInstanceOf(NavigationItem::class, $item);
         $this->assertNotInstanceOf(NavGroupItem::class, $item);
-        $this->assertSame(NavItem::class, $item::class);
+        $this->assertSame(NavigationItem::class, $item::class);
     }
 
     public function testForLink()
     {
         $item = NavGroupItem::forLink('foo', 'bar');
 
-        $this->assertInstanceOf(NavItem::class, $item);
+        $this->assertInstanceOf(NavigationItem::class, $item);
         $this->assertNotInstanceOf(NavGroupItem::class, $item);
-        $this->assertSame(NavItem::class, $item::class);
+        $this->assertSame(NavigationItem::class, $item::class);
     }
 
-    protected function createNavItems(): array
+    protected function createNavigationItems(): array
     {
         return [
-            new NavItem(new Route(new InMemoryPage('foo')), 'Foo'),
-            new NavItem(new Route(new InMemoryPage('bar')), 'Bar'),
+            new NavigationItem(new Route(new InMemoryPage('foo')), 'Foo'),
+            new NavigationItem(new Route(new InMemoryPage('bar')), 'Bar'),
         ];
     }
 }
diff --git a/packages/framework/tests/Unit/NavItemIsActiveHelperTest.php b/packages/framework/tests/Unit/NavigationItemIsActiveHelperTest.php
similarity index 65%
rename from packages/framework/tests/Unit/NavItemIsActiveHelperTest.php
rename to packages/framework/tests/Unit/NavigationItemIsActiveHelperTest.php
index bbd6d82b4d2..9e861f587a9 100644
--- a/packages/framework/tests/Unit/NavItemIsActiveHelperTest.php
+++ b/packages/framework/tests/Unit/NavigationItemIsActiveHelperTest.php
@@ -5,7 +5,7 @@
 namespace Hyde\Framework\Testing\Unit;
 
 use Hyde\Foundation\Facades\Routes;
-use Hyde\Framework\Features\Navigation\NavItem;
+use Hyde\Framework\Features\Navigation\NavigationItem;
 use Hyde\Pages\InMemoryPage;
 use Hyde\Support\Facades\Render;
 use Hyde\Support\Models\RenderData;
@@ -14,11 +14,11 @@
 use Mockery;
 
 /**
- * @covers \Hyde\Framework\Features\Navigation\NavItem
+ * @covers \Hyde\Framework\Features\Navigation\NavigationItem
  *
- * @see \Hyde\Framework\Testing\Unit\NavItemTest
+ * @see \Hyde\Framework\Testing\Unit\NavigationItemTest
  */
-class NavItemIsActiveHelperTest extends UnitTestCase
+class NavigationItemIsActiveHelperTest extends UnitTestCase
 {
     public static function setUpBeforeClass(): void
     {
@@ -34,205 +34,205 @@ protected function tearDown(): void
     public function testIsCurrent()
     {
         $this->mockRenderData($this->makeRoute('foo'));
-        $this->assertFalse(NavItem::forRoute($this->makeRoute('bar'))->isActive());
+        $this->assertFalse(NavigationItem::forRoute($this->makeRoute('bar'))->isActive());
     }
 
     public function testIsCurrentWhenCurrent()
     {
         $this->mockRenderData($this->makeRoute('foo'));
-        $this->assertTrue(NavItem::forRoute($this->makeRoute('foo'))->isActive());
+        $this->assertTrue(NavigationItem::forRoute($this->makeRoute('foo'))->isActive());
     }
 
     public function testIsCurrentUsingCurrentRoute()
     {
         $this->mockRenderData($this->makeRoute('index'));
-        $this->assertTrue(NavItem::forRoute(Routes::get('index'))->isActive());
+        $this->assertTrue(NavigationItem::forRoute(Routes::get('index'))->isActive());
     }
 
     public function testIsCurrentUsingCurrentLink()
     {
         $this->mockRenderData($this->makeRoute('index'));
-        $this->assertTrue(NavItem::forLink('index.html', 'Home')->isActive());
+        $this->assertTrue(NavigationItem::forLink('index.html', 'Home')->isActive());
     }
 
     public function testIsCurrentWhenNotCurrent()
     {
         $this->mockRenderData($this->makeRoute('foo'));
-        $this->assertFalse(NavItem::forRoute($this->makeRoute('bar'))->isActive());
+        $this->assertFalse(NavigationItem::forRoute($this->makeRoute('bar'))->isActive());
     }
 
     public function testIsCurrentUsingNotCurrentRoute()
     {
         $this->mockRenderData($this->makeRoute('foo'));
-        $this->assertFalse(NavItem::forRoute(Routes::get('index'))->isActive());
+        $this->assertFalse(NavigationItem::forRoute(Routes::get('index'))->isActive());
     }
 
     public function testIsCurrentUsingNotCurrentLink()
     {
         $this->mockRenderData($this->makeRoute('foo'));
-        $this->assertFalse(NavItem::forLink('index.html', 'Home')->isActive());
+        $this->assertFalse(NavigationItem::forLink('index.html', 'Home')->isActive());
     }
 
     public function testIsCurrentWithNestedCurrentPage()
     {
         $this->mockRenderData($this->makeRoute('foo/bar'));
-        $this->assertFalse(NavItem::forRoute($this->makeRoute('bar'))->isActive());
+        $this->assertFalse(NavigationItem::forRoute($this->makeRoute('bar'))->isActive());
     }
 
     public function testIsCurrentWhenCurrentWithNestedCurrentPage()
     {
         $this->mockRenderData($this->makeRoute('foo/bar'));
-        $this->assertTrue(NavItem::forRoute($this->makeRoute('foo/bar'))->isActive());
+        $this->assertTrue(NavigationItem::forRoute($this->makeRoute('foo/bar'))->isActive());
     }
 
     public function testIsCurrentWithNestedCurrentPageWhenNested()
     {
         $this->mockRenderData($this->makeRoute('foo/bar'));
-        $this->assertTrue(NavItem::forRoute($this->makeRoute('foo/bar'))->isActive());
+        $this->assertTrue(NavigationItem::forRoute($this->makeRoute('foo/bar'))->isActive());
     }
 
     public function testIsCurrentWhenCurrentWithNestedCurrentPageWhenNested()
     {
         $this->mockRenderData($this->makeRoute('foo/bar'));
-        $this->assertFalse(NavItem::forRoute($this->makeRoute('foo/baz'))->isActive());
+        $this->assertFalse(NavigationItem::forRoute($this->makeRoute('foo/baz'))->isActive());
     }
 
     public function testIsCurrentWithNestedCurrentPageWhenVeryNested()
     {
         $this->mockRenderData($this->makeRoute('foo/bar/baz'));
-        $this->assertTrue(NavItem::forRoute($this->makeRoute('foo/bar/baz'))->isActive());
+        $this->assertTrue(NavigationItem::forRoute($this->makeRoute('foo/bar/baz'))->isActive());
     }
 
     public function testIsCurrentWhenCurrentWithNestedCurrentPageWhenVeryNested()
     {
         $this->mockRenderData($this->makeRoute('foo/bar/baz'));
-        $this->assertFalse(NavItem::forRoute($this->makeRoute('foo/baz/bar'))->isActive());
+        $this->assertFalse(NavigationItem::forRoute($this->makeRoute('foo/baz/bar'))->isActive());
     }
 
     public function testIsCurrentWithNestedCurrentPageWhenVeryDifferingNested()
     {
         $this->mockRenderData($this->makeRoute('foo'));
-        $this->assertFalse(NavItem::forRoute($this->makeRoute('foo/bar/baz'))->isActive());
+        $this->assertFalse(NavigationItem::forRoute($this->makeRoute('foo/bar/baz'))->isActive());
     }
 
     public function testIsCurrentWithNestedCurrentPageWhenVeryDifferingNestedInverse()
     {
         $this->mockRenderData($this->makeRoute('foo/bar/baz'));
-        $this->assertFalse(NavItem::forRoute($this->makeRoute('foo'))->isActive());
+        $this->assertFalse(NavigationItem::forRoute($this->makeRoute('foo'))->isActive());
     }
 
     public function testIsCurrentUsingCurrentLinkWithNestedCurrentPage()
     {
         $this->mockRenderData($this->makeRoute('foo/bar'));
-        $this->assertFalse(NavItem::forLink('foo/bar.html', 'foo')->isActive());
+        $this->assertFalse(NavigationItem::forLink('foo/bar.html', 'foo')->isActive());
     }
 
     public function testIsCurrentUsingNotCurrentLinkWithNestedCurrentPage()
     {
         $this->mockRenderData($this->makeRoute('foo/bar'));
-        $this->assertFalse(NavItem::forLink('foo.html', 'foo')->isActive());
+        $this->assertFalse(NavigationItem::forLink('foo.html', 'foo')->isActive());
     }
 
     public function testIsCurrentWhenCurrentWithNestedCurrentPageAndSubjectPage()
     {
         $this->mockRenderData($this->makeRoute('foo/bar'));
-        $this->assertFalse(NavItem::forLink('foo/bar.html', 'foo')->isActive());
+        $this->assertFalse(NavigationItem::forLink('foo/bar.html', 'foo')->isActive());
     }
 
     public function testIsCurrentWhenNotCurrentWithNestedCurrentPageAndSubjectPage()
     {
         $this->mockRenderData($this->makeRoute('foo/bar'));
-        $this->assertFalse(NavItem::forLink('foo/baz.html', 'foo')->isActive());
+        $this->assertFalse(NavigationItem::forLink('foo/baz.html', 'foo')->isActive());
     }
 
     public function testIsCurrentWithNestedCurrentPageWhenNestedUsingLinkItem()
     {
         $this->mockRenderData($this->makeRoute('foo/bar'));
-        $this->assertFalse(NavItem::forLink('foo/bar.html', 'foo')->isActive());
+        $this->assertFalse(NavigationItem::forLink('foo/bar.html', 'foo')->isActive());
     }
 
     public function testIsCurrentWhenCurrentWithNestedCurrentPageWhenNestedUsingLinkItem()
     {
         $this->mockRenderData($this->makeRoute('foo/bar'));
-        $this->assertFalse(NavItem::forLink('foo/baz.html', 'foo')->isActive());
+        $this->assertFalse(NavigationItem::forLink('foo/baz.html', 'foo')->isActive());
     }
 
     public function testIsCurrentWithNestedCurrentPageWhenVeryNestedUsingLinkItem()
     {
         $this->mockRenderData($this->makeRoute('foo/bar/baz'));
-        $this->assertFalse(NavItem::forLink('foo/bar/baz.html', 'foo')->isActive());
+        $this->assertFalse(NavigationItem::forLink('foo/bar/baz.html', 'foo')->isActive());
     }
 
     public function testIsCurrentWhenCurrentWithNestedCurrentPageWhenVeryNestedUsingLinkItem()
     {
         $this->mockRenderData($this->makeRoute('foo/bar/baz'));
-        $this->assertFalse(NavItem::forLink('foo/baz/bar.html', 'foo')->isActive());
+        $this->assertFalse(NavigationItem::forLink('foo/baz/bar.html', 'foo')->isActive());
     }
 
     public function testIsCurrentWithNestedCurrentPageWhenVeryDifferingNestedUsingLinkItem()
     {
         $this->mockRenderData($this->makeRoute('foo'));
-        $this->assertFalse(NavItem::forLink('foo/bar/baz.html', 'foo')->isActive());
+        $this->assertFalse(NavigationItem::forLink('foo/bar/baz.html', 'foo')->isActive());
     }
 
     public function testIsCurrentWithNestedCurrentPageWhenVeryDifferingNestedInverseUsingLinkItem()
     {
         $this->mockRenderData($this->makeRoute('foo/bar/baz'));
-        $this->assertFalse(NavItem::forLink('foo.html', 'foo')->isActive());
+        $this->assertFalse(NavigationItem::forLink('foo.html', 'foo')->isActive());
     }
 
     public function testIsCurrentWithNestedCurrentPageWhenNestedUsingPrettyLinkItem()
     {
         $this->mockRenderData($this->makeRoute('foo/bar'));
-        $this->assertFalse(NavItem::forLink('foo/bar', 'foo')->isActive());
+        $this->assertFalse(NavigationItem::forLink('foo/bar', 'foo')->isActive());
     }
 
     public function testIsCurrentWhenCurrentWithNestedCurrentPageWhenNestedUsingPrettyLinkItem()
     {
         $this->mockRenderData($this->makeRoute('foo/bar'));
-        $this->assertFalse(NavItem::forLink('foo/baz', 'foo')->isActive());
+        $this->assertFalse(NavigationItem::forLink('foo/baz', 'foo')->isActive());
     }
 
     public function testIsCurrentWithNestedCurrentPageWhenVeryNestedUsingPrettyLinkItem()
     {
         $this->mockRenderData($this->makeRoute('foo/bar/baz'));
-        $this->assertFalse(NavItem::forLink('foo/bar/baz', 'foo')->isActive());
+        $this->assertFalse(NavigationItem::forLink('foo/bar/baz', 'foo')->isActive());
     }
 
     public function testIsCurrentWhenCurrentWithNestedCurrentPageWhenVeryNestedUsingPrettyLinkItem()
     {
         $this->mockRenderData($this->makeRoute('foo/bar/baz'));
-        $this->assertFalse(NavItem::forLink('foo/baz/bar', 'foo')->isActive());
+        $this->assertFalse(NavigationItem::forLink('foo/baz/bar', 'foo')->isActive());
     }
 
     public function testIsCurrentWithNestedCurrentPageWhenVeryDifferingNestedUsingPrettyLinkItem()
     {
         $this->mockRenderData($this->makeRoute('foo'));
-        $this->assertFalse(NavItem::forLink('foo/bar/baz', 'foo')->isActive());
+        $this->assertFalse(NavigationItem::forLink('foo/bar/baz', 'foo')->isActive());
     }
 
     public function testIsCurrentWithNestedCurrentPageWhenVeryDifferingNestedInverseUsingPrettyLinkItem()
     {
         $this->mockRenderData($this->makeRoute('foo/bar/baz'));
-        $this->assertFalse(NavItem::forLink('foo', 'foo')->isActive());
+        $this->assertFalse(NavigationItem::forLink('foo', 'foo')->isActive());
     }
 
     public function testIsCurrentWithAbsoluteLink()
     {
         $this->mockRenderData($this->makeRoute('foo'));
-        $this->assertFalse(NavItem::forLink('/foo', 'foo')->isActive());
+        $this->assertFalse(NavigationItem::forLink('/foo', 'foo')->isActive());
     }
 
     public function testIsCurrentWithNestedCurrentPageWhenNestedUsingAbsoluteLinkItem()
     {
         $this->mockRenderData($this->makeRoute('foo/bar'));
-        $this->assertFalse(NavItem::forLink('/foo/bar', 'foo')->isActive());
+        $this->assertFalse(NavigationItem::forLink('/foo/bar', 'foo')->isActive());
     }
 
     public function testIsCurrentWhenCurrentWithNestedCurrentPageWhenNestedUsingAbsoluteLinkItem()
     {
         $this->mockRenderData($this->makeRoute('foo/bar/baz'));
-        $this->assertFalse(NavItem::forLink('/foo/bar/baz', 'foo')->isActive());
+        $this->assertFalse(NavigationItem::forLink('/foo/bar/baz', 'foo')->isActive());
     }
 
     protected function mockRenderData(Route $route): void
diff --git a/packages/framework/tests/Unit/NavItemTest.php b/packages/framework/tests/Unit/NavigationItemTest.php
similarity index 54%
rename from packages/framework/tests/Unit/NavItemTest.php
rename to packages/framework/tests/Unit/NavigationItemTest.php
index d38214d425e..a76b0c0bbb5 100644
--- a/packages/framework/tests/Unit/NavItemTest.php
+++ b/packages/framework/tests/Unit/NavigationItemTest.php
@@ -7,7 +7,7 @@
 use Hyde\Foundation\Facades\Routes;
 use Hyde\Support\Models\ExternalRoute;
 use Hyde\Framework\Exceptions\RouteNotFoundException;
-use Hyde\Framework\Features\Navigation\NavItem;
+use Hyde\Framework\Features\Navigation\NavigationItem;
 use Hyde\Pages\InMemoryPage;
 use Hyde\Pages\MarkdownPage;
 use Hyde\Support\Facades\Render;
@@ -17,14 +17,14 @@
 use Mockery;
 
 /**
- * This unit test covers the basics of the NavItem class.
+ * This unit test covers the basics of the NavigationItem class.
  * For the full feature test, see the MainNavigationMenuTest class.
  *
- * @covers \Hyde\Framework\Features\Navigation\NavItem
+ * @covers \Hyde\Framework\Features\Navigation\NavigationItem
  *
- * @see \Hyde\Framework\Testing\Unit\NavItemIsActiveHelperTest
+ * @see \Hyde\Framework\Testing\Unit\NavigationItemIsActiveHelperTest
  */
-class NavItemTest extends UnitTestCase
+class NavigationItemTest extends UnitTestCase
 {
     public static function setUpBeforeClass(): void
     {
@@ -42,7 +42,7 @@ protected function setUp(): void
     public function testConstruct()
     {
         $route = new Route(new MarkdownPage());
-        $item = new NavItem($route, 'Test', 500);
+        $item = new NavigationItem($route, 'Test', 500);
 
         $this->assertSame($route, $item->getRoute());
     }
@@ -50,19 +50,19 @@ public function testConstruct()
     public function testPassingRouteInstanceToConstructorUsesRouteInstance()
     {
         $route = new Route(new MarkdownPage());
-        $this->assertSame($route, (new NavItem($route, 'Home'))->getRoute());
+        $this->assertSame($route, (new NavigationItem($route, 'Home'))->getRoute());
     }
 
     public function testPassingRouteKeyToConstructorUsesRouteInstance()
     {
         $route = Routes::get('index');
 
-        $this->assertSame($route, (new NavItem('index', 'Home'))->getRoute());
+        $this->assertSame($route, (new NavigationItem('index', 'Home'))->getRoute());
     }
 
     public function testPassingUrlToConstructorUsesExternalRoute()
     {
-        $item = new NavItem('https://example.com', 'Home');
+        $item = new NavigationItem('https://example.com', 'Home');
         $this->assertInstanceOf(ExternalRoute::class, $item->getRoute());
         $this->assertEquals(new ExternalRoute('https://example.com'), $item->getRoute());
         $this->assertSame('https://example.com', (string) $item->getRoute());
@@ -70,7 +70,7 @@ public function testPassingUrlToConstructorUsesExternalRoute()
 
     public function testPassingUnknownRouteKeyToConstructorUsesExternalRoute()
     {
-        $item = new NavItem('foo', 'Home');
+        $item = new NavigationItem('foo', 'Home');
         $this->assertInstanceOf(ExternalRoute::class, $item->getRoute());
         $this->assertEquals(new ExternalRoute('foo'), $item->getRoute());
         $this->assertSame('foo', (string) $item->getRoute());
@@ -79,39 +79,39 @@ public function testPassingUnknownRouteKeyToConstructorUsesExternalRoute()
     public function testGetDestination()
     {
         $route = new Route(new InMemoryPage('foo'));
-        $navItem = new NavItem($route, 'Page', 500);
+        $NavigationItem = new NavigationItem($route, 'Page', 500);
 
-        $this->assertSame($route, $navItem->getRoute());
+        $this->assertSame($route, $NavigationItem->getRoute());
     }
 
     public function testGetLink()
     {
-        $navItem = new NavItem(new Route(new InMemoryPage('foo')), 'Page', 500);
-        $this->assertSame('foo.html', $navItem->getUrl());
+        $NavigationItem = new NavigationItem(new Route(new InMemoryPage('foo')), 'Page', 500);
+        $this->assertSame('foo.html', $NavigationItem->getUrl());
     }
 
     public function testGetLabel()
     {
-        $navItem = new NavItem(new Route(new InMemoryPage('foo')), 'Page', 500);
-        $this->assertSame('Page', $navItem->getLabel());
+        $NavigationItem = new NavigationItem(new Route(new InMemoryPage('foo')), 'Page', 500);
+        $this->assertSame('Page', $NavigationItem->getLabel());
     }
 
     public function testGetPriority()
     {
-        $navItem = new NavItem(new Route(new InMemoryPage('foo')), 'Page', 500);
-        $this->assertSame(500, $navItem->getPriority());
+        $NavigationItem = new NavigationItem(new Route(new InMemoryPage('foo')), 'Page', 500);
+        $this->assertSame(500, $NavigationItem->getPriority());
     }
 
     public function testGetGroup()
     {
-        $navItem = new NavItem(new Route(new InMemoryPage('foo')), 'Page', 500);
-        $this->assertNull($navItem->getGroupKey());
+        $NavigationItem = new NavigationItem(new Route(new InMemoryPage('foo')), 'Page', 500);
+        $this->assertNull($NavigationItem->getGroupKey());
     }
 
     public function testFromRoute()
     {
         $route = new Route(new MarkdownPage());
-        $item = NavItem::forRoute($route);
+        $item = NavigationItem::forRoute($route);
 
         $this->assertSame($route, $item->getRoute());
     }
@@ -120,12 +120,12 @@ public function testToString()
     {
         Render::shouldReceive('getRouteKey')->once()->andReturn('index');
 
-        $this->assertSame('index.html', (string) NavItem::forRoute(Routes::get('index')));
+        $this->assertSame('index.html', (string) NavigationItem::forRoute(Routes::get('index')));
     }
 
     public function testForLink()
     {
-        $item = NavItem::forLink('foo', 'bar');
+        $item = NavigationItem::forLink('foo', 'bar');
 
         $this->assertEquals(new ExternalRoute('foo'), $item->getRoute());
         $this->assertSame('bar', $item->getLabel());
@@ -134,13 +134,13 @@ public function testForLink()
 
     public function testForLinkWithCustomPriority()
     {
-        $this->assertSame(100, NavItem::forLink('foo', 'bar', 100)->getPriority());
+        $this->assertSame(100, NavigationItem::forLink('foo', 'bar', 100)->getPriority());
     }
 
     public function testForRoute()
     {
         $route = Routes::get('404');
-        $item = NavItem::forRoute($route, 'foo');
+        $item = NavigationItem::forRoute($route, 'foo');
 
         $this->assertSame($route, $item->getRoute());
         $this->assertSame('foo', $item->getLabel());
@@ -150,7 +150,7 @@ public function testForRoute()
     public function testForIndexRoute()
     {
         $route = Routes::get('index');
-        $item = NavItem::forRoute($route, 'foo');
+        $item = NavigationItem::forRoute($route, 'foo');
 
         $this->assertSame($route, $item->getRoute());
         $this->assertSame('foo', $item->getLabel());
@@ -160,52 +160,52 @@ public function testForIndexRoute()
     public function testForRouteWithRouteKey()
     {
         $this->assertEquals(
-            NavItem::forRoute(Routes::get('index'), 'foo'),
-            NavItem::forRoute('index', 'foo')
+            NavigationItem::forRoute(Routes::get('index'), 'foo'),
+            NavigationItem::forRoute('index', 'foo')
         );
     }
 
     public function testForRouteWithMissingRouteKey()
     {
         $this->expectException(RouteNotFoundException::class);
-        NavItem::forRoute('foo', 'foo');
+        NavigationItem::forRoute('foo', 'foo');
     }
 
     public function testForRouteWithCustomPriority()
     {
-        $this->assertSame(100, NavItem::forRoute(Routes::get('index'), 'foo', 100)->getPriority());
+        $this->assertSame(100, NavigationItem::forRoute(Routes::get('index'), 'foo', 100)->getPriority());
     }
 
-    public function testRouteBasedNavItemDestinationsAreResolvedRelatively()
+    public function testRouteBasedNavigationItemDestinationsAreResolvedRelatively()
     {
         Render::swap(Mockery::mock(RenderData::class, [
             'getRoute' => new Route(new InMemoryPage('foo')),
             'getRouteKey' => 'foo',
         ]));
 
-        $this->assertSame('foo.html', (string) NavItem::forRoute(new Route(new InMemoryPage('foo'))));
-        $this->assertSame('foo/bar.html', (string) NavItem::forRoute(new Route(new InMemoryPage('foo/bar'))));
+        $this->assertSame('foo.html', (string) NavigationItem::forRoute(new Route(new InMemoryPage('foo'))));
+        $this->assertSame('foo/bar.html', (string) NavigationItem::forRoute(new Route(new InMemoryPage('foo/bar'))));
 
         Render::swap(Mockery::mock(RenderData::class, [
             'getRoute' => new Route(new InMemoryPage('foo/bar')),
             'getRouteKey' => 'foo/bar',
         ]));
 
-        $this->assertSame('../foo.html', (string) NavItem::forRoute(new Route(new InMemoryPage('foo'))));
-        $this->assertSame('../foo/bar.html', (string) NavItem::forRoute(new Route(new InMemoryPage('foo/bar'))));
+        $this->assertSame('../foo.html', (string) NavigationItem::forRoute(new Route(new InMemoryPage('foo'))));
+        $this->assertSame('../foo/bar.html', (string) NavigationItem::forRoute(new Route(new InMemoryPage('foo/bar'))));
 
         Render::swap(Mockery::mock(RenderData::class, [
             'getRoute' => new Route(new InMemoryPage('foo/bar/baz')),
             'getRouteKey' => 'foo/bar/baz',
         ]));
 
-        $this->assertSame('../../foo.html', (string) NavItem::forRoute(new Route(new InMemoryPage('foo'))));
-        $this->assertSame('../../foo/bar.html', (string) NavItem::forRoute(new Route(new InMemoryPage('foo/bar'))));
+        $this->assertSame('../../foo.html', (string) NavigationItem::forRoute(new Route(new InMemoryPage('foo'))));
+        $this->assertSame('../../foo/bar.html', (string) NavigationItem::forRoute(new Route(new InMemoryPage('foo/bar'))));
     }
 
     public function testDropdownFacade()
     {
-        $item = NavItem::forGroup('foo', []);
+        $item = NavigationItem::forGroup('foo', []);
 
         $this->assertSame('foo', $item->getLabel());
         $this->assertSame([], $item->getItems());
@@ -215,17 +215,17 @@ public function testDropdownFacade()
     public function testDropdownFacadeWithChildren()
     {
         $children = [
-            new NavItem(new Route(new MarkdownPage()), 'bar'),
+            new NavigationItem(new Route(new MarkdownPage()), 'bar'),
         ];
 
-        $item = NavItem::forGroup('foo', $children);
+        $item = NavigationItem::forGroup('foo', $children);
         $this->assertSame($children, $item->getItems());
         $this->assertSame(999, $item->getPriority());
     }
 
     public function testDropdownFacadeWithCustomPriority()
     {
-        $item = NavItem::forGroup('foo', [], 500);
+        $item = NavigationItem::forGroup('foo', [], 500);
 
         $this->assertSame(500, $item->getPriority());
     }
@@ -236,8 +236,8 @@ public function testIsCurrent()
             'getRoute' => new Route(new InMemoryPage('foo')),
             'getRouteKey' => 'foo',
         ]));
-        $this->assertTrue(NavItem::forRoute(new Route(new InMemoryPage('foo')))->isActive());
-        $this->assertFalse(NavItem::forRoute(new Route(new InMemoryPage('bar')))->isActive());
+        $this->assertTrue(NavigationItem::forRoute(new Route(new InMemoryPage('foo')))->isActive());
+        $this->assertFalse(NavigationItem::forRoute(new Route(new InMemoryPage('bar')))->isActive());
     }
 
     public function testIsCurrentWithExternalRoute()
@@ -246,47 +246,47 @@ public function testIsCurrentWithExternalRoute()
             'getRoute' => new Route(new InMemoryPage('foo')),
             'getRouteKey' => 'foo',
         ]));
-        $this->assertFalse(NavItem::forLink('foo', 'bar')->isActive());
-        $this->assertFalse(NavItem::forLink('https://example.com', 'bar')->isActive());
+        $this->assertFalse(NavigationItem::forLink('foo', 'bar')->isActive());
+        $this->assertFalse(NavigationItem::forLink('https://example.com', 'bar')->isActive());
     }
 
     public function testGetGroupWithNoGroup()
     {
-        $this->assertNull((new NavItem(new Route(new MarkdownPage()), 'Test', 500))->getGroupKey());
+        $this->assertNull((new NavigationItem(new Route(new MarkdownPage()), 'Test', 500))->getGroupKey());
     }
 
     public function testGetGroupWithGroup()
     {
-        $this->assertSame('foo', (new NavItem(new Route(new MarkdownPage()), 'Test', 500, 'foo'))->getGroupKey());
+        $this->assertSame('foo', (new NavigationItem(new Route(new MarkdownPage()), 'Test', 500, 'foo'))->getGroupKey());
     }
 
     public function testGetGroupFromRouteWithGroup()
     {
-        $this->assertSame('foo', NavItem::forRoute(new Route(new MarkdownPage(matter: ['navigation.group' => 'foo'])))->getGroupKey());
+        $this->assertSame('foo', NavigationItem::forRoute(new Route(new MarkdownPage(matter: ['navigation.group' => 'foo'])))->getGroupKey());
     }
 
     public function testGetGroupForRouteWithGroup()
     {
-        $this->assertSame('foo', NavItem::forRoute(new Route(new MarkdownPage(matter: ['navigation.group' => 'foo'])), 'foo')->getGroupKey());
+        $this->assertSame('foo', NavigationItem::forRoute(new Route(new MarkdownPage(matter: ['navigation.group' => 'foo'])), 'foo')->getGroupKey());
     }
 
     public function testGroupKeysAreNormalized()
     {
-        $item = new NavItem(new Route(new MarkdownPage()), 'Test', 500, 'Foo Bar');
+        $item = new NavigationItem(new Route(new MarkdownPage()), 'Test', 500, 'Foo Bar');
         $this->assertSame('foo-bar', $item->getGroupKey());
     }
 
     public function testNormalizeGroupKeyCreatesSlugs()
     {
-        $this->assertSame('foo-bar', NavItem::normalizeGroupKey('Foo Bar'));
-        $this->assertSame('foo-bar', NavItem::normalizeGroupKey('foo bar'));
-        $this->assertSame('foo-bar', NavItem::normalizeGroupKey('foo_bar'));
-        $this->assertSame('foo-bar', NavItem::normalizeGroupKey('foo-bar'));
-        $this->assertSame('foo-bar', NavItem::normalizeGroupKey(' foo bar '));
+        $this->assertSame('foo-bar', NavigationItem::normalizeGroupKey('Foo Bar'));
+        $this->assertSame('foo-bar', NavigationItem::normalizeGroupKey('foo bar'));
+        $this->assertSame('foo-bar', NavigationItem::normalizeGroupKey('foo_bar'));
+        $this->assertSame('foo-bar', NavigationItem::normalizeGroupKey('foo-bar'));
+        $this->assertSame('foo-bar', NavigationItem::normalizeGroupKey(' foo bar '));
     }
 
     public function testNormalizeGroupKeyReturnsNullForNull()
     {
-        $this->assertNull(NavItem::normalizeGroupKey(null));
+        $this->assertNull(NavigationItem::normalizeGroupKey(null));
     }
 }
diff --git a/packages/framework/tests/Unit/NavigationMenuUnitTest.php b/packages/framework/tests/Unit/NavigationMenuUnitTest.php
index 648bb55a092..0330f4a0916 100644
--- a/packages/framework/tests/Unit/NavigationMenuUnitTest.php
+++ b/packages/framework/tests/Unit/NavigationMenuUnitTest.php
@@ -7,7 +7,7 @@
 use Hyde\Testing\UnitTestCase;
 use Illuminate\Support\Collection;
 use Hyde\Support\Models\ExternalRoute;
-use Hyde\Framework\Features\Navigation\NavItem;
+use Hyde\Framework\Features\Navigation\NavigationItem;
 use Hyde\Framework\Features\Navigation\MainNavigationMenu;
 
 /**
@@ -121,8 +121,8 @@ protected function getItems(): array
         ];
     }
 
-    protected function item(string $destination, string $label, int $priority = 500): NavItem
+    protected function item(string $destination, string $label, int $priority = 500): NavigationItem
     {
-        return new NavItem(new ExternalRoute($destination), $label, $priority);
+        return new NavigationItem(new ExternalRoute($destination), $label, $priority);
     }
 }
diff --git a/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php b/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
index da60ae2934d..5f6f27eb683 100644
--- a/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
@@ -9,7 +9,7 @@
 use Hyde\Testing\TestsBladeViews;
 use Hyde\Testing\Support\TestView;
 use Illuminate\View\ComponentAttributeBag;
-use Hyde\Framework\Features\Navigation\NavItem;
+use Hyde\Framework\Features\Navigation\NavigationItem;
 use Hyde\Testing\TestCase;
 
 /**
@@ -29,7 +29,7 @@ protected function setUp(): void
     protected function testView(): TestView
     {
         return $this->view(view('hyde::components.navigation.navigation-link', [
-            'item' => NavItem::forRoute(new Route(new InMemoryPage('foo')), 'Foo'),
+            'item' => NavigationItem::forRoute(new Route(new InMemoryPage('foo')), 'Foo'),
             'attributes' => new ComponentAttributeBag(),
         ]));
     }

From e46e6c386f21e590b488b26d4d1ac65984f5196e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 21 Mar 2024 10:16:02 +0100
Subject: [PATCH 1049/1422] Rename class NavGroupItem to GroupedNavigationItem

---
 .../components/docs/sidebar-items.blade.php   |  2 +-
 .../views/layouts/navigation.blade.php        |  2 +-
 .../Navigation/DocumentationSidebar.php       |  2 +-
 ...roupItem.php => GroupedNavigationItem.php} |  2 +-
 .../Features/Navigation/NavigationItem.php    |  4 +-
 .../Navigation/NavigationMenuGenerator.php    |  8 +--
 .../AutomaticNavigationConfigurationsTest.php |  4 +-
 .../Unit/DocumentationSidebarUnitTest.php     |  6 +-
 ...Test.php => GroupedNavigationItemTest.php} | 58 +++++++++----------
 9 files changed, 44 insertions(+), 44 deletions(-)
 rename packages/framework/src/Framework/Features/Navigation/{NavGroupItem.php => GroupedNavigationItem.php} (98%)
 rename packages/framework/tests/Unit/{NavGroupItemTest.php => GroupedNavigationItemTest.php} (67%)

diff --git a/packages/framework/resources/views/components/docs/sidebar-items.blade.php b/packages/framework/resources/views/components/docs/sidebar-items.blade.php
index f0d4cb553f0..2cd3f7d17ff 100644
--- a/packages/framework/resources/views/components/docs/sidebar-items.blade.php
+++ b/packages/framework/resources/views/components/docs/sidebar-items.blade.php
@@ -6,7 +6,7 @@
     </ul>
 @else
     <ul id="sidebar-items" role="list">
-        @php /** @var \Hyde\Framework\Features\Navigation\NavGroupItem $group */ @endphp
+        @php /** @var \Hyde\Framework\Features\Navigation\GroupedNavigationItem $group */ @endphp
         @foreach ($sidebar->getItems() as $group)
             <li class="sidebar-group" role="listitem" @if($sidebar->isCollapsible()) x-data="{ groupOpen: {{ $sidebar->isGroupActive($group->getGroupKey()) ? 'true' : 'false' }} }" @endif>
                 <header @class(['sidebar-group-header p-2 px-4 -ml-2 flex justify-between items-center', 'group hover:bg-black/10' => $sidebar->isCollapsible()]) @if($sidebar->isCollapsible()) @click="groupOpen = ! groupOpen" @endif>
diff --git a/packages/framework/resources/views/layouts/navigation.blade.php b/packages/framework/resources/views/layouts/navigation.blade.php
index 65b50f43bf0..5b766e4a77d 100644
--- a/packages/framework/resources/views/layouts/navigation.blade.php
+++ b/packages/framework/resources/views/layouts/navigation.blade.php
@@ -37,7 +37,7 @@
         <ul aria-label="Navigation links" class="md:flex-grow md:flex justify-end">
             @foreach ($navigation->getItems() as $item)
                 <li class="md:mx-2">
-                    @if($item instanceof \Hyde\Framework\Features\Navigation\NavGroupItem)
+                    @if($item instanceof \Hyde\Framework\Features\Navigation\GroupedNavigationItem)
                         <x-hyde::navigation.dropdown :label="$item->getLabel()" :items="$item->getItems()"/>
                     @else
                         <x-hyde::navigation.navigation-link :item="$item"/>
diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 73a1300e338..971fe2abf09 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -56,7 +56,7 @@ public function isCollapsible(): bool
 
     public function hasGroups(): bool
     {
-        return $this->getItems()->contains(fn (NavigationItem $item): bool => $item instanceof NavGroupItem);
+        return $this->getItems()->contains(fn (NavigationItem $item): bool => $item instanceof GroupedNavigationItem);
     }
 
     /**
diff --git a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php b/packages/framework/src/Framework/Features/Navigation/GroupedNavigationItem.php
similarity index 98%
rename from packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
rename to packages/framework/src/Framework/Features/Navigation/GroupedNavigationItem.php
index 78f41e30440..0d12290e855 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/GroupedNavigationItem.php
@@ -15,7 +15,7 @@
  *
  * @todo Consider extracting trait for shared code with navigation menu class
  */
-class NavGroupItem extends NavigationItem
+class GroupedNavigationItem extends NavigationItem
 {
     /** @var array<\Hyde\Framework\Features\Navigation\NavigationItem> */
     protected array $items = [];
diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index c5c38c09227..e9b6ef3a9a8 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -86,9 +86,9 @@ public static function forLink(string $href, string $label, int $priority = Navi
      * @param  array<NavigationItem>  $items  The items to be included in the dropdown.
      * @param  int  $priority  The priority of the dropdown item. Leave blank to use the default priority, which is last in the menu.
      */
-    public static function forGroup(string $label, array $items, int $priority = NavigationMenu::LAST): NavGroupItem
+    public static function forGroup(string $label, array $items, int $priority = NavigationMenu::LAST): GroupedNavigationItem
     {
-        return new NavGroupItem($label, $items, $priority);
+        return new GroupedNavigationItem($label, $items, $priority);
     }
 
     /**
diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
index fa15161c649..10d88a5e596 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
@@ -146,12 +146,12 @@ protected function addRouteToGroup(Route $route): void
         }
     }
 
-    protected function getOrCreateGroupItem(string $groupName): NavGroupItem
+    protected function getOrCreateGroupItem(string $groupName): GroupedNavigationItem
     {
         $groupKey = Str::slug($groupName);
         $group = $this->items->get($groupKey);
 
-        if ($group instanceof NavGroupItem) {
+        if ($group instanceof GroupedNavigationItem) {
             return $group;
         } elseif ($group instanceof NavigationItem) {
             // We are trying to add children to an existing navigation menu item,
@@ -161,7 +161,7 @@ protected function getOrCreateGroupItem(string $groupName): NavGroupItem
             // Todo: Add note in documentation about this behavior
             // Example file structure: _pages/foo.md, _pages/foo/bar.md, _pages/foo/baz.md, here the link to foo will be lost.
 
-            $item = new NavGroupItem($group->getLabel(), [], $group->getPriority());
+            $item = new GroupedNavigationItem($group->getLabel(), [], $group->getPriority());
 
             $this->items->put($groupKey, $item);
 
@@ -171,7 +171,7 @@ protected function getOrCreateGroupItem(string $groupName): NavGroupItem
         return $this->createGroupItem($groupKey, $groupName);
     }
 
-    protected function createGroupItem(string $groupKey, string $groupName): NavGroupItem
+    protected function createGroupItem(string $groupKey, string $groupName): GroupedNavigationItem
     {
         $label = $this->searchForGroupLabelInConfig($groupKey) ?? $groupName;
 
diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 844c05ad9f2..0230e570374 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -18,7 +18,7 @@
 use Illuminate\Support\Collection;
 use Hyde\Foundation\Kernel\RouteCollection;
 use Hyde\Framework\Features\Navigation\NavigationItem;
-use Hyde\Framework\Features\Navigation\NavGroupItem;
+use Hyde\Framework\Features\Navigation\GroupedNavigationItem;
 use Hyde\Framework\Features\Navigation\MainNavigationMenu;
 use Hyde\Framework\Features\Navigation\DocumentationSidebar;
 use Hyde\Framework\Features\Navigation\NavigationMenuGenerator;
@@ -1320,7 +1320,7 @@ public function __construct(TestCase $test, $sidebar = false)
     public function state(): array
     {
         return $this->items->map(function (NavigationItem $item): TestNavigationItem {
-            return new TestNavigationItem($item->getLabel(), $item->getGroupKey(), $item->getPriority(), $item instanceof NavGroupItem ? $item->getItems() : []);
+            return new TestNavigationItem($item->getLabel(), $item->getGroupKey(), $item->getPriority(), $item instanceof GroupedNavigationItem ? $item->getItems() : []);
         })->toArray();
     }
 
diff --git a/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php b/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
index b4c88dbb64b..dd9af5b4c06 100644
--- a/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
+++ b/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
@@ -8,7 +8,7 @@
 use Illuminate\Support\Collection;
 use Hyde\Support\Models\ExternalRoute;
 use Hyde\Framework\Features\Navigation\NavigationItem;
-use Hyde\Framework\Features\Navigation\NavGroupItem;
+use Hyde\Framework\Features\Navigation\GroupedNavigationItem;
 use Hyde\Framework\Features\Navigation\DocumentationSidebar;
 
 /**
@@ -204,13 +204,13 @@ public function testHasGroupsReturnsFalseWhenNoItemsHaveChildren()
         $this->assertFalse((new DocumentationSidebar())->hasGroups());
     }
 
-    public function testHasGroupsReturnsTrueWhenAtLeastOneItemIsNavGroupItemInstance()
+    public function testHasGroupsReturnsTrueWhenAtLeastOneItemIsGroupedNavigationItemInstance()
     {
         self::mockConfig();
         self::setupKernel();
 
         $menu = new DocumentationSidebar([
-            new NavGroupItem('foo', []),
+            new GroupedNavigationItem('foo', []),
         ]);
 
         $this->assertTrue($menu->hasGroups());
diff --git a/packages/framework/tests/Unit/NavGroupItemTest.php b/packages/framework/tests/Unit/GroupedNavigationItemTest.php
similarity index 67%
rename from packages/framework/tests/Unit/NavGroupItemTest.php
rename to packages/framework/tests/Unit/GroupedNavigationItemTest.php
index 2f98bb102f9..282c78b5bbe 100644
--- a/packages/framework/tests/Unit/NavGroupItemTest.php
+++ b/packages/framework/tests/Unit/GroupedNavigationItemTest.php
@@ -11,12 +11,12 @@
 use Hyde\Pages\DocumentationPage;
 use Hyde\Foundation\HydeCoreExtension;
 use Hyde\Framework\Features\Navigation\NavigationItem;
-use Hyde\Framework\Features\Navigation\NavGroupItem;
+use Hyde\Framework\Features\Navigation\GroupedNavigationItem;
 
 /**
- * @covers \Hyde\Framework\Features\Navigation\NavGroupItem
+ * @covers \Hyde\Framework\Features\Navigation\GroupedNavigationItem
  */
-class NavGroupItemTest extends UnitTestCase
+class GroupedNavigationItemTest extends UnitTestCase
 {
     public static function setUpBeforeClass(): void
     {
@@ -26,28 +26,28 @@ public static function setUpBeforeClass(): void
 
     public function testCanConstruct()
     {
-        $this->assertSame('Foo', (new NavGroupItem('Foo'))->getLabel());
+        $this->assertSame('Foo', (new GroupedNavigationItem('Foo'))->getLabel());
     }
 
     public function testCanConstructWithPriority()
     {
-        $this->assertSame(500, (new NavGroupItem('Foo', priority: 500))->getPriority());
+        $this->assertSame(500, (new GroupedNavigationItem('Foo', priority: 500))->getPriority());
     }
 
     public function testDefaultPriorityValueIsLast()
     {
-        $this->assertSame(999, (new NavGroupItem('Foo'))->getPriority());
+        $this->assertSame(999, (new GroupedNavigationItem('Foo'))->getPriority());
     }
 
     public function testDestinationIsAlwaysNull()
     {
-        $this->assertNull((new NavGroupItem('Foo'))->getRoute());
+        $this->assertNull((new GroupedNavigationItem('Foo'))->getRoute());
     }
 
     public function testCanConstructWithChildren()
     {
         $children = $this->createNavigationItems();
-        $item = new NavGroupItem('Foo', $children);
+        $item = new GroupedNavigationItem('Foo', $children);
 
         $this->assertCount(2, $item->getItems());
         $this->assertSame($children, $item->getItems());
@@ -56,7 +56,7 @@ public function testCanConstructWithChildren()
     public function testCanConstructWithChildrenWithoutRoute()
     {
         $children = $this->createNavigationItems();
-        $item = new NavGroupItem('Foo', $children);
+        $item = new GroupedNavigationItem('Foo', $children);
 
         $this->assertCount(2, $item->getItems());
         $this->assertSame($children, $item->getItems());
@@ -65,19 +65,19 @@ public function testCanConstructWithChildrenWithoutRoute()
     public function testGetItems()
     {
         $children = $this->createNavigationItems();
-        $item = new NavGroupItem('Foo', $children);
+        $item = new GroupedNavigationItem('Foo', $children);
 
         $this->assertSame($children, $item->getItems());
     }
 
     public function testGetItemsWithNoItems()
     {
-        $this->assertEmpty((new NavGroupItem('Foo'))->getItems());
+        $this->assertEmpty((new GroupedNavigationItem('Foo'))->getItems());
     }
 
     public function testCanAddItemToDropdown()
     {
-        $group = new NavGroupItem('Foo');
+        $group = new GroupedNavigationItem('Foo');
         $child = new NavigationItem(new Route(new MarkdownPage()), 'Bar');
 
         $this->assertSame([$child], $group->addItem($child)->getItems());
@@ -85,7 +85,7 @@ public function testCanAddItemToDropdown()
 
     public function testAddChildMethodReturnsSelf()
     {
-        $group = new NavGroupItem('Foo');
+        $group = new GroupedNavigationItem('Foo');
         $child = new NavigationItem(new Route(new MarkdownPage()), 'Bar');
 
         $this->assertSame($group, $group->addItem($child));
@@ -93,7 +93,7 @@ public function testAddChildMethodReturnsSelf()
 
     public function testCanAddMultipleItemsToDropdown()
     {
-        $group = new NavGroupItem('Foo');
+        $group = new GroupedNavigationItem('Foo');
         $items = $this->createNavigationItems();
 
         $this->assertSame($items, $group->addItems($items)->getItems());
@@ -101,14 +101,14 @@ public function testCanAddMultipleItemsToDropdown()
 
     public function testAddChildrenMethodReturnsSelf()
     {
-        $group = new NavGroupItem('Foo');
+        $group = new GroupedNavigationItem('Foo');
 
         $this->assertSame($group, $group->addItems([]));
     }
 
     public function testAddingAnItemWithAGroupKeyKeepsTheSetGroupKey()
     {
-        $group = new NavGroupItem('Foo');
+        $group = new GroupedNavigationItem('Foo');
         $child = new NavigationItem(new Route(new MarkdownPage()), 'Child', group: 'bar');
 
         $group->addItem($child);
@@ -119,7 +119,7 @@ public function testAddingAnItemWithAGroupKeyKeepsTheSetGroupKey()
 
     public function testAddingAnItemWithNoGroupKeyUsesGroupIdentifier()
     {
-        $group = new NavGroupItem('Foo');
+        $group = new GroupedNavigationItem('Foo');
         $child = new NavigationItem(new Route(new MarkdownPage()), 'Bar');
 
         $group->addItem($child);
@@ -130,17 +130,17 @@ public function testAddingAnItemWithNoGroupKeyUsesGroupIdentifier()
 
     public function testGetPriorityUsesDefaultPriority()
     {
-        $this->assertSame(999, (new NavGroupItem('Foo'))->getPriority());
+        $this->assertSame(999, (new GroupedNavigationItem('Foo'))->getPriority());
     }
 
     public function testGetPriorityWithNoChildrenUsesGroupPriority()
     {
-        $this->assertSame(999, (new NavGroupItem('Foo'))->getPriority());
+        $this->assertSame(999, (new GroupedNavigationItem('Foo'))->getPriority());
     }
 
     public function testGetPriorityWithChildrenUsesGroupPriority()
     {
-        $group = new NavGroupItem('Foo', [new NavigationItem(new Route(new MarkdownPage()), 'Bar', 100)]);
+        $group = new GroupedNavigationItem('Foo', [new NavigationItem(new Route(new MarkdownPage()), 'Bar', 100)]);
 
         $this->assertSame(999, $group->getPriority());
     }
@@ -153,13 +153,13 @@ public function testGetPriorityWithDocumentationPageChildrenUsesLowestPriority()
             new NavigationItem(new Route(new DocumentationPage()), 'Baz', 300),
         ];
 
-        $this->assertSame(100, (new NavGroupItem('Foo', $items))->getPriority());
-        $this->assertSame(100, (new NavGroupItem('Foo', array_reverse($items)))->getPriority());
+        $this->assertSame(100, (new GroupedNavigationItem('Foo', $items))->getPriority());
+        $this->assertSame(100, (new GroupedNavigationItem('Foo', array_reverse($items)))->getPriority());
     }
 
     public function testGetPriorityUsesGroupPriorityForMixedChildTypes()
     {
-        $group = new NavGroupItem('Foo');
+        $group = new GroupedNavigationItem('Foo');
 
         foreach (HydeCoreExtension::getPageClasses() as $type) {
             $child = new NavigationItem(new Route(new $type()), 'Bar', 100);
@@ -171,29 +171,29 @@ public function testGetPriorityUsesGroupPriorityForMixedChildTypes()
 
     public function testGetPriorityHandlesStringUrlChildGracefully()
     {
-        $this->assertSame(999, (new NavGroupItem('Foo', [new NavigationItem('foo', 'Bar', 100)]))->getPriority());
+        $this->assertSame(999, (new GroupedNavigationItem('Foo', [new NavigationItem('foo', 'Bar', 100)]))->getPriority());
     }
 
     public function testGetPriorityHandlesExternalUrlChildGracefully()
     {
-        $this->assertSame(999, (new NavGroupItem('Foo', [new NavigationItem('https://example.com', 'Bar', 100)]))->getPriority());
+        $this->assertSame(999, (new GroupedNavigationItem('Foo', [new NavigationItem('https://example.com', 'Bar', 100)]))->getPriority());
     }
 
     public function testForRoute()
     {
-        $item = NavGroupItem::forRoute(new Route(new InMemoryPage('foo')));
+        $item = GroupedNavigationItem::forRoute(new Route(new InMemoryPage('foo')));
 
         $this->assertInstanceOf(NavigationItem::class, $item);
-        $this->assertNotInstanceOf(NavGroupItem::class, $item);
+        $this->assertNotInstanceOf(GroupedNavigationItem::class, $item);
         $this->assertSame(NavigationItem::class, $item::class);
     }
 
     public function testForLink()
     {
-        $item = NavGroupItem::forLink('foo', 'bar');
+        $item = GroupedNavigationItem::forLink('foo', 'bar');
 
         $this->assertInstanceOf(NavigationItem::class, $item);
-        $this->assertNotInstanceOf(NavGroupItem::class, $item);
+        $this->assertNotInstanceOf(GroupedNavigationItem::class, $item);
         $this->assertSame(NavigationItem::class, $item::class);
     }
 

From d76e78a787c2f908a20ce1f6faf48e6056958e33 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 21 Mar 2024 10:55:41 +0100
Subject: [PATCH 1050/1422] Add todos for methods to refactor

---
 .../src/Framework/Features/Navigation/NavigationItem.php    | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index e9b6ef3a9a8..fdc4918c7f5 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -54,6 +54,8 @@ public function __construct(Route|string|null $destination, string $label, int $
     /**
      * Create a new navigation menu item leading to a Route instance.
      *
+     * TODO: Merge into a create method
+     *
      * @param  \Hyde\Support\Models\Route|string<\Hyde\Support\Models\RouteKey>  $route  Route instance or route key
      * @param  int|null  $priority  Leave blank to use the priority of the route's corresponding page.
      * @param  string|null  $label  Leave blank to use the label of the route's corresponding page.
@@ -73,6 +75,8 @@ public static function forRoute(Route|string $route, ?string $label = null, ?int
 
     /**
      * Create a new navigation menu item leading to an external URI.
+     *
+     * TODO: Merge into a create method
      */
     public static function forLink(string $href, string $label, int $priority = NavigationMenu::DEFAULT): self
     {
@@ -82,6 +86,8 @@ public static function forLink(string $href, string $label, int $priority = Navi
     /**
      * Create a new dropdown navigation menu item.
      *
+     * TODO: Move to GroupedNavigationItem::create()
+     *
      * @param  string  $label  The label of the dropdown item.
      * @param  array<NavigationItem>  $items  The items to be included in the dropdown.
      * @param  int  $priority  The priority of the dropdown item. Leave blank to use the default priority, which is last in the menu.

From b629a4aa760070d61ccb5a391e8e74ce9c2bcbce Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 21 Mar 2024 11:00:36 +0100
Subject: [PATCH 1051/1422] Clarify constructor docs

---
 .../src/Framework/Features/Navigation/NavigationItem.php        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index fdc4918c7f5..fc3de7bdcb4 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -29,7 +29,7 @@ class NavigationItem implements Stringable
     protected ?string $group = null;
 
     /**
-     * Create a new navigation menu item.
+     * Create a new navigation menu item with your own properties.
      *
      * @param  \Hyde\Support\Models\Route|string|null  $destination  Route instance, route key, or external URI. For dropdowns/groups, this should be null.
      * @param  string  $label  The label of the navigation item.

From 1a679f2ae2c94421c540e06add0364dbe39580c6 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 21 Mar 2024 11:07:52 +0100
Subject: [PATCH 1052/1422] Sketch out new create method

---
 .../src/Framework/Features/Navigation/NavigationItem.php  | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index fc3de7bdcb4..588cb75bc27 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -51,6 +51,14 @@ public function __construct(Route|string|null $destination, string $label, int $
         }
     }
 
+    /**
+     * Create a new navigation menu item, automatically filling in the properties from a Route instance if provided.
+     */
+    public static function create(): static
+    {
+        // TODO: Implement create() method.
+    }
+
     /**
      * Create a new navigation menu item leading to a Route instance.
      *

From 4ec587ce12eab0afc6b3c0bbebc393a52f8c42f9 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 21 Mar 2024 11:10:52 +0100
Subject: [PATCH 1053/1422] Copy over helper method signature

---
 .../src/Framework/Features/Navigation/NavigationItem.php   | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index 588cb75bc27..bc88505f60f 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -53,8 +53,13 @@ public function __construct(Route|string|null $destination, string $label, int $
 
     /**
      * Create a new navigation menu item, automatically filling in the properties from a Route instance if provided.
+     *
+     * @param  \Hyde\Support\Models\Route|string<\Hyde\Support\Models\RouteKey>  $route  Route instance or route key
+     * @param  int|null  $priority  Leave blank to use the priority of the route's corresponding page.
+     * @param  string|null  $label  Leave blank to use the label of the route's corresponding page.
+     * @param  string|null  $group  Leave blank to use the group of the route's corresponding page.
      */
-    public static function create(): static
+    public static function create(Route|string $route, ?string $label = null, ?int $priority = null, ?string $group = null): static
     {
         // TODO: Implement create() method.
     }

From 151f6238ffdd87f3a508630ce96e04399058e5cd Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 21 Mar 2024 11:12:42 +0100
Subject: [PATCH 1054/1422] Move logic to new method

---
 .../Features/Navigation/NavigationItem.php     | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index bc88505f60f..d7036e51a3c 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -61,7 +61,14 @@ public function __construct(Route|string|null $destination, string $label, int $
      */
     public static function create(Route|string $route, ?string $label = null, ?int $priority = null, ?string $group = null): static
     {
-        // TODO: Implement create() method.
+        $route = $route instanceof Route ? $route : Routes::getOrFail($route);
+
+        return new self(
+            $route,
+            $label ?? $route->getPage()->navigationMenuLabel(),
+            $priority ?? $route->getPage()->navigationMenuPriority(),
+            $group ?? $route->getPage()->navigationMenuGroup(),
+        );
     }
 
     /**
@@ -76,14 +83,7 @@ public static function create(Route|string $route, ?string $label = null, ?int $
      */
     public static function forRoute(Route|string $route, ?string $label = null, ?int $priority = null, ?string $group = null): self
     {
-        $route = $route instanceof Route ? $route : Routes::getOrFail($route);
-
-        return new self(
-            $route,
-            $label ?? $route->getPage()->navigationMenuLabel(),
-            $priority ?? $route->getPage()->navigationMenuPriority(),
-            $group ?? $route->getPage()->navigationMenuGroup(),
-        );
+        return self::create($route, $label, $priority, $group);
     }
 
     /**

From 98f9ac939bb4cea2fb072d2e9582bdea8e07acdd Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 21 Mar 2024 11:17:32 +0100
Subject: [PATCH 1055/1422] Change static return type to self

---
 .../src/Framework/Features/Navigation/NavigationItem.php        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index d7036e51a3c..66219b60a3f 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -59,7 +59,7 @@ public function __construct(Route|string|null $destination, string $label, int $
      * @param  string|null  $label  Leave blank to use the label of the route's corresponding page.
      * @param  string|null  $group  Leave blank to use the group of the route's corresponding page.
      */
-    public static function create(Route|string $route, ?string $label = null, ?int $priority = null, ?string $group = null): static
+    public static function create(Route|string $route, ?string $label = null, ?int $priority = null, ?string $group = null): self
     {
         $route = $route instanceof Route ? $route : Routes::getOrFail($route);
 

From d62e3d344b7a7c77ed64a6540d8ec079c6555a2d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 21 Mar 2024 11:44:49 +0100
Subject: [PATCH 1056/1422] Replace NavigationItem `forRoute` method with
 `create`

---
 .../Features/Navigation/NavigationItem.php    | 15 ------
 .../Navigation/NavigationMenuGenerator.php    |  6 +--
 .../tests/Feature/NavigationMenuTest.php      | 44 +++++++++---------
 .../Services/DocumentationSidebarTest.php     | 32 ++++++-------
 .../tests/Unit/GroupedNavigationItemTest.php  |  4 +-
 .../Unit/NavigationItemIsActiveHelperTest.php | 26 +++++------
 .../tests/Unit/NavigationItemTest.php         | 46 +++++++++----------
 .../Unit/Views/NavigationLinkViewTest.php     |  2 +-
 8 files changed, 80 insertions(+), 95 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index 66219b60a3f..61b9ce38eba 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -71,21 +71,6 @@ public static function create(Route|string $route, ?string $label = null, ?int $
         );
     }
 
-    /**
-     * Create a new navigation menu item leading to a Route instance.
-     *
-     * TODO: Merge into a create method
-     *
-     * @param  \Hyde\Support\Models\Route|string<\Hyde\Support\Models\RouteKey>  $route  Route instance or route key
-     * @param  int|null  $priority  Leave blank to use the priority of the route's corresponding page.
-     * @param  string|null  $label  Leave blank to use the label of the route's corresponding page.
-     * @param  string|null  $group  Leave blank to use the group of the route's corresponding page.
-     */
-    public static function forRoute(Route|string $route, ?string $label = null, ?int $priority = null, ?string $group = null): self
-    {
-        return self::create($route, $label, $priority, $group);
-    }
-
     /**
      * Create a new navigation menu item leading to an external URI.
      *
diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
index 10d88a5e596..cc31f8d5cff 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
@@ -71,7 +71,7 @@ protected function generate(): void
                 if ($this->canGroupRoute($route)) {
                     $this->addRouteToGroup($route);
                 } else {
-                    $this->items->put($route->getRouteKey(), NavigationItem::forRoute($route));
+                    $this->items->put($route->getRouteKey(), NavigationItem::create($route));
                 }
             }
         });
@@ -79,7 +79,7 @@ protected function generate(): void
         if ($this->generatesSidebar) {
             // If there are no pages other than the index page, we add it to the sidebar so that it's not empty
             if ($this->items->count() === 0 && DocumentationPage::home() !== null) {
-                $this->items->push(NavigationItem::forRoute(DocumentationPage::home()));
+                $this->items->push(NavigationItem::create(DocumentationPage::home()));
             }
         } else {
             collect(Config::getArray('hyde.navigation.custom', []))->each(function (NavigationItem $item): void {
@@ -133,7 +133,7 @@ protected function canGroupRoute(Route $route): bool
 
     protected function addRouteToGroup(Route $route): void
     {
-        $item = NavigationItem::forRoute($route);
+        $item = NavigationItem::create($route);
 
         $groupName = $this->generatesSidebar ? ($item->getGroupKey() ?? 'Other') : $item->getGroupKey();
 
diff --git a/packages/framework/tests/Feature/NavigationMenuTest.php b/packages/framework/tests/Feature/NavigationMenuTest.php
index bfe6d4a7435..2aa73a6e0ac 100644
--- a/packages/framework/tests/Feature/NavigationMenuTest.php
+++ b/packages/framework/tests/Feature/NavigationMenuTest.php
@@ -38,7 +38,7 @@ public function testGenerateMethodCreatesCollectionOfNavigationItems()
     public function testGetItemsReturnsItems()
     {
         $this->assertEquals(collect([
-            NavigationItem::forRoute(Routes::get('index')),
+            NavigationItem::create(Routes::get('index')),
         ]), $this->createNavigationMenu()->getItems());
     }
 
@@ -67,9 +67,9 @@ public function testCreatedCollectionIsSortedByNavigationMenuPriority()
         $menu = $this->createNavigationMenu();
 
         $expected = collect([
-            NavigationItem::forRoute(Routes::get('index')),
-            NavigationItem::forRoute(Routes::get('foo')),
-            NavigationItem::forRoute(Routes::get('docs/index')),
+            NavigationItem::create(Routes::get('index')),
+            NavigationItem::create(Routes::get('foo')),
+            NavigationItem::create(Routes::get('docs/index')),
         ]);
 
         $this->assertCount(count($expected), $menu->getItems());
@@ -83,8 +83,8 @@ public function testIsSortedAutomaticallyWhenUsingNavigationMenuCreate()
         $menu = $this->createNavigationMenu();
 
         $expected = collect([
-            NavigationItem::forRoute(Routes::get('index')),
-            NavigationItem::forRoute(Routes::get('foo')),
+            NavigationItem::create(Routes::get('index')),
+            NavigationItem::create(Routes::get('foo')),
         ]);
 
         $this->assertCount(count($expected), $menu->getItems());
@@ -98,7 +98,7 @@ public function testExternalLinkCanBeAddedInConfig()
         $menu = $this->createNavigationMenu();
 
         $expected = collect([
-            NavigationItem::forRoute(Routes::get('index')),
+            NavigationItem::create(Routes::get('index')),
             NavigationItem::forLink('https://example.com', 'foo'),
         ]);
 
@@ -113,7 +113,7 @@ public function testPathLinkCanBeAddedInConfig()
         $menu = $this->createNavigationMenu();
 
         $expected = collect([
-            NavigationItem::forRoute(Routes::get('index')),
+            NavigationItem::create(Routes::get('index')),
             NavigationItem::forLink('foo', 'foo'),
         ]);
 
@@ -131,7 +131,7 @@ public function testDuplicatesAreNotRemovedWhenAddingInConfig()
         $menu = $this->createNavigationMenu();
 
         $expected = collect([
-            NavigationItem::forRoute(Routes::get('index')),
+            NavigationItem::create(Routes::get('index')),
             NavigationItem::forLink('foo', 'foo'),
             NavigationItem::forLink('foo', 'foo'),
         ]);
@@ -150,7 +150,7 @@ public function testDuplicatesAreNotRemovedWhenAddingInConfigRegardlessOfDestina
         $menu = $this->createNavigationMenu();
 
         $expected = collect([
-            NavigationItem::forRoute(Routes::get('index')),
+            NavigationItem::create(Routes::get('index')),
             NavigationItem::forLink('foo', 'foo'),
             NavigationItem::forLink('bar', 'foo'),
         ]);
@@ -168,9 +168,9 @@ public function testConfigItemsTakePrecedenceOverGeneratedItems()
         $menu = $this->createNavigationMenu();
 
         $expected = collect([
-            NavigationItem::forRoute(Routes::get('index')),
+            NavigationItem::create(Routes::get('index')),
             NavigationItem::forLink('bar', 'Foo'),
-            NavigationItem::forRoute(Routes::get('foo')),
+            NavigationItem::create(Routes::get('foo')),
         ]);
 
         $this->assertCount(count($expected), $menu->getItems());
@@ -185,8 +185,8 @@ public function testDocumentationPagesThatAreNotIndexAreNotAddedToTheMenu()
         $menu = $this->createNavigationMenu();
 
         $expected = collect([
-            NavigationItem::forRoute(Routes::get('index')),
-            NavigationItem::forRoute(Routes::get('docs/index')),
+            NavigationItem::create(Routes::get('index')),
+            NavigationItem::create(Routes::get('docs/index')),
         ]);
 
         $this->assertCount(count($expected), $menu->getItems());
@@ -199,7 +199,7 @@ public function testPagesInSubdirectoriesAreNotAddedToTheNavigationMenu()
         $this->file('_pages/foo/bar.md');
 
         $menu = $this->createNavigationMenu();
-        $expected = collect([NavigationItem::forRoute(Routes::get('index'))]);
+        $expected = collect([NavigationItem::create(Routes::get('index'))]);
 
         $this->assertCount(count($expected), $menu->getItems());
         $this->assertEquals($expected, $menu->getItems());
@@ -213,8 +213,8 @@ public function testPagesInSubdirectoriesCanBeAddedToTheNavigationMenuWithConfig
 
         $menu = $this->createNavigationMenu();
         $expected = collect([
-            NavigationItem::forRoute(Routes::get('index')),
-            NavigationItem::forRoute(Routes::get('foo/bar')),
+            NavigationItem::create(Routes::get('index')),
+            NavigationItem::create(Routes::get('foo/bar')),
         ]);
 
         $this->assertCount(count($expected), $menu->getItems());
@@ -229,9 +229,9 @@ public function testPagesInSubdirectoriesAreNotAddedToTheNavigationMenuWithConfi
 
         $menu = $this->createNavigationMenu();
         $expected = collect([
-            NavigationItem::forRoute(Routes::get('index')),
+            NavigationItem::create(Routes::get('index')),
             NavigationItem::forGroup('Foo', [
-                NavigationItem::forRoute(Routes::get('foo/bar')),
+                NavigationItem::create(Routes::get('foo/bar')),
             ]),
         ]);
 
@@ -249,10 +249,10 @@ public function testPagesInDropdownsDoNotGetAddedToTheMainNavigation()
 
         $this->assertCount(3, $menu->getItems());
         $this->assertEquals([
-            NavigationItem::forRoute(Routes::get('index')),
-            NavigationItem::forRoute((new MarkdownPage('foo'))->getRoute()),
+            NavigationItem::create(Routes::get('index')),
+            NavigationItem::create((new MarkdownPage('foo'))->getRoute()),
             NavigationItem::forGroup('Bar', [
-                NavigationItem::forRoute((new MarkdownPage('bar/baz'))->getRoute()),
+                NavigationItem::create((new MarkdownPage('bar/baz'))->getRoute()),
             ]),
         ], $menu->getItems()->all());
     }
diff --git a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
index f5bbafa28ef..454cf6ecd05 100644
--- a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
+++ b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
@@ -86,9 +86,9 @@ public function testSidebarIsOrderedAlphabeticallyWhenNoOrderIsSetInConfig()
 
         $this->assertEquals(
             collect([
-                NavigationItem::forRoute(Routes::get('docs/a'), priority: 999),
-                NavigationItem::forRoute(Routes::get('docs/b'), priority: 999),
-                NavigationItem::forRoute(Routes::get('docs/c'), priority: 999),
+                NavigationItem::create(Routes::get('docs/a'), priority: 999),
+                NavigationItem::create(Routes::get('docs/b'), priority: 999),
+                NavigationItem::create(Routes::get('docs/c'), priority: 999),
             ]),
             NavigationMenuGenerator::handle(DocumentationSidebar::class)->getItems()
         );
@@ -107,9 +107,9 @@ public function testSidebarIsOrderedByPriorityWhenPriorityIsSetInConfig()
 
         $this->assertEquals(
             collect([
-                NavigationItem::forRoute(Routes::get('docs/c'), priority: 250 + 250),
-                NavigationItem::forRoute(Routes::get('docs/b'), priority: 250 + 251),
-                NavigationItem::forRoute(Routes::get('docs/a'), priority: 250 + 252),
+                NavigationItem::create(Routes::get('docs/c'), priority: 250 + 250),
+                NavigationItem::create(Routes::get('docs/b'), priority: 250 + 251),
+                NavigationItem::create(Routes::get('docs/a'), priority: 250 + 252),
             ]),
             NavigationMenuGenerator::handle(DocumentationSidebar::class)->getItems()
         );
@@ -146,9 +146,9 @@ public function testSidebarPrioritiesCanBeSetInBothFrontMatterAndConfig()
 
         $this->assertEquals(
             collect([
-                NavigationItem::forRoute(Routes::get('docs/first'), priority: 250 + 250),
-                NavigationItem::forRoute(Routes::get('docs/second'), priority: 250 + 252),
-                NavigationItem::forRoute(Routes::get('docs/third'), priority: 250 + 300),
+                NavigationItem::create(Routes::get('docs/first'), priority: 250 + 250),
+                NavigationItem::create(Routes::get('docs/second'), priority: 250 + 252),
+                NavigationItem::create(Routes::get('docs/third'), priority: 250 + 300),
             ]),
             NavigationMenuGenerator::handle(DocumentationSidebar::class)->getItems()
         );
@@ -195,7 +195,7 @@ public function testGetItemsInGroupDoesNotIncludeDocsIndex()
         Filesystem::touch('_docs/index.md');
 
         $this->assertEquals(
-            collect([NavigationItem::forRoute(Routes::get('docs/foo'), priority: 999)]),
+            collect([NavigationItem::create(Routes::get('docs/foo'), priority: 999)]),
             NavigationMenuGenerator::handle(DocumentationSidebar::class)->getItems()
         );
     }
@@ -268,10 +268,10 @@ public function testCanHaveMultipleGroupedPagesWithTheSameNameLabels()
         $this->assertEquals(
             collect([
                 NavigationItem::forGroup('Bar', [
-                    NavigationItem::forRoute(Routes::get('docs/bar'), priority: 999),
+                    NavigationItem::create(Routes::get('docs/bar'), priority: 999),
                 ]),
                 NavigationItem::forGroup('Foo', [
-                    NavigationItem::forRoute(Routes::get('docs/foo'), priority: 999),
+                    NavigationItem::create(Routes::get('docs/foo'), priority: 999),
                 ]),
             ]),
             $sidebar->getItems()
@@ -289,8 +289,8 @@ public function testDuplicateLabelsWithinTheSameGroupAreNotRemoved()
         $this->assertEquals(
             collect([
                 NavigationItem::forGroup('Foo', [
-                    NavigationItem::forRoute(Routes::get('docs/bar'), priority: 999),
-                    NavigationItem::forRoute(Routes::get('docs/foo'), priority: 999),
+                    NavigationItem::create(Routes::get('docs/bar'), priority: 999),
+                    NavigationItem::create(Routes::get('docs/foo'), priority: 999),
                 ]),
             ]),
             $sidebar->getItems()
@@ -312,7 +312,7 @@ public function testIndexPageAddedToSidebarWhenItIsTheOnlyPage()
 
         $this->assertCount(1, $sidebar->getItems());
         $this->assertEquals(
-            collect([NavigationItem::forRoute(Routes::get('docs/index'))]),
+            collect([NavigationItem::create(Routes::get('docs/index'))]),
             $sidebar->getItems()
         );
     }
@@ -325,7 +325,7 @@ public function testIndexPageNotAddedToSidebarWhenOtherPagesExist()
 
         $this->assertCount(1, $sidebar->getItems());
         $this->assertEquals(
-            collect([NavigationItem::forRoute(Routes::get('docs/test-0'))]),
+            collect([NavigationItem::create(Routes::get('docs/test-0'))]),
             $sidebar->getItems()
         );
     }
diff --git a/packages/framework/tests/Unit/GroupedNavigationItemTest.php b/packages/framework/tests/Unit/GroupedNavigationItemTest.php
index 282c78b5bbe..fdc9f2b3f2b 100644
--- a/packages/framework/tests/Unit/GroupedNavigationItemTest.php
+++ b/packages/framework/tests/Unit/GroupedNavigationItemTest.php
@@ -179,9 +179,9 @@ public function testGetPriorityHandlesExternalUrlChildGracefully()
         $this->assertSame(999, (new GroupedNavigationItem('Foo', [new NavigationItem('https://example.com', 'Bar', 100)]))->getPriority());
     }
 
-    public function testForRoute()
+    public function testCreate()
     {
-        $item = GroupedNavigationItem::forRoute(new Route(new InMemoryPage('foo')));
+        $item = GroupedNavigationItem::create(new Route(new InMemoryPage('foo')));
 
         $this->assertInstanceOf(NavigationItem::class, $item);
         $this->assertNotInstanceOf(GroupedNavigationItem::class, $item);
diff --git a/packages/framework/tests/Unit/NavigationItemIsActiveHelperTest.php b/packages/framework/tests/Unit/NavigationItemIsActiveHelperTest.php
index 9e861f587a9..b5a089ff0db 100644
--- a/packages/framework/tests/Unit/NavigationItemIsActiveHelperTest.php
+++ b/packages/framework/tests/Unit/NavigationItemIsActiveHelperTest.php
@@ -34,19 +34,19 @@ protected function tearDown(): void
     public function testIsCurrent()
     {
         $this->mockRenderData($this->makeRoute('foo'));
-        $this->assertFalse(NavigationItem::forRoute($this->makeRoute('bar'))->isActive());
+        $this->assertFalse(NavigationItem::create($this->makeRoute('bar'))->isActive());
     }
 
     public function testIsCurrentWhenCurrent()
     {
         $this->mockRenderData($this->makeRoute('foo'));
-        $this->assertTrue(NavigationItem::forRoute($this->makeRoute('foo'))->isActive());
+        $this->assertTrue(NavigationItem::create($this->makeRoute('foo'))->isActive());
     }
 
     public function testIsCurrentUsingCurrentRoute()
     {
         $this->mockRenderData($this->makeRoute('index'));
-        $this->assertTrue(NavigationItem::forRoute(Routes::get('index'))->isActive());
+        $this->assertTrue(NavigationItem::create(Routes::get('index'))->isActive());
     }
 
     public function testIsCurrentUsingCurrentLink()
@@ -58,13 +58,13 @@ public function testIsCurrentUsingCurrentLink()
     public function testIsCurrentWhenNotCurrent()
     {
         $this->mockRenderData($this->makeRoute('foo'));
-        $this->assertFalse(NavigationItem::forRoute($this->makeRoute('bar'))->isActive());
+        $this->assertFalse(NavigationItem::create($this->makeRoute('bar'))->isActive());
     }
 
     public function testIsCurrentUsingNotCurrentRoute()
     {
         $this->mockRenderData($this->makeRoute('foo'));
-        $this->assertFalse(NavigationItem::forRoute(Routes::get('index'))->isActive());
+        $this->assertFalse(NavigationItem::create(Routes::get('index'))->isActive());
     }
 
     public function testIsCurrentUsingNotCurrentLink()
@@ -76,49 +76,49 @@ public function testIsCurrentUsingNotCurrentLink()
     public function testIsCurrentWithNestedCurrentPage()
     {
         $this->mockRenderData($this->makeRoute('foo/bar'));
-        $this->assertFalse(NavigationItem::forRoute($this->makeRoute('bar'))->isActive());
+        $this->assertFalse(NavigationItem::create($this->makeRoute('bar'))->isActive());
     }
 
     public function testIsCurrentWhenCurrentWithNestedCurrentPage()
     {
         $this->mockRenderData($this->makeRoute('foo/bar'));
-        $this->assertTrue(NavigationItem::forRoute($this->makeRoute('foo/bar'))->isActive());
+        $this->assertTrue(NavigationItem::create($this->makeRoute('foo/bar'))->isActive());
     }
 
     public function testIsCurrentWithNestedCurrentPageWhenNested()
     {
         $this->mockRenderData($this->makeRoute('foo/bar'));
-        $this->assertTrue(NavigationItem::forRoute($this->makeRoute('foo/bar'))->isActive());
+        $this->assertTrue(NavigationItem::create($this->makeRoute('foo/bar'))->isActive());
     }
 
     public function testIsCurrentWhenCurrentWithNestedCurrentPageWhenNested()
     {
         $this->mockRenderData($this->makeRoute('foo/bar'));
-        $this->assertFalse(NavigationItem::forRoute($this->makeRoute('foo/baz'))->isActive());
+        $this->assertFalse(NavigationItem::create($this->makeRoute('foo/baz'))->isActive());
     }
 
     public function testIsCurrentWithNestedCurrentPageWhenVeryNested()
     {
         $this->mockRenderData($this->makeRoute('foo/bar/baz'));
-        $this->assertTrue(NavigationItem::forRoute($this->makeRoute('foo/bar/baz'))->isActive());
+        $this->assertTrue(NavigationItem::create($this->makeRoute('foo/bar/baz'))->isActive());
     }
 
     public function testIsCurrentWhenCurrentWithNestedCurrentPageWhenVeryNested()
     {
         $this->mockRenderData($this->makeRoute('foo/bar/baz'));
-        $this->assertFalse(NavigationItem::forRoute($this->makeRoute('foo/baz/bar'))->isActive());
+        $this->assertFalse(NavigationItem::create($this->makeRoute('foo/baz/bar'))->isActive());
     }
 
     public function testIsCurrentWithNestedCurrentPageWhenVeryDifferingNested()
     {
         $this->mockRenderData($this->makeRoute('foo'));
-        $this->assertFalse(NavigationItem::forRoute($this->makeRoute('foo/bar/baz'))->isActive());
+        $this->assertFalse(NavigationItem::create($this->makeRoute('foo/bar/baz'))->isActive());
     }
 
     public function testIsCurrentWithNestedCurrentPageWhenVeryDifferingNestedInverse()
     {
         $this->mockRenderData($this->makeRoute('foo/bar/baz'));
-        $this->assertFalse(NavigationItem::forRoute($this->makeRoute('foo'))->isActive());
+        $this->assertFalse(NavigationItem::create($this->makeRoute('foo'))->isActive());
     }
 
     public function testIsCurrentUsingCurrentLinkWithNestedCurrentPage()
diff --git a/packages/framework/tests/Unit/NavigationItemTest.php b/packages/framework/tests/Unit/NavigationItemTest.php
index a76b0c0bbb5..fe3f5c35d10 100644
--- a/packages/framework/tests/Unit/NavigationItemTest.php
+++ b/packages/framework/tests/Unit/NavigationItemTest.php
@@ -111,7 +111,7 @@ public function testGetGroup()
     public function testFromRoute()
     {
         $route = new Route(new MarkdownPage());
-        $item = NavigationItem::forRoute($route);
+        $item = NavigationItem::create($route);
 
         $this->assertSame($route, $item->getRoute());
     }
@@ -120,7 +120,7 @@ public function testToString()
     {
         Render::shouldReceive('getRouteKey')->once()->andReturn('index');
 
-        $this->assertSame('index.html', (string) NavigationItem::forRoute(Routes::get('index')));
+        $this->assertSame('index.html', (string) NavigationItem::create(Routes::get('index')));
     }
 
     public function testForLink()
@@ -137,10 +137,10 @@ public function testForLinkWithCustomPriority()
         $this->assertSame(100, NavigationItem::forLink('foo', 'bar', 100)->getPriority());
     }
 
-    public function testForRoute()
+    public function testCreate()
     {
         $route = Routes::get('404');
-        $item = NavigationItem::forRoute($route, 'foo');
+        $item = NavigationItem::create($route, 'foo');
 
         $this->assertSame($route, $item->getRoute());
         $this->assertSame('foo', $item->getLabel());
@@ -150,30 +150,30 @@ public function testForRoute()
     public function testForIndexRoute()
     {
         $route = Routes::get('index');
-        $item = NavigationItem::forRoute($route, 'foo');
+        $item = NavigationItem::create($route, 'foo');
 
         $this->assertSame($route, $item->getRoute());
         $this->assertSame('foo', $item->getLabel());
         $this->assertSame(0, $item->getPriority());
     }
 
-    public function testForRouteWithRouteKey()
+    public function testCreateWithRouteKey()
     {
         $this->assertEquals(
-            NavigationItem::forRoute(Routes::get('index'), 'foo'),
-            NavigationItem::forRoute('index', 'foo')
+            NavigationItem::create(Routes::get('index'), 'foo'),
+            NavigationItem::create('index', 'foo')
         );
     }
 
-    public function testForRouteWithMissingRouteKey()
+    public function testCreateWithMissingRouteKey()
     {
         $this->expectException(RouteNotFoundException::class);
-        NavigationItem::forRoute('foo', 'foo');
+        NavigationItem::create('foo', 'foo');
     }
 
-    public function testForRouteWithCustomPriority()
+    public function testCreateWithCustomPriority()
     {
-        $this->assertSame(100, NavigationItem::forRoute(Routes::get('index'), 'foo', 100)->getPriority());
+        $this->assertSame(100, NavigationItem::create(Routes::get('index'), 'foo', 100)->getPriority());
     }
 
     public function testRouteBasedNavigationItemDestinationsAreResolvedRelatively()
@@ -183,24 +183,24 @@ public function testRouteBasedNavigationItemDestinationsAreResolvedRelatively()
             'getRouteKey' => 'foo',
         ]));
 
-        $this->assertSame('foo.html', (string) NavigationItem::forRoute(new Route(new InMemoryPage('foo'))));
-        $this->assertSame('foo/bar.html', (string) NavigationItem::forRoute(new Route(new InMemoryPage('foo/bar'))));
+        $this->assertSame('foo.html', (string) NavigationItem::create(new Route(new InMemoryPage('foo'))));
+        $this->assertSame('foo/bar.html', (string) NavigationItem::create(new Route(new InMemoryPage('foo/bar'))));
 
         Render::swap(Mockery::mock(RenderData::class, [
             'getRoute' => new Route(new InMemoryPage('foo/bar')),
             'getRouteKey' => 'foo/bar',
         ]));
 
-        $this->assertSame('../foo.html', (string) NavigationItem::forRoute(new Route(new InMemoryPage('foo'))));
-        $this->assertSame('../foo/bar.html', (string) NavigationItem::forRoute(new Route(new InMemoryPage('foo/bar'))));
+        $this->assertSame('../foo.html', (string) NavigationItem::create(new Route(new InMemoryPage('foo'))));
+        $this->assertSame('../foo/bar.html', (string) NavigationItem::create(new Route(new InMemoryPage('foo/bar'))));
 
         Render::swap(Mockery::mock(RenderData::class, [
             'getRoute' => new Route(new InMemoryPage('foo/bar/baz')),
             'getRouteKey' => 'foo/bar/baz',
         ]));
 
-        $this->assertSame('../../foo.html', (string) NavigationItem::forRoute(new Route(new InMemoryPage('foo'))));
-        $this->assertSame('../../foo/bar.html', (string) NavigationItem::forRoute(new Route(new InMemoryPage('foo/bar'))));
+        $this->assertSame('../../foo.html', (string) NavigationItem::create(new Route(new InMemoryPage('foo'))));
+        $this->assertSame('../../foo/bar.html', (string) NavigationItem::create(new Route(new InMemoryPage('foo/bar'))));
     }
 
     public function testDropdownFacade()
@@ -236,8 +236,8 @@ public function testIsCurrent()
             'getRoute' => new Route(new InMemoryPage('foo')),
             'getRouteKey' => 'foo',
         ]));
-        $this->assertTrue(NavigationItem::forRoute(new Route(new InMemoryPage('foo')))->isActive());
-        $this->assertFalse(NavigationItem::forRoute(new Route(new InMemoryPage('bar')))->isActive());
+        $this->assertTrue(NavigationItem::create(new Route(new InMemoryPage('foo')))->isActive());
+        $this->assertFalse(NavigationItem::create(new Route(new InMemoryPage('bar')))->isActive());
     }
 
     public function testIsCurrentWithExternalRoute()
@@ -262,12 +262,12 @@ public function testGetGroupWithGroup()
 
     public function testGetGroupFromRouteWithGroup()
     {
-        $this->assertSame('foo', NavigationItem::forRoute(new Route(new MarkdownPage(matter: ['navigation.group' => 'foo'])))->getGroupKey());
+        $this->assertSame('foo', NavigationItem::create(new Route(new MarkdownPage(matter: ['navigation.group' => 'foo'])))->getGroupKey());
     }
 
-    public function testGetGroupForRouteWithGroup()
+    public function testGetGroupCreateWithGroup()
     {
-        $this->assertSame('foo', NavigationItem::forRoute(new Route(new MarkdownPage(matter: ['navigation.group' => 'foo'])), 'foo')->getGroupKey());
+        $this->assertSame('foo', NavigationItem::create(new Route(new MarkdownPage(matter: ['navigation.group' => 'foo'])), 'foo')->getGroupKey());
     }
 
     public function testGroupKeysAreNormalized()
diff --git a/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php b/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
index 5f6f27eb683..de571ed18df 100644
--- a/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
@@ -29,7 +29,7 @@ protected function setUp(): void
     protected function testView(): TestView
     {
         return $this->view(view('hyde::components.navigation.navigation-link', [
-            'item' => NavigationItem::forRoute(new Route(new InMemoryPage('foo')), 'Foo'),
+            'item' => NavigationItem::create(new Route(new InMemoryPage('foo')), 'Foo'),
             'attributes' => new ComponentAttributeBag(),
         ]));
     }

From a3659dd3cde634bee8f56f2fe0c86bdd62367a91 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 21 Mar 2024 11:49:24 +0100
Subject: [PATCH 1057/1422] Resolve route data only for routes

---
 .../Features/Navigation/NavigationItem.php         | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index 61b9ce38eba..6449710a636 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -63,12 +63,14 @@ public static function create(Route|string $route, ?string $label = null, ?int $
     {
         $route = $route instanceof Route ? $route : Routes::getOrFail($route);
 
-        return new self(
-            $route,
-            $label ?? $route->getPage()->navigationMenuLabel(),
-            $priority ?? $route->getPage()->navigationMenuPriority(),
-            $group ?? $route->getPage()->navigationMenuGroup(),
-        );
+        if ($route instanceof Route) {
+            return new self(
+                $route,
+                $label ?? $route->getPage()->navigationMenuLabel(),
+                $priority ?? $route->getPage()->navigationMenuPriority(),
+                $group ?? $route->getPage()->navigationMenuGroup(),
+            );
+        }
     }
 
     /**

From 374fba7503be5974e85ac8f9acde6b0253fee30d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 21 Mar 2024 19:04:30 +0100
Subject: [PATCH 1058/1422] Replace ternary assignment with if else block

---
 .../src/Framework/Features/Navigation/NavigationItem.php    | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index 6449710a636..50b6f1734d8 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -61,7 +61,11 @@ public function __construct(Route|string|null $destination, string $label, int $
      */
     public static function create(Route|string $route, ?string $label = null, ?int $priority = null, ?string $group = null): self
     {
-        $route = $route instanceof Route ? $route : Routes::getOrFail($route);
+        if ($route instanceof Route) {
+            $route = $route;
+        } else {
+            $route = Routes::getOrFail($route);
+        }
 
         if ($route instanceof Route) {
             return new self(

From 13d7d4690f649bc4e2e8f73ec52b4a6d3e64b459 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 21 Mar 2024 19:07:12 +0100
Subject: [PATCH 1059/1422] Simplify if else block

---
 .../src/Framework/Features/Navigation/NavigationItem.php      | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index 50b6f1734d8..bdb5c0c0d9b 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -61,9 +61,7 @@ public function __construct(Route|string|null $destination, string $label, int $
      */
     public static function create(Route|string $route, ?string $label = null, ?int $priority = null, ?string $group = null): self
     {
-        if ($route instanceof Route) {
-            $route = $route;
-        } else {
+        if (! $route instanceof Route) {
             $route = Routes::getOrFail($route);
         }
 

From 7369f827e154807f5f3672b65d7595f492580a3b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 21 Mar 2024 19:10:37 +0100
Subject: [PATCH 1060/1422] Use get instead of get or fail

---
 .../src/Framework/Features/Navigation/NavigationItem.php        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index bdb5c0c0d9b..31aa5aef289 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -62,7 +62,7 @@ public function __construct(Route|string|null $destination, string $label, int $
     public static function create(Route|string $route, ?string $label = null, ?int $priority = null, ?string $group = null): self
     {
         if (! $route instanceof Route) {
-            $route = Routes::getOrFail($route);
+            $route = Routes::get($route);
         }
 
         if ($route instanceof Route) {

From 6139fd79209a6dd319557841fac7876532e06876 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 21 Mar 2024 19:12:03 +0100
Subject: [PATCH 1061/1422] Add auxiliary type check

---
 .../src/Framework/Features/Navigation/NavigationItem.php        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index 31aa5aef289..3f65865e6d2 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -65,7 +65,7 @@ public static function create(Route|string $route, ?string $label = null, ?int $
             $route = Routes::get($route);
         }
 
-        if ($route instanceof Route) {
+        if ($route instanceof Route && ! $route instanceof ExternalRoute) {
             return new self(
                 $route,
                 $label ?? $route->getPage()->navigationMenuLabel(),

From 54b6c77f84fcf5c6896ea8823baf5c8a731e7483 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 21 Mar 2024 19:12:21 +0100
Subject: [PATCH 1062/1422] Null coalesce to external route

---
 .../src/Framework/Features/Navigation/NavigationItem.php        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index 3f65865e6d2..aa1e97af2c1 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -62,7 +62,7 @@ public function __construct(Route|string|null $destination, string $label, int $
     public static function create(Route|string $route, ?string $label = null, ?int $priority = null, ?string $group = null): self
     {
         if (! $route instanceof Route) {
-            $route = Routes::get($route);
+            $route = Routes::get($route) ?? new ExternalRoute($route);
         }
 
         if ($route instanceof Route && ! $route instanceof ExternalRoute) {

From bece9050181da55f13d3f9d81d565254335bdc1a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 21 Mar 2024 19:12:48 +0100
Subject: [PATCH 1063/1422] Add default branch to return new self

---
 .../src/Framework/Features/Navigation/NavigationItem.php        | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index aa1e97af2c1..ae590057f25 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -73,6 +73,8 @@ public static function create(Route|string $route, ?string $label = null, ?int $
                 $group ?? $route->getPage()->navigationMenuGroup(),
             );
         }
+
+        return new self($route, $label ?? '', $priority ?? NavigationMenu::DEFAULT, $group);
     }
 
     /**

From 62a01c754159c2761af6e741b3a1e84a144ac812 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 21 Mar 2024 19:13:51 +0100
Subject: [PATCH 1064/1422] Expect external route instead of exception

---
 packages/framework/tests/Unit/NavigationItemTest.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/packages/framework/tests/Unit/NavigationItemTest.php b/packages/framework/tests/Unit/NavigationItemTest.php
index fe3f5c35d10..1c48e6cf307 100644
--- a/packages/framework/tests/Unit/NavigationItemTest.php
+++ b/packages/framework/tests/Unit/NavigationItemTest.php
@@ -6,7 +6,6 @@
 
 use Hyde\Foundation\Facades\Routes;
 use Hyde\Support\Models\ExternalRoute;
-use Hyde\Framework\Exceptions\RouteNotFoundException;
 use Hyde\Framework\Features\Navigation\NavigationItem;
 use Hyde\Pages\InMemoryPage;
 use Hyde\Pages\MarkdownPage;
@@ -167,8 +166,7 @@ public function testCreateWithRouteKey()
 
     public function testCreateWithMissingRouteKey()
     {
-        $this->expectException(RouteNotFoundException::class);
-        NavigationItem::create('foo', 'foo');
+        $this->assertInstanceOf(ExternalRoute::class, NavigationItem::create('foo', 'foo')->getRoute());
     }
 
     public function testCreateWithCustomPriority()

From d521a1360ab0c716498bd69f43650d276de25f15 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 21 Mar 2024 19:37:20 +0100
Subject: [PATCH 1065/1422] Update helper to defer to new create method

---
 .../src/Framework/Features/Navigation/NavigationItem.php        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index ae590057f25..f4fa5a7eed9 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -84,7 +84,7 @@ public static function create(Route|string $route, ?string $label = null, ?int $
      */
     public static function forLink(string $href, string $label, int $priority = NavigationMenu::DEFAULT): self
     {
-        return new self($href, $label, $priority);
+        return self::create($href, $label, $priority);
     }
 
     /**

From c9088b37f24bf855698eed91f73c76934363d54e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 21 Mar 2024 19:44:30 +0100
Subject: [PATCH 1066/1422] Update test names

---
 packages/framework/tests/Unit/GroupedNavigationItemTest.php | 2 +-
 packages/framework/tests/Unit/NavigationItemTest.php        | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/framework/tests/Unit/GroupedNavigationItemTest.php b/packages/framework/tests/Unit/GroupedNavigationItemTest.php
index fdc9f2b3f2b..7647f536819 100644
--- a/packages/framework/tests/Unit/GroupedNavigationItemTest.php
+++ b/packages/framework/tests/Unit/GroupedNavigationItemTest.php
@@ -188,7 +188,7 @@ public function testCreate()
         $this->assertSame(NavigationItem::class, $item::class);
     }
 
-    public function testForLink()
+    public function testCreateWithLink()
     {
         $item = GroupedNavigationItem::forLink('foo', 'bar');
 
diff --git a/packages/framework/tests/Unit/NavigationItemTest.php b/packages/framework/tests/Unit/NavigationItemTest.php
index 1c48e6cf307..9825faba539 100644
--- a/packages/framework/tests/Unit/NavigationItemTest.php
+++ b/packages/framework/tests/Unit/NavigationItemTest.php
@@ -122,7 +122,7 @@ public function testToString()
         $this->assertSame('index.html', (string) NavigationItem::create(Routes::get('index')));
     }
 
-    public function testForLink()
+    public function testCreateWithLink()
     {
         $item = NavigationItem::forLink('foo', 'bar');
 
@@ -131,7 +131,7 @@ public function testForLink()
         $this->assertSame(500, $item->getPriority());
     }
 
-    public function testForLinkWithCustomPriority()
+    public function testCreateWithLinkWithCustomPriority()
     {
         $this->assertSame(100, NavigationItem::forLink('foo', 'bar', 100)->getPriority());
     }

From 83c57f076a914ae1f878ea8cf62d33fe50100d7b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 21 Mar 2024 19:45:52 +0100
Subject: [PATCH 1067/1422] Replace NavigationItem `forLink` method with
 `create`

---
 config/hyde.php                               |  2 +-
 docs/digging-deeper/navigation.md             |  4 +-
 packages/framework/config/hyde.php            |  2 +-
 .../Features/Navigation/NavigationItem.php    | 12 +-----
 .../tests/Feature/NavigationMenuTest.php      | 28 ++++++-------
 .../tests/Unit/GroupedNavigationItemTest.php  |  2 +-
 .../Unit/NavigationItemIsActiveHelperTest.php | 42 +++++++++----------
 .../tests/Unit/NavigationItemTest.php         |  8 ++--
 8 files changed, 45 insertions(+), 55 deletions(-)

diff --git a/config/hyde.php b/config/hyde.php
index 65fa6d4394f..c91370adce7 100644
--- a/config/hyde.php
+++ b/config/hyde.php
@@ -350,7 +350,7 @@
         // To get started quickly, you can uncomment the defaults here.
         // See the documentation link above for more information.
         'custom' => [
-            // NavigationItem::forLink('https://github.com/hydephp/hyde', 'GitHub', 200),
+            // NavigationItem::create('https://github.com/hydephp/hyde', 'GitHub', 200),
         ],
 
         // How should pages in subdirectories be displayed in the menu?
diff --git a/docs/digging-deeper/navigation.md b/docs/digging-deeper/navigation.md
index 761506488f2..b904b37bbbd 100644
--- a/docs/digging-deeper/navigation.md
+++ b/docs/digging-deeper/navigation.md
@@ -232,7 +232,7 @@ To remove items from being automatically added, simply add the page's route key
 
 You can easily add custom navigation menu links similar to how we add Authors. Simply add a `NavigationItem` model to the `navigation.custom` array.
 
-When linking to an external site, you should use the `NavigationItem::forLink()` method facade. The first two arguments are the
+When linking to an external site, you should use the `NavigationItem::create()` method facade. The first two arguments are the
 destination and label, both required. The third argument is the priority, which is optional, and defaults to `500`.
 
 ```php
@@ -241,7 +241,7 @@ use Hyde\Framework\Features\Navigation\NavigationItem;
 
 'navigation' => [
     'custom' => [
-        NavigationItem::forLink('https://github.com/hydephp/hyde', 'GitHub', 200),
+        NavigationItem::create('https://github.com/hydephp/hyde', 'GitHub', 200),
     ]
 ]
 ```
diff --git a/packages/framework/config/hyde.php b/packages/framework/config/hyde.php
index 65fa6d4394f..c91370adce7 100644
--- a/packages/framework/config/hyde.php
+++ b/packages/framework/config/hyde.php
@@ -350,7 +350,7 @@
         // To get started quickly, you can uncomment the defaults here.
         // See the documentation link above for more information.
         'custom' => [
-            // NavigationItem::forLink('https://github.com/hydephp/hyde', 'GitHub', 200),
+            // NavigationItem::create('https://github.com/hydephp/hyde', 'GitHub', 200),
         ],
 
         // How should pages in subdirectories be displayed in the menu?
diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index f4fa5a7eed9..1d4105be39d 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -19,7 +19,7 @@
  * You have a few options to construct a navigation menu item:
  *   1. You can supply a Route directly and explicit properties to the constructor
  *   2. You can use NavigationItem::fromRoute() to use data from the route
- *   3. You can use NavigationItem::forLink() for an external or un-routed link
+ *   3. You can use NavigationItem::create() for an external or un-routed link
  */
 class NavigationItem implements Stringable
 {
@@ -77,16 +77,6 @@ public static function create(Route|string $route, ?string $label = null, ?int $
         return new self($route, $label ?? '', $priority ?? NavigationMenu::DEFAULT, $group);
     }
 
-    /**
-     * Create a new navigation menu item leading to an external URI.
-     *
-     * TODO: Merge into a create method
-     */
-    public static function forLink(string $href, string $label, int $priority = NavigationMenu::DEFAULT): self
-    {
-        return self::create($href, $label, $priority);
-    }
-
     /**
      * Create a new dropdown navigation menu item.
      *
diff --git a/packages/framework/tests/Feature/NavigationMenuTest.php b/packages/framework/tests/Feature/NavigationMenuTest.php
index 2aa73a6e0ac..2c81be2ea36 100644
--- a/packages/framework/tests/Feature/NavigationMenuTest.php
+++ b/packages/framework/tests/Feature/NavigationMenuTest.php
@@ -93,13 +93,13 @@ public function testIsSortedAutomaticallyWhenUsingNavigationMenuCreate()
 
     public function testExternalLinkCanBeAddedInConfig()
     {
-        config(['hyde.navigation.custom' => [NavigationItem::forLink('https://example.com', 'foo')]]);
+        config(['hyde.navigation.custom' => [NavigationItem::create('https://example.com', 'foo')]]);
 
         $menu = $this->createNavigationMenu();
 
         $expected = collect([
             NavigationItem::create(Routes::get('index')),
-            NavigationItem::forLink('https://example.com', 'foo'),
+            NavigationItem::create('https://example.com', 'foo'),
         ]);
 
         $this->assertCount(count($expected), $menu->getItems());
@@ -108,13 +108,13 @@ public function testExternalLinkCanBeAddedInConfig()
 
     public function testPathLinkCanBeAddedInConfig()
     {
-        config(['hyde.navigation.custom' => [NavigationItem::forLink('foo', 'foo')]]);
+        config(['hyde.navigation.custom' => [NavigationItem::create('foo', 'foo')]]);
 
         $menu = $this->createNavigationMenu();
 
         $expected = collect([
             NavigationItem::create(Routes::get('index')),
-            NavigationItem::forLink('foo', 'foo'),
+            NavigationItem::create('foo', 'foo'),
         ]);
 
         $this->assertCount(count($expected), $menu->getItems());
@@ -124,16 +124,16 @@ public function testPathLinkCanBeAddedInConfig()
     public function testDuplicatesAreNotRemovedWhenAddingInConfig()
     {
         config(['hyde.navigation.custom' => [
-            NavigationItem::forLink('foo', 'foo'),
-            NavigationItem::forLink('foo', 'foo'),
+            NavigationItem::create('foo', 'foo'),
+            NavigationItem::create('foo', 'foo'),
         ]]);
 
         $menu = $this->createNavigationMenu();
 
         $expected = collect([
             NavigationItem::create(Routes::get('index')),
-            NavigationItem::forLink('foo', 'foo'),
-            NavigationItem::forLink('foo', 'foo'),
+            NavigationItem::create('foo', 'foo'),
+            NavigationItem::create('foo', 'foo'),
         ]);
 
         $this->assertCount(count($expected), $menu->getItems());
@@ -143,16 +143,16 @@ public function testDuplicatesAreNotRemovedWhenAddingInConfig()
     public function testDuplicatesAreNotRemovedWhenAddingInConfigRegardlessOfDestination()
     {
         config(['hyde.navigation.custom' => [
-            NavigationItem::forLink('foo', 'foo'),
-            NavigationItem::forLink('bar', 'foo'),
+            NavigationItem::create('foo', 'foo'),
+            NavigationItem::create('bar', 'foo'),
         ]]);
 
         $menu = $this->createNavigationMenu();
 
         $expected = collect([
             NavigationItem::create(Routes::get('index')),
-            NavigationItem::forLink('foo', 'foo'),
-            NavigationItem::forLink('bar', 'foo'),
+            NavigationItem::create('foo', 'foo'),
+            NavigationItem::create('bar', 'foo'),
         ]);
 
         $this->assertCount(count($expected), $menu->getItems());
@@ -163,13 +163,13 @@ public function testConfigItemsTakePrecedenceOverGeneratedItems()
     {
         $this->file('_pages/foo.md');
 
-        config(['hyde.navigation.custom' => [NavigationItem::forLink('bar', 'Foo')]]);
+        config(['hyde.navigation.custom' => [NavigationItem::create('bar', 'Foo')]]);
 
         $menu = $this->createNavigationMenu();
 
         $expected = collect([
             NavigationItem::create(Routes::get('index')),
-            NavigationItem::forLink('bar', 'Foo'),
+            NavigationItem::create('bar', 'Foo'),
             NavigationItem::create(Routes::get('foo')),
         ]);
 
diff --git a/packages/framework/tests/Unit/GroupedNavigationItemTest.php b/packages/framework/tests/Unit/GroupedNavigationItemTest.php
index 7647f536819..d08dfc1a740 100644
--- a/packages/framework/tests/Unit/GroupedNavigationItemTest.php
+++ b/packages/framework/tests/Unit/GroupedNavigationItemTest.php
@@ -190,7 +190,7 @@ public function testCreate()
 
     public function testCreateWithLink()
     {
-        $item = GroupedNavigationItem::forLink('foo', 'bar');
+        $item = GroupedNavigationItem::create('foo', 'bar');
 
         $this->assertInstanceOf(NavigationItem::class, $item);
         $this->assertNotInstanceOf(GroupedNavigationItem::class, $item);
diff --git a/packages/framework/tests/Unit/NavigationItemIsActiveHelperTest.php b/packages/framework/tests/Unit/NavigationItemIsActiveHelperTest.php
index b5a089ff0db..e747d0b9f0f 100644
--- a/packages/framework/tests/Unit/NavigationItemIsActiveHelperTest.php
+++ b/packages/framework/tests/Unit/NavigationItemIsActiveHelperTest.php
@@ -52,7 +52,7 @@ public function testIsCurrentUsingCurrentRoute()
     public function testIsCurrentUsingCurrentLink()
     {
         $this->mockRenderData($this->makeRoute('index'));
-        $this->assertTrue(NavigationItem::forLink('index.html', 'Home')->isActive());
+        $this->assertTrue(NavigationItem::create('index.html', 'Home')->isActive());
     }
 
     public function testIsCurrentWhenNotCurrent()
@@ -70,7 +70,7 @@ public function testIsCurrentUsingNotCurrentRoute()
     public function testIsCurrentUsingNotCurrentLink()
     {
         $this->mockRenderData($this->makeRoute('foo'));
-        $this->assertFalse(NavigationItem::forLink('index.html', 'Home')->isActive());
+        $this->assertFalse(NavigationItem::create('index.html', 'Home')->isActive());
     }
 
     public function testIsCurrentWithNestedCurrentPage()
@@ -124,115 +124,115 @@ public function testIsCurrentWithNestedCurrentPageWhenVeryDifferingNestedInverse
     public function testIsCurrentUsingCurrentLinkWithNestedCurrentPage()
     {
         $this->mockRenderData($this->makeRoute('foo/bar'));
-        $this->assertFalse(NavigationItem::forLink('foo/bar.html', 'foo')->isActive());
+        $this->assertFalse(NavigationItem::create('foo/bar.html', 'foo')->isActive());
     }
 
     public function testIsCurrentUsingNotCurrentLinkWithNestedCurrentPage()
     {
         $this->mockRenderData($this->makeRoute('foo/bar'));
-        $this->assertFalse(NavigationItem::forLink('foo.html', 'foo')->isActive());
+        $this->assertFalse(NavigationItem::create('foo.html', 'foo')->isActive());
     }
 
     public function testIsCurrentWhenCurrentWithNestedCurrentPageAndSubjectPage()
     {
         $this->mockRenderData($this->makeRoute('foo/bar'));
-        $this->assertFalse(NavigationItem::forLink('foo/bar.html', 'foo')->isActive());
+        $this->assertFalse(NavigationItem::create('foo/bar.html', 'foo')->isActive());
     }
 
     public function testIsCurrentWhenNotCurrentWithNestedCurrentPageAndSubjectPage()
     {
         $this->mockRenderData($this->makeRoute('foo/bar'));
-        $this->assertFalse(NavigationItem::forLink('foo/baz.html', 'foo')->isActive());
+        $this->assertFalse(NavigationItem::create('foo/baz.html', 'foo')->isActive());
     }
 
     public function testIsCurrentWithNestedCurrentPageWhenNestedUsingLinkItem()
     {
         $this->mockRenderData($this->makeRoute('foo/bar'));
-        $this->assertFalse(NavigationItem::forLink('foo/bar.html', 'foo')->isActive());
+        $this->assertFalse(NavigationItem::create('foo/bar.html', 'foo')->isActive());
     }
 
     public function testIsCurrentWhenCurrentWithNestedCurrentPageWhenNestedUsingLinkItem()
     {
         $this->mockRenderData($this->makeRoute('foo/bar'));
-        $this->assertFalse(NavigationItem::forLink('foo/baz.html', 'foo')->isActive());
+        $this->assertFalse(NavigationItem::create('foo/baz.html', 'foo')->isActive());
     }
 
     public function testIsCurrentWithNestedCurrentPageWhenVeryNestedUsingLinkItem()
     {
         $this->mockRenderData($this->makeRoute('foo/bar/baz'));
-        $this->assertFalse(NavigationItem::forLink('foo/bar/baz.html', 'foo')->isActive());
+        $this->assertFalse(NavigationItem::create('foo/bar/baz.html', 'foo')->isActive());
     }
 
     public function testIsCurrentWhenCurrentWithNestedCurrentPageWhenVeryNestedUsingLinkItem()
     {
         $this->mockRenderData($this->makeRoute('foo/bar/baz'));
-        $this->assertFalse(NavigationItem::forLink('foo/baz/bar.html', 'foo')->isActive());
+        $this->assertFalse(NavigationItem::create('foo/baz/bar.html', 'foo')->isActive());
     }
 
     public function testIsCurrentWithNestedCurrentPageWhenVeryDifferingNestedUsingLinkItem()
     {
         $this->mockRenderData($this->makeRoute('foo'));
-        $this->assertFalse(NavigationItem::forLink('foo/bar/baz.html', 'foo')->isActive());
+        $this->assertFalse(NavigationItem::create('foo/bar/baz.html', 'foo')->isActive());
     }
 
     public function testIsCurrentWithNestedCurrentPageWhenVeryDifferingNestedInverseUsingLinkItem()
     {
         $this->mockRenderData($this->makeRoute('foo/bar/baz'));
-        $this->assertFalse(NavigationItem::forLink('foo.html', 'foo')->isActive());
+        $this->assertFalse(NavigationItem::create('foo.html', 'foo')->isActive());
     }
 
     public function testIsCurrentWithNestedCurrentPageWhenNestedUsingPrettyLinkItem()
     {
         $this->mockRenderData($this->makeRoute('foo/bar'));
-        $this->assertFalse(NavigationItem::forLink('foo/bar', 'foo')->isActive());
+        $this->assertFalse(NavigationItem::create('foo/bar', 'foo')->isActive());
     }
 
     public function testIsCurrentWhenCurrentWithNestedCurrentPageWhenNestedUsingPrettyLinkItem()
     {
         $this->mockRenderData($this->makeRoute('foo/bar'));
-        $this->assertFalse(NavigationItem::forLink('foo/baz', 'foo')->isActive());
+        $this->assertFalse(NavigationItem::create('foo/baz', 'foo')->isActive());
     }
 
     public function testIsCurrentWithNestedCurrentPageWhenVeryNestedUsingPrettyLinkItem()
     {
         $this->mockRenderData($this->makeRoute('foo/bar/baz'));
-        $this->assertFalse(NavigationItem::forLink('foo/bar/baz', 'foo')->isActive());
+        $this->assertFalse(NavigationItem::create('foo/bar/baz', 'foo')->isActive());
     }
 
     public function testIsCurrentWhenCurrentWithNestedCurrentPageWhenVeryNestedUsingPrettyLinkItem()
     {
         $this->mockRenderData($this->makeRoute('foo/bar/baz'));
-        $this->assertFalse(NavigationItem::forLink('foo/baz/bar', 'foo')->isActive());
+        $this->assertFalse(NavigationItem::create('foo/baz/bar', 'foo')->isActive());
     }
 
     public function testIsCurrentWithNestedCurrentPageWhenVeryDifferingNestedUsingPrettyLinkItem()
     {
         $this->mockRenderData($this->makeRoute('foo'));
-        $this->assertFalse(NavigationItem::forLink('foo/bar/baz', 'foo')->isActive());
+        $this->assertFalse(NavigationItem::create('foo/bar/baz', 'foo')->isActive());
     }
 
     public function testIsCurrentWithNestedCurrentPageWhenVeryDifferingNestedInverseUsingPrettyLinkItem()
     {
         $this->mockRenderData($this->makeRoute('foo/bar/baz'));
-        $this->assertFalse(NavigationItem::forLink('foo', 'foo')->isActive());
+        $this->assertFalse(NavigationItem::create('foo', 'foo')->isActive());
     }
 
     public function testIsCurrentWithAbsoluteLink()
     {
         $this->mockRenderData($this->makeRoute('foo'));
-        $this->assertFalse(NavigationItem::forLink('/foo', 'foo')->isActive());
+        $this->assertFalse(NavigationItem::create('/foo', 'foo')->isActive());
     }
 
     public function testIsCurrentWithNestedCurrentPageWhenNestedUsingAbsoluteLinkItem()
     {
         $this->mockRenderData($this->makeRoute('foo/bar'));
-        $this->assertFalse(NavigationItem::forLink('/foo/bar', 'foo')->isActive());
+        $this->assertFalse(NavigationItem::create('/foo/bar', 'foo')->isActive());
     }
 
     public function testIsCurrentWhenCurrentWithNestedCurrentPageWhenNestedUsingAbsoluteLinkItem()
     {
         $this->mockRenderData($this->makeRoute('foo/bar/baz'));
-        $this->assertFalse(NavigationItem::forLink('/foo/bar/baz', 'foo')->isActive());
+        $this->assertFalse(NavigationItem::create('/foo/bar/baz', 'foo')->isActive());
     }
 
     protected function mockRenderData(Route $route): void
diff --git a/packages/framework/tests/Unit/NavigationItemTest.php b/packages/framework/tests/Unit/NavigationItemTest.php
index 9825faba539..4f6894c93c5 100644
--- a/packages/framework/tests/Unit/NavigationItemTest.php
+++ b/packages/framework/tests/Unit/NavigationItemTest.php
@@ -124,7 +124,7 @@ public function testToString()
 
     public function testCreateWithLink()
     {
-        $item = NavigationItem::forLink('foo', 'bar');
+        $item = NavigationItem::create('foo', 'bar');
 
         $this->assertEquals(new ExternalRoute('foo'), $item->getRoute());
         $this->assertSame('bar', $item->getLabel());
@@ -133,7 +133,7 @@ public function testCreateWithLink()
 
     public function testCreateWithLinkWithCustomPriority()
     {
-        $this->assertSame(100, NavigationItem::forLink('foo', 'bar', 100)->getPriority());
+        $this->assertSame(100, NavigationItem::create('foo', 'bar', 100)->getPriority());
     }
 
     public function testCreate()
@@ -244,8 +244,8 @@ public function testIsCurrentWithExternalRoute()
             'getRoute' => new Route(new InMemoryPage('foo')),
             'getRouteKey' => 'foo',
         ]));
-        $this->assertFalse(NavigationItem::forLink('foo', 'bar')->isActive());
-        $this->assertFalse(NavigationItem::forLink('https://example.com', 'bar')->isActive());
+        $this->assertFalse(NavigationItem::create('foo', 'bar')->isActive());
+        $this->assertFalse(NavigationItem::create('https://example.com', 'bar')->isActive());
     }
 
     public function testGetGroupWithNoGroup()

From 495ee7dc0438ee8eb4071547aaee37b85efe5859 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 21 Mar 2024 19:49:33 +0100
Subject: [PATCH 1068/1422] Normalize comparison with constructor

---
 .../src/Framework/Features/Navigation/NavigationItem.php        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index 1d4105be39d..62a4610117b 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -61,7 +61,7 @@ public function __construct(Route|string|null $destination, string $label, int $
      */
     public static function create(Route|string $route, ?string $label = null, ?int $priority = null, ?string $group = null): self
     {
-        if (! $route instanceof Route) {
+        if (is_string($route)) {
             $route = Routes::get($route) ?? new ExternalRoute($route);
         }
 

From bd773c04635bae14d4c15cc5d9b7d9317d94b712 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 21 Mar 2024 19:49:51 +0100
Subject: [PATCH 1069/1422] Update parameter docs

---
 .../src/Framework/Features/Navigation/NavigationItem.php        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index 62a4610117b..840c528feb0 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -54,7 +54,7 @@ public function __construct(Route|string|null $destination, string $label, int $
     /**
      * Create a new navigation menu item, automatically filling in the properties from a Route instance if provided.
      *
-     * @param  \Hyde\Support\Models\Route|string<\Hyde\Support\Models\RouteKey>  $route  Route instance or route key
+     * @param  \Hyde\Support\Models\Route|string<\Hyde\Support\Models\RouteKey>  $route  Route instance or route key, or external URI.
      * @param  int|null  $priority  Leave blank to use the priority of the route's corresponding page.
      * @param  string|null  $label  Leave blank to use the label of the route's corresponding page.
      * @param  string|null  $group  Leave blank to use the group of the route's corresponding page.

From fd65310f39764f33115f74178273ee171c196855 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 21 Mar 2024 19:50:24 +0100
Subject: [PATCH 1070/1422] Update parameter docs

---
 .../src/Framework/Features/Navigation/NavigationItem.php    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index 840c528feb0..00e72c03c76 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -55,9 +55,9 @@ public function __construct(Route|string|null $destination, string $label, int $
      * Create a new navigation menu item, automatically filling in the properties from a Route instance if provided.
      *
      * @param  \Hyde\Support\Models\Route|string<\Hyde\Support\Models\RouteKey>  $route  Route instance or route key, or external URI.
-     * @param  int|null  $priority  Leave blank to use the priority of the route's corresponding page.
-     * @param  string|null  $label  Leave blank to use the label of the route's corresponding page.
-     * @param  string|null  $group  Leave blank to use the group of the route's corresponding page.
+     * @param  int|null  $priority  Leave blank to use the priority of the route's corresponding page, if there is one tied to the route.
+     * @param  string|null  $label  Leave blank to use the label of the route's corresponding page, if there is one tied to the route.
+     * @param  string|null  $group  Leave blank to use the group of the route's corresponding page, if there is one tied to the route.
      */
     public static function create(Route|string $route, ?string $label = null, ?int $priority = null, ?string $group = null): self
     {

From 41416cd1960fd40f573539cd6a202857a7edc423 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 21 Mar 2024 19:51:25 +0100
Subject: [PATCH 1071/1422] Update named parameter to destination

---
 .../Features/Navigation/NavigationItem.php    | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index 00e72c03c76..f801dd75b80 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -54,27 +54,27 @@ public function __construct(Route|string|null $destination, string $label, int $
     /**
      * Create a new navigation menu item, automatically filling in the properties from a Route instance if provided.
      *
-     * @param  \Hyde\Support\Models\Route|string<\Hyde\Support\Models\RouteKey>  $route  Route instance or route key, or external URI.
+     * @param  \Hyde\Support\Models\Route|string<\Hyde\Support\Models\RouteKey>  $destination  Route instance or route key, or external URI.
      * @param  int|null  $priority  Leave blank to use the priority of the route's corresponding page, if there is one tied to the route.
      * @param  string|null  $label  Leave blank to use the label of the route's corresponding page, if there is one tied to the route.
      * @param  string|null  $group  Leave blank to use the group of the route's corresponding page, if there is one tied to the route.
      */
-    public static function create(Route|string $route, ?string $label = null, ?int $priority = null, ?string $group = null): self
+    public static function create(Route|string $destination, ?string $label = null, ?int $priority = null, ?string $group = null): self
     {
-        if (is_string($route)) {
-            $route = Routes::get($route) ?? new ExternalRoute($route);
+        if (is_string($destination)) {
+            $destination = Routes::get($destination) ?? new ExternalRoute($destination);
         }
 
-        if ($route instanceof Route && ! $route instanceof ExternalRoute) {
+        if ($destination instanceof Route && ! $destination instanceof ExternalRoute) {
             return new self(
-                $route,
-                $label ?? $route->getPage()->navigationMenuLabel(),
-                $priority ?? $route->getPage()->navigationMenuPriority(),
-                $group ?? $route->getPage()->navigationMenuGroup(),
+                $destination,
+                $label ?? $destination->getPage()->navigationMenuLabel(),
+                $priority ?? $destination->getPage()->navigationMenuPriority(),
+                $group ?? $destination->getPage()->navigationMenuGroup(),
             );
         }
 
-        return new self($route, $label ?? '', $priority ?? NavigationMenu::DEFAULT, $group);
+        return new self($destination, $label ?? '', $priority ?? NavigationMenu::DEFAULT, $group);
     }
 
     /**

From 76fc723d00a8a2b91526cb6622f9817d89a1db58 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 21 Mar 2024 19:51:40 +0100
Subject: [PATCH 1072/1422] Union annotate plain string type

---
 .../src/Framework/Features/Navigation/NavigationItem.php        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index f801dd75b80..9a8b9cdf445 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -54,7 +54,7 @@ public function __construct(Route|string|null $destination, string $label, int $
     /**
      * Create a new navigation menu item, automatically filling in the properties from a Route instance if provided.
      *
-     * @param  \Hyde\Support\Models\Route|string<\Hyde\Support\Models\RouteKey>  $destination  Route instance or route key, or external URI.
+     * @param  \Hyde\Support\Models\Route|string<\Hyde\Support\Models\RouteKey>|string  $destination  Route instance or route key, or external URI.
      * @param  int|null  $priority  Leave blank to use the priority of the route's corresponding page, if there is one tied to the route.
      * @param  string|null  $label  Leave blank to use the label of the route's corresponding page, if there is one tied to the route.
      * @param  string|null  $group  Leave blank to use the group of the route's corresponding page, if there is one tied to the route.

From c882f7936c00bc11caa9a1615491eb2ce399c07b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 21 Mar 2024 19:53:33 +0100
Subject: [PATCH 1073/1422] Update todo

---
 .../src/Framework/Features/Navigation/NavigationItem.php        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index 9a8b9cdf445..7888d3441ea 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -80,7 +80,7 @@ public static function create(Route|string $destination, ?string $label = null,
     /**
      * Create a new dropdown navigation menu item.
      *
-     * TODO: Move to GroupedNavigationItem::create()
+     * TODO: Move to GroupedNavigationItem::create() as this solves the naming issue, and because it makes little sense for it to be here. It also resolves the self/static issue.
      *
      * @param  string  $label  The label of the dropdown item.
      * @param  array<NavigationItem>  $items  The items to be included in the dropdown.

From 215240d50d26f07e1940a1818e8e7020465a69cb Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 21 Mar 2024 19:54:22 +0100
Subject: [PATCH 1074/1422] Override parent method

---
 .../Framework/Features/Navigation/GroupedNavigationItem.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/GroupedNavigationItem.php b/packages/framework/src/Framework/Features/Navigation/GroupedNavigationItem.php
index 0d12290e855..6f980312ad2 100644
--- a/packages/framework/src/Framework/Features/Navigation/GroupedNavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/GroupedNavigationItem.php
@@ -4,6 +4,7 @@
 
 namespace Hyde\Framework\Features\Navigation;
 
+use Hyde\Support\Models\Route;
 use Hyde\Pages\DocumentationPage;
 use Hyde\Support\Models\ExternalRoute;
 
@@ -27,6 +28,11 @@ public function __construct(string $label, array $items = [], int $priority = Na
         $this->addItems($items);
     }
 
+    public static function create(Route|string $destination, ?string $label = null, ?int $priority = null, ?string $group = null): NavigationItem
+    {
+        return parent::create($destination, $label, $priority, $group);
+    }
+
     /**
      * Get the items of the grouped navigation item.
      *

From 37ee6e355a84110862b3c486b362dfd4905c429c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 21 Mar 2024 20:04:12 +0100
Subject: [PATCH 1075/1422] Deprecate GroupedNavigationItem

---
 .../src/Framework/Features/Navigation/GroupedNavigationItem.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/GroupedNavigationItem.php b/packages/framework/src/Framework/Features/Navigation/GroupedNavigationItem.php
index 6f980312ad2..ec25d844126 100644
--- a/packages/framework/src/Framework/Features/Navigation/GroupedNavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/GroupedNavigationItem.php
@@ -15,6 +15,8 @@
  * Abstraction for a grouped navigation menu item. For main navigation menus, this is a dropdown.
  *
  * @todo Consider extracting trait for shared code with navigation menu class
+ *
+ * @deprecated Use NavigationGroup instead
  */
 class GroupedNavigationItem extends NavigationItem
 {

From be3510d306ef70302b17feb0593b8093d996ca09 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 21 Mar 2024 20:04:57 +0100
Subject: [PATCH 1076/1422] Deprecate forGroup method

---
 .../src/Framework/Features/Navigation/NavigationItem.php        | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index 7888d3441ea..16a3b689d22 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -80,6 +80,8 @@ public static function create(Route|string $destination, ?string $label = null,
     /**
      * Create a new dropdown navigation menu item.
      *
+     * @deprecated Use NavigationGroup::create() instead.
+     *
      * TODO: Move to GroupedNavigationItem::create() as this solves the naming issue, and because it makes little sense for it to be here. It also resolves the self/static issue.
      *
      * @param  string  $label  The label of the dropdown item.

From 5c0ed74ced2ac1919a682aee98432f4196bd6ff4 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 21 Mar 2024 20:05:50 +0100
Subject: [PATCH 1077/1422] Create NavigationGroup.php

---
 .../Framework/Features/Navigation/NavigationGroup.php  | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 packages/framework/src/Framework/Features/Navigation/NavigationGroup.php

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
new file mode 100644
index 00000000000..92ba7abe4d5
--- /dev/null
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Hyde\Framework\Features\Navigation;
+
+class NavigationGroup
+{
+    //
+}

From d23f57473c73c05a48882ed6f23a9c28408f6f64 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 21 Mar 2024 20:14:09 +0100
Subject: [PATCH 1078/1422] Add todo

---
 .../src/Framework/Features/Navigation/NavigationItem.php        | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index 16a3b689d22..39bb0d3d724 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -16,6 +16,8 @@
 /**
  * Abstraction for a navigation menu item. Used by the MainNavigationMenu and DocumentationSidebar classes.
  *
+ * @todo Consider adding a NavigationElement contract to this class and new NavigationGroup class for shared methods and to allow easier type hinting.
+ *
  * You have a few options to construct a navigation menu item:
  *   1. You can supply a Route directly and explicit properties to the constructor
  *   2. You can use NavigationItem::fromRoute() to use data from the route

From a3fc9ddee4bab7c3cc308fcfb25ac6d86910755d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 21 Mar 2024 20:17:25 +0100
Subject: [PATCH 1079/1422] Add items array

---
 .../src/Framework/Features/Navigation/NavigationGroup.php      | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
index 92ba7abe4d5..f78ae1a277a 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
@@ -6,5 +6,6 @@
 
 class NavigationGroup
 {
-    //
+    /** @var array<\Hyde\Framework\Features\Navigation\NavigationItem> */
+    protected array $items = [];
 }

From 77cf42839d0ad45addd76a8d23817366deaad2df Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 21 Mar 2024 20:18:09 +0100
Subject: [PATCH 1080/1422] Add label and priority properties

---
 .../src/Framework/Features/Navigation/NavigationGroup.php       | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
index f78ae1a277a..8b062a7d19a 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
@@ -8,4 +8,6 @@ class NavigationGroup
 {
     /** @var array<\Hyde\Framework\Features\Navigation\NavigationItem> */
     protected array $items = [];
+    protected string $label;
+    protected int $priority;
 }

From 8e284b038f8312e03ea022bd89e5793737f5ff33 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 21 Mar 2024 20:18:34 +0100
Subject: [PATCH 1081/1422] Create base constructor

---
 .../src/Framework/Features/Navigation/NavigationGroup.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
index 8b062a7d19a..7ae32b8e49d 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
@@ -10,4 +10,12 @@ class NavigationGroup
     protected array $items = [];
     protected string $label;
     protected int $priority;
+
+    public function __construct(string $label, array $items = [], int $priority = NavigationMenu::LAST)
+    {
+        $this->label = $label;
+        $this->priority = $priority;
+
+        $this->addItems($items);
+    }
 }

From 3598621c7e55237e32695cd08aae9b5f020be51c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 21 Mar 2024 20:20:25 +0100
Subject: [PATCH 1082/1422] Add base create method

---
 .../src/Framework/Features/Navigation/NavigationGroup.php    | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
index 7ae32b8e49d..0da083dcdca 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
@@ -18,4 +18,9 @@ public function __construct(string $label, array $items = [], int $priority = Na
 
         $this->addItems($items);
     }
+
+    public static function create(string $label, array $items = [], int $priority = NavigationMenu::LAST): static
+    {
+        return new static($label, $items, $priority);
+    }
 }

From fd34e6afbc70c7a7d34501d14ce03bb58afc5c36 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 21 Mar 2024 20:20:52 +0100
Subject: [PATCH 1083/1422] Add items getter

---
 .../src/Framework/Features/Navigation/NavigationGroup.php   | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
index 0da083dcdca..c07d0198fa2 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
@@ -23,4 +23,10 @@ public static function create(string $label, array $items = [], int $priority =
     {
         return new static($label, $items, $priority);
     }
+
+    /** @return array<\Hyde\Framework\Features\Navigation\NavigationItem> */
+    public function getItems(): array
+    {
+        return $this->items;
+    }
 }

From a2dc2f3b9ac41485b834ee791eae89904b36201b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 21 Mar 2024 20:21:44 +0100
Subject: [PATCH 1084/1422] Copy over base items adder methods

---
 .../Features/Navigation/NavigationGroup.php   | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
index c07d0198fa2..b1a8ecb4522 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
@@ -29,4 +29,23 @@ public function getItems(): array
     {
         return $this->items;
     }
+
+    public function addItem(NavigationItem $item): static
+    {
+        $item->group ??= $this->group;
+
+        $this->items[] = $item;
+
+        return $this;
+    }
+
+    /** @param  array<\Hyde\Framework\Features\Navigation\NavigationItem>  $items */
+    public function addItems(array $items): static
+    {
+        foreach ($items as $item) {
+            $this->addItem($item);
+        }
+
+        return $this;
+    }
 }

From 9f5c1ab3ff012b13c7ed59ee9936b02dde01d24f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 21 Mar 2024 20:22:46 +0100
Subject: [PATCH 1085/1422] Deprecate operation

---
 .../src/Framework/Features/Navigation/NavigationGroup.php        | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
index b1a8ecb4522..0a3bd1b71c2 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
@@ -32,6 +32,7 @@ public function getItems(): array
 
     public function addItem(NavigationItem $item): static
     {
+        /** @deprecated I don't think we necessarily need to care about this */
         $item->group ??= $this->group;
 
         $this->items[] = $item;

From c67fc320cfc0cb8eaca8982f415622fa52d612b7 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 21 Mar 2024 20:23:46 +0100
Subject: [PATCH 1086/1422] Copy over priority accessor

---
 .../Features/Navigation/NavigationGroup.php   | 31 +++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
index 0a3bd1b71c2..6baf501bc52 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
@@ -4,6 +4,12 @@
 
 namespace Hyde\Framework\Features\Navigation;
 
+use Hyde\Pages\DocumentationPage;
+use Hyde\Support\Models\ExternalRoute;
+
+use function min;
+use function collect;
+
 class NavigationGroup
 {
     /** @var array<\Hyde\Framework\Features\Navigation\NavigationItem> */
@@ -49,4 +55,29 @@ public function addItems(array $items): static
 
         return $this;
     }
+
+    /**
+     * Get the priority to determine the order of the grouped navigation item.
+     *
+     * For sidebar groups, this is the priority of the lowest priority child, unless the dropdown itself has a lower priority.
+     */
+    public function getPriority(): int
+    {
+        if ($this->containsOnlyDocumentationPages()) {
+            return min($this->priority, collect($this->getItems())->min(fn (NavigationItem $child): int => $child->getPriority()));
+        }
+
+        return $this->priority;
+    }
+
+    protected function containsOnlyDocumentationPages(): bool
+    {
+        if (empty($this->getItems())) {
+            return false;
+        }
+
+        return collect($this->getItems())->every(function (NavigationItem $child): bool {
+            return (! $child->getRoute() instanceof ExternalRoute) && $child->getRoute()->getPage() instanceof DocumentationPage;
+        });
+    }
 }

From 0f3be7ff01eb8fcb3a1df8d596ccb6fb3474fb03 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 21 Mar 2024 20:27:14 +0100
Subject: [PATCH 1087/1422] Create temporary deprecated helper to aid in
 refactor

---
 .../src/Framework/Features/Navigation/NavigationGroup.php   | 3 ++-
 .../src/Framework/Features/Navigation/NavigationItem.php    | 6 ++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
index 6baf501bc52..f0e3cb58ba4 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
@@ -4,6 +4,7 @@
 
 namespace Hyde\Framework\Features\Navigation;
 
+use Illuminate\Support\Str;
 use Hyde\Pages\DocumentationPage;
 use Hyde\Support\Models\ExternalRoute;
 
@@ -39,7 +40,7 @@ public function getItems(): array
     public function addItem(NavigationItem $item): static
     {
         /** @deprecated I don't think we necessarily need to care about this */
-        $item->group ??= $this->group;
+        $item->setGroup($item->getGroupKey() ?? Str::slug($this->label));
 
         $this->items[] = $item;
 
diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index 39bb0d3d724..032b4905823 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -161,4 +161,10 @@ public static function normalizeGroupKey(?string $group): ?string
     {
         return $group ? Str::slug($group) : null;
     }
+
+    /** @deprecated Temporary to reduce issues during refactoring */
+    public function setGroup(string $group): void
+    {
+        $this->group = $group;
+    }
 }

From 24cc0885a694807b7b1942f72b2c4d28cb66a6c6 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 21 Mar 2024 20:33:07 +0100
Subject: [PATCH 1088/1422] Revert "Override parent method"

This reverts commit 215240d50d26f07e1940a1818e8e7020465a69cb.
---
 .../Framework/Features/Navigation/GroupedNavigationItem.php | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GroupedNavigationItem.php b/packages/framework/src/Framework/Features/Navigation/GroupedNavigationItem.php
index ec25d844126..0edf19b15e1 100644
--- a/packages/framework/src/Framework/Features/Navigation/GroupedNavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/GroupedNavigationItem.php
@@ -4,7 +4,6 @@
 
 namespace Hyde\Framework\Features\Navigation;
 
-use Hyde\Support\Models\Route;
 use Hyde\Pages\DocumentationPage;
 use Hyde\Support\Models\ExternalRoute;
 
@@ -30,11 +29,6 @@ public function __construct(string $label, array $items = [], int $priority = Na
         $this->addItems($items);
     }
 
-    public static function create(Route|string $destination, ?string $label = null, ?int $priority = null, ?string $group = null): NavigationItem
-    {
-        return parent::create($destination, $label, $priority, $group);
-    }
-
     /**
      * Get the items of the grouped navigation item.
      *

From 44eca8f11a85fbafc4afeb2561432a54a8e344a0 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 21 Mar 2024 20:33:54 +0100
Subject: [PATCH 1089/1422] Shift class description to new class

---
 .../Framework/Features/Navigation/GroupedNavigationItem.php  | 4 ----
 .../src/Framework/Features/Navigation/NavigationGroup.php    | 5 +++++
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GroupedNavigationItem.php b/packages/framework/src/Framework/Features/Navigation/GroupedNavigationItem.php
index 0edf19b15e1..b5b02dfd8e5 100644
--- a/packages/framework/src/Framework/Features/Navigation/GroupedNavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/GroupedNavigationItem.php
@@ -11,10 +11,6 @@
 use function collect;
 
 /**
- * Abstraction for a grouped navigation menu item. For main navigation menus, this is a dropdown.
- *
- * @todo Consider extracting trait for shared code with navigation menu class
- *
  * @deprecated Use NavigationGroup instead
  */
 class GroupedNavigationItem extends NavigationItem
diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
index f0e3cb58ba4..bfadeab01b0 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
@@ -11,6 +11,11 @@
 use function min;
 use function collect;
 
+/**
+ * Abstraction for a grouped navigation menu item. For main navigation menus, this is a dropdown.
+ *
+ * @todo Consider extracting trait for shared code with navigation menu class
+ */
 class NavigationGroup
 {
     /** @var array<\Hyde\Framework\Features\Navigation\NavigationItem> */

From 8b29e17f7c3cd62ecc7eea4c2c335e58d9f62f1d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 21 Mar 2024 20:34:16 +0100
Subject: [PATCH 1090/1422] Remove non vital lines from class being removed

---
 .../Navigation/GroupedNavigationItem.php      | 24 -------------------
 1 file changed, 24 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GroupedNavigationItem.php b/packages/framework/src/Framework/Features/Navigation/GroupedNavigationItem.php
index b5b02dfd8e5..de98b73ed38 100644
--- a/packages/framework/src/Framework/Features/Navigation/GroupedNavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/GroupedNavigationItem.php
@@ -7,15 +7,11 @@
 use Hyde\Pages\DocumentationPage;
 use Hyde\Support\Models\ExternalRoute;
 
-use function min;
-use function collect;
-
 /**
  * @deprecated Use NavigationGroup instead
  */
 class GroupedNavigationItem extends NavigationItem
 {
-    /** @var array<\Hyde\Framework\Features\Navigation\NavigationItem> */
     protected array $items = [];
 
     public function __construct(string $label, array $items = [], int $priority = NavigationMenu::LAST)
@@ -25,21 +21,11 @@ public function __construct(string $label, array $items = [], int $priority = Na
         $this->addItems($items);
     }
 
-    /**
-     * Get the items of the grouped navigation item.
-     *
-     * For the main navigation menu, this stores any dropdown items.
-     *
-     * @return array<\Hyde\Framework\Features\Navigation\NavigationItem>
-     */
     public function getItems(): array
     {
         return $this->items;
     }
 
-    /**
-     * Add a navigation item to the grouped navigation item.
-     */
     public function addItem(NavigationItem $item): static
     {
         $item->group ??= $this->group;
@@ -49,11 +35,6 @@ public function addItem(NavigationItem $item): static
         return $this;
     }
 
-    /**
-     * Add multiple navigation items to the grouped navigation item.
-     *
-     * @param  array<\Hyde\Framework\Features\Navigation\NavigationItem>  $items
-     */
     public function addItems(array $items): static
     {
         foreach ($items as $item) {
@@ -63,11 +44,6 @@ public function addItems(array $items): static
         return $this;
     }
 
-    /**
-     * Get the priority to determine the order of the grouped navigation item.
-     *
-     * For sidebar groups, this is the priority of the lowest priority child, unless the dropdown has a lower priority.
-     */
     public function getPriority(): int
     {
         if ($this->containsOnlyDocumentationPages()) {

From ad24ae91a51b933a85a7420d4df5c41f26e2ea21 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 21 Mar 2024 20:37:24 +0100
Subject: [PATCH 1091/1422] Create NavigationGroupTest.php

---
 .../framework/tests/Unit/NavigationGroupTest.php  | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 packages/framework/tests/Unit/NavigationGroupTest.php

diff --git a/packages/framework/tests/Unit/NavigationGroupTest.php b/packages/framework/tests/Unit/NavigationGroupTest.php
new file mode 100644
index 00000000000..5ef3fd18f8c
--- /dev/null
+++ b/packages/framework/tests/Unit/NavigationGroupTest.php
@@ -0,0 +1,15 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Hyde\Framework\Testing\Unit;
+
+use Hyde\Testing\UnitTestCase;
+
+/**
+ * @covers \Hyde\Framework\Features\Navigation\NavigationGroup
+ */
+class NavigationGroupTest extends UnitTestCase
+{
+    //
+}

From 7e90b392dee38fd5bbf253060c1e70513a03d4cd Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 21 Mar 2024 20:37:52 +0100
Subject: [PATCH 1092/1422] Copy over tests from replaced class

---
 .../tests/Unit/NavigationGroupTest.php        | 198 +++++++++++++++++-
 1 file changed, 197 insertions(+), 1 deletion(-)

diff --git a/packages/framework/tests/Unit/NavigationGroupTest.php b/packages/framework/tests/Unit/NavigationGroupTest.php
index 5ef3fd18f8c..7430eba44e1 100644
--- a/packages/framework/tests/Unit/NavigationGroupTest.php
+++ b/packages/framework/tests/Unit/NavigationGroupTest.php
@@ -4,12 +4,208 @@
 
 namespace Hyde\Framework\Testing\Unit;
 
+use Hyde\Pages\MarkdownPage;
+use Hyde\Pages\InMemoryPage;
 use Hyde\Testing\UnitTestCase;
+use Hyde\Support\Models\Route;
+use Hyde\Pages\DocumentationPage;
+use Hyde\Foundation\HydeCoreExtension;
+use Hyde\Framework\Features\Navigation\NavigationItem;
+use Hyde\Framework\Features\Navigation\NavigationGroup;
 
 /**
  * @covers \Hyde\Framework\Features\Navigation\NavigationGroup
  */
 class NavigationGroupTest extends UnitTestCase
 {
-    //
+    public static function setUpBeforeClass(): void
+    {
+        self::needsKernel();
+        self::mockConfig();
+    }
+
+    public function testCanConstruct()
+    {
+        $this->assertSame('Foo', (new NavigationGroup('Foo'))->getLabel());
+    }
+
+    public function testCanConstructWithPriority()
+    {
+        $this->assertSame(500, (new NavigationGroup('Foo', priority: 500))->getPriority());
+    }
+
+    public function testDefaultPriorityValueIsLast()
+    {
+        $this->assertSame(999, (new NavigationGroup('Foo'))->getPriority());
+    }
+
+    public function testDestinationIsAlwaysNull()
+    {
+        $this->assertNull((new NavigationGroup('Foo'))->getRoute());
+    }
+
+    public function testCanConstructWithChildren()
+    {
+        $children = $this->createNavigationItems();
+        $item = new NavigationGroup('Foo', $children);
+
+        $this->assertCount(2, $item->getItems());
+        $this->assertSame($children, $item->getItems());
+    }
+
+    public function testCanConstructWithChildrenWithoutRoute()
+    {
+        $children = $this->createNavigationItems();
+        $item = new NavigationGroup('Foo', $children);
+
+        $this->assertCount(2, $item->getItems());
+        $this->assertSame($children, $item->getItems());
+    }
+
+    public function testGetItems()
+    {
+        $children = $this->createNavigationItems();
+        $item = new NavigationGroup('Foo', $children);
+
+        $this->assertSame($children, $item->getItems());
+    }
+
+    public function testGetItemsWithNoItems()
+    {
+        $this->assertEmpty((new NavigationGroup('Foo'))->getItems());
+    }
+
+    public function testCanAddItemToDropdown()
+    {
+        $group = new NavigationGroup('Foo');
+        $child = new NavigationItem(new Route(new MarkdownPage()), 'Bar');
+
+        $this->assertSame([$child], $group->addItem($child)->getItems());
+    }
+
+    public function testAddChildMethodReturnsSelf()
+    {
+        $group = new NavigationGroup('Foo');
+        $child = new NavigationItem(new Route(new MarkdownPage()), 'Bar');
+
+        $this->assertSame($group, $group->addItem($child));
+    }
+
+    public function testCanAddMultipleItemsToDropdown()
+    {
+        $group = new NavigationGroup('Foo');
+        $items = $this->createNavigationItems();
+
+        $this->assertSame($items, $group->addItems($items)->getItems());
+    }
+
+    public function testAddChildrenMethodReturnsSelf()
+    {
+        $group = new NavigationGroup('Foo');
+
+        $this->assertSame($group, $group->addItems([]));
+    }
+
+    public function testAddingAnItemWithAGroupKeyKeepsTheSetGroupKey()
+    {
+        $group = new NavigationGroup('Foo');
+        $child = new NavigationItem(new Route(new MarkdownPage()), 'Child', group: 'bar');
+
+        $group->addItem($child);
+
+        $this->assertSame('foo', $group->getGroupKey());
+        $this->assertSame('bar', $child->getGroupKey());
+    }
+
+    public function testAddingAnItemWithNoGroupKeyUsesGroupIdentifier()
+    {
+        $group = new NavigationGroup('Foo');
+        $child = new NavigationItem(new Route(new MarkdownPage()), 'Bar');
+
+        $group->addItem($child);
+
+        $this->assertSame('foo', $group->getGroupKey());
+        $this->assertSame('foo', $child->getGroupKey());
+    }
+
+    public function testGetPriorityUsesDefaultPriority()
+    {
+        $this->assertSame(999, (new NavigationGroup('Foo'))->getPriority());
+    }
+
+    public function testGetPriorityWithNoChildrenUsesGroupPriority()
+    {
+        $this->assertSame(999, (new NavigationGroup('Foo'))->getPriority());
+    }
+
+    public function testGetPriorityWithChildrenUsesGroupPriority()
+    {
+        $group = new NavigationGroup('Foo', [new NavigationItem(new Route(new MarkdownPage()), 'Bar', 100)]);
+
+        $this->assertSame(999, $group->getPriority());
+    }
+
+    public function testGetPriorityWithDocumentationPageChildrenUsesLowestPriority()
+    {
+        $items = [
+            new NavigationItem(new Route(new DocumentationPage()), 'Foo', 100),
+            new NavigationItem(new Route(new DocumentationPage()), 'Bar', 200),
+            new NavigationItem(new Route(new DocumentationPage()), 'Baz', 300),
+        ];
+
+        $this->assertSame(100, (new NavigationGroup('Foo', $items))->getPriority());
+        $this->assertSame(100, (new NavigationGroup('Foo', array_reverse($items)))->getPriority());
+    }
+
+    public function testGetPriorityUsesGroupPriorityForMixedChildTypes()
+    {
+        $group = new NavigationGroup('Foo');
+
+        foreach (HydeCoreExtension::getPageClasses() as $type) {
+            $child = new NavigationItem(new Route(new $type()), 'Bar', 100);
+            $group->addItem($child);
+        }
+
+        $this->assertSame(999, $group->getPriority());
+    }
+
+    public function testGetPriorityHandlesStringUrlChildGracefully()
+    {
+        $this->assertSame(999, (new NavigationGroup('Foo', [new NavigationItem('foo', 'Bar', 100)]))->getPriority());
+    }
+
+    public function testGetPriorityHandlesExternalUrlChildGracefully()
+    {
+        $this->assertSame(999, (new NavigationGroup('Foo', [new NavigationItem('https://example.com', 'Bar', 100)]))->getPriority());
+    }
+
+    public function testCreate()
+    {
+        $this->markTestSkipped('TODO: Reimplement this test');
+
+        $item = NavigationGroup::create(new Route(new InMemoryPage('foo')));
+
+        $this->assertInstanceOf(NavigationItem::class, $item);
+        $this->assertNotInstanceOf(NavigationGroup::class, $item);
+        $this->assertSame(NavigationItem::class, $item::class);
+    }
+
+    public function testCreateWithLink()
+    {
+        $this->markTestSkipped('TODO: Reimplement this test');
+
+        $item = NavigationGroup::create('foo', 'bar');
+
+        $this->assertInstanceOf(NavigationItem::class, $item);
+        $this->assertNotInstanceOf(NavigationGroup::class, $item);
+        $this->assertSame(NavigationItem::class, $item::class);
+    }
+
+    protected function createNavigationItems(): array
+    {
+        return [
+            new NavigationItem(new Route(new InMemoryPage('foo')), 'Foo'),
+            new NavigationItem(new Route(new InMemoryPage('bar')), 'Bar'),
+        ];
+    }
 }

From 83f01f36a5547bfce14b6c1924e4cc9e98d6c291 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 21 Mar 2024 20:39:06 +0100
Subject: [PATCH 1093/1422] Copy over shared accessors from navigation item
 class

---
 .../Features/Navigation/NavigationGroup.php   | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
index bfadeab01b0..9b944447715 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
@@ -36,6 +36,26 @@ public static function create(string $label, array $items = [], int $priority =
         return new static($label, $items, $priority);
     }
 
+    /**
+     * @todo Put into contract shared with NavigationItem class
+     *
+     * Get the label of the navigation item.
+     */
+    public function getLabel(): string
+    {
+        return $this->label;
+    }
+
+    /**
+     * @todo Put into contract shared with NavigationItem class
+     *
+     * Get the priority to determine the order of the navigation item.
+     */
+    public function getPriority(): int
+    {
+        return $this->priority;
+    }
+
     /** @return array<\Hyde\Framework\Features\Navigation\NavigationItem> */
     public function getItems(): array
     {

From 1c57d0e483d5576de6415a6e3950ee553d389d86 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 21 Mar 2024 20:39:38 +0100
Subject: [PATCH 1094/1422] Merge duplicated accessor

---
 .../Features/Navigation/NavigationGroup.php          | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
index 9b944447715..747321c0e57 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
@@ -46,16 +46,6 @@ public function getLabel(): string
         return $this->label;
     }
 
-    /**
-     * @todo Put into contract shared with NavigationItem class
-     *
-     * Get the priority to determine the order of the navigation item.
-     */
-    public function getPriority(): int
-    {
-        return $this->priority;
-    }
-
     /** @return array<\Hyde\Framework\Features\Navigation\NavigationItem> */
     public function getItems(): array
     {
@@ -85,6 +75,8 @@ public function addItems(array $items): static
     /**
      * Get the priority to determine the order of the grouped navigation item.
      *
+     * @todo Put into contract shared with NavigationItem class
+     *
      * For sidebar groups, this is the priority of the lowest priority child, unless the dropdown itself has a lower priority.
      */
     public function getPriority(): int

From 9f78ce5e251135891c4f1ecdaae19353d18d96fc Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 21 Mar 2024 20:40:11 +0100
Subject: [PATCH 1095/1422] Navigation groups do not need route accessor

---
 packages/framework/tests/Unit/NavigationGroupTest.php | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/packages/framework/tests/Unit/NavigationGroupTest.php b/packages/framework/tests/Unit/NavigationGroupTest.php
index 7430eba44e1..654255df95e 100644
--- a/packages/framework/tests/Unit/NavigationGroupTest.php
+++ b/packages/framework/tests/Unit/NavigationGroupTest.php
@@ -39,11 +39,6 @@ public function testDefaultPriorityValueIsLast()
         $this->assertSame(999, (new NavigationGroup('Foo'))->getPriority());
     }
 
-    public function testDestinationIsAlwaysNull()
-    {
-        $this->assertNull((new NavigationGroup('Foo'))->getRoute());
-    }
-
     public function testCanConstructWithChildren()
     {
         $children = $this->createNavigationItems();

From 31a0cff8fde912eabac476b68e9c2faa1011ddec Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 21 Mar 2024 20:40:39 +0100
Subject: [PATCH 1096/1422] Navigation groups do not need group key accessor

I don't see why this is needed on this class
---
 packages/framework/tests/Unit/NavigationGroupTest.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/framework/tests/Unit/NavigationGroupTest.php b/packages/framework/tests/Unit/NavigationGroupTest.php
index 654255df95e..03151e5feb6 100644
--- a/packages/framework/tests/Unit/NavigationGroupTest.php
+++ b/packages/framework/tests/Unit/NavigationGroupTest.php
@@ -108,7 +108,6 @@ public function testAddingAnItemWithAGroupKeyKeepsTheSetGroupKey()
 
         $group->addItem($child);
 
-        $this->assertSame('foo', $group->getGroupKey());
         $this->assertSame('bar', $child->getGroupKey());
     }
 
@@ -119,7 +118,6 @@ public function testAddingAnItemWithNoGroupKeyUsesGroupIdentifier()
 
         $group->addItem($child);
 
-        $this->assertSame('foo', $group->getGroupKey());
         $this->assertSame('foo', $child->getGroupKey());
     }
 

From d57b204e87f63d4bfe85e2bd63d9e9fde86450b1 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 21 Mar 2024 20:42:19 +0100
Subject: [PATCH 1097/1422] Delete GroupedNavigationItemTest.php

Replaced by NavigationGroupTest.php
---
 .../tests/Unit/GroupedNavigationItemTest.php  | 207 ------------------
 1 file changed, 207 deletions(-)
 delete mode 100644 packages/framework/tests/Unit/GroupedNavigationItemTest.php

diff --git a/packages/framework/tests/Unit/GroupedNavigationItemTest.php b/packages/framework/tests/Unit/GroupedNavigationItemTest.php
deleted file mode 100644
index d08dfc1a740..00000000000
--- a/packages/framework/tests/Unit/GroupedNavigationItemTest.php
+++ /dev/null
@@ -1,207 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Hyde\Framework\Testing\Unit;
-
-use Hyde\Pages\MarkdownPage;
-use Hyde\Pages\InMemoryPage;
-use Hyde\Testing\UnitTestCase;
-use Hyde\Support\Models\Route;
-use Hyde\Pages\DocumentationPage;
-use Hyde\Foundation\HydeCoreExtension;
-use Hyde\Framework\Features\Navigation\NavigationItem;
-use Hyde\Framework\Features\Navigation\GroupedNavigationItem;
-
-/**
- * @covers \Hyde\Framework\Features\Navigation\GroupedNavigationItem
- */
-class GroupedNavigationItemTest extends UnitTestCase
-{
-    public static function setUpBeforeClass(): void
-    {
-        self::needsKernel();
-        self::mockConfig();
-    }
-
-    public function testCanConstruct()
-    {
-        $this->assertSame('Foo', (new GroupedNavigationItem('Foo'))->getLabel());
-    }
-
-    public function testCanConstructWithPriority()
-    {
-        $this->assertSame(500, (new GroupedNavigationItem('Foo', priority: 500))->getPriority());
-    }
-
-    public function testDefaultPriorityValueIsLast()
-    {
-        $this->assertSame(999, (new GroupedNavigationItem('Foo'))->getPriority());
-    }
-
-    public function testDestinationIsAlwaysNull()
-    {
-        $this->assertNull((new GroupedNavigationItem('Foo'))->getRoute());
-    }
-
-    public function testCanConstructWithChildren()
-    {
-        $children = $this->createNavigationItems();
-        $item = new GroupedNavigationItem('Foo', $children);
-
-        $this->assertCount(2, $item->getItems());
-        $this->assertSame($children, $item->getItems());
-    }
-
-    public function testCanConstructWithChildrenWithoutRoute()
-    {
-        $children = $this->createNavigationItems();
-        $item = new GroupedNavigationItem('Foo', $children);
-
-        $this->assertCount(2, $item->getItems());
-        $this->assertSame($children, $item->getItems());
-    }
-
-    public function testGetItems()
-    {
-        $children = $this->createNavigationItems();
-        $item = new GroupedNavigationItem('Foo', $children);
-
-        $this->assertSame($children, $item->getItems());
-    }
-
-    public function testGetItemsWithNoItems()
-    {
-        $this->assertEmpty((new GroupedNavigationItem('Foo'))->getItems());
-    }
-
-    public function testCanAddItemToDropdown()
-    {
-        $group = new GroupedNavigationItem('Foo');
-        $child = new NavigationItem(new Route(new MarkdownPage()), 'Bar');
-
-        $this->assertSame([$child], $group->addItem($child)->getItems());
-    }
-
-    public function testAddChildMethodReturnsSelf()
-    {
-        $group = new GroupedNavigationItem('Foo');
-        $child = new NavigationItem(new Route(new MarkdownPage()), 'Bar');
-
-        $this->assertSame($group, $group->addItem($child));
-    }
-
-    public function testCanAddMultipleItemsToDropdown()
-    {
-        $group = new GroupedNavigationItem('Foo');
-        $items = $this->createNavigationItems();
-
-        $this->assertSame($items, $group->addItems($items)->getItems());
-    }
-
-    public function testAddChildrenMethodReturnsSelf()
-    {
-        $group = new GroupedNavigationItem('Foo');
-
-        $this->assertSame($group, $group->addItems([]));
-    }
-
-    public function testAddingAnItemWithAGroupKeyKeepsTheSetGroupKey()
-    {
-        $group = new GroupedNavigationItem('Foo');
-        $child = new NavigationItem(new Route(new MarkdownPage()), 'Child', group: 'bar');
-
-        $group->addItem($child);
-
-        $this->assertSame('foo', $group->getGroupKey());
-        $this->assertSame('bar', $child->getGroupKey());
-    }
-
-    public function testAddingAnItemWithNoGroupKeyUsesGroupIdentifier()
-    {
-        $group = new GroupedNavigationItem('Foo');
-        $child = new NavigationItem(new Route(new MarkdownPage()), 'Bar');
-
-        $group->addItem($child);
-
-        $this->assertSame('foo', $group->getGroupKey());
-        $this->assertSame('foo', $child->getGroupKey());
-    }
-
-    public function testGetPriorityUsesDefaultPriority()
-    {
-        $this->assertSame(999, (new GroupedNavigationItem('Foo'))->getPriority());
-    }
-
-    public function testGetPriorityWithNoChildrenUsesGroupPriority()
-    {
-        $this->assertSame(999, (new GroupedNavigationItem('Foo'))->getPriority());
-    }
-
-    public function testGetPriorityWithChildrenUsesGroupPriority()
-    {
-        $group = new GroupedNavigationItem('Foo', [new NavigationItem(new Route(new MarkdownPage()), 'Bar', 100)]);
-
-        $this->assertSame(999, $group->getPriority());
-    }
-
-    public function testGetPriorityWithDocumentationPageChildrenUsesLowestPriority()
-    {
-        $items = [
-            new NavigationItem(new Route(new DocumentationPage()), 'Foo', 100),
-            new NavigationItem(new Route(new DocumentationPage()), 'Bar', 200),
-            new NavigationItem(new Route(new DocumentationPage()), 'Baz', 300),
-        ];
-
-        $this->assertSame(100, (new GroupedNavigationItem('Foo', $items))->getPriority());
-        $this->assertSame(100, (new GroupedNavigationItem('Foo', array_reverse($items)))->getPriority());
-    }
-
-    public function testGetPriorityUsesGroupPriorityForMixedChildTypes()
-    {
-        $group = new GroupedNavigationItem('Foo');
-
-        foreach (HydeCoreExtension::getPageClasses() as $type) {
-            $child = new NavigationItem(new Route(new $type()), 'Bar', 100);
-            $group->addItem($child);
-        }
-
-        $this->assertSame(999, $group->getPriority());
-    }
-
-    public function testGetPriorityHandlesStringUrlChildGracefully()
-    {
-        $this->assertSame(999, (new GroupedNavigationItem('Foo', [new NavigationItem('foo', 'Bar', 100)]))->getPriority());
-    }
-
-    public function testGetPriorityHandlesExternalUrlChildGracefully()
-    {
-        $this->assertSame(999, (new GroupedNavigationItem('Foo', [new NavigationItem('https://example.com', 'Bar', 100)]))->getPriority());
-    }
-
-    public function testCreate()
-    {
-        $item = GroupedNavigationItem::create(new Route(new InMemoryPage('foo')));
-
-        $this->assertInstanceOf(NavigationItem::class, $item);
-        $this->assertNotInstanceOf(GroupedNavigationItem::class, $item);
-        $this->assertSame(NavigationItem::class, $item::class);
-    }
-
-    public function testCreateWithLink()
-    {
-        $item = GroupedNavigationItem::create('foo', 'bar');
-
-        $this->assertInstanceOf(NavigationItem::class, $item);
-        $this->assertNotInstanceOf(GroupedNavigationItem::class, $item);
-        $this->assertSame(NavigationItem::class, $item::class);
-    }
-
-    protected function createNavigationItems(): array
-    {
-        return [
-            new NavigationItem(new Route(new InMemoryPage('foo')), 'Foo'),
-            new NavigationItem(new Route(new InMemoryPage('bar')), 'Bar'),
-        ];
-    }
-}

From e3ae2c73078b2c57d52fccc692ebb315d164e15a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 21 Mar 2024 20:54:47 +0100
Subject: [PATCH 1098/1422] Add experimental method for compatibility during
 refactor

---
 .../src/Framework/Features/Navigation/NavigationGroup.php   | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
index 747321c0e57..2aed9477672 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
@@ -98,4 +98,10 @@ protected function containsOnlyDocumentationPages(): bool
             return (! $child->getRoute() instanceof ExternalRoute) && $child->getRoute()->getPage() instanceof DocumentationPage;
         });
     }
+
+    /** @experimental This may not be needed. */
+    public function getGroupKey(): string
+    {
+        return Str::slug($this->label);
+    }
 }

From 6faed17a62f0d2abab4298a56daeb7ec20530d72 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 21 Mar 2024 20:49:20 +0100
Subject: [PATCH 1099/1422] Use new NavigationGroup class instead of the old
 one

---
 .../views/components/docs/sidebar-items.blade.php         | 2 +-
 .../resources/views/layouts/navigation.blade.php          | 2 +-
 .../Features/Navigation/DocumentationSidebar.php          | 2 +-
 .../src/Framework/Features/Navigation/NavigationItem.php  | 6 +++---
 .../Features/Navigation/NavigationMenuGenerator.php       | 8 ++++----
 .../Feature/AutomaticNavigationConfigurationsTest.php     | 4 ++--
 .../framework/tests/Unit/DocumentationSidebarUnitTest.php | 6 +++---
 7 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/packages/framework/resources/views/components/docs/sidebar-items.blade.php b/packages/framework/resources/views/components/docs/sidebar-items.blade.php
index 2cd3f7d17ff..aef909869ad 100644
--- a/packages/framework/resources/views/components/docs/sidebar-items.blade.php
+++ b/packages/framework/resources/views/components/docs/sidebar-items.blade.php
@@ -6,7 +6,7 @@
     </ul>
 @else
     <ul id="sidebar-items" role="list">
-        @php /** @var \Hyde\Framework\Features\Navigation\GroupedNavigationItem $group */ @endphp
+        @php /** @var \Hyde\Framework\Features\Navigation\NavigationGroup $group */ @endphp
         @foreach ($sidebar->getItems() as $group)
             <li class="sidebar-group" role="listitem" @if($sidebar->isCollapsible()) x-data="{ groupOpen: {{ $sidebar->isGroupActive($group->getGroupKey()) ? 'true' : 'false' }} }" @endif>
                 <header @class(['sidebar-group-header p-2 px-4 -ml-2 flex justify-between items-center', 'group hover:bg-black/10' => $sidebar->isCollapsible()]) @if($sidebar->isCollapsible()) @click="groupOpen = ! groupOpen" @endif>
diff --git a/packages/framework/resources/views/layouts/navigation.blade.php b/packages/framework/resources/views/layouts/navigation.blade.php
index 5b766e4a77d..452e53d62fb 100644
--- a/packages/framework/resources/views/layouts/navigation.blade.php
+++ b/packages/framework/resources/views/layouts/navigation.blade.php
@@ -37,7 +37,7 @@
         <ul aria-label="Navigation links" class="md:flex-grow md:flex justify-end">
             @foreach ($navigation->getItems() as $item)
                 <li class="md:mx-2">
-                    @if($item instanceof \Hyde\Framework\Features\Navigation\GroupedNavigationItem)
+                    @if($item instanceof \Hyde\Framework\Features\Navigation\NavigationGroup)
                         <x-hyde::navigation.dropdown :label="$item->getLabel()" :items="$item->getItems()"/>
                     @else
                         <x-hyde::navigation.navigation-link :item="$item"/>
diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 971fe2abf09..31cf72ec1ff 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -56,7 +56,7 @@ public function isCollapsible(): bool
 
     public function hasGroups(): bool
     {
-        return $this->getItems()->contains(fn (NavigationItem $item): bool => $item instanceof GroupedNavigationItem);
+        return $this->getItems()->contains(fn (NavigationItem $item): bool => $item instanceof NavigationGroup);
     }
 
     /**
diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index 032b4905823..b299a36b461 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -84,15 +84,15 @@ public static function create(Route|string $destination, ?string $label = null,
      *
      * @deprecated Use NavigationGroup::create() instead.
      *
-     * TODO: Move to GroupedNavigationItem::create() as this solves the naming issue, and because it makes little sense for it to be here. It also resolves the self/static issue.
+     * TODO: Move to NavigationGroup::create() as this solves the naming issue, and because it makes little sense for it to be here. It also resolves the self/static issue.
      *
      * @param  string  $label  The label of the dropdown item.
      * @param  array<NavigationItem>  $items  The items to be included in the dropdown.
      * @param  int  $priority  The priority of the dropdown item. Leave blank to use the default priority, which is last in the menu.
      */
-    public static function forGroup(string $label, array $items, int $priority = NavigationMenu::LAST): GroupedNavigationItem
+    public static function forGroup(string $label, array $items, int $priority = NavigationMenu::LAST): NavigationGroup
     {
-        return new GroupedNavigationItem($label, $items, $priority);
+        return new NavigationGroup($label, $items, $priority);
     }
 
     /**
diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
index cc31f8d5cff..12c6e225a16 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
@@ -146,12 +146,12 @@ protected function addRouteToGroup(Route $route): void
         }
     }
 
-    protected function getOrCreateGroupItem(string $groupName): GroupedNavigationItem
+    protected function getOrCreateGroupItem(string $groupName): NavigationGroup
     {
         $groupKey = Str::slug($groupName);
         $group = $this->items->get($groupKey);
 
-        if ($group instanceof GroupedNavigationItem) {
+        if ($group instanceof NavigationGroup) {
             return $group;
         } elseif ($group instanceof NavigationItem) {
             // We are trying to add children to an existing navigation menu item,
@@ -161,7 +161,7 @@ protected function getOrCreateGroupItem(string $groupName): GroupedNavigationIte
             // Todo: Add note in documentation about this behavior
             // Example file structure: _pages/foo.md, _pages/foo/bar.md, _pages/foo/baz.md, here the link to foo will be lost.
 
-            $item = new GroupedNavigationItem($group->getLabel(), [], $group->getPriority());
+            $item = new NavigationGroup($group->getLabel(), [], $group->getPriority());
 
             $this->items->put($groupKey, $item);
 
@@ -171,7 +171,7 @@ protected function getOrCreateGroupItem(string $groupName): GroupedNavigationIte
         return $this->createGroupItem($groupKey, $groupName);
     }
 
-    protected function createGroupItem(string $groupKey, string $groupName): GroupedNavigationItem
+    protected function createGroupItem(string $groupKey, string $groupName): NavigationGroup
     {
         $label = $this->searchForGroupLabelInConfig($groupKey) ?? $groupName;
 
diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 0230e570374..81501174b94 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -18,7 +18,7 @@
 use Illuminate\Support\Collection;
 use Hyde\Foundation\Kernel\RouteCollection;
 use Hyde\Framework\Features\Navigation\NavigationItem;
-use Hyde\Framework\Features\Navigation\GroupedNavigationItem;
+use Hyde\Framework\Features\Navigation\NavigationGroup;
 use Hyde\Framework\Features\Navigation\MainNavigationMenu;
 use Hyde\Framework\Features\Navigation\DocumentationSidebar;
 use Hyde\Framework\Features\Navigation\NavigationMenuGenerator;
@@ -1320,7 +1320,7 @@ public function __construct(TestCase $test, $sidebar = false)
     public function state(): array
     {
         return $this->items->map(function (NavigationItem $item): TestNavigationItem {
-            return new TestNavigationItem($item->getLabel(), $item->getGroupKey(), $item->getPriority(), $item instanceof GroupedNavigationItem ? $item->getItems() : []);
+            return new TestNavigationItem($item->getLabel(), $item->getGroupKey(), $item->getPriority(), $item instanceof NavigationGroup ? $item->getItems() : []);
         })->toArray();
     }
 
diff --git a/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php b/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
index dd9af5b4c06..036350064ae 100644
--- a/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
+++ b/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
@@ -8,7 +8,7 @@
 use Illuminate\Support\Collection;
 use Hyde\Support\Models\ExternalRoute;
 use Hyde\Framework\Features\Navigation\NavigationItem;
-use Hyde\Framework\Features\Navigation\GroupedNavigationItem;
+use Hyde\Framework\Features\Navigation\NavigationGroup;
 use Hyde\Framework\Features\Navigation\DocumentationSidebar;
 
 /**
@@ -204,13 +204,13 @@ public function testHasGroupsReturnsFalseWhenNoItemsHaveChildren()
         $this->assertFalse((new DocumentationSidebar())->hasGroups());
     }
 
-    public function testHasGroupsReturnsTrueWhenAtLeastOneItemIsGroupedNavigationItemInstance()
+    public function testHasGroupsReturnsTrueWhenAtLeastOneItemIsNavigationGroupInstance()
     {
         self::mockConfig();
         self::setupKernel();
 
         $menu = new DocumentationSidebar([
-            new GroupedNavigationItem('foo', []),
+            new NavigationGroup('foo', []),
         ]);
 
         $this->assertTrue($menu->hasGroups());

From eff193b2e8f469f29164399c96a59d99c044935d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 21 Mar 2024 20:57:24 +0100
Subject: [PATCH 1100/1422] Union type navigation group class

---
 .../Features/Navigation/DocumentationSidebar.php          | 2 +-
 .../src/Framework/Features/Navigation/NavigationMenu.php  | 8 ++++----
 .../Feature/AutomaticNavigationConfigurationsTest.php     | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 31cf72ec1ff..b50e38682c3 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -56,7 +56,7 @@ public function isCollapsible(): bool
 
     public function hasGroups(): bool
     {
-        return $this->getItems()->contains(fn (NavigationItem $item): bool => $item instanceof NavigationGroup);
+        return $this->getItems()->contains(fn (NavigationItem|NavigationGroup $item): bool => $item instanceof NavigationGroup);
     }
 
     /**
diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
index 6876e1c003f..0edef08d48a 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
@@ -20,7 +20,7 @@ abstract class NavigationMenu
     public const DEFAULT = 500;
     public const LAST = 999;
 
-    /** @var \Illuminate\Support\Collection<\Hyde\Framework\Features\Navigation\NavigationItem> */
+    /** @var \Illuminate\Support\Collection<\Hyde\Framework\Features\Navigation\NavigationItem|\Hyde\Framework\Features\Navigation\NavigationGroup> */
     protected Collection $items;
 
     public function __construct(Arrayable|array $items = [])
@@ -41,7 +41,7 @@ public function __construct(Arrayable|array $items = [])
      *
      * Items are automatically sorted by their priority, falling back to the order they were added.
      *
-     * @return \Illuminate\Support\Collection<\Hyde\Framework\Features\Navigation\NavigationItem>
+     * @return \Illuminate\Support\Collection<\Hyde\Framework\Features\Navigation\NavigationItem|\Hyde\Framework\Features\Navigation\NavigationGroup>
      */
     public function getItems(): Collection
     {
@@ -49,13 +49,13 @@ public function getItems(): Collection
         // so any sorting we do in generator actions will only be partial. This way, we can ensure
         // that the items are always freshly sorted by their priorities when they are retrieved.
 
-        return $this->items->sortBy(fn (NavigationItem $item) => $item->getPriority())->values();
+        return $this->items->sortBy(fn (NavigationItem|NavigationGroup $item) => $item->getPriority())->values();
     }
 
     /**
      * Add a navigation item to the navigation menu.
      */
-    public function add(NavigationItem $item): void
+    public function add(NavigationItem|NavigationGroup $item): void
     {
         $this->items->push($item);
     }
diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 81501174b94..4277e67ef84 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -1293,7 +1293,7 @@ public function __construct(string $label, ?string $group, int $priority, array
         $this->label = $label;
         $this->group = $group;
         $this->priority = $priority;
-        $this->children = collect($children)->map(fn (NavigationItem $child) => $child->getLabel())->toArray();
+        $this->children = collect($children)->map(fn (NavigationItem|NavigationGroup $child) => $child->getLabel())->toArray();
     }
 
     public static function properties(): array
@@ -1319,7 +1319,7 @@ public function __construct(TestCase $test, $sidebar = false)
     /** A simplified serialized format for comparisons */
     public function state(): array
     {
-        return $this->items->map(function (NavigationItem $item): TestNavigationItem {
+        return $this->items->map(function (NavigationItem|NavigationGroup $item): TestNavigationItem {
             return new TestNavigationItem($item->getLabel(), $item->getGroupKey(), $item->getPriority(), $item instanceof NavigationGroup ? $item->getItems() : []);
         })->toArray();
     }

From 6d8eb4630f144a222af7647b8076b6a9b122700c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 21 Mar 2024 21:05:05 +0100
Subject: [PATCH 1101/1422] Delete GroupedNavigationItem.php

---
 .../Navigation/GroupedNavigationItem.php      | 66 -------------------
 1 file changed, 66 deletions(-)
 delete mode 100644 packages/framework/src/Framework/Features/Navigation/GroupedNavigationItem.php

diff --git a/packages/framework/src/Framework/Features/Navigation/GroupedNavigationItem.php b/packages/framework/src/Framework/Features/Navigation/GroupedNavigationItem.php
deleted file mode 100644
index de98b73ed38..00000000000
--- a/packages/framework/src/Framework/Features/Navigation/GroupedNavigationItem.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Hyde\Framework\Features\Navigation;
-
-use Hyde\Pages\DocumentationPage;
-use Hyde\Support\Models\ExternalRoute;
-
-/**
- * @deprecated Use NavigationGroup instead
- */
-class GroupedNavigationItem extends NavigationItem
-{
-    protected array $items = [];
-
-    public function __construct(string $label, array $items = [], int $priority = NavigationMenu::LAST)
-    {
-        parent::__construct(null, $label, $priority, static::normalizeGroupKey($label));
-
-        $this->addItems($items);
-    }
-
-    public function getItems(): array
-    {
-        return $this->items;
-    }
-
-    public function addItem(NavigationItem $item): static
-    {
-        $item->group ??= $this->group;
-
-        $this->items[] = $item;
-
-        return $this;
-    }
-
-    public function addItems(array $items): static
-    {
-        foreach ($items as $item) {
-            $this->addItem($item);
-        }
-
-        return $this;
-    }
-
-    public function getPriority(): int
-    {
-        if ($this->containsOnlyDocumentationPages()) {
-            return min($this->priority, collect($this->getItems())->min(fn (NavigationItem $child): int => $child->getPriority()));
-        }
-
-        return parent::getPriority();
-    }
-
-    protected function containsOnlyDocumentationPages(): bool
-    {
-        if (empty($this->getItems())) {
-            return false;
-        }
-
-        return collect($this->getItems())->every(function (NavigationItem $child): bool {
-            return (! $child->getRoute() instanceof ExternalRoute) && $child->getRoute()->getPage() instanceof DocumentationPage;
-        });
-    }
-}

From ebc687fb9f866123cce328b52e7fcbca89a1de44 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 21 Mar 2024 21:11:28 +0100
Subject: [PATCH 1102/1422] Remove redundant infix from method name

---
 .../resources/views/components/docs/sidebar-items.blade.php   | 2 +-
 .../Framework/Features/Navigation/DocumentationSidebar.php    | 2 +-
 .../src/Framework/Features/Navigation/NavigationGroup.php     | 4 ++--
 .../Framework/Features/Navigation/NavigationMenuGenerator.php | 4 ++--
 .../tests/Feature/AutomaticNavigationConfigurationsTest.php   | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/framework/resources/views/components/docs/sidebar-items.blade.php b/packages/framework/resources/views/components/docs/sidebar-items.blade.php
index aef909869ad..ed05cf10961 100644
--- a/packages/framework/resources/views/components/docs/sidebar-items.blade.php
+++ b/packages/framework/resources/views/components/docs/sidebar-items.blade.php
@@ -8,7 +8,7 @@
     <ul id="sidebar-items" role="list">
         @php /** @var \Hyde\Framework\Features\Navigation\NavigationGroup $group */ @endphp
         @foreach ($sidebar->getItems() as $group)
-            <li class="sidebar-group" role="listitem" @if($sidebar->isCollapsible()) x-data="{ groupOpen: {{ $sidebar->isGroupActive($group->getGroupKey()) ? 'true' : 'false' }} }" @endif>
+            <li class="sidebar-group" role="listitem" @if($sidebar->isCollapsible()) x-data="{ groupOpen: {{ $sidebar->isGroupActive($group->getKey()) ? 'true' : 'false' }} }" @endif>
                 <header @class(['sidebar-group-header p-2 px-4 -ml-2 flex justify-between items-center', 'group hover:bg-black/10' => $sidebar->isCollapsible()]) @if($sidebar->isCollapsible()) @click="groupOpen = ! groupOpen" @endif>
                     <h4 @class(['sidebar-group-heading text-base font-semibold', 'cursor-pointer dark:group-hover:text-white' => $sidebar->isCollapsible()])>{{ $group->getLabel() }}</h4>
                     @if($sidebar->isCollapsible())
diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index b50e38682c3..50f40bb15bd 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -92,6 +92,6 @@ private function shouldIndexPageBeActive(string $group): bool
             return false;
         }
 
-        return $group === $this->getItems()->firstOrFail()->getGroupKey();
+        return $group === $this->getItems()->firstOrFail()->getKey();
     }
 }
diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
index 2aed9477672..91a3928e472 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
@@ -99,8 +99,8 @@ protected function containsOnlyDocumentationPages(): bool
         });
     }
 
-    /** @experimental This may not be needed. */
-    public function getGroupKey(): string
+    /** Get the key that identifies the group */
+    public function getKey(): string
     {
         return Str::slug($this->label);
     }
diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
index 12c6e225a16..4c684d01b95 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
@@ -141,8 +141,8 @@ protected function addRouteToGroup(Route $route): void
 
         $groupItem->addItem($item);
 
-        if (! $this->items->has($groupItem->getGroupKey())) {
-            $this->items->put($groupItem->getGroupKey(), $groupItem);
+        if (! $this->items->has($groupItem->getKey())) {
+            $this->items->put($groupItem->getKey(), $groupItem);
         }
     }
 
diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 4277e67ef84..70216261795 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -1320,7 +1320,7 @@ public function __construct(TestCase $test, $sidebar = false)
     public function state(): array
     {
         return $this->items->map(function (NavigationItem|NavigationGroup $item): TestNavigationItem {
-            return new TestNavigationItem($item->getLabel(), $item->getGroupKey(), $item->getPriority(), $item instanceof NavigationGroup ? $item->getItems() : []);
+            return new TestNavigationItem($item->getLabel(), $item->getKey(), $item->getPriority(), $item instanceof NavigationGroup ? $item->getItems() : []);
         })->toArray();
     }
 

From 9c8ab4e79b9ccdac3f0caddb0e4d8ac67d854f10 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 21 Mar 2024 21:11:45 +0100
Subject: [PATCH 1103/1422] Move up method in class source

---
 .../Features/Navigation/NavigationGroup.php          | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
index 91a3928e472..c38ee34ae7e 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
@@ -72,6 +72,12 @@ public function addItems(array $items): static
         return $this;
     }
 
+    /** Get the key that identifies the group */
+    public function getKey(): string
+    {
+        return Str::slug($this->label);
+    }
+
     /**
      * Get the priority to determine the order of the grouped navigation item.
      *
@@ -98,10 +104,4 @@ protected function containsOnlyDocumentationPages(): bool
             return (! $child->getRoute() instanceof ExternalRoute) && $child->getRoute()->getPage() instanceof DocumentationPage;
         });
     }
-
-    /** Get the key that identifies the group */
-    public function getKey(): string
-    {
-        return Str::slug($this->label);
-    }
 }

From 45c217c65e0bdcc3305a242b0503e9a28979e6a7 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 21 Mar 2024 21:15:46 +0100
Subject: [PATCH 1104/1422] Revert "Move up method in class source"

This reverts commit 9c8ab4e79b9ccdac3f0caddb0e4d8ac67d854f10.
---
 .../Features/Navigation/NavigationGroup.php          | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
index c38ee34ae7e..91a3928e472 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
@@ -72,12 +72,6 @@ public function addItems(array $items): static
         return $this;
     }
 
-    /** Get the key that identifies the group */
-    public function getKey(): string
-    {
-        return Str::slug($this->label);
-    }
-
     /**
      * Get the priority to determine the order of the grouped navigation item.
      *
@@ -104,4 +98,10 @@ protected function containsOnlyDocumentationPages(): bool
             return (! $child->getRoute() instanceof ExternalRoute) && $child->getRoute()->getPage() instanceof DocumentationPage;
         });
     }
+
+    /** Get the key that identifies the group */
+    public function getKey(): string
+    {
+        return Str::slug($this->label);
+    }
 }

From 292ef099e04fdcdcb0579bf1f07386e108ca0dfd Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 21 Mar 2024 21:15:48 +0100
Subject: [PATCH 1105/1422] Revert "Remove redundant infix from method name"

This reverts commit ebc687fb9f866123cce328b52e7fcbca89a1de44.
---
 .../resources/views/components/docs/sidebar-items.blade.php   | 2 +-
 .../Framework/Features/Navigation/DocumentationSidebar.php    | 2 +-
 .../src/Framework/Features/Navigation/NavigationGroup.php     | 4 ++--
 .../Framework/Features/Navigation/NavigationMenuGenerator.php | 4 ++--
 .../tests/Feature/AutomaticNavigationConfigurationsTest.php   | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/framework/resources/views/components/docs/sidebar-items.blade.php b/packages/framework/resources/views/components/docs/sidebar-items.blade.php
index ed05cf10961..aef909869ad 100644
--- a/packages/framework/resources/views/components/docs/sidebar-items.blade.php
+++ b/packages/framework/resources/views/components/docs/sidebar-items.blade.php
@@ -8,7 +8,7 @@
     <ul id="sidebar-items" role="list">
         @php /** @var \Hyde\Framework\Features\Navigation\NavigationGroup $group */ @endphp
         @foreach ($sidebar->getItems() as $group)
-            <li class="sidebar-group" role="listitem" @if($sidebar->isCollapsible()) x-data="{ groupOpen: {{ $sidebar->isGroupActive($group->getKey()) ? 'true' : 'false' }} }" @endif>
+            <li class="sidebar-group" role="listitem" @if($sidebar->isCollapsible()) x-data="{ groupOpen: {{ $sidebar->isGroupActive($group->getGroupKey()) ? 'true' : 'false' }} }" @endif>
                 <header @class(['sidebar-group-header p-2 px-4 -ml-2 flex justify-between items-center', 'group hover:bg-black/10' => $sidebar->isCollapsible()]) @if($sidebar->isCollapsible()) @click="groupOpen = ! groupOpen" @endif>
                     <h4 @class(['sidebar-group-heading text-base font-semibold', 'cursor-pointer dark:group-hover:text-white' => $sidebar->isCollapsible()])>{{ $group->getLabel() }}</h4>
                     @if($sidebar->isCollapsible())
diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 50f40bb15bd..b50e38682c3 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -92,6 +92,6 @@ private function shouldIndexPageBeActive(string $group): bool
             return false;
         }
 
-        return $group === $this->getItems()->firstOrFail()->getKey();
+        return $group === $this->getItems()->firstOrFail()->getGroupKey();
     }
 }
diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
index 91a3928e472..2aed9477672 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
@@ -99,8 +99,8 @@ protected function containsOnlyDocumentationPages(): bool
         });
     }
 
-    /** Get the key that identifies the group */
-    public function getKey(): string
+    /** @experimental This may not be needed. */
+    public function getGroupKey(): string
     {
         return Str::slug($this->label);
     }
diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
index 4c684d01b95..12c6e225a16 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
@@ -141,8 +141,8 @@ protected function addRouteToGroup(Route $route): void
 
         $groupItem->addItem($item);
 
-        if (! $this->items->has($groupItem->getKey())) {
-            $this->items->put($groupItem->getKey(), $groupItem);
+        if (! $this->items->has($groupItem->getGroupKey())) {
+            $this->items->put($groupItem->getGroupKey(), $groupItem);
         }
     }
 
diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 70216261795..4277e67ef84 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -1320,7 +1320,7 @@ public function __construct(TestCase $test, $sidebar = false)
     public function state(): array
     {
         return $this->items->map(function (NavigationItem|NavigationGroup $item): TestNavigationItem {
-            return new TestNavigationItem($item->getLabel(), $item->getKey(), $item->getPriority(), $item instanceof NavigationGroup ? $item->getItems() : []);
+            return new TestNavigationItem($item->getLabel(), $item->getGroupKey(), $item->getPriority(), $item instanceof NavigationGroup ? $item->getItems() : []);
         })->toArray();
     }
 

From 5cc73a8add6e77852599f4b5007ca5e5916b3f49 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 21 Mar 2024 21:16:36 +0100
Subject: [PATCH 1106/1422] Replace experimental marker with design note

Seems like this is needed to simplify the API between the navigation element classes
---
 .../src/Framework/Features/Navigation/NavigationGroup.php       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
index 2aed9477672..e428b90cdf5 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
@@ -99,7 +99,7 @@ protected function containsOnlyDocumentationPages(): bool
         });
     }
 
-    /** @experimental This may not be needed. */
+    /** @todo Put into contract shared with NavigationItem class */
     public function getGroupKey(): string
     {
         return Str::slug($this->label);

From 34ab7fab56a0edc75d40e06055f6df2f7ff645b3 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 21 Mar 2024 21:17:02 +0100
Subject: [PATCH 1107/1422] Revert "Revert "Move up method in class source""

This reverts commit 45c217c65e0bdcc3305a242b0503e9a28979e6a7.
---
 .../Features/Navigation/NavigationGroup.php          | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
index e428b90cdf5..d7b311a4d61 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
@@ -72,6 +72,12 @@ public function addItems(array $items): static
         return $this;
     }
 
+    /** @todo Put into contract shared with NavigationItem class */
+    public function getGroupKey(): string
+    {
+        return Str::slug($this->label);
+    }
+
     /**
      * Get the priority to determine the order of the grouped navigation item.
      *
@@ -98,10 +104,4 @@ protected function containsOnlyDocumentationPages(): bool
             return (! $child->getRoute() instanceof ExternalRoute) && $child->getRoute()->getPage() instanceof DocumentationPage;
         });
     }
-
-    /** @todo Put into contract shared with NavigationItem class */
-    public function getGroupKey(): string
-    {
-        return Str::slug($this->label);
-    }
 }

From 255bd863c02d346024fbbc29c2e6b20c19fba331 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 22 Mar 2024 10:13:31 +0100
Subject: [PATCH 1108/1422] Remove group key assignment when adding item

Like this is cool, and it makes the state make more sense when dumped, but it doesn't actually matter. Duck typing works fine here, and I don't think it's worth exposing a public method just for this.
---
 .../src/Framework/Features/Navigation/NavigationGroup.php   | 3 ---
 .../src/Framework/Features/Navigation/NavigationItem.php    | 6 ------
 packages/framework/tests/Unit/NavigationGroupTest.php       | 4 ++--
 3 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
index d7b311a4d61..1ab5dfd6989 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
@@ -54,9 +54,6 @@ public function getItems(): array
 
     public function addItem(NavigationItem $item): static
     {
-        /** @deprecated I don't think we necessarily need to care about this */
-        $item->setGroup($item->getGroupKey() ?? Str::slug($this->label));
-
         $this->items[] = $item;
 
         return $this;
diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index b299a36b461..b5b4566dab8 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -161,10 +161,4 @@ public static function normalizeGroupKey(?string $group): ?string
     {
         return $group ? Str::slug($group) : null;
     }
-
-    /** @deprecated Temporary to reduce issues during refactoring */
-    public function setGroup(string $group): void
-    {
-        $this->group = $group;
-    }
 }
diff --git a/packages/framework/tests/Unit/NavigationGroupTest.php b/packages/framework/tests/Unit/NavigationGroupTest.php
index 03151e5feb6..dffa66d7033 100644
--- a/packages/framework/tests/Unit/NavigationGroupTest.php
+++ b/packages/framework/tests/Unit/NavigationGroupTest.php
@@ -111,14 +111,14 @@ public function testAddingAnItemWithAGroupKeyKeepsTheSetGroupKey()
         $this->assertSame('bar', $child->getGroupKey());
     }
 
-    public function testAddingAnItemWithNoGroupKeyUsesGroupIdentifier()
+    public function testAddingAnItemWithNoGroupKeyDoesNotModifyGroupIdentifier()
     {
         $group = new NavigationGroup('Foo');
         $child = new NavigationItem(new Route(new MarkdownPage()), 'Bar');
 
         $group->addItem($child);
 
-        $this->assertSame('foo', $child->getGroupKey());
+        $this->assertNull($child->getGroupKey());
     }
 
     public function testGetPriorityUsesDefaultPriority()

From e6a026c996fa12801d92ce77f05e97512281142c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 22 Mar 2024 13:06:56 +0100
Subject: [PATCH 1109/1422] Create NavigationElement.php

---
 .../Features/Navigation/NavigationElement.php          | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 packages/framework/src/Framework/Features/Navigation/NavigationElement.php

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationElement.php b/packages/framework/src/Framework/Features/Navigation/NavigationElement.php
new file mode 100644
index 00000000000..655031ed680
--- /dev/null
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationElement.php
@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Hyde\Framework\Features\Navigation;
+
+interface NavigationElement
+{
+    //
+}

From 4edadc626f1bb5cf89b79c65384ba61f33789e76 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 22 Mar 2024 13:14:51 +0100
Subject: [PATCH 1110/1422] Implement NavigationElement contract

---
 .../src/Framework/Features/Navigation/NavigationGroup.php   | 2 +-
 .../src/Framework/Features/Navigation/NavigationItem.php    | 2 +-
 packages/framework/tests/Unit/NavigationGroupTest.php       | 5 +++++
 packages/framework/tests/Unit/NavigationItemTest.php        | 6 ++++++
 4 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
index 1ab5dfd6989..a328593b81e 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
@@ -16,7 +16,7 @@
  *
  * @todo Consider extracting trait for shared code with navigation menu class
  */
-class NavigationGroup
+class NavigationGroup implements NavigationElement
 {
     /** @var array<\Hyde\Framework\Features\Navigation\NavigationItem> */
     protected array $items = [];
diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index b5b4566dab8..42405a2f387 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -23,7 +23,7 @@
  *   2. You can use NavigationItem::fromRoute() to use data from the route
  *   3. You can use NavigationItem::create() for an external or un-routed link
  */
-class NavigationItem implements Stringable
+class NavigationItem implements NavigationElement, Stringable
 {
     protected ?Route $route;
     protected string $label;
diff --git a/packages/framework/tests/Unit/NavigationGroupTest.php b/packages/framework/tests/Unit/NavigationGroupTest.php
index dffa66d7033..c8541d3b374 100644
--- a/packages/framework/tests/Unit/NavigationGroupTest.php
+++ b/packages/framework/tests/Unit/NavigationGroupTest.php
@@ -57,6 +57,11 @@ public function testCanConstructWithChildrenWithoutRoute()
         $this->assertSame($children, $item->getItems());
     }
 
+    public function testIsInstanceOfNavigationElement()
+    {
+        $this->assertInstanceOf(NavigationGroup::class, new NavigationGroup('Foo'));
+    }
+
     public function testGetItems()
     {
         $children = $this->createNavigationItems();
diff --git a/packages/framework/tests/Unit/NavigationItemTest.php b/packages/framework/tests/Unit/NavigationItemTest.php
index 4f6894c93c5..51510b06de0 100644
--- a/packages/framework/tests/Unit/NavigationItemTest.php
+++ b/packages/framework/tests/Unit/NavigationItemTest.php
@@ -14,6 +14,7 @@
 use Hyde\Support\Models\Route;
 use Hyde\Testing\UnitTestCase;
 use Mockery;
+use Hyde\Framework\Features\Navigation\NavigationElement;
 
 /**
  * This unit test covers the basics of the NavigationItem class.
@@ -46,6 +47,11 @@ public function testConstruct()
         $this->assertSame($route, $item->getRoute());
     }
 
+    public function testIsInstanceOfNavigationElement()
+    {
+        $this->assertInstanceOf(NavigationElement::class, new NavigationItem(new Route(new MarkdownPage()), 'Test', 500));
+    }
+
     public function testPassingRouteInstanceToConstructorUsesRouteInstance()
     {
         $route = new Route(new MarkdownPage());

From e2fcfaf0fa51fb38eb95032c567d669ada1808c0 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 22 Mar 2024 13:21:01 +0100
Subject: [PATCH 1111/1422] Contract shared methods

---
 .../Features/Navigation/NavigationElement.php | 20 ++++++++++++++++++-
 .../Features/Navigation/NavigationGroup.php   |  8 --------
 .../Features/Navigation/NavigationItem.php    |  7 -------
 3 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationElement.php b/packages/framework/src/Framework/Features/Navigation/NavigationElement.php
index 655031ed680..985517a7cf3 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationElement.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationElement.php
@@ -6,5 +6,23 @@
 
 interface NavigationElement
 {
-    //
+    /**
+     * Get the label of the navigation item.
+     */
+    public function getLabel(): string;
+
+    /**
+     * Get the priority to determine the order of the navigation item.
+     */
+    public function getPriority(): int;
+
+    /**
+     * Get the group identifier key of the navigation item, if any.
+     *
+     * For sidebars this is the category key, for navigation menus this is the dropdown key.
+     *
+     * When using automatic subdirectory based groups, the subdirectory name is the group key.
+     * Otherwise, the group key is a "slugified" version of the group's label.
+     */
+    public function getGroupKey(): ?string;
 }
diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
index a328593b81e..016134e76a8 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
@@ -36,11 +36,6 @@ public static function create(string $label, array $items = [], int $priority =
         return new static($label, $items, $priority);
     }
 
-    /**
-     * @todo Put into contract shared with NavigationItem class
-     *
-     * Get the label of the navigation item.
-     */
     public function getLabel(): string
     {
         return $this->label;
@@ -69,7 +64,6 @@ public function addItems(array $items): static
         return $this;
     }
 
-    /** @todo Put into contract shared with NavigationItem class */
     public function getGroupKey(): string
     {
         return Str::slug($this->label);
@@ -78,8 +72,6 @@ public function getGroupKey(): string
     /**
      * Get the priority to determine the order of the grouped navigation item.
      *
-     * @todo Put into contract shared with NavigationItem class
-     *
      * For sidebar groups, this is the priority of the lowest priority child, unless the dropdown itself has a lower priority.
      */
     public function getPriority(): int
diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index 42405a2f387..e2aa669c552 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -16,8 +16,6 @@
 /**
  * Abstraction for a navigation menu item. Used by the MainNavigationMenu and DocumentationSidebar classes.
  *
- * @todo Consider adding a NavigationElement contract to this class and new NavigationGroup class for shared methods and to allow easier type hinting.
- *
  * You have a few options to construct a navigation menu item:
  *   1. You can supply a Route directly and explicit properties to the constructor
  *   2. You can use NavigationItem::fromRoute() to use data from the route
@@ -137,11 +135,6 @@ public function getPriority(): int
 
     /**
      * Get the group identifier key of the navigation item, if any.
-     *
-     * For sidebars this is the category key, for navigation menus this is the dropdown key.
-     *
-     * When using automatic subdirectory based groups, the subdirectory name is the group key.
-     * Otherwise, the group key is a "slugified" version of the group's label.
      */
     public function getGroupKey(): ?string
     {

From f3f3ecc76ab6f51c3dfaf5ec97663fcf6a0fa57b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 22 Mar 2024 13:25:36 +0100
Subject: [PATCH 1112/1422] Reimplement test

---
 .../tests/Unit/NavigationGroupTest.php        | 22 ++++---------------
 1 file changed, 4 insertions(+), 18 deletions(-)

diff --git a/packages/framework/tests/Unit/NavigationGroupTest.php b/packages/framework/tests/Unit/NavigationGroupTest.php
index c8541d3b374..ddcb108a121 100644
--- a/packages/framework/tests/Unit/NavigationGroupTest.php
+++ b/packages/framework/tests/Unit/NavigationGroupTest.php
@@ -179,24 +179,10 @@ public function testGetPriorityHandlesExternalUrlChildGracefully()
 
     public function testCreate()
     {
-        $this->markTestSkipped('TODO: Reimplement this test');
-
-        $item = NavigationGroup::create(new Route(new InMemoryPage('foo')));
-
-        $this->assertInstanceOf(NavigationItem::class, $item);
-        $this->assertNotInstanceOf(NavigationGroup::class, $item);
-        $this->assertSame(NavigationItem::class, $item::class);
-    }
-
-    public function testCreateWithLink()
-    {
-        $this->markTestSkipped('TODO: Reimplement this test');
-
-        $item = NavigationGroup::create('foo', 'bar');
-
-        $this->assertInstanceOf(NavigationItem::class, $item);
-        $this->assertNotInstanceOf(NavigationGroup::class, $item);
-        $this->assertSame(NavigationItem::class, $item::class);
+        $this->assertEquals(
+            new NavigationGroup('Foo', [new NavigationItem(new Route(new InMemoryPage('foo')), 'Foo')], 100),
+            NavigationGroup::create('Foo', [new NavigationItem(new Route(new InMemoryPage('foo')), 'Foo')], 100)
+        );
     }
 
     protected function createNavigationItems(): array

From 63ee2047bdac52a7a94f6d7fa2db95bd61359f10 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 22 Mar 2024 13:25:48 +0100
Subject: [PATCH 1113/1422] Move up test

---
 .../framework/tests/Unit/NavigationGroupTest.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/packages/framework/tests/Unit/NavigationGroupTest.php b/packages/framework/tests/Unit/NavigationGroupTest.php
index ddcb108a121..24645519810 100644
--- a/packages/framework/tests/Unit/NavigationGroupTest.php
+++ b/packages/framework/tests/Unit/NavigationGroupTest.php
@@ -62,6 +62,14 @@ public function testIsInstanceOfNavigationElement()
         $this->assertInstanceOf(NavigationGroup::class, new NavigationGroup('Foo'));
     }
 
+    public function testCreate()
+    {
+        $this->assertEquals(
+            new NavigationGroup('Foo', [new NavigationItem(new Route(new InMemoryPage('foo')), 'Foo')], 100),
+            NavigationGroup::create('Foo', [new NavigationItem(new Route(new InMemoryPage('foo')), 'Foo')], 100)
+        );
+    }
+
     public function testGetItems()
     {
         $children = $this->createNavigationItems();
@@ -177,14 +185,6 @@ public function testGetPriorityHandlesExternalUrlChildGracefully()
         $this->assertSame(999, (new NavigationGroup('Foo', [new NavigationItem('https://example.com', 'Bar', 100)]))->getPriority());
     }
 
-    public function testCreate()
-    {
-        $this->assertEquals(
-            new NavigationGroup('Foo', [new NavigationItem(new Route(new InMemoryPage('foo')), 'Foo')], 100),
-            NavigationGroup::create('Foo', [new NavigationItem(new Route(new InMemoryPage('foo')), 'Foo')], 100)
-        );
-    }
-
     protected function createNavigationItems(): array
     {
         return [

From 1709763df6e1a6f6caaf8d7dce31bccaa3566381 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 22 Mar 2024 13:25:56 +0100
Subject: [PATCH 1114/1422] Clarify documentation

---
 .../src/Framework/Features/Navigation/NavigationGroup.php       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
index 016134e76a8..bd1aef93beb 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
@@ -72,7 +72,7 @@ public function getGroupKey(): string
     /**
      * Get the priority to determine the order of the grouped navigation item.
      *
-     * For sidebar groups, this is the priority of the lowest priority child, unless the dropdown itself has a lower priority.
+     * For sidebar groups, this is the priority of the lowest priority child, unless the dropdown instance itself has a lower priority.
      */
     public function getPriority(): int
     {

From 9f133ce658b0bccd0f7f7b02613f31174defcdab Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 22 Mar 2024 13:48:30 +0100
Subject: [PATCH 1115/1422] Remove todo for closed PR
 https://github.com/hydephp/develop/pull/1630

---
 .../src/Framework/Features/Navigation/NavigationGroup.php       | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
index bd1aef93beb..d65dc297691 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
@@ -13,8 +13,6 @@
 
 /**
  * Abstraction for a grouped navigation menu item. For main navigation menus, this is a dropdown.
- *
- * @todo Consider extracting trait for shared code with navigation menu class
  */
 class NavigationGroup implements NavigationElement
 {

From 0e8e6116c64e65f543d828bed15bbd69b5849f9e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 22 Mar 2024 13:52:52 +0100
Subject: [PATCH 1116/1422] Extract helper method

---
 .../src/Framework/Features/Navigation/NavigationMenu.php    | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
index 0edef08d48a..58371a0022a 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
@@ -56,6 +56,12 @@ public function getItems(): Collection
      * Add a navigation item to the navigation menu.
      */
     public function add(NavigationItem|NavigationGroup $item): void
+    {
+        $this->items->add($item);
+    }
+
+    /** Type safe helper to add a navigation item to the menu. */
+    protected function addItem(NavigationItem|NavigationGroup $item): void
     {
         $this->items->push($item);
     }

From 3c3febdc1f0db53d2e8aa1fc8229fff2666b27fd Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 22 Mar 2024 13:53:21 +0100
Subject: [PATCH 1117/1422] Add additional test

---
 .../tests/Unit/NavigationMenuUnitTest.php          | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/packages/framework/tests/Unit/NavigationMenuUnitTest.php b/packages/framework/tests/Unit/NavigationMenuUnitTest.php
index 0330f4a0916..11e1c5087d7 100644
--- a/packages/framework/tests/Unit/NavigationMenuUnitTest.php
+++ b/packages/framework/tests/Unit/NavigationMenuUnitTest.php
@@ -82,6 +82,20 @@ public function testCanAddItems()
         $this->assertSame($item, $menu->getItems()->first());
     }
 
+    public function testCanAddMultipleItems()
+    {
+        $menu = new MainNavigationMenu();
+
+        $item1 = $this->item('/', 'Home');
+        $item2 = $this->item('/about', 'About');
+
+        $menu->add($item1);
+        $menu->add($item2);
+
+        $this->assertCount(2, $menu->getItems());
+        $this->assertSame([$item1, $item2], $menu->getItems()->all());
+    }
+
     public function testItemsAreInTheOrderTheyWereAddedWhenThereAreNoCustomPriorities()
     {
         $menu = new MainNavigationMenu();

From 0a7a6b25ef1a169618049da4b9ef227ec0c10e09 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 22 Mar 2024 13:54:41 +0100
Subject: [PATCH 1118/1422] Support adding multiple items at once

---
 .../Features/Navigation/NavigationMenu.php       | 16 +++++++++++++---
 .../tests/Unit/NavigationMenuUnitTest.php        | 13 +++++++++++++
 2 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
index 58371a0022a..e9303a1ee16 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
@@ -53,11 +53,21 @@ public function getItems(): Collection
     }
 
     /**
-     * Add a navigation item to the navigation menu.
+     * Add one or more navigation items to the navigation menu.
+     *
+     * @param  \Hyde\Framework\Features\Navigation\NavigationItem|\Hyde\Framework\Features\Navigation\NavigationGroup|array<\Hyde\Framework\Features\Navigation\NavigationItem|\Hyde\Framework\Features\Navigation\NavigationGroup>  $items
      */
-    public function add(NavigationItem|NavigationGroup $item): void
+    public function add(NavigationItem|NavigationGroup|array $items): void
     {
-        $this->items->add($item);
+        if (is_array($items)) {
+            foreach ($items as $item) {
+                $this->addItem($item);
+            }
+
+            return;
+        }
+
+        $this->addItem($items);
     }
 
     /** Type safe helper to add a navigation item to the menu. */
diff --git a/packages/framework/tests/Unit/NavigationMenuUnitTest.php b/packages/framework/tests/Unit/NavigationMenuUnitTest.php
index 11e1c5087d7..d60aa5e0c6f 100644
--- a/packages/framework/tests/Unit/NavigationMenuUnitTest.php
+++ b/packages/framework/tests/Unit/NavigationMenuUnitTest.php
@@ -96,6 +96,19 @@ public function testCanAddMultipleItems()
         $this->assertSame([$item1, $item2], $menu->getItems()->all());
     }
 
+    public function testCanAddMultipleItemsAtOnce()
+    {
+        $menu = new MainNavigationMenu();
+
+        $item1 = $this->item('/', 'Home');
+        $item2 = $this->item('/about', 'About');
+
+        $menu->add([$item1, $item2]);
+
+        $this->assertCount(2, $menu->getItems());
+        $this->assertSame([$item1, $item2], $menu->getItems()->all());
+    }
+
     public function testItemsAreInTheOrderTheyWereAddedWhenThereAreNoCustomPriorities()
     {
         $menu = new MainNavigationMenu();

From 88a1bc5c2b64659faaca05f0e941b81a85505478 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 22 Mar 2024 13:56:03 +0100
Subject: [PATCH 1119/1422] Wrap array to simplify method implementation

---
 .../Framework/Features/Navigation/NavigationMenu.php  | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
index e9303a1ee16..a2e13228173 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
@@ -4,6 +4,7 @@
 
 namespace Hyde\Framework\Features\Navigation;
 
+use Illuminate\Support\Arr;
 use Illuminate\Support\Collection;
 use Illuminate\Contracts\Support\Arrayable;
 
@@ -59,15 +60,9 @@ public function getItems(): Collection
      */
     public function add(NavigationItem|NavigationGroup|array $items): void
     {
-        if (is_array($items)) {
-            foreach ($items as $item) {
-                $this->addItem($item);
-            }
-
-            return;
+        foreach (Arr::wrap($items) as $item) {
+            $this->addItem($item);
         }
-
-        $this->addItem($items);
     }
 
     /** Type safe helper to add a navigation item to the menu. */

From 8be45e644cb00b0cecf4050cbb043639ab7bcfa6 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 22 Mar 2024 13:58:22 +0100
Subject: [PATCH 1120/1422] Test modifier methods are fluently chainable

---
 packages/framework/tests/Unit/NavigationGroupTest.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/packages/framework/tests/Unit/NavigationGroupTest.php b/packages/framework/tests/Unit/NavigationGroupTest.php
index 24645519810..cbb0cd64bc7 100644
--- a/packages/framework/tests/Unit/NavigationGroupTest.php
+++ b/packages/framework/tests/Unit/NavigationGroupTest.php
@@ -185,6 +185,14 @@ public function testGetPriorityHandlesExternalUrlChildGracefully()
         $this->assertSame(999, (new NavigationGroup('Foo', [new NavigationItem('https://example.com', 'Bar', 100)]))->getPriority());
     }
 
+    public function testModifierMethodsAreFluentlyChainable()
+    {
+        $group = new NavigationGroup('Foo');
+
+        $this->assertSame($group, $group->addItem(new NavigationItem(new Route(new MarkdownPage()), 'Bar')));
+        $this->assertSame($group, $group->addItems([new NavigationItem(new Route(new MarkdownPage()), 'Bar')]));
+    }
+
     protected function createNavigationItems(): array
     {
         return [

From 8a063c2c42c92c8de85e6de81852048df2f9717b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 22 Mar 2024 14:00:45 +0100
Subject: [PATCH 1121/1422] Update setter to be fluently chainable

---
 .../src/Framework/Features/Navigation/NavigationMenu.php | 4 +++-
 packages/framework/tests/Unit/NavigationMenuUnitTest.php | 9 +++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
index a2e13228173..cd3b22e08eb 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
@@ -58,11 +58,13 @@ public function getItems(): Collection
      *
      * @param  \Hyde\Framework\Features\Navigation\NavigationItem|\Hyde\Framework\Features\Navigation\NavigationGroup|array<\Hyde\Framework\Features\Navigation\NavigationItem|\Hyde\Framework\Features\Navigation\NavigationGroup>  $items
      */
-    public function add(NavigationItem|NavigationGroup|array $items): void
+    public function add(NavigationItem|NavigationGroup|array $items): static
     {
         foreach (Arr::wrap($items) as $item) {
             $this->addItem($item);
         }
+
+        return $this;
     }
 
     /** Type safe helper to add a navigation item to the menu. */
diff --git a/packages/framework/tests/Unit/NavigationMenuUnitTest.php b/packages/framework/tests/Unit/NavigationMenuUnitTest.php
index d60aa5e0c6f..e90b159624f 100644
--- a/packages/framework/tests/Unit/NavigationMenuUnitTest.php
+++ b/packages/framework/tests/Unit/NavigationMenuUnitTest.php
@@ -139,6 +139,15 @@ public function testItemsAreSortedByPriority()
         $this->assertSame([$item1, $item2, $item3], $menu->getItems()->all());
     }
 
+    public function testModifierMethodsAreFluentlyChainable()
+    {
+        $menu = new MainNavigationMenu();
+
+        $item = $this->item('/', 'Home');
+
+        $this->assertSame($menu, $menu->add($item));
+    }
+
     protected function getItems(): array
     {
         return [

From ea23d59721141da0d52b5c874082fd19f38ce191 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 22 Mar 2024 14:17:14 +0100
Subject: [PATCH 1122/1422] Add items using dynamic helper

---
 .../src/Framework/Features/Navigation/NavigationMenu.php  | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
index cd3b22e08eb..7b6a18b1f70 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
@@ -28,13 +28,7 @@ public function __construct(Arrayable|array $items = [])
     {
         $this->items = new Collection();
 
-        foreach ($items as $item) {
-            // Instead of adding the items directly, we iterate through them and
-            // add them through the helper. This ensures that all the items are
-            // of the correct type, bringing type safety to the menu's items.
-
-            $this->add($item);
-        }
+        $this->add($items instanceof Arrayable ? $items->toArray() : $items);
     }
 
     /**

From 7332c237845b50bb1fab4acbd7af9385f60a6009 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 22 Mar 2024 14:17:39 +0100
Subject: [PATCH 1123/1422] Evaluate arrayable using helper function

---
 .../src/Framework/Features/Navigation/NavigationMenu.php      | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
index 7b6a18b1f70..d066d09bada 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
@@ -8,6 +8,8 @@
 use Illuminate\Support\Collection;
 use Illuminate\Contracts\Support\Arrayable;
 
+use function Hyde\evaluate_arrayable;
+
 /**
  * Represents a site navigation menu, and contains all of its navigation items.
  *
@@ -28,7 +30,7 @@ public function __construct(Arrayable|array $items = [])
     {
         $this->items = new Collection();
 
-        $this->add($items instanceof Arrayable ? $items->toArray() : $items);
+        $this->add(evaluate_arrayable($items));
     }
 
     /**

From 1677b818f51a7f21cc37f8bc4a6088327aa7a74b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 22 Mar 2024 14:30:06 +0100
Subject: [PATCH 1124/1422] Merge adder methods to simplify API

---
 .../Features/Navigation/NavigationGroup.php   | 24 +++++++++----------
 .../tests/Unit/NavigationGroupTest.php        |  6 ++---
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
index d65dc297691..e5b8c3aa8c2 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
@@ -5,6 +5,7 @@
 namespace Hyde\Framework\Features\Navigation;
 
 use Illuminate\Support\Str;
+use Illuminate\Support\Arr;
 use Hyde\Pages\DocumentationPage;
 use Hyde\Support\Models\ExternalRoute;
 
@@ -26,7 +27,7 @@ public function __construct(string $label, array $items = [], int $priority = Na
         $this->label = $label;
         $this->priority = $priority;
 
-        $this->addItems($items);
+        $this->addItem($items);
     }
 
     public static function create(string $label, array $items = [], int $priority = NavigationMenu::LAST): static
@@ -45,18 +46,11 @@ public function getItems(): array
         return $this->items;
     }
 
-    public function addItem(NavigationItem $item): static
+    /** @param  \Hyde\Framework\Features\Navigation\NavigationItem|array<\Hyde\Framework\Features\Navigation\NavigationItem>  $items */
+    public function addItem(NavigationItem|array $items): static
     {
-        $this->items[] = $item;
-
-        return $this;
-    }
-
-    /** @param  array<\Hyde\Framework\Features\Navigation\NavigationItem>  $items */
-    public function addItems(array $items): static
-    {
-        foreach ($items as $item) {
-            $this->addItem($item);
+        foreach (Arr::wrap($items) as $item) {
+            $this->pushItem($item);
         }
 
         return $this;
@@ -91,4 +85,10 @@ protected function containsOnlyDocumentationPages(): bool
             return (! $child->getRoute() instanceof ExternalRoute) && $child->getRoute()->getPage() instanceof DocumentationPage;
         });
     }
+
+    /** Type safe helper to add a navigation item to the group. */
+    protected function pushItem(NavigationItem $item): void
+    {
+        $this->items[] = $item;
+    }
 }
diff --git a/packages/framework/tests/Unit/NavigationGroupTest.php b/packages/framework/tests/Unit/NavigationGroupTest.php
index cbb0cd64bc7..d17e3020736 100644
--- a/packages/framework/tests/Unit/NavigationGroupTest.php
+++ b/packages/framework/tests/Unit/NavigationGroupTest.php
@@ -104,14 +104,14 @@ public function testCanAddMultipleItemsToDropdown()
         $group = new NavigationGroup('Foo');
         $items = $this->createNavigationItems();
 
-        $this->assertSame($items, $group->addItems($items)->getItems());
+        $this->assertSame($items, $group->addItem($items)->getItems());
     }
 
     public function testAddChildrenMethodReturnsSelf()
     {
         $group = new NavigationGroup('Foo');
 
-        $this->assertSame($group, $group->addItems([]));
+        $this->assertSame($group, $group->addItem([]));
     }
 
     public function testAddingAnItemWithAGroupKeyKeepsTheSetGroupKey()
@@ -190,7 +190,7 @@ public function testModifierMethodsAreFluentlyChainable()
         $group = new NavigationGroup('Foo');
 
         $this->assertSame($group, $group->addItem(new NavigationItem(new Route(new MarkdownPage()), 'Bar')));
-        $this->assertSame($group, $group->addItems([new NavigationItem(new Route(new MarkdownPage()), 'Bar')]));
+        $this->assertSame($group, $group->addItem([new NavigationItem(new Route(new MarkdownPage()), 'Bar')]));
     }
 
     protected function createNavigationItems(): array

From b632b88a1e1f7ddd602f629268ee5cfad15668b7 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 22 Mar 2024 14:36:18 +0100
Subject: [PATCH 1125/1422] Rename helper method to make it more fluent

I thought $group->addItem benefited from having the item suffix to make it clear what is added, but considering an entire operation looks like $group->add($items) it's redundant to have it twice.
---
 .../Features/Navigation/NavigationGroup.php    |  4 ++--
 .../Navigation/NavigationMenuGenerator.php     |  2 +-
 .../tests/Unit/NavigationGroupTest.php         | 18 +++++++++---------
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
index e5b8c3aa8c2..0aa9664d34d 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
@@ -27,7 +27,7 @@ public function __construct(string $label, array $items = [], int $priority = Na
         $this->label = $label;
         $this->priority = $priority;
 
-        $this->addItem($items);
+        $this->add($items);
     }
 
     public static function create(string $label, array $items = [], int $priority = NavigationMenu::LAST): static
@@ -47,7 +47,7 @@ public function getItems(): array
     }
 
     /** @param  \Hyde\Framework\Features\Navigation\NavigationItem|array<\Hyde\Framework\Features\Navigation\NavigationItem>  $items */
-    public function addItem(NavigationItem|array $items): static
+    public function add(NavigationItem|array $items): static
     {
         foreach (Arr::wrap($items) as $item) {
             $this->pushItem($item);
diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
index 12c6e225a16..995ce8b81d2 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
@@ -139,7 +139,7 @@ protected function addRouteToGroup(Route $route): void
 
         $groupItem = $this->getOrCreateGroupItem($groupName);
 
-        $groupItem->addItem($item);
+        $groupItem->add($item);
 
         if (! $this->items->has($groupItem->getGroupKey())) {
             $this->items->put($groupItem->getGroupKey(), $groupItem);
diff --git a/packages/framework/tests/Unit/NavigationGroupTest.php b/packages/framework/tests/Unit/NavigationGroupTest.php
index d17e3020736..9b51ed0c122 100644
--- a/packages/framework/tests/Unit/NavigationGroupTest.php
+++ b/packages/framework/tests/Unit/NavigationGroupTest.php
@@ -88,7 +88,7 @@ public function testCanAddItemToDropdown()
         $group = new NavigationGroup('Foo');
         $child = new NavigationItem(new Route(new MarkdownPage()), 'Bar');
 
-        $this->assertSame([$child], $group->addItem($child)->getItems());
+        $this->assertSame([$child], $group->add($child)->getItems());
     }
 
     public function testAddChildMethodReturnsSelf()
@@ -96,7 +96,7 @@ public function testAddChildMethodReturnsSelf()
         $group = new NavigationGroup('Foo');
         $child = new NavigationItem(new Route(new MarkdownPage()), 'Bar');
 
-        $this->assertSame($group, $group->addItem($child));
+        $this->assertSame($group, $group->add($child));
     }
 
     public function testCanAddMultipleItemsToDropdown()
@@ -104,14 +104,14 @@ public function testCanAddMultipleItemsToDropdown()
         $group = new NavigationGroup('Foo');
         $items = $this->createNavigationItems();
 
-        $this->assertSame($items, $group->addItem($items)->getItems());
+        $this->assertSame($items, $group->add($items)->getItems());
     }
 
     public function testAddChildrenMethodReturnsSelf()
     {
         $group = new NavigationGroup('Foo');
 
-        $this->assertSame($group, $group->addItem([]));
+        $this->assertSame($group, $group->add([]));
     }
 
     public function testAddingAnItemWithAGroupKeyKeepsTheSetGroupKey()
@@ -119,7 +119,7 @@ public function testAddingAnItemWithAGroupKeyKeepsTheSetGroupKey()
         $group = new NavigationGroup('Foo');
         $child = new NavigationItem(new Route(new MarkdownPage()), 'Child', group: 'bar');
 
-        $group->addItem($child);
+        $group->add($child);
 
         $this->assertSame('bar', $child->getGroupKey());
     }
@@ -129,7 +129,7 @@ public function testAddingAnItemWithNoGroupKeyDoesNotModifyGroupIdentifier()
         $group = new NavigationGroup('Foo');
         $child = new NavigationItem(new Route(new MarkdownPage()), 'Bar');
 
-        $group->addItem($child);
+        $group->add($child);
 
         $this->assertNull($child->getGroupKey());
     }
@@ -169,7 +169,7 @@ public function testGetPriorityUsesGroupPriorityForMixedChildTypes()
 
         foreach (HydeCoreExtension::getPageClasses() as $type) {
             $child = new NavigationItem(new Route(new $type()), 'Bar', 100);
-            $group->addItem($child);
+            $group->add($child);
         }
 
         $this->assertSame(999, $group->getPriority());
@@ -189,8 +189,8 @@ public function testModifierMethodsAreFluentlyChainable()
     {
         $group = new NavigationGroup('Foo');
 
-        $this->assertSame($group, $group->addItem(new NavigationItem(new Route(new MarkdownPage()), 'Bar')));
-        $this->assertSame($group, $group->addItem([new NavigationItem(new Route(new MarkdownPage()), 'Bar')]));
+        $this->assertSame($group, $group->add(new NavigationItem(new Route(new MarkdownPage()), 'Bar')));
+        $this->assertSame($group, $group->add([new NavigationItem(new Route(new MarkdownPage()), 'Bar')]));
     }
 
     protected function createNavigationItems(): array

From 80c97e45d3b03c2b049002a50a20083e1dca19b2 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 22 Mar 2024 14:36:33 +0100
Subject: [PATCH 1126/1422] Normalize helper method name

---
 .../src/Framework/Features/Navigation/NavigationGroup.php     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
index 0aa9664d34d..ab529816035 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
@@ -50,7 +50,7 @@ public function getItems(): array
     public function add(NavigationItem|array $items): static
     {
         foreach (Arr::wrap($items) as $item) {
-            $this->pushItem($item);
+            $this->addItem($item);
         }
 
         return $this;
@@ -87,7 +87,7 @@ protected function containsOnlyDocumentationPages(): bool
     }
 
     /** Type safe helper to add a navigation item to the group. */
-    protected function pushItem(NavigationItem $item): void
+    protected function addItem(NavigationItem $item): void
     {
         $this->items[] = $item;
     }

From 9b754da09b48b391c78f0002d3debbeaf24ee92e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 22 Mar 2024 14:56:07 +0100
Subject: [PATCH 1127/1422] Remove relatively unnecessary PHPDoc comments

---
 .../src/Framework/Features/Navigation/NavigationGroup.php        | 1 -
 .../src/Framework/Features/Navigation/NavigationMenu.php         | 1 -
 2 files changed, 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
index ab529816035..949482618f7 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
@@ -86,7 +86,6 @@ protected function containsOnlyDocumentationPages(): bool
         });
     }
 
-    /** Type safe helper to add a navigation item to the group. */
     protected function addItem(NavigationItem $item): void
     {
         $this->items[] = $item;
diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
index d066d09bada..46e904cde29 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
@@ -63,7 +63,6 @@ public function add(NavigationItem|NavigationGroup|array $items): static
         return $this;
     }
 
-    /** Type safe helper to add a navigation item to the menu. */
     protected function addItem(NavigationItem|NavigationGroup $item): void
     {
         $this->items->push($item);

From f4750752d631d36a345d25381afb2d62561a4e1b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 22 Mar 2024 14:56:45 +0100
Subject: [PATCH 1128/1422] Shift comment from method description to body

This is not relevant for users wanting to learn about the method usage, it's just desired to explain why we have the complex sorting, so it's better to have it within the body.
---
 .../src/Framework/Features/Navigation/NavigationGroup.php      | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
index 949482618f7..e12859c6a7c 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
@@ -63,12 +63,11 @@ public function getGroupKey(): string
 
     /**
      * Get the priority to determine the order of the grouped navigation item.
-     *
-     * For sidebar groups, this is the priority of the lowest priority child, unless the dropdown instance itself has a lower priority.
      */
     public function getPriority(): int
     {
         if ($this->containsOnlyDocumentationPages()) {
+            // For sidebar groups, we use the priority of the lowest priority child, unless the dropdown instance itself has a lower priority.
             return min($this->priority, collect($this->getItems())->min(fn (NavigationItem $child): int => $child->getPriority()));
         }
 

From 868ec55d42ce7b9caf6f77122d5efb9f5bff8fcc Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 22 Mar 2024 14:57:31 +0100
Subject: [PATCH 1129/1422] Remove unnecessary PHPDoc comment

---
 .../src/Framework/Features/Navigation/NavigationGroup.php      | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
index e12859c6a7c..30a2016d22a 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
@@ -61,9 +61,6 @@ public function getGroupKey(): string
         return Str::slug($this->label);
     }
 
-    /**
-     * Get the priority to determine the order of the grouped navigation item.
-     */
     public function getPriority(): int
     {
         if ($this->containsOnlyDocumentationPages()) {

From 06a97398dfba1632b475470c3e18d3d2604b75c4 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 22 Mar 2024 14:57:39 +0100
Subject: [PATCH 1130/1422] Simplify class description

---
 .../src/Framework/Features/Navigation/NavigationGroup.php       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
index 30a2016d22a..8fd22055a16 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
@@ -13,7 +13,7 @@
 use function collect;
 
 /**
- * Abstraction for a grouped navigation menu item. For main navigation menus, this is a dropdown.
+ * Abstraction for a grouped navigation menu item, like a dropdown or a sidebar group.
  */
 class NavigationGroup implements NavigationElement
 {

From fcefc89a0fe92def5b92099684efc4a7d7dcc7e5 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 22 Mar 2024 14:59:00 +0100
Subject: [PATCH 1131/1422] Reorder methods to move up contracted ones

---
 .../Features/Navigation/NavigationGroup.php   | 34 +++++++++----------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
index 8fd22055a16..96525a5db19 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
@@ -40,6 +40,21 @@ public function getLabel(): string
         return $this->label;
     }
 
+    public function getGroupKey(): string
+    {
+        return Str::slug($this->label);
+    }
+
+    public function getPriority(): int
+    {
+        if ($this->containsOnlyDocumentationPages()) {
+            // For sidebar groups, we use the priority of the lowest priority child, unless the dropdown instance itself has a lower priority.
+            return min($this->priority, collect($this->getItems())->min(fn (NavigationItem $child): int => $child->getPriority()));
+        }
+
+        return $this->priority;
+    }
+
     /** @return array<\Hyde\Framework\Features\Navigation\NavigationItem> */
     public function getItems(): array
     {
@@ -56,19 +71,9 @@ public function add(NavigationItem|array $items): static
         return $this;
     }
 
-    public function getGroupKey(): string
-    {
-        return Str::slug($this->label);
-    }
-
-    public function getPriority(): int
+    protected function addItem(NavigationItem $item): void
     {
-        if ($this->containsOnlyDocumentationPages()) {
-            // For sidebar groups, we use the priority of the lowest priority child, unless the dropdown instance itself has a lower priority.
-            return min($this->priority, collect($this->getItems())->min(fn (NavigationItem $child): int => $child->getPriority()));
-        }
-
-        return $this->priority;
+        $this->items[] = $item;
     }
 
     protected function containsOnlyDocumentationPages(): bool
@@ -81,9 +86,4 @@ protected function containsOnlyDocumentationPages(): bool
             return (! $child->getRoute() instanceof ExternalRoute) && $child->getRoute()->getPage() instanceof DocumentationPage;
         });
     }
-
-    protected function addItem(NavigationItem $item): void
-    {
-        $this->items[] = $item;
-    }
 }

From cbab526f1a977dd35c6b1870422ac42da8c671da Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 22 Mar 2024 16:47:00 +0100
Subject: [PATCH 1132/1422] Merge conditional early return into return
 expression

---
 .../src/Framework/Features/Navigation/NavigationGroup.php   | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
index 96525a5db19..0ef773f944f 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
@@ -78,11 +78,7 @@ protected function addItem(NavigationItem $item): void
 
     protected function containsOnlyDocumentationPages(): bool
     {
-        if (empty($this->getItems())) {
-            return false;
-        }
-
-        return collect($this->getItems())->every(function (NavigationItem $child): bool {
+        return $this->getItems() && collect($this->getItems())->every(function (NavigationItem $child): bool {
             return (! $child->getRoute() instanceof ExternalRoute) && $child->getRoute()->getPage() instanceof DocumentationPage;
         });
     }

From 4f3a66a5f4adb75eca207baa47fbf5d778e0445d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 22 Mar 2024 17:07:11 +0100
Subject: [PATCH 1133/1422] Use clearer expression

---
 .../src/Framework/Features/Navigation/NavigationGroup.php       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
index 0ef773f944f..ebd076aa9af 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
@@ -78,7 +78,7 @@ protected function addItem(NavigationItem $item): void
 
     protected function containsOnlyDocumentationPages(): bool
     {
-        return $this->getItems() && collect($this->getItems())->every(function (NavigationItem $child): bool {
+        return count($this->getItems()) && collect($this->getItems())->every(function (NavigationItem $child): bool {
             return (! $child->getRoute() instanceof ExternalRoute) && $child->getRoute()->getPage() instanceof DocumentationPage;
         });
     }

From 61dfa89869317f2c35e9cc7b046c2440cfcb4b0f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 22 Mar 2024 17:09:03 +0100
Subject: [PATCH 1134/1422] Move specific method docs from interface to
 implementation

---
 .../src/Framework/Features/Navigation/NavigationElement.php  | 5 -----
 .../src/Framework/Features/Navigation/NavigationItem.php     | 5 +++++
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationElement.php b/packages/framework/src/Framework/Features/Navigation/NavigationElement.php
index 985517a7cf3..6084549e48b 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationElement.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationElement.php
@@ -18,11 +18,6 @@ public function getPriority(): int;
 
     /**
      * Get the group identifier key of the navigation item, if any.
-     *
-     * For sidebars this is the category key, for navigation menus this is the dropdown key.
-     *
-     * When using automatic subdirectory based groups, the subdirectory name is the group key.
-     * Otherwise, the group key is a "slugified" version of the group's label.
      */
     public function getGroupKey(): ?string;
 }
diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index e2aa669c552..9a6917ec8fe 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -135,6 +135,11 @@ public function getPriority(): int
 
     /**
      * Get the group identifier key of the navigation item, if any.
+     *
+     *  For sidebars this is the category key, for navigation menus this is the dropdown key.
+     *
+     *  When using automatic subdirectory based groups, the subdirectory name is the group key.
+     *  Otherwise, the group key is a 'slugified' version of the group's label.
      */
     public function getGroupKey(): ?string
     {

From e1121b11dac5e075b902daa764929ae5d38a58e0 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 22 Mar 2024 17:24:29 +0100
Subject: [PATCH 1135/1422] Use the new create method

---
 .../src/Framework/Features/Navigation/NavigationItem.php        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index 9a6917ec8fe..ff93747abc0 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -90,7 +90,7 @@ public static function create(Route|string $destination, ?string $label = null,
      */
     public static function forGroup(string $label, array $items, int $priority = NavigationMenu::LAST): NavigationGroup
     {
-        return new NavigationGroup($label, $items, $priority);
+        return NavigationGroup::create($label, $items, $priority);
     }
 
     /**

From 2c643945d08f9e49fffeb57551b6920c864b9db5 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 22 Mar 2024 17:29:49 +0100
Subject: [PATCH 1136/1422] Inline and remove the `NavigationItem::forGroup`
 method

---
 .../Features/Navigation/NavigationItem.php       | 16 ----------------
 .../Navigation/NavigationMenuGenerator.php       |  2 +-
 .../tests/Feature/NavigationMenuTest.php         |  5 +++--
 .../Services/DocumentationSidebarTest.php        |  7 ++++---
 .../framework/tests/Unit/NavigationItemTest.php  |  7 ++++---
 5 files changed, 12 insertions(+), 25 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index ff93747abc0..ba93936fa98 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -77,22 +77,6 @@ public static function create(Route|string $destination, ?string $label = null,
         return new self($destination, $label ?? '', $priority ?? NavigationMenu::DEFAULT, $group);
     }
 
-    /**
-     * Create a new dropdown navigation menu item.
-     *
-     * @deprecated Use NavigationGroup::create() instead.
-     *
-     * TODO: Move to NavigationGroup::create() as this solves the naming issue, and because it makes little sense for it to be here. It also resolves the self/static issue.
-     *
-     * @param  string  $label  The label of the dropdown item.
-     * @param  array<NavigationItem>  $items  The items to be included in the dropdown.
-     * @param  int  $priority  The priority of the dropdown item. Leave blank to use the default priority, which is last in the menu.
-     */
-    public static function forGroup(string $label, array $items, int $priority = NavigationMenu::LAST): NavigationGroup
-    {
-        return NavigationGroup::create($label, $items, $priority);
-    }
-
     /**
      * Resolve a link to the navigation item.
      */
diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
index 995ce8b81d2..0c2b05cb223 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
@@ -177,7 +177,7 @@ protected function createGroupItem(string $groupKey, string $groupName): Navigat
 
         $priority = $this->searchForGroupPriorityInConfig($groupKey);
 
-        return NavigationItem::forGroup($this->normalizeGroupLabel($label), [], $priority ?? NavigationMenu::LAST);
+        return NavigationGroup::create($this->normalizeGroupLabel($label), [], $priority ?? NavigationMenu::LAST);
     }
 
     protected function normalizeGroupLabel(string $label): string
diff --git a/packages/framework/tests/Feature/NavigationMenuTest.php b/packages/framework/tests/Feature/NavigationMenuTest.php
index 2c81be2ea36..d0ede48df22 100644
--- a/packages/framework/tests/Feature/NavigationMenuTest.php
+++ b/packages/framework/tests/Feature/NavigationMenuTest.php
@@ -8,6 +8,7 @@
 use Hyde\Support\Models\Route;
 use Hyde\Foundation\Facades\Routes;
 use Hyde\Support\Models\ExternalRoute;
+use Hyde\Framework\Features\Navigation\NavigationGroup;
 use Hyde\Framework\Features\Navigation\MainNavigationMenu;
 use Hyde\Framework\Features\Navigation\NavigationItem;
 use Hyde\Pages\MarkdownPage;
@@ -230,7 +231,7 @@ public function testPagesInSubdirectoriesAreNotAddedToTheNavigationMenuWithConfi
         $menu = $this->createNavigationMenu();
         $expected = collect([
             NavigationItem::create(Routes::get('index')),
-            NavigationItem::forGroup('Foo', [
+            NavigationGroup::create('Foo', [
                 NavigationItem::create(Routes::get('foo/bar')),
             ]),
         ]);
@@ -251,7 +252,7 @@ public function testPagesInDropdownsDoNotGetAddedToTheMainNavigation()
         $this->assertEquals([
             NavigationItem::create(Routes::get('index')),
             NavigationItem::create((new MarkdownPage('foo'))->getRoute()),
-            NavigationItem::forGroup('Bar', [
+            NavigationGroup::create('Bar', [
                 NavigationItem::create((new MarkdownPage('bar/baz'))->getRoute()),
             ]),
         ], $menu->getItems()->all());
diff --git a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
index 454cf6ecd05..f6a19307a61 100644
--- a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
+++ b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
@@ -7,6 +7,7 @@
 use Hyde\Facades\Filesystem;
 use Hyde\Foundation\Facades\Routes;
 use Hyde\Framework\Actions\ConvertsArrayToFrontMatter;
+use Hyde\Framework\Features\Navigation\NavigationGroup;
 use Hyde\Framework\Features\Navigation\DocumentationSidebar;
 use Hyde\Framework\Features\Navigation\NavigationItem;
 use Hyde\Hyde;
@@ -267,10 +268,10 @@ public function testCanHaveMultipleGroupedPagesWithTheSameNameLabels()
 
         $this->assertEquals(
             collect([
-                NavigationItem::forGroup('Bar', [
+                NavigationGroup::create('Bar', [
                     NavigationItem::create(Routes::get('docs/bar'), priority: 999),
                 ]),
-                NavigationItem::forGroup('Foo', [
+                NavigationGroup::create('Foo', [
                     NavigationItem::create(Routes::get('docs/foo'), priority: 999),
                 ]),
             ]),
@@ -288,7 +289,7 @@ public function testDuplicateLabelsWithinTheSameGroupAreNotRemoved()
 
         $this->assertEquals(
             collect([
-                NavigationItem::forGroup('Foo', [
+                NavigationGroup::create('Foo', [
                     NavigationItem::create(Routes::get('docs/bar'), priority: 999),
                     NavigationItem::create(Routes::get('docs/foo'), priority: 999),
                 ]),
diff --git a/packages/framework/tests/Unit/NavigationItemTest.php b/packages/framework/tests/Unit/NavigationItemTest.php
index 51510b06de0..b613557ac9b 100644
--- a/packages/framework/tests/Unit/NavigationItemTest.php
+++ b/packages/framework/tests/Unit/NavigationItemTest.php
@@ -14,6 +14,7 @@
 use Hyde\Support\Models\Route;
 use Hyde\Testing\UnitTestCase;
 use Mockery;
+use Hyde\Framework\Features\Navigation\NavigationGroup;
 use Hyde\Framework\Features\Navigation\NavigationElement;
 
 /**
@@ -209,7 +210,7 @@ public function testRouteBasedNavigationItemDestinationsAreResolvedRelatively()
 
     public function testDropdownFacade()
     {
-        $item = NavigationItem::forGroup('foo', []);
+        $item = NavigationGroup::create('foo');
 
         $this->assertSame('foo', $item->getLabel());
         $this->assertSame([], $item->getItems());
@@ -222,14 +223,14 @@ public function testDropdownFacadeWithChildren()
             new NavigationItem(new Route(new MarkdownPage()), 'bar'),
         ];
 
-        $item = NavigationItem::forGroup('foo', $children);
+        $item = NavigationGroup::create('foo', $children);
         $this->assertSame($children, $item->getItems());
         $this->assertSame(999, $item->getPriority());
     }
 
     public function testDropdownFacadeWithCustomPriority()
     {
-        $item = NavigationItem::forGroup('foo', [], 500);
+        $item = NavigationGroup::create('foo', [], 500);
 
         $this->assertSame(500, $item->getPriority());
     }

From b4cf19ad30bd6fdbd2b8424dcfb3fe89504ce68b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 22 Mar 2024 17:36:41 +0100
Subject: [PATCH 1137/1422] Add new todo markers

---
 .../src/Framework/Features/Navigation/DocumentationSidebar.php  | 2 ++
 .../src/Framework/Features/Navigation/NavigationItem.php        | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index b50e38682c3..cbd281afd81 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -62,6 +62,8 @@ public function hasGroups(): bool
     /**
      * Is a page within the group the current page? This is used to determine if the sidebar group should be open when loading the page.
      *
+     * @todo See if we can make this deterministic, so we pre-discover which group will be active, without having to weirdly check this in the view.
+     *
      * @internal This method is used in the sidebar view to determine if a group should be open, and is not intended to be used in other contexts.
      *
      * For index pages, this will also return true for the first group in the menu, unless the index page has a specific group set.
diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index ba93936fa98..53df7171678 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -26,6 +26,8 @@ class NavigationItem implements NavigationElement, Stringable
     protected ?Route $route;
     protected string $label;
     protected int $priority;
+
+    // TODO: Do we actually need this? We should just care if it's physically stored in a group.
     protected ?string $group = null;
 
     /**

From f2295da2be5fe3f1ab6197d96e22cd58ea51f278 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 22 Mar 2024 17:40:07 +0100
Subject: [PATCH 1138/1422] Draft new method to get active group

---
 .../Framework/Features/Navigation/DocumentationSidebar.php   | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index cbd281afd81..1700fc35f62 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -59,6 +59,11 @@ public function hasGroups(): bool
         return $this->getItems()->contains(fn (NavigationItem|NavigationGroup $item): bool => $item instanceof NavigationGroup);
     }
 
+    public function getActiveGroup(): ?string
+    {
+        return Render::getPage()->navigationMenuGroup();
+    }
+
     /**
      * Is a page within the group the current page? This is used to determine if the sidebar group should be open when loading the page.
      *

From 62b71fd26cc5704450dc4efe296462b836396f7a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 22 Mar 2024 17:43:13 +0100
Subject: [PATCH 1139/1422] Get active group using current logic

---
 .../Framework/Features/Navigation/DocumentationSidebar.php    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 1700fc35f62..dd5f8c9d766 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -61,7 +61,9 @@ public function hasGroups(): bool
 
     public function getActiveGroup(): ?string
     {
-        return Render::getPage()->navigationMenuGroup();
+        return $this->items->first(function (NavigationItem|NavigationGroup $item): bool {
+            return $this->isGroupActive($item->getGroupKey());
+        })?->getGroupKey();
     }
 
     /**

From bce8386ceccc65f012e72604599872c9d5262162 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 22 Mar 2024 17:43:48 +0100
Subject: [PATCH 1140/1422] Return the actual group instance

Want to move away from depending so much on the keys
---
 .../Framework/Features/Navigation/DocumentationSidebar.php    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index dd5f8c9d766..ae3fae6ffd9 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -59,11 +59,11 @@ public function hasGroups(): bool
         return $this->getItems()->contains(fn (NavigationItem|NavigationGroup $item): bool => $item instanceof NavigationGroup);
     }
 
-    public function getActiveGroup(): ?string
+    public function getActiveGroup(): ?NavigationGroup
     {
         return $this->items->first(function (NavigationItem|NavigationGroup $item): bool {
             return $this->isGroupActive($item->getGroupKey());
-        })?->getGroupKey();
+        });
     }
 
     /**

From ee47718baf3a65873794f847dd4aae2dda7cda3c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 22 Mar 2024 17:45:22 +0100
Subject: [PATCH 1141/1422] Move old logic to temporary method for refactor

---
 .../Features/Navigation/DocumentationSidebar.php          | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index ae3fae6ffd9..b623e7dcfae 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -62,7 +62,7 @@ public function hasGroups(): bool
     public function getActiveGroup(): ?NavigationGroup
     {
         return $this->items->first(function (NavigationItem|NavigationGroup $item): bool {
-            return $this->isGroupActive($item->getGroupKey());
+            return $this->legacy_isGroupActive($item->getGroupKey());
         });
     }
 
@@ -78,6 +78,12 @@ public function getActiveGroup(): ?NavigationGroup
      * We have this logic here because not all NavigationItem instances belong to sidebars, and we need data from both.
      */
     public function isGroupActive(string $group): bool
+    {
+        return $this->legacy_isGroupActive($group);
+    }
+
+    /** @deprecated Temporary method to aid in refactoring. */
+    public function legacy_isGroupActive(string $group): bool
     {
         $groupMatchesCurrentPageGroup = NavigationItem::normalizeGroupKey(Render::getPage()->navigationMenuGroup()) === $group;
 

From 5708c2c6e9e6bd2aa0fbe834e6c80d68a2b8c45a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 22 Mar 2024 17:46:34 +0100
Subject: [PATCH 1142/1422] Get state using new method

---
 .../src/Framework/Features/Navigation/DocumentationSidebar.php  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index b623e7dcfae..923880f054f 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -79,7 +79,7 @@ public function getActiveGroup(): ?NavigationGroup
      */
     public function isGroupActive(string $group): bool
     {
-        return $this->legacy_isGroupActive($group);
+        return $group === $this->getActiveGroup()?->getGroupKey();
     }
 
     /** @deprecated Temporary method to aid in refactoring. */

From 44c2302ced31db07eae6574a125cc00130d6b750 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 22 Mar 2024 17:50:23 +0100
Subject: [PATCH 1143/1422] Add todo

---
 .../src/Framework/Features/Navigation/DocumentationSidebar.php  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 923880f054f..ef343fefb87 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -64,6 +64,8 @@ public function getActiveGroup(): ?NavigationGroup
         return $this->items->first(function (NavigationItem|NavigationGroup $item): bool {
             return $this->legacy_isGroupActive($item->getGroupKey());
         });
+
+        // TODO:  ?? $this->items->first(fn (NavigationItem|NavigationGroup $item): bool => $item->getLabel() === 'Other')
     }
 
     /**

From 79a2124185752748620e4d06833f1747676b9fec Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 22 Mar 2024 17:50:49 +0100
Subject: [PATCH 1144/1422] Implement todo to support opening other groups

---
 .../Framework/Features/Navigation/DocumentationSidebar.php    | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index ef343fefb87..1c77bd21373 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -63,9 +63,7 @@ public function getActiveGroup(): ?NavigationGroup
     {
         return $this->items->first(function (NavigationItem|NavigationGroup $item): bool {
             return $this->legacy_isGroupActive($item->getGroupKey());
-        });
-
-        // TODO:  ?? $this->items->first(fn (NavigationItem|NavigationGroup $item): bool => $item->getLabel() === 'Other')
+        }) ?? $this->items->first(fn (NavigationItem|NavigationGroup $item): bool => $item->getLabel() === 'Other');
     }
 
     /**

From 0e198a4349baae7f198781e73aa77360237b93ea Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 22 Mar 2024 17:51:46 +0100
Subject: [PATCH 1145/1422] Replace fallback to earlier null coalesce

---
 .../Framework/Features/Navigation/DocumentationSidebar.php    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 1c77bd21373..e3519bb2cdf 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -62,8 +62,8 @@ public function hasGroups(): bool
     public function getActiveGroup(): ?NavigationGroup
     {
         return $this->items->first(function (NavigationItem|NavigationGroup $item): bool {
-            return $this->legacy_isGroupActive($item->getGroupKey());
-        }) ?? $this->items->first(fn (NavigationItem|NavigationGroup $item): bool => $item->getLabel() === 'Other');
+            return $this->legacy_isGroupActive($item->getGroupKey() ?? 'other');
+        });
     }
 
     /**

From 7f908d3ea9a836cb3d71978d23bd61e781a76377 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 22 Mar 2024 17:51:49 +0100
Subject: [PATCH 1146/1422] Revert "Replace fallback to earlier null coalesce"

This reverts commit 0e198a4349baae7f198781e73aa77360237b93ea.
---
 .../Framework/Features/Navigation/DocumentationSidebar.php    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index e3519bb2cdf..1c77bd21373 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -62,8 +62,8 @@ public function hasGroups(): bool
     public function getActiveGroup(): ?NavigationGroup
     {
         return $this->items->first(function (NavigationItem|NavigationGroup $item): bool {
-            return $this->legacy_isGroupActive($item->getGroupKey() ?? 'other');
-        });
+            return $this->legacy_isGroupActive($item->getGroupKey());
+        }) ?? $this->items->first(fn (NavigationItem|NavigationGroup $item): bool => $item->getLabel() === 'Other');
     }
 
     /**

From 869283e95b9ed06d18831a16cbb8105fa6bd7242 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 22 Mar 2024 17:52:18 +0100
Subject: [PATCH 1147/1422] Handle type error

---
 .../src/Framework/Features/Navigation/DocumentationSidebar.php  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 1c77bd21373..aeb20af17bc 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -62,7 +62,7 @@ public function hasGroups(): bool
     public function getActiveGroup(): ?NavigationGroup
     {
         return $this->items->first(function (NavigationItem|NavigationGroup $item): bool {
-            return $this->legacy_isGroupActive($item->getGroupKey());
+            return $item->getGroupKey() && $this->legacy_isGroupActive($item->getGroupKey());
         }) ?? $this->items->first(fn (NavigationItem|NavigationGroup $item): bool => $item->getLabel() === 'Other');
     }
 

From dc4a5399a1f8637ae487523ea83f05d5b4e1d25a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 22 Mar 2024 17:54:20 +0100
Subject: [PATCH 1148/1422] Update mocks

See https://github.com/hydephp/develop/pull/1632#issuecomment-2015506136
---
 .../tests/Feature/Services/DocumentationSidebarTest.php         | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
index f6a19307a61..cc057064539 100644
--- a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
+++ b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
@@ -209,12 +209,14 @@ public function testIsGroupActiveReturnsFalseWhenSuppliedGroupIsNotActive()
 
     public function testIsGroupActiveReturnsTrueWhenSuppliedGroupIsActive()
     {
+        $this->makePage('foo', ['navigation.group' => 'foo']);
         Render::setPage(new DocumentationPage(matter: ['navigation.group' => 'foo']));
         $this->assertTrue(NavigationMenuGenerator::handle(DocumentationSidebar::class)->isGroupActive('foo'));
     }
 
     public function testIsGroupActiveReturnsTrueForDifferingCasing()
     {
+        $this->makePage('foo', ['navigation.group' => 'Foo Bar']);
         Render::setPage(new DocumentationPage(matter: ['navigation.group' => 'Foo Bar']));
         $this->assertTrue(NavigationMenuGenerator::handle(DocumentationSidebar::class)->isGroupActive('foo-bar'));
     }

From 7161f0b32da591041173f2d4da4568af2339719e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 22 Mar 2024 18:01:45 +0100
Subject: [PATCH 1149/1422] Evaluate types before loop

---
 .../Features/Navigation/DocumentationSidebar.php       |  8 ++++++--
 .../Feature/Services/DocumentationSidebarTest.php      | 10 ++++++++++
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index aeb20af17bc..f5478f3d07d 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -61,9 +61,13 @@ public function hasGroups(): bool
 
     public function getActiveGroup(): ?NavigationGroup
     {
-        return $this->items->first(function (NavigationItem|NavigationGroup $item): bool {
+        if (! $this->hasGroups()) {
+            return null;
+        }
+
+        return $this->items->first(function (NavigationGroup $item): bool {
             return $item->getGroupKey() && $this->legacy_isGroupActive($item->getGroupKey());
-        }) ?? $this->items->first(fn (NavigationItem|NavigationGroup $item): bool => $item->getLabel() === 'Other');
+        }) ?? $this->items->first(fn (NavigationGroup $item): bool => $item->getLabel() === 'Other');
     }
 
     /**
diff --git a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
index cc057064539..c8b9db2df3d 100644
--- a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
+++ b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
@@ -201,6 +201,16 @@ public function testGetItemsInGroupDoesNotIncludeDocsIndex()
         );
     }
 
+//    public function testGetActiveGroup()
+//    {
+//        $this->makePage('foo', ['navigation.group' => 'foo']);
+//        $this->makePage('bar', ['navigation.group' => 'bar']);
+//        $this->makePage('baz');
+//
+//        Render::setPage(new DocumentationPage(matter: ['navigation.group' => 'foo']));
+//        dd(NavigationMenuGenerator::handle(DocumentationSidebar::class)->getActiveGroup());
+//    }
+
     public function testIsGroupActiveReturnsFalseWhenSuppliedGroupIsNotActive()
     {
         Render::setPage(new DocumentationPage(matter: ['navigation.group' => 'foo']));

From ee3aa690d284f4cb3e2ee7dacee786759973abcb Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 22 Mar 2024 18:06:33 +0100
Subject: [PATCH 1150/1422] Protect legacy method being removed

---
 .../src/Framework/Features/Navigation/DocumentationSidebar.php  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index f5478f3d07d..008af3d845b 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -87,7 +87,7 @@ public function isGroupActive(string $group): bool
     }
 
     /** @deprecated Temporary method to aid in refactoring. */
-    public function legacy_isGroupActive(string $group): bool
+    protected function legacy_isGroupActive(string $group): bool
     {
         $groupMatchesCurrentPageGroup = NavigationItem::normalizeGroupKey(Render::getPage()->navigationMenuGroup()) === $group;
 

From 1ac4204de961957eb8551642604a3a3ad92a0f82 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 22 Mar 2024 18:09:04 +0100
Subject: [PATCH 1151/1422] Create parameter for internal data hopping

This is temporary as I want to visualise how the data is passed here for the refactor
---
 .../Navigation/DocumentationSidebar.php        | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 008af3d845b..3367feff1cf 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -66,7 +66,7 @@ public function getActiveGroup(): ?NavigationGroup
         }
 
         return $this->items->first(function (NavigationGroup $item): bool {
-            return $item->getGroupKey() && $this->legacy_isGroupActive($item->getGroupKey());
+            return $item->getGroupKey() && $this->legacy_isGroupActive($item->getGroupKey(), Render::getPage());
         }) ?? $this->items->first(fn (NavigationGroup $item): bool => $item->getLabel() === 'Other');
     }
 
@@ -87,27 +87,27 @@ public function isGroupActive(string $group): bool
     }
 
     /** @deprecated Temporary method to aid in refactoring. */
-    protected function legacy_isGroupActive(string $group): bool
+    protected function legacy_isGroupActive(string $group, DocumentationPage $currentPage): bool
     {
-        $groupMatchesCurrentPageGroup = NavigationItem::normalizeGroupKey(Render::getPage()->navigationMenuGroup()) === $group;
+        $groupMatchesCurrentPageGroup = NavigationItem::normalizeGroupKey($currentPage->navigationMenuGroup()) === $group;
 
-        if ($this->isCurrentPageIndexPage()) {
-            return $this->shouldIndexPageBeActive($group) || $groupMatchesCurrentPageGroup;
+        if ($this->isCurrentPageIndexPage($currentPage)) {
+            return $this->shouldIndexPageBeActive($group, $currentPage) || $groupMatchesCurrentPageGroup;
         }
 
         return $groupMatchesCurrentPageGroup;
     }
 
-    private function isCurrentPageIndexPage(): bool
+    private function isCurrentPageIndexPage(DocumentationPage $currentPage): bool
     {
-        return Render::getPage()->getRoute()->is(DocumentationPage::homeRouteName());
+        return $currentPage->getRoute()->is(DocumentationPage::homeRouteName());
     }
 
-    private function shouldIndexPageBeActive(string $group): bool
+    private function shouldIndexPageBeActive(string $group, DocumentationPage $currentPage): bool
     {
         // Unless the index page has a specific group set, the first group in the sidebar should be open when visiting the index page.
 
-        if (filled(Render::getPage()->navigationMenuGroup())) {
+        if (filled($currentPage->navigationMenuGroup())) {
             return false;
         }
 

From c1ef8c86a6cbdf351a910197101978ece637f8a0 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 22 Mar 2024 18:10:48 +0100
Subject: [PATCH 1152/1422] Introduce local variable

---
 .../Framework/Features/Navigation/DocumentationSidebar.php  | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 3367feff1cf..4213c2eccc8 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -65,8 +65,10 @@ public function getActiveGroup(): ?NavigationGroup
             return null;
         }
 
-        return $this->items->first(function (NavigationGroup $item): bool {
-            return $item->getGroupKey() && $this->legacy_isGroupActive($item->getGroupKey(), Render::getPage());
+        $currentPage = Render::getPage();
+
+        return $this->items->first(function (NavigationGroup $item) use ($currentPage): bool {
+            return $item->getGroupKey() && $this->legacy_isGroupActive($item->getGroupKey(), $currentPage);
         }) ?? $this->items->first(fn (NavigationGroup $item): bool => $item->getLabel() === 'Other');
     }
 

From 393820191aac4ead8a5cd606603efb68724b5586 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 22 Mar 2024 18:10:59 +0100
Subject: [PATCH 1153/1422] Annotate type which should be constant

---
 .../src/Framework/Features/Navigation/DocumentationSidebar.php   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 4213c2eccc8..07a4dfd704e 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -65,6 +65,7 @@ public function getActiveGroup(): ?NavigationGroup
             return null;
         }
 
+        /** @var DocumentationPage $currentPage */
         $currentPage = Render::getPage();
 
         return $this->items->first(function (NavigationGroup $item) use ($currentPage): bool {

From 136f1253cdf6aadf4a3a1f6f6a1a6fd11517d6a6 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 22 Mar 2024 18:11:03 +0100
Subject: [PATCH 1154/1422] Revert "Annotate type which should be constant"

This reverts commit 393820191aac4ead8a5cd606603efb68724b5586.
---
 .../src/Framework/Features/Navigation/DocumentationSidebar.php   | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 07a4dfd704e..4213c2eccc8 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -65,7 +65,6 @@ public function getActiveGroup(): ?NavigationGroup
             return null;
         }
 
-        /** @var DocumentationPage $currentPage */
         $currentPage = Render::getPage();
 
         return $this->items->first(function (NavigationGroup $item) use ($currentPage): bool {

From 30f3424ed8884960007de1ca96d62f9f6fe0a170 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 22 Mar 2024 18:11:40 +0100
Subject: [PATCH 1155/1422] Use more generic type

Apparently some tests use other pages, and I think that's fine for now
---
 .../Framework/Features/Navigation/DocumentationSidebar.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 4213c2eccc8..63df79b7398 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -7,6 +7,7 @@
 use Hyde\Facades\Config;
 use Hyde\Pages\DocumentationPage;
 use Hyde\Support\Facades\Render;
+use Hyde\Pages\Concerns\HydePage;
 use Illuminate\Contracts\Support\Arrayable;
 
 use function app;
@@ -89,7 +90,7 @@ public function isGroupActive(string $group): bool
     }
 
     /** @deprecated Temporary method to aid in refactoring. */
-    protected function legacy_isGroupActive(string $group, DocumentationPage $currentPage): bool
+    protected function legacy_isGroupActive(string $group, HydePage $currentPage): bool
     {
         $groupMatchesCurrentPageGroup = NavigationItem::normalizeGroupKey($currentPage->navigationMenuGroup()) === $group;
 
@@ -100,12 +101,12 @@ protected function legacy_isGroupActive(string $group, DocumentationPage $curren
         return $groupMatchesCurrentPageGroup;
     }
 
-    private function isCurrentPageIndexPage(DocumentationPage $currentPage): bool
+    private function isCurrentPageIndexPage(HydePage $currentPage): bool
     {
         return $currentPage->getRoute()->is(DocumentationPage::homeRouteName());
     }
 
-    private function shouldIndexPageBeActive(string $group, DocumentationPage $currentPage): bool
+    private function shouldIndexPageBeActive(string $group, HydePage $currentPage): bool
     {
         // Unless the index page has a specific group set, the first group in the sidebar should be open when visiting the index page.
 

From 9255856825b5fdc676aaed679e4191dd3d54be3d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 22 Mar 2024 18:13:14 +0100
Subject: [PATCH 1156/1422] Extract helper

---
 .../Framework/Features/Navigation/DocumentationSidebar.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 63df79b7398..c3bd971c8f4 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -92,7 +92,7 @@ public function isGroupActive(string $group): bool
     /** @deprecated Temporary method to aid in refactoring. */
     protected function legacy_isGroupActive(string $group, HydePage $currentPage): bool
     {
-        $groupMatchesCurrentPageGroup = NavigationItem::normalizeGroupKey($currentPage->navigationMenuGroup()) === $group;
+        $groupMatchesCurrentPageGroup = $this->groupMatchesCurrentPageGroup($currentPage, $group);
 
         if ($this->isCurrentPageIndexPage($currentPage)) {
             return $this->shouldIndexPageBeActive($group, $currentPage) || $groupMatchesCurrentPageGroup;
@@ -116,4 +116,9 @@ private function shouldIndexPageBeActive(string $group, HydePage $currentPage):
 
         return $group === $this->getItems()->firstOrFail()->getGroupKey();
     }
+
+    protected function groupMatchesCurrentPageGroup(HydePage $currentPage, string $group): bool
+    {
+        return NavigationItem::normalizeGroupKey($currentPage->navigationMenuGroup()) === $group;
+    }
 }

From ff21524fa247a42532b352eb2b90a0c67ecd9a34 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 22 Mar 2024 18:13:23 +0100
Subject: [PATCH 1157/1422] Inline variable

---
 .../Framework/Features/Navigation/DocumentationSidebar.php  | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index c3bd971c8f4..a2e479f5d35 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -92,13 +92,11 @@ public function isGroupActive(string $group): bool
     /** @deprecated Temporary method to aid in refactoring. */
     protected function legacy_isGroupActive(string $group, HydePage $currentPage): bool
     {
-        $groupMatchesCurrentPageGroup = $this->groupMatchesCurrentPageGroup($currentPage, $group);
-
         if ($this->isCurrentPageIndexPage($currentPage)) {
-            return $this->shouldIndexPageBeActive($group, $currentPage) || $groupMatchesCurrentPageGroup;
+            return $this->shouldIndexPageBeActive($group, $currentPage) || $this->groupMatchesCurrentPageGroup($currentPage, $group);
         }
 
-        return $groupMatchesCurrentPageGroup;
+        return $this->groupMatchesCurrentPageGroup($currentPage, $group);
     }
 
     private function isCurrentPageIndexPage(HydePage $currentPage): bool

From 44b901e2790eb3d42d6f472bdda59df5d4a07868 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 22 Mar 2024 18:15:15 +0100
Subject: [PATCH 1158/1422] Shift auxiliary return path to helper method

---
 .../Framework/Features/Navigation/DocumentationSidebar.php    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index a2e479f5d35..1a050fef99c 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -93,7 +93,7 @@ public function isGroupActive(string $group): bool
     protected function legacy_isGroupActive(string $group, HydePage $currentPage): bool
     {
         if ($this->isCurrentPageIndexPage($currentPage)) {
-            return $this->shouldIndexPageBeActive($group, $currentPage) || $this->groupMatchesCurrentPageGroup($currentPage, $group);
+            return $this->shouldIndexPageBeActive($group, $currentPage);
         }
 
         return $this->groupMatchesCurrentPageGroup($currentPage, $group);
@@ -112,7 +112,7 @@ private function shouldIndexPageBeActive(string $group, HydePage $currentPage):
             return false;
         }
 
-        return $group === $this->getItems()->firstOrFail()->getGroupKey();
+        return ($group === $this->getItems()->firstOrFail()->getGroupKey()) || $this->groupMatchesCurrentPageGroup($currentPage, $group);
     }
 
     protected function groupMatchesCurrentPageGroup(HydePage $currentPage, string $group): bool

From 2f8b7cc66109e3f07fa4daf908f8ed81aca11c5e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 22 Mar 2024 18:17:06 +0100
Subject: [PATCH 1159/1422] Evaluate condition earlier

---
 .../Framework/Features/Navigation/DocumentationSidebar.php  | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 1a050fef99c..a4bfb4fe3c6 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -108,11 +108,15 @@ private function shouldIndexPageBeActive(string $group, HydePage $currentPage):
     {
         // Unless the index page has a specific group set, the first group in the sidebar should be open when visiting the index page.
 
+        if ($this->groupMatchesCurrentPageGroup($currentPage, $group)) {
+            return true;
+        }
+
         if (filled($currentPage->navigationMenuGroup())) {
             return false;
         }
 
-        return ($group === $this->getItems()->firstOrFail()->getGroupKey()) || $this->groupMatchesCurrentPageGroup($currentPage, $group);
+        return $group === $this->getItems()->firstOrFail()->getGroupKey();
     }
 
     protected function groupMatchesCurrentPageGroup(HydePage $currentPage, string $group): bool

From 2efed29d02d17be7f56605675e63db2dc7ae22a6 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 22 Mar 2024 18:24:04 +0100
Subject: [PATCH 1160/1422] Update active group check to compare against
 determined state

---
 .../resources/views/components/docs/sidebar-items.blade.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/resources/views/components/docs/sidebar-items.blade.php b/packages/framework/resources/views/components/docs/sidebar-items.blade.php
index aef909869ad..6efff702add 100644
--- a/packages/framework/resources/views/components/docs/sidebar-items.blade.php
+++ b/packages/framework/resources/views/components/docs/sidebar-items.blade.php
@@ -8,7 +8,7 @@
     <ul id="sidebar-items" role="list">
         @php /** @var \Hyde\Framework\Features\Navigation\NavigationGroup $group */ @endphp
         @foreach ($sidebar->getItems() as $group)
-            <li class="sidebar-group" role="listitem" @if($sidebar->isCollapsible()) x-data="{ groupOpen: {{ $sidebar->isGroupActive($group->getGroupKey()) ? 'true' : 'false' }} }" @endif>
+            <li class="sidebar-group" role="listitem" @if($sidebar->isCollapsible()) x-data="{ groupOpen: {{ ($sidebar->getActiveGroup() === $group) ? 'true' : 'false' }} }" @endif>
                 <header @class(['sidebar-group-header p-2 px-4 -ml-2 flex justify-between items-center', 'group hover:bg-black/10' => $sidebar->isCollapsible()]) @if($sidebar->isCollapsible()) @click="groupOpen = ! groupOpen" @endif>
                     <h4 @class(['sidebar-group-heading text-base font-semibold', 'cursor-pointer dark:group-hover:text-white' => $sidebar->isCollapsible()])>{{ $group->getLabel() }}</h4>
                     @if($sidebar->isCollapsible())

From a4a38f5e18efafb58ba3e7928b16b6fdd3c261c3 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 22 Mar 2024 18:25:21 +0100
Subject: [PATCH 1161/1422] Add todo

---
 .../src/Framework/Features/Navigation/DocumentationSidebar.php   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index a4bfb4fe3c6..d106cbfdc88 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -63,6 +63,7 @@ public function hasGroups(): bool
     public function getActiveGroup(): ?NavigationGroup
     {
         if (! $this->hasGroups()) {
+            // Todo we should also consider checking if the sidebar is collapsible, because if it isn't all groups are always active.
             return null;
         }
 

From eb67f0816b8023ba2f16534cb547ceb9e1f7722f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 22 Mar 2024 19:50:33 +0100
Subject: [PATCH 1162/1422] Return null when current page is null

---
 .../Framework/Features/Navigation/DocumentationSidebar.php    | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index d106cbfdc88..b6f04f4b01c 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -69,6 +69,10 @@ public function getActiveGroup(): ?NavigationGroup
 
         $currentPage = Render::getPage();
 
+        if ($currentPage === null) {
+            return null;
+        }
+
         return $this->items->first(function (NavigationGroup $item) use ($currentPage): bool {
             return $item->getGroupKey() && $this->legacy_isGroupActive($item->getGroupKey(), $currentPage);
         }) ?? $this->items->first(fn (NavigationGroup $item): bool => $item->getLabel() === 'Other');

From 9387233254bdb3cdfcac90b5bfc268f6a56f9430 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 23 Mar 2024 10:31:50 +0100
Subject: [PATCH 1163/1422] Create
 DocumentationSidebarGetActiveGroupUnitTest.php

---
 ...DocumentationSidebarGetActiveGroupUnitTest.php | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php

diff --git a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
new file mode 100644
index 00000000000..a0e0e627ef4
--- /dev/null
+++ b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
@@ -0,0 +1,15 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Hyde\Framework\Testing\Unit;
+
+use Hyde\Testing\UnitTestCase;
+
+/**
+ * @covers \Hyde\Framework\Features\Navigation\DocumentationSidebar
+ */
+class DocumentationSidebarGetActiveGroupUnitTest extends UnitTestCase
+{
+    //
+}

From a5df7c6e08a9d57325e2df507252b677c6241ae8 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 23 Mar 2024 10:32:02 +0100
Subject: [PATCH 1164/1422] Annotate test crosslinks

---
 .../tests/Feature/Services/DocumentationSidebarTest.php        | 1 +
 .../tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php  | 3 +++
 packages/framework/tests/Unit/DocumentationSidebarUnitTest.php | 1 +
 3 files changed, 5 insertions(+)

diff --git a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
index c8b9db2df3d..90f57c2b39c 100644
--- a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
+++ b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
@@ -27,6 +27,7 @@
  * @covers \Hyde\Framework\Features\Navigation\NavigationItem
  *
  * @see \Hyde\Framework\Testing\Unit\DocumentationSidebarUnitTest
+ * @see \Hyde\Framework\Testing\Unit\DocumentationSidebarGetActiveGroupUnitTest
  */
 class DocumentationSidebarTest extends TestCase
 {
diff --git a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
index a0e0e627ef4..5c009047574 100644
--- a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
+++ b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
@@ -8,6 +8,9 @@
 
 /**
  * @covers \Hyde\Framework\Features\Navigation\DocumentationSidebar
+ *
+ * @see \Hyde\Framework\Testing\Feature\Services\DocumentationSidebarTest
+ * @see \Hyde\Framework\Testing\Unit\DocumentationSidebarGetActiveGroupUnitTest
  */
 class DocumentationSidebarGetActiveGroupUnitTest extends UnitTestCase
 {
diff --git a/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php b/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
index 036350064ae..9b9c4b7bb6a 100644
--- a/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
+++ b/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
@@ -16,6 +16,7 @@
  * @covers \Hyde\Framework\Features\Navigation\NavigationMenu
  *
  * @see \Hyde\Framework\Testing\Feature\Services\DocumentationSidebarTest
+ * @see \Hyde\Framework\Testing\Unit\DocumentationSidebarGetActiveGroupUnitTest
  * @see \Hyde\Framework\Testing\Unit\NavigationMenuUnitTest
  */
 class DocumentationSidebarUnitTest extends UnitTestCase

From 5203626b8032d7583ff7a18ab201f9c391098a4d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 23 Mar 2024 10:33:28 +0100
Subject: [PATCH 1165/1422] Implement the main test method

---
 ...mentationSidebarGetActiveGroupUnitTest.php | 55 ++++++++++++++++++-
 1 file changed, 54 insertions(+), 1 deletion(-)

diff --git a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
index 5c009047574..d28f8b1be56 100644
--- a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
+++ b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
@@ -4,7 +4,17 @@
 
 namespace Hyde\Framework\Testing\Unit;
 
+use Mockery;
+use Illuminate\View\Factory;
 use Hyde\Testing\UnitTestCase;
+use Hyde\Support\Facades\Render;
+use Hyde\Pages\DocumentationPage;
+use Hyde\Support\Models\RenderData;
+use Hyde\Foundation\Facades\Routes;
+use Illuminate\Support\Facades\View;
+use Hyde\Framework\Features\Navigation\NavigationGroup;
+use Hyde\Framework\Features\Navigation\DocumentationSidebar;
+use Hyde\Framework\Features\Navigation\NavigationMenuGenerator;
 
 /**
  * @covers \Hyde\Framework\Features\Navigation\DocumentationSidebar
@@ -14,5 +24,48 @@
  */
 class DocumentationSidebarGetActiveGroupUnitTest extends UnitTestCase
 {
-    //
+    protected static bool $needsConfig = true;
+    protected static bool $needsKernel = true;
+
+    public function testGetActiveGroup()
+    {
+        View::swap(Mockery::mock(Factory::class)->makePartial());
+        $renderData = new RenderData();
+        Render::swap($renderData);
+
+        $pages = [
+            'foo' => 'one',
+            'bar' => 'two',
+            'baz' => 'three',
+        ];
+
+        foreach ($pages as $page => $group) {
+            $page = new DocumentationPage($page, ['navigation.group' => $group]);
+            Routes::addRoute($page->getRoute());
+        }
+
+        $menu = NavigationMenuGenerator::handle(DocumentationSidebar::class);
+
+        $this->assertNull($menu->getActiveGroup());
+
+        $renderData->setPage(new DocumentationPage('foo', ['navigation.group' => 'one']));
+
+        $this->assertInstanceOf(NavigationGroup::class, $menu->getActiveGroup());
+        $this->assertSame('one', $menu->getActiveGroup()->getGroupKey());
+
+        foreach ($pages as $page => $group) {
+            $renderData->setPage(new DocumentationPage($page, ['navigation.group' => $group]));
+            $this->assertSame($group, $menu->getActiveGroup()->getGroupKey());
+        }
+
+        $renderData->setPage(new DocumentationPage('foo', ['navigation.group' => 'one']));
+
+        $this->assertSame([
+            'one' => true,
+            'two' => false,
+            'three' => false,
+        ], $menu->getItems()->mapWithKeys(fn (NavigationGroup $item): array => [
+            $item->getGroupKey() => $item === $menu->getActiveGroup(),
+        ])->all());
+    }
 }

From 4c868f242a16984b811b1e4617aa9d9d80ef091a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 23 Mar 2024 10:41:20 +0100
Subject: [PATCH 1166/1422] Refactor test using ChatGPT

---
 ...mentationSidebarGetActiveGroupUnitTest.php | 41 ++++++++++++++++---
 1 file changed, 36 insertions(+), 5 deletions(-)

diff --git a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
index d28f8b1be56..ddbe41363ba 100644
--- a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
+++ b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
@@ -27,8 +27,10 @@ class DocumentationSidebarGetActiveGroupUnitTest extends UnitTestCase
     protected static bool $needsConfig = true;
     protected static bool $needsKernel = true;
 
-    public function testGetActiveGroup()
+    protected function setUp(): void
     {
+        parent::setUp();
+
         View::swap(Mockery::mock(Factory::class)->makePartial());
         $renderData = new RenderData();
         Render::swap($renderData);
@@ -43,29 +45,58 @@ public function testGetActiveGroup()
             $page = new DocumentationPage($page, ['navigation.group' => $group]);
             Routes::addRoute($page->getRoute());
         }
+    }
 
+    public function testActiveGroupIsNullInitially()
+    {
         $menu = NavigationMenuGenerator::handle(DocumentationSidebar::class);
-
         $this->assertNull($menu->getActiveGroup());
+    }
+
+    public function testSetActiveGroup()
+    {
+        $menu = NavigationMenuGenerator::handle(DocumentationSidebar::class);
 
+        $renderData = Render::getFacadeRoot();
         $renderData->setPage(new DocumentationPage('foo', ['navigation.group' => 'one']));
 
         $this->assertInstanceOf(NavigationGroup::class, $menu->getActiveGroup());
         $this->assertSame('one', $menu->getActiveGroup()->getGroupKey());
+    }
+
+    public function testActiveGroupUpdatesWithPageChanges()
+    {
+        $menu = NavigationMenuGenerator::handle(DocumentationSidebar::class);
+        $renderData = Render::getFacadeRoot();
+
+        $pages = [
+            'foo' => 'one',
+            'bar' => 'two',
+            'baz' => 'three',
+        ];
 
         foreach ($pages as $page => $group) {
             $renderData->setPage(new DocumentationPage($page, ['navigation.group' => $group]));
             $this->assertSame($group, $menu->getActiveGroup()->getGroupKey());
         }
+    }
 
+    public function testActiveGroupItems()
+    {
+        $menu = NavigationMenuGenerator::handle(DocumentationSidebar::class);
+        $renderData = Render::getFacadeRoot();
         $renderData->setPage(new DocumentationPage('foo', ['navigation.group' => 'one']));
 
-        $this->assertSame([
+        $expectedItems = [
             'one' => true,
             'two' => false,
             'three' => false,
-        ], $menu->getItems()->mapWithKeys(fn (NavigationGroup $item): array => [
+        ];
+
+        $actualItems = $menu->getItems()->mapWithKeys(fn (NavigationGroup $item): array => [
             $item->getGroupKey() => $item === $menu->getActiveGroup(),
-        ])->all());
+        ])->all();
+
+        $this->assertSame($expectedItems, $actualItems);
     }
 }

From b8504ca155c63f818e08e3af1c6e161d4fcc2a83 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 23 Mar 2024 10:46:19 +0100
Subject: [PATCH 1167/1422] Cleanup generated test

---
 ...mentationSidebarGetActiveGroupUnitTest.php | 36 +++++++++----------
 1 file changed, 16 insertions(+), 20 deletions(-)

diff --git a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
index ddbe41363ba..10a79e0ba32 100644
--- a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
+++ b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
@@ -27,13 +27,16 @@ class DocumentationSidebarGetActiveGroupUnitTest extends UnitTestCase
     protected static bool $needsConfig = true;
     protected static bool $needsKernel = true;
 
+    protected RenderData $renderData;
+    protected DocumentationSidebar $menu;
+
     protected function setUp(): void
     {
         parent::setUp();
 
         View::swap(Mockery::mock(Factory::class)->makePartial());
-        $renderData = new RenderData();
-        Render::swap($renderData);
+        $this->renderData = new RenderData();
+        Render::swap($this->renderData);
 
         $pages = [
             'foo' => 'one',
@@ -45,30 +48,25 @@ protected function setUp(): void
             $page = new DocumentationPage($page, ['navigation.group' => $group]);
             Routes::addRoute($page->getRoute());
         }
+
+        $this->menu = NavigationMenuGenerator::handle(DocumentationSidebar::class);
     }
 
     public function testActiveGroupIsNullInitially()
     {
-        $menu = NavigationMenuGenerator::handle(DocumentationSidebar::class);
-        $this->assertNull($menu->getActiveGroup());
+        $this->assertNull($this->menu->getActiveGroup());
     }
 
     public function testSetActiveGroup()
     {
-        $menu = NavigationMenuGenerator::handle(DocumentationSidebar::class);
+        $this->renderData->setPage(new DocumentationPage('foo', ['navigation.group' => 'one']));
 
-        $renderData = Render::getFacadeRoot();
-        $renderData->setPage(new DocumentationPage('foo', ['navigation.group' => 'one']));
-
-        $this->assertInstanceOf(NavigationGroup::class, $menu->getActiveGroup());
-        $this->assertSame('one', $menu->getActiveGroup()->getGroupKey());
+        $this->assertInstanceOf(NavigationGroup::class, $this->menu->getActiveGroup());
+        $this->assertSame('one', $this->menu->getActiveGroup()->getGroupKey());
     }
 
     public function testActiveGroupUpdatesWithPageChanges()
     {
-        $menu = NavigationMenuGenerator::handle(DocumentationSidebar::class);
-        $renderData = Render::getFacadeRoot();
-
         $pages = [
             'foo' => 'one',
             'bar' => 'two',
@@ -76,16 +74,14 @@ public function testActiveGroupUpdatesWithPageChanges()
         ];
 
         foreach ($pages as $page => $group) {
-            $renderData->setPage(new DocumentationPage($page, ['navigation.group' => $group]));
-            $this->assertSame($group, $menu->getActiveGroup()->getGroupKey());
+            $this->renderData->setPage(new DocumentationPage($page, ['navigation.group' => $group]));
+            $this->assertSame($group, $this->menu->getActiveGroup()->getGroupKey());
         }
     }
 
     public function testActiveGroupItems()
     {
-        $menu = NavigationMenuGenerator::handle(DocumentationSidebar::class);
-        $renderData = Render::getFacadeRoot();
-        $renderData->setPage(new DocumentationPage('foo', ['navigation.group' => 'one']));
+        $this->renderData->setPage(new DocumentationPage('foo', ['navigation.group' => 'one']));
 
         $expectedItems = [
             'one' => true,
@@ -93,8 +89,8 @@ public function testActiveGroupItems()
             'three' => false,
         ];
 
-        $actualItems = $menu->getItems()->mapWithKeys(fn (NavigationGroup $item): array => [
-            $item->getGroupKey() => $item === $menu->getActiveGroup(),
+        $actualItems = $this->menu->getItems()->mapWithKeys(fn (NavigationGroup $item): array => [
+            $item->getGroupKey() => $item === $this->menu->getActiveGroup(),
         ])->all();
 
         $this->assertSame($expectedItems, $actualItems);

From 0376cb37494cb0f8063a567beae5aef95ed9fd18 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 23 Mar 2024 11:29:36 +0100
Subject: [PATCH 1168/1422] Split out unit test method

---
 .../Unit/DocumentationSidebarGetActiveGroupUnitTest.php     | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
index 10a79e0ba32..3e3606549a7 100644
--- a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
+++ b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
@@ -53,6 +53,12 @@ protected function setUp(): void
     }
 
     public function testActiveGroupIsNullInitially()
+    {
+        $menu = new DocumentationSidebar();
+        $this->assertNull($menu->getActiveGroup());
+    }
+
+    public function testActiveGroupIsNullWhenNoGroupIsActive()
     {
         $this->assertNull($this->menu->getActiveGroup());
     }

From c2c0716da71cf6de8cd9dd0c5e233c75111eeead Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 23 Mar 2024 11:36:58 +0100
Subject: [PATCH 1169/1422] Return null if sidebar is not collapsible

---
 .../Framework/Features/Navigation/DocumentationSidebar.php   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index b6f04f4b01c..22678febb17 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -63,7 +63,10 @@ public function hasGroups(): bool
     public function getActiveGroup(): ?NavigationGroup
     {
         if (! $this->hasGroups()) {
-            // Todo we should also consider checking if the sidebar is collapsible, because if it isn't all groups are always active.
+            return null;
+        }
+
+        if (! $this->isCollapsible()) {
             return null;
         }
 

From d39a6e1e8a99b2c165d44af8026fd9f94d1192f1 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 23 Mar 2024 11:37:53 +0100
Subject: [PATCH 1170/1422] Add todos

---
 .../src/Framework/Features/Navigation/DocumentationSidebar.php  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 22678febb17..78271f4d5df 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -63,10 +63,12 @@ public function hasGroups(): bool
     public function getActiveGroup(): ?NavigationGroup
     {
         if (! $this->hasGroups()) {
+            // Todo: Would it make more sense to throw an exception here?
             return null;
         }
 
         if (! $this->isCollapsible()) {
+            // Todo: Would it make more sense to throw an exception here?
             return null;
         }
 

From e43260bc58501c3aa5765edc7c5fdf8f9bb85562 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 23 Mar 2024 11:46:25 +0100
Subject: [PATCH 1171/1422] Refactor test to make data flow clearer

---
 ...mentationSidebarGetActiveGroupUnitTest.php | 44 ++++++++++---------
 1 file changed, 24 insertions(+), 20 deletions(-)

diff --git a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
index 3e3606549a7..69befc453a3 100644
--- a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
+++ b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
@@ -28,7 +28,6 @@ class DocumentationSidebarGetActiveGroupUnitTest extends UnitTestCase
     protected static bool $needsKernel = true;
 
     protected RenderData $renderData;
-    protected DocumentationSidebar $menu;
 
     protected function setUp(): void
     {
@@ -37,19 +36,6 @@ protected function setUp(): void
         View::swap(Mockery::mock(Factory::class)->makePartial());
         $this->renderData = new RenderData();
         Render::swap($this->renderData);
-
-        $pages = [
-            'foo' => 'one',
-            'bar' => 'two',
-            'baz' => 'three',
-        ];
-
-        foreach ($pages as $page => $group) {
-            $page = new DocumentationPage($page, ['navigation.group' => $group]);
-            Routes::addRoute($page->getRoute());
-        }
-
-        $this->menu = NavigationMenuGenerator::handle(DocumentationSidebar::class);
     }
 
     public function testActiveGroupIsNullInitially()
@@ -60,15 +46,17 @@ public function testActiveGroupIsNullInitially()
 
     public function testActiveGroupIsNullWhenNoGroupIsActive()
     {
-        $this->assertNull($this->menu->getActiveGroup());
+        $this->assertNull($this->sidebar()->getActiveGroup());
     }
 
     public function testSetActiveGroup()
     {
         $this->renderData->setPage(new DocumentationPage('foo', ['navigation.group' => 'one']));
 
-        $this->assertInstanceOf(NavigationGroup::class, $this->menu->getActiveGroup());
-        $this->assertSame('one', $this->menu->getActiveGroup()->getGroupKey());
+        $sidebar = $this->sidebar();
+
+        $this->assertInstanceOf(NavigationGroup::class, $sidebar->getActiveGroup());
+        $this->assertSame('one', $sidebar->getActiveGroup()->getGroupKey());
     }
 
     public function testActiveGroupUpdatesWithPageChanges()
@@ -81,7 +69,7 @@ public function testActiveGroupUpdatesWithPageChanges()
 
         foreach ($pages as $page => $group) {
             $this->renderData->setPage(new DocumentationPage($page, ['navigation.group' => $group]));
-            $this->assertSame($group, $this->menu->getActiveGroup()->getGroupKey());
+            $this->assertSame($group, $this->sidebar()->getActiveGroup()->getGroupKey());
         }
     }
 
@@ -95,10 +83,26 @@ public function testActiveGroupItems()
             'three' => false,
         ];
 
-        $actualItems = $this->menu->getItems()->mapWithKeys(fn (NavigationGroup $item): array => [
-            $item->getGroupKey() => $item === $this->menu->getActiveGroup(),
+        $sidebar = $this->sidebar();
+
+        $actualItems = $sidebar->getItems()->mapWithKeys(fn (NavigationGroup $item): array => [
+            $item->getGroupKey() => $item === $sidebar->getActiveGroup(),
         ])->all();
 
         $this->assertSame($expectedItems, $actualItems);
     }
+
+    protected function sidebar(array $pages = [
+        'foo' => 'one',
+        'bar' => 'two',
+        'baz' => 'three',
+    ]): DocumentationSidebar
+    {
+        foreach ($pages as $page => $group) {
+            $page = new DocumentationPage($page, ['navigation.group' => $group]);
+            Routes::addRoute($page->getRoute());
+        }
+
+        return NavigationMenuGenerator::handle(DocumentationSidebar::class);
+    }
 }

From a0b0d22b6eee36d0480634090589a67f4e77494b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 23 Mar 2024 11:42:16 +0100
Subject: [PATCH 1172/1422] Test active group is null when there are no groups

---
 .../Unit/DocumentationSidebarGetActiveGroupUnitTest.php     | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
index 69befc453a3..b0bc5d6b8bf 100644
--- a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
+++ b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
@@ -44,6 +44,12 @@ public function testActiveGroupIsNullInitially()
         $this->assertNull($menu->getActiveGroup());
     }
 
+    public function testActiveGroupIsNullWhenThereAreNoGroups()
+    {
+        $menu = new DocumentationSidebar();
+        $this->assertNull($menu->getActiveGroup());
+    }
+
     public function testActiveGroupIsNullWhenNoGroupIsActive()
     {
         $this->assertNull($this->sidebar()->getActiveGroup());

From 70dccebfc9f3d52056e44cde200415790c6f12e6 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 23 Mar 2024 11:40:52 +0100
Subject: [PATCH 1173/1422] Throw exceptions when trying to get group data for
 non grouped menu

I think trying to do this means something is wrong in the application, as you should not care about these methods if you are not using groups, so if you are, something is wrong, and it's helpful to have an exception explain exactly what is wrong than making the user trying to debug which part returns null.
---
 .../Framework/Features/Navigation/DocumentationSidebar.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 78271f4d5df..30fcbf5063d 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -5,6 +5,7 @@
 namespace Hyde\Framework\Features\Navigation;
 
 use Hyde\Facades\Config;
+use BadMethodCallException;
 use Hyde\Pages\DocumentationPage;
 use Hyde\Support\Facades\Render;
 use Hyde\Pages\Concerns\HydePage;
@@ -63,13 +64,11 @@ public function hasGroups(): bool
     public function getActiveGroup(): ?NavigationGroup
     {
         if (! $this->hasGroups()) {
-            // Todo: Would it make more sense to throw an exception here?
-            return null;
+            throw new BadMethodCallException('Cannot get the active group when there are no groups.');
         }
 
         if (! $this->isCollapsible()) {
-            // Todo: Would it make more sense to throw an exception here?
-            return null;
+            throw new BadMethodCallException('Cannot get the active group when the sidebar is not collapsible.');
         }
 
         $currentPage = Render::getPage();

From 68118a4674019d64f03bbbd5364a0c451143a20c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 23 Mar 2024 11:41:37 +0100
Subject: [PATCH 1174/1422] Add early throw if there are no items

---
 .../Framework/Features/Navigation/DocumentationSidebar.php    | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 30fcbf5063d..711631cad13 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -63,6 +63,10 @@ public function hasGroups(): bool
 
     public function getActiveGroup(): ?NavigationGroup
     {
+        if ($this->items->isEmpty()) {
+            throw new BadMethodCallException('Cannot get the active group when there are no items.');
+        }
+
         if (! $this->hasGroups()) {
             throw new BadMethodCallException('Cannot get the active group when there are no groups.');
         }

From 96f16bf956fff3120d5da640e415be0f1ce79f2a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 23 Mar 2024 12:42:18 +0100
Subject: [PATCH 1175/1422] Tests that exceptions are now thrown

---
 ...umentationSidebarGetActiveGroupUnitTest.php | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
index b0bc5d6b8bf..49147d21a03 100644
--- a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
+++ b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
@@ -5,6 +5,7 @@
 namespace Hyde\Framework\Testing\Unit;
 
 use Mockery;
+use BadMethodCallException;
 use Illuminate\View\Factory;
 use Hyde\Testing\UnitTestCase;
 use Hyde\Support\Facades\Render;
@@ -12,6 +13,7 @@
 use Hyde\Support\Models\RenderData;
 use Hyde\Foundation\Facades\Routes;
 use Illuminate\Support\Facades\View;
+use Hyde\Framework\Features\Navigation\NavigationItem;
 use Hyde\Framework\Features\Navigation\NavigationGroup;
 use Hyde\Framework\Features\Navigation\DocumentationSidebar;
 use Hyde\Framework\Features\Navigation\NavigationMenuGenerator;
@@ -38,16 +40,20 @@ protected function setUp(): void
         Render::swap($this->renderData);
     }
 
-    public function testActiveGroupIsNullInitially()
+    public function testCannotGetActiveGroupWhenNoItemsExist()
     {
-        $menu = new DocumentationSidebar();
-        $this->assertNull($menu->getActiveGroup());
+        $this->expectException(BadMethodCallException::class);
+        $this->expectExceptionMessage('Cannot get the active group when there are no items.');
+
+        (new DocumentationSidebar())->getActiveGroup();
     }
 
-    public function testActiveGroupIsNullWhenThereAreNoGroups()
+    public function testCannotGetActiveGroupWhenNoGroupsExist()
     {
-        $menu = new DocumentationSidebar();
-        $this->assertNull($menu->getActiveGroup());
+        $this->expectException(BadMethodCallException::class);
+        $this->expectExceptionMessage('Cannot get the active group when there are no groups.');
+
+        (new DocumentationSidebar([new NavigationItem('foo', 'Foo')]))->getActiveGroup();
     }
 
     public function testActiveGroupIsNullWhenNoGroupIsActive()

From 683d988419d5cd5a28a9c2218acc29d6d33f2730 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 23 Mar 2024 12:45:17 +0100
Subject: [PATCH 1176/1422] Manually mock config for each test to reset it

---
 .../tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
index 49147d21a03..d701672ecfe 100644
--- a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
+++ b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
@@ -26,7 +26,6 @@
  */
 class DocumentationSidebarGetActiveGroupUnitTest extends UnitTestCase
 {
-    protected static bool $needsConfig = true;
     protected static bool $needsKernel = true;
 
     protected RenderData $renderData;
@@ -38,6 +37,8 @@ protected function setUp(): void
         View::swap(Mockery::mock(Factory::class)->makePartial());
         $this->renderData = new RenderData();
         Render::swap($this->renderData);
+
+        self::mockConfig();
     }
 
     public function testCannotGetActiveGroupWhenNoItemsExist()

From fa5876d3b15f5dc5011ed123f5848cf2548a1f28 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 23 Mar 2024 12:46:52 +0100
Subject: [PATCH 1177/1422] Test cannot get active group when sidebars are not
 collapsible

---
 .../DocumentationSidebarGetActiveGroupUnitTest.php     | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
index d701672ecfe..b1295cece1a 100644
--- a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
+++ b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
@@ -57,6 +57,16 @@ public function testCannotGetActiveGroupWhenNoGroupsExist()
         (new DocumentationSidebar([new NavigationItem('foo', 'Foo')]))->getActiveGroup();
     }
 
+    public function testCannotGetActiveGroupWhenSidebarsAreNotCollapsible()
+    {
+        self::mockConfig(['docs.sidebar.collapsible' => false]);
+
+        $this->expectException(BadMethodCallException::class);
+        $this->expectExceptionMessage('Cannot get the active group when the sidebar is not collapsible.');
+
+        (new DocumentationSidebar([new NavigationGroup('foo')]))->getActiveGroup();
+    }
+
     public function testActiveGroupIsNullWhenNoGroupIsActive()
     {
         $this->assertNull($this->sidebar()->getActiveGroup());

From d05c77a1d8cf51dcbf0fbbc7453c864ad2ccdeb2 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 23 Mar 2024 12:55:43 +0100
Subject: [PATCH 1178/1422] Catch exception to return false

---
 .../Framework/Features/Navigation/DocumentationSidebar.php  | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 711631cad13..b932a682daa 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -99,7 +99,11 @@ public function getActiveGroup(): ?NavigationGroup
      */
     public function isGroupActive(string $group): bool
     {
-        return $group === $this->getActiveGroup()?->getGroupKey();
+        try {
+            return $group === $this->getActiveGroup()?->getGroupKey();
+        } catch (BadMethodCallException) {
+            return false;
+        }
     }
 
     /** @deprecated Temporary method to aid in refactoring. */

From 48f0d32dddf92a3d3a125af11472893601555afd Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 23 Mar 2024 18:10:30 +0100
Subject: [PATCH 1179/1422] Add method description

---
 .../src/Framework/Features/Navigation/DocumentationSidebar.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index b932a682daa..1c519169727 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -61,6 +61,9 @@ public function hasGroups(): bool
         return $this->getItems()->contains(fn (NavigationItem|NavigationGroup $item): bool => $item instanceof NavigationGroup);
     }
 
+    /**
+     * Get the group that should be open when the sidebar is loaded.
+     */
     public function getActiveGroup(): ?NavigationGroup
     {
         if ($this->items->isEmpty()) {

From 1a34ce4dbd64a24e748fb2cae22cc8797e32255d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 23 Mar 2024 18:11:37 +0100
Subject: [PATCH 1180/1422] Mark method as experimental

---
 .../src/Framework/Features/Navigation/DocumentationSidebar.php  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 1c519169727..4c7583cb535 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -63,6 +63,8 @@ public function hasGroups(): bool
 
     /**
      * Get the group that should be open when the sidebar is loaded.
+     *
+     * @experimental This method is experimental and may be changed or made internal in the future. If internal, we will not need the validation checks.
      */
     public function getActiveGroup(): ?NavigationGroup
     {

From 48ac6d080a1a13fa0eaf7fd9a379523084c81a92 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 23 Mar 2024 18:18:47 +0100
Subject: [PATCH 1181/1422] Mark method as internal and remove validation

I don't see that this will be used that much outside our view, so we don't need complexity to improve the DX of this.
---
 .../Navigation/DocumentationSidebar.php       | 14 +++---------
 ...mentationSidebarGetActiveGroupUnitTest.php | 22 +++++--------------
 2 files changed, 9 insertions(+), 27 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 4c7583cb535..c865580b629 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -64,20 +64,12 @@ public function hasGroups(): bool
     /**
      * Get the group that should be open when the sidebar is loaded.
      *
-     * @experimental This method is experimental and may be changed or made internal in the future. If internal, we will not need the validation checks.
+     * @internal This method offloads logic for the sidebar view, and is not intended to be used in other contexts.
      */
     public function getActiveGroup(): ?NavigationGroup
     {
-        if ($this->items->isEmpty()) {
-            throw new BadMethodCallException('Cannot get the active group when there are no items.');
-        }
-
-        if (! $this->hasGroups()) {
-            throw new BadMethodCallException('Cannot get the active group when there are no groups.');
-        }
-
-        if (! $this->isCollapsible()) {
-            throw new BadMethodCallException('Cannot get the active group when the sidebar is not collapsible.');
+        if ($this->items->isEmpty() || (! $this->hasGroups()) || (! $this->isCollapsible())) {
+            return null;
         }
 
         $currentPage = Render::getPage();
diff --git a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
index b1295cece1a..60d7ed925a2 100644
--- a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
+++ b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
@@ -5,7 +5,6 @@
 namespace Hyde\Framework\Testing\Unit;
 
 use Mockery;
-use BadMethodCallException;
 use Illuminate\View\Factory;
 use Hyde\Testing\UnitTestCase;
 use Hyde\Support\Facades\Render;
@@ -41,30 +40,21 @@ protected function setUp(): void
         self::mockConfig();
     }
 
-    public function testCannotGetActiveGroupWhenNoItemsExist()
+    public function testGetActiveGroupIsNullWhenNoItemsExist()
     {
-        $this->expectException(BadMethodCallException::class);
-        $this->expectExceptionMessage('Cannot get the active group when there are no items.');
-
-        (new DocumentationSidebar())->getActiveGroup();
+        $this->assertNull((new DocumentationSidebar())->getActiveGroup());
     }
 
-    public function testCannotGetActiveGroupWhenNoGroupsExist()
+    public function testGetActiveGroupIsNullWhenNoGroupsExist()
     {
-        $this->expectException(BadMethodCallException::class);
-        $this->expectExceptionMessage('Cannot get the active group when there are no groups.');
-
-        (new DocumentationSidebar([new NavigationItem('foo', 'Foo')]))->getActiveGroup();
+        $this->assertNull((new DocumentationSidebar([new NavigationItem('foo', 'Foo')]))->getActiveGroup());
     }
 
-    public function testCannotGetActiveGroupWhenSidebarsAreNotCollapsible()
+    public function testGetActiveGroupIsNullWhenSidebarsAreNotCollapsible()
     {
         self::mockConfig(['docs.sidebar.collapsible' => false]);
 
-        $this->expectException(BadMethodCallException::class);
-        $this->expectExceptionMessage('Cannot get the active group when the sidebar is not collapsible.');
-
-        (new DocumentationSidebar([new NavigationGroup('foo')]))->getActiveGroup();
+        $this->assertNull((new DocumentationSidebar([new NavigationGroup('foo')]))->getActiveGroup());
     }
 
     public function testActiveGroupIsNullWhenNoGroupIsActive()

From a6942b13bc158a29cdd9f82cc8958dadd9581320 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 23 Mar 2024 18:21:45 +0100
Subject: [PATCH 1182/1422] Test get active group

---
 .../Services/DocumentationSidebarTest.php     | 24 ++++++++++++-------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
index 90f57c2b39c..6c361083693 100644
--- a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
+++ b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
@@ -202,15 +202,21 @@ public function testGetItemsInGroupDoesNotIncludeDocsIndex()
         );
     }
 
-//    public function testGetActiveGroup()
-//    {
-//        $this->makePage('foo', ['navigation.group' => 'foo']);
-//        $this->makePage('bar', ['navigation.group' => 'bar']);
-//        $this->makePage('baz');
-//
-//        Render::setPage(new DocumentationPage(matter: ['navigation.group' => 'foo']));
-//        dd(NavigationMenuGenerator::handle(DocumentationSidebar::class)->getActiveGroup());
-//    }
+    public function testGetActiveGroup()
+    {
+        $this->makePage('foo', ['navigation.group' => 'foo']);
+        $this->makePage('bar', ['navigation.group' => 'bar']);
+        $this->makePage('baz');
+
+        Render::setPage(new DocumentationPage(matter: ['navigation.group' => 'foo']));
+
+        $this->assertEquals(
+            NavigationGroup::create('Foo', [
+                NavigationItem::create(Routes::get('docs/foo'), priority: 999),
+            ]),
+            NavigationMenuGenerator::handle(DocumentationSidebar::class)->getActiveGroup()
+        );
+    }
 
     public function testIsGroupActiveReturnsFalseWhenSuppliedGroupIsNotActive()
     {

From 91e64ce5b40dd1e5271a238d91117df01856911e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 23 Mar 2024 18:22:03 +0100
Subject: [PATCH 1183/1422] Revert "Catch exception to return false"

This reverts commit d05c77a1d8cf51dcbf0fbbc7453c864ad2ccdeb2.
---
 .../Framework/Features/Navigation/DocumentationSidebar.php | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index c865580b629..c7abd1d0cf3 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -5,7 +5,6 @@
 namespace Hyde\Framework\Features\Navigation;
 
 use Hyde\Facades\Config;
-use BadMethodCallException;
 use Hyde\Pages\DocumentationPage;
 use Hyde\Support\Facades\Render;
 use Hyde\Pages\Concerns\HydePage;
@@ -96,11 +95,7 @@ public function getActiveGroup(): ?NavigationGroup
      */
     public function isGroupActive(string $group): bool
     {
-        try {
-            return $group === $this->getActiveGroup()?->getGroupKey();
-        } catch (BadMethodCallException) {
-            return false;
-        }
+        return $group === $this->getActiveGroup()?->getGroupKey();
     }
 
     /** @deprecated Temporary method to aid in refactoring. */

From be0b049ca76ffc4d3d7c8704e607a691d63a93ff Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 23 Mar 2024 18:23:25 +0100
Subject: [PATCH 1184/1422] Inline old method now only used in tests

---
 .../Navigation/DocumentationSidebar.php       | 16 --------
 .../Services/DocumentationSidebarTest.php     | 39 ++++++++++++-------
 2 files changed, 26 insertions(+), 29 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index c7abd1d0cf3..f7a88e4cf2f 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -82,22 +82,6 @@ public function getActiveGroup(): ?NavigationGroup
         }) ?? $this->items->first(fn (NavigationGroup $item): bool => $item->getLabel() === 'Other');
     }
 
-    /**
-     * Is a page within the group the current page? This is used to determine if the sidebar group should be open when loading the page.
-     *
-     * @todo See if we can make this deterministic, so we pre-discover which group will be active, without having to weirdly check this in the view.
-     *
-     * @internal This method is used in the sidebar view to determine if a group should be open, and is not intended to be used in other contexts.
-     *
-     * For index pages, this will also return true for the first group in the menu, unless the index page has a specific group set.
-     *
-     * We have this logic here because not all NavigationItem instances belong to sidebars, and we need data from both.
-     */
-    public function isGroupActive(string $group): bool
-    {
-        return $group === $this->getActiveGroup()?->getGroupKey();
-    }
-
     /** @deprecated Temporary method to aid in refactoring. */
     protected function legacy_isGroupActive(string $group, HydePage $currentPage): bool
     {
diff --git a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
index 6c361083693..11b578cd405 100644
--- a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
+++ b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
@@ -221,21 +221,24 @@ public function testGetActiveGroup()
     public function testIsGroupActiveReturnsFalseWhenSuppliedGroupIsNotActive()
     {
         Render::setPage(new DocumentationPage(matter: ['navigation.group' => 'foo']));
-        $this->assertFalse(NavigationMenuGenerator::handle(DocumentationSidebar::class)->isGroupActive('bar'));
+        $mainNavigationMenu = NavigationMenuGenerator::handle(DocumentationSidebar::class);
+        $this->assertFalse('bar' === $mainNavigationMenu->getActiveGroup()?->getGroupKey());
     }
 
     public function testIsGroupActiveReturnsTrueWhenSuppliedGroupIsActive()
     {
         $this->makePage('foo', ['navigation.group' => 'foo']);
         Render::setPage(new DocumentationPage(matter: ['navigation.group' => 'foo']));
-        $this->assertTrue(NavigationMenuGenerator::handle(DocumentationSidebar::class)->isGroupActive('foo'));
+        $mainNavigationMenu = NavigationMenuGenerator::handle(DocumentationSidebar::class);
+        $this->assertTrue('foo' === $mainNavigationMenu->getActiveGroup()?->getGroupKey());
     }
 
     public function testIsGroupActiveReturnsTrueForDifferingCasing()
     {
         $this->makePage('foo', ['navigation.group' => 'Foo Bar']);
         Render::setPage(new DocumentationPage(matter: ['navigation.group' => 'Foo Bar']));
-        $this->assertTrue(NavigationMenuGenerator::handle(DocumentationSidebar::class)->isGroupActive('foo-bar'));
+        $mainNavigationMenu = NavigationMenuGenerator::handle(DocumentationSidebar::class);
+        $this->assertTrue('foo-bar' === $mainNavigationMenu->getActiveGroup()?->getGroupKey());
     }
 
     public function testIsGroupActiveReturnsTrueFirstGroupOfIndexPage()
@@ -246,9 +249,12 @@ public function testIsGroupActiveReturnsTrueFirstGroupOfIndexPage()
         $this->makePage('baz', ['navigation.group' => 'baz']);
 
         Render::setPage(DocumentationPage::get('index'));
-        $this->assertTrue(NavigationMenuGenerator::handle(DocumentationSidebar::class)->isGroupActive('bar'));
-        $this->assertFalse(NavigationMenuGenerator::handle(DocumentationSidebar::class)->isGroupActive('foo'));
-        $this->assertFalse(NavigationMenuGenerator::handle(DocumentationSidebar::class)->isGroupActive('baz'));
+        $mainNavigationMenu2 = NavigationMenuGenerator::handle(DocumentationSidebar::class);
+        $this->assertTrue('bar' === $mainNavigationMenu2->getActiveGroup()?->getGroupKey());
+        $mainNavigationMenu1 = NavigationMenuGenerator::handle(DocumentationSidebar::class);
+        $this->assertFalse('foo' === $mainNavigationMenu1->getActiveGroup()?->getGroupKey());
+        $mainNavigationMenu = NavigationMenuGenerator::handle(DocumentationSidebar::class);
+        $this->assertFalse('baz' === $mainNavigationMenu->getActiveGroup()?->getGroupKey());
     }
 
     public function testIsGroupActiveReturnsTrueFirstSortedGroupOfIndexPage()
@@ -259,9 +265,12 @@ public function testIsGroupActiveReturnsTrueFirstSortedGroupOfIndexPage()
         $this->makePage('baz', ['navigation.group' => 'baz', 'navigation.priority' => 3]);
 
         Render::setPage(DocumentationPage::get('index'));
-        $this->assertTrue(NavigationMenuGenerator::handle(DocumentationSidebar::class)->isGroupActive('foo'));
-        $this->assertFalse(NavigationMenuGenerator::handle(DocumentationSidebar::class)->isGroupActive('bar'));
-        $this->assertFalse(NavigationMenuGenerator::handle(DocumentationSidebar::class)->isGroupActive('baz'));
+        $mainNavigationMenu2 = NavigationMenuGenerator::handle(DocumentationSidebar::class);
+        $this->assertTrue('foo' === $mainNavigationMenu2->getActiveGroup()?->getGroupKey());
+        $mainNavigationMenu1 = NavigationMenuGenerator::handle(DocumentationSidebar::class);
+        $this->assertFalse('bar' === $mainNavigationMenu1->getActiveGroup()?->getGroupKey());
+        $mainNavigationMenu = NavigationMenuGenerator::handle(DocumentationSidebar::class);
+        $this->assertFalse('baz' === $mainNavigationMenu->getActiveGroup()?->getGroupKey());
     }
 
     public function testAutomaticIndexPageGroupExpansionRespectsCustomNavigationMenuSettings()
@@ -272,9 +281,12 @@ public function testAutomaticIndexPageGroupExpansionRespectsCustomNavigationMenu
         $this->makePage('baz', ['navigation.group' => 'baz', 'navigation.priority' => 3]);
 
         Render::setPage(DocumentationPage::get('index'));
-        $this->assertFalse(NavigationMenuGenerator::handle(DocumentationSidebar::class)->isGroupActive('foo'));
-        $this->assertFalse(NavigationMenuGenerator::handle(DocumentationSidebar::class)->isGroupActive('bar'));
-        $this->assertTrue(NavigationMenuGenerator::handle(DocumentationSidebar::class)->isGroupActive('baz'));
+        $mainNavigationMenu2 = NavigationMenuGenerator::handle(DocumentationSidebar::class);
+        $this->assertFalse('foo' === $mainNavigationMenu2->getActiveGroup()?->getGroupKey());
+        $mainNavigationMenu1 = NavigationMenuGenerator::handle(DocumentationSidebar::class);
+        $this->assertFalse('bar' === $mainNavigationMenu1->getActiveGroup()?->getGroupKey());
+        $mainNavigationMenu = NavigationMenuGenerator::handle(DocumentationSidebar::class);
+        $this->assertTrue('baz' === $mainNavigationMenu->getActiveGroup()?->getGroupKey());
     }
 
     public function testCanHaveMultipleGroupedPagesWithTheSameNameLabels()
@@ -322,7 +334,8 @@ public function testIsGroupActiveForIndexPageWithNoGroups()
         $this->makePage('index');
 
         Render::setPage(DocumentationPage::get('index'));
-        $this->assertFalse(NavigationMenuGenerator::handle(DocumentationSidebar::class)->isGroupActive('foo'));
+        $mainNavigationMenu = NavigationMenuGenerator::handle(DocumentationSidebar::class);
+        $this->assertFalse('foo' === $mainNavigationMenu->getActiveGroup()?->getGroupKey());
     }
 
     public function testIndexPageAddedToSidebarWhenItIsTheOnlyPage()

From d462ff7c93886017f45b0b6b1549e27cfa6dc384 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 23 Mar 2024 18:34:44 +0100
Subject: [PATCH 1185/1422] Fix test method name

---
 .../tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
index 60d7ed925a2..442e901c2b6 100644
--- a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
+++ b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
@@ -62,7 +62,7 @@ public function testActiveGroupIsNullWhenNoGroupIsActive()
         $this->assertNull($this->sidebar()->getActiveGroup());
     }
 
-    public function testSetActiveGroup()
+    public function testWithActiveGroup()
     {
         $this->renderData->setPage(new DocumentationPage('foo', ['navigation.group' => 'one']));
 

From cf52c68d3a8661cea5af1d4b2d5730a292931220 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 23 Mar 2024 18:39:28 +0100
Subject: [PATCH 1186/1422] Create new test method with more realistic sample

Makes it easier to visualise when the structure looks like real data
---
 ...mentationSidebarGetActiveGroupUnitTest.php | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
index 442e901c2b6..34851dc3048 100644
--- a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
+++ b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
@@ -40,6 +40,36 @@ protected function setUp(): void
         self::mockConfig();
     }
 
+    public function testGetActiveGroup()
+    {
+        // The sidebar structure
+        $items = [
+            // Group keys
+            'getting-started' => [
+                // Group items
+                'Introduction',
+                'Installation',
+            ],
+            'configuration' => [
+                'Configuration',
+                'Environment Variables',
+            ],
+            'usage' => [
+                'Routing',
+                'Middleware',
+            ],
+        ];
+
+        // Create the sidebar
+        foreach ($items as $group => $groupItems) {
+            $groupItems = array_map(fn (string $item): NavigationItem => new NavigationItem($item, $item), $groupItems);
+            $group = new NavigationGroup($group, $groupItems);
+            $items[$group->getGroupKey()] = $group;
+        }
+
+        $sidebar = new DocumentationSidebar($items);
+    }
+
     public function testGetActiveGroupIsNullWhenNoItemsExist()
     {
         $this->assertNull((new DocumentationSidebar())->getActiveGroup());

From 180e8f0ff7ee680c550fdd1bd3159b69a2e166b8 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 23 Mar 2024 19:04:24 +0100
Subject: [PATCH 1187/1422] Inline variable

---
 .../tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php  | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
index 34851dc3048..5f5c624fe24 100644
--- a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
+++ b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
@@ -63,8 +63,7 @@ public function testGetActiveGroup()
         // Create the sidebar
         foreach ($items as $group => $groupItems) {
             $groupItems = array_map(fn (string $item): NavigationItem => new NavigationItem($item, $item), $groupItems);
-            $group = new NavigationGroup($group, $groupItems);
-            $items[$group->getGroupKey()] = $group;
+            $items[$group] = new NavigationGroup($group, $groupItems);
         }
 
         $sidebar = new DocumentationSidebar($items);

From ae51390f19c0ada3f334a893c36fb95bb064c31f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 23 Mar 2024 19:04:32 +0100
Subject: [PATCH 1188/1422] Inline variable

---
 .../tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php  | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
index 5f5c624fe24..4ce76579b7e 100644
--- a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
+++ b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
@@ -62,8 +62,7 @@ public function testGetActiveGroup()
 
         // Create the sidebar
         foreach ($items as $group => $groupItems) {
-            $groupItems = array_map(fn (string $item): NavigationItem => new NavigationItem($item, $item), $groupItems);
-            $items[$group] = new NavigationGroup($group, $groupItems);
+            $items[$group] = new NavigationGroup($group, array_map(fn (string $item): NavigationItem => new NavigationItem($item, $item), $groupItems));
         }
 
         $sidebar = new DocumentationSidebar($items);

From 71aa97d90f1036f7cb0c55561421305e84382cc8 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 23 Mar 2024 19:06:13 +0100
Subject: [PATCH 1189/1422] Rename variables

---
 .../tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
index 4ce76579b7e..e60eef88aeb 100644
--- a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
+++ b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
@@ -61,8 +61,8 @@ public function testGetActiveGroup()
         ];
 
         // Create the sidebar
-        foreach ($items as $group => $groupItems) {
-            $items[$group] = new NavigationGroup($group, array_map(fn (string $item): NavigationItem => new NavigationItem($item, $item), $groupItems));
+        foreach ($items as $groupKey => $groupItems) {
+            $items[$groupKey] = new NavigationGroup($groupKey, array_map(fn (string $item): NavigationItem => new NavigationItem($item, $item), $groupItems));
         }
 
         $sidebar = new DocumentationSidebar($items);

From 22cf763d3eaf777a8e4b60ce8475bf4fe38e2bcd Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 23 Mar 2024 19:07:19 +0100
Subject: [PATCH 1190/1422] Assert null

---
 .../tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php   | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
index e60eef88aeb..b7acd4eef8a 100644
--- a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
+++ b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
@@ -66,6 +66,8 @@ public function testGetActiveGroup()
         }
 
         $sidebar = new DocumentationSidebar($items);
+
+        $this->assertNull($sidebar->getActiveGroup());
     }
 
     public function testGetActiveGroupIsNullWhenNoItemsExist()

From 8a89a37df52c1d7244a6365905edd4a08d4870b1 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 23 Mar 2024 19:10:28 +0100
Subject: [PATCH 1191/1422] Extract helper method

---
 .../DocumentationSidebarGetActiveGroupUnitTest.php    | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
index b7acd4eef8a..45048d3f101 100644
--- a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
+++ b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
@@ -94,7 +94,7 @@ public function testActiveGroupIsNullWhenNoGroupIsActive()
 
     public function testWithActiveGroup()
     {
-        $this->renderData->setPage(new DocumentationPage('foo', ['navigation.group' => 'one']));
+        $this->mockCurrentPageForActiveGroup('one');
 
         $sidebar = $this->sidebar();
 
@@ -111,14 +111,14 @@ public function testActiveGroupUpdatesWithPageChanges()
         ];
 
         foreach ($pages as $page => $group) {
-            $this->renderData->setPage(new DocumentationPage($page, ['navigation.group' => $group]));
+            $this->mockCurrentPageForActiveGroup($group);
             $this->assertSame($group, $this->sidebar()->getActiveGroup()->getGroupKey());
         }
     }
 
     public function testActiveGroupItems()
     {
-        $this->renderData->setPage(new DocumentationPage('foo', ['navigation.group' => 'one']));
+        $this->mockCurrentPageForActiveGroup('one');
 
         $expectedItems = [
             'one' => true,
@@ -148,4 +148,9 @@ protected function sidebar(array $pages = [
 
         return NavigationMenuGenerator::handle(DocumentationSidebar::class);
     }
+
+    protected function mockCurrentPageForActiveGroup(string $group): void
+    {
+        $this->renderData->setPage(new DocumentationPage('foo', ['navigation.group' => $group]));
+    }
 }

From c4d7884876ae026285e4f812785480c70519643f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 23 Mar 2024 19:10:36 +0100
Subject: [PATCH 1192/1422] Remove variable

---
 .../tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
index 45048d3f101..18ab2d032b5 100644
--- a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
+++ b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
@@ -110,7 +110,7 @@ public function testActiveGroupUpdatesWithPageChanges()
             'baz' => 'three',
         ];
 
-        foreach ($pages as $page => $group) {
+        foreach ($pages as $group) {
             $this->mockCurrentPageForActiveGroup($group);
             $this->assertSame($group, $this->sidebar()->getActiveGroup()->getGroupKey());
         }

From e93a0c5b5137232b9e5d5fd34bd4f50fe7132d7c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 23 Mar 2024 19:11:10 +0100
Subject: [PATCH 1193/1422] Section code

---
 .../tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
index 18ab2d032b5..2ca1f734278 100644
--- a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
+++ b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
@@ -60,11 +60,12 @@ public function testGetActiveGroup()
             ],
         ];
 
-        // Create the sidebar
+        // Create the sidebar items
         foreach ($items as $groupKey => $groupItems) {
             $items[$groupKey] = new NavigationGroup($groupKey, array_map(fn (string $item): NavigationItem => new NavigationItem($item, $item), $groupItems));
         }
 
+        // Create the sidebar
         $sidebar = new DocumentationSidebar($items);
 
         $this->assertNull($sidebar->getActiveGroup());

From 89debff7926ec93291a7c5f6ec7db94298efc080 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 23 Mar 2024 19:15:57 +0100
Subject: [PATCH 1194/1422] Add comment

---
 .../tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
index 2ca1f734278..2cfd7db7367 100644
--- a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
+++ b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
@@ -68,6 +68,7 @@ public function testGetActiveGroup()
         // Create the sidebar
         $sidebar = new DocumentationSidebar($items);
 
+        // Assert is null when there is no active group
         $this->assertNull($sidebar->getActiveGroup());
     }
 

From c7399432f9bb9f1828c6e7fc5b0a1f7174779383 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 23 Mar 2024 19:17:40 +0100
Subject: [PATCH 1195/1422] Revert "Remove variable"

This reverts commit c4d7884876ae026285e4f812785480c70519643f.
---
 .../tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
index 2cfd7db7367..79398acc75d 100644
--- a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
+++ b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
@@ -112,7 +112,7 @@ public function testActiveGroupUpdatesWithPageChanges()
             'baz' => 'three',
         ];
 
-        foreach ($pages as $group) {
+        foreach ($pages as $page => $group) {
             $this->mockCurrentPageForActiveGroup($group);
             $this->assertSame($group, $this->sidebar()->getActiveGroup()->getGroupKey());
         }

From 066a804795707b9b41366887d5eeb38a8fcf9381 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 23 Mar 2024 19:18:23 +0100
Subject: [PATCH 1196/1422] Allow setting the identifier in the testing helper
 method

---
 .../Unit/DocumentationSidebarGetActiveGroupUnitTest.php     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
index 79398acc75d..19a457608be 100644
--- a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
+++ b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
@@ -113,7 +113,7 @@ public function testActiveGroupUpdatesWithPageChanges()
         ];
 
         foreach ($pages as $page => $group) {
-            $this->mockCurrentPageForActiveGroup($group);
+            $this->mockCurrentPageForActiveGroup($group, $page);
             $this->assertSame($group, $this->sidebar()->getActiveGroup()->getGroupKey());
         }
     }
@@ -151,8 +151,8 @@ protected function sidebar(array $pages = [
         return NavigationMenuGenerator::handle(DocumentationSidebar::class);
     }
 
-    protected function mockCurrentPageForActiveGroup(string $group): void
+    protected function mockCurrentPageForActiveGroup(string $group, string $identifier = 'foo'): void
     {
-        $this->renderData->setPage(new DocumentationPage('foo', ['navigation.group' => $group]));
+        $this->renderData->setPage(new DocumentationPage($identifier, ['navigation.group' => $group]));
     }
 }

From d70fccf5791968451348ac34c3e02193514a7258 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 23 Mar 2024 19:21:18 +0100
Subject: [PATCH 1197/1422] Add more assertions

---
 ...mentationSidebarGetActiveGroupUnitTest.php | 46 +++++++++++++++++++
 1 file changed, 46 insertions(+)

diff --git a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
index 19a457608be..e02768c674e 100644
--- a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
+++ b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
@@ -70,6 +70,52 @@ public function testGetActiveGroup()
 
         // Assert is null when there is no active group
         $this->assertNull($sidebar->getActiveGroup());
+
+        // Assert is null when active group is outside the sidebar
+        $this->mockCurrentPageForActiveGroup('foo');
+        $this->assertNull($sidebar->getActiveGroup());
+
+        // Assert is null when sidebar is not collapsible
+        self::mockConfig(['docs.sidebar.collapsible' => false]);
+        $this->mockCurrentPageForActiveGroup('getting-started');
+        $this->assertNull($sidebar->getActiveGroup());
+        self::mockConfig(['docs.sidebar.collapsible' => true]);
+
+        // Assert the active group
+        $this->mockCurrentPageForActiveGroup('getting-started');
+        $this->assertSame('getting-started', $sidebar->getActiveGroup()->getGroupKey());
+
+        // Assert the active group
+        $this->mockCurrentPageForActiveGroup('configuration');
+        $this->assertSame('configuration', $sidebar->getActiveGroup()->getGroupKey());
+
+        // Assert the active group
+        $this->mockCurrentPageForActiveGroup('usage');
+        $this->assertSame('usage', $sidebar->getActiveGroup()->getGroupKey());
+
+        // Assert the active group for identifier within the group
+        $this->mockCurrentPageForActiveGroup('getting-started', 'Introduction');
+        $this->assertSame('getting-started', $sidebar->getActiveGroup()->getGroupKey());
+
+        // Assert the active group for identifier within the group
+        $this->mockCurrentPageForActiveGroup('configuration', 'Configuration');
+        $this->assertSame('configuration', $sidebar->getActiveGroup()->getGroupKey());
+
+        // Assert the active group for identifier within the group
+        $this->mockCurrentPageForActiveGroup('usage', 'Routing');
+        $this->assertSame('usage', $sidebar->getActiveGroup()->getGroupKey());
+
+        // Assert the active group for with group key having different casing
+        $this->mockCurrentPageForActiveGroup('GETTING-STARTED');
+        $this->assertSame('getting-started', $sidebar->getActiveGroup()->getGroupKey());
+
+        // Assert the active group for with group key having different casing
+        $this->mockCurrentPageForActiveGroup('Getting-Started');
+        $this->assertSame('getting-started', $sidebar->getActiveGroup()->getGroupKey());
+
+        // Assert the active group for with group key having different casing
+        $this->mockCurrentPageForActiveGroup('getting-started');
+        $this->assertSame('getting-started', $sidebar->getActiveGroup()->getGroupKey());
     }
 
     public function testGetActiveGroupIsNullWhenNoItemsExist()

From 65352b86f8dbb1e6392680d890b16ab025912907 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 23 Mar 2024 19:22:16 +0100
Subject: [PATCH 1198/1422] Remove overlapping tests

---
 ...mentationSidebarGetActiveGroupUnitTest.php | 71 -------------------
 1 file changed, 71 deletions(-)

diff --git a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
index e02768c674e..08cfbd0dc7a 100644
--- a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
+++ b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
@@ -10,12 +10,10 @@
 use Hyde\Support\Facades\Render;
 use Hyde\Pages\DocumentationPage;
 use Hyde\Support\Models\RenderData;
-use Hyde\Foundation\Facades\Routes;
 use Illuminate\Support\Facades\View;
 use Hyde\Framework\Features\Navigation\NavigationItem;
 use Hyde\Framework\Features\Navigation\NavigationGroup;
 use Hyde\Framework\Features\Navigation\DocumentationSidebar;
-use Hyde\Framework\Features\Navigation\NavigationMenuGenerator;
 
 /**
  * @covers \Hyde\Framework\Features\Navigation\DocumentationSidebar
@@ -128,75 +126,6 @@ public function testGetActiveGroupIsNullWhenNoGroupsExist()
         $this->assertNull((new DocumentationSidebar([new NavigationItem('foo', 'Foo')]))->getActiveGroup());
     }
 
-    public function testGetActiveGroupIsNullWhenSidebarsAreNotCollapsible()
-    {
-        self::mockConfig(['docs.sidebar.collapsible' => false]);
-
-        $this->assertNull((new DocumentationSidebar([new NavigationGroup('foo')]))->getActiveGroup());
-    }
-
-    public function testActiveGroupIsNullWhenNoGroupIsActive()
-    {
-        $this->assertNull($this->sidebar()->getActiveGroup());
-    }
-
-    public function testWithActiveGroup()
-    {
-        $this->mockCurrentPageForActiveGroup('one');
-
-        $sidebar = $this->sidebar();
-
-        $this->assertInstanceOf(NavigationGroup::class, $sidebar->getActiveGroup());
-        $this->assertSame('one', $sidebar->getActiveGroup()->getGroupKey());
-    }
-
-    public function testActiveGroupUpdatesWithPageChanges()
-    {
-        $pages = [
-            'foo' => 'one',
-            'bar' => 'two',
-            'baz' => 'three',
-        ];
-
-        foreach ($pages as $page => $group) {
-            $this->mockCurrentPageForActiveGroup($group, $page);
-            $this->assertSame($group, $this->sidebar()->getActiveGroup()->getGroupKey());
-        }
-    }
-
-    public function testActiveGroupItems()
-    {
-        $this->mockCurrentPageForActiveGroup('one');
-
-        $expectedItems = [
-            'one' => true,
-            'two' => false,
-            'three' => false,
-        ];
-
-        $sidebar = $this->sidebar();
-
-        $actualItems = $sidebar->getItems()->mapWithKeys(fn (NavigationGroup $item): array => [
-            $item->getGroupKey() => $item === $sidebar->getActiveGroup(),
-        ])->all();
-
-        $this->assertSame($expectedItems, $actualItems);
-    }
-
-    protected function sidebar(array $pages = [
-        'foo' => 'one',
-        'bar' => 'two',
-        'baz' => 'three',
-    ]): DocumentationSidebar
-    {
-        foreach ($pages as $page => $group) {
-            $page = new DocumentationPage($page, ['navigation.group' => $group]);
-            Routes::addRoute($page->getRoute());
-        }
-
-        return NavigationMenuGenerator::handle(DocumentationSidebar::class);
-    }
-
     protected function mockCurrentPageForActiveGroup(string $group, string $identifier = 'foo'): void
     {
         $this->renderData->setPage(new DocumentationPage($identifier, ['navigation.group' => $group]));

From 2baf0d0991be3a63246332a0bed7121c7f6c55e2 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 23 Mar 2024 19:23:38 +0100
Subject: [PATCH 1199/1422] Extract helper method

---
 ...mentationSidebarGetActiveGroupUnitTest.php | 55 ++++++++++---------
 1 file changed, 30 insertions(+), 25 deletions(-)

diff --git a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
index 08cfbd0dc7a..dd7656817c2 100644
--- a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
+++ b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
@@ -40,31 +40,7 @@ protected function setUp(): void
 
     public function testGetActiveGroup()
     {
-        // The sidebar structure
-        $items = [
-            // Group keys
-            'getting-started' => [
-                // Group items
-                'Introduction',
-                'Installation',
-            ],
-            'configuration' => [
-                'Configuration',
-                'Environment Variables',
-            ],
-            'usage' => [
-                'Routing',
-                'Middleware',
-            ],
-        ];
-
-        // Create the sidebar items
-        foreach ($items as $groupKey => $groupItems) {
-            $items[$groupKey] = new NavigationGroup($groupKey, array_map(fn (string $item): NavigationItem => new NavigationItem($item, $item), $groupItems));
-        }
-
-        // Create the sidebar
-        $sidebar = new DocumentationSidebar($items);
+        $sidebar = $this->createSidebar();
 
         // Assert is null when there is no active group
         $this->assertNull($sidebar->getActiveGroup());
@@ -130,4 +106,33 @@ protected function mockCurrentPageForActiveGroup(string $group, string $identifi
     {
         $this->renderData->setPage(new DocumentationPage($identifier, ['navigation.group' => $group]));
     }
+
+    protected function createSidebar(): DocumentationSidebar
+    {
+        // The sidebar structure
+        $items = [
+            // Group keys
+            'getting-started' => [
+                // Group items
+                'Introduction',
+                'Installation',
+            ],
+            'configuration' => [
+                'Configuration',
+                'Environment Variables',
+            ],
+            'usage' => [
+                'Routing',
+                'Middleware',
+            ],
+        ];
+
+        // Create the sidebar items
+        foreach ($items as $groupKey => $groupItems) {
+            $items[$groupKey] = new NavigationGroup($groupKey, array_map(fn (string $item): NavigationItem => new NavigationItem($item, $item), $groupItems));
+        }
+
+        // Create the sidebar
+        return new DocumentationSidebar($items);
+    }
 }

From 73e60d4977f950d2023a57c6d917534ed47f60e6 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 23 Mar 2024 19:23:50 +0100
Subject: [PATCH 1200/1422] Move up helper method in class

Makes it easier to understand the test
---
 ...mentationSidebarGetActiveGroupUnitTest.php | 58 +++++++++----------
 1 file changed, 29 insertions(+), 29 deletions(-)

diff --git a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
index dd7656817c2..86b6a637f26 100644
--- a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
+++ b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
@@ -38,6 +38,35 @@ protected function setUp(): void
         self::mockConfig();
     }
 
+    protected function createSidebar(): DocumentationSidebar
+    {
+        // The sidebar structure
+        $items = [
+            // Group keys
+            'getting-started' => [
+                // Group items
+                'Introduction',
+                'Installation',
+            ],
+            'configuration' => [
+                'Configuration',
+                'Environment Variables',
+            ],
+            'usage' => [
+                'Routing',
+                'Middleware',
+            ],
+        ];
+
+        // Create the sidebar items
+        foreach ($items as $groupKey => $groupItems) {
+            $items[$groupKey] = new NavigationGroup($groupKey, array_map(fn (string $item): NavigationItem => new NavigationItem($item, $item), $groupItems));
+        }
+
+        // Create the sidebar
+        return new DocumentationSidebar($items);
+    }
+
     public function testGetActiveGroup()
     {
         $sidebar = $this->createSidebar();
@@ -106,33 +135,4 @@ protected function mockCurrentPageForActiveGroup(string $group, string $identifi
     {
         $this->renderData->setPage(new DocumentationPage($identifier, ['navigation.group' => $group]));
     }
-
-    protected function createSidebar(): DocumentationSidebar
-    {
-        // The sidebar structure
-        $items = [
-            // Group keys
-            'getting-started' => [
-                // Group items
-                'Introduction',
-                'Installation',
-            ],
-            'configuration' => [
-                'Configuration',
-                'Environment Variables',
-            ],
-            'usage' => [
-                'Routing',
-                'Middleware',
-            ],
-        ];
-
-        // Create the sidebar items
-        foreach ($items as $groupKey => $groupItems) {
-            $items[$groupKey] = new NavigationGroup($groupKey, array_map(fn (string $item): NavigationItem => new NavigationItem($item, $item), $groupItems));
-        }
-
-        // Create the sidebar
-        return new DocumentationSidebar($items);
-    }
 }

From 655598c1986f306bdaa6d86683e6c7aff53e8f71 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 23 Mar 2024 19:24:43 +0100
Subject: [PATCH 1201/1422] Use ChatGPT to split out assertions into new tests

---
 ...mentationSidebarGetActiveGroupUnitTest.php | 60 ++++++++++++++-----
 1 file changed, 45 insertions(+), 15 deletions(-)

diff --git a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
index 86b6a637f26..ed990ac146b 100644
--- a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
+++ b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
@@ -66,57 +66,87 @@ protected function createSidebar(): DocumentationSidebar
         // Create the sidebar
         return new DocumentationSidebar($items);
     }
-
-    public function testGetActiveGroup()
+    public function testNoActiveGroupWhenNoneExists()
     {
         $sidebar = $this->createSidebar();
-
-        // Assert is null when there is no active group
         $this->assertNull($sidebar->getActiveGroup());
+    }
 
-        // Assert is null when active group is outside the sidebar
+    public function testNoActiveGroupWhenOutsideSidebar()
+    {
+        $sidebar = $this->createSidebar();
         $this->mockCurrentPageForActiveGroup('foo');
         $this->assertNull($sidebar->getActiveGroup());
+    }
 
-        // Assert is null when sidebar is not collapsible
+    public function testNoActiveGroupWhenSidebarNotCollapsible()
+    {
+        $sidebar = $this->createSidebar();
         self::mockConfig(['docs.sidebar.collapsible' => false]);
         $this->mockCurrentPageForActiveGroup('getting-started');
         $this->assertNull($sidebar->getActiveGroup());
         self::mockConfig(['docs.sidebar.collapsible' => true]);
+    }
 
-        // Assert the active group
+    public function testActiveGroupGettingStarted()
+    {
+        $sidebar = $this->createSidebar();
         $this->mockCurrentPageForActiveGroup('getting-started');
         $this->assertSame('getting-started', $sidebar->getActiveGroup()->getGroupKey());
+    }
 
-        // Assert the active group
+    public function testActiveGroupConfiguration()
+    {
+        $sidebar = $this->createSidebar();
         $this->mockCurrentPageForActiveGroup('configuration');
         $this->assertSame('configuration', $sidebar->getActiveGroup()->getGroupKey());
+    }
 
-        // Assert the active group
+    public function testActiveGroupUsage()
+    {
+        $sidebar = $this->createSidebar();
         $this->mockCurrentPageForActiveGroup('usage');
         $this->assertSame('usage', $sidebar->getActiveGroup()->getGroupKey());
+    }
 
-        // Assert the active group for identifier within the group
+    public function testActiveGroupWithIdentifierGettingStarted()
+    {
+        $sidebar = $this->createSidebar();
         $this->mockCurrentPageForActiveGroup('getting-started', 'Introduction');
         $this->assertSame('getting-started', $sidebar->getActiveGroup()->getGroupKey());
+    }
 
-        // Assert the active group for identifier within the group
+    public function testActiveGroupWithIdentifierConfiguration()
+    {
+        $sidebar = $this->createSidebar();
         $this->mockCurrentPageForActiveGroup('configuration', 'Configuration');
         $this->assertSame('configuration', $sidebar->getActiveGroup()->getGroupKey());
+    }
 
-        // Assert the active group for identifier within the group
+    public function testActiveGroupWithIdentifierUsage()
+    {
+        $sidebar = $this->createSidebar();
         $this->mockCurrentPageForActiveGroup('usage', 'Routing');
         $this->assertSame('usage', $sidebar->getActiveGroup()->getGroupKey());
+    }
 
-        // Assert the active group for with group key having different casing
+    public function testActiveGroupDifferentCasingGettingStarted()
+    {
+        $sidebar = $this->createSidebar();
         $this->mockCurrentPageForActiveGroup('GETTING-STARTED');
         $this->assertSame('getting-started', $sidebar->getActiveGroup()->getGroupKey());
+    }
 
-        // Assert the active group for with group key having different casing
+    public function testActiveGroupDifferentCasingGettingStarted2()
+    {
+        $sidebar = $this->createSidebar();
         $this->mockCurrentPageForActiveGroup('Getting-Started');
         $this->assertSame('getting-started', $sidebar->getActiveGroup()->getGroupKey());
+    }
 
-        // Assert the active group for with group key having different casing
+    public function testActiveGroupDifferentCasingGettingStarted3()
+    {
+        $sidebar = $this->createSidebar();
         $this->mockCurrentPageForActiveGroup('getting-started');
         $this->assertSame('getting-started', $sidebar->getActiveGroup()->getGroupKey());
     }

From a4cd4af7d706622ab0e281717c866baa4f0d85cf Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 23 Mar 2024 19:25:19 +0100
Subject: [PATCH 1202/1422] Inline local variables

---
 ...mentationSidebarGetActiveGroupUnitTest.php | 36 +++++++------------
 1 file changed, 12 insertions(+), 24 deletions(-)

diff --git a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
index ed990ac146b..a11f294c7db 100644
--- a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
+++ b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
@@ -68,87 +68,75 @@ protected function createSidebar(): DocumentationSidebar
     }
     public function testNoActiveGroupWhenNoneExists()
     {
-        $sidebar = $this->createSidebar();
-        $this->assertNull($sidebar->getActiveGroup());
+        $this->assertNull($this->createSidebar()->getActiveGroup());
     }
 
     public function testNoActiveGroupWhenOutsideSidebar()
     {
-        $sidebar = $this->createSidebar();
         $this->mockCurrentPageForActiveGroup('foo');
-        $this->assertNull($sidebar->getActiveGroup());
+        $this->assertNull($this->createSidebar()->getActiveGroup());
     }
 
     public function testNoActiveGroupWhenSidebarNotCollapsible()
     {
-        $sidebar = $this->createSidebar();
         self::mockConfig(['docs.sidebar.collapsible' => false]);
         $this->mockCurrentPageForActiveGroup('getting-started');
-        $this->assertNull($sidebar->getActiveGroup());
+        $this->assertNull($this->createSidebar()->getActiveGroup());
         self::mockConfig(['docs.sidebar.collapsible' => true]);
     }
 
     public function testActiveGroupGettingStarted()
     {
-        $sidebar = $this->createSidebar();
         $this->mockCurrentPageForActiveGroup('getting-started');
-        $this->assertSame('getting-started', $sidebar->getActiveGroup()->getGroupKey());
+        $this->assertSame('getting-started', $this->createSidebar()->getActiveGroup()->getGroupKey());
     }
 
     public function testActiveGroupConfiguration()
     {
-        $sidebar = $this->createSidebar();
         $this->mockCurrentPageForActiveGroup('configuration');
-        $this->assertSame('configuration', $sidebar->getActiveGroup()->getGroupKey());
+        $this->assertSame('configuration', $this->createSidebar()->getActiveGroup()->getGroupKey());
     }
 
     public function testActiveGroupUsage()
     {
-        $sidebar = $this->createSidebar();
         $this->mockCurrentPageForActiveGroup('usage');
-        $this->assertSame('usage', $sidebar->getActiveGroup()->getGroupKey());
+        $this->assertSame('usage', $this->createSidebar()->getActiveGroup()->getGroupKey());
     }
 
     public function testActiveGroupWithIdentifierGettingStarted()
     {
-        $sidebar = $this->createSidebar();
         $this->mockCurrentPageForActiveGroup('getting-started', 'Introduction');
-        $this->assertSame('getting-started', $sidebar->getActiveGroup()->getGroupKey());
+        $this->assertSame('getting-started', $this->createSidebar()->getActiveGroup()->getGroupKey());
     }
 
     public function testActiveGroupWithIdentifierConfiguration()
     {
-        $sidebar = $this->createSidebar();
         $this->mockCurrentPageForActiveGroup('configuration', 'Configuration');
-        $this->assertSame('configuration', $sidebar->getActiveGroup()->getGroupKey());
+        $this->assertSame('configuration', $this->createSidebar()->getActiveGroup()->getGroupKey());
     }
 
     public function testActiveGroupWithIdentifierUsage()
     {
-        $sidebar = $this->createSidebar();
         $this->mockCurrentPageForActiveGroup('usage', 'Routing');
-        $this->assertSame('usage', $sidebar->getActiveGroup()->getGroupKey());
+        $this->assertSame('usage', $this->createSidebar()->getActiveGroup()->getGroupKey());
     }
 
     public function testActiveGroupDifferentCasingGettingStarted()
     {
-        $sidebar = $this->createSidebar();
         $this->mockCurrentPageForActiveGroup('GETTING-STARTED');
-        $this->assertSame('getting-started', $sidebar->getActiveGroup()->getGroupKey());
+        $this->assertSame('getting-started', $this->createSidebar()->getActiveGroup()->getGroupKey());
     }
 
     public function testActiveGroupDifferentCasingGettingStarted2()
     {
-        $sidebar = $this->createSidebar();
         $this->mockCurrentPageForActiveGroup('Getting-Started');
-        $this->assertSame('getting-started', $sidebar->getActiveGroup()->getGroupKey());
+        $this->assertSame('getting-started', $this->createSidebar()->getActiveGroup()->getGroupKey());
     }
 
     public function testActiveGroupDifferentCasingGettingStarted3()
     {
-        $sidebar = $this->createSidebar();
         $this->mockCurrentPageForActiveGroup('getting-started');
-        $this->assertSame('getting-started', $sidebar->getActiveGroup()->getGroupKey());
+        $this->assertSame('getting-started', $this->createSidebar()->getActiveGroup()->getGroupKey());
     }
 
     public function testGetActiveGroupIsNullWhenNoItemsExist()

From 5b510896440b063f666312a087424977ebb3d281 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 23 Mar 2024 19:26:00 +0100
Subject: [PATCH 1203/1422] Add missing newline

---
 .../tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
index a11f294c7db..fd7fd4482a5 100644
--- a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
+++ b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
@@ -66,6 +66,7 @@ protected function createSidebar(): DocumentationSidebar
         // Create the sidebar
         return new DocumentationSidebar($items);
     }
+
     public function testNoActiveGroupWhenNoneExists()
     {
         $this->assertNull($this->createSidebar()->getActiveGroup());

From 7e86d30f82d1c023b1f900f39744ed866f474a9a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 23 Mar 2024 19:27:12 +0100
Subject: [PATCH 1204/1422] Comment logic abstract

---
 .../src/Framework/Features/Navigation/DocumentationSidebar.php  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index f7a88e4cf2f..6567c24c95c 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -67,6 +67,8 @@ public function hasGroups(): bool
      */
     public function getActiveGroup(): ?NavigationGroup
     {
+        // A group is active when it contains the current page being rendered
+
         if ($this->items->isEmpty() || (! $this->hasGroups()) || (! $this->isCollapsible())) {
             return null;
         }

From 1495094980fedd0182d6f081159eff7555ba2031 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 23 Mar 2024 19:36:54 +0100
Subject: [PATCH 1205/1422] Draft new unit tests

---
 ...DocumentationSidebarGetActiveGroupUnitTest.php | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
index fd7fd4482a5..c17f1059238 100644
--- a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
+++ b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
@@ -150,6 +150,21 @@ public function testGetActiveGroupIsNullWhenNoGroupsExist()
         $this->assertNull((new DocumentationSidebar([new NavigationItem('foo', 'Foo')]))->getActiveGroup());
     }
 
+    public function testGetActiveGroupReturnsFirstGroupWhenRenderingIndexPage()
+    {
+
+    }
+
+    public function testGetActiveGroupReturnsFirstGroupByLowestPriorityWhenRenderingIndexPage()
+    {
+
+    }
+
+    public function testGetActiveGroupReturnsExplicitlySetIndexPageGroupWhenRenderingIndexPage()
+    {
+
+    }
+
     protected function mockCurrentPageForActiveGroup(string $group, string $identifier = 'foo'): void
     {
         $this->renderData->setPage(new DocumentationPage($identifier, ['navigation.group' => $group]));

From 528d9f4bcd423fe6c132f48a644ac992d86907dc Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 23 Mar 2024 19:39:33 +0100
Subject: [PATCH 1206/1422] Implement the tests

---
 .../DocumentationSidebarGetActiveGroupUnitTest.php     | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
index c17f1059238..f82ffc1a14e 100644
--- a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
+++ b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
@@ -152,17 +152,25 @@ public function testGetActiveGroupIsNullWhenNoGroupsExist()
 
     public function testGetActiveGroupReturnsFirstGroupWhenRenderingIndexPage()
     {
-
+        $this->renderData->setPage(new DocumentationPage('index'));
+        $this->assertSame('getting-started', $this->createSidebar()->getActiveGroup()->getGroupKey());
     }
 
     public function testGetActiveGroupReturnsFirstGroupByLowestPriorityWhenRenderingIndexPage()
     {
+        $sidebar = $this->createSidebar();
+        $sidebar->add(new NavigationGroup('other', [new NavigationItem('Other', 'Other')], 0));
 
+        $this->renderData->setPage(new DocumentationPage('index'));
+        $this->assertSame('other', $sidebar->getActiveGroup()->getGroupKey());
     }
 
     public function testGetActiveGroupReturnsExplicitlySetIndexPageGroupWhenRenderingIndexPage()
     {
+        $sidebar = $this->createSidebar();
 
+        $this->renderData->setPage(new DocumentationPage('index', ['navigation.group' => 'usage']));
+        $this->assertSame('usage', $sidebar->getActiveGroup()->getGroupKey());
     }
 
     protected function mockCurrentPageForActiveGroup(string $group, string $identifier = 'foo'): void

From 04aa0f6433ed891417b9cc896911d2b1cfac53d1 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 23 Mar 2024 19:39:45 +0100
Subject: [PATCH 1207/1422] Add additional unit test

---
 .../Unit/DocumentationSidebarGetActiveGroupUnitTest.php  | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
index f82ffc1a14e..2b196ef5775 100644
--- a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
+++ b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
@@ -173,6 +173,15 @@ public function testGetActiveGroupReturnsExplicitlySetIndexPageGroupWhenRenderin
         $this->assertSame('usage', $sidebar->getActiveGroup()->getGroupKey());
     }
 
+    public function testGetActiveGroupReturnsExplicitlySetIndexPageGroupWhenRenderingIndexPageRegardlessOfPriorities()
+    {
+        $sidebar = $this->createSidebar();
+        $sidebar->add(new NavigationGroup('other', [new NavigationItem('Other', 'Other')], 0));
+
+        $this->renderData->setPage(new DocumentationPage('index', ['navigation.group' => 'usage']));
+        $this->assertSame('usage', $sidebar->getActiveGroup()->getGroupKey());
+    }
+
     protected function mockCurrentPageForActiveGroup(string $group, string $identifier = 'foo'): void
     {
         $this->renderData->setPage(new DocumentationPage($identifier, ['navigation.group' => $group]));

From d0ef0052a263f12b30a20077332aca13a0873b9c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 23 Mar 2024 19:43:56 +0100
Subject: [PATCH 1208/1422] Add additional unit test

---
 .../Unit/DocumentationSidebarGetActiveGroupUnitTest.php     | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
index 2b196ef5775..79286a5bfc9 100644
--- a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
+++ b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
@@ -150,6 +150,12 @@ public function testGetActiveGroupIsNullWhenNoGroupsExist()
         $this->assertNull((new DocumentationSidebar([new NavigationItem('foo', 'Foo')]))->getActiveGroup());
     }
 
+    public function testGetActiveGroupIsNullIfTheSetGroupIsNotPresentInTheSidebarItems()
+    {
+        $this->renderData->setPage(new DocumentationPage('foo', ['navigation.group' => 'foo']));
+        $this->assertNull($this->createSidebar()->getActiveGroup());
+    }
+
     public function testGetActiveGroupReturnsFirstGroupWhenRenderingIndexPage()
     {
         $this->renderData->setPage(new DocumentationPage('index'));

From 35446053ba7c11cc7874098e20ecc7cca1a18a56 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 23 Mar 2024 19:44:44 +0100
Subject: [PATCH 1209/1422] Compare using deterministic logic instead of legacy
 loop

Performance consideration is negligible (new is 0.038ms instead of 0.085ms) but it makes it more understandable and reduces the need of a complex loop
---
 .../src/Framework/Features/Navigation/DocumentationSidebar.php  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 6567c24c95c..5286c48c005 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -80,7 +80,7 @@ public function getActiveGroup(): ?NavigationGroup
         }
 
         return $this->items->first(function (NavigationGroup $item) use ($currentPage): bool {
-            return $item->getGroupKey() && $this->legacy_isGroupActive($item->getGroupKey(), $currentPage);
+            return $item->getGroupKey() === NavigationItem::normalizeGroupKey($currentPage->navigationMenuGroup());
         }) ?? $this->items->first(fn (NavigationGroup $item): bool => $item->getLabel() === 'Other');
     }
 

From 2e96c0212117c64c1fcb15831f960f324de4989d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 23 Mar 2024 19:48:08 +0100
Subject: [PATCH 1210/1422] Add early check for index page handling

---
 .../Framework/Features/Navigation/DocumentationSidebar.php    | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 5286c48c005..80c075c976e 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -79,6 +79,10 @@ public function getActiveGroup(): ?NavigationGroup
             return null;
         }
 
+        if ($this->isCurrentPageIndexPage($currentPage) && blank($currentPage->navigationMenuGroup())) {
+            return $this->items->sortBy(fn (NavigationGroup $item): int => $item->getPriority())->first();
+        }
+
         return $this->items->first(function (NavigationGroup $item) use ($currentPage): bool {
             return $item->getGroupKey() === NavigationItem::normalizeGroupKey($currentPage->navigationMenuGroup());
         }) ?? $this->items->first(fn (NavigationGroup $item): bool => $item->getLabel() === 'Other');

From d167719d86d77024535db81e3b49ae19f0ceb6a6 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 23 Mar 2024 19:49:26 +0100
Subject: [PATCH 1211/1422] Remove legacy code that is now no longer needed

---
 .../Navigation/DocumentationSidebar.php       | 32 -------------------
 1 file changed, 32 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 80c075c976e..5b58dd70bbd 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -7,11 +7,9 @@
 use Hyde\Facades\Config;
 use Hyde\Pages\DocumentationPage;
 use Hyde\Support\Facades\Render;
-use Hyde\Pages\Concerns\HydePage;
 use Illuminate\Contracts\Support\Arrayable;
 
 use function app;
-use function filled;
 use function is_string;
 
 class DocumentationSidebar extends NavigationMenu
@@ -88,38 +86,8 @@ public function getActiveGroup(): ?NavigationGroup
         }) ?? $this->items->first(fn (NavigationGroup $item): bool => $item->getLabel() === 'Other');
     }
 
-    /** @deprecated Temporary method to aid in refactoring. */
-    protected function legacy_isGroupActive(string $group, HydePage $currentPage): bool
-    {
-        if ($this->isCurrentPageIndexPage($currentPage)) {
-            return $this->shouldIndexPageBeActive($group, $currentPage);
-        }
-
-        return $this->groupMatchesCurrentPageGroup($currentPage, $group);
-    }
-
     private function isCurrentPageIndexPage(HydePage $currentPage): bool
     {
         return $currentPage->getRoute()->is(DocumentationPage::homeRouteName());
     }
-
-    private function shouldIndexPageBeActive(string $group, HydePage $currentPage): bool
-    {
-        // Unless the index page has a specific group set, the first group in the sidebar should be open when visiting the index page.
-
-        if ($this->groupMatchesCurrentPageGroup($currentPage, $group)) {
-            return true;
-        }
-
-        if (filled($currentPage->navigationMenuGroup())) {
-            return false;
-        }
-
-        return $group === $this->getItems()->firstOrFail()->getGroupKey();
-    }
-
-    protected function groupMatchesCurrentPageGroup(HydePage $currentPage, string $group): bool
-    {
-        return NavigationItem::normalizeGroupKey($currentPage->navigationMenuGroup()) === $group;
-    }
 }

From 1c1080f3c59cb1ace3096616db1f4cca2e1e72a7 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 23 Mar 2024 19:49:54 +0100
Subject: [PATCH 1212/1422] Add back code comment

---
 .../src/Framework/Features/Navigation/DocumentationSidebar.php  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 5b58dd70bbd..bc45b8a6c33 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -78,6 +78,8 @@ public function getActiveGroup(): ?NavigationGroup
         }
 
         if ($this->isCurrentPageIndexPage($currentPage) && blank($currentPage->navigationMenuGroup())) {
+            // Unless the index page has a specific group set, the first group in the sidebar should be open when visiting the index page.
+
             return $this->items->sortBy(fn (NavigationGroup $item): int => $item->getPriority())->first();
         }
 

From c860213004c8d685e519ed79757f0046b8daefb6 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 23 Mar 2024 19:50:09 +0100
Subject: [PATCH 1213/1422] Inline method

---
 .../Framework/Features/Navigation/DocumentationSidebar.php | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index bc45b8a6c33..8957ba16936 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -77,7 +77,7 @@ public function getActiveGroup(): ?NavigationGroup
             return null;
         }
 
-        if ($this->isCurrentPageIndexPage($currentPage) && blank($currentPage->navigationMenuGroup())) {
+        if ($currentPage->getRoute()->is(DocumentationPage::homeRouteName()) && blank($currentPage->navigationMenuGroup())) {
             // Unless the index page has a specific group set, the first group in the sidebar should be open when visiting the index page.
 
             return $this->items->sortBy(fn (NavigationGroup $item): int => $item->getPriority())->first();
@@ -87,9 +87,4 @@ public function getActiveGroup(): ?NavigationGroup
             return $item->getGroupKey() === NavigationItem::normalizeGroupKey($currentPage->navigationMenuGroup());
         }) ?? $this->items->first(fn (NavigationGroup $item): bool => $item->getLabel() === 'Other');
     }
-
-    private function isCurrentPageIndexPage(HydePage $currentPage): bool
-    {
-        return $currentPage->getRoute()->is(DocumentationPage::homeRouteName());
-    }
 }

From f9886f201c6ea4f53fdd9736b9becc1a7de74ece Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 23 Mar 2024 19:52:28 +0100
Subject: [PATCH 1214/1422] Merge up conditional into null return block

---
 .../Framework/Features/Navigation/DocumentationSidebar.php  | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 8957ba16936..0895c5787f5 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -67,16 +67,12 @@ public function getActiveGroup(): ?NavigationGroup
     {
         // A group is active when it contains the current page being rendered
 
-        if ($this->items->isEmpty() || (! $this->hasGroups()) || (! $this->isCollapsible())) {
+        if ($this->items->isEmpty() || (! $this->hasGroups()) || (! $this->isCollapsible()) || Render::getPage() === null) {
             return null;
         }
 
         $currentPage = Render::getPage();
 
-        if ($currentPage === null) {
-            return null;
-        }
-
         if ($currentPage->getRoute()->is(DocumentationPage::homeRouteName()) && blank($currentPage->navigationMenuGroup())) {
             // Unless the index page has a specific group set, the first group in the sidebar should be open when visiting the index page.
 

From ddcb510439fefd0c8ea2e494efaafcdacf3a855e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 23 Mar 2024 19:53:09 +0100
Subject: [PATCH 1215/1422] Shift down code comment

---
 .../Framework/Features/Navigation/DocumentationSidebar.php    | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 0895c5787f5..aca4aef029d 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -65,8 +65,6 @@ public function hasGroups(): bool
      */
     public function getActiveGroup(): ?NavigationGroup
     {
-        // A group is active when it contains the current page being rendered
-
         if ($this->items->isEmpty() || (! $this->hasGroups()) || (! $this->isCollapsible()) || Render::getPage() === null) {
             return null;
         }
@@ -75,11 +73,11 @@ public function getActiveGroup(): ?NavigationGroup
 
         if ($currentPage->getRoute()->is(DocumentationPage::homeRouteName()) && blank($currentPage->navigationMenuGroup())) {
             // Unless the index page has a specific group set, the first group in the sidebar should be open when visiting the index page.
-
             return $this->items->sortBy(fn (NavigationGroup $item): int => $item->getPriority())->first();
         }
 
         return $this->items->first(function (NavigationGroup $item) use ($currentPage): bool {
+            // A group is active when it contains the current page being rendered
             return $item->getGroupKey() === NavigationItem::normalizeGroupKey($currentPage->navigationMenuGroup());
         }) ?? $this->items->first(fn (NavigationGroup $item): bool => $item->getLabel() === 'Other');
     }

From ec6139beb224166d93b3cb56c668255282e07b7d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 23 Mar 2024 19:53:30 +0100
Subject: [PATCH 1216/1422] Rename loop variable to better match type

---
 .../Framework/Features/Navigation/DocumentationSidebar.php    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index aca4aef029d..9787e425f57 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -76,9 +76,9 @@ public function getActiveGroup(): ?NavigationGroup
             return $this->items->sortBy(fn (NavigationGroup $item): int => $item->getPriority())->first();
         }
 
-        return $this->items->first(function (NavigationGroup $item) use ($currentPage): bool {
+        return $this->items->first(function (NavigationGroup $group) use ($currentPage): bool {
             // A group is active when it contains the current page being rendered
-            return $item->getGroupKey() === NavigationItem::normalizeGroupKey($currentPage->navigationMenuGroup());
+            return $group->getGroupKey() === NavigationItem::normalizeGroupKey($currentPage->navigationMenuGroup());
         }) ?? $this->items->first(fn (NavigationGroup $item): bool => $item->getLabel() === 'Other');
     }
 }

From 8ef1198d724b44287b0221a2180d47a2bb2f5328 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 23 Mar 2024 19:53:58 +0100
Subject: [PATCH 1217/1422] Remove unused null coalesce to other group

---
 .../src/Framework/Features/Navigation/DocumentationSidebar.php  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 9787e425f57..a36ddc4f2eb 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -79,6 +79,6 @@ public function getActiveGroup(): ?NavigationGroup
         return $this->items->first(function (NavigationGroup $group) use ($currentPage): bool {
             // A group is active when it contains the current page being rendered
             return $group->getGroupKey() === NavigationItem::normalizeGroupKey($currentPage->navigationMenuGroup());
-        }) ?? $this->items->first(fn (NavigationGroup $item): bool => $item->getLabel() === 'Other');
+        });
     }
 }

From 63ca58a14091407a1e005a34231ea649e2d9d148 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 23 Mar 2024 20:01:16 +0100
Subject: [PATCH 1218/1422] Style comment formatting

---
 .../src/Framework/Features/Navigation/DocumentationSidebar.php  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index a36ddc4f2eb..5a6e6a380a0 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -77,7 +77,7 @@ public function getActiveGroup(): ?NavigationGroup
         }
 
         return $this->items->first(function (NavigationGroup $group) use ($currentPage): bool {
-            // A group is active when it contains the current page being rendered
+            // A group is active when it contains the current page being rendered.
             return $group->getGroupKey() === NavigationItem::normalizeGroupKey($currentPage->navigationMenuGroup());
         });
     }

From a2baea5088223bd7781b1357698f8f2cfc892b04 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 23 Mar 2024 20:09:47 +0100
Subject: [PATCH 1219/1422] Type hint against the shared contract

---
 .../src/Framework/Features/Navigation/DocumentationSidebar.php  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 5a6e6a380a0..f2a5d485fa6 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -55,7 +55,7 @@ public function isCollapsible(): bool
 
     public function hasGroups(): bool
     {
-        return $this->getItems()->contains(fn (NavigationItem|NavigationGroup $item): bool => $item instanceof NavigationGroup);
+        return $this->getItems()->contains(fn (NavigationElement $item): bool => $item instanceof NavigationGroup);
     }
 
     /**

From 58be9bbfb2b88a9ae3bace3c71ae85c2bc036c40 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 11:23:57 +0100
Subject: [PATCH 1220/1422] Deprecate ExternalRoute class

See https://github.com/hydephp/develop/pull/1635
---
 packages/framework/src/Support/Models/ExternalRoute.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/src/Support/Models/ExternalRoute.php b/packages/framework/src/Support/Models/ExternalRoute.php
index f6ad450b071..f39ce405dae 100644
--- a/packages/framework/src/Support/Models/ExternalRoute.php
+++ b/packages/framework/src/Support/Models/ExternalRoute.php
@@ -8,6 +8,7 @@
  * A route that leads to an external URI.
  *
  * @experimental Take caution when using this class, as it may be subject to change.
+ * @deprecated This class may be removed before release.
  */
 class ExternalRoute extends Route
 {

From 3bc2b90735ca6e5847bc01b741258c907ee16b4d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 11:24:55 +0100
Subject: [PATCH 1221/1422] Create NavigationDestination.php

---
 .../Features/Navigation/NavigationDestination.php      | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 packages/framework/src/Framework/Features/Navigation/NavigationDestination.php

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationDestination.php b/packages/framework/src/Framework/Features/Navigation/NavigationDestination.php
new file mode 100644
index 00000000000..875e9c7ebb7
--- /dev/null
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationDestination.php
@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Hyde\Framework\Features\Navigation;
+
+class NavigationDestination
+{
+    //
+}

From 9e734e0342abc3eb007134433d11aee17231afc8 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 11:25:09 +0100
Subject: [PATCH 1222/1422] Class `NavigationDestination` implements
 `Stringable`

---
 .../Framework/Features/Navigation/NavigationDestination.php   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationDestination.php b/packages/framework/src/Framework/Features/Navigation/NavigationDestination.php
index 875e9c7ebb7..87849d69473 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationDestination.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationDestination.php
@@ -4,7 +4,9 @@
 
 namespace Hyde\Framework\Features\Navigation;
 
-class NavigationDestination
+use Stringable;
+
+class NavigationDestination implements Stringable
 {
     //
 }

From 50180ce593e751ced7f3100e6166f6441d81de86 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 11:23:57 +0100
Subject: [PATCH 1223/1422] Deprecate ExternalRoute class

See https://github.com/hydephp/develop/pull/1635
---
 packages/framework/src/Support/Models/ExternalRoute.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/src/Support/Models/ExternalRoute.php b/packages/framework/src/Support/Models/ExternalRoute.php
index f6ad450b071..721b89a7c13 100644
--- a/packages/framework/src/Support/Models/ExternalRoute.php
+++ b/packages/framework/src/Support/Models/ExternalRoute.php
@@ -8,6 +8,8 @@
  * A route that leads to an external URI.
  *
  * @experimental Take caution when using this class, as it may be subject to change.
+ *
+ * @deprecated This class may be removed before release.
  */
 class ExternalRoute extends Route
 {

From e2ec80d675497c710ba24fd6cdff0c5459357a19 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 11:28:00 +0100
Subject: [PATCH 1224/1422] Remove nullable type from route property

I don't think this is used anymore
---
 .../src/Framework/Features/Navigation/NavigationItem.php        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index 53df7171678..1bc5001decb 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -23,7 +23,7 @@
  */
 class NavigationItem implements NavigationElement, Stringable
 {
-    protected ?Route $route;
+    protected Route $route;
     protected string $label;
     protected int $priority;
 

From 9353eef2c4b9f290a024738bae47dbc775f4b004 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 11:29:56 +0100
Subject: [PATCH 1225/1422] Remove nullable destination parameter type

Also no longer needed since decoupling the navigation classes
---
 .../src/Framework/Features/Navigation/NavigationItem.php      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index 1bc5001decb..7d67811207a 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -33,12 +33,12 @@ class NavigationItem implements NavigationElement, Stringable
     /**
      * Create a new navigation menu item with your own properties.
      *
-     * @param  \Hyde\Support\Models\Route|string|null  $destination  Route instance, route key, or external URI. For dropdowns/groups, this should be null.
+     * @param  \Hyde\Support\Models\Route|string  $destination  Route instance, route key, or external URI.
      * @param  string  $label  The label of the navigation item.
      * @param  int  $priority  The priority to determine the order of the navigation item.
      * @param  string|null  $group  The dropdown/group key of the navigation item, if any.
      */
-    public function __construct(Route|string|null $destination, string $label, int $priority = NavigationMenu::DEFAULT, ?string $group = null)
+    public function __construct(Route|string $destination, string $label, int $priority = NavigationMenu::DEFAULT, ?string $group = null)
     {
         if (is_string($destination)) {
             $destination = Routes::get($destination) ?? new ExternalRoute($destination);

From 6f482348067dcf487642af97eb4ec5207cbd806a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 12:33:18 +0100
Subject: [PATCH 1226/1422] Add destination property

---
 .../Framework/Features/Navigation/NavigationDestination.php    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationDestination.php b/packages/framework/src/Framework/Features/Navigation/NavigationDestination.php
index 87849d69473..ab873893c8f 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationDestination.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationDestination.php
@@ -5,8 +5,9 @@
 namespace Hyde\Framework\Features\Navigation;
 
 use Stringable;
+use Hyde\Support\Models\Route;
 
 class NavigationDestination implements Stringable
 {
-    //
+    protected Route|string $destination;
 }

From c6f7a595a7ae32362093756d203f9502364b089d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 12:33:27 +0100
Subject: [PATCH 1227/1422] Add constructor

---
 .../Framework/Features/Navigation/NavigationDestination.php  | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationDestination.php b/packages/framework/src/Framework/Features/Navigation/NavigationDestination.php
index ab873893c8f..dfc1693712f 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationDestination.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationDestination.php
@@ -10,4 +10,9 @@
 class NavigationDestination implements Stringable
 {
     protected Route|string $destination;
+
+    public function __construct(Route|string $destination)
+    {
+        $this->destination = $destination;
+    }
 }

From 84861054315805ac8829f69313c06b5d44766f1c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 12:33:40 +0100
Subject: [PATCH 1228/1422] Implement stringable method

---
 .../Framework/Features/Navigation/NavigationDestination.php  | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationDestination.php b/packages/framework/src/Framework/Features/Navigation/NavigationDestination.php
index dfc1693712f..48cedb49a28 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationDestination.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationDestination.php
@@ -15,4 +15,9 @@ public function __construct(Route|string $destination)
     {
         $this->destination = $destination;
     }
+
+    public function __toString(): string
+    {
+        return (string) $this->destination;
+    }
 }

From 954ccc78f175bcf43604520252fb2caf2e748272 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 12:34:49 +0100
Subject: [PATCH 1229/1422] Get route instance for route keys

---
 .../Features/Navigation/NavigationDestination.php          | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationDestination.php b/packages/framework/src/Framework/Features/Navigation/NavigationDestination.php
index 48cedb49a28..b78a5d04ae1 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationDestination.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationDestination.php
@@ -6,6 +6,9 @@
 
 use Stringable;
 use Hyde\Support\Models\Route;
+use Hyde\Foundation\Facades\Routes;
+
+use function is_string;
 
 class NavigationDestination implements Stringable
 {
@@ -13,6 +16,10 @@ class NavigationDestination implements Stringable
 
     public function __construct(Route|string $destination)
     {
+        if (is_string($destination) && Routes::has($destination)) {
+            $destination = Routes::get($destination);
+        }
+
         $this->destination = $destination;
     }
 

From 8da04dbbc0df1273bd05ca53d8f532f2950a85d9 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 12:35:15 +0100
Subject: [PATCH 1230/1422] Add get link method

---
 .../Framework/Features/Navigation/NavigationDestination.php  | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationDestination.php b/packages/framework/src/Framework/Features/Navigation/NavigationDestination.php
index b78a5d04ae1..04b7d2f091a 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationDestination.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationDestination.php
@@ -24,6 +24,11 @@ public function __construct(Route|string $destination)
     }
 
     public function __toString(): string
+    {
+        return $this->getLink();
+    }
+
+    public function getLink(): string
     {
         return (string) $this->destination;
     }

From fff2088833a97a9caeca9f05edf3f112e39df3d7 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 12:36:10 +0100
Subject: [PATCH 1231/1422] Deprecate route property

---
 .../src/Framework/Features/Navigation/NavigationItem.php         | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index 7d67811207a..8d7a2766640 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -23,6 +23,7 @@
  */
 class NavigationItem implements NavigationElement, Stringable
 {
+    /** @deprecated */
     protected Route $route;
     protected string $label;
     protected int $priority;

From 74a98f52754b96e09a8be2d48894af0b93edfee6 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 12:36:31 +0100
Subject: [PATCH 1232/1422] Add new destination property

---
 .../src/Framework/Features/Navigation/NavigationItem.php         | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index 8d7a2766640..7e4c1647f79 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -25,6 +25,7 @@ class NavigationItem implements NavigationElement, Stringable
 {
     /** @deprecated */
     protected Route $route;
+    protected NavigationDestination $destination;
     protected string $label;
     protected int $priority;
 

From a56db505bbb0ead19916d37ff27c3c9a723e2ee7 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 12:37:20 +0100
Subject: [PATCH 1233/1422] Construct destination

---
 .../src/Framework/Features/Navigation/NavigationItem.php        | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index 7e4c1647f79..339f018a473 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -42,6 +42,8 @@ class NavigationItem implements NavigationElement, Stringable
      */
     public function __construct(Route|string $destination, string $label, int $priority = NavigationMenu::DEFAULT, ?string $group = null)
     {
+        $this->destination = new NavigationDestination($destination);
+
         if (is_string($destination)) {
             $destination = Routes::get($destination) ?? new ExternalRoute($destination);
         }

From b28c520afd8074461ea9b06d50fe42d39cf19a73 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 12:41:33 +0100
Subject: [PATCH 1234/1422] Get link using new destination class

---
 .../src/Framework/Features/Navigation/NavigationItem.php        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index 339f018a473..f2064bf86d0 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -104,7 +104,7 @@ public function getRoute(): ?Route
      */
     public function getUrl(): string
     {
-        return (string) $this->route;
+        return $this->destination->getLink();
     }
 
     /**

From e8c1f2f79cbbdc5d8ae3e0808acaa258d21ced3a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 12:44:41 +0100
Subject: [PATCH 1235/1422] Add experimental route getter

---
 .../Framework/Features/Navigation/NavigationDestination.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationDestination.php b/packages/framework/src/Framework/Features/Navigation/NavigationDestination.php
index 04b7d2f091a..bcf07e11763 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationDestination.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationDestination.php
@@ -32,4 +32,10 @@ public function getLink(): string
     {
         return (string) $this->destination;
     }
+
+    /** @experimental */
+    public function getRoute(): ?Route
+    {
+        return $this->destination instanceof Route ? $this->destination : null;
+    }
 }

From 5cc2163e2a2ddc6bee55bb20ea7e35d6ed4f48fe Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 12:45:00 +0100
Subject: [PATCH 1236/1422] Get route using destination

---
 .../src/Framework/Features/Navigation/NavigationItem.php        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index f2064bf86d0..b7b2ee9f0aa 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -96,7 +96,7 @@ public function __toString(): string
      */
     public function getRoute(): ?Route
     {
-        return $this->route;
+        return $this->destination->getRoute();
     }
 
     /**

From 6efd8b909212d88e2768a488403e83528e220d7b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 12:48:01 +0100
Subject: [PATCH 1237/1422] Skip tests needing to be reimplemented for
 https://github.com/hydephp/develop/pull/1636

---
 packages/framework/tests/Unit/NavigationItemTest.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/tests/Unit/NavigationItemTest.php b/packages/framework/tests/Unit/NavigationItemTest.php
index b613557ac9b..6daf921bb83 100644
--- a/packages/framework/tests/Unit/NavigationItemTest.php
+++ b/packages/framework/tests/Unit/NavigationItemTest.php
@@ -68,6 +68,7 @@ public function testPassingRouteKeyToConstructorUsesRouteInstance()
 
     public function testPassingUrlToConstructorUsesExternalRoute()
     {
+        $this->markTestSkipped('Todo: Reimplement this test for https://github.com/hydephp/develop/pull/1636');
         $item = new NavigationItem('https://example.com', 'Home');
         $this->assertInstanceOf(ExternalRoute::class, $item->getRoute());
         $this->assertEquals(new ExternalRoute('https://example.com'), $item->getRoute());
@@ -76,6 +77,7 @@ public function testPassingUrlToConstructorUsesExternalRoute()
 
     public function testPassingUnknownRouteKeyToConstructorUsesExternalRoute()
     {
+        $this->markTestSkipped('Todo: Reimplement this test for https://github.com/hydephp/develop/pull/1636');
         $item = new NavigationItem('foo', 'Home');
         $this->assertInstanceOf(ExternalRoute::class, $item->getRoute());
         $this->assertEquals(new ExternalRoute('foo'), $item->getRoute());

From c5203902c6ad55a8ae3e5531894aad1526da37c1 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 12:55:14 +0100
Subject: [PATCH 1238/1422] Use null check instead of instanceof on deprecated
 class

---
 .../src/Framework/Features/Navigation/NavigationGroup.php      | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
index ebd076aa9af..5b9c0ea8896 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
@@ -7,7 +7,6 @@
 use Illuminate\Support\Str;
 use Illuminate\Support\Arr;
 use Hyde\Pages\DocumentationPage;
-use Hyde\Support\Models\ExternalRoute;
 
 use function min;
 use function collect;
@@ -79,7 +78,7 @@ protected function addItem(NavigationItem $item): void
     protected function containsOnlyDocumentationPages(): bool
     {
         return count($this->getItems()) && collect($this->getItems())->every(function (NavigationItem $child): bool {
-            return (! $child->getRoute() instanceof ExternalRoute) && $child->getRoute()->getPage() instanceof DocumentationPage;
+            return ($child->getRoute() !== null) && $child->getRoute()->getPage() instanceof DocumentationPage;
         });
     }
 }

From faea07b04747ed3ec1b616dc6b28f86696030800 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 12:56:59 +0100
Subject: [PATCH 1239/1422] Reimplement tests for changed types

---
 .../framework/tests/Unit/NavigationItemTest.php  | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/packages/framework/tests/Unit/NavigationItemTest.php b/packages/framework/tests/Unit/NavigationItemTest.php
index 6daf921bb83..3cb99793a9c 100644
--- a/packages/framework/tests/Unit/NavigationItemTest.php
+++ b/packages/framework/tests/Unit/NavigationItemTest.php
@@ -66,22 +66,18 @@ public function testPassingRouteKeyToConstructorUsesRouteInstance()
         $this->assertSame($route, (new NavigationItem('index', 'Home'))->getRoute());
     }
 
-    public function testPassingUrlToConstructorUsesExternalRoute()
+    public function testPassingUrlToConstructorSetsRouteToNull()
     {
-        $this->markTestSkipped('Todo: Reimplement this test for https://github.com/hydephp/develop/pull/1636');
         $item = new NavigationItem('https://example.com', 'Home');
-        $this->assertInstanceOf(ExternalRoute::class, $item->getRoute());
-        $this->assertEquals(new ExternalRoute('https://example.com'), $item->getRoute());
-        $this->assertSame('https://example.com', (string) $item->getRoute());
+        $this->assertNull($item->getRoute());
+        $this->assertSame('https://example.com', $item->getUrl());
     }
 
-    public function testPassingUnknownRouteKeyToConstructorUsesExternalRoute()
+    public function testPassingUnknownRouteKeyToConstructorSetsRouteToNull()
     {
-        $this->markTestSkipped('Todo: Reimplement this test for https://github.com/hydephp/develop/pull/1636');
         $item = new NavigationItem('foo', 'Home');
-        $this->assertInstanceOf(ExternalRoute::class, $item->getRoute());
-        $this->assertEquals(new ExternalRoute('foo'), $item->getRoute());
-        $this->assertSame('foo', (string) $item->getRoute());
+        $this->assertNull($item->getRoute());
+        $this->assertSame('foo', $item->getUrl());
     }
 
     public function testGetDestination()

From f5a356736b6fe7152dda673c3cd08fb4bb401ec8 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 13:06:03 +0100
Subject: [PATCH 1240/1422] Compare state using destination

---
 .../src/Framework/Features/Navigation/NavigationItem.php        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index b7b2ee9f0aa..db5b1526127 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -141,7 +141,7 @@ public function getGroupKey(): ?string
      */
     public function isActive(): bool
     {
-        return Hyde::currentRoute()->getLink() === $this->route->getLink();
+        return Hyde::currentRoute()->getLink() === $this->destination->getLink();
     }
 
     /** @return ($group is null ? null : string) */

From 39108997d1d707bc9f948e267795b3a518ce99c3 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 13:06:59 +0100
Subject: [PATCH 1241/1422] Use accessor with same logic

---
 .../src/Framework/Features/Navigation/NavigationItem.php        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index db5b1526127..9d89484bdf9 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -141,7 +141,7 @@ public function getGroupKey(): ?string
      */
     public function isActive(): bool
     {
-        return Hyde::currentRoute()->getLink() === $this->destination->getLink();
+        return Hyde::currentRoute()->getLink() === $this->getUrl();
     }
 
     /** @return ($group is null ? null : string) */

From cdceed7f81f011f347c8ba079a84a535a59a3b4a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 13:07:51 +0100
Subject: [PATCH 1242/1422] Remove deprecated route property

---
 .../src/Framework/Features/Navigation/NavigationItem.php   | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index 9d89484bdf9..1cf373a5081 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -23,8 +23,6 @@
  */
 class NavigationItem implements NavigationElement, Stringable
 {
-    /** @deprecated */
-    protected Route $route;
     protected NavigationDestination $destination;
     protected string $label;
     protected int $priority;
@@ -44,11 +42,6 @@ public function __construct(Route|string $destination, string $label, int $prior
     {
         $this->destination = new NavigationDestination($destination);
 
-        if (is_string($destination)) {
-            $destination = Routes::get($destination) ?? new ExternalRoute($destination);
-        }
-
-        $this->route = $destination;
         $this->label = $label;
         $this->priority = $priority;
 

From d16368c378772d6bb8accabda2f6c7be20f793f4 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 15:30:35 +0100
Subject: [PATCH 1243/1422] Deprecate methods we probably don't actually need

---
 .../src/Framework/Features/Navigation/NavigationItem.php      | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index 1cf373a5081..6fec030a9f6 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -86,6 +86,8 @@ public function __toString(): string
 
     /**
      * Get the destination route of the navigation item. For dropdowns, this will return null.
+     *
+     * @deprecated To simplify the class, we may remove this as we probably don't need it.
      */
     public function getRoute(): ?Route
     {
@@ -94,6 +96,8 @@ public function getRoute(): ?Route
 
     /**
      * Resolve the destination link of the navigation item.
+     *
+     * @deprecated May be renamed to getLink() in the future.
      */
     public function getUrl(): string
     {

From eb81668e91594e9944a5d72cffb5f7d29246f2f9 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 15:31:28 +0100
Subject: [PATCH 1244/1422] Skip tests needing to be reimplemented for #1636

---
 packages/framework/tests/Unit/NavigationItemTest.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/tests/Unit/NavigationItemTest.php b/packages/framework/tests/Unit/NavigationItemTest.php
index 3cb99793a9c..002270845b2 100644
--- a/packages/framework/tests/Unit/NavigationItemTest.php
+++ b/packages/framework/tests/Unit/NavigationItemTest.php
@@ -129,6 +129,7 @@ public function testToString()
 
     public function testCreateWithLink()
     {
+        $this->markTestSkipped('Todo: Reimplement this test for https://github.com/hydephp/develop/pull/1636');
         $item = NavigationItem::create('foo', 'bar');
 
         $this->assertEquals(new ExternalRoute('foo'), $item->getRoute());
@@ -171,6 +172,7 @@ public function testCreateWithRouteKey()
 
     public function testCreateWithMissingRouteKey()
     {
+        $this->markTestSkipped('Todo: Reimplement this test for https://github.com/hydephp/develop/pull/1636');
         $this->assertInstanceOf(ExternalRoute::class, NavigationItem::create('foo', 'foo')->getRoute());
     }
 

From 798acda5546fd8d09ca9ee25d3b5693fb22915a4 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 15:34:58 +0100
Subject: [PATCH 1245/1422] Normalize logic with new destination constructor

---
 .../src/Framework/Features/Navigation/NavigationItem.php      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index 6fec030a9f6..4615fdbbdf2 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -60,8 +60,8 @@ public function __construct(Route|string $destination, string $label, int $prior
      */
     public static function create(Route|string $destination, ?string $label = null, ?int $priority = null, ?string $group = null): self
     {
-        if (is_string($destination)) {
-            $destination = Routes::get($destination) ?? new ExternalRoute($destination);
+        if (is_string($destination) && Routes::has($destination)) {
+            $destination = Routes::get($destination);
         }
 
         if ($destination instanceof Route && ! $destination instanceof ExternalRoute) {

From 6a64d131765e101171c9ef2a1694ed5f1207eb54 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 15:36:27 +0100
Subject: [PATCH 1246/1422] Remove type check for old class

---
 .../src/Framework/Features/Navigation/NavigationItem.php       | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index 4615fdbbdf2..c3fa4d1973d 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -9,7 +9,6 @@
 use Hyde\Support\Models\Route;
 use Illuminate\Support\Str;
 use Stringable;
-use Hyde\Support\Models\ExternalRoute;
 
 use function is_string;
 
@@ -64,7 +63,7 @@ public static function create(Route|string $destination, ?string $label = null,
             $destination = Routes::get($destination);
         }
 
-        if ($destination instanceof Route && ! $destination instanceof ExternalRoute) {
+        if ($destination instanceof Route) {
             return new self(
                 $destination,
                 $label ?? $destination->getPage()->navigationMenuLabel(),

From 1eea4dead92bd0c80208eac6b6fe160760e082a2 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 15:38:28 +0100
Subject: [PATCH 1247/1422] Update deprecation notice

---
 .../src/Framework/Features/Navigation/NavigationItem.php        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index c3fa4d1973d..867684ea5f5 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -96,7 +96,7 @@ public function getRoute(): ?Route
     /**
      * Resolve the destination link of the navigation item.
      *
-     * @deprecated May be renamed to getLink() in the future.
+     * @deprecated May be renamed to getLink() in the future to better match its usage, and to match the Route class.
      */
     public function getUrl(): string
     {

From 218590dcc9f41daf390d209f1c299c7e5de3a28d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 15:42:28 +0100
Subject: [PATCH 1248/1422] Replace dependences on deprecated class with
 inlined strings

We need the kernel and config so we can check if the routes exist
---
 packages/framework/tests/Feature/NavigationMenuTest.php     | 3 +--
 .../framework/tests/Unit/DocumentationSidebarUnitTest.php   | 6 ++++--
 packages/framework/tests/Unit/NavigationMenuUnitTest.php    | 6 ++++--
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/packages/framework/tests/Feature/NavigationMenuTest.php b/packages/framework/tests/Feature/NavigationMenuTest.php
index d0ede48df22..a98931a6e41 100644
--- a/packages/framework/tests/Feature/NavigationMenuTest.php
+++ b/packages/framework/tests/Feature/NavigationMenuTest.php
@@ -7,7 +7,6 @@
 use Hyde\Hyde;
 use Hyde\Support\Models\Route;
 use Hyde\Foundation\Facades\Routes;
-use Hyde\Support\Models\ExternalRoute;
 use Hyde\Framework\Features\Navigation\NavigationGroup;
 use Hyde\Framework\Features\Navigation\MainNavigationMenu;
 use Hyde\Framework\Features\Navigation\NavigationItem;
@@ -268,7 +267,7 @@ public function testCanAddItemsToMainNavigationMenuResolvedFromContainer()
         Hyde::boot();
 
         $navigation = app('navigation.main');
-        $navigation->add(new NavigationItem(new ExternalRoute('/foo'), 'Foo'));
+        $navigation->add(new NavigationItem('/foo', 'Foo'));
 
         $this->assertCount(2, $navigation->getItems());
         $this->assertSame('Foo', $navigation->getItems()->last()->getLabel());
diff --git a/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php b/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
index 9b9c4b7bb6a..4c009f9382d 100644
--- a/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
+++ b/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
@@ -6,7 +6,6 @@
 
 use Hyde\Testing\UnitTestCase;
 use Illuminate\Support\Collection;
-use Hyde\Support\Models\ExternalRoute;
 use Hyde\Framework\Features\Navigation\NavigationItem;
 use Hyde\Framework\Features\Navigation\NavigationGroup;
 use Hyde\Framework\Features\Navigation\DocumentationSidebar;
@@ -21,6 +20,9 @@
  */
 class DocumentationSidebarUnitTest extends UnitTestCase
 {
+    protected static bool $needsKernel = true;
+    protected static bool $needsConfig = true;
+
     // Base menu tests
 
     public function testCanConstruct()
@@ -228,6 +230,6 @@ protected function getItems(): array
 
     protected function item(string $destination, string $label, int $priority = 500): NavigationItem
     {
-        return new NavigationItem(new ExternalRoute($destination), $label, $priority);
+        return new NavigationItem($destination, $label, $priority);
     }
 }
diff --git a/packages/framework/tests/Unit/NavigationMenuUnitTest.php b/packages/framework/tests/Unit/NavigationMenuUnitTest.php
index e90b159624f..8de2aba9229 100644
--- a/packages/framework/tests/Unit/NavigationMenuUnitTest.php
+++ b/packages/framework/tests/Unit/NavigationMenuUnitTest.php
@@ -6,7 +6,6 @@
 
 use Hyde\Testing\UnitTestCase;
 use Illuminate\Support\Collection;
-use Hyde\Support\Models\ExternalRoute;
 use Hyde\Framework\Features\Navigation\NavigationItem;
 use Hyde\Framework\Features\Navigation\MainNavigationMenu;
 
@@ -19,6 +18,9 @@
  */
 class NavigationMenuUnitTest extends UnitTestCase
 {
+    protected static bool $needsKernel = true;
+    protected static bool $needsConfig = true;
+
     // Base menu tests
 
     public function testCanConstruct()
@@ -159,6 +161,6 @@ protected function getItems(): array
 
     protected function item(string $destination, string $label, int $priority = 500): NavigationItem
     {
-        return new NavigationItem(new ExternalRoute($destination), $label, $priority);
+        return new NavigationItem($destination, $label, $priority);
     }
 }

From 67941949381dd87fea22fbe69131b5a23d17ffbb Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 15:44:43 +0100
Subject: [PATCH 1249/1422] Remove logic added to base of test

---
 packages/framework/tests/Unit/DocumentationSidebarUnitTest.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php b/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
index 4c009f9382d..27e1e3826e3 100644
--- a/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
+++ b/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
@@ -209,9 +209,6 @@ public function testHasGroupsReturnsFalseWhenNoItemsHaveChildren()
 
     public function testHasGroupsReturnsTrueWhenAtLeastOneItemIsNavigationGroupInstance()
     {
-        self::mockConfig();
-        self::setupKernel();
-
         $menu = new DocumentationSidebar([
             new NavigationGroup('foo', []),
         ]);

From ba65f1c5d38c9cd786065fb9b424cb181e288b0f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 15:48:30 +0100
Subject: [PATCH 1250/1422] Delete ExternalRoute.php

---
 .../src/Support/Models/ExternalRoute.php      | 28 -------------------
 1 file changed, 28 deletions(-)
 delete mode 100644 packages/framework/src/Support/Models/ExternalRoute.php

diff --git a/packages/framework/src/Support/Models/ExternalRoute.php b/packages/framework/src/Support/Models/ExternalRoute.php
deleted file mode 100644
index 721b89a7c13..00000000000
--- a/packages/framework/src/Support/Models/ExternalRoute.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Hyde\Support\Models;
-
-/**
- * A route that leads to an external URI.
- *
- * @experimental Take caution when using this class, as it may be subject to change.
- *
- * @deprecated This class may be removed before release.
- */
-class ExternalRoute extends Route
-{
-    protected string $destination;
-
-    /** @noinspection PhpMissingParentConstructorInspection */
-    public function __construct(string $destination)
-    {
-        $this->destination = $destination;
-    }
-
-    public function getLink(): string
-    {
-        return $this->destination;
-    }
-}

From 72fce42a51c6730a8588dbf0b7d4663e14723c86 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 15:51:13 +0100
Subject: [PATCH 1251/1422] Revert "Skip tests needing to be reimplemented for
 #1636"

This reverts commit eb81668e91594e9944a5d72cffb5f7d29246f2f9.
---
 packages/framework/tests/Unit/NavigationItemTest.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/framework/tests/Unit/NavigationItemTest.php b/packages/framework/tests/Unit/NavigationItemTest.php
index 002270845b2..3cb99793a9c 100644
--- a/packages/framework/tests/Unit/NavigationItemTest.php
+++ b/packages/framework/tests/Unit/NavigationItemTest.php
@@ -129,7 +129,6 @@ public function testToString()
 
     public function testCreateWithLink()
     {
-        $this->markTestSkipped('Todo: Reimplement this test for https://github.com/hydephp/develop/pull/1636');
         $item = NavigationItem::create('foo', 'bar');
 
         $this->assertEquals(new ExternalRoute('foo'), $item->getRoute());
@@ -172,7 +171,6 @@ public function testCreateWithRouteKey()
 
     public function testCreateWithMissingRouteKey()
     {
-        $this->markTestSkipped('Todo: Reimplement this test for https://github.com/hydephp/develop/pull/1636');
         $this->assertInstanceOf(ExternalRoute::class, NavigationItem::create('foo', 'foo')->getRoute());
     }
 

From cab21b70721c0a3d20c37334ab0252d5aab78c43 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 15:53:31 +0100
Subject: [PATCH 1252/1422] Reimplement tests for changed types

---
 packages/framework/tests/Unit/NavigationItemTest.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/framework/tests/Unit/NavigationItemTest.php b/packages/framework/tests/Unit/NavigationItemTest.php
index 3cb99793a9c..a74e1d94d76 100644
--- a/packages/framework/tests/Unit/NavigationItemTest.php
+++ b/packages/framework/tests/Unit/NavigationItemTest.php
@@ -5,7 +5,6 @@
 namespace Hyde\Framework\Testing\Unit;
 
 use Hyde\Foundation\Facades\Routes;
-use Hyde\Support\Models\ExternalRoute;
 use Hyde\Framework\Features\Navigation\NavigationItem;
 use Hyde\Pages\InMemoryPage;
 use Hyde\Pages\MarkdownPage;
@@ -131,7 +130,8 @@ public function testCreateWithLink()
     {
         $item = NavigationItem::create('foo', 'bar');
 
-        $this->assertEquals(new ExternalRoute('foo'), $item->getRoute());
+        $this->assertNull($item->getRoute());
+        $this->assertSame('foo', $item->getUrl());
         $this->assertSame('bar', $item->getLabel());
         $this->assertSame(500, $item->getPriority());
     }
@@ -171,7 +171,7 @@ public function testCreateWithRouteKey()
 
     public function testCreateWithMissingRouteKey()
     {
-        $this->assertInstanceOf(ExternalRoute::class, NavigationItem::create('foo', 'foo')->getRoute());
+        $this->assertNull(NavigationItem::create('foo', 'foo')->getRoute());
     }
 
     public function testCreateWithCustomPriority()

From 0dec761e7ba554dcee8ebff754f31d934a882ced Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 15:54:01 +0100
Subject: [PATCH 1253/1422] Rename test for removed class

---
 packages/framework/tests/Unit/NavigationItemTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/tests/Unit/NavigationItemTest.php b/packages/framework/tests/Unit/NavigationItemTest.php
index a74e1d94d76..209727ea153 100644
--- a/packages/framework/tests/Unit/NavigationItemTest.php
+++ b/packages/framework/tests/Unit/NavigationItemTest.php
@@ -243,7 +243,7 @@ public function testIsCurrent()
         $this->assertFalse(NavigationItem::create(new Route(new InMemoryPage('bar')))->isActive());
     }
 
-    public function testIsCurrentWithExternalRoute()
+    public function testIsCurrentWithLink()
     {
         Render::swap(Mockery::mock(RenderData::class, [
             'getRoute' => new Route(new InMemoryPage('foo')),

From 976d7ff5dd46fa6d10118ee4c2a1084ee585c6c7 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 15:54:12 +0100
Subject: [PATCH 1254/1422] Remove removed new class from release notes

---
 RELEASE_NOTES.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 1c7e3aa81e5..3c8def52a9b 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -11,7 +11,6 @@ This serves two purposes:
 
 ### Added
 - Added a new `\Hyde\Framework\Actions\PreBuildTasks\TransferMediaAssets` build task handle media assets transfers for site builds.
-- Added a new `ExternalRoute` class to represent external routes.
 - Added a new `NavigationItem::getLink()` method contain the previous `NavigationItem::getDestination()` logic, to return the link URL.
 
 ### Changed

From 45332ecf91178c4083eeddf44f75f2ba1df41581 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 15:57:08 +0100
Subject: [PATCH 1255/1422] Add a new page accessor

---
 .../src/Framework/Features/Navigation/NavigationItem.php | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index 867684ea5f5..ea8febd647a 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -4,6 +4,7 @@
 
 namespace Hyde\Framework\Features\Navigation;
 
+use Hyde\Pages\Concerns\HydePage;
 use Hyde\Foundation\Facades\Routes;
 use Hyde\Hyde;
 use Hyde\Support\Models\Route;
@@ -83,6 +84,14 @@ public function __toString(): string
         return $this->getUrl();
     }
 
+    /**
+     * If the navigation item is a link to a routed page, get the corresponding page instance.
+     */
+    public function getPage(): ?HydePage
+    {
+        return $this->destination->getRoute()?->getPage();
+    }
+
     /**
      * Get the destination route of the navigation item. For dropdowns, this will return null.
      *

From 2f963c617e0432e957ba780439479989b0274bcc Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 15:58:38 +0100
Subject: [PATCH 1256/1422] Simplify search logic to access page directly

---
 .../src/Framework/Features/Navigation/NavigationGroup.php       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
index 5b9c0ea8896..937d1647ddd 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
@@ -78,7 +78,7 @@ protected function addItem(NavigationItem $item): void
     protected function containsOnlyDocumentationPages(): bool
     {
         return count($this->getItems()) && collect($this->getItems())->every(function (NavigationItem $child): bool {
-            return ($child->getRoute() !== null) && $child->getRoute()->getPage() instanceof DocumentationPage;
+            return $child->getPage() instanceof DocumentationPage;
         });
     }
 }

From 6aa82b7257f2696e5a180fad9a7a771a3a38225c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 16:03:40 +0100
Subject: [PATCH 1257/1422] Restructure test to improve assertions

And to care less about the route state
---
 .../tests/Unit/NavigationItemTest.php         | 68 +++++++++++++------
 1 file changed, 49 insertions(+), 19 deletions(-)

diff --git a/packages/framework/tests/Unit/NavigationItemTest.php b/packages/framework/tests/Unit/NavigationItemTest.php
index 209727ea153..b97a192056c 100644
--- a/packages/framework/tests/Unit/NavigationItemTest.php
+++ b/packages/framework/tests/Unit/NavigationItemTest.php
@@ -41,10 +41,10 @@ protected function setUp(): void
 
     public function testConstruct()
     {
-        $route = new Route(new MarkdownPage());
-        $item = new NavigationItem($route, 'Test', 500);
-
-        $this->assertSame($route, $item->getRoute());
+        $this->assertInstanceOf(NavigationItem::class, new NavigationItem('foo', 'Test'));
+        $this->assertInstanceOf(NavigationItem::class, new NavigationItem(new Route(new MarkdownPage()), 'Test'));
+        $this->assertInstanceOf(NavigationItem::class, new NavigationItem(new Route(new MarkdownPage()), 'Test', 500));
+        $this->assertInstanceOf(NavigationItem::class, new NavigationItem(new Route(new MarkdownPage()), 'Test', 500, 'foo'));
     }
 
     public function testIsInstanceOfNavigationElement()
@@ -55,36 +55,45 @@ public function testIsInstanceOfNavigationElement()
     public function testPassingRouteInstanceToConstructorUsesRouteInstance()
     {
         $route = new Route(new MarkdownPage());
-        $this->assertSame($route, (new NavigationItem($route, 'Home'))->getRoute());
+        $this->assertEquals($route, (new NavigationItem($route, 'Home'))->getPage()->getRoute());
     }
 
     public function testPassingRouteKeyToConstructorUsesRouteInstance()
     {
         $route = Routes::get('index');
-
-        $this->assertSame($route, (new NavigationItem('index', 'Home'))->getRoute());
+        $item = new NavigationItem('index', 'Home');
+        $this->assertNotNull($item->getPage());
+        $this->assertSame($route->getPage(), $item->getPage());
     }
 
     public function testPassingUrlToConstructorSetsRouteToNull()
     {
         $item = new NavigationItem('https://example.com', 'Home');
-        $this->assertNull($item->getRoute());
+        $this->assertNull($item->getPage());
         $this->assertSame('https://example.com', $item->getUrl());
     }
 
     public function testPassingUnknownRouteKeyToConstructorSetsRouteToNull()
     {
         $item = new NavigationItem('foo', 'Home');
-        $this->assertNull($item->getRoute());
+        $this->assertNull($item->getPage());
         $this->assertSame('foo', $item->getUrl());
     }
 
-    public function testGetDestination()
+    public function testCanGetPage()
+    {
+        $page = new MarkdownPage();
+        $item = new NavigationItem(new Route($page), 'Test', 500);
+
+        $this->assertSame($page, $item->getPage());
+    }
+
+    public function testGetPageRoute()
     {
         $route = new Route(new InMemoryPage('foo'));
         $NavigationItem = new NavigationItem($route, 'Page', 500);
 
-        $this->assertSame($route, $NavigationItem->getRoute());
+        $this->assertEquals($route, $NavigationItem->getPage()->getRoute());
     }
 
     public function testGetLink()
@@ -113,10 +122,12 @@ public function testGetGroup()
 
     public function testFromRoute()
     {
-        $route = new Route(new MarkdownPage());
+        $page = new MarkdownPage();
+        $route = new Route($page);
         $item = NavigationItem::create($route);
 
-        $this->assertSame($route, $item->getRoute());
+        $this->assertSame($page, $item->getPage());
+        $this->assertEquals($route, $item->getPage()->getRoute());
     }
 
     public function testToString()
@@ -130,7 +141,7 @@ public function testCreateWithLink()
     {
         $item = NavigationItem::create('foo', 'bar');
 
-        $this->assertNull($item->getRoute());
+        $this->assertNull($item->getPage());
         $this->assertSame('foo', $item->getUrl());
         $this->assertSame('bar', $item->getLabel());
         $this->assertSame(500, $item->getPriority());
@@ -146,19 +157,38 @@ public function testCreate()
         $route = Routes::get('404');
         $item = NavigationItem::create($route, 'foo');
 
-        $this->assertSame($route, $item->getRoute());
+        $this->assertSame($route->getPage(), $item->getPage());
         $this->assertSame('foo', $item->getLabel());
         $this->assertSame(999, $item->getPriority());
+        $this->assertEquals($route, $item->getPage()->getRoute());
+        $this->assertSame('404.html', $item->getUrl());
+        $this->assertSame('404.html', (string) $item);
+        $this->assertNull($item->getGroupKey());
     }
 
     public function testForIndexRoute()
     {
         $route = Routes::get('index');
-        $item = NavigationItem::create($route, 'foo');
+        $item = NavigationItem::create($route);
 
-        $this->assertSame($route, $item->getRoute());
-        $this->assertSame('foo', $item->getLabel());
+        $this->assertSame($route->getPage(), $item->getPage());
+        $this->assertSame('Home', $item->getLabel());
         $this->assertSame(0, $item->getPriority());
+        $this->assertEquals($route, $item->getPage()->getRoute());
+        $this->assertSame('index.html', $item->getUrl());
+        $this->assertSame('index.html', (string) $item);
+        $this->assertNull($item->getGroupKey());
+    }
+
+    public function testCreateWithLabels()
+    {
+        $route = Routes::get('404');
+        $item = NavigationItem::create($route, 'foo');
+        $this->assertSame('foo', $item->getLabel());
+
+        $route = Routes::get('index');
+        $item = NavigationItem::create($route);
+        $this->assertSame('Home', $item->getLabel());
     }
 
     public function testCreateWithRouteKey()
@@ -171,7 +201,7 @@ public function testCreateWithRouteKey()
 
     public function testCreateWithMissingRouteKey()
     {
-        $this->assertNull(NavigationItem::create('foo', 'foo')->getRoute());
+        $this->assertNull(NavigationItem::create('foo', 'foo')->getPage());
     }
 
     public function testCreateWithCustomPriority()

From b4011e124fcd9cd7b80d23f2e5aeb7f6631859f9 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 16:26:31 +0100
Subject: [PATCH 1258/1422] Use the resolved link instead of implicit route
 resolve

---
 .../resources/views/components/docs/sidebar-item.blade.php    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/resources/views/components/docs/sidebar-item.blade.php b/packages/framework/resources/views/components/docs/sidebar-item.blade.php
index cab03d7c3f3..d57c5d468a5 100644
--- a/packages/framework/resources/views/components/docs/sidebar-item.blade.php
+++ b/packages/framework/resources/views/components/docs/sidebar-item.blade.php
@@ -4,7 +4,7 @@
         : 'active bg-black/5 dark:bg-black/10' => $item->isActive()
     ]) role="listitem">
     @if($item->isActive())
-        <a href="{{ $item->getRoute() }}" aria-current="true" @class([$grouped
+        <a href="{{ $item->getUrl() }}" aria-current="true" @class([$grouped
             ? '-ml-8 pl-4 py-1 px-2 block text-indigo-600 dark:text-indigo-400 dark:font-medium border-l-[0.325rem] border-indigo-500 transition-colors duration-300 ease-in-out hover:bg-black/10'
             : '-ml-4 p-2 block hover:bg-black/5 dark:hover:bg-black/10 text-indigo-600 dark:text-indigo-400 dark:font-medium border-l-[0.325rem] border-indigo-500 transition-colors duration-300 ease-in-out'
         ])>
@@ -16,7 +16,7 @@
             {!! $page->getTableOfContents() !!}
         @endif
     @else
-        <a href="{{ $item->getRoute() }}" @class([$grouped
+        <a href="{{ $item->getUrl() }}" @class([$grouped
             ? '-ml-8 pl-4 py-1 px-2 block border-l-[0.325rem] border-transparent transition-colors duration-300 ease-in-out hover:bg-black/10'
             : 'block -ml-4 p-2 border-l-[0.325rem] border-transparent hover:bg-black/5 dark:hover:bg-black/10'
         ])>

From 1b94a90fa45f286967a6efa3c8499aaa1f176f7a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 16:30:07 +0100
Subject: [PATCH 1259/1422] Remove `NavigationItem::getRoute` method

Use `$item->getPage()->getRoute()` instead
---
 .../Framework/Features/Navigation/NavigationItem.php   | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index ea8febd647a..ff72167d305 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -92,16 +92,6 @@ public function getPage(): ?HydePage
         return $this->destination->getRoute()?->getPage();
     }
 
-    /**
-     * Get the destination route of the navigation item. For dropdowns, this will return null.
-     *
-     * @deprecated To simplify the class, we may remove this as we probably don't need it.
-     */
-    public function getRoute(): ?Route
-    {
-        return $this->destination->getRoute();
-    }
-
     /**
      * Resolve the destination link of the navigation item.
      *

From 37c51c2f0f47a1e14d41a66631bad27ad0ae236e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 16:37:21 +0100
Subject: [PATCH 1260/1422] Rename `NavigationItem` method `getUrl` to
 `getLink`

---
 .../views/components/docs/sidebar-item.blade.php     |  4 ++--
 .../Framework/Features/Navigation/NavigationItem.php |  8 +++-----
 packages/framework/tests/Unit/NavigationItemTest.php | 12 ++++++------
 3 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/packages/framework/resources/views/components/docs/sidebar-item.blade.php b/packages/framework/resources/views/components/docs/sidebar-item.blade.php
index d57c5d468a5..c22f14182e8 100644
--- a/packages/framework/resources/views/components/docs/sidebar-item.blade.php
+++ b/packages/framework/resources/views/components/docs/sidebar-item.blade.php
@@ -4,7 +4,7 @@
         : 'active bg-black/5 dark:bg-black/10' => $item->isActive()
     ]) role="listitem">
     @if($item->isActive())
-        <a href="{{ $item->getUrl() }}" aria-current="true" @class([$grouped
+        <a href="{{ $item->getLink() }}" aria-current="true" @class([$grouped
             ? '-ml-8 pl-4 py-1 px-2 block text-indigo-600 dark:text-indigo-400 dark:font-medium border-l-[0.325rem] border-indigo-500 transition-colors duration-300 ease-in-out hover:bg-black/10'
             : '-ml-4 p-2 block hover:bg-black/5 dark:hover:bg-black/10 text-indigo-600 dark:text-indigo-400 dark:font-medium border-l-[0.325rem] border-indigo-500 transition-colors duration-300 ease-in-out'
         ])>
@@ -16,7 +16,7 @@
             {!! $page->getTableOfContents() !!}
         @endif
     @else
-        <a href="{{ $item->getUrl() }}" @class([$grouped
+        <a href="{{ $item->getLink() }}" @class([$grouped
             ? '-ml-8 pl-4 py-1 px-2 block border-l-[0.325rem] border-transparent transition-colors duration-300 ease-in-out hover:bg-black/10'
             : 'block -ml-4 p-2 border-l-[0.325rem] border-transparent hover:bg-black/5 dark:hover:bg-black/10'
         ])>
diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index ff72167d305..5e6b12da234 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -81,7 +81,7 @@ public static function create(Route|string $destination, ?string $label = null,
      */
     public function __toString(): string
     {
-        return $this->getUrl();
+        return $this->getLink();
     }
 
     /**
@@ -94,10 +94,8 @@ public function getPage(): ?HydePage
 
     /**
      * Resolve the destination link of the navigation item.
-     *
-     * @deprecated May be renamed to getLink() in the future to better match its usage, and to match the Route class.
      */
-    public function getUrl(): string
+    public function getLink(): string
     {
         return $this->destination->getLink();
     }
@@ -136,7 +134,7 @@ public function getGroupKey(): ?string
      */
     public function isActive(): bool
     {
-        return Hyde::currentRoute()->getLink() === $this->getUrl();
+        return Hyde::currentRoute()->getLink() === $this->getLink();
     }
 
     /** @return ($group is null ? null : string) */
diff --git a/packages/framework/tests/Unit/NavigationItemTest.php b/packages/framework/tests/Unit/NavigationItemTest.php
index b97a192056c..10a76006f56 100644
--- a/packages/framework/tests/Unit/NavigationItemTest.php
+++ b/packages/framework/tests/Unit/NavigationItemTest.php
@@ -70,14 +70,14 @@ public function testPassingUrlToConstructorSetsRouteToNull()
     {
         $item = new NavigationItem('https://example.com', 'Home');
         $this->assertNull($item->getPage());
-        $this->assertSame('https://example.com', $item->getUrl());
+        $this->assertSame('https://example.com', $item->getLink());
     }
 
     public function testPassingUnknownRouteKeyToConstructorSetsRouteToNull()
     {
         $item = new NavigationItem('foo', 'Home');
         $this->assertNull($item->getPage());
-        $this->assertSame('foo', $item->getUrl());
+        $this->assertSame('foo', $item->getLink());
     }
 
     public function testCanGetPage()
@@ -99,7 +99,7 @@ public function testGetPageRoute()
     public function testGetLink()
     {
         $NavigationItem = new NavigationItem(new Route(new InMemoryPage('foo')), 'Page', 500);
-        $this->assertSame('foo.html', $NavigationItem->getUrl());
+        $this->assertSame('foo.html', $NavigationItem->getLink());
     }
 
     public function testGetLabel()
@@ -142,7 +142,7 @@ public function testCreateWithLink()
         $item = NavigationItem::create('foo', 'bar');
 
         $this->assertNull($item->getPage());
-        $this->assertSame('foo', $item->getUrl());
+        $this->assertSame('foo', $item->getLink());
         $this->assertSame('bar', $item->getLabel());
         $this->assertSame(500, $item->getPriority());
     }
@@ -161,7 +161,7 @@ public function testCreate()
         $this->assertSame('foo', $item->getLabel());
         $this->assertSame(999, $item->getPriority());
         $this->assertEquals($route, $item->getPage()->getRoute());
-        $this->assertSame('404.html', $item->getUrl());
+        $this->assertSame('404.html', $item->getLink());
         $this->assertSame('404.html', (string) $item);
         $this->assertNull($item->getGroupKey());
     }
@@ -175,7 +175,7 @@ public function testForIndexRoute()
         $this->assertSame('Home', $item->getLabel());
         $this->assertSame(0, $item->getPriority());
         $this->assertEquals($route, $item->getPage()->getRoute());
-        $this->assertSame('index.html', $item->getUrl());
+        $this->assertSame('index.html', $item->getLink());
         $this->assertSame('index.html', (string) $item);
         $this->assertNull($item->getGroupKey());
     }

From 53a8b08e03e987d6681b28b56535c03c3804ac9f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 16:40:46 +0100
Subject: [PATCH 1261/1422] Add type annotation

---
 .../resources/views/components/docs/sidebar-item.blade.php       | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/resources/views/components/docs/sidebar-item.blade.php b/packages/framework/resources/views/components/docs/sidebar-item.blade.php
index c22f14182e8..fe320513408 100644
--- a/packages/framework/resources/views/components/docs/sidebar-item.blade.php
+++ b/packages/framework/resources/views/components/docs/sidebar-item.blade.php
@@ -1,4 +1,5 @@
 @props(['grouped' => false])
+@php /** @var \Hyde\Framework\Features\Navigation\NavigationItem $item */ @endphp
 <li @class(['sidebar-item -ml-4 pl-4', $grouped
         ? 'active -ml-8 pl-8 bg-black/5 dark:bg-black/10'
         : 'active bg-black/5 dark:bg-black/10' => $item->isActive()

From 1b8cd1bbd008da76befbfe83c2fc4ac20ca24d73 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 16:53:46 +0100
Subject: [PATCH 1262/1422] Unwrap unnecessary null check

---
 .../src/Framework/Features/Navigation/NavigationItem.php      | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index 5e6b12da234..00e1c2bba4c 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -45,9 +45,7 @@ public function __construct(Route|string $destination, string $label, int $prior
         $this->label = $label;
         $this->priority = $priority;
 
-        if ($group !== null) {
-            $this->group = static::normalizeGroupKey($group);
-        }
+        $this->group = static::normalizeGroupKey($group);
     }
 
     /**

From d3b2044b087b41335a3191fa4834dbb0d73077f9 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 17:00:54 +0100
Subject: [PATCH 1263/1422] Inline the navigation destination class

Turns out we really didn't need this. It does add one test for the new side effect of constructor now being less magic (desirable as it's the scope of the create method)
---
 .../Navigation/NavigationDestination.php      | 41 -------------------
 .../Features/Navigation/NavigationItem.php    |  8 ++--
 .../tests/Unit/NavigationItemTest.php         | 15 +++++--
 3 files changed, 15 insertions(+), 49 deletions(-)
 delete mode 100644 packages/framework/src/Framework/Features/Navigation/NavigationDestination.php

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationDestination.php b/packages/framework/src/Framework/Features/Navigation/NavigationDestination.php
deleted file mode 100644
index bcf07e11763..00000000000
--- a/packages/framework/src/Framework/Features/Navigation/NavigationDestination.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Hyde\Framework\Features\Navigation;
-
-use Stringable;
-use Hyde\Support\Models\Route;
-use Hyde\Foundation\Facades\Routes;
-
-use function is_string;
-
-class NavigationDestination implements Stringable
-{
-    protected Route|string $destination;
-
-    public function __construct(Route|string $destination)
-    {
-        if (is_string($destination) && Routes::has($destination)) {
-            $destination = Routes::get($destination);
-        }
-
-        $this->destination = $destination;
-    }
-
-    public function __toString(): string
-    {
-        return $this->getLink();
-    }
-
-    public function getLink(): string
-    {
-        return (string) $this->destination;
-    }
-
-    /** @experimental */
-    public function getRoute(): ?Route
-    {
-        return $this->destination instanceof Route ? $this->destination : null;
-    }
-}
diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index 00e1c2bba4c..6c8d73ad3f5 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -23,7 +23,7 @@
  */
 class NavigationItem implements NavigationElement, Stringable
 {
-    protected NavigationDestination $destination;
+    protected string|Route $destination;
     protected string $label;
     protected int $priority;
 
@@ -40,7 +40,7 @@ class NavigationItem implements NavigationElement, Stringable
      */
     public function __construct(Route|string $destination, string $label, int $priority = NavigationMenu::DEFAULT, ?string $group = null)
     {
-        $this->destination = new NavigationDestination($destination);
+        $this->destination = $destination;
 
         $this->label = $label;
         $this->priority = $priority;
@@ -87,7 +87,7 @@ public function __toString(): string
      */
     public function getPage(): ?HydePage
     {
-        return $this->destination->getRoute()?->getPage();
+        return $this->destination instanceof Route ? $this->destination->getPage() : null;
     }
 
     /**
@@ -95,7 +95,7 @@ public function getPage(): ?HydePage
      */
     public function getLink(): string
     {
-        return $this->destination->getLink();
+        return (string) $this->destination;
     }
 
     /**
diff --git a/packages/framework/tests/Unit/NavigationItemTest.php b/packages/framework/tests/Unit/NavigationItemTest.php
index 10a76006f56..f003b3400b0 100644
--- a/packages/framework/tests/Unit/NavigationItemTest.php
+++ b/packages/framework/tests/Unit/NavigationItemTest.php
@@ -58,12 +58,11 @@ public function testPassingRouteInstanceToConstructorUsesRouteInstance()
         $this->assertEquals($route, (new NavigationItem($route, 'Home'))->getPage()->getRoute());
     }
 
-    public function testPassingRouteKeyToConstructorUsesRouteInstance()
+    public function testPassingRouteKeyToConstructorUsesDestinationAsLink()
     {
-        $route = Routes::get('index');
         $item = new NavigationItem('index', 'Home');
-        $this->assertNotNull($item->getPage());
-        $this->assertSame($route->getPage(), $item->getPage());
+        $this->assertNull($item->getPage());
+        $this->assertSame('index', $item->getLink());
     }
 
     public function testPassingUrlToConstructorSetsRouteToNull()
@@ -209,6 +208,14 @@ public function testCreateWithCustomPriority()
         $this->assertSame(100, NavigationItem::create(Routes::get('index'), 'foo', 100)->getPriority());
     }
 
+    public function testPassingRouteKeyToStaticConstructorUsesRouteInstance()
+    {
+        $route = Routes::get('index');
+        $item = NavigationItem::create('index', 'Home');
+        $this->assertNotNull($item->getPage());
+        $this->assertSame($route->getPage(), $item->getPage());
+    }
+
     public function testRouteBasedNavigationItemDestinationsAreResolvedRelatively()
     {
         Render::swap(Mockery::mock(RenderData::class, [

From 1ed674b7f55c77b5d4591ab1f0a094688c566f96 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 17:02:58 +0100
Subject: [PATCH 1264/1422] Reorder methods in class

---
 .../Features/Navigation/NavigationItem.php       | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index 6c8d73ad3f5..c0d65bd58df 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -82,14 +82,6 @@ public function __toString(): string
         return $this->getLink();
     }
 
-    /**
-     * If the navigation item is a link to a routed page, get the corresponding page instance.
-     */
-    public function getPage(): ?HydePage
-    {
-        return $this->destination instanceof Route ? $this->destination->getPage() : null;
-    }
-
     /**
      * Resolve the destination link of the navigation item.
      */
@@ -127,6 +119,14 @@ public function getGroupKey(): ?string
         return $this->group;
     }
 
+    /**
+     * If the navigation item is a link to a routed page, get the corresponding page instance.
+     */
+    public function getPage(): ?HydePage
+    {
+        return $this->destination instanceof Route ? $this->destination->getPage() : null;
+    }
+
     /**
      * Check if the NavigationItem instance is the current page being rendered.
      */

From 4ea66c6d938952aeefd262b1b247e07bd93b4007 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 17:04:35 +0100
Subject: [PATCH 1265/1422] Replace early construct call with property coalesce
 assignments

---
 .../src/Framework/Features/Navigation/NavigationItem.php | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index c0d65bd58df..099e539cd48 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -63,12 +63,9 @@ public static function create(Route|string $destination, ?string $label = null,
         }
 
         if ($destination instanceof Route) {
-            return new self(
-                $destination,
-                $label ?? $destination->getPage()->navigationMenuLabel(),
-                $priority ?? $destination->getPage()->navigationMenuPriority(),
-                $group ?? $destination->getPage()->navigationMenuGroup(),
-            );
+            $label ??= $destination->getPage()->navigationMenuLabel();
+            $priority ??= $destination->getPage()->navigationMenuPriority();
+            $group ??= $destination->getPage()->navigationMenuGroup();
         }
 
         return new self($destination, $label ?? '', $priority ?? NavigationMenu::DEFAULT, $group);

From 3e4901bee4d4f1313bea62170e52bbb55c91a45d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 17:05:18 +0100
Subject: [PATCH 1266/1422] Return new static instead of self

Now longer needed as we decoupled the navigation group class
---
 .../src/Framework/Features/Navigation/NavigationItem.php      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index 099e539cd48..0649c7e44e9 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -56,7 +56,7 @@ public function __construct(Route|string $destination, string $label, int $prior
      * @param  string|null  $label  Leave blank to use the label of the route's corresponding page, if there is one tied to the route.
      * @param  string|null  $group  Leave blank to use the group of the route's corresponding page, if there is one tied to the route.
      */
-    public static function create(Route|string $destination, ?string $label = null, ?int $priority = null, ?string $group = null): self
+    public static function create(Route|string $destination, ?string $label = null, ?int $priority = null, ?string $group = null): static
     {
         if (is_string($destination) && Routes::has($destination)) {
             $destination = Routes::get($destination);
@@ -68,7 +68,7 @@ public static function create(Route|string $destination, ?string $label = null,
             $group ??= $destination->getPage()->navigationMenuGroup();
         }
 
-        return new self($destination, $label ?? '', $priority ?? NavigationMenu::DEFAULT, $group);
+        return new static($destination, $label ?? '', $priority ?? NavigationMenu::DEFAULT, $group);
     }
 
     /**

From 4909d15d8fa73d57589630d64c58e2cfdef373d6 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 17:12:53 +0100
Subject: [PATCH 1267/1422] Test create with null label

---
 packages/framework/tests/Unit/NavigationItemTest.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/framework/tests/Unit/NavigationItemTest.php b/packages/framework/tests/Unit/NavigationItemTest.php
index f003b3400b0..6857189254f 100644
--- a/packages/framework/tests/Unit/NavigationItemTest.php
+++ b/packages/framework/tests/Unit/NavigationItemTest.php
@@ -208,6 +208,11 @@ public function testCreateWithCustomPriority()
         $this->assertSame(100, NavigationItem::create(Routes::get('index'), 'foo', 100)->getPriority());
     }
 
+    public function testCreateWithNullLabel()
+    {
+        $this->assertSame('', NavigationItem::create('foo')->getLabel());
+    }
+
     public function testPassingRouteKeyToStaticConstructorUsesRouteInstance()
     {
         $route = Routes::get('index');

From 41db3d1c7772439de56abf46449463e71c6591a8 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 17:29:16 +0100
Subject: [PATCH 1268/1422] Test create with null label for route

---
 packages/framework/tests/Unit/NavigationItemTest.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/framework/tests/Unit/NavigationItemTest.php b/packages/framework/tests/Unit/NavigationItemTest.php
index 6857189254f..fe66e9c57d4 100644
--- a/packages/framework/tests/Unit/NavigationItemTest.php
+++ b/packages/framework/tests/Unit/NavigationItemTest.php
@@ -208,6 +208,11 @@ public function testCreateWithCustomPriority()
         $this->assertSame(100, NavigationItem::create(Routes::get('index'), 'foo', 100)->getPriority());
     }
 
+    public function testCreateWithNullLabelForRoute()
+    {
+        $this->assertSame('Home', NavigationItem::create('index')->getLabel());
+    }
+
     public function testCreateWithNullLabel()
     {
         $this->assertSame('', NavigationItem::create('foo')->getLabel());

From 0c0a87c95098f3e6fd97813bf49e10097338dfbd Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 17:37:37 +0100
Subject: [PATCH 1269/1422] Update label to fall back to the supplied link

---
 .../Features/Navigation/NavigationItem.php      |  2 +-
 .../framework/tests/Unit/NavigationItemTest.php | 17 ++++++++++++++++-
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index 0649c7e44e9..22ac69f8e28 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -68,7 +68,7 @@ public static function create(Route|string $destination, ?string $label = null,
             $group ??= $destination->getPage()->navigationMenuGroup();
         }
 
-        return new static($destination, $label ?? '', $priority ?? NavigationMenu::DEFAULT, $group);
+        return new static($destination, $label ?? $destination, $priority ?? NavigationMenu::DEFAULT, $group);
     }
 
     /**
diff --git a/packages/framework/tests/Unit/NavigationItemTest.php b/packages/framework/tests/Unit/NavigationItemTest.php
index fe66e9c57d4..a92b27e25d5 100644
--- a/packages/framework/tests/Unit/NavigationItemTest.php
+++ b/packages/framework/tests/Unit/NavigationItemTest.php
@@ -215,7 +215,22 @@ public function testCreateWithNullLabelForRoute()
 
     public function testCreateWithNullLabel()
     {
-        $this->assertSame('', NavigationItem::create('foo')->getLabel());
+        $this->assertSame('foo', NavigationItem::create('foo')->getLabel());
+
+        $links = [
+            'www.example.com',
+            'https://example.com',
+            'https://example.com/',
+            'https://example.com/foo',
+            'https://example.com/foo/',
+            'https://example.com/foo/bar',
+            'https://example.com/foo/bar.html',
+            'https://example.com/foo/bar.png',
+        ];
+
+        foreach ($links as $link) {
+            $this->assertSame($link, NavigationItem::create($link)->getLink());
+        }
     }
 
     public function testPassingRouteKeyToStaticConstructorUsesRouteInstance()

From 180e0dfadec01d844eeba0f4d22340257145cc9e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 17:46:30 +0100
Subject: [PATCH 1270/1422] Fix method being asserted

---
 packages/framework/tests/Unit/NavigationItemTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/tests/Unit/NavigationItemTest.php b/packages/framework/tests/Unit/NavigationItemTest.php
index a92b27e25d5..4b7fa9cff2a 100644
--- a/packages/framework/tests/Unit/NavigationItemTest.php
+++ b/packages/framework/tests/Unit/NavigationItemTest.php
@@ -229,7 +229,7 @@ public function testCreateWithNullLabel()
         ];
 
         foreach ($links as $link) {
-            $this->assertSame($link, NavigationItem::create($link)->getLink());
+            $this->assertSame($link, NavigationItem::create($link)->getLabel());
         }
     }
 

From 99ef0ed92c2c3b3dfbdcfcf678fe30108e447108 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 17:46:43 +0100
Subject: [PATCH 1271/1422] Extract helper method

---
 .../src/Framework/Features/Navigation/NavigationItem.php   | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index 22ac69f8e28..ac93f435a14 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -68,7 +68,7 @@ public static function create(Route|string $destination, ?string $label = null,
             $group ??= $destination->getPage()->navigationMenuGroup();
         }
 
-        return new static($destination, $label ?? $destination, $priority ?? NavigationMenu::DEFAULT, $group);
+        return new static($destination, $label ?? static::makeTitleFromUrl($destination), $priority ?? NavigationMenu::DEFAULT, $group);
     }
 
     /**
@@ -137,4 +137,9 @@ public static function normalizeGroupKey(?string $group): ?string
     {
         return $group ? Str::slug($group) : null;
     }
+
+    protected static function makeTitleFromUrl(string $url): string
+    {
+        return $url;
+    }
 }

From ea50e0f38245ac9ce553cc5851f5cdcc6e85bc2f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 17:50:49 +0100
Subject: [PATCH 1272/1422] Dynamically generate titles from input links

---
 .../Features/Navigation/NavigationItem.php    |  7 ++-
 .../tests/Unit/NavigationItemTest.php         | 48 +++++++++++++------
 2 files changed, 39 insertions(+), 16 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index ac93f435a14..ed4132e3bc6 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -138,8 +138,13 @@ public static function normalizeGroupKey(?string $group): ?string
         return $group ? Str::slug($group) : null;
     }
 
+    /** @experimental This feature may be removed before release, and the label will just fall back to the input $url */
     protected static function makeTitleFromUrl(string $url): string
     {
-        return $url;
+        $basename = basename($url);
+        $basename = Str::replaceFirst('www.', '', $basename);
+        $basename = Str::replaceLast('.html', '', $basename);
+
+        return Hyde::makeTitle($basename);
     }
 }
diff --git a/packages/framework/tests/Unit/NavigationItemTest.php b/packages/framework/tests/Unit/NavigationItemTest.php
index 4b7fa9cff2a..cee578da044 100644
--- a/packages/framework/tests/Unit/NavigationItemTest.php
+++ b/packages/framework/tests/Unit/NavigationItemTest.php
@@ -215,22 +215,40 @@ public function testCreateWithNullLabelForRoute()
 
     public function testCreateWithNullLabel()
     {
-        $this->assertSame('foo', NavigationItem::create('foo')->getLabel());
-
-        $links = [
-            'www.example.com',
-            'https://example.com',
-            'https://example.com/',
-            'https://example.com/foo',
-            'https://example.com/foo/',
-            'https://example.com/foo/bar',
-            'https://example.com/foo/bar.html',
-            'https://example.com/foo/bar.png',
-        ];
+        $this->assertSame('Foo', NavigationItem::create('foo')->getLabel());
+    }
+
+    public function testCreateWithNullLabelForLinks()
+    {
+        $this->assertSame('Example.com', NavigationItem::create('example.com')->getLabel());
+        $this->assertSame('Example.com', NavigationItem::create('example.com/')->getLabel());
+        $this->assertSame('Example.com', NavigationItem::create('https://example.com/')->getLabel());
+    }
+
+    public function testCreateWithNullLabelForLinksWithSubdomain()
+    {
+        $this->assertSame('Example.com', NavigationItem::create('www.example.com')->getLabel());
+        $this->assertSame('Example.com', NavigationItem::create('www.example.com/')->getLabel());
+        $this->assertSame('Example.com', NavigationItem::create('https://www.example.com')->getLabel());
+        $this->assertSame('Example.com', NavigationItem::create('https://www.example.com/')->getLabel());
+    }
 
-        foreach ($links as $link) {
-            $this->assertSame($link, NavigationItem::create($link)->getLabel());
-        }
+    public function testCreateWithNullLabelForLinksWithPages()
+    {
+        $this->assertSame('Foo', NavigationItem::create('https://example.com/foo')->getLabel());
+        $this->assertSame('Foo', NavigationItem::create('https://example.com/foo/')->getLabel());
+        $this->assertSame('Bar', NavigationItem::create('https://example.com/foo/bar')->getLabel());
+        $this->assertSame('Bar', NavigationItem::create('https://example.com/foo/bar/')->getLabel());
+    }
+
+    public function testCreateWithNullLabelForLinkWithPageWithHtmlExtension()
+    {
+        $this->assertSame('Bar', NavigationItem::create('https://example.com/foo/bar.html')->getLabel());
+    }
+
+    public function testCreateWithNullLabelForLinkWithPageWithOtherExtension()
+    {
+        $this->assertSame('Bar.png', NavigationItem::create('https://example.com/foo/bar.png')->getLabel());
     }
 
     public function testPassingRouteKeyToStaticConstructorUsesRouteInstance()

From 8f2bd586a87f3e29a2c24978d53996b50d7655bd Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 17:51:37 +0100
Subject: [PATCH 1273/1422] Revert "Dynamically generate titles from input
 links"

This reverts commit ea50e0f38245ac9ce553cc5851f5cdcc6e85bc2f. See https://github.com/hydephp/develop/pull/1638/files#r1536861523

Revert "Extract helper method"

This reverts commit 99ef0ed92c2c3b3dfbdcfcf678fe30108e447108.
---
 .../Features/Navigation/NavigationItem.php    | 12 +----
 .../tests/Unit/NavigationItemTest.php         | 48 ++++++-------------
 2 files changed, 16 insertions(+), 44 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index ed4132e3bc6..22ac69f8e28 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -68,7 +68,7 @@ public static function create(Route|string $destination, ?string $label = null,
             $group ??= $destination->getPage()->navigationMenuGroup();
         }
 
-        return new static($destination, $label ?? static::makeTitleFromUrl($destination), $priority ?? NavigationMenu::DEFAULT, $group);
+        return new static($destination, $label ?? $destination, $priority ?? NavigationMenu::DEFAULT, $group);
     }
 
     /**
@@ -137,14 +137,4 @@ public static function normalizeGroupKey(?string $group): ?string
     {
         return $group ? Str::slug($group) : null;
     }
-
-    /** @experimental This feature may be removed before release, and the label will just fall back to the input $url */
-    protected static function makeTitleFromUrl(string $url): string
-    {
-        $basename = basename($url);
-        $basename = Str::replaceFirst('www.', '', $basename);
-        $basename = Str::replaceLast('.html', '', $basename);
-
-        return Hyde::makeTitle($basename);
-    }
 }
diff --git a/packages/framework/tests/Unit/NavigationItemTest.php b/packages/framework/tests/Unit/NavigationItemTest.php
index cee578da044..4b7fa9cff2a 100644
--- a/packages/framework/tests/Unit/NavigationItemTest.php
+++ b/packages/framework/tests/Unit/NavigationItemTest.php
@@ -215,40 +215,22 @@ public function testCreateWithNullLabelForRoute()
 
     public function testCreateWithNullLabel()
     {
-        $this->assertSame('Foo', NavigationItem::create('foo')->getLabel());
-    }
-
-    public function testCreateWithNullLabelForLinks()
-    {
-        $this->assertSame('Example.com', NavigationItem::create('example.com')->getLabel());
-        $this->assertSame('Example.com', NavigationItem::create('example.com/')->getLabel());
-        $this->assertSame('Example.com', NavigationItem::create('https://example.com/')->getLabel());
-    }
-
-    public function testCreateWithNullLabelForLinksWithSubdomain()
-    {
-        $this->assertSame('Example.com', NavigationItem::create('www.example.com')->getLabel());
-        $this->assertSame('Example.com', NavigationItem::create('www.example.com/')->getLabel());
-        $this->assertSame('Example.com', NavigationItem::create('https://www.example.com')->getLabel());
-        $this->assertSame('Example.com', NavigationItem::create('https://www.example.com/')->getLabel());
-    }
-
-    public function testCreateWithNullLabelForLinksWithPages()
-    {
-        $this->assertSame('Foo', NavigationItem::create('https://example.com/foo')->getLabel());
-        $this->assertSame('Foo', NavigationItem::create('https://example.com/foo/')->getLabel());
-        $this->assertSame('Bar', NavigationItem::create('https://example.com/foo/bar')->getLabel());
-        $this->assertSame('Bar', NavigationItem::create('https://example.com/foo/bar/')->getLabel());
-    }
-
-    public function testCreateWithNullLabelForLinkWithPageWithHtmlExtension()
-    {
-        $this->assertSame('Bar', NavigationItem::create('https://example.com/foo/bar.html')->getLabel());
-    }
+        $this->assertSame('foo', NavigationItem::create('foo')->getLabel());
+
+        $links = [
+            'www.example.com',
+            'https://example.com',
+            'https://example.com/',
+            'https://example.com/foo',
+            'https://example.com/foo/',
+            'https://example.com/foo/bar',
+            'https://example.com/foo/bar.html',
+            'https://example.com/foo/bar.png',
+        ];
 
-    public function testCreateWithNullLabelForLinkWithPageWithOtherExtension()
-    {
-        $this->assertSame('Bar.png', NavigationItem::create('https://example.com/foo/bar.png')->getLabel());
+        foreach ($links as $link) {
+            $this->assertSame($link, NavigationItem::create($link)->getLabel());
+        }
     }
 
     public function testPassingRouteKeyToStaticConstructorUsesRouteInstance()

From 71c068ce5419a50393782d21e08f1565c8463537 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 17:56:39 +0100
Subject: [PATCH 1274/1422] Update todo abstract

---
 .../src/Framework/Features/Navigation/NavigationItem.php        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index 22ac69f8e28..f56f370b831 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -27,7 +27,7 @@ class NavigationItem implements NavigationElement, Stringable
     protected string $label;
     protected int $priority;
 
-    // TODO: Do we actually need this? We should just care if it's physically stored in a group.
+    // TODO: Do we actually need this? We should just care if it's physically stored in a group. Adding the group key here doesn't magically make it appear in the group, it needs to be added to the group's items array, so why should we care about the key here?
     protected ?string $group = null;
 
     /**

From cd791af70839ef6bbfdee1c347dd43e356319765 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 17:57:03 +0100
Subject: [PATCH 1275/1422] Convert todo into deprecation

---
 .../src/Framework/Features/Navigation/NavigationItem.php        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index f56f370b831..345576b38b3 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -27,7 +27,7 @@ class NavigationItem implements NavigationElement, Stringable
     protected string $label;
     protected int $priority;
 
-    // TODO: Do we actually need this? We should just care if it's physically stored in a group. Adding the group key here doesn't magically make it appear in the group, it needs to be added to the group's items array, so why should we care about the key here?
+    /** @deprecated Do we actually need this? We should just care if it's physically stored in a group. Adding the group key here doesn't magically make it appear in the group, it needs to be added to the group's items array, so why should we care about the key here? */
     protected ?string $group = null;
 
     /**

From f45eb19814c9b6f972dbad01344104f7ddf4b279 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 17:58:10 +0100
Subject: [PATCH 1276/1422] Deprecate accessor for deprecated property

---
 .../src/Framework/Features/Navigation/NavigationItem.php        | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index 345576b38b3..694db93176d 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -106,6 +106,8 @@ public function getPriority(): int
     /**
      * Get the group identifier key of the navigation item, if any.
      *
+     * @deprecated as the property is deprecated.
+     *
      *  For sidebars this is the category key, for navigation menus this is the dropdown key.
      *
      *  When using automatic subdirectory based groups, the subdirectory name is the group key.

From 48d945d6fd1a2674eab7826a86482a5d621ac858 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 18:01:00 +0100
Subject: [PATCH 1277/1422] Deprecate the group paramters

---
 .../src/Framework/Features/Navigation/NavigationItem.php     | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index 694db93176d..764a758a62f 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -5,6 +5,7 @@
 namespace Hyde\Framework\Features\Navigation;
 
 use Hyde\Pages\Concerns\HydePage;
+use JetBrains\PhpStorm\Deprecated;
 use Hyde\Foundation\Facades\Routes;
 use Hyde\Hyde;
 use Hyde\Support\Models\Route;
@@ -38,7 +39,7 @@ class NavigationItem implements NavigationElement, Stringable
      * @param  int  $priority  The priority to determine the order of the navigation item.
      * @param  string|null  $group  The dropdown/group key of the navigation item, if any.
      */
-    public function __construct(Route|string $destination, string $label, int $priority = NavigationMenu::DEFAULT, ?string $group = null)
+    public function __construct(Route|string $destination, string $label, int $priority = NavigationMenu::DEFAULT, #[Deprecated] ?string $group = null)
     {
         $this->destination = $destination;
 
@@ -56,7 +57,7 @@ public function __construct(Route|string $destination, string $label, int $prior
      * @param  string|null  $label  Leave blank to use the label of the route's corresponding page, if there is one tied to the route.
      * @param  string|null  $group  Leave blank to use the group of the route's corresponding page, if there is one tied to the route.
      */
-    public static function create(Route|string $destination, ?string $label = null, ?int $priority = null, ?string $group = null): static
+    public static function create(Route|string $destination, ?string $label = null, ?int $priority = null, #[Deprecated] ?string $group = null): static
     {
         if (is_string($destination) && Routes::has($destination)) {
             $destination = Routes::get($destination);

From 51f562023bd8239b68cb4814b267a2c259622c47 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 18:06:03 +0100
Subject: [PATCH 1278/1422] Remove tests for deprecated group accessor

May be radical at this point, but I want to remove usages so I can see better how this is used
---
 .../AutomaticNavigationConfigurationsTest.php |  8 ++---
 .../tests/Unit/NavigationGroupTest.php        | 20 -----------
 .../tests/Unit/NavigationItemTest.php         | 34 -------------------
 3 files changed, 3 insertions(+), 59 deletions(-)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 4277e67ef84..0f5404ee4ef 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -1284,21 +1284,19 @@ protected function sidebar(?array $withPages = null): AssertableNavigationMenu
 class TestNavigationItem
 {
     public readonly string $label;
-    public readonly ?string $group;
     public readonly int $priority;
     public readonly array $children;
 
-    public function __construct(string $label, ?string $group, int $priority, array $children)
+    public function __construct(string $label, int $priority, array $children)
     {
         $this->label = $label;
-        $this->group = $group;
         $this->priority = $priority;
         $this->children = collect($children)->map(fn (NavigationItem|NavigationGroup $child) => $child->getLabel())->toArray();
     }
 
     public static function properties(): array
     {
-        return ['label', 'group', 'priority', 'children'];
+        return ['label', 'priority', 'children'];
     }
 }
 
@@ -1320,7 +1318,7 @@ public function __construct(TestCase $test, $sidebar = false)
     public function state(): array
     {
         return $this->items->map(function (NavigationItem|NavigationGroup $item): TestNavigationItem {
-            return new TestNavigationItem($item->getLabel(), $item->getGroupKey(), $item->getPriority(), $item instanceof NavigationGroup ? $item->getItems() : []);
+            return new TestNavigationItem($item->getLabel(), $item->getPriority(), $item instanceof NavigationGroup ? $item->getItems() : []);
         })->toArray();
     }
 
diff --git a/packages/framework/tests/Unit/NavigationGroupTest.php b/packages/framework/tests/Unit/NavigationGroupTest.php
index 9b51ed0c122..2baaf30d2fc 100644
--- a/packages/framework/tests/Unit/NavigationGroupTest.php
+++ b/packages/framework/tests/Unit/NavigationGroupTest.php
@@ -114,26 +114,6 @@ public function testAddChildrenMethodReturnsSelf()
         $this->assertSame($group, $group->add([]));
     }
 
-    public function testAddingAnItemWithAGroupKeyKeepsTheSetGroupKey()
-    {
-        $group = new NavigationGroup('Foo');
-        $child = new NavigationItem(new Route(new MarkdownPage()), 'Child', group: 'bar');
-
-        $group->add($child);
-
-        $this->assertSame('bar', $child->getGroupKey());
-    }
-
-    public function testAddingAnItemWithNoGroupKeyDoesNotModifyGroupIdentifier()
-    {
-        $group = new NavigationGroup('Foo');
-        $child = new NavigationItem(new Route(new MarkdownPage()), 'Bar');
-
-        $group->add($child);
-
-        $this->assertNull($child->getGroupKey());
-    }
-
     public function testGetPriorityUsesDefaultPriority()
     {
         $this->assertSame(999, (new NavigationGroup('Foo'))->getPriority());
diff --git a/packages/framework/tests/Unit/NavigationItemTest.php b/packages/framework/tests/Unit/NavigationItemTest.php
index 4b7fa9cff2a..bb35faac14a 100644
--- a/packages/framework/tests/Unit/NavigationItemTest.php
+++ b/packages/framework/tests/Unit/NavigationItemTest.php
@@ -113,12 +113,6 @@ public function testGetPriority()
         $this->assertSame(500, $NavigationItem->getPriority());
     }
 
-    public function testGetGroup()
-    {
-        $NavigationItem = new NavigationItem(new Route(new InMemoryPage('foo')), 'Page', 500);
-        $this->assertNull($NavigationItem->getGroupKey());
-    }
-
     public function testFromRoute()
     {
         $page = new MarkdownPage();
@@ -162,7 +156,6 @@ public function testCreate()
         $this->assertEquals($route, $item->getPage()->getRoute());
         $this->assertSame('404.html', $item->getLink());
         $this->assertSame('404.html', (string) $item);
-        $this->assertNull($item->getGroupKey());
     }
 
     public function testForIndexRoute()
@@ -176,7 +169,6 @@ public function testForIndexRoute()
         $this->assertEquals($route, $item->getPage()->getRoute());
         $this->assertSame('index.html', $item->getLink());
         $this->assertSame('index.html', (string) $item);
-        $this->assertNull($item->getGroupKey());
     }
 
     public function testCreateWithLabels()
@@ -315,32 +307,6 @@ public function testIsCurrentWithLink()
         $this->assertFalse(NavigationItem::create('https://example.com', 'bar')->isActive());
     }
 
-    public function testGetGroupWithNoGroup()
-    {
-        $this->assertNull((new NavigationItem(new Route(new MarkdownPage()), 'Test', 500))->getGroupKey());
-    }
-
-    public function testGetGroupWithGroup()
-    {
-        $this->assertSame('foo', (new NavigationItem(new Route(new MarkdownPage()), 'Test', 500, 'foo'))->getGroupKey());
-    }
-
-    public function testGetGroupFromRouteWithGroup()
-    {
-        $this->assertSame('foo', NavigationItem::create(new Route(new MarkdownPage(matter: ['navigation.group' => 'foo'])))->getGroupKey());
-    }
-
-    public function testGetGroupCreateWithGroup()
-    {
-        $this->assertSame('foo', NavigationItem::create(new Route(new MarkdownPage(matter: ['navigation.group' => 'foo'])), 'foo')->getGroupKey());
-    }
-
-    public function testGroupKeysAreNormalized()
-    {
-        $item = new NavigationItem(new Route(new MarkdownPage()), 'Test', 500, 'Foo Bar');
-        $this->assertSame('foo-bar', $item->getGroupKey());
-    }
-
     public function testNormalizeGroupKeyCreatesSlugs()
     {
         $this->assertSame('foo-bar', NavigationItem::normalizeGroupKey('Foo Bar'));

From 9a893d11b798ca91f2ee568cca80b2500e8c07af Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 18:13:14 +0100
Subject: [PATCH 1279/1422] Replace ternary expression with if/else block

---
 .../Features/Navigation/NavigationMenuGenerator.php         | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
index 0c2b05cb223..deb58efc204 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
@@ -135,7 +135,11 @@ protected function addRouteToGroup(Route $route): void
     {
         $item = NavigationItem::create($route);
 
-        $groupName = $this->generatesSidebar ? ($item->getGroupKey() ?? 'Other') : $item->getGroupKey();
+        if ($this->generatesSidebar) {
+            $groupName = ($item->getGroupKey() ?? 'Other');
+        } else {
+            $groupName = $item->getGroupKey();
+        }
 
         $groupItem = $this->getOrCreateGroupItem($groupName);
 

From 769744fea76e0690cabe87f98dc2ba6ace3aebf7 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 18:14:15 +0100
Subject: [PATCH 1280/1422] Introduce local variable

---
 .../Features/Navigation/NavigationMenuGenerator.php          | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
index deb58efc204..1f8d17d549a 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
@@ -135,10 +135,11 @@ protected function addRouteToGroup(Route $route): void
     {
         $item = NavigationItem::create($route);
 
+        $groupKey = $item->getGroupKey();
         if ($this->generatesSidebar) {
-            $groupName = ($item->getGroupKey() ?? 'Other');
+            $groupName = ($groupKey ?? 'Other');
         } else {
-            $groupName = $item->getGroupKey();
+            $groupName = $groupKey;
         }
 
         $groupItem = $this->getOrCreateGroupItem($groupName);

From 2fafd0f7f419dc904edd293e1fe349c20eea24ad Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 18:16:51 +0100
Subject: [PATCH 1281/1422] Get group key through page instance

---
 .../Framework/Features/Navigation/NavigationMenuGenerator.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
index 1f8d17d549a..7790152efc2 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
@@ -135,7 +135,7 @@ protected function addRouteToGroup(Route $route): void
     {
         $item = NavigationItem::create($route);
 
-        $groupKey = $item->getGroupKey();
+        $groupKey = $item->getPage()->navigationMenuGroup();
         if ($this->generatesSidebar) {
             $groupName = ($groupKey ?? 'Other');
         } else {

From ba03fb8573ca3b5339365af05cc3ee8eeaa3fe0b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 18:24:04 +0100
Subject: [PATCH 1282/1422] Replace conditional with ternary expression

---
 .../Features/Navigation/NavigationMenuGenerator.php         | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
index 7790152efc2..c0942e77bfa 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
@@ -136,11 +136,7 @@ protected function addRouteToGroup(Route $route): void
         $item = NavigationItem::create($route);
 
         $groupKey = $item->getPage()->navigationMenuGroup();
-        if ($this->generatesSidebar) {
-            $groupName = ($groupKey ?? 'Other');
-        } else {
-            $groupName = $groupKey;
-        }
+        $groupName = $this->generatesSidebar ? $groupKey ?? 'Other' : $groupKey;
 
         $groupItem = $this->getOrCreateGroupItem($groupName);
 

From 252764819fd6ee759ca8acad63072276936fa6aa Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 18:24:31 +0100
Subject: [PATCH 1283/1422] Add clarifying parentheses

---
 .../Framework/Features/Navigation/NavigationMenuGenerator.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
index c0942e77bfa..2d79194d299 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
@@ -136,7 +136,7 @@ protected function addRouteToGroup(Route $route): void
         $item = NavigationItem::create($route);
 
         $groupKey = $item->getPage()->navigationMenuGroup();
-        $groupName = $this->generatesSidebar ? $groupKey ?? 'Other' : $groupKey;
+        $groupName = $this->generatesSidebar ? ($groupKey ?? 'Other') : $groupKey;
 
         $groupItem = $this->getOrCreateGroupItem($groupName);
 

From 0eda65fe12c676fd405a9fe1dd8ba187ead848ce Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 18:26:09 +0100
Subject: [PATCH 1284/1422] Use helper method with essentially the same
 semantics

---
 .../Framework/Features/Navigation/NavigationMenuGenerator.php  | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
index 2d79194d299..d43c0638185 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
@@ -6,7 +6,6 @@
 
 use Hyde\Hyde;
 use Hyde\Facades\Config;
-use Illuminate\Support\Str;
 use Hyde\Support\Models\Route;
 use Hyde\Pages\DocumentationPage;
 use Illuminate\Support\Collection;
@@ -149,7 +148,7 @@ protected function addRouteToGroup(Route $route): void
 
     protected function getOrCreateGroupItem(string $groupName): NavigationGroup
     {
-        $groupKey = Str::slug($groupName);
+        $groupKey = NavigationItem::normalizeGroupKey($groupName);
         $group = $this->items->get($groupKey);
 
         if ($group instanceof NavigationGroup) {

From 13435431e8e9e3795a21b242477795b2f70a394a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 18:27:25 +0100
Subject: [PATCH 1285/1422] Get group through the connected page

---
 .../src/Framework/Features/Navigation/NavigationItem.php        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index 764a758a62f..7b36daf841e 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -116,7 +116,7 @@ public function getPriority(): int
      */
     public function getGroupKey(): ?string
     {
-        return $this->group;
+        return $this->getPage()?->navigationMenuGroup();
     }
 
     /**

From d362701cac27054d93e0ab84fefff3f41ce5fefd Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 18:45:54 +0100
Subject: [PATCH 1286/1422] Remove the group property

---
 .../src/Framework/Features/Navigation/NavigationItem.php       | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index 7b36daf841e..105e432205d 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -28,9 +28,6 @@ class NavigationItem implements NavigationElement, Stringable
     protected string $label;
     protected int $priority;
 
-    /** @deprecated Do we actually need this? We should just care if it's physically stored in a group. Adding the group key here doesn't magically make it appear in the group, it needs to be added to the group's items array, so why should we care about the key here? */
-    protected ?string $group = null;
-
     /**
      * Create a new navigation menu item with your own properties.
      *

From 35c2cd828559191a8eedbabcdeb788f7bd7fcb7a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 18:48:11 +0100
Subject: [PATCH 1287/1422] Remove group parameter documentation

---
 .../src/Framework/Features/Navigation/NavigationItem.php        | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index 105e432205d..49c5205a3c3 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -34,7 +34,6 @@ class NavigationItem implements NavigationElement, Stringable
      * @param  \Hyde\Support\Models\Route|string  $destination  Route instance, route key, or external URI.
      * @param  string  $label  The label of the navigation item.
      * @param  int  $priority  The priority to determine the order of the navigation item.
-     * @param  string|null  $group  The dropdown/group key of the navigation item, if any.
      */
     public function __construct(Route|string $destination, string $label, int $priority = NavigationMenu::DEFAULT, #[Deprecated] ?string $group = null)
     {
@@ -52,7 +51,6 @@ public function __construct(Route|string $destination, string $label, int $prior
      * @param  \Hyde\Support\Models\Route|string<\Hyde\Support\Models\RouteKey>|string  $destination  Route instance or route key, or external URI.
      * @param  int|null  $priority  Leave blank to use the priority of the route's corresponding page, if there is one tied to the route.
      * @param  string|null  $label  Leave blank to use the label of the route's corresponding page, if there is one tied to the route.
-     * @param  string|null  $group  Leave blank to use the group of the route's corresponding page, if there is one tied to the route.
      */
     public static function create(Route|string $destination, ?string $label = null, ?int $priority = null, #[Deprecated] ?string $group = null): static
     {

From fbb7b3bbf8d0b537f50ba6fd0631f46ecd16719d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 18:48:20 +0100
Subject: [PATCH 1288/1422] No longer construct the group

---
 .../src/Framework/Features/Navigation/NavigationItem.php        | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index 49c5205a3c3..f1d4940a78f 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -41,8 +41,6 @@ public function __construct(Route|string $destination, string $label, int $prior
 
         $this->label = $label;
         $this->priority = $priority;
-
-        $this->group = static::normalizeGroupKey($group);
     }
 
     /**

From daef8281436555f355e873f051477e37261c8f20 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 18:49:30 +0100
Subject: [PATCH 1289/1422] Remove the group parameter from item constructor

---
 .../src/Framework/Features/Navigation/NavigationItem.php      | 4 ++--
 packages/framework/tests/Unit/NavigationItemTest.php          | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index f1d4940a78f..7a1c0d0a10e 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -35,7 +35,7 @@ class NavigationItem implements NavigationElement, Stringable
      * @param  string  $label  The label of the navigation item.
      * @param  int  $priority  The priority to determine the order of the navigation item.
      */
-    public function __construct(Route|string $destination, string $label, int $priority = NavigationMenu::DEFAULT, #[Deprecated] ?string $group = null)
+    public function __construct(Route|string $destination, string $label, int $priority = NavigationMenu::DEFAULT)
     {
         $this->destination = $destination;
 
@@ -62,7 +62,7 @@ public static function create(Route|string $destination, ?string $label = null,
             $group ??= $destination->getPage()->navigationMenuGroup();
         }
 
-        return new static($destination, $label ?? $destination, $priority ?? NavigationMenu::DEFAULT, $group);
+        return new static($destination, $label ?? $destination, $priority ?? NavigationMenu::DEFAULT);
     }
 
     /**
diff --git a/packages/framework/tests/Unit/NavigationItemTest.php b/packages/framework/tests/Unit/NavigationItemTest.php
index bb35faac14a..b39e7f83506 100644
--- a/packages/framework/tests/Unit/NavigationItemTest.php
+++ b/packages/framework/tests/Unit/NavigationItemTest.php
@@ -44,7 +44,6 @@ public function testConstruct()
         $this->assertInstanceOf(NavigationItem::class, new NavigationItem('foo', 'Test'));
         $this->assertInstanceOf(NavigationItem::class, new NavigationItem(new Route(new MarkdownPage()), 'Test'));
         $this->assertInstanceOf(NavigationItem::class, new NavigationItem(new Route(new MarkdownPage()), 'Test', 500));
-        $this->assertInstanceOf(NavigationItem::class, new NavigationItem(new Route(new MarkdownPage()), 'Test', 500, 'foo'));
     }
 
     public function testIsInstanceOfNavigationElement()

From 91d9cac1010d5c92963561860884fbeb1448a0f2 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 18:51:18 +0100
Subject: [PATCH 1290/1422] Remove coalesce assignment for the removed group

---
 .../src/Framework/Features/Navigation/NavigationItem.php         | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index 7a1c0d0a10e..bcf35a9b304 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -59,7 +59,6 @@ public static function create(Route|string $destination, ?string $label = null,
         if ($destination instanceof Route) {
             $label ??= $destination->getPage()->navigationMenuLabel();
             $priority ??= $destination->getPage()->navigationMenuPriority();
-            $group ??= $destination->getPage()->navigationMenuGroup();
         }
 
         return new static($destination, $label ?? $destination, $priority ?? NavigationMenu::DEFAULT);

From 8cad7f21877770ccc486e9f540813ad57cbceb7d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 18:52:52 +0100
Subject: [PATCH 1291/1422] Remove the group parameter from item create method

---
 .../src/Framework/Features/Navigation/NavigationItem.php        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index bcf35a9b304..caaa73d74e2 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -50,7 +50,7 @@ public function __construct(Route|string $destination, string $label, int $prior
      * @param  int|null  $priority  Leave blank to use the priority of the route's corresponding page, if there is one tied to the route.
      * @param  string|null  $label  Leave blank to use the label of the route's corresponding page, if there is one tied to the route.
      */
-    public static function create(Route|string $destination, ?string $label = null, ?int $priority = null, #[Deprecated] ?string $group = null): static
+    public static function create(Route|string $destination, ?string $label = null, ?int $priority = null): static
     {
         if (is_string($destination) && Routes::has($destination)) {
             $destination = Routes::get($destination);

From 8c37e9443c5d894887c7d1c13f297e32347a4edd Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 18:53:39 +0100
Subject: [PATCH 1292/1422] Fix wrong order of parameter annotations

---
 .../src/Framework/Features/Navigation/NavigationItem.php        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index caaa73d74e2..f19a63ee96c 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -47,8 +47,8 @@ public function __construct(Route|string $destination, string $label, int $prior
      * Create a new navigation menu item, automatically filling in the properties from a Route instance if provided.
      *
      * @param  \Hyde\Support\Models\Route|string<\Hyde\Support\Models\RouteKey>|string  $destination  Route instance or route key, or external URI.
-     * @param  int|null  $priority  Leave blank to use the priority of the route's corresponding page, if there is one tied to the route.
      * @param  string|null  $label  Leave blank to use the label of the route's corresponding page, if there is one tied to the route.
+     * @param  int|null  $priority  Leave blank to use the priority of the route's corresponding page, if there is one tied to the route.
      */
     public static function create(Route|string $destination, ?string $label = null, ?int $priority = null): static
     {

From 13298c4c5b90d0190565f51623790d774de36403 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 18:53:43 +0100
Subject: [PATCH 1293/1422] Introduce local variable

---
 .../tests/Feature/Services/DocumentationSidebarTest.php        | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
index 11b578cd405..9c3601ab46d 100644
--- a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
+++ b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
@@ -159,7 +159,8 @@ public function testSidebarPrioritiesCanBeSetInBothFrontMatterAndConfig()
     public function testGroupCanBeSetInFrontMatter()
     {
         $this->makePage('foo', ['navigation.group' => 'bar']);
-        $this->assertEquals('bar', collect(NavigationMenuGenerator::handle(DocumentationSidebar::class)->getItems()->first()->getItems())->first()->getGroupKey());
+        $firstItem = collect(NavigationMenuGenerator::handle(DocumentationSidebar::class)->getItems()->first()->getItems())->first();
+        $this->assertEquals('bar', $firstItem->getGroupKey());
     }
 
     public function testHasGroupsReturnsFalseWhenThereAreNoGroups()

From 81f2e03b74e046571ccaf5572d2f4acd64620428 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 18:54:36 +0100
Subject: [PATCH 1294/1422] Add type annotation

---
 .../tests/Feature/Services/DocumentationSidebarTest.php          | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
index 9c3601ab46d..0dd3ae74393 100644
--- a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
+++ b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
@@ -159,6 +159,7 @@ public function testSidebarPrioritiesCanBeSetInBothFrontMatterAndConfig()
     public function testGroupCanBeSetInFrontMatter()
     {
         $this->makePage('foo', ['navigation.group' => 'bar']);
+        /** @var NavigationItem $firstItem */
         $firstItem = collect(NavigationMenuGenerator::handle(DocumentationSidebar::class)->getItems()->first()->getItems())->first();
         $this->assertEquals('bar', $firstItem->getGroupKey());
     }

From 8ecc783d6bbab4edc68200f3092d10df6ac75f20 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 18:55:13 +0100
Subject: [PATCH 1295/1422] Simplify local variable name

---
 .../tests/Feature/Services/DocumentationSidebarTest.php     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
index 0dd3ae74393..f622e08dcb5 100644
--- a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
+++ b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
@@ -159,9 +159,9 @@ public function testSidebarPrioritiesCanBeSetInBothFrontMatterAndConfig()
     public function testGroupCanBeSetInFrontMatter()
     {
         $this->makePage('foo', ['navigation.group' => 'bar']);
-        /** @var NavigationItem $firstItem */
-        $firstItem = collect(NavigationMenuGenerator::handle(DocumentationSidebar::class)->getItems()->first()->getItems())->first();
-        $this->assertEquals('bar', $firstItem->getGroupKey());
+        /** @var NavigationItem $item */
+        $item = collect(NavigationMenuGenerator::handle(DocumentationSidebar::class)->getItems()->first()->getItems())->first();
+        $this->assertEquals('bar', $item->getGroupKey());
     }
 
     public function testHasGroupsReturnsFalseWhenThereAreNoGroups()

From 4f3ba21408678fefe5782bb63b9c2776d35aaf66 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 18:55:26 +0100
Subject: [PATCH 1296/1422] Add some spacing

---
 .../tests/Feature/Services/DocumentationSidebarTest.php          | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
index f622e08dcb5..6a7ac43bd42 100644
--- a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
+++ b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
@@ -159,6 +159,7 @@ public function testSidebarPrioritiesCanBeSetInBothFrontMatterAndConfig()
     public function testGroupCanBeSetInFrontMatter()
     {
         $this->makePage('foo', ['navigation.group' => 'bar']);
+
         /** @var NavigationItem $item */
         $item = collect(NavigationMenuGenerator::handle(DocumentationSidebar::class)->getItems()->first()->getItems())->first();
         $this->assertEquals('bar', $item->getGroupKey());

From be0820e1ca8682df3f0e10e988191f3255eaafc9 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 18:55:51 +0100
Subject: [PATCH 1297/1422] Use assert same

---
 .../tests/Feature/Services/DocumentationSidebarTest.php         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
index 6a7ac43bd42..562fb83fd4a 100644
--- a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
+++ b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
@@ -162,7 +162,7 @@ public function testGroupCanBeSetInFrontMatter()
 
         /** @var NavigationItem $item */
         $item = collect(NavigationMenuGenerator::handle(DocumentationSidebar::class)->getItems()->first()->getItems())->first();
-        $this->assertEquals('bar', $item->getGroupKey());
+        $this->assertSame('bar', $item->getGroupKey());
     }
 
     public function testHasGroupsReturnsFalseWhenThereAreNoGroups()

From 80f9a5c1d06bce0b7a5593dc92bedf1614a83fa4 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 19:00:08 +0100
Subject: [PATCH 1298/1422] Inline method usage

---
 .../tests/Feature/Services/DocumentationSidebarTest.php         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
index 562fb83fd4a..3fe5722e880 100644
--- a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
+++ b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
@@ -162,7 +162,7 @@ public function testGroupCanBeSetInFrontMatter()
 
         /** @var NavigationItem $item */
         $item = collect(NavigationMenuGenerator::handle(DocumentationSidebar::class)->getItems()->first()->getItems())->first();
-        $this->assertSame('bar', $item->getGroupKey());
+        $this->assertSame('bar', $item->getPage()->navigationMenuGroup());
     }
 
     public function testHasGroupsReturnsFalseWhenThereAreNoGroups()

From 660edfccdedfb524b6889b24039e7bea9885cbbf Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 19:00:27 +0100
Subject: [PATCH 1299/1422] Extract testing helper method for data access

---
 .../Services/DocumentationSidebarTest.php     | 31 +++++++++++--------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
index 3fe5722e880..a1971486787 100644
--- a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
+++ b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
@@ -225,7 +225,7 @@ public function testIsGroupActiveReturnsFalseWhenSuppliedGroupIsNotActive()
     {
         Render::setPage(new DocumentationPage(matter: ['navigation.group' => 'foo']));
         $mainNavigationMenu = NavigationMenuGenerator::handle(DocumentationSidebar::class);
-        $this->assertFalse('bar' === $mainNavigationMenu->getActiveGroup()?->getGroupKey());
+        $this->assertFalse('bar' === $this->getGroupKey($mainNavigationMenu));
     }
 
     public function testIsGroupActiveReturnsTrueWhenSuppliedGroupIsActive()
@@ -233,7 +233,7 @@ public function testIsGroupActiveReturnsTrueWhenSuppliedGroupIsActive()
         $this->makePage('foo', ['navigation.group' => 'foo']);
         Render::setPage(new DocumentationPage(matter: ['navigation.group' => 'foo']));
         $mainNavigationMenu = NavigationMenuGenerator::handle(DocumentationSidebar::class);
-        $this->assertTrue('foo' === $mainNavigationMenu->getActiveGroup()?->getGroupKey());
+        $this->assertTrue('foo' === $this->getGroupKey($mainNavigationMenu));
     }
 
     public function testIsGroupActiveReturnsTrueForDifferingCasing()
@@ -241,7 +241,7 @@ public function testIsGroupActiveReturnsTrueForDifferingCasing()
         $this->makePage('foo', ['navigation.group' => 'Foo Bar']);
         Render::setPage(new DocumentationPage(matter: ['navigation.group' => 'Foo Bar']));
         $mainNavigationMenu = NavigationMenuGenerator::handle(DocumentationSidebar::class);
-        $this->assertTrue('foo-bar' === $mainNavigationMenu->getActiveGroup()?->getGroupKey());
+        $this->assertTrue('foo-bar' === $this->getGroupKey($mainNavigationMenu));
     }
 
     public function testIsGroupActiveReturnsTrueFirstGroupOfIndexPage()
@@ -253,11 +253,11 @@ public function testIsGroupActiveReturnsTrueFirstGroupOfIndexPage()
 
         Render::setPage(DocumentationPage::get('index'));
         $mainNavigationMenu2 = NavigationMenuGenerator::handle(DocumentationSidebar::class);
-        $this->assertTrue('bar' === $mainNavigationMenu2->getActiveGroup()?->getGroupKey());
+        $this->assertTrue('bar' === $this->getGroupKey($mainNavigationMenu2));
         $mainNavigationMenu1 = NavigationMenuGenerator::handle(DocumentationSidebar::class);
-        $this->assertFalse('foo' === $mainNavigationMenu1->getActiveGroup()?->getGroupKey());
+        $this->assertFalse('foo' === $this->getGroupKey($mainNavigationMenu1));
         $mainNavigationMenu = NavigationMenuGenerator::handle(DocumentationSidebar::class);
-        $this->assertFalse('baz' === $mainNavigationMenu->getActiveGroup()?->getGroupKey());
+        $this->assertFalse('baz' === $this->getGroupKey($mainNavigationMenu));
     }
 
     public function testIsGroupActiveReturnsTrueFirstSortedGroupOfIndexPage()
@@ -269,11 +269,11 @@ public function testIsGroupActiveReturnsTrueFirstSortedGroupOfIndexPage()
 
         Render::setPage(DocumentationPage::get('index'));
         $mainNavigationMenu2 = NavigationMenuGenerator::handle(DocumentationSidebar::class);
-        $this->assertTrue('foo' === $mainNavigationMenu2->getActiveGroup()?->getGroupKey());
+        $this->assertTrue('foo' === $this->getGroupKey($mainNavigationMenu2));
         $mainNavigationMenu1 = NavigationMenuGenerator::handle(DocumentationSidebar::class);
-        $this->assertFalse('bar' === $mainNavigationMenu1->getActiveGroup()?->getGroupKey());
+        $this->assertFalse('bar' === $this->getGroupKey($mainNavigationMenu1));
         $mainNavigationMenu = NavigationMenuGenerator::handle(DocumentationSidebar::class);
-        $this->assertFalse('baz' === $mainNavigationMenu->getActiveGroup()?->getGroupKey());
+        $this->assertFalse('baz' === $this->getGroupKey($mainNavigationMenu));
     }
 
     public function testAutomaticIndexPageGroupExpansionRespectsCustomNavigationMenuSettings()
@@ -285,11 +285,11 @@ public function testAutomaticIndexPageGroupExpansionRespectsCustomNavigationMenu
 
         Render::setPage(DocumentationPage::get('index'));
         $mainNavigationMenu2 = NavigationMenuGenerator::handle(DocumentationSidebar::class);
-        $this->assertFalse('foo' === $mainNavigationMenu2->getActiveGroup()?->getGroupKey());
+        $this->assertFalse('foo' === $this->getGroupKey($mainNavigationMenu2));
         $mainNavigationMenu1 = NavigationMenuGenerator::handle(DocumentationSidebar::class);
-        $this->assertFalse('bar' === $mainNavigationMenu1->getActiveGroup()?->getGroupKey());
+        $this->assertFalse('bar' === $this->getGroupKey($mainNavigationMenu1));
         $mainNavigationMenu = NavigationMenuGenerator::handle(DocumentationSidebar::class);
-        $this->assertTrue('baz' === $mainNavigationMenu->getActiveGroup()?->getGroupKey());
+        $this->assertTrue('baz' === $this->getGroupKey($mainNavigationMenu));
     }
 
     public function testCanHaveMultipleGroupedPagesWithTheSameNameLabels()
@@ -338,7 +338,7 @@ public function testIsGroupActiveForIndexPageWithNoGroups()
 
         Render::setPage(DocumentationPage::get('index'));
         $mainNavigationMenu = NavigationMenuGenerator::handle(DocumentationSidebar::class);
-        $this->assertFalse('foo' === $mainNavigationMenu->getActiveGroup()?->getGroupKey());
+        $this->assertFalse('foo' === $this->getGroupKey($mainNavigationMenu));
     }
 
     public function testIndexPageAddedToSidebarWhenItIsTheOnlyPage()
@@ -380,4 +380,9 @@ protected function makePage(string $name, ?array $matter = null): void
             (new ConvertsArrayToFrontMatter)->execute($matter ?? [])
         );
     }
+
+    protected function getGroupKey(DocumentationSidebar $menu): ?string
+    {
+        return $menu->getActiveGroup()?->getGroupKey();
+    }
 }

From c2254b02d79c586bdae099483a7341dc13589c3d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 19:04:09 +0100
Subject: [PATCH 1300/1422] Extract testing helper method for data access

---
 ...mentationSidebarGetActiveGroupUnitTest.php | 33 +++++++++++--------
 1 file changed, 20 insertions(+), 13 deletions(-)

diff --git a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
index 79286a5bfc9..08dd6279872 100644
--- a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
+++ b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
@@ -89,55 +89,55 @@ public function testNoActiveGroupWhenSidebarNotCollapsible()
     public function testActiveGroupGettingStarted()
     {
         $this->mockCurrentPageForActiveGroup('getting-started');
-        $this->assertSame('getting-started', $this->createSidebar()->getActiveGroup()->getGroupKey());
+        $this->assertSame('getting-started', $this->getActiveGroupKey());
     }
 
     public function testActiveGroupConfiguration()
     {
         $this->mockCurrentPageForActiveGroup('configuration');
-        $this->assertSame('configuration', $this->createSidebar()->getActiveGroup()->getGroupKey());
+        $this->assertSame('configuration', $this->getActiveGroupKey());
     }
 
     public function testActiveGroupUsage()
     {
         $this->mockCurrentPageForActiveGroup('usage');
-        $this->assertSame('usage', $this->createSidebar()->getActiveGroup()->getGroupKey());
+        $this->assertSame('usage', $this->getActiveGroupKey());
     }
 
     public function testActiveGroupWithIdentifierGettingStarted()
     {
         $this->mockCurrentPageForActiveGroup('getting-started', 'Introduction');
-        $this->assertSame('getting-started', $this->createSidebar()->getActiveGroup()->getGroupKey());
+        $this->assertSame('getting-started', $this->getActiveGroupKey());
     }
 
     public function testActiveGroupWithIdentifierConfiguration()
     {
         $this->mockCurrentPageForActiveGroup('configuration', 'Configuration');
-        $this->assertSame('configuration', $this->createSidebar()->getActiveGroup()->getGroupKey());
+        $this->assertSame('configuration', $this->getActiveGroupKey());
     }
 
     public function testActiveGroupWithIdentifierUsage()
     {
         $this->mockCurrentPageForActiveGroup('usage', 'Routing');
-        $this->assertSame('usage', $this->createSidebar()->getActiveGroup()->getGroupKey());
+        $this->assertSame('usage', $this->getActiveGroupKey());
     }
 
     public function testActiveGroupDifferentCasingGettingStarted()
     {
         $this->mockCurrentPageForActiveGroup('GETTING-STARTED');
-        $this->assertSame('getting-started', $this->createSidebar()->getActiveGroup()->getGroupKey());
+        $this->assertSame('getting-started', $this->getActiveGroupKey());
     }
 
     public function testActiveGroupDifferentCasingGettingStarted2()
     {
         $this->mockCurrentPageForActiveGroup('Getting-Started');
-        $this->assertSame('getting-started', $this->createSidebar()->getActiveGroup()->getGroupKey());
+        $this->assertSame('getting-started', $this->getActiveGroupKey());
     }
 
     public function testActiveGroupDifferentCasingGettingStarted3()
     {
         $this->mockCurrentPageForActiveGroup('getting-started');
-        $this->assertSame('getting-started', $this->createSidebar()->getActiveGroup()->getGroupKey());
+        $this->assertSame('getting-started', $this->getActiveGroupKey());
     }
 
     public function testGetActiveGroupIsNullWhenNoItemsExist()
@@ -159,7 +159,7 @@ public function testGetActiveGroupIsNullIfTheSetGroupIsNotPresentInTheSidebarIte
     public function testGetActiveGroupReturnsFirstGroupWhenRenderingIndexPage()
     {
         $this->renderData->setPage(new DocumentationPage('index'));
-        $this->assertSame('getting-started', $this->createSidebar()->getActiveGroup()->getGroupKey());
+        $this->assertSame('getting-started', $this->getActiveGroupKey());
     }
 
     public function testGetActiveGroupReturnsFirstGroupByLowestPriorityWhenRenderingIndexPage()
@@ -168,7 +168,7 @@ public function testGetActiveGroupReturnsFirstGroupByLowestPriorityWhenRendering
         $sidebar->add(new NavigationGroup('other', [new NavigationItem('Other', 'Other')], 0));
 
         $this->renderData->setPage(new DocumentationPage('index'));
-        $this->assertSame('other', $sidebar->getActiveGroup()->getGroupKey());
+        $this->assertSame('other', $this->getActiveGroupKey($sidebar));
     }
 
     public function testGetActiveGroupReturnsExplicitlySetIndexPageGroupWhenRenderingIndexPage()
@@ -176,7 +176,7 @@ public function testGetActiveGroupReturnsExplicitlySetIndexPageGroupWhenRenderin
         $sidebar = $this->createSidebar();
 
         $this->renderData->setPage(new DocumentationPage('index', ['navigation.group' => 'usage']));
-        $this->assertSame('usage', $sidebar->getActiveGroup()->getGroupKey());
+        $this->assertSame('usage', $this->getActiveGroupKey($sidebar));
     }
 
     public function testGetActiveGroupReturnsExplicitlySetIndexPageGroupWhenRenderingIndexPageRegardlessOfPriorities()
@@ -185,11 +185,18 @@ public function testGetActiveGroupReturnsExplicitlySetIndexPageGroupWhenRenderin
         $sidebar->add(new NavigationGroup('other', [new NavigationItem('Other', 'Other')], 0));
 
         $this->renderData->setPage(new DocumentationPage('index', ['navigation.group' => 'usage']));
-        $this->assertSame('usage', $sidebar->getActiveGroup()->getGroupKey());
+        $this->assertSame('usage', $this->getActiveGroupKey($sidebar));
     }
 
     protected function mockCurrentPageForActiveGroup(string $group, string $identifier = 'foo'): void
     {
         $this->renderData->setPage(new DocumentationPage($identifier, ['navigation.group' => $group]));
     }
+
+    protected function getActiveGroupKey(?DocumentationSidebar $sidebar = null): string
+    {
+        $sidebar ??= $this->createSidebar();
+
+        return $sidebar->getActiveGroup()->getGroupKey();
+    }
 }

From 524e1ea8e4f13cb3b085242fcfc1eada8bcfb9b6 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 19:04:46 +0100
Subject: [PATCH 1301/1422] Update
 DocumentationSidebarGetActiveGroupUnitTest.php

---
 .../tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
index 08dd6279872..91ca9487966 100644
--- a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
+++ b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
@@ -173,10 +173,8 @@ public function testGetActiveGroupReturnsFirstGroupByLowestPriorityWhenRendering
 
     public function testGetActiveGroupReturnsExplicitlySetIndexPageGroupWhenRenderingIndexPage()
     {
-        $sidebar = $this->createSidebar();
-
         $this->renderData->setPage(new DocumentationPage('index', ['navigation.group' => 'usage']));
-        $this->assertSame('usage', $this->getActiveGroupKey($sidebar));
+        $this->assertSame('usage', $this->getActiveGroupKey($this->createSidebar()));
     }
 
     public function testGetActiveGroupReturnsExplicitlySetIndexPageGroupWhenRenderingIndexPageRegardlessOfPriorities()

From c52a912366314b1419f4852f1becb385475d5a92 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 19:05:01 +0100
Subject: [PATCH 1302/1422] Move up test in source

---
 .../DocumentationSidebarGetActiveGroupUnitTest.php   | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
index 91ca9487966..34a266fbc59 100644
--- a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
+++ b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
@@ -162,6 +162,12 @@ public function testGetActiveGroupReturnsFirstGroupWhenRenderingIndexPage()
         $this->assertSame('getting-started', $this->getActiveGroupKey());
     }
 
+    public function testGetActiveGroupReturnsExplicitlySetIndexPageGroupWhenRenderingIndexPage()
+    {
+        $this->renderData->setPage(new DocumentationPage('index', ['navigation.group' => 'usage']));
+        $this->assertSame('usage', $this->getActiveGroupKey($this->createSidebar()));
+    }
+
     public function testGetActiveGroupReturnsFirstGroupByLowestPriorityWhenRenderingIndexPage()
     {
         $sidebar = $this->createSidebar();
@@ -171,12 +177,6 @@ public function testGetActiveGroupReturnsFirstGroupByLowestPriorityWhenRendering
         $this->assertSame('other', $this->getActiveGroupKey($sidebar));
     }
 
-    public function testGetActiveGroupReturnsExplicitlySetIndexPageGroupWhenRenderingIndexPage()
-    {
-        $this->renderData->setPage(new DocumentationPage('index', ['navigation.group' => 'usage']));
-        $this->assertSame('usage', $this->getActiveGroupKey($this->createSidebar()));
-    }
-
     public function testGetActiveGroupReturnsExplicitlySetIndexPageGroupWhenRenderingIndexPageRegardlessOfPriorities()
     {
         $sidebar = $this->createSidebar();

From 09b909f45a95d7419732641c3bd9df79ff8ca559 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 19:06:01 +0100
Subject: [PATCH 1303/1422] Use fluent method call

---
 .../Unit/DocumentationSidebarGetActiveGroupUnitTest.php     | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
index 34a266fbc59..85cfca99569 100644
--- a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
+++ b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
@@ -170,8 +170,7 @@ public function testGetActiveGroupReturnsExplicitlySetIndexPageGroupWhenRenderin
 
     public function testGetActiveGroupReturnsFirstGroupByLowestPriorityWhenRenderingIndexPage()
     {
-        $sidebar = $this->createSidebar();
-        $sidebar->add(new NavigationGroup('other', [new NavigationItem('Other', 'Other')], 0));
+        $sidebar = $this->createSidebar()->add(new NavigationGroup('other', [new NavigationItem('Other', 'Other')], 0));
 
         $this->renderData->setPage(new DocumentationPage('index'));
         $this->assertSame('other', $this->getActiveGroupKey($sidebar));
@@ -179,8 +178,7 @@ public function testGetActiveGroupReturnsFirstGroupByLowestPriorityWhenRendering
 
     public function testGetActiveGroupReturnsExplicitlySetIndexPageGroupWhenRenderingIndexPageRegardlessOfPriorities()
     {
-        $sidebar = $this->createSidebar();
-        $sidebar->add(new NavigationGroup('other', [new NavigationItem('Other', 'Other')], 0));
+        $sidebar = $this->createSidebar()->add(new NavigationGroup('other', [new NavigationItem('Other', 'Other')], 0));
 
         $this->renderData->setPage(new DocumentationPage('index', ['navigation.group' => 'usage']));
         $this->assertSame('usage', $this->getActiveGroupKey($sidebar));

From 749d41c34fab2e745dfd1fa22f4704043e79f610 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 19:08:24 +0100
Subject: [PATCH 1304/1422] Remove `getGroupKey` method from
 `NavigationElement` contract

---
 .../src/Framework/Features/Navigation/NavigationElement.php  | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationElement.php b/packages/framework/src/Framework/Features/Navigation/NavigationElement.php
index 6084549e48b..10152254c5c 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationElement.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationElement.php
@@ -15,9 +15,4 @@ public function getLabel(): string;
      * Get the priority to determine the order of the navigation item.
      */
     public function getPriority(): int;
-
-    /**
-     * Get the group identifier key of the navigation item, if any.
-     */
-    public function getGroupKey(): ?string;
 }

From 6b675523b6ad964075c08e38f195e76dd10452bb Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 19:09:30 +0100
Subject: [PATCH 1305/1422] Remove `getGroupKey` method from `NavigationItem`
 class

---
 .../Features/Navigation/NavigationItem.php       | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index f19a63ee96c..c67485e6406 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -5,7 +5,6 @@
 namespace Hyde\Framework\Features\Navigation;
 
 use Hyde\Pages\Concerns\HydePage;
-use JetBrains\PhpStorm\Deprecated;
 use Hyde\Foundation\Facades\Routes;
 use Hyde\Hyde;
 use Hyde\Support\Models\Route;
@@ -96,21 +95,6 @@ public function getPriority(): int
         return $this->priority;
     }
 
-    /**
-     * Get the group identifier key of the navigation item, if any.
-     *
-     * @deprecated as the property is deprecated.
-     *
-     *  For sidebars this is the category key, for navigation menus this is the dropdown key.
-     *
-     *  When using automatic subdirectory based groups, the subdirectory name is the group key.
-     *  Otherwise, the group key is a 'slugified' version of the group's label.
-     */
-    public function getGroupKey(): ?string
-    {
-        return $this->getPage()?->navigationMenuGroup();
-    }
-
     /**
      * If the navigation item is a link to a routed page, get the corresponding page instance.
      */

From c359bcaac4260add8348bbfb5f21a84a05297e67 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 19:22:55 +0100
Subject: [PATCH 1306/1422] Move group key normalization method to navigation
 group class

---
 .../Features/Navigation/DocumentationSidebar.php   |  2 +-
 .../Features/Navigation/NavigationGroup.php        |  6 ++++++
 .../Features/Navigation/NavigationItem.php         |  7 -------
 .../Navigation/NavigationMenuGenerator.php         |  2 +-
 .../framework/tests/Unit/NavigationGroupTest.php   | 14 ++++++++++++++
 .../framework/tests/Unit/NavigationItemTest.php    | 14 --------------
 6 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index f2a5d485fa6..195d90263a8 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -78,7 +78,7 @@ public function getActiveGroup(): ?NavigationGroup
 
         return $this->items->first(function (NavigationGroup $group) use ($currentPage): bool {
             // A group is active when it contains the current page being rendered.
-            return $group->getGroupKey() === NavigationItem::normalizeGroupKey($currentPage->navigationMenuGroup());
+            return $group->getGroupKey() === NavigationGroup::normalizeGroupKey($currentPage->navigationMenuGroup());
         });
     }
 }
diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
index 937d1647ddd..516e6d7736d 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
@@ -81,4 +81,10 @@ protected function containsOnlyDocumentationPages(): bool
             return $child->getPage() instanceof DocumentationPage;
         });
     }
+
+    /** @return ($group is null ? null : string) */
+    public static function normalizeGroupKey(?string $group): ?string
+    {
+        return $group ? Str::slug($group) : null;
+    }
 }
diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index c67485e6406..8e406303dd3 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -8,7 +8,6 @@
 use Hyde\Foundation\Facades\Routes;
 use Hyde\Hyde;
 use Hyde\Support\Models\Route;
-use Illuminate\Support\Str;
 use Stringable;
 
 use function is_string;
@@ -110,10 +109,4 @@ public function isActive(): bool
     {
         return Hyde::currentRoute()->getLink() === $this->getLink();
     }
-
-    /** @return ($group is null ? null : string) */
-    public static function normalizeGroupKey(?string $group): ?string
-    {
-        return $group ? Str::slug($group) : null;
-    }
 }
diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
index d43c0638185..c0e11aa5a75 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
@@ -148,7 +148,7 @@ protected function addRouteToGroup(Route $route): void
 
     protected function getOrCreateGroupItem(string $groupName): NavigationGroup
     {
-        $groupKey = NavigationItem::normalizeGroupKey($groupName);
+        $groupKey = NavigationGroup::normalizeGroupKey($groupName);
         $group = $this->items->get($groupKey);
 
         if ($group instanceof NavigationGroup) {
diff --git a/packages/framework/tests/Unit/NavigationGroupTest.php b/packages/framework/tests/Unit/NavigationGroupTest.php
index 2baaf30d2fc..ca7170207bb 100644
--- a/packages/framework/tests/Unit/NavigationGroupTest.php
+++ b/packages/framework/tests/Unit/NavigationGroupTest.php
@@ -173,6 +173,20 @@ public function testModifierMethodsAreFluentlyChainable()
         $this->assertSame($group, $group->add([new NavigationItem(new Route(new MarkdownPage()), 'Bar')]));
     }
 
+    public function testNormalizeGroupKeyCreatesSlugs()
+    {
+        $this->assertSame('foo-bar', NavigationGroup::normalizeGroupKey('Foo Bar'));
+        $this->assertSame('foo-bar', NavigationGroup::normalizeGroupKey('foo bar'));
+        $this->assertSame('foo-bar', NavigationGroup::normalizeGroupKey('foo_bar'));
+        $this->assertSame('foo-bar', NavigationGroup::normalizeGroupKey('foo-bar'));
+        $this->assertSame('foo-bar', NavigationGroup::normalizeGroupKey(' foo bar '));
+    }
+
+    public function testNormalizeGroupKeyReturnsNullForNull()
+    {
+        $this->assertNull(NavigationGroup::normalizeGroupKey(null));
+    }
+
     protected function createNavigationItems(): array
     {
         return [
diff --git a/packages/framework/tests/Unit/NavigationItemTest.php b/packages/framework/tests/Unit/NavigationItemTest.php
index b39e7f83506..02152f8a182 100644
--- a/packages/framework/tests/Unit/NavigationItemTest.php
+++ b/packages/framework/tests/Unit/NavigationItemTest.php
@@ -305,18 +305,4 @@ public function testIsCurrentWithLink()
         $this->assertFalse(NavigationItem::create('foo', 'bar')->isActive());
         $this->assertFalse(NavigationItem::create('https://example.com', 'bar')->isActive());
     }
-
-    public function testNormalizeGroupKeyCreatesSlugs()
-    {
-        $this->assertSame('foo-bar', NavigationItem::normalizeGroupKey('Foo Bar'));
-        $this->assertSame('foo-bar', NavigationItem::normalizeGroupKey('foo bar'));
-        $this->assertSame('foo-bar', NavigationItem::normalizeGroupKey('foo_bar'));
-        $this->assertSame('foo-bar', NavigationItem::normalizeGroupKey('foo-bar'));
-        $this->assertSame('foo-bar', NavigationItem::normalizeGroupKey(' foo bar '));
-    }
-
-    public function testNormalizeGroupKeyReturnsNullForNull()
-    {
-        $this->assertNull(NavigationItem::normalizeGroupKey(null));
-    }
 }

From 74933b8bb0626788d24e6a039859476a521862be Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 19:24:11 +0100
Subject: [PATCH 1307/1422] Remove null support from group key normalization
 method

This is no longer needed
---
 .../src/Framework/Features/Navigation/NavigationGroup.php    | 5 ++---
 packages/framework/tests/Unit/NavigationGroupTest.php        | 5 -----
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
index 516e6d7736d..7515620cc2c 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
@@ -82,9 +82,8 @@ protected function containsOnlyDocumentationPages(): bool
         });
     }
 
-    /** @return ($group is null ? null : string) */
-    public static function normalizeGroupKey(?string $group): ?string
+    public static function normalizeGroupKey(string $group): string
     {
-        return $group ? Str::slug($group) : null;
+        return Str::slug($group);
     }
 }
diff --git a/packages/framework/tests/Unit/NavigationGroupTest.php b/packages/framework/tests/Unit/NavigationGroupTest.php
index ca7170207bb..077659cdb9f 100644
--- a/packages/framework/tests/Unit/NavigationGroupTest.php
+++ b/packages/framework/tests/Unit/NavigationGroupTest.php
@@ -182,11 +182,6 @@ public function testNormalizeGroupKeyCreatesSlugs()
         $this->assertSame('foo-bar', NavigationGroup::normalizeGroupKey(' foo bar '));
     }
 
-    public function testNormalizeGroupKeyReturnsNullForNull()
-    {
-        $this->assertNull(NavigationGroup::normalizeGroupKey(null));
-    }
-
     protected function createNavigationItems(): array
     {
         return [

From eb346e9c526eb259810801382377ce29a1eb71cc Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 19:48:23 +0100
Subject: [PATCH 1308/1422] Add null type check

---
 .../src/Framework/Features/Navigation/DocumentationSidebar.php  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 195d90263a8..097174d38c7 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -78,7 +78,7 @@ public function getActiveGroup(): ?NavigationGroup
 
         return $this->items->first(function (NavigationGroup $group) use ($currentPage): bool {
             // A group is active when it contains the current page being rendered.
-            return $group->getGroupKey() === NavigationGroup::normalizeGroupKey($currentPage->navigationMenuGroup());
+            return $currentPage->navigationMenuGroup() && $group->getGroupKey() === NavigationGroup::normalizeGroupKey($currentPage->navigationMenuGroup());
         });
     }
 }

From de6993bac15fe29da924515a5e4eae8f5e7cd45e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 19:48:51 +0100
Subject: [PATCH 1309/1422] Mark group key normalization method as experimental

---
 .../src/Framework/Features/Navigation/NavigationGroup.php        | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
index 7515620cc2c..b0b127ddc27 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
@@ -82,6 +82,7 @@ protected function containsOnlyDocumentationPages(): bool
         });
     }
 
+    /** @experimental This method is subject to change before its release. */
     public static function normalizeGroupKey(string $group): string
     {
         return Str::slug($group);

From 67c5d1da22dc5ef659bb406a979abe6c62aef684 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 25 Mar 2024 10:01:33 +0100
Subject: [PATCH 1310/1422] Rename local closure variables

---
 .../src/Framework/Features/Navigation/NavigationGroup.php   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
index b0b127ddc27..0d619dce874 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
@@ -48,7 +48,7 @@ public function getPriority(): int
     {
         if ($this->containsOnlyDocumentationPages()) {
             // For sidebar groups, we use the priority of the lowest priority child, unless the dropdown instance itself has a lower priority.
-            return min($this->priority, collect($this->getItems())->min(fn (NavigationItem $child): int => $child->getPriority()));
+            return min($this->priority, collect($this->getItems())->min(fn (NavigationItem $item): int => $item->getPriority()));
         }
 
         return $this->priority;
@@ -77,8 +77,8 @@ protected function addItem(NavigationItem $item): void
 
     protected function containsOnlyDocumentationPages(): bool
     {
-        return count($this->getItems()) && collect($this->getItems())->every(function (NavigationItem $child): bool {
-            return $child->getPage() instanceof DocumentationPage;
+        return count($this->getItems()) && collect($this->getItems())->every(function (NavigationItem $item): bool {
+            return $item->getPage() instanceof DocumentationPage;
         });
     }
 

From 34f2569cb635e88351e58fbf982b363b12504a60 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 25 Mar 2024 10:04:03 +0100
Subject: [PATCH 1311/1422] Deprecate the navigation element contract

---
 .../src/Framework/Features/Navigation/NavigationElement.php    | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationElement.php b/packages/framework/src/Framework/Features/Navigation/NavigationElement.php
index 10152254c5c..ddc1159ffa8 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationElement.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationElement.php
@@ -4,6 +4,9 @@
 
 namespace Hyde\Framework\Features\Navigation;
 
+/**
+ * @deprecated
+ */
 interface NavigationElement
 {
     /**

From 3175f91fe113721677d7cc8834d8924259e59ca4 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 25 Mar 2024 10:09:36 +0100
Subject: [PATCH 1312/1422] Replace interface type hint with union type

---
 .../src/Framework/Features/Navigation/DocumentationSidebar.php  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 097174d38c7..6e8332b8ad2 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -55,7 +55,7 @@ public function isCollapsible(): bool
 
     public function hasGroups(): bool
     {
-        return $this->getItems()->contains(fn (NavigationElement $item): bool => $item instanceof NavigationGroup);
+        return $this->getItems()->contains(fn (NavigationItem|NavigationGroup $item): bool => $item instanceof NavigationGroup);
     }
 
     /**

From 9b1a1d0d5fc6a82c11bdaffd88c7c30a9590e9d5 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 25 Mar 2024 10:13:40 +0100
Subject: [PATCH 1313/1422] No longer implement navigation element contract

---
 .../src/Framework/Features/Navigation/NavigationGroup.php   | 2 +-
 .../src/Framework/Features/Navigation/NavigationItem.php    | 2 +-
 packages/framework/tests/Unit/NavigationGroupTest.php       | 6 +-----
 packages/framework/tests/Unit/NavigationItemTest.php        | 6 ------
 4 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
index 0d619dce874..ca6e696da2b 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
@@ -14,7 +14,7 @@
 /**
  * Abstraction for a grouped navigation menu item, like a dropdown or a sidebar group.
  */
-class NavigationGroup implements NavigationElement
+class NavigationGroup
 {
     /** @var array<\Hyde\Framework\Features\Navigation\NavigationItem> */
     protected array $items = [];
diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index 8e406303dd3..3847bc79b18 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -20,7 +20,7 @@
  *   2. You can use NavigationItem::fromRoute() to use data from the route
  *   3. You can use NavigationItem::create() for an external or un-routed link
  */
-class NavigationItem implements NavigationElement, Stringable
+class NavigationItem implements Stringable
 {
     protected string|Route $destination;
     protected string $label;
diff --git a/packages/framework/tests/Unit/NavigationGroupTest.php b/packages/framework/tests/Unit/NavigationGroupTest.php
index 077659cdb9f..378a1d7fe52 100644
--- a/packages/framework/tests/Unit/NavigationGroupTest.php
+++ b/packages/framework/tests/Unit/NavigationGroupTest.php
@@ -26,6 +26,7 @@ public static function setUpBeforeClass(): void
 
     public function testCanConstruct()
     {
+        $this->assertInstanceOf(NavigationGroup::class, new NavigationGroup('Foo'));
         $this->assertSame('Foo', (new NavigationGroup('Foo'))->getLabel());
     }
 
@@ -57,11 +58,6 @@ public function testCanConstructWithChildrenWithoutRoute()
         $this->assertSame($children, $item->getItems());
     }
 
-    public function testIsInstanceOfNavigationElement()
-    {
-        $this->assertInstanceOf(NavigationGroup::class, new NavigationGroup('Foo'));
-    }
-
     public function testCreate()
     {
         $this->assertEquals(
diff --git a/packages/framework/tests/Unit/NavigationItemTest.php b/packages/framework/tests/Unit/NavigationItemTest.php
index 02152f8a182..0e1da8957b6 100644
--- a/packages/framework/tests/Unit/NavigationItemTest.php
+++ b/packages/framework/tests/Unit/NavigationItemTest.php
@@ -14,7 +14,6 @@
 use Hyde\Testing\UnitTestCase;
 use Mockery;
 use Hyde\Framework\Features\Navigation\NavigationGroup;
-use Hyde\Framework\Features\Navigation\NavigationElement;
 
 /**
  * This unit test covers the basics of the NavigationItem class.
@@ -46,11 +45,6 @@ public function testConstruct()
         $this->assertInstanceOf(NavigationItem::class, new NavigationItem(new Route(new MarkdownPage()), 'Test', 500));
     }
 
-    public function testIsInstanceOfNavigationElement()
-    {
-        $this->assertInstanceOf(NavigationElement::class, new NavigationItem(new Route(new MarkdownPage()), 'Test', 500));
-    }
-
     public function testPassingRouteInstanceToConstructorUsesRouteInstance()
     {
         $route = new Route(new MarkdownPage());

From 4385cc79a658e361ce9d2a76c1ebac7a4e200bb7 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 25 Mar 2024 10:17:10 +0100
Subject: [PATCH 1314/1422] Delete NavigationElement.php

---
 .../Features/Navigation/NavigationElement.php | 21 -------------------
 1 file changed, 21 deletions(-)
 delete mode 100644 packages/framework/src/Framework/Features/Navigation/NavigationElement.php

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationElement.php b/packages/framework/src/Framework/Features/Navigation/NavigationElement.php
deleted file mode 100644
index ddc1159ffa8..00000000000
--- a/packages/framework/src/Framework/Features/Navigation/NavigationElement.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Hyde\Framework\Features\Navigation;
-
-/**
- * @deprecated
- */
-interface NavigationElement
-{
-    /**
-     * Get the label of the navigation item.
-     */
-    public function getLabel(): string;
-
-    /**
-     * Get the priority to determine the order of the navigation item.
-     */
-    public function getPriority(): int;
-}

From c870acb51fbe9c65907e5bae2d73c7490d78d8cd Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 25 Mar 2024 10:30:25 +0100
Subject: [PATCH 1315/1422] Clean up test

---
 .../tests/Feature/SidebarViewTest.php          | 18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)

diff --git a/packages/framework/tests/Feature/SidebarViewTest.php b/packages/framework/tests/Feature/SidebarViewTest.php
index 522d25de033..03800562e2a 100644
--- a/packages/framework/tests/Feature/SidebarViewTest.php
+++ b/packages/framework/tests/Feature/SidebarViewTest.php
@@ -7,10 +7,8 @@
 namespace Hyde\Framework\Testing\Feature;
 
 use Hyde\Framework\Features\Navigation\DocumentationSidebar;
-use Hyde\Hyde;
 use Hyde\Testing\TestCase;
 use Illuminate\Contracts\View\View;
-use Throwable;
 use Hyde\Framework\Features\Navigation\NavigationMenuGenerator;
 
 /**
@@ -189,21 +187,7 @@ protected function renderComponent(View $view): self
         app()->instance('navigation.sidebar', $sidebar);
         view()->share('sidebar', $sidebar);
 
-        try {
-            $this->html = $view->render();
-            /** @noinspection LaravelFunctionsInspection */
-            if (env('TEST_HTML_DEBUG', false)) {
-                file_put_contents(Hyde::path('_site/test.html'), $this->html);
-                echo "\e[0;32mCreated file: \e[0m".realpath(Hyde::path('_site/test.html'));
-            }
-        } catch (Throwable $exception) {
-            /** @noinspection LaravelFunctionsInspection */
-            if (env('TEST_HTML_DEBUG', false)) {
-                throw $exception;
-            }
-            $this->fail($exception->getMessage());
-        }
-
+        $this->html = $view->render();
         $this->assertIsString($this->html);
 
         return $this;

From ea15074a0c08d9129873497c5becdc193dc4759d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 25 Mar 2024 10:30:51 +0100
Subject: [PATCH 1316/1422] Clean up test

---
 .../tests/Feature/SidebarViewTest.php         | 31 +++++--------------
 1 file changed, 8 insertions(+), 23 deletions(-)

diff --git a/packages/framework/tests/Feature/SidebarViewTest.php b/packages/framework/tests/Feature/SidebarViewTest.php
index 03800562e2a..1f76307068b 100644
--- a/packages/framework/tests/Feature/SidebarViewTest.php
+++ b/packages/framework/tests/Feature/SidebarViewTest.php
@@ -38,8 +38,7 @@ public function testBaseSidebar()
             ->assertSeeHtml('<a href="../">Back to home page</a>')
             ->assertSeeHtml('<span class="sr-only">Toggle dark theme</span>')
             ->assertDontSee('<a href="docs/index.html">')
-            ->assertDontSee('<li class="sidebar-item')
-            ->allGood();
+            ->assertDontSee('<li class="sidebar-item');
 
         $this->assertViewWasRendered(view('hyde::components.docs.sidebar-items'));
 
@@ -53,8 +52,7 @@ public function testBaseSidebarWithoutFooter()
 
         $this->renderComponent(view('hyde::components.docs.sidebar'))
             ->assertDontSee('<footer id="sidebar-footer"')
-            ->assertDontSee('Back to home page')
-            ->allGood();
+            ->assertDontSee('Back to home page');
     }
 
     public function testBaseSidebarWithCustomFooterText()
@@ -64,8 +62,7 @@ public function testBaseSidebarWithCustomFooterText()
         $this->renderComponent(view('hyde::components.docs.sidebar'))
             ->assertSeeHtml('<footer id="sidebar-footer"')
             ->assertSeeHtml('<p>My <strong>Markdown</strong> Footer Text</p>')
-            ->assertDontSee('Back to home page')
-            ->allGood();
+            ->assertDontSee('Back to home page');
     }
 
     public function testBaseSidebarCustomHeaderBrand()
@@ -74,8 +71,7 @@ public function testBaseSidebarCustomHeaderBrand()
 
         $this->renderComponent(view('hyde::components.docs.sidebar'))
             ->assertSeeText('My Custom Header')
-            ->assertDontSee('HydePHP Docs')
-            ->allGood();
+            ->assertDontSee('HydePHP Docs');
 
         $this->assertViewWasRendered(view('hyde::components.docs.sidebar-brand'));
     }
@@ -90,8 +86,7 @@ public function testBaseSidebarWithItems()
             ->assertSeeHtml('<a href="docs/index.html">')
             ->assertSeeHtml('<nav id="sidebar-navigation"')
             ->assertSeeHtml('<ul id="sidebar-items" role="list" class="pl-2">')
-            ->assertSeeHtml('<li class="sidebar-item')
-            ->allGood();
+            ->assertSeeHtml('<li class="sidebar-item');
 
         $this->assertViewWasRendered(view('hyde::components.docs.sidebar-items'));
     }
@@ -116,8 +111,7 @@ public function testSidebarWithGroupedItems()
             ->assertSeeHtml('class="sidebar-group-toggle')
             ->assertSeeHtml('class="sidebar-group-toggle-icon')
             ->assertSeeHtml('class="sidebar-group-items')
-            ->assertSee('groupOpen')
-            ->allGood();
+            ->assertSee('groupOpen');
 
         $this->assertViewWasRendered(view('hyde::components.docs.sidebar-items', [
             'grouped' => true,
@@ -147,8 +141,7 @@ public function testSidebarWithNonCollapsibleGroupedItems()
             ->assertSeeHtml('class="sidebar-group-items')
             ->assertDontSee('sidebar-group-toggle')
             ->assertDontSee('sidebar-group-toggle-icon')
-            ->assertDontSee('groupOpen')
-            ->allGood();
+            ->assertDontSee('groupOpen');
 
         $this->assertViewWasRendered(view('hyde::components.docs.sidebar-items', [
             'grouped' => true,
@@ -171,8 +164,7 @@ public function testSidebarWithMixedGroupedAndUngroupedItems()
             ->assertSeeText('Other')
             ->assertSeeText('Second')
             ->assertSeeHtml('href="docs/first.html"')
-            ->assertSeeHtml('href="docs/second.html"')
-            ->allGood();
+            ->assertSeeHtml('href="docs/second.html"');
 
         $this->assertViewWasRendered(view('hyde::components.docs.sidebar-items', [
             'grouped' => true,
@@ -234,11 +226,4 @@ protected function assertDontSee(string $text): self
 
         return $this;
     }
-
-    protected function allGood(): self
-    {
-        // Just an empty helper so we get easier Git diffs when adding new assertions.
-
-        return $this;
-    }
 }

From c5d04170352c4f10a2349fe4ee18094f12f65a8c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 25 Mar 2024 10:56:49 +0100
Subject: [PATCH 1317/1422] Remove abstract modifier from navigation menu class

I see no reason why we can't allow users to create custom menus by instantiating this class
---
 .../src/Framework/Features/Navigation/NavigationMenu.php        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
index 46e904cde29..7329b6bfbe9 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
@@ -18,7 +18,7 @@
  * @example `$menu = app('navigation.main');` for the main navigation menu.
  * @example `$menu = app('navigation.sidebar');` for the documentation sidebar.
  */
-abstract class NavigationMenu
+class NavigationMenu
 {
     public const DEFAULT = 500;
     public const LAST = 999;

From 2beb314dbc338053cfe0f3677b5f99fc28c29835 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 25 Mar 2024 10:57:47 +0100
Subject: [PATCH 1318/1422] Create NavigationAPITest.php

---
 .../framework/tests/Feature/NavigationAPITest.php | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 packages/framework/tests/Feature/NavigationAPITest.php

diff --git a/packages/framework/tests/Feature/NavigationAPITest.php b/packages/framework/tests/Feature/NavigationAPITest.php
new file mode 100644
index 00000000000..49e7eae0e4e
--- /dev/null
+++ b/packages/framework/tests/Feature/NavigationAPITest.php
@@ -0,0 +1,15 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Hyde\Framework\Testing\Feature;
+
+use Hyde\Testing\TestCase;
+
+/**
+ * High level tests for the Navigation API.
+ */
+class NavigationAPITest extends TestCase
+{
+    //
+}

From 102df43e6619b1907d67426caa54bf4ebd47c34d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 25 Mar 2024 11:02:12 +0100
Subject: [PATCH 1319/1422] Set up test kernel

---
 .../tests/Feature/NavigationAPITest.php       | 27 ++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/packages/framework/tests/Feature/NavigationAPITest.php b/packages/framework/tests/Feature/NavigationAPITest.php
index 49e7eae0e4e..5cec9b75b4c 100644
--- a/packages/framework/tests/Feature/NavigationAPITest.php
+++ b/packages/framework/tests/Feature/NavigationAPITest.php
@@ -5,11 +5,36 @@
 namespace Hyde\Framework\Testing\Feature;
 
 use Hyde\Testing\TestCase;
+use Hyde\Foundation\HydeKernel;
+use Illuminate\Support\Collection;
+use Hyde\Foundation\Kernel\RouteCollection;
 
 /**
  * High level tests for the Navigation API.
  */
 class NavigationAPITest extends TestCase
 {
-    //
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->kernel = new TestKernel();
+        HydeKernel::setInstance($this->kernel);
+    }
+}
+
+class TestKernel extends HydeKernel
+{
+    protected ?RouteCollection $mockRoutes = null;
+
+    public function setRoutes(Collection $routes): void
+    {
+        $this->mockRoutes = RouteCollection::make($routes);
+    }
+
+    /** @return \Hyde\Foundation\Kernel\RouteCollection<string, \Hyde\Support\Models\Route> */
+    public function routes(): RouteCollection
+    {
+        return $this->mockRoutes ?? parent::routes();
+    }
 }

From c462c62f695c44baedab5bf5650421c0994a3d8d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 25 Mar 2024 12:02:44 +0100
Subject: [PATCH 1320/1422] Revert "Set up test kernel"

This reverts commit 102df43e6619b1907d67426caa54bf4ebd47c34d.
---
 .../tests/Feature/NavigationAPITest.php       | 27 +------------------
 1 file changed, 1 insertion(+), 26 deletions(-)

diff --git a/packages/framework/tests/Feature/NavigationAPITest.php b/packages/framework/tests/Feature/NavigationAPITest.php
index 5cec9b75b4c..49e7eae0e4e 100644
--- a/packages/framework/tests/Feature/NavigationAPITest.php
+++ b/packages/framework/tests/Feature/NavigationAPITest.php
@@ -5,36 +5,11 @@
 namespace Hyde\Framework\Testing\Feature;
 
 use Hyde\Testing\TestCase;
-use Hyde\Foundation\HydeKernel;
-use Illuminate\Support\Collection;
-use Hyde\Foundation\Kernel\RouteCollection;
 
 /**
  * High level tests for the Navigation API.
  */
 class NavigationAPITest extends TestCase
 {
-    protected function setUp(): void
-    {
-        parent::setUp();
-
-        $this->kernel = new TestKernel();
-        HydeKernel::setInstance($this->kernel);
-    }
-}
-
-class TestKernel extends HydeKernel
-{
-    protected ?RouteCollection $mockRoutes = null;
-
-    public function setRoutes(Collection $routes): void
-    {
-        $this->mockRoutes = RouteCollection::make($routes);
-    }
-
-    /** @return \Hyde\Foundation\Kernel\RouteCollection<string, \Hyde\Support\Models\Route> */
-    public function routes(): RouteCollection
-    {
-        return $this->mockRoutes ?? parent::routes();
-    }
+    //
 }

From 85f8aa238c45e550bda2ea37e04818104633f123 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 25 Mar 2024 12:06:31 +0100
Subject: [PATCH 1321/1422] Update NavigationMenu to implement Arrayable

---
 .../src/Framework/Features/Navigation/NavigationMenu.php        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
index 7329b6bfbe9..14904103ea6 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
@@ -18,7 +18,7 @@
  * @example `$menu = app('navigation.main');` for the main navigation menu.
  * @example `$menu = app('navigation.sidebar');` for the documentation sidebar.
  */
-class NavigationMenu
+class NavigationMenu implements Arrayable
 {
     public const DEFAULT = 500;
     public const LAST = 999;

From 72b74173b8a05a57031f3a394795146b634cb104 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 25 Mar 2024 12:06:53 +0100
Subject: [PATCH 1322/1422] Draft to array method

---
 .../Framework/Features/Navigation/NavigationMenu.php   | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
index 14904103ea6..770e823373b 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
@@ -63,6 +63,16 @@ public function add(NavigationItem|NavigationGroup|array $items): static
         return $this;
     }
 
+    /**
+     * Get the navigation items in the menu as an array.
+     *
+     * @return array<array<string, mixed>>
+     */
+    public function toArray(): array
+    {
+        //
+    }
+
     protected function addItem(NavigationItem|NavigationGroup $item): void
     {
         $this->items->push($item);

From 7e8aee5a82b0fca3bc28ad962855610ceba151b1 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 25 Mar 2024 12:07:03 +0100
Subject: [PATCH 1323/1422] Mark method as experimental

---
 .../src/Framework/Features/Navigation/NavigationMenu.php        | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
index 770e823373b..5abedcd74d4 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
@@ -66,6 +66,8 @@ public function add(NavigationItem|NavigationGroup|array $items): static
     /**
      * Get the navigation items in the menu as an array.
      *
+     * @experimental This method is experimental and may be changed before release.
+     *
      * @return array<array<string, mixed>>
      */
     public function toArray(): array

From fe76c48f3f5f4e0fb9da9548610f930031ccd845 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 25 Mar 2024 12:08:34 +0100
Subject: [PATCH 1324/1422] Annotate full array generics

---
 .../src/Framework/Features/Navigation/NavigationMenu.php        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
index 5abedcd74d4..8de2abe758c 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
@@ -68,7 +68,7 @@ public function add(NavigationItem|NavigationGroup|array $items): static
      *
      * @experimental This method is experimental and may be changed before release.
      *
-     * @return array<array<string, mixed>>
+     * @return array<int, array{url: string, title: string, active: bool}>
      */
     public function toArray(): array
     {

From 493aee87d458737ff11a339b0b1d866f97bd927f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 25 Mar 2024 12:11:44 +0100
Subject: [PATCH 1325/1422] Add null safety to active state check

---
 .../src/Framework/Features/Navigation/NavigationItem.php     | 2 +-
 packages/framework/tests/Unit/NavigationItemTest.php         | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index 3847bc79b18..dd4ab94709a 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -107,6 +107,6 @@ public function getPage(): ?HydePage
      */
     public function isActive(): bool
     {
-        return Hyde::currentRoute()->getLink() === $this->getLink();
+        return Hyde::currentRoute()?->getLink() === $this->getLink();
     }
 }
diff --git a/packages/framework/tests/Unit/NavigationItemTest.php b/packages/framework/tests/Unit/NavigationItemTest.php
index 0e1da8957b6..cb45bd6c9a9 100644
--- a/packages/framework/tests/Unit/NavigationItemTest.php
+++ b/packages/framework/tests/Unit/NavigationItemTest.php
@@ -299,4 +299,9 @@ public function testIsCurrentWithLink()
         $this->assertFalse(NavigationItem::create('foo', 'bar')->isActive());
         $this->assertFalse(NavigationItem::create('https://example.com', 'bar')->isActive());
     }
+
+    public function testIsCurrentIsNullSafe()
+    {
+        $this->assertFalse(NavigationItem::create('foo', 'bar')->isActive());
+    }
 }

From 473ac2056b49b5ffda20f1b985db3f3c66ceaaf7 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 25 Mar 2024 12:12:27 +0100
Subject: [PATCH 1326/1422] Draft test setup

---
 .../tests/Feature/NavigationAPITest.php       | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/packages/framework/tests/Feature/NavigationAPITest.php b/packages/framework/tests/Feature/NavigationAPITest.php
index 49e7eae0e4e..64208fe8b10 100644
--- a/packages/framework/tests/Feature/NavigationAPITest.php
+++ b/packages/framework/tests/Feature/NavigationAPITest.php
@@ -5,11 +5,28 @@
 namespace Hyde\Framework\Testing\Feature;
 
 use Hyde\Testing\TestCase;
+use Hyde\Foundation\Facades\Routes;
+use Hyde\Testing\MocksKernelFeatures;
+use Hyde\Framework\Features\Navigation\NavigationMenu;
+use Hyde\Framework\Features\Navigation\NavigationItem;
 
 /**
  * High level tests for the Navigation API.
  */
 class NavigationAPITest extends TestCase
 {
-    //
+    use MocksKernelFeatures;
+
+    public function testNavigationMenus()
+    {
+        $this->withPages(['index', 'about', 'contact']);
+
+        $menu = new NavigationMenu([
+            new NavigationItem(Routes::get('index'), 'Home'),
+            new NavigationItem(Routes::get('about'), 'About'),
+            new NavigationItem(Routes::get('contact'), 'Contact'),
+        ]);
+
+        $this->assertCount(3, $menu->getItems());
+    }
 }

From d8630e731e6c4c7e59dd6650070476f1a87b3f9c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 25 Mar 2024 12:29:49 +0100
Subject: [PATCH 1327/1422] Create initial array representation

---
 .../src/Framework/Features/Navigation/NavigationMenu.php  | 8 +++++++-
 packages/framework/tests/Feature/NavigationAPITest.php    | 6 +++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
index 8de2abe758c..f1a64e45be6 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
@@ -72,7 +72,13 @@ public function add(NavigationItem|NavigationGroup|array $items): static
      */
     public function toArray(): array
     {
-        //
+        return $this->getItems()->map(function (NavigationItem|NavigationGroup $item): array {
+            return [
+                'url' => $item->getLink(),
+                'title' => $item->getLabel(),
+                'active' => $item->isActive(),
+            ];
+        })->all();
     }
 
     protected function addItem(NavigationItem|NavigationGroup $item): void
diff --git a/packages/framework/tests/Feature/NavigationAPITest.php b/packages/framework/tests/Feature/NavigationAPITest.php
index 64208fe8b10..e0db6750d8e 100644
--- a/packages/framework/tests/Feature/NavigationAPITest.php
+++ b/packages/framework/tests/Feature/NavigationAPITest.php
@@ -27,6 +27,10 @@ public function testNavigationMenus()
             new NavigationItem(Routes::get('contact'), 'Contact'),
         ]);
 
-        $this->assertCount(3, $menu->getItems());
+        $this->assertSame([
+            ['url' => 'index.html', 'title' => 'Home', 'active' => false],
+            ['url' => 'about.html', 'title' => 'About', 'active' => false],
+            ['url' => 'contact.html', 'title' => 'Contact', 'active' => false],
+        ], $menu->toArray());
     }
 }

From c188e01beb2a0601c242aa23b0dfd82a907f7739 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 25 Mar 2024 12:31:29 +0100
Subject: [PATCH 1328/1422] Update array keys to match data structure

---
 .../src/Framework/Features/Navigation/NavigationMenu.php    | 6 +++---
 packages/framework/tests/Feature/NavigationAPITest.php      | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
index f1a64e45be6..e0b7203f393 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
@@ -68,14 +68,14 @@ public function add(NavigationItem|NavigationGroup|array $items): static
      *
      * @experimental This method is experimental and may be changed before release.
      *
-     * @return array<int, array{url: string, title: string, active: bool}>
+     * @return array<int, array{link: string, label: string, active: bool}>
      */
     public function toArray(): array
     {
         return $this->getItems()->map(function (NavigationItem|NavigationGroup $item): array {
             return [
-                'url' => $item->getLink(),
-                'title' => $item->getLabel(),
+                'link' => $item->getLink(),
+                'label' => $item->getLabel(),
                 'active' => $item->isActive(),
             ];
         })->all();
diff --git a/packages/framework/tests/Feature/NavigationAPITest.php b/packages/framework/tests/Feature/NavigationAPITest.php
index e0db6750d8e..169c60beb53 100644
--- a/packages/framework/tests/Feature/NavigationAPITest.php
+++ b/packages/framework/tests/Feature/NavigationAPITest.php
@@ -28,9 +28,9 @@ public function testNavigationMenus()
         ]);
 
         $this->assertSame([
-            ['url' => 'index.html', 'title' => 'Home', 'active' => false],
-            ['url' => 'about.html', 'title' => 'About', 'active' => false],
-            ['url' => 'contact.html', 'title' => 'Contact', 'active' => false],
+            ['link' => 'index.html', 'label' => 'Home', 'active' => false],
+            ['link' => 'about.html', 'label' => 'About', 'active' => false],
+            ['link' => 'contact.html', 'label' => 'Contact', 'active' => false],
         ], $menu->toArray());
     }
 }

From 091c93725fb27d3d6af396d375b5f085585cd2b7 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 25 Mar 2024 12:32:19 +0100
Subject: [PATCH 1329/1422] Remove active state from array

I think this helper makes most sense when it's portable, so we don't want render state specific data here
---
 .../src/Framework/Features/Navigation/NavigationMenu.php    | 3 +--
 packages/framework/tests/Feature/NavigationAPITest.php      | 6 +++---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
index e0b7203f393..cbb8b24cb23 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
@@ -68,7 +68,7 @@ public function add(NavigationItem|NavigationGroup|array $items): static
      *
      * @experimental This method is experimental and may be changed before release.
      *
-     * @return array<int, array{link: string, label: string, active: bool}>
+     * @return array<int, array{link: string, label: string}>
      */
     public function toArray(): array
     {
@@ -76,7 +76,6 @@ public function toArray(): array
             return [
                 'link' => $item->getLink(),
                 'label' => $item->getLabel(),
-                'active' => $item->isActive(),
             ];
         })->all();
     }
diff --git a/packages/framework/tests/Feature/NavigationAPITest.php b/packages/framework/tests/Feature/NavigationAPITest.php
index 169c60beb53..c44b5a9e0e4 100644
--- a/packages/framework/tests/Feature/NavigationAPITest.php
+++ b/packages/framework/tests/Feature/NavigationAPITest.php
@@ -28,9 +28,9 @@ public function testNavigationMenus()
         ]);
 
         $this->assertSame([
-            ['link' => 'index.html', 'label' => 'Home', 'active' => false],
-            ['link' => 'about.html', 'label' => 'About', 'active' => false],
-            ['link' => 'contact.html', 'label' => 'Contact', 'active' => false],
+            ['link' => 'index.html', 'label' => 'Home'],
+            ['link' => 'about.html', 'label' => 'About'],
+            ['link' => 'contact.html', 'label' => 'Contact'],
         ], $menu->toArray());
     }
 }

From 38050af04e6a1429f4fbc77d2e5bd0cbfa7d548f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 25 Mar 2024 12:35:54 +0100
Subject: [PATCH 1330/1422] Array serialize navigation groups

---
 .../Features/Navigation/NavigationMenu.php    | 12 +++++++++-
 .../tests/Feature/NavigationAPITest.php       | 22 +++++++++++++++++++
 2 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
index cbb8b24cb23..873ce83b4b6 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
@@ -68,11 +68,21 @@ public function add(NavigationItem|NavigationGroup|array $items): static
      *
      * @experimental This method is experimental and may be changed before release.
      *
-     * @return array<int, array{link: string, label: string}>
+     * @return array<int, array{link?: string, label: string, items?: array<int, array{link: string, label: string}>}>
      */
     public function toArray(): array
     {
         return $this->getItems()->map(function (NavigationItem|NavigationGroup $item): array {
+            if ($item instanceof NavigationGroup) {
+                return [
+                    'label' => $item->getLabel(),
+                    'items' => array_map(fn (NavigationItem $item): array => [
+                        'link' => $item->getLink(),
+                        'label' => $item->getLabel(),
+                    ], $item->getItems()),
+                ];
+            }
+
             return [
                 'link' => $item->getLink(),
                 'label' => $item->getLabel(),
diff --git a/packages/framework/tests/Feature/NavigationAPITest.php b/packages/framework/tests/Feature/NavigationAPITest.php
index c44b5a9e0e4..54f4ab06f1f 100644
--- a/packages/framework/tests/Feature/NavigationAPITest.php
+++ b/packages/framework/tests/Feature/NavigationAPITest.php
@@ -9,6 +9,7 @@
 use Hyde\Testing\MocksKernelFeatures;
 use Hyde\Framework\Features\Navigation\NavigationMenu;
 use Hyde\Framework\Features\Navigation\NavigationItem;
+use Hyde\Framework\Features\Navigation\NavigationGroup;
 
 /**
  * High level tests for the Navigation API.
@@ -33,4 +34,25 @@ public function testNavigationMenus()
             ['link' => 'contact.html', 'label' => 'Contact'],
         ], $menu->toArray());
     }
+
+    public function testNavigationMenusWithGroups()
+    {
+        $this->withPages(['index', 'about', 'contact']);
+
+        $menu = new NavigationMenu([
+            new NavigationItem(Routes::get('index'), 'Home'),
+            new NavigationGroup('About', [
+                new NavigationItem(Routes::get('about'), 'About Us'),
+                new NavigationItem(Routes::get('contact'), 'Contact Us'),
+            ]),
+        ]);
+
+        $this->assertSame([
+            ['link' => 'index.html', 'label' => 'Home'],
+            ['label' => 'About', 'items' => [
+                ['link' => 'about.html', 'label' => 'About Us'],
+                ['link' => 'contact.html', 'label' => 'Contact Us'],
+            ]],
+        ], $menu->toArray());
+    }
 }

From b1d62bfae5a58cd8d118debf18328ae4383e331b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 25 Mar 2024 12:39:24 +0100
Subject: [PATCH 1331/1422] Make navigation menu serializable

---
 .../Features/Navigation/NavigationMenu.php      |  6 +++++-
 .../tests/Feature/NavigationAPITest.php         | 17 +++++++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
index 873ce83b4b6..2c4d8d063f7 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
@@ -6,6 +6,8 @@
 
 use Illuminate\Support\Arr;
 use Illuminate\Support\Collection;
+use Hyde\Support\Concerns\Serializable;
+use Hyde\Support\Contracts\SerializableContract;
 use Illuminate\Contracts\Support\Arrayable;
 
 use function Hyde\evaluate_arrayable;
@@ -18,8 +20,10 @@
  * @example `$menu = app('navigation.main');` for the main navigation menu.
  * @example `$menu = app('navigation.sidebar');` for the documentation sidebar.
  */
-class NavigationMenu implements Arrayable
+class NavigationMenu implements SerializableContract
 {
+    use Serializable;
+
     public const DEFAULT = 500;
     public const LAST = 999;
 
diff --git a/packages/framework/tests/Feature/NavigationAPITest.php b/packages/framework/tests/Feature/NavigationAPITest.php
index 54f4ab06f1f..657110fda4d 100644
--- a/packages/framework/tests/Feature/NavigationAPITest.php
+++ b/packages/framework/tests/Feature/NavigationAPITest.php
@@ -33,6 +33,23 @@ public function testNavigationMenus()
             ['link' => 'about.html', 'label' => 'About'],
             ['link' => 'contact.html', 'label' => 'Contact'],
         ], $menu->toArray());
+
+        $this->assertSame(<<<JSON
+        [
+            {
+                "link": "index.html",
+                "label": "Home"
+            },
+            {
+                "link": "about.html",
+                "label": "About"
+            },
+            {
+                "link": "contact.html",
+                "label": "Contact"
+            }
+        ]
+        JSON, $menu->toJson(JSON_PRETTY_PRINT));
     }
 
     public function testNavigationMenusWithGroups()

From 86cdc95c21e6a4a16c71d26bc073ad826e3dc660 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 25 Mar 2024 12:39:27 +0100
Subject: [PATCH 1332/1422] Revert "Make navigation menu serializable"

This reverts commit 072c98a8f302ebeb4458d4815f62d2b58aa71efb. Probably overengineering.
---
 .../Features/Navigation/NavigationMenu.php      |  6 +-----
 .../tests/Feature/NavigationAPITest.php         | 17 -----------------
 2 files changed, 1 insertion(+), 22 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
index 2c4d8d063f7..873ce83b4b6 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
@@ -6,8 +6,6 @@
 
 use Illuminate\Support\Arr;
 use Illuminate\Support\Collection;
-use Hyde\Support\Concerns\Serializable;
-use Hyde\Support\Contracts\SerializableContract;
 use Illuminate\Contracts\Support\Arrayable;
 
 use function Hyde\evaluate_arrayable;
@@ -20,10 +18,8 @@
  * @example `$menu = app('navigation.main');` for the main navigation menu.
  * @example `$menu = app('navigation.sidebar');` for the documentation sidebar.
  */
-class NavigationMenu implements SerializableContract
+class NavigationMenu implements Arrayable
 {
-    use Serializable;
-
     public const DEFAULT = 500;
     public const LAST = 999;
 
diff --git a/packages/framework/tests/Feature/NavigationAPITest.php b/packages/framework/tests/Feature/NavigationAPITest.php
index 657110fda4d..54f4ab06f1f 100644
--- a/packages/framework/tests/Feature/NavigationAPITest.php
+++ b/packages/framework/tests/Feature/NavigationAPITest.php
@@ -33,23 +33,6 @@ public function testNavigationMenus()
             ['link' => 'about.html', 'label' => 'About'],
             ['link' => 'contact.html', 'label' => 'Contact'],
         ], $menu->toArray());
-
-        $this->assertSame(<<<JSON
-        [
-            {
-                "link": "index.html",
-                "label": "Home"
-            },
-            {
-                "link": "about.html",
-                "label": "About"
-            },
-            {
-                "link": "contact.html",
-                "label": "Contact"
-            }
-        ]
-        JSON, $menu->toJson(JSON_PRETTY_PRINT));
     }
 
     public function testNavigationMenusWithGroups()

From ecbe2fb05695eff5e39b5fbce661f9f83053d957 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 25 Mar 2024 12:49:06 +0100
Subject: [PATCH 1333/1422] Simplify array data structure

---
 .../Framework/Features/Navigation/NavigationMenu.php |  6 ++----
 .../framework/tests/Feature/NavigationAPITest.php    | 12 ++++++------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
index 873ce83b4b6..c4a2f1e5eb3 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
@@ -77,15 +77,13 @@ public function toArray(): array
                 return [
                     'label' => $item->getLabel(),
                     'items' => array_map(fn (NavigationItem $item): array => [
-                        'link' => $item->getLink(),
-                        'label' => $item->getLabel(),
+                        $item->getLink() => $item->getLabel(),
                     ], $item->getItems()),
                 ];
             }
 
             return [
-                'link' => $item->getLink(),
-                'label' => $item->getLabel(),
+                $item->getLink() => $item->getLabel(),
             ];
         })->all();
     }
diff --git a/packages/framework/tests/Feature/NavigationAPITest.php b/packages/framework/tests/Feature/NavigationAPITest.php
index 54f4ab06f1f..1325939c64d 100644
--- a/packages/framework/tests/Feature/NavigationAPITest.php
+++ b/packages/framework/tests/Feature/NavigationAPITest.php
@@ -29,9 +29,9 @@ public function testNavigationMenus()
         ]);
 
         $this->assertSame([
-            ['link' => 'index.html', 'label' => 'Home'],
-            ['link' => 'about.html', 'label' => 'About'],
-            ['link' => 'contact.html', 'label' => 'Contact'],
+            ['index.html' => 'Home'],
+            ['about.html' => 'About'],
+            ['contact.html' => 'Contact'],
         ], $menu->toArray());
     }
 
@@ -48,10 +48,10 @@ public function testNavigationMenusWithGroups()
         ]);
 
         $this->assertSame([
-            ['link' => 'index.html', 'label' => 'Home'],
+            ['index.html' => 'Home'],
             ['label' => 'About', 'items' => [
-                ['link' => 'about.html', 'label' => 'About Us'],
-                ['link' => 'contact.html', 'label' => 'Contact Us'],
+                ['about.html' => 'About Us'],
+                ['contact.html' => 'Contact Us'],
             ]],
         ], $menu->toArray());
     }

From cb08b9f4ccb91e746e1dae7b74ed7c7edd848af5 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 25 Mar 2024 12:52:45 +0100
Subject: [PATCH 1334/1422] Flatten array keys

---
 .../Features/Navigation/NavigationMenu.php    | 10 +++++-----
 .../tests/Feature/NavigationAPITest.php       | 19 +++++++++++--------
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
index c4a2f1e5eb3..c3425859737 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
@@ -72,14 +72,14 @@ public function add(NavigationItem|NavigationGroup|array $items): static
      */
     public function toArray(): array
     {
-        return $this->getItems()->map(function (NavigationItem|NavigationGroup $item): array {
+        return $this->getItems()->mapWithKeys(function (NavigationItem|NavigationGroup $item): array {
             if ($item instanceof NavigationGroup) {
-                return [
+                return [[
                     'label' => $item->getLabel(),
-                    'items' => array_map(fn (NavigationItem $item): array => [
+                    'items' => Arr::mapWithKeys($item->getItems(), fn (NavigationItem $item): array => [
                         $item->getLink() => $item->getLabel(),
-                    ], $item->getItems()),
-                ];
+                    ]),
+                ]];
             }
 
             return [
diff --git a/packages/framework/tests/Feature/NavigationAPITest.php b/packages/framework/tests/Feature/NavigationAPITest.php
index 1325939c64d..a26363978f8 100644
--- a/packages/framework/tests/Feature/NavigationAPITest.php
+++ b/packages/framework/tests/Feature/NavigationAPITest.php
@@ -29,9 +29,9 @@ public function testNavigationMenus()
         ]);
 
         $this->assertSame([
-            ['index.html' => 'Home'],
-            ['about.html' => 'About'],
-            ['contact.html' => 'Contact'],
+            'index.html' => 'Home',
+            'about.html' => 'About',
+            'contact.html' => 'Contact',
         ], $menu->toArray());
     }
 
@@ -48,11 +48,14 @@ public function testNavigationMenusWithGroups()
         ]);
 
         $this->assertSame([
-            ['index.html' => 'Home'],
-            ['label' => 'About', 'items' => [
-                ['about.html' => 'About Us'],
-                ['contact.html' => 'Contact Us'],
-            ]],
+            'index.html' => 'Home',
+            [
+                'label' => 'About',
+                'items' => [
+                    'about.html' => 'About Us',
+                    'contact.html' => 'Contact Us',
+                ],
+            ],
         ], $menu->toArray());
     }
 }

From 151992d79b8552205cda2176812f5f0ce6022ae7 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 25 Mar 2024 12:55:52 +0100
Subject: [PATCH 1335/1422] Put labels first in array representation

Considering we use a label-first approach for filtering, we are placing the highest importance on the labels, so we should put them first. It also makes it more semantic that $label leads to a $link
---
 .../Features/Navigation/NavigationMenu.php        | 15 ++++++++-------
 .../framework/tests/Feature/NavigationAPITest.php | 15 +++++++--------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
index c3425859737..30892e915ce 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
@@ -74,16 +74,17 @@ public function toArray(): array
     {
         return $this->getItems()->mapWithKeys(function (NavigationItem|NavigationGroup $item): array {
             if ($item instanceof NavigationGroup) {
-                return [[
-                    'label' => $item->getLabel(),
-                    'items' => Arr::mapWithKeys($item->getItems(), fn (NavigationItem $item): array => [
-                        $item->getLink() => $item->getLabel(),
-                    ]),
-                ]];
+                return [
+                    $item->getLabel() => [
+                        'items' => Arr::mapWithKeys($item->getItems(), fn (NavigationItem $item): array => [
+                            $item->getLabel() => $item->getLink(),
+                        ]),
+                    ]
+                ];
             }
 
             return [
-                $item->getLink() => $item->getLabel(),
+                $item->getLabel() => $item->getLink(),
             ];
         })->all();
     }
diff --git a/packages/framework/tests/Feature/NavigationAPITest.php b/packages/framework/tests/Feature/NavigationAPITest.php
index a26363978f8..390ce17c843 100644
--- a/packages/framework/tests/Feature/NavigationAPITest.php
+++ b/packages/framework/tests/Feature/NavigationAPITest.php
@@ -29,9 +29,9 @@ public function testNavigationMenus()
         ]);
 
         $this->assertSame([
-            'index.html' => 'Home',
-            'about.html' => 'About',
-            'contact.html' => 'Contact',
+            'Home' => 'index.html',
+            'About' => 'about.html',
+            'Contact' => 'contact.html',
         ], $menu->toArray());
     }
 
@@ -48,12 +48,11 @@ public function testNavigationMenusWithGroups()
         ]);
 
         $this->assertSame([
-            'index.html' => 'Home',
-            [
-                'label' => 'About',
+            'Home' => 'index.html',
+            'About' => [
                 'items' => [
-                    'about.html' => 'About Us',
-                    'contact.html' => 'Contact Us',
+                    'About Us' => 'about.html',
+                    'Contact Us' => 'contact.html',
                 ],
             ],
         ], $menu->toArray());

From 612df231cbc3d1ade7092a04b40e3785ea7183d3 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 25 Mar 2024 12:57:47 +0100
Subject: [PATCH 1336/1422] Cleanup and normalize formatting

---
 .../Framework/Features/Navigation/NavigationMenu.php | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
index 30892e915ce..e76cf5e5b46 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
@@ -76,16 +76,14 @@ public function toArray(): array
             if ($item instanceof NavigationGroup) {
                 return [
                     $item->getLabel() => [
-                        'items' => Arr::mapWithKeys($item->getItems(), fn (NavigationItem $item): array => [
-                            $item->getLabel() => $item->getLink(),
-                        ]),
-                    ]
+                        'items' => Arr::mapWithKeys($item->getItems(), function (NavigationItem $item): array {
+                            return [$item->getLabel() => $item->getLink()];
+                        }),
+                    ],
                 ];
             }
 
-            return [
-                $item->getLabel() => $item->getLink(),
-            ];
+            return [$item->getLabel() => $item->getLink()];
         })->all();
     }
 

From 8a316b3e1000d00342f32bb6662e139e18242398 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 25 Mar 2024 12:59:39 +0100
Subject: [PATCH 1337/1422] Update array generics for updated structure

---
 .../src/Framework/Features/Navigation/NavigationMenu.php        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
index e76cf5e5b46..35e90d30013 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
@@ -68,7 +68,7 @@ public function add(NavigationItem|NavigationGroup|array $items): static
      *
      * @experimental This method is experimental and may be changed before release.
      *
-     * @return array<int, array{link?: string, label: string, items?: array<int, array{link: string, label: string}>}>
+     * @return array<string, string|array{items: array<string, string>}>
      */
     public function toArray(): array
     {

From 3af4c3b18ff016963275b16079dc19059fe84acc Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 25 Mar 2024 13:29:04 +0100
Subject: [PATCH 1338/1422] Move experimental helper to test

Don't think we need this in the public API for now
---
 .../Features/Navigation/NavigationMenu.php    | 26 +------------------
 .../tests/Feature/NavigationAPITest.php       | 22 ++++++++++++++--
 2 files changed, 21 insertions(+), 27 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
index 35e90d30013..7329b6bfbe9 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
@@ -18,7 +18,7 @@
  * @example `$menu = app('navigation.main');` for the main navigation menu.
  * @example `$menu = app('navigation.sidebar');` for the documentation sidebar.
  */
-class NavigationMenu implements Arrayable
+class NavigationMenu
 {
     public const DEFAULT = 500;
     public const LAST = 999;
@@ -63,30 +63,6 @@ public function add(NavigationItem|NavigationGroup|array $items): static
         return $this;
     }
 
-    /**
-     * Get the navigation items in the menu as an array.
-     *
-     * @experimental This method is experimental and may be changed before release.
-     *
-     * @return array<string, string|array{items: array<string, string>}>
-     */
-    public function toArray(): array
-    {
-        return $this->getItems()->mapWithKeys(function (NavigationItem|NavigationGroup $item): array {
-            if ($item instanceof NavigationGroup) {
-                return [
-                    $item->getLabel() => [
-                        'items' => Arr::mapWithKeys($item->getItems(), function (NavigationItem $item): array {
-                            return [$item->getLabel() => $item->getLink()];
-                        }),
-                    ],
-                ];
-            }
-
-            return [$item->getLabel() => $item->getLink()];
-        })->all();
-    }
-
     protected function addItem(NavigationItem|NavigationGroup $item): void
     {
         $this->items->push($item);
diff --git a/packages/framework/tests/Feature/NavigationAPITest.php b/packages/framework/tests/Feature/NavigationAPITest.php
index 390ce17c843..eb2545efaca 100644
--- a/packages/framework/tests/Feature/NavigationAPITest.php
+++ b/packages/framework/tests/Feature/NavigationAPITest.php
@@ -5,6 +5,7 @@
 namespace Hyde\Framework\Testing\Feature;
 
 use Hyde\Testing\TestCase;
+use Illuminate\Support\Arr;
 use Hyde\Foundation\Facades\Routes;
 use Hyde\Testing\MocksKernelFeatures;
 use Hyde\Framework\Features\Navigation\NavigationMenu;
@@ -32,7 +33,7 @@ public function testNavigationMenus()
             'Home' => 'index.html',
             'About' => 'about.html',
             'Contact' => 'contact.html',
-        ], $menu->toArray());
+        ], $this->toArray($menu));
     }
 
     public function testNavigationMenusWithGroups()
@@ -55,6 +56,23 @@ public function testNavigationMenusWithGroups()
                     'Contact Us' => 'contact.html',
                 ],
             ],
-        ], $menu->toArray());
+        ], $this->toArray($menu));
+    }
+
+    protected function toArray(NavigationMenu $menu): array
+    {
+        return $menu->getItems()->mapWithKeys(function (NavigationItem|NavigationGroup $item): array {
+            if ($item instanceof NavigationGroup) {
+                return [
+                    $item->getLabel() => [
+                        'items' => Arr::mapWithKeys($item->getItems(), function (NavigationItem $item): array {
+                            return [$item->getLabel() => $item->getLink()];
+                        }),
+                    ],
+                ];
+            }
+
+            return [$item->getLabel() => $item->getLink()];
+        })->all();
     }
 }

From 1332d658a2b8ec51bca60bb351cb1bdee94de18a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 25 Mar 2024 13:33:29 +0100
Subject: [PATCH 1339/1422] Update test abstract

---
 packages/framework/tests/Feature/NavigationAPITest.php | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/packages/framework/tests/Feature/NavigationAPITest.php b/packages/framework/tests/Feature/NavigationAPITest.php
index eb2545efaca..379b4c970c6 100644
--- a/packages/framework/tests/Feature/NavigationAPITest.php
+++ b/packages/framework/tests/Feature/NavigationAPITest.php
@@ -13,7 +13,7 @@
 use Hyde\Framework\Features\Navigation\NavigationGroup;
 
 /**
- * High level tests for the Navigation API.
+ * High level tests for the Navigation API to go along with the documentation.
  */
 class NavigationAPITest extends TestCase
 {
@@ -34,6 +34,13 @@ public function testNavigationMenus()
             'About' => 'about.html',
             'Contact' => 'contact.html',
         ], $this->toArray($menu));
+
+        foreach ($menu->getItems() as $item) {
+            $this->assertInstanceOf(NavigationItem::class, $item);
+
+            $this->assertIsString($item->getLabel());
+            $this->assertIsString($item->getLink());
+        }
     }
 
     public function testNavigationMenusWithGroups()

From 974a77d83a2ca6adfc944ca07e785199c3519945 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 25 Mar 2024 13:47:28 +0100
Subject: [PATCH 1340/1422] Begin adding code driven documentation

---
 .../tests/Feature/NavigationAPITest.php       | 71 ++++++++++++++++++-
 1 file changed, 70 insertions(+), 1 deletion(-)

diff --git a/packages/framework/tests/Feature/NavigationAPITest.php b/packages/framework/tests/Feature/NavigationAPITest.php
index 379b4c970c6..9458bff9e13 100644
--- a/packages/framework/tests/Feature/NavigationAPITest.php
+++ b/packages/framework/tests/Feature/NavigationAPITest.php
@@ -4,6 +4,7 @@
 
 namespace Hyde\Framework\Testing\Feature;
 
+use Hyde\Pages\BladePage;
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Arr;
 use Hyde\Foundation\Facades\Routes;
@@ -13,16 +14,82 @@
 use Hyde\Framework\Features\Navigation\NavigationGroup;
 
 /**
- * High level tests for the Navigation API to go along with the documentation.
+ * High level tests for the Navigation API to go along with the code-driven documentation.
  */
 class NavigationAPITest extends TestCase
 {
     use MocksKernelFeatures;
 
+    public function testNavigationItems()
+    {
+        // Each navigation item is represented by a NavigationItem instance containing the needed information.
+
+        // ## Creating Navigation Items
+
+        // There are a few ways to create navigation items, depending on your needs.
+
+        // You can create instances directly by passing either a URL or Route instance to the constructor.
+        $item = new NavigationItem(Routes::get('index'), 'Home');
+        $this->assertInstanceOf(NavigationItem::class, $item);
+        $item = new NavigationItem('https://example.com', 'External Link');
+        $this->assertInstanceOf(NavigationItem::class, $item);
+
+        // You can also set the priority of the item, which determines its position in the menu.
+        $item = new NavigationItem(Routes::get('index'), 'Home', 25);
+        $this->assertSame(25, $item->getPriority());
+
+        // You can also create instances using the static create method, which can automatically fill in the label and priority from a Route.
+        $item = NavigationItem::create(Routes::get('index'));
+        $this->assertSame('Home', $item->getLabel());
+        $this->assertSame(0, $item->getPriority());
+
+        // You can also pass a custom label and priority to the create method to override the defaults.
+        $item = NavigationItem::create(Routes::get('index'), 'Custom Label', 50);
+        $this->assertSame('Custom Label', $item->getLabel());
+        $this->assertSame(50, $item->getPriority());
+
+        // The create method also works with route keys.
+        $item = NavigationItem::create('index');
+        $this->assertSame('Home', $item->getLabel());
+        $this->assertEquals(NavigationItem::create('index'), NavigationItem::create(Routes::get('index')));
+
+        // You can also pass a URL to the create method.
+        $item = NavigationItem::create('https://example.com');
+        $this->assertSame('https://example.com', $item->getLink());
+
+        // Unless you pass a custom label to URL items, the label will be the URL itself.
+        $item = NavigationItem::create('https://example.com');
+        $this->assertSame('https://example.com', $item->getLabel());
+
+        // ## Navigation Item Methods
+
+        // There are a few helper methods available on NavigationItem instances.
+        $item = NavigationItem::create('index'); // Documentation ignores this line.
+
+        // Get the label of the item.
+        $this->assertSame('Home', $item->getLabel());
+
+        // Get the link of the item.
+        $this->assertSame('index.html', $item->getLink());
+
+        // You can also get the link by casting the item to a string.
+        $this->assertSame('index.html', (string) $item);
+
+        // Get the priority of the item.
+        $this->assertSame(0, $item->getPriority());
+
+        // Get the underlying Page instance of the item, if it exists. If the item is not a routed page (like direct URLs), this will return null.
+        $this->assertInstanceOf(BladePage::class, $item->getPage());
+
+        // Check if the item is active (the current page being rendered).
+        $this->assertFalse($item->isActive());
+    }
+
     public function testNavigationMenus()
     {
         $this->withPages(['index', 'about', 'contact']);
 
+        // Navigation menus are created with an array of NavigationItem instances.
         $menu = new NavigationMenu([
             new NavigationItem(Routes::get('index'), 'Home'),
             new NavigationItem(Routes::get('about'), 'About'),
@@ -35,6 +102,7 @@ public function testNavigationMenus()
             'Contact' => 'contact.html',
         ], $this->toArray($menu));
 
+        // You can get the items in the menu, which are automatically sorted by their priority.
         foreach ($menu->getItems() as $item) {
             $this->assertInstanceOf(NavigationItem::class, $item);
 
@@ -47,6 +115,7 @@ public function testNavigationMenusWithGroups()
     {
         $this->withPages(['index', 'about', 'contact']);
 
+        // You can also add navigation groups to the menu, which can contain more items.
         $menu = new NavigationMenu([
             new NavigationItem(Routes::get('index'), 'Home'),
             new NavigationGroup('About', [

From 3d9e7125d3eec0b3e6347d0f9c3619945ae3ed1c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 25 Mar 2024 13:48:54 +0100
Subject: [PATCH 1341/1422] Create navigation-api.md

---
 docs/advanced-features/navigation-api.md | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 docs/advanced-features/navigation-api.md

diff --git a/docs/advanced-features/navigation-api.md b/docs/advanced-features/navigation-api.md
new file mode 100644
index 00000000000..10dc1cfda42
--- /dev/null
+++ b/docs/advanced-features/navigation-api.md
@@ -0,0 +1,7 @@
+---
+navigation:
+    label: "Navigation API"
+---
+
+# Navigation API
+

From 45c62523b4c8e25a8662e284dcc89e967d43ccc4 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 25 Mar 2024 13:50:38 +0100
Subject: [PATCH 1342/1422] Add warning

---
 docs/advanced-features/navigation-api.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/advanced-features/navigation-api.md b/docs/advanced-features/navigation-api.md
index 10dc1cfda42..4f7c75ef215 100644
--- a/docs/advanced-features/navigation-api.md
+++ b/docs/advanced-features/navigation-api.md
@@ -5,3 +5,4 @@ navigation:
 
 # Navigation API
 
+>warning This article covers advanced information that is only relevant if you want to create custom navigation menus. Instead, you may want to read the [Navigation](navigation) article for a general overview.

From d930787a739d0b3029325cc4aeb8d04b41d40818 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 25 Mar 2024 13:51:47 +0100
Subject: [PATCH 1343/1422] Add abstract

---
 docs/advanced-features/navigation-api.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/docs/advanced-features/navigation-api.md b/docs/advanced-features/navigation-api.md
index 4f7c75ef215..f71365d3c19 100644
--- a/docs/advanced-features/navigation-api.md
+++ b/docs/advanced-features/navigation-api.md
@@ -6,3 +6,8 @@ navigation:
 # Navigation API
 
 >warning This article covers advanced information that is only relevant if you want to create custom navigation menus. Instead, you may want to read the [Navigation](navigation) article for a general overview.
+
+## Abstract
+
+This article describes the Navigation API introduced in HydePHP v2. Both the main navigation menu and the documentation sidebar bundled with HydePHP are built with this API.
+However, if you are interested in creating your own custom navigation menus, you can also utilize this API - and this article will show you how.

From 356202467ff3cd05b1c23a2d3f7e625a4c936d2a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 25 Mar 2024 13:52:28 +0100
Subject: [PATCH 1344/1422] Document target reader

---
 docs/advanced-features/navigation-api.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docs/advanced-features/navigation-api.md b/docs/advanced-features/navigation-api.md
index f71365d3c19..a767173f3cb 100644
--- a/docs/advanced-features/navigation-api.md
+++ b/docs/advanced-features/navigation-api.md
@@ -11,3 +11,6 @@ navigation:
 
 This article describes the Navigation API introduced in HydePHP v2. Both the main navigation menu and the documentation sidebar bundled with HydePHP are built with this API.
 However, if you are interested in creating your own custom navigation menus, you can also utilize this API - and this article will show you how.
+
+This article is intended for advanced users, as most users will not need to create custom navigation menus.
+For this reason, the documentation is very code-driven due to the technical nature of the API.

From adb51bf58fdbae618f6ef34e9adabe8be7c98819 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 25 Mar 2024 14:16:54 +0100
Subject: [PATCH 1345/1422] Document overview

---
 docs/advanced-features/navigation-api.md | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/docs/advanced-features/navigation-api.md b/docs/advanced-features/navigation-api.md
index a767173f3cb..ef54dc15746 100644
--- a/docs/advanced-features/navigation-api.md
+++ b/docs/advanced-features/navigation-api.md
@@ -14,3 +14,13 @@ However, if you are interested in creating your own custom navigation menus, you
 
 This article is intended for advanced users, as most users will not need to create custom navigation menus.
 For this reason, the documentation is very code-driven due to the technical nature of the API.
+
+## Overview
+
+The Navigation API consists of a set of classes within the `Hyde\Framework\Features\Navigation` namespace.
+
+Together, these form an object-oriented way to create and interact with navigation menus and their items.
+
+In short, a navigation menu is an instance of the `NavigationMenu` class. Each menu contains a collection of `NavigationItem` or `NavigationGroup` classes.
+The former represents a single item in the menu, while the latter represents a group of items.
+

From c6a5cbd2c5e452aef131a85f458b4b129a719380 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 25 Mar 2024 14:17:05 +0100
Subject: [PATCH 1346/1422] Document visualisation

---
 docs/advanced-features/navigation-api.md | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/docs/advanced-features/navigation-api.md b/docs/advanced-features/navigation-api.md
index ef54dc15746..ca23fb81218 100644
--- a/docs/advanced-features/navigation-api.md
+++ b/docs/advanced-features/navigation-api.md
@@ -24,3 +24,22 @@ Together, these form an object-oriented way to create and interact with navigati
 In short, a navigation menu is an instance of the `NavigationMenu` class. Each menu contains a collection of `NavigationItem` or `NavigationGroup` classes.
 The former represents a single item in the menu, while the latter represents a group of items.
 
+### Visualisation
+
+Here is a visual representation of the structure of a navigation menu:
+
+```php
+namespace Hyde\Framework\Features\Navigation;
+
+class NavigationMenu {
+    protected Collection $items = [
+        new NavigationItem(destination: 'index.html', label: 'Home'),
+        new NavigationItem(destination: 'posts.html', label: 'Blog'),
+        new NavigationGroup(label: 'About', items: [
+            new NavigationItem(destination: 'about.html', label: 'About Us'),
+            new NavigationItem(destination: 'team.html', label: 'Our Team'),
+        ]),
+    ];
+}
+```
+

From 765c1df70cec9d0222049bad82debc05c9354b85 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 25 Mar 2024 14:17:13 +0100
Subject: [PATCH 1347/1422] Document built in menus

---
 docs/advanced-features/navigation-api.md | 28 ++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/docs/advanced-features/navigation-api.md b/docs/advanced-features/navigation-api.md
index ca23fb81218..6799b4bb04b 100644
--- a/docs/advanced-features/navigation-api.md
+++ b/docs/advanced-features/navigation-api.md
@@ -43,3 +43,31 @@ class NavigationMenu {
 }
 ```
 
+### Built-in Menus
+
+HydePHP comes with two built-in menus: the main navigation menu and the documentation sidebar.
+
+These are bound into the service container as singletons and can be accessed through dependency injection.
+
+```php
+use Hyde\Framework\Features\Navigation\MainNavigationMenu;
+use Hyde\Framework\Features\Navigation\DocumentationSidebar;
+
+/** @var \Hyde\Framework\Features\Navigation\MainNavigationMenu $menu */
+$menu = app('navigation.main')
+
+/** @var DocumentationSidebar $sidebar */
+$sidebar= app('navigation.sidebar')
+```
+
+You can also get them through the static `get` helpers on the menu classes themselves.
+
+```php
+use Hyde\Framework\Features\Navigation\MainNavigationMenu;
+use Hyde\Framework\Features\Navigation\DocumentationSidebar;
+
+$menu = MainNavigationMenu::get();
+$sidebar = DocumentationSidebar::get();
+```
+
+>info Developer tip: The menus are only generated *after* the Hyde Kernel is booted. If you are getting BindingResolutionExceptions, ensure that you are not trying to access the menus too early in the application lifecycle. (Consider using the `booted` event.) 

From e4e7b3a45f2dce7e845e257befb8ae58a0dc1cdc Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 25 Mar 2024 14:17:50 +0100
Subject: [PATCH 1348/1422] Test service container menus

---
 .../tests/Feature/NavigationAPITest.php       | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/packages/framework/tests/Feature/NavigationAPITest.php b/packages/framework/tests/Feature/NavigationAPITest.php
index 9458bff9e13..5446e192e02 100644
--- a/packages/framework/tests/Feature/NavigationAPITest.php
+++ b/packages/framework/tests/Feature/NavigationAPITest.php
@@ -4,6 +4,7 @@
 
 namespace Hyde\Framework\Testing\Feature;
 
+use Hyde\Hyde;
 use Hyde\Pages\BladePage;
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Arr;
@@ -12,6 +13,8 @@
 use Hyde\Framework\Features\Navigation\NavigationMenu;
 use Hyde\Framework\Features\Navigation\NavigationItem;
 use Hyde\Framework\Features\Navigation\NavigationGroup;
+use Hyde\Framework\Features\Navigation\MainNavigationMenu;
+use Hyde\Framework\Features\Navigation\DocumentationSidebar;
 
 /**
  * High level tests for the Navigation API to go along with the code-driven documentation.
@@ -20,6 +23,23 @@ class NavigationAPITest extends TestCase
 {
     use MocksKernelFeatures;
 
+    public function testServiceContainerMenus()
+    {
+        // The NavigationServiceProvider binds the main and sidebar navigation menus into the service container.
+
+        Hyde::boot();
+
+        // You can access the menus from the service container.
+
+        $this->assertInstanceOf(MainNavigationMenu::class, app('navigation.main'));
+        $this->assertInstanceOf(DocumentationSidebar::class, app('navigation.sidebar'));
+
+        // You can also use the facade to access the menus.
+
+        $this->assertSame(app('navigation.main'), MainNavigationMenu::get());
+        $this->assertSame(app('navigation.sidebar'), DocumentationSidebar::get());
+    }
+
     public function testNavigationItems()
     {
         // Each navigation item is represented by a NavigationItem instance containing the needed information.

From 77ca13070837f6294de253519d886129b8f2249c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 26 Mar 2024 13:06:16 +0100
Subject: [PATCH 1349/1422] Improve section introduction

---
 docs/advanced-features/navigation-api.md | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/docs/advanced-features/navigation-api.md b/docs/advanced-features/navigation-api.md
index 6799b4bb04b..397d6b466de 100644
--- a/docs/advanced-features/navigation-api.md
+++ b/docs/advanced-features/navigation-api.md
@@ -45,9 +45,8 @@ class NavigationMenu {
 
 ### Built-in Menus
 
-HydePHP comes with two built-in menus: the main navigation menu and the documentation sidebar.
-
-These are bound into the service container as singletons and can be accessed through dependency injection.
+HydePHP comes with two built-in menus: the main navigation menu and the documentation sidebar, both represented as child classes of the `NavigationMenu` class.
+They are bound into the service container as singletons and can be accessed through dependency injection.
 
 ```php
 use Hyde\Framework\Features\Navigation\MainNavigationMenu;

From cffbdb694d71f9420daedb2cbccd141f6b1f6100 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 26 Mar 2024 14:29:06 +0100
Subject: [PATCH 1350/1422] Create new custom menu section

---
 docs/advanced-features/navigation-api.md | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/docs/advanced-features/navigation-api.md b/docs/advanced-features/navigation-api.md
index 397d6b466de..79bb7b9a736 100644
--- a/docs/advanced-features/navigation-api.md
+++ b/docs/advanced-features/navigation-api.md
@@ -70,3 +70,16 @@ $sidebar = DocumentationSidebar::get();
 ```
 
 >info Developer tip: The menus are only generated *after* the Hyde Kernel is booted. If you are getting BindingResolutionExceptions, ensure that you are not trying to access the menus too early in the application lifecycle. (Consider using the `booted` event.) 
+
+## Creating Custom Menus
+
+### Overview
+
+When creating a custom menu, there are two ways to go about it:
+
+1. You can construct a NavigationMenu instance directly and add items to it. This works great for smaller menus that don't need any special logic, for example a footer menu or social media links.
+2. You can create a custom class that extends the NavigationMenu class. This is useful for larger menus that require more complex logic, or that you want to reuse in multiple places in your application or in a package.
+
+In both cases, the underlying API is the same, and you can use the helper methods and features provided by the APIs.
+
+In this section, you will first see some high level overviews of how the API can be used, then we'll dive in deeper and take a look at each class and method in detail.

From f567fcb0a64615eaaa3ae33373a5a022281849e0 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 26 Mar 2024 14:44:04 +0100
Subject: [PATCH 1351/1422] Update heading

---
 docs/advanced-features/navigation-api.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/advanced-features/navigation-api.md b/docs/advanced-features/navigation-api.md
index 79bb7b9a736..65d39675759 100644
--- a/docs/advanced-features/navigation-api.md
+++ b/docs/advanced-features/navigation-api.md
@@ -73,7 +73,7 @@ $sidebar = DocumentationSidebar::get();
 
 ## Creating Custom Menus
 
-### Overview
+### Introduction Overview
 
 When creating a custom menu, there are two ways to go about it:
 

From 504373c08267e1eb0a4e9787dd96b1f85aa1c9eb Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 26 Mar 2024 14:53:17 +0100
Subject: [PATCH 1352/1422] Begin adding high level example

---
 docs/advanced-features/navigation-api.md      | 27 +++++++++++++++++++
 .../tests/Feature/NavigationAPITest.php       | 15 +++++++++++
 2 files changed, 42 insertions(+)

diff --git a/docs/advanced-features/navigation-api.md b/docs/advanced-features/navigation-api.md
index 65d39675759..31421354ea0 100644
--- a/docs/advanced-features/navigation-api.md
+++ b/docs/advanced-features/navigation-api.md
@@ -83,3 +83,30 @@ When creating a custom menu, there are two ways to go about it:
 In both cases, the underlying API is the same, and you can use the helper methods and features provided by the APIs.
 
 In this section, you will first see some high level overviews of how the API can be used, then we'll dive in deeper and take a look at each class and method in detail.
+
+### High Level Example
+
+Here is a high level example of how you can create a custom menu, and how to actually utilize it into something useful: A menu with social media links for a site footer.
+
+#### Step 1: Create the Menu
+
+```php
+// To create our menu, we start by constructing a new NavigationMenu instance
+$menu = new NavigationMenu();
+
+// We can then add our social media links to the menu.
+// We do this by adding NavigationItem instances to the menu.
+$menu->add([
+    // The first parameter is the URL, and the second is the label.
+    NavigationItem::create('https://twitter.com/hydephp', 'Twitter'),
+    NavigationItem::create('https://github.com/hydephp', 'GitHub'),
+    NavigationItem::create('https://hydephp.com', 'Website'),
+]);
+```
+
+#### Tips:
+ 
+- You can use the `add` method to add single items or arrays of items. You can also pass an array of items directly to the menu constructor.
+- The navigation menu items is stored in a Laravel Collection, and is type safe to support both `NavigationItem` and `NavigationGroup` instances. 
+- You can also construct NavigationItem instances directly, but the `create` method is a convenient shorthand, and can fill in data from routes, if you use them.
+- It's also possible to set an item's priority as the third parameter, but here we don't need it, as they default to the order they are added.
diff --git a/packages/framework/tests/Feature/NavigationAPITest.php b/packages/framework/tests/Feature/NavigationAPITest.php
index 5446e192e02..5ddb5bc211a 100644
--- a/packages/framework/tests/Feature/NavigationAPITest.php
+++ b/packages/framework/tests/Feature/NavigationAPITest.php
@@ -155,6 +155,21 @@ public function testNavigationMenusWithGroups()
         ], $this->toArray($menu));
     }
 
+    public function testSocialMediaFooterLinkExample()
+    {
+        // To create our menu, we start by constructing a new NavigationMenu instance
+        $menu = new NavigationMenu();
+
+        // We can then add our social media links to the menu.
+        // We do this by adding NavigationItem instances to the menu.
+        $menu->add([
+            // The first parameter is the URL, and the second is the label.
+            NavigationItem::create('https://twitter.com/hydephp', 'Twitter'),
+            NavigationItem::create('https://github.com/hydephp', 'GitHub'),
+            NavigationItem::create('https://hydephp.com', 'Website'),
+        ]);
+    }
+
     protected function toArray(NavigationMenu $menu): array
     {
         return $menu->getItems()->mapWithKeys(function (NavigationItem|NavigationGroup $item): array {

From 89ae76f22fe2eccbbf60e63fb58e0939025efa39 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 26 Mar 2024 15:13:26 +0100
Subject: [PATCH 1353/1422] Add more complete documentation examples

---
 docs/advanced-features/navigation-api.md      | 45 ++++++++++++++++---
 .../tests/Feature/NavigationAPITest.php       | 35 +++++++++++++++
 2 files changed, 74 insertions(+), 6 deletions(-)

diff --git a/docs/advanced-features/navigation-api.md b/docs/advanced-features/navigation-api.md
index 31421354ea0..d1cc4e87ee2 100644
--- a/docs/advanced-features/navigation-api.md
+++ b/docs/advanced-features/navigation-api.md
@@ -86,16 +86,16 @@ In this section, you will first see some high level overviews of how the API can
 
 ### High Level Example
 
-Here is a high level example of how you can create a custom menu, and how to actually utilize it into something useful: A menu with social media links for a site footer.
+To illustrate how you can create a custom menu, let's make something useful: A footer menu with social media links.
 
 #### Step 1: Create the Menu
 
+To create our menu, we start by constructing a new NavigationMenu instance.
+We can then add our social media links as NavigationItem instances to the menu.
+
 ```php
-// To create our menu, we start by constructing a new NavigationMenu instance
 $menu = new NavigationMenu();
 
-// We can then add our social media links to the menu.
-// We do this by adding NavigationItem instances to the menu.
 $menu->add([
     // The first parameter is the URL, and the second is the label.
     NavigationItem::create('https://twitter.com/hydephp', 'Twitter'),
@@ -104,8 +104,41 @@ $menu->add([
 ]);
 ```
 
-#### Tips:
- 
+#### Step 2: Display the Menu
+
+We can now iterate over the menu items to render them in our footer.
+
+```blade
+<footer>
+    <ul>
+        @foreach ($menu->getItems() as $item)
+            <li><a href="{{ $item->getLink() }}">{{ $item->getLabel() }}</a></li>
+        @endforeach
+    </ul>
+</footer>
+```
+
+This will result in the following HTML:
+
+```html
+<footer>
+    <ul>
+        <li><a href="https://twitter.com/hydephp">Twitter</a></li>
+        <li><a href="https://github.com/hydephp">GitHub</a></li>
+        <li><a href="https://hydephp.com">Website</a></li>
+    </ul>
+</footer>
+```
+
+#### Next Steps & Tips
+
+Of course, this is an incredibly simplistic example to illustrate the core concepts.
+Where the Navigation API really shines is in more complex scenarios where you want to utilize things like
+HydePHP Routes to resolve dynamic relative urls, and to use features like groups, priorities, and active states helpers to check if a menu item is the current page being viewed.
+
+The object-oriented nature of the API also makes this perfect for package developers wanting to create dynamic and reusable navigation menus that even can be further extended and customized by the end user.
+
+Here are some general tips to keep in mind when working with the Navigation API:
 - You can use the `add` method to add single items or arrays of items. You can also pass an array of items directly to the menu constructor.
 - The navigation menu items is stored in a Laravel Collection, and is type safe to support both `NavigationItem` and `NavigationGroup` instances. 
 - You can also construct NavigationItem instances directly, but the `create` method is a convenient shorthand, and can fill in data from routes, if you use them.
diff --git a/packages/framework/tests/Feature/NavigationAPITest.php b/packages/framework/tests/Feature/NavigationAPITest.php
index 5ddb5bc211a..5bb966a87a3 100644
--- a/packages/framework/tests/Feature/NavigationAPITest.php
+++ b/packages/framework/tests/Feature/NavigationAPITest.php
@@ -10,6 +10,7 @@
 use Illuminate\Support\Arr;
 use Hyde\Foundation\Facades\Routes;
 use Hyde\Testing\MocksKernelFeatures;
+use Illuminate\Support\Facades\Blade;
 use Hyde\Framework\Features\Navigation\NavigationMenu;
 use Hyde\Framework\Features\Navigation\NavigationItem;
 use Hyde\Framework\Features\Navigation\NavigationGroup;
@@ -168,6 +169,27 @@ public function testSocialMediaFooterLinkExample()
             NavigationItem::create('https://github.com/hydephp', 'GitHub'),
             NavigationItem::create('https://hydephp.com', 'Website'),
         ]);
+
+        $rendered = Blade::render(/** @lang Blade */ <<<'BLADE'
+        {{-- We can now iterate over the menu items to render them in our footer. --}}
+        <footer>
+            <ul>
+                @foreach ($menu->getItems() as $item)
+                    <li><a href="{{ $item->getLink() }}">{{ $item->getLabel() }}</a></li>
+                @endforeach
+            </ul>
+        </footer>
+        BLADE, ['menu' => $menu]);
+
+        $this->assertSameIgnoringIndentation(<<<'HTML'
+        <footer>
+            <ul>
+                <li><a href="https://twitter.com/hydephp">Twitter</a></li>
+                <li><a href="https://github.com/hydephp">GitHub</a></li>
+                <li><a href="https://hydephp.com">Website</a></li>
+            </ul>
+        </footer>
+        HTML, $rendered);
     }
 
     protected function toArray(NavigationMenu $menu): array
@@ -186,4 +208,17 @@ protected function toArray(NavigationMenu $menu): array
             return [$item->getLabel() => $item->getLink()];
         })->all();
     }
+
+    protected function assertSameIgnoringIndentation(string $expected, string $actual): void
+    {
+        $this->assertSame(
+            $this->removeIndentation(trim($expected)),
+            $this->removeIndentation(trim($actual))
+        );
+    }
+
+    protected function removeIndentation(string $actual): string
+    {
+        return implode("\n", array_map('trim', explode("\n", $actual)));
+    }
 }

From cc055330f569db223e43e1ab043738281edac030 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 26 Mar 2024 15:14:33 +0100
Subject: [PATCH 1354/1422] Update abstract

---
 docs/advanced-features/navigation-api.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/advanced-features/navigation-api.md b/docs/advanced-features/navigation-api.md
index d1cc4e87ee2..250137f1da1 100644
--- a/docs/advanced-features/navigation-api.md
+++ b/docs/advanced-features/navigation-api.md
@@ -14,6 +14,7 @@ However, if you are interested in creating your own custom navigation menus, you
 
 This article is intended for advanced users, as most users will not need to create custom navigation menus.
 For this reason, the documentation is very code-driven due to the technical nature of the API.
+We'll also be mixing in some practical examples of Blade and PHP code to illustrate how you can use the API in your own projects.
 
 ## Overview
 

From 0b9c84d2179397969466caf757e063a40e948ae7 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 26 Mar 2024 15:31:17 +0100
Subject: [PATCH 1355/1422] Update section to lead to the new documentation
 page

---
 docs/digging-deeper/navigation.md | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/docs/digging-deeper/navigation.md b/docs/digging-deeper/navigation.md
index b904b37bbbd..65bac03a553 100644
--- a/docs/digging-deeper/navigation.md
+++ b/docs/digging-deeper/navigation.md
@@ -326,14 +326,7 @@ use Hyde\Framework\Features\Navigation\DropdownNavigationItem;
 
 ## The Navigation API
 
-If you want to interact with the site navigation programmatically, you can do so through the new Navigation API.
-
+If you want to interact with the site navigation programmatically, or if you want to create complex custom, you can do so through the new Navigation API.
 For most cases you don't need this, as Hyde creates the navigation for you. But it can be useful for advanced users and package developers.
 
-### Overview
-
-The Navigation API consists of the following classes, allowing you to fluently interact with the navigation menus:
-
-```php
-use Hyde\Framework\Features\Navigation\NavigationMenu;
-```
+The Navigation API consists of a set of PHP classes, allowing you to fluently interact with the navigation menus. You can learn more about the API in the [Navigation API](navigation-api) documentation.

From d0e494890e10ff827dd1a221c31033ebb7d2d224 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 26 Mar 2024 15:34:42 +0100
Subject: [PATCH 1356/1422] Set up documentation coverage

---
 packages/framework/tests/Feature/NavigationAPITest.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/packages/framework/tests/Feature/NavigationAPITest.php b/packages/framework/tests/Feature/NavigationAPITest.php
index 5bb966a87a3..26b444577ac 100644
--- a/packages/framework/tests/Feature/NavigationAPITest.php
+++ b/packages/framework/tests/Feature/NavigationAPITest.php
@@ -19,6 +19,14 @@
 
 /**
  * High level tests for the Navigation API to go along with the code-driven documentation.
+ *
+ * @see \Hyde\Framework\Features\Navigation\
+ *
+ * @covers \Hyde\Framework\Features\Navigation\NavigationMenu
+ * @covers \Hyde\Framework\Features\Navigation\NavigationItem
+ * @covers \Hyde\Framework\Features\Navigation\NavigationGroup
+ * @covers \Hyde\Framework\Features\Navigation\MainNavigationMenu
+ * @covers \Hyde\Framework\Features\Navigation\DocumentationSidebar
  */
 class NavigationAPITest extends TestCase
 {

From 5d5b0df75f51cf56f407695f4df6b4388276b3b8 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 26 Mar 2024 16:49:38 +0100
Subject: [PATCH 1357/1422] Begin class reference section

---
 docs/advanced-features/navigation-api.md | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/docs/advanced-features/navigation-api.md b/docs/advanced-features/navigation-api.md
index 250137f1da1..9d5921bd426 100644
--- a/docs/advanced-features/navigation-api.md
+++ b/docs/advanced-features/navigation-api.md
@@ -144,3 +144,13 @@ Here are some general tips to keep in mind when working with the Navigation API:
 - The navigation menu items is stored in a Laravel Collection, and is type safe to support both `NavigationItem` and `NavigationGroup` instances. 
 - You can also construct NavigationItem instances directly, but the `create` method is a convenient shorthand, and can fill in data from routes, if you use them.
 - It's also possible to set an item's priority as the third parameter, but here we don't need it, as they default to the order they are added.
+
+## Class Reference
+
+Below is a reference of the classes and methods available in the Navigation API.
+
+### NavigationMenu
+
+### NavigationItem
+
+### NavigationGroup

From babd111aa406460cff29f646165b02358197463f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 26 Mar 2024 17:03:22 +0100
Subject: [PATCH 1358/1422] Add section introductions

---
 docs/advanced-features/navigation-api.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/docs/advanced-features/navigation-api.md b/docs/advanced-features/navigation-api.md
index 9d5921bd426..9a17702d534 100644
--- a/docs/advanced-features/navigation-api.md
+++ b/docs/advanced-features/navigation-api.md
@@ -151,6 +151,12 @@ Below is a reference of the classes and methods available in the Navigation API.
 
 ### NavigationMenu
 
+The `NavigationMenu` class represents a navigation menu. It contains a collection of items, which can be either `NavigationItem` or `NavigationGroup` instances.
+
 ### NavigationItem
 
+The `NavigationItem` class represents a single item in a navigation menu. It contains information such as the destination link, label, and priority for ordering in the menu.
+
 ### NavigationGroup
+
+The `NavigationGroup` class represents a group of items in a navigation menu. It contains a label and a collection of items. This class is often used to create submenus or dropdowns in a navigation menu.

From ad47c5acc5d18280f84f4fc3c619659095ae03a0 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 26 Mar 2024 17:04:00 +0100
Subject: [PATCH 1359/1422] Clarifications and formatting

---
 docs/advanced-features/navigation-api.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/docs/advanced-features/navigation-api.md b/docs/advanced-features/navigation-api.md
index 9a17702d534..9c0381e4852 100644
--- a/docs/advanced-features/navigation-api.md
+++ b/docs/advanced-features/navigation-api.md
@@ -155,8 +155,9 @@ The `NavigationMenu` class represents a navigation menu. It contains a collectio
 
 ### NavigationItem
 
-The `NavigationItem` class represents a single item in a navigation menu. It contains information such as the destination link, label, and priority for ordering in the menu.
+The `NavigationItem` class represents a single item in a navigation menu. It contains information such as the destination link or route, a label, and priority for ordering in the menu.
 
 ### NavigationGroup
 
-The `NavigationGroup` class represents a group of items in a navigation menu. It contains a label and a collection of items. This class is often used to create submenus or dropdowns in a navigation menu.
+The `NavigationGroup` class represents a group of items in a navigation menu. It contains a label, priority, and a collection of navigation items.
+This class is often used to create submenus or dropdowns in a navigation menu.

From 9a2c03e17b30da566f239e391f2b414ce6fbb590 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 26 Mar 2024 17:05:26 +0100
Subject: [PATCH 1360/1422] Lower heading groups

Might be less semantic, but will make formatting easier
---
 docs/advanced-features/navigation-api.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/advanced-features/navigation-api.md b/docs/advanced-features/navigation-api.md
index 9c0381e4852..8b85976d161 100644
--- a/docs/advanced-features/navigation-api.md
+++ b/docs/advanced-features/navigation-api.md
@@ -149,15 +149,15 @@ Here are some general tips to keep in mind when working with the Navigation API:
 
 Below is a reference of the classes and methods available in the Navigation API.
 
-### NavigationMenu
+## NavigationMenu
 
 The `NavigationMenu` class represents a navigation menu. It contains a collection of items, which can be either `NavigationItem` or `NavigationGroup` instances.
 
-### NavigationItem
+## NavigationItem
 
 The `NavigationItem` class represents a single item in a navigation menu. It contains information such as the destination link or route, a label, and priority for ordering in the menu.
 
-### NavigationGroup
+## NavigationGroup
 
 The `NavigationGroup` class represents a group of items in a navigation menu. It contains a label, priority, and a collection of navigation items.
 This class is often used to create submenus or dropdowns in a navigation menu.

From f7ae4e1aee514481422e0f7e58c6420fbda01ee7 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 26 Mar 2024 17:14:54 +0100
Subject: [PATCH 1361/1422] Start sketching out item docs

---
 docs/advanced-features/navigation-api.md | 112 +++++++++++++++++++++++
 1 file changed, 112 insertions(+)

diff --git a/docs/advanced-features/navigation-api.md b/docs/advanced-features/navigation-api.md
index 8b85976d161..6cdd2eb790e 100644
--- a/docs/advanced-features/navigation-api.md
+++ b/docs/advanced-features/navigation-api.md
@@ -157,6 +157,118 @@ The `NavigationMenu` class represents a navigation menu. It contains a collectio
 
 The `NavigationItem` class represents a single item in a navigation menu. It contains information such as the destination link or route, a label, and priority for ordering in the menu.
 
+Here is the constructor signature and a quick reference of the methods available on the `NavigationItem` class, and their types. Keep on reading to see more detailed examples and explanations.
+
+```php
+use Hyde\Framework\Features\Navigation\NavigationItem;
+
+$item = new NavigationItem(Route|string $destination, string $label, int $priority = 500);
+
+$item->getLink():  string; // Returns the resolved link route or destination URL.
+$item->getLabel(): string; // Returns the label of the item.
+$item->isActive(): bool;   // Returns true if the item is the page being rendered.
+$item->getPriority(): int; // Returns the priority of the item.
+$item->getPage(): ?HydePage; // Returns the underlying Page instance, if there is one.
+```
+
+### Creating Navigation Items
+
+There are several ways to create navigation items using the `NavigationItem` class.
+
+#### Direct instantiation
+
+You can create instances directly by passing either a URL or a Route instance to the constructor. 
+
+The first parameter is the destination, the second is the label, and the third optional parameter is the priority.
+
+```php
+$item = new NavigationItem('index', 'Home');
+$item = new NavigationItem(Routes::get('index'), 'Home');
+$item = new NavigationItem('https://example.com', 'External Link');
+```
+
+#### Setting Priority
+
+You can set the priority of the item, which determines its position in the menu.
+
+```php
+$item = new NavigationItem(Routes::get('index'), 'Home', 25);
+```
+
+#### Static Creation Method
+
+You can use the static `create` method, which can automatically fill in the label and priority from a Route.
+
+```php
+$item = NavigationItem::create(Routes::get('index'));
+```
+
+You can also pass a custom label and priority to the `create` method to override the defaults.
+
+```php
+$item = NavigationItem::create(Routes::get('index'), 'Custom Label', 50);
+```
+
+#### Using Route Keys and URLs
+
+The `create` method works with route keys and URLs.
+
+```php
+$item = NavigationItem::create('index');
+$item = NavigationItem::create('https://example.com');
+```
+
+Unless you pass a custom label to URL items, the label will be the URL itself.
+
+```php
+$item = NavigationItem::create('https://example.com');
+```
+
+### Navigation Item Methods
+
+### Getting Label and Link
+
+```php
+$item = NavigationItem::create('index');
+
+// Get the label of the item.
+$item->getLabel(); // Returns 'Home'
+
+// Get the link of the item.
+$item->getLink(); // Returns 'index.html'
+```
+
+You can also get the link by casting the item to a string.
+
+```php
+(string) $item; // Returns 'index.html'
+```
+
+### Getting Priority
+
+```php
+$item->getPriority(); // Returns 0
+```
+
+### Getting Page Instance
+
+You can get the underlying Page instance of the item, if it exists.
+
+```php
+$item->getPage(); // Returns instance of BladePage or null
+```
+
+### Checking Active State
+
+You can check if the item is active (i.e., the current page being rendered).
+
+```php
+$item->isActive(); // Returns false
+```
+
+This concludes the documentation for the `NavigationItem` class.
+
+
 ## NavigationGroup
 
 The `NavigationGroup` class represents a group of items in a navigation menu. It contains a label, priority, and a collection of navigation items.

From 13b00bce285701eaad271500195af40427f4432c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 26 Mar 2024 17:23:01 +0100
Subject: [PATCH 1362/1422] Remove PHPDocs from constructor

---
 .../src/Framework/Features/Navigation/NavigationItem.php   | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index dd4ab94709a..7b202c7c5ea 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -26,13 +26,6 @@ class NavigationItem implements Stringable
     protected string $label;
     protected int $priority;
 
-    /**
-     * Create a new navigation menu item with your own properties.
-     *
-     * @param  \Hyde\Support\Models\Route|string  $destination  Route instance, route key, or external URI.
-     * @param  string  $label  The label of the navigation item.
-     * @param  int  $priority  The priority to determine the order of the navigation item.
-     */
     public function __construct(Route|string $destination, string $label, int $priority = NavigationMenu::DEFAULT)
     {
         $this->destination = $destination;

From f8476918644d3244371b023d35f658c2fe479881 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 26 Mar 2024 17:23:18 +0100
Subject: [PATCH 1363/1422] Remove outdated class documentation

---
 .../src/Framework/Features/Navigation/NavigationItem.php     | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index 7b202c7c5ea..0d0a53347ff 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -14,11 +14,6 @@
 
 /**
  * Abstraction for a navigation menu item. Used by the MainNavigationMenu and DocumentationSidebar classes.
- *
- * You have a few options to construct a navigation menu item:
- *   1. You can supply a Route directly and explicit properties to the constructor
- *   2. You can use NavigationItem::fromRoute() to use data from the route
- *   3. You can use NavigationItem::create() for an external or un-routed link
  */
 class NavigationItem implements Stringable
 {

From 4a36e293ae8be06626e3e5ad6ec5b3e7743145be Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 26 Mar 2024 17:25:55 +0100
Subject: [PATCH 1364/1422] Sort property constructors

---
 .../src/Framework/Features/Navigation/NavigationItem.php       | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index 0d0a53347ff..1d116e42c90 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -23,10 +23,9 @@ class NavigationItem implements Stringable
 
     public function __construct(Route|string $destination, string $label, int $priority = NavigationMenu::DEFAULT)
     {
-        $this->destination = $destination;
-
         $this->label = $label;
         $this->priority = $priority;
+        $this->destination = $destination;
     }
 
     /**

From 3bcafebb468d446da53c8613e7bb64680418e2e0 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 26 Mar 2024 17:32:22 +0100
Subject: [PATCH 1365/1422] Extract helper method

---
 .../Features/Navigation/NavigationItem.php    | 25 +++++++++++--------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index 1d116e42c90..8953f007835 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -37,16 +37,7 @@ public function __construct(Route|string $destination, string $label, int $prior
      */
     public static function create(Route|string $destination, ?string $label = null, ?int $priority = null): static
     {
-        if (is_string($destination) && Routes::has($destination)) {
-            $destination = Routes::get($destination);
-        }
-
-        if ($destination instanceof Route) {
-            $label ??= $destination->getPage()->navigationMenuLabel();
-            $priority ??= $destination->getPage()->navigationMenuPriority();
-        }
-
-        return new static($destination, $label ?? $destination, $priority ?? NavigationMenu::DEFAULT);
+        return new static(...self::make($destination, $label, $priority));
     }
 
     /**
@@ -96,4 +87,18 @@ public function isActive(): bool
     {
         return Hyde::currentRoute()?->getLink() === $this->getLink();
     }
+
+    protected static function make(Route|string $destination, ?string $label = null, ?int $priority = null): array
+    {
+        if (is_string($destination) && Routes::has($destination)) {
+            $destination = Routes::get($destination);
+        }
+
+        if ($destination instanceof Route) {
+            $label ??= $destination->getPage()->navigationMenuLabel();
+            $priority ??= $destination->getPage()->navigationMenuPriority();
+        }
+
+        return [$destination, $label ?? $destination, $priority ?? NavigationMenu::DEFAULT];
+    }
 }

From 1b35793fdfa9b10e176b3bf54b4dc75212c7aeb1 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 26 Mar 2024 17:41:29 +0100
Subject: [PATCH 1366/1422] Update constructor to use the same logic as the
 static create method

---
 .../src/Framework/Features/Navigation/NavigationItem.php   | 4 +---
 packages/framework/tests/Unit/NavigationItemTest.php       | 7 ++++---
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index 8953f007835..d3587644624 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -23,9 +23,7 @@ class NavigationItem implements Stringable
 
     public function __construct(Route|string $destination, string $label, int $priority = NavigationMenu::DEFAULT)
     {
-        $this->label = $label;
-        $this->priority = $priority;
-        $this->destination = $destination;
+        [$this->destination, $this->label, $this->priority] = self::make($destination, $label, $priority);
     }
 
     /**
diff --git a/packages/framework/tests/Unit/NavigationItemTest.php b/packages/framework/tests/Unit/NavigationItemTest.php
index cb45bd6c9a9..0d5acc1bb2e 100644
--- a/packages/framework/tests/Unit/NavigationItemTest.php
+++ b/packages/framework/tests/Unit/NavigationItemTest.php
@@ -51,11 +51,12 @@ public function testPassingRouteInstanceToConstructorUsesRouteInstance()
         $this->assertEquals($route, (new NavigationItem($route, 'Home'))->getPage()->getRoute());
     }
 
-    public function testPassingRouteKeyToConstructorUsesDestinationAsLink()
+    public function testPassingRouteKeyToConstructorUsesDestinationAsRoute()
     {
         $item = new NavigationItem('index', 'Home');
-        $this->assertNull($item->getPage());
-        $this->assertSame('index', $item->getLink());
+        $this->assertSame(Routes::get('index')->getPage(), $item->getPage());
+        $this->assertSame('index', $item->getPage()->getRouteKey());
+        $this->assertSame('index.html', $item->getLink());
     }
 
     public function testPassingUrlToConstructorSetsRouteToNull()

From b3c87c2a3a719ed9be82c407cb7b9fc7a735c464 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 26 Mar 2024 18:14:08 +0100
Subject: [PATCH 1367/1422] Update and normalize class documentation and
 constructors

---
 .../Features/Navigation/NavigationItem.php    | 28 ++++++++++++++-----
 1 file changed, 21 insertions(+), 7 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index d3587644624..786011c8420 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -13,7 +13,9 @@
 use function is_string;
 
 /**
- * Abstraction for a navigation menu item. Used by the MainNavigationMenu and DocumentationSidebar classes.
+ * Abstraction for a navigation menu item containing useful information like the destination, label, and priority.
+ *
+ * It is used by the MainNavigationMenu and DocumentationSidebar classes.
  */
 class NavigationItem implements Stringable
 {
@@ -21,7 +23,14 @@ class NavigationItem implements Stringable
     protected string $label;
     protected int $priority;
 
-    public function __construct(Route|string $destination, string $label, int $priority = NavigationMenu::DEFAULT)
+    /**
+     * Create a new navigation menu item, automatically filling in the properties from a Route instance if provided.
+     *
+     * @param  \Hyde\Support\Models\Route|string<\Hyde\Support\Models\RouteKey>|string  $destination  Route instance or route key, or an external URI.
+     * @param  string|null  $label  If not provided, Hyde will try to get it from the route's connected page, or from the URL.
+     * @param  int|null  $priority  If not provided, Hyde will try to get it from the route or the default priority of 500.
+     */
+    public function __construct(Route|string $destination, ?string $label = null, ?int $priority = null)
     {
         [$this->destination, $this->label, $this->priority] = self::make($destination, $label, $priority);
     }
@@ -29,9 +38,9 @@ public function __construct(Route|string $destination, string $label, int $prior
     /**
      * Create a new navigation menu item, automatically filling in the properties from a Route instance if provided.
      *
-     * @param  \Hyde\Support\Models\Route|string<\Hyde\Support\Models\RouteKey>|string  $destination  Route instance or route key, or external URI.
-     * @param  string|null  $label  Leave blank to use the label of the route's corresponding page, if there is one tied to the route.
-     * @param  int|null  $priority  Leave blank to use the priority of the route's corresponding page, if there is one tied to the route.
+     * @param  \Hyde\Support\Models\Route|string<\Hyde\Support\Models\RouteKey>|string  $destination  Route instance or route key, or an external URI.
+     * @param  string|null  $label  If not provided, Hyde will try to get it from the route's connected page, or from the URL.
+     * @param  int|null  $priority  If not provided, Hyde will try to get it from the route or the default priority of 500.
      */
     public static function create(Route|string $destination, ?string $label = null, ?int $priority = null): static
     {
@@ -39,7 +48,7 @@ public static function create(Route|string $destination, ?string $label = null,
     }
 
     /**
-     * Resolve a link to the navigation item.
+     * Resolve a link to the navigation item. See `getLink()` for more information.
      */
     public function __toString(): string
     {
@@ -47,7 +56,10 @@ public function __toString(): string
     }
 
     /**
-     * Resolve the destination link of the navigation item.
+     * Resolve the destination link of the navigation item. This can then be used in the `href` attribute of an anchor tag.
+     *
+     * If the destination is a Route, it will be resolved using the Route's link.
+     * Otherwise, it will be returned as is for external links using URLs.
      */
     public function getLink(): string
     {
@@ -88,11 +100,13 @@ public function isActive(): bool
 
     protected static function make(Route|string $destination, ?string $label = null, ?int $priority = null): array
     {
+        // Automatically resolve the destination if it's a route key.
         if (is_string($destination) && Routes::has($destination)) {
             $destination = Routes::get($destination);
         }
 
         if ($destination instanceof Route) {
+            // Try to fill in missing properties from the route's connected page.
             $label ??= $destination->getPage()->navigationMenuLabel();
             $priority ??= $destination->getPage()->navigationMenuPriority();
         }

From 78ff7d2a7e7c84355be266a2ab16c6f99d90d848 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 26 Mar 2024 18:16:55 +0100
Subject: [PATCH 1368/1422] Annotate array return generics

---
 .../src/Framework/Features/Navigation/NavigationItem.php         | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index 786011c8420..c7d01de2d15 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -98,6 +98,7 @@ public function isActive(): bool
         return Hyde::currentRoute()?->getLink() === $this->getLink();
     }
 
+    /** @return array{Route|string, string, int} */
     protected static function make(Route|string $destination, ?string $label = null, ?int $priority = null): array
     {
         // Automatically resolve the destination if it's a route key.

From 26cd0bfff66ff2e8253b026f4961a95088926c70 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 26 Mar 2024 18:17:14 +0100
Subject: [PATCH 1369/1422] Use fully qualified class name in type annotation

---
 .../src/Framework/Features/Navigation/NavigationItem.php        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index c7d01de2d15..befda4b80e9 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -98,7 +98,7 @@ public function isActive(): bool
         return Hyde::currentRoute()?->getLink() === $this->getLink();
     }
 
-    /** @return array{Route|string, string, int} */
+    /** @return array{\Hyde\Support\Models\Route|string, string, int} */
     protected static function make(Route|string $destination, ?string $label = null, ?int $priority = null): array
     {
         // Automatically resolve the destination if it's a route key.

From 15b8b65890301b89024b216c18be1bdf2fffcb9e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 26 Mar 2024 18:22:46 +0100
Subject: [PATCH 1370/1422] Test construct with null label

---
 .../tests/Unit/NavigationItemTest.php         | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/packages/framework/tests/Unit/NavigationItemTest.php b/packages/framework/tests/Unit/NavigationItemTest.php
index 0d5acc1bb2e..19f4f22f0c1 100644
--- a/packages/framework/tests/Unit/NavigationItemTest.php
+++ b/packages/framework/tests/Unit/NavigationItemTest.php
@@ -219,6 +219,26 @@ public function testCreateWithNullLabel()
         }
     }
 
+    public function testConstructWithNullLabel()
+    {
+        $this->assertSame('foo', (new NavigationItem('foo'))->getLabel());
+
+        $links = [
+            'www.example.com',
+            'https://example.com',
+            'https://example.com/',
+            'https://example.com/foo',
+            'https://example.com/foo/',
+            'https://example.com/foo/bar',
+            'https://example.com/foo/bar.html',
+            'https://example.com/foo/bar.png',
+        ];
+
+        foreach ($links as $link) {
+            $this->assertSame($link, (new NavigationItem($link))->getLabel());
+        }
+    }
+
     public function testPassingRouteKeyToStaticConstructorUsesRouteInstance()
     {
         $route = Routes::get('index');

From 377a2ba0f4ebdd046bdb42b4f441105833ff78b4 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 26 Mar 2024 19:17:44 +0100
Subject: [PATCH 1371/1422] Create new documentation for simplified API

---
 docs/advanced-features/navigation-api.md      | 119 ++++--------------
 .../tests/Feature/NavigationAPITest.php       |  62 ++++-----
 2 files changed, 55 insertions(+), 126 deletions(-)

diff --git a/docs/advanced-features/navigation-api.md b/docs/advanced-features/navigation-api.md
index 6cdd2eb790e..7f6d3e0c008 100644
--- a/docs/advanced-features/navigation-api.md
+++ b/docs/advanced-features/navigation-api.md
@@ -155,120 +155,45 @@ The `NavigationMenu` class represents a navigation menu. It contains a collectio
 
 ## NavigationItem
 
-The `NavigationItem` class represents a single item in a navigation menu. It contains information such as the destination link or route, a label, and priority for ordering in the menu.
-
-Here is the constructor signature and a quick reference of the methods available on the `NavigationItem` class, and their types. Keep on reading to see more detailed examples and explanations.
-
-```php
-use Hyde\Framework\Features\Navigation\NavigationItem;
-
-$item = new NavigationItem(Route|string $destination, string $label, int $priority = 500);
-
-$item->getLink():  string; // Returns the resolved link route or destination URL.
-$item->getLabel(): string; // Returns the label of the item.
-$item->isActive(): bool;   // Returns true if the item is the page being rendered.
-$item->getPriority(): int; // Returns the priority of the item.
-$item->getPage(): ?HydePage; // Returns the underlying Page instance, if there is one.
-```
+The `NavigationItem` class is an abstraction for a navigation menu item containing useful information like the destination, label, and priority.
 
 ### Creating Navigation Items
 
-There are several ways to create navigation items using the `NavigationItem` class.
-
-#### Direct instantiation
-
-You can create instances directly by passing either a URL or a Route instance to the constructor. 
-
-The first parameter is the destination, the second is the label, and the third optional parameter is the priority.
-
-```php
-$item = new NavigationItem('index', 'Home');
-$item = new NavigationItem(Routes::get('index'), 'Home');
-$item = new NavigationItem('https://example.com', 'External Link');
-```
-
-#### Setting Priority
+There are two syntaxes for creating NavigationItem instances, you can use a standard constructor or the static create method.
+Both options provide the exact same signature and functionality, so it's just a matter of preference which one you use.
 
-You can set the priority of the item, which determines its position in the menu.
+The constructors take three parameters: the destination, the label, and the optional priority.
+The destination can be a `Route` instance, a route key string, or an external URL.
 
 ```php
-$item = new NavigationItem(Routes::get('index'), 'Home', 25);
-```
-
-#### Static Creation Method
-
-You can use the static `create` method, which can automatically fill in the label and priority from a Route.
-
-```php
-$item = NavigationItem::create(Routes::get('index'));
-```
-
-You can also pass a custom label and priority to the `create` method to override the defaults.
-
-```php
-$item = NavigationItem::create(Routes::get('index'), 'Custom Label', 50);
-```
-
-#### Using Route Keys and URLs
-
-The `create` method works with route keys and URLs.
-
-```php
-$item = NavigationItem::create('index');
-$item = NavigationItem::create('https://example.com');
-```
-
-Unless you pass a custom label to URL items, the label will be the URL itself.
-
-```php
-$item = NavigationItem::create('https://example.com');
-```
-
-### Navigation Item Methods
-
-### Getting Label and Link
-
-```php
-$item = NavigationItem::create('index');
-
-// Get the label of the item.
-$item->getLabel(); // Returns 'Home'
-
-// Get the link of the item.
-$item->getLink(); // Returns 'index.html'
-```
-
-You can also get the link by casting the item to a string.
+use Hyde\Framework\Features\Navigation\NavigationItem;
 
-```php
-(string) $item; // Returns 'index.html'
+$item = new NavigationItem($destination, $label, $priority);
+$item = NavigationItem::create($destination, $label, $priority);
 ```
 
-### Getting Priority
-
-```php
-$item->getPriority(); // Returns 0
-```
+#### Using Routes
 
-### Getting Page Instance
+Using the HydePHP routing system is the recommended way to create navigation items leading to pages within your project,
+as they will automatically have links resolved to the correct URL, and Hyde can check if the items are active.
+Additionally, Hyde will use the page data as the label and priority defaults unless you override them.
 
-You can get the underlying Page instance of the item, if it exists.
+Create routed navigation items by providing either a `Route` instance or a route key string as the destination.
 
 ```php
-$item->getPage(); // Returns instance of BladePage or null
-```
-
-### Checking Active State
+// Using a Route instance will automatically fill in the label and priority from the route's connected page.
+$item = new NavigationItem(Routes::get('index'));
+// ['destination' => 'index.html', 'label' => 'Home', 'priority' => 0]
 
-You can check if the item is active (i.e., the current page being rendered).
+// Using a route key provides the same functionality as using a Route instance.
+// Make sure the route exists otherwise it will be treated as a link.
+$item = new NavigationItem('index'); // Exactly the same as above, but without type safety.
 
-```php
-$item->isActive(); // Returns false
+// Setting the label and/or priorities will override the page's data.
+$item = new NavigationItem(Routes::get('index'), 'Custom Label', 10);
+// ['destination' => 'index.html', 'label' => 'Custom Label', 'priority' => 10]
 ```
 
-This concludes the documentation for the `NavigationItem` class.
-
-
 ## NavigationGroup
 
 The `NavigationGroup` class represents a group of items in a navigation menu. It contains a label, priority, and a collection of navigation items.
diff --git a/packages/framework/tests/Feature/NavigationAPITest.php b/packages/framework/tests/Feature/NavigationAPITest.php
index 26b444577ac..31f866b3c43 100644
--- a/packages/framework/tests/Feature/NavigationAPITest.php
+++ b/packages/framework/tests/Feature/NavigationAPITest.php
@@ -51,44 +51,37 @@ public function testServiceContainerMenus()
 
     public function testNavigationItems()
     {
-        // Each navigation item is represented by a NavigationItem instance containing the needed information.
+        // The NavigationItem class is an abstraction for a navigation menu item containing useful information like the destination, label, and priority.
 
         // ## Creating Navigation Items
 
-        // There are a few ways to create navigation items, depending on your needs.
+        // There are two syntaxes for creating NavigationItem instances, you can use a standard constructor or the static create method.
+        // Both options provide the exact same signature and functionality, so it's just a matter of preference which one you use.
 
-        // You can create instances directly by passing either a URL or Route instance to the constructor.
-        $item = new NavigationItem(Routes::get('index'), 'Home');
-        $this->assertInstanceOf(NavigationItem::class, $item);
-        $item = new NavigationItem('https://example.com', 'External Link');
-        $this->assertInstanceOf(NavigationItem::class, $item);
+        // The constructors take three parameters: the destination, the label, and the optional priority.
+        // The destination can be a Route instance, a route key string, or an external URL.
 
-        // You can also set the priority of the item, which determines its position in the menu.
-        $item = new NavigationItem(Routes::get('index'), 'Home', 25);
-        $this->assertSame(25, $item->getPriority());
+        // Using a Route instance will automatically fill in the label and priority from the route's connected page.
+        $item = new NavigationItem(Routes::get('index'));
+        $this->assertData(['destination' => 'index.html', 'label' => 'Home', 'priority' => 0], $item);
 
-        // You can also create instances using the static create method, which can automatically fill in the label and priority from a Route.
-        $item = NavigationItem::create(Routes::get('index'));
-        $this->assertSame('Home', $item->getLabel());
-        $this->assertSame(0, $item->getPriority());
+        // Using a route key provides the same functionality as using a Route instance.
+        // Make sure the route exists otherwise it will be treated as a link.
+        $item = new NavigationItem('index');
+        $this->assertEquals(new NavigationItem(Routes::get('index')), $item);
 
-        // You can also pass a custom label and priority to the create method to override the defaults.
-        $item = NavigationItem::create(Routes::get('index'), 'Custom Label', 50);
-        $this->assertSame('Custom Label', $item->getLabel());
-        $this->assertSame(50, $item->getPriority());
-
-        // The create method also works with route keys.
-        $item = NavigationItem::create('index');
-        $this->assertSame('Home', $item->getLabel());
-        $this->assertEquals(NavigationItem::create('index'), NavigationItem::create(Routes::get('index')));
+        // Setting the label and/or priorities will override the page's data.
+        $item = new NavigationItem(Routes::get('index'), 'Custom Label', 10);
+        $this->assertData(['destination' => 'index.html', 'label' => 'Custom Label', 'priority' => 10], $item);
 
-        // You can also pass a URL to the create method.
-        $item = NavigationItem::create('https://example.com');
-        $this->assertSame('https://example.com', $item->getLink());
+        // You can also pass an external URL as the destination.
+        $item = new NavigationItem('https://example.com', 'External Link', 10);
+        $this->assertData(['destination' => 'https://example.com', 'label' => 'External Link', 'priority' => 10], $item);
 
-        // Unless you pass a custom label to URL items, the label will be the URL itself.
-        $item = NavigationItem::create('https://example.com');
-        $this->assertSame('https://example.com', $item->getLabel());
+        // If you do not set a label for links, the label will default to the URL.
+        // And if uf you do not set a priority, it will default to 500.
+        $item = new NavigationItem('https://example.com');
+        $this->assertData(['destination' => 'https://example.com', 'label' => 'https://example.com', 'priority' => 500], $item);
 
         // ## Navigation Item Methods
 
@@ -229,4 +222,15 @@ protected function removeIndentation(string $actual): string
     {
         return implode("\n", array_map('trim', explode("\n", $actual)));
     }
+
+    protected function assertData(array $expected, NavigationItem $item): void
+    {
+        $actual = [
+            'destination' => $item->getLink(),
+            'label' => $item->getLabel(),
+            'priority' => $item->getPriority(),
+        ];
+
+        $this->assertSame($expected, $actual);
+    }
 }

From 2c11b05761a4d2b5c8ef252d402a26cdd0c8264a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 26 Mar 2024 19:20:35 +0100
Subject: [PATCH 1372/1422] Swap order of examples

---
 docs/advanced-features/navigation-api.md            | 13 ++++++-------
 .../framework/tests/Feature/NavigationAPITest.php   |  8 ++++----
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/docs/advanced-features/navigation-api.md b/docs/advanced-features/navigation-api.md
index 7f6d3e0c008..fc6fe2aea61 100644
--- a/docs/advanced-features/navigation-api.md
+++ b/docs/advanced-features/navigation-api.md
@@ -182,16 +182,15 @@ Create routed navigation items by providing either a `Route` instance or a route
 
 ```php
 // Using a Route instance will automatically fill in the label and priority from the route's connected page.
-$item = new NavigationItem(Routes::get('index'));
-// ['destination' => 'index.html', 'label' => 'Home', 'priority' => 0]
-
-// Using a route key provides the same functionality as using a Route instance.
+// Using a route key provides the same functionality as using a Route instance, trading a bit of type safety for convenience.
 // Make sure the route exists otherwise it will be treated as a link.
-$item = new NavigationItem('index'); // Exactly the same as above, but without type safety.
+$item = new NavigationItem('index');
+
+//
+$item = new NavigationItem(Routes::get('index'));
 
 // Setting the label and/or priorities will override the page's data.
-$item = new NavigationItem(Routes::get('index'), 'Custom Label', 10);
-// ['destination' => 'index.html', 'label' => 'Custom Label', 'priority' => 10]
+$item = new NavigationItem(Routes::get('index'), 'Custom Label', 100);
 ```
 
 ## NavigationGroup
diff --git a/packages/framework/tests/Feature/NavigationAPITest.php b/packages/framework/tests/Feature/NavigationAPITest.php
index 31f866b3c43..191a9c2156e 100644
--- a/packages/framework/tests/Feature/NavigationAPITest.php
+++ b/packages/framework/tests/Feature/NavigationAPITest.php
@@ -61,15 +61,15 @@ public function testNavigationItems()
         // The constructors take three parameters: the destination, the label, and the optional priority.
         // The destination can be a Route instance, a route key string, or an external URL.
 
-        // Using a Route instance will automatically fill in the label and priority from the route's connected page.
-        $item = new NavigationItem(Routes::get('index'));
-        $this->assertData(['destination' => 'index.html', 'label' => 'Home', 'priority' => 0], $item);
-
         // Using a route key provides the same functionality as using a Route instance.
         // Make sure the route exists otherwise it will be treated as a link.
         $item = new NavigationItem('index');
         $this->assertEquals(new NavigationItem(Routes::get('index')), $item);
 
+        // Using a Route instance will automatically fill in the label and priority from the route's connected page.
+        $item = new NavigationItem(Routes::get('index'));
+        $this->assertData(['destination' => 'index.html', 'label' => 'Home', 'priority' => 0], $item);
+
         // Setting the label and/or priorities will override the page's data.
         $item = new NavigationItem(Routes::get('index'), 'Custom Label', 10);
         $this->assertData(['destination' => 'index.html', 'label' => 'Custom Label', 'priority' => 10], $item);

From 26baea19a4ad60ab6b992dc0c881e3b2edf0864a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 26 Mar 2024 19:20:38 +0100
Subject: [PATCH 1373/1422] Revert "Swap order of examples"

This reverts commit 2c11b05761a4d2b5c8ef252d402a26cdd0c8264a.
---
 docs/advanced-features/navigation-api.md            | 13 +++++++------
 .../framework/tests/Feature/NavigationAPITest.php   |  8 ++++----
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/docs/advanced-features/navigation-api.md b/docs/advanced-features/navigation-api.md
index fc6fe2aea61..7f6d3e0c008 100644
--- a/docs/advanced-features/navigation-api.md
+++ b/docs/advanced-features/navigation-api.md
@@ -182,15 +182,16 @@ Create routed navigation items by providing either a `Route` instance or a route
 
 ```php
 // Using a Route instance will automatically fill in the label and priority from the route's connected page.
-// Using a route key provides the same functionality as using a Route instance, trading a bit of type safety for convenience.
-// Make sure the route exists otherwise it will be treated as a link.
-$item = new NavigationItem('index');
-
-//
 $item = new NavigationItem(Routes::get('index'));
+// ['destination' => 'index.html', 'label' => 'Home', 'priority' => 0]
+
+// Using a route key provides the same functionality as using a Route instance.
+// Make sure the route exists otherwise it will be treated as a link.
+$item = new NavigationItem('index'); // Exactly the same as above, but without type safety.
 
 // Setting the label and/or priorities will override the page's data.
-$item = new NavigationItem(Routes::get('index'), 'Custom Label', 100);
+$item = new NavigationItem(Routes::get('index'), 'Custom Label', 10);
+// ['destination' => 'index.html', 'label' => 'Custom Label', 'priority' => 10]
 ```
 
 ## NavigationGroup
diff --git a/packages/framework/tests/Feature/NavigationAPITest.php b/packages/framework/tests/Feature/NavigationAPITest.php
index 191a9c2156e..31f866b3c43 100644
--- a/packages/framework/tests/Feature/NavigationAPITest.php
+++ b/packages/framework/tests/Feature/NavigationAPITest.php
@@ -61,15 +61,15 @@ public function testNavigationItems()
         // The constructors take three parameters: the destination, the label, and the optional priority.
         // The destination can be a Route instance, a route key string, or an external URL.
 
+        // Using a Route instance will automatically fill in the label and priority from the route's connected page.
+        $item = new NavigationItem(Routes::get('index'));
+        $this->assertData(['destination' => 'index.html', 'label' => 'Home', 'priority' => 0], $item);
+
         // Using a route key provides the same functionality as using a Route instance.
         // Make sure the route exists otherwise it will be treated as a link.
         $item = new NavigationItem('index');
         $this->assertEquals(new NavigationItem(Routes::get('index')), $item);
 
-        // Using a Route instance will automatically fill in the label and priority from the route's connected page.
-        $item = new NavigationItem(Routes::get('index'));
-        $this->assertData(['destination' => 'index.html', 'label' => 'Home', 'priority' => 0], $item);
-
         // Setting the label and/or priorities will override the page's data.
         $item = new NavigationItem(Routes::get('index'), 'Custom Label', 10);
         $this->assertData(['destination' => 'index.html', 'label' => 'Custom Label', 'priority' => 10], $item);

From 39ea38d5453683fe099ebdaa607d44c83faf1e0d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 26 Mar 2024 19:24:14 +0100
Subject: [PATCH 1374/1422] Clean up examples

---
 docs/advanced-features/navigation-api.md | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/docs/advanced-features/navigation-api.md b/docs/advanced-features/navigation-api.md
index 7f6d3e0c008..e7bcd67740c 100644
--- a/docs/advanced-features/navigation-api.md
+++ b/docs/advanced-features/navigation-api.md
@@ -178,22 +178,22 @@ Using the HydePHP routing system is the recommended way to create navigation ite
 as they will automatically have links resolved to the correct URL, and Hyde can check if the items are active.
 Additionally, Hyde will use the page data as the label and priority defaults unless you override them.
 
-Create routed navigation items by providing either a `Route` instance or a route key string as the destination.
+You can create routed navigation items by providing either a `Route` instance or a route key string as the destination.
 
 ```php
-// Using a Route instance will automatically fill in the label and priority from the route's connected page.
-$item = new NavigationItem(Routes::get('index'));
-// ['destination' => 'index.html', 'label' => 'Home', 'priority' => 0]
+// Using a route key string.
+$item = new NavigationItem('index');
 
-// Using a route key provides the same functionality as using a Route instance.
-// Make sure the route exists otherwise it will be treated as a link.
-$item = new NavigationItem('index'); // Exactly the same as above, but without type safety.
+// Using the Routes facade to get a Route instance.
+$item = new NavigationItem(Routes::get('index'));
 
-// Setting the label and/or priorities will override the page's data.
+// Setting the label and/or priorities will override inferred data.
 $item = new NavigationItem(Routes::get('index'), 'Custom Label', 10);
-// ['destination' => 'index.html', 'label' => 'Custom Label', 'priority' => 10]
 ```
 
+Using a route key is more concise, but will not provide type safety as it will be treated as a link if the route does not exist,
+whereas providing an invalid route key to the `Routes` facade will throw an exception. It's up to you which one you prefer.
+
 ## NavigationGroup
 
 The `NavigationGroup` class represents a group of items in a navigation menu. It contains a label, priority, and a collection of navigation items.

From 4df7c701848bf11c83b41b36a9400d610aeb6a6b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 26 Mar 2024 19:25:12 +0100
Subject: [PATCH 1375/1422] Fix typo in code comment

---
 packages/framework/tests/Feature/NavigationAPITest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/tests/Feature/NavigationAPITest.php b/packages/framework/tests/Feature/NavigationAPITest.php
index 31f866b3c43..0f087bf8b82 100644
--- a/packages/framework/tests/Feature/NavigationAPITest.php
+++ b/packages/framework/tests/Feature/NavigationAPITest.php
@@ -79,7 +79,7 @@ public function testNavigationItems()
         $this->assertData(['destination' => 'https://example.com', 'label' => 'External Link', 'priority' => 10], $item);
 
         // If you do not set a label for links, the label will default to the URL.
-        // And if uf you do not set a priority, it will default to 500.
+        // And if you do not set a priority, it will default to 500.
         $item = new NavigationItem('https://example.com');
         $this->assertData(['destination' => 'https://example.com', 'label' => 'https://example.com', 'priority' => 500], $item);
 

From 0c29b9aedcf5837147e7888c8980058aae260272 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 26 Mar 2024 19:30:58 +0100
Subject: [PATCH 1376/1422] Document using external URLs

---
 docs/advanced-features/navigation-api.md | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/docs/advanced-features/navigation-api.md b/docs/advanced-features/navigation-api.md
index e7bcd67740c..ac6137c51ea 100644
--- a/docs/advanced-features/navigation-api.md
+++ b/docs/advanced-features/navigation-api.md
@@ -194,6 +194,22 @@ $item = new NavigationItem(Routes::get('index'), 'Custom Label', 10);
 Using a route key is more concise, but will not provide type safety as it will be treated as a link if the route does not exist,
 whereas providing an invalid route key to the `Routes` facade will throw an exception. It's up to you which one you prefer.
 
+#### Using External URLs
+
+You can also create navigation items that link to external URLs by providing a full URL as the destination.
+
+If you do not set a label for links, the label will default to the URL, and if you do not set a priority, it will default to `500`.
+
+```php
+$item = new NavigationItem('https://example.com');
+$item = new NavigationItem('https://example.com', 'External Link', 10);
+```
+
+While it is discouraged to use external URLs for internal pages, as Hyde won't be able to resolve relative links or check active states,
+they are excellent for any time you want an absolute link to an external site or resource.
+
+Note that Hyde will not validate or modify the URL, so you are responsible for ensuring it's correct.
+
 ## NavigationGroup
 
 The `NavigationGroup` class represents a group of items in a navigation menu. It contains a label, priority, and a collection of navigation items.

From aea7e3aa3715bcf183a542c308616990d4c149a5 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 26 Mar 2024 19:40:35 +0100
Subject: [PATCH 1377/1422] Document examples more

---
 docs/advanced-features/navigation-api.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docs/advanced-features/navigation-api.md b/docs/advanced-features/navigation-api.md
index ac6137c51ea..2893d6d2f6d 100644
--- a/docs/advanced-features/navigation-api.md
+++ b/docs/advanced-features/navigation-api.md
@@ -201,7 +201,10 @@ You can also create navigation items that link to external URLs by providing a f
 If you do not set a label for links, the label will default to the URL, and if you do not set a priority, it will default to `500`.
 
 ```php
+// This will lead directly to the link, and use it as the label with a priority of 500.
 $item = new NavigationItem('https://example.com');
+
+// You can also set a custom label and priority to override the defaults.
 $item = new NavigationItem('https://example.com', 'External Link', 10);
 ```
 

From 80b2b97f7b441a470339ecf3a2144e15a975c440 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 26 Mar 2024 19:43:01 +0100
Subject: [PATCH 1378/1422] Test item sorting

---
 .../tests/Feature/NavigationAPITest.php       | 31 +++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/packages/framework/tests/Feature/NavigationAPITest.php b/packages/framework/tests/Feature/NavigationAPITest.php
index 0f087bf8b82..ec5e9e7aa07 100644
--- a/packages/framework/tests/Feature/NavigationAPITest.php
+++ b/packages/framework/tests/Feature/NavigationAPITest.php
@@ -157,6 +157,37 @@ public function testNavigationMenusWithGroups()
         ], $this->toArray($menu));
     }
 
+    public function testItemSorting()
+    {
+        // Test items without priorities are returned in the order they were added.
+
+        $menu = new NavigationMenu([
+            new NavigationItem('foo', 'foo'),
+            new NavigationItem('bar', 'bar'),
+            new NavigationItem('baz', 'baz'),
+        ]);
+
+        $this->assertSame([
+            'foo' => 'foo',
+            'bar' => 'bar',
+            'baz' => 'baz',
+        ], $this->toArray($menu));
+
+        // Test items with priorities are sorted by priority.
+
+        $menu = new NavigationMenu([
+            new NavigationItem('foo', 'foo', 10),
+            new NavigationItem('bar', 'bar', 5),
+            new NavigationItem('baz', 'baz', 15),
+        ]);
+
+        $this->assertSame([
+            'bar' => 'bar',
+            'foo' => 'foo',
+            'baz' => 'baz',
+        ], $this->toArray($menu));
+    }
+
     public function testSocialMediaFooterLinkExample()
     {
         // To create our menu, we start by constructing a new NavigationMenu instance

From b542d4b15f9b498200b8e4801578fb8f24b69802 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 26 Mar 2024 19:50:12 +0100
Subject: [PATCH 1379/1422] Style array key order

---
 packages/framework/tests/Feature/NavigationAPITest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/tests/Feature/NavigationAPITest.php b/packages/framework/tests/Feature/NavigationAPITest.php
index ec5e9e7aa07..b51483e03f1 100644
--- a/packages/framework/tests/Feature/NavigationAPITest.php
+++ b/packages/framework/tests/Feature/NavigationAPITest.php
@@ -177,8 +177,8 @@ public function testItemSorting()
 
         $menu = new NavigationMenu([
             new NavigationItem('foo', 'foo', 10),
-            new NavigationItem('bar', 'bar', 5),
             new NavigationItem('baz', 'baz', 15),
+            new NavigationItem('bar', 'bar', 5),
         ]);
 
         $this->assertSame([

From 790c975e7f725b56f8af6179ab11c2a94e44f6ac Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 26 Mar 2024 19:51:27 +0100
Subject: [PATCH 1380/1422] Clean up examples

---
 docs/advanced-features/navigation-api.md | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/advanced-features/navigation-api.md b/docs/advanced-features/navigation-api.md
index 2893d6d2f6d..941a0738808 100644
--- a/docs/advanced-features/navigation-api.md
+++ b/docs/advanced-features/navigation-api.md
@@ -182,13 +182,13 @@ You can create routed navigation items by providing either a `Route` instance or
 
 ```php
 // Using a route key string.
-$item = new NavigationItem('index');
+new NavigationItem('index');
 
 // Using the Routes facade to get a Route instance.
-$item = new NavigationItem(Routes::get('index'));
+new NavigationItem(Routes::get('index'));
 
 // Setting the label and/or priorities will override inferred data.
-$item = new NavigationItem(Routes::get('index'), 'Custom Label', 10);
+new NavigationItem(Routes::get('index'), 'Custom Label', 10);
 ```
 
 Using a route key is more concise, but will not provide type safety as it will be treated as a link if the route does not exist,
@@ -202,10 +202,10 @@ If you do not set a label for links, the label will default to the URL, and if y
 
 ```php
 // This will lead directly to the link, and use it as the label with a priority of 500.
-$item = new NavigationItem('https://example.com');
+new NavigationItem('https://example.com');
 
 // You can also set a custom label and priority to override the defaults.
-$item = new NavigationItem('https://example.com', 'External Link', 10);
+new NavigationItem('https://example.com', 'External Link', 10);
 ```
 
 While it is discouraged to use external URLs for internal pages, as Hyde won't be able to resolve relative links or check active states,

From 894425bb71ff1d21b268da7059b0fb26e6856cbd Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 26 Mar 2024 20:00:38 +0100
Subject: [PATCH 1381/1422] Style examples

---
 docs/advanced-features/navigation-api.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/advanced-features/navigation-api.md b/docs/advanced-features/navigation-api.md
index 941a0738808..087a0a970ae 100644
--- a/docs/advanced-features/navigation-api.md
+++ b/docs/advanced-features/navigation-api.md
@@ -188,7 +188,7 @@ new NavigationItem('index');
 new NavigationItem(Routes::get('index'));
 
 // Setting the label and/or priorities will override inferred data.
-new NavigationItem(Routes::get('index'), 'Custom Label', 10);
+new NavigationItem(Routes::get('index'), 'Custom Label', 25);
 ```
 
 Using a route key is more concise, but will not provide type safety as it will be treated as a link if the route does not exist,
@@ -205,7 +205,7 @@ If you do not set a label for links, the label will default to the URL, and if y
 new NavigationItem('https://example.com');
 
 // You can also set a custom label and priority to override the defaults.
-new NavigationItem('https://example.com', 'External Link', 10);
+new NavigationItem('https://example.com', 'External Link', 25);
 ```
 
 While it is discouraged to use external URLs for internal pages, as Hyde won't be able to resolve relative links or check active states,

From 57e660880041d98f627a9a59e79864682ae4ccf1 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 26 Mar 2024 20:01:03 +0100
Subject: [PATCH 1382/1422] Format Markdown

---
 docs/advanced-features/navigation-api.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/advanced-features/navigation-api.md b/docs/advanced-features/navigation-api.md
index 087a0a970ae..c48a7bf968d 100644
--- a/docs/advanced-features/navigation-api.md
+++ b/docs/advanced-features/navigation-api.md
@@ -70,7 +70,7 @@ $menu = MainNavigationMenu::get();
 $sidebar = DocumentationSidebar::get();
 ```
 
->info Developer tip: The menus are only generated *after* the Hyde Kernel is booted. If you are getting BindingResolutionExceptions, ensure that you are not trying to access the menus too early in the application lifecycle. (Consider using the `booted` event.) 
+>info Developer tip: The menus are only generated *after* the Hyde Kernel is booted. If you are getting BindingResolutionExceptions, ensure that you are not trying to access the menus too early in the application lifecycle. (Consider using the `booted` event.)
 
 ## Creating Custom Menus
 
@@ -141,7 +141,7 @@ The object-oriented nature of the API also makes this perfect for package develo
 
 Here are some general tips to keep in mind when working with the Navigation API:
 - You can use the `add` method to add single items or arrays of items. You can also pass an array of items directly to the menu constructor.
-- The navigation menu items is stored in a Laravel Collection, and is type safe to support both `NavigationItem` and `NavigationGroup` instances. 
+- The navigation menu items is stored in a Laravel Collection, and is type safe to support both `NavigationItem` and `NavigationGroup` instances.
 - You can also construct NavigationItem instances directly, but the `create` method is a convenient shorthand, and can fill in data from routes, if you use them.
 - It's also possible to set an item's priority as the third parameter, but here we don't need it, as they default to the order they are added.
 

From 49f5b1f96a742f265721960a786d7343ed87c147 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 26 Mar 2024 20:02:01 +0100
Subject: [PATCH 1383/1422] Normalize Markdown

---
 docs/advanced-features/navigation-api.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/docs/advanced-features/navigation-api.md b/docs/advanced-features/navigation-api.md
index c48a7bf968d..ff0d504393a 100644
--- a/docs/advanced-features/navigation-api.md
+++ b/docs/advanced-features/navigation-api.md
@@ -7,6 +7,7 @@ navigation:
 
 >warning This article covers advanced information that is only relevant if you want to create custom navigation menus. Instead, you may want to read the [Navigation](navigation) article for a general overview.
 
+
 ## Abstract
 
 This article describes the Navigation API introduced in HydePHP v2. Both the main navigation menu and the documentation sidebar bundled with HydePHP are built with this API.
@@ -16,6 +17,7 @@ This article is intended for advanced users, as most users will not need to crea
 For this reason, the documentation is very code-driven due to the technical nature of the API.
 We'll also be mixing in some practical examples of Blade and PHP code to illustrate how you can use the API in your own projects.
 
+
 ## Overview
 
 The Navigation API consists of a set of classes within the `Hyde\Framework\Features\Navigation` namespace.
@@ -72,6 +74,7 @@ $sidebar = DocumentationSidebar::get();
 
 >info Developer tip: The menus are only generated *after* the Hyde Kernel is booted. If you are getting BindingResolutionExceptions, ensure that you are not trying to access the menus too early in the application lifecycle. (Consider using the `booted` event.)
 
+
 ## Creating Custom Menus
 
 ### Introduction Overview
@@ -145,14 +148,17 @@ Here are some general tips to keep in mind when working with the Navigation API:
 - You can also construct NavigationItem instances directly, but the `create` method is a convenient shorthand, and can fill in data from routes, if you use them.
 - It's also possible to set an item's priority as the third parameter, but here we don't need it, as they default to the order they are added.
 
+
 ## Class Reference
 
 Below is a reference of the classes and methods available in the Navigation API.
 
+
 ## NavigationMenu
 
 The `NavigationMenu` class represents a navigation menu. It contains a collection of items, which can be either `NavigationItem` or `NavigationGroup` instances.
 
+
 ## NavigationItem
 
 The `NavigationItem` class is an abstraction for a navigation menu item containing useful information like the destination, label, and priority.
@@ -213,6 +219,7 @@ they are excellent for any time you want an absolute link to an external site or
 
 Note that Hyde will not validate or modify the URL, so you are responsible for ensuring it's correct.
 
+
 ## NavigationGroup
 
 The `NavigationGroup` class represents a group of items in a navigation menu. It contains a label, priority, and a collection of navigation items.

From 36eba078d710ebbfd23ec85de9e0a94e18a6e564 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 26 Mar 2024 20:31:14 +0100
Subject: [PATCH 1384/1422] Add quick references

---
 docs/advanced-features/navigation-api.md | 31 ++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/docs/advanced-features/navigation-api.md b/docs/advanced-features/navigation-api.md
index ff0d504393a..af7be74fa05 100644
--- a/docs/advanced-features/navigation-api.md
+++ b/docs/advanced-features/navigation-api.md
@@ -163,6 +163,37 @@ The `NavigationMenu` class represents a navigation menu. It contains a collectio
 
 The `NavigationItem` class is an abstraction for a navigation menu item containing useful information like the destination, label, and priority.
 
+### Quick Reference
+
+Here is a quick reference of the methods available on the NavigationItem class:
+
+```php
+// Create a new NavigationItem instance.
+$item = NavigationItem::create($destination, $label, $priority): NavigationItem;
+
+// Get the link of the item.
+$item->getLink(): string;
+
+// Get the label of the item.
+$item->getLabel(): string;
+
+// Get the priority of the item.
+$item->getPriority(): int;
+
+// Check if the item is active. (Only works when the destination is a route)
+$item->isActive(): bool; 
+```
+
+### Blade Example
+
+Here is an example of how you can put it all together in a Blade template:
+
+```blade
+<a href="{{ $item->getLink() }}" @class(['active' => $item->isActive()])>
+    {{ $item->getLabel() }}
+</a>
+```
+
 ### Creating Navigation Items
 
 There are two syntaxes for creating NavigationItem instances, you can use a standard constructor or the static create method.

From a5b3e86ab2858a9e65d104b5151dd04f2b37b243 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 26 Mar 2024 20:32:24 +0100
Subject: [PATCH 1385/1422] Add example context

---
 docs/advanced-features/navigation-api.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/advanced-features/navigation-api.md b/docs/advanced-features/navigation-api.md
index af7be74fa05..db274feafbe 100644
--- a/docs/advanced-features/navigation-api.md
+++ b/docs/advanced-features/navigation-api.md
@@ -194,6 +194,8 @@ Here is an example of how you can put it all together in a Blade template:
 </a>
 ```
 
+This will output an anchor tag with the correct link and label, and if the item is active, it will add an `active` class to the tag.
+
 ### Creating Navigation Items
 
 There are two syntaxes for creating NavigationItem instances, you can use a standard constructor or the static create method.

From 7204ba9e67848db59abb8d1c36400326e280fba8 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 26 Mar 2024 20:33:22 +0100
Subject: [PATCH 1386/1422] Format method documentation

---
 .../src/Framework/Features/Navigation/NavigationItem.php      | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index befda4b80e9..43d2cf5312b 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -56,7 +56,9 @@ public function __toString(): string
     }
 
     /**
-     * Resolve the destination link of the navigation item. This can then be used in the `href` attribute of an anchor tag.
+     * Resolve the destination link of the navigation item.
+     *
+     * This can then be used in the `href` attribute of an anchor tag.
      *
      * If the destination is a Route, it will be resolved using the Route's link.
      * Otherwise, it will be returned as is for external links using URLs.

From c9824a9844f8e97c2215402e80d7c388219a510b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 27 Mar 2024 10:45:48 +0100
Subject: [PATCH 1387/1422] Add method documentation

---
 docs/advanced-features/navigation-api.md | 48 ++++++++++++++++++++++++
 1 file changed, 48 insertions(+)

diff --git a/docs/advanced-features/navigation-api.md b/docs/advanced-features/navigation-api.md
index db274feafbe..0e269e9ae07 100644
--- a/docs/advanced-features/navigation-api.md
+++ b/docs/advanced-features/navigation-api.md
@@ -252,6 +252,54 @@ they are excellent for any time you want an absolute link to an external site or
 
 Note that Hyde will not validate or modify the URL, so you are responsible for ensuring it's correct.
 
+### Method Reference
+
+#### Accessing the resolved links `getLink`
+
+The `getLink` method is designed to return a link that can be used in the `href` attribute of an anchor tag.
+
+If the destination is a route, the link will be resolved to the correct URL, using relative paths if possible. It will also respect the pretty URL setting.
+
+```php
+$item = new NavigationItem(Routes::get('index'));
+$item->getLink(); // Outputs 'index.html' 
+
+$item = new NavigationItem('https://example.com');
+$item->getLink(); // Outputs 'https://example.com'
+```
+
+**Tip:** The item instances automatically turns into the resolved link when cast to a string. Perfect for your Blade templates!
+
+```blade
+<a href="{{ $item }}">{{ $item->getLabel() }}</a>
+```
+
+#### Accessing the label `getLabel`
+
+The `getLabel` method returns the label of the item. This is the text that will be displayed in the navigation menu.
+
+```php
+$item = new NavigationItem('index', 'Home');
+$item->getLabel(); // Outputs 'Home'
+```
+
+#### Accessing the priority `getPriority`
+
+The `getPriority` method returns the priority of the item. This is a number that determines the order in which the items are displayed in the menu, where lower numbers come first.
+
+```php
+$item = new NavigationItem('index', 'Home', 25);
+$item->getPriority(); // Outputs 25
+```
+
+#### Checking if the item is active `isActive`
+
+The `isActive` method checks if the item is active (by comparing it to the Hyde page being compiled at the moment). This is useful for highlighting the current page in the navigation menu.
+
+```php
+$item = new NavigationItem('index');
+$item->isActive(); // Outputs true if the item is the current page, otherwise false.
+```
 
 ## NavigationGroup
 

From cbd584976473c0926162f6a334774ee3aa9980c2 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 27 Mar 2024 10:46:47 +0100
Subject: [PATCH 1388/1422] Add commented Copilot idea

---
 docs/advanced-features/navigation-api.md | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/docs/advanced-features/navigation-api.md b/docs/advanced-features/navigation-api.md
index 0e269e9ae07..f7a2079e4af 100644
--- a/docs/advanced-features/navigation-api.md
+++ b/docs/advanced-features/navigation-api.md
@@ -301,6 +301,27 @@ $item = new NavigationItem('index');
 $item->isActive(); // Outputs true if the item is the current page, otherwise false.
 ```
 
+<!--
+
+Generated by Copilot, kinda cool, maybe something to implement?
+
+### Advanced Usage
+
+#### Customizing the Active State
+
+By default, the `isActive` method will check if the item's destination matches the current page being compiled.
+
+However, you can also provide a custom callback to the method to determine if the item is active.
+
+```php
+$item = new NavigationItem('index');
+$item->isActive(fn($item) => $item->getLink() === 'index.html');
+```
+
+This is useful if you want to check for a specific query parameter, or if you want to check if the item is active based on a more complex condition.
+-->
+
+
 ## NavigationGroup
 
 The `NavigationGroup` class represents a group of items in a navigation menu. It contains a label, priority, and a collection of navigation items.

From 44cb27192b113a5de5a3aadfe9adca4b69d4d8d9 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 27 Mar 2024 10:46:54 +0100
Subject: [PATCH 1389/1422] Formatting

---
 docs/advanced-features/navigation-api.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/docs/advanced-features/navigation-api.md b/docs/advanced-features/navigation-api.md
index f7a2079e4af..48b4e4a6ae1 100644
--- a/docs/advanced-features/navigation-api.md
+++ b/docs/advanced-features/navigation-api.md
@@ -302,7 +302,6 @@ $item->isActive(); // Outputs true if the item is the current page, otherwise fa
 ```
 
 <!--
-
 Generated by Copilot, kinda cool, maybe something to implement?
 
 ### Advanced Usage

From 0191d4493837c6b2c9f379c3b08229551706d278 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 27 Mar 2024 11:08:37 +0100
Subject: [PATCH 1390/1422] Document alternate syntax

---
 docs/advanced-features/navigation-api.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/advanced-features/navigation-api.md b/docs/advanced-features/navigation-api.md
index 48b4e4a6ae1..68b6dac9615 100644
--- a/docs/advanced-features/navigation-api.md
+++ b/docs/advanced-features/navigation-api.md
@@ -170,6 +170,7 @@ Here is a quick reference of the methods available on the NavigationItem class:
 ```php
 // Create a new NavigationItem instance.
 $item = NavigationItem::create($destination, $label, $priority): NavigationItem;
+$item = new NavigationItem($destination, $label, $priority); // Same as above.
 
 // Get the link of the item.
 $item->getLink(): string;

From 7149976af24ff3c17d1f1aa3c7305ecf35548e77 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 27 Mar 2024 11:12:51 +0100
Subject: [PATCH 1391/1422] Document import

---
 docs/advanced-features/navigation-api.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/advanced-features/navigation-api.md b/docs/advanced-features/navigation-api.md
index 68b6dac9615..0a6c12eae1d 100644
--- a/docs/advanced-features/navigation-api.md
+++ b/docs/advanced-features/navigation-api.md
@@ -168,6 +168,8 @@ The `NavigationItem` class is an abstraction for a navigation menu item containi
 Here is a quick reference of the methods available on the NavigationItem class:
 
 ```php
+use Hyde\Framework\Features\Navigation\NavigationItem;
+
 // Create a new NavigationItem instance.
 $item = NavigationItem::create($destination, $label, $priority): NavigationItem;
 $item = new NavigationItem($destination, $label, $priority); // Same as above.

From 892b89083f68a7174488d26b8e12ab3dfbaf376e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 27 Mar 2024 11:12:57 +0100
Subject: [PATCH 1392/1422] Document setup

---
 docs/advanced-features/navigation-api.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docs/advanced-features/navigation-api.md b/docs/advanced-features/navigation-api.md
index 0a6c12eae1d..f93970d7186 100644
--- a/docs/advanced-features/navigation-api.md
+++ b/docs/advanced-features/navigation-api.md
@@ -192,6 +192,10 @@ $item->isActive(): bool;
 Here is an example of how you can put it all together in a Blade template:
 
 ```blade
+@php
+    $item = new NavigationItem('index.html', 'Home');
+@endphp
+
 <a href="{{ $item->getLink() }}" @class(['active' => $item->isActive()])>
     {{ $item->getLabel() }}
 </a>

From 3948eb8a63d32fd6cc3c3ce374454143d929b4ca Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 27 Mar 2024 11:17:31 +0100
Subject: [PATCH 1393/1422] Add initial menu documentation

---
 docs/advanced-features/navigation-api.md | 80 ++++++++++++++++++++++++
 1 file changed, 80 insertions(+)

diff --git a/docs/advanced-features/navigation-api.md b/docs/advanced-features/navigation-api.md
index f93970d7186..a91eb14784c 100644
--- a/docs/advanced-features/navigation-api.md
+++ b/docs/advanced-features/navigation-api.md
@@ -158,6 +158,86 @@ Below is a reference of the classes and methods available in the Navigation API.
 
 The `NavigationMenu` class represents a navigation menu. It contains a collection of items, which can be either `NavigationItem` or `NavigationGroup` instances.
 
+### Quick Reference
+
+Here is a quick reference of the methods available on the NavigationMenu class:
+
+```php
+use Hyde\Framework\Features\Navigation\NavigationMenu;
+
+// Create a new NavigationMenu instance, optionally providing an array of items.
+$menu = new NavigationMenu($items = []);
+
+// Add a single item or an array of items to the menu.
+$menu->add(new NavigationItem()): $this;
+$menu->add([new NavigationItem()]): $this;
+
+// Get all items in the menu as a sorted Collection.
+$menu->getItems(): Collection;
+```
+
+### Blade Example
+
+Here is an example of how you can put it all together in a Blade template:
+
+```blade
+@php
+    $menu = new NavigationMenu([
+        new NavigationItem('index.html', 'Home'),
+        new NavigationItem('posts.html', 'Blog'),
+    ]);
+@endphp
+
+<ul>
+    @foreach ($menu->getItems() as $item)
+        <li><a href="{{ $item->getLink() }}">{{ $item->getLabel() }}</a></li>
+    @endforeach
+</ul>
+```
+
+This will output an unordered list with the correct links and labels for each item in the menu.
+
+### Creating Navigation Menus
+
+You can create a new NavigationMenu instance by calling the constructor and optionally providing an array or Collection of NavigationItem and/or NavigationGroup instances.
+
+```php
+use Hyde\Framework\Features\Navigation\NavigationMenu;
+use Hyde\Framework\Features\Navigation\NavigationItem;
+use Hyde\Framework\Features\Navigation\NavigationGroup;
+
+$menu = new NavigationMenu([
+    new NavigationItem('index.html', 'Home'),
+    new NavigationItem('posts.html', 'Blog'),
+    new NavigationGroup('About', [
+        new NavigationItem('about.html', 'About Us'),
+        new NavigationItem('team.html', 'Our Team'),
+    ]),
+]);
+```
+
+### Adding Items to the Menu
+
+You can also add items to the menu after it has been created by using the `add` method.
+
+The `add` method can take a single item or an array of items, and will return the menu instance to allow for method chaining.
+
+```php
+$menu->add([
+    new NavigationItem('privacy.html', 'Privacy Policy'),
+    new NavigationItem('terms.html', 'Terms of Service'),
+])->add(new NavigationItem('contact.html', 'Contact Us'));
+```
+
+### Accessing Items in the Menu
+
+You can access all items in the menu by calling the `getItems` method, which will return a Collection of all items in the menu.
+
+```php
+$items = $menu->getItems();
+```
+
+The items will automatically be sorted by their priority, with lower numbers coming first, defaulting go the order they were added if no priority is set.
 
 ## NavigationItem
 

From a822c42e8d2b2f44a4c9dcee40df013a0bf39e97 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 27 Mar 2024 11:17:47 +0100
Subject: [PATCH 1394/1422] Revert "Document setup"

This reverts commit 892b89083f68a7174488d26b8e12ab3dfbaf376e.
---
 docs/advanced-features/navigation-api.md | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/docs/advanced-features/navigation-api.md b/docs/advanced-features/navigation-api.md
index a91eb14784c..84a8427a575 100644
--- a/docs/advanced-features/navigation-api.md
+++ b/docs/advanced-features/navigation-api.md
@@ -272,10 +272,6 @@ $item->isActive(): bool;
 Here is an example of how you can put it all together in a Blade template:
 
 ```blade
-@php
-    $item = new NavigationItem('index.html', 'Home');
-@endphp
-
 <a href="{{ $item->getLink() }}" @class(['active' => $item->isActive()])>
     {{ $item->getLabel() }}
 </a>

From 13cb289869794a79788df06b2981aa3347cb8f30 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 27 Mar 2024 11:21:45 +0100
Subject: [PATCH 1395/1422] Clean up documentation

---
 docs/advanced-features/navigation-api.md | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/docs/advanced-features/navigation-api.md b/docs/advanced-features/navigation-api.md
index 84a8427a575..4b194e5f624 100644
--- a/docs/advanced-features/navigation-api.md
+++ b/docs/advanced-features/navigation-api.md
@@ -169,11 +169,11 @@ use Hyde\Framework\Features\Navigation\NavigationMenu;
 $menu = new NavigationMenu($items = []);
 
 // Add a single item or an array of items to the menu.
-$menu->add(new NavigationItem()): $this;
-$menu->add([new NavigationItem()]): $this;
+$menu->add(new NavigationItem());
+$menu->add([new NavigationItem()]);
 
 // Get all items in the menu as a sorted Collection.
-$menu->getItems(): Collection;
+$menu->getItems(): Collection<NavigationItem|NavigationGroup>
 ```
 
 ### Blade Example
@@ -181,13 +181,6 @@ $menu->getItems(): Collection;
 Here is an example of how you can put it all together in a Blade template:
 
 ```blade
-@php
-    $menu = new NavigationMenu([
-        new NavigationItem('index.html', 'Home'),
-        new NavigationItem('posts.html', 'Blog'),
-    ]);
-@endphp
-
 <ul>
     @foreach ($menu->getItems() as $item)
         <li><a href="{{ $item->getLink() }}">{{ $item->getLabel() }}</a></li>

From 8a5ceb34908db31be9b1b704b43d0dc8dac6b4c6 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 27 Mar 2024 11:21:50 +0100
Subject: [PATCH 1396/1422] Remove redundant example

---
 docs/advanced-features/navigation-api.md | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/docs/advanced-features/navigation-api.md b/docs/advanced-features/navigation-api.md
index 4b194e5f624..713413617cf 100644
--- a/docs/advanced-features/navigation-api.md
+++ b/docs/advanced-features/navigation-api.md
@@ -176,20 +176,6 @@ $menu->add([new NavigationItem()]);
 $menu->getItems(): Collection<NavigationItem|NavigationGroup>
 ```
 
-### Blade Example
-
-Here is an example of how you can put it all together in a Blade template:
-
-```blade
-<ul>
-    @foreach ($menu->getItems() as $item)
-        <li><a href="{{ $item->getLink() }}">{{ $item->getLabel() }}</a></li>
-    @endforeach
-</ul>
-```
-
-This will output an unordered list with the correct links and labels for each item in the menu.
-
 ### Creating Navigation Menus
 
 You can create a new NavigationMenu instance by calling the constructor and optionally providing an array or Collection of NavigationItem and/or NavigationGroup instances.

From f46b2de2b992b648280f97bdd4641070693058ca Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 27 Mar 2024 11:26:46 +0100
Subject: [PATCH 1397/1422] Split out examples

---
 docs/advanced-features/navigation-api.md | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/docs/advanced-features/navigation-api.md b/docs/advanced-features/navigation-api.md
index 713413617cf..e2b824226c6 100644
--- a/docs/advanced-features/navigation-api.md
+++ b/docs/advanced-features/navigation-api.md
@@ -178,7 +178,15 @@ $menu->getItems(): Collection<NavigationItem|NavigationGroup>
 
 ### Creating Navigation Menus
 
-You can create a new NavigationMenu instance by calling the constructor and optionally providing an array or Collection of NavigationItem and/or NavigationGroup instances.
+You can create a new NavigationMenu instance by simply calling the constructor, optionally providing an array of items.
+
+```php
+use Hyde\Framework\Features\Navigation\NavigationMenu;
+
+$menu = new NavigationMenu($items = []);
+```
+
+Here is how to provide an array or Collection of NavigationItem and/or NavigationGroup instances directly to the constructor.
 
 ```php
 use Hyde\Framework\Features\Navigation\NavigationMenu;
@@ -202,10 +210,12 @@ You can also add items to the menu after it has been created by using the `add`
 The `add` method can take a single item or an array of items, and will return the menu instance to allow for method chaining.
 
 ```php
-$menu->add([
-    new NavigationItem('privacy.html', 'Privacy Policy'),
-    new NavigationItem('terms.html', 'Terms of Service'),
-])->add(new NavigationItem('contact.html', 'Contact Us'));
+$menu = (new NavigationMenu())
+    ->add(new NavigationItem('contact.html', 'Contact Us'))
+    ->add([
+        new NavigationItem('privacy.html', 'Privacy Policy'),
+        new NavigationItem('terms.html', 'Terms of Service'),
+    ]);
 ```
 
 ### Accessing Items in the Menu

From 619d7ee0c5bc77d9645cd278d2f9141851cc5990 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 27 Mar 2024 11:47:22 +0100
Subject: [PATCH 1398/1422] Merge lines

---
 docs/advanced-features/navigation-api.md | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/docs/advanced-features/navigation-api.md b/docs/advanced-features/navigation-api.md
index e2b824226c6..81dbc8f1f33 100644
--- a/docs/advanced-features/navigation-api.md
+++ b/docs/advanced-features/navigation-api.md
@@ -205,9 +205,7 @@ $menu = new NavigationMenu([
 
 ### Adding Items to the Menu
 
-You can also add items to the menu after it has been created by using the `add` method.
-
-The `add` method can take a single item or an array of items, and will return the menu instance to allow for method chaining.
+You can also add items to the menu after it has been created by using the `add` method which can take a single item or an array of items, and can be fluently chained.
 
 ```php
 $menu = (new NavigationMenu())

From d696a1b40764fe363b3931a356a6cdf39a2f7197 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 27 Mar 2024 11:50:35 +0100
Subject: [PATCH 1399/1422] Clean up heading levels

---
 docs/advanced-features/navigation-api.md | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/docs/advanced-features/navigation-api.md b/docs/advanced-features/navigation-api.md
index 81dbc8f1f33..44b7c3bee24 100644
--- a/docs/advanced-features/navigation-api.md
+++ b/docs/advanced-features/navigation-api.md
@@ -322,9 +322,7 @@ they are excellent for any time you want an absolute link to an external site or
 
 Note that Hyde will not validate or modify the URL, so you are responsible for ensuring it's correct.
 
-### Method Reference
-
-#### Accessing the resolved links `getLink`
+### Accessing the resolved links
 
 The `getLink` method is designed to return a link that can be used in the `href` attribute of an anchor tag.
 
@@ -344,7 +342,7 @@ $item->getLink(); // Outputs 'https://example.com'
 <a href="{{ $item }}">{{ $item->getLabel() }}</a>
 ```
 
-#### Accessing the label `getLabel`
+### Accessing the label
 
 The `getLabel` method returns the label of the item. This is the text that will be displayed in the navigation menu.
 
@@ -353,7 +351,7 @@ $item = new NavigationItem('index', 'Home');
 $item->getLabel(); // Outputs 'Home'
 ```
 
-#### Accessing the priority `getPriority`
+### Accessing the priority
 
 The `getPriority` method returns the priority of the item. This is a number that determines the order in which the items are displayed in the menu, where lower numbers come first.
 
@@ -362,7 +360,7 @@ $item = new NavigationItem('index', 'Home', 25);
 $item->getPriority(); // Outputs 25
 ```
 
-#### Checking if the item is active `isActive`
+### Checking if the item is active
 
 The `isActive` method checks if the item is active (by comparing it to the Hyde page being compiled at the moment). This is useful for highlighting the current page in the navigation menu.
 

From 6021f7b1c61010a79fa51778a671d7983f0fbe81 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 27 Mar 2024 11:58:54 +0100
Subject: [PATCH 1400/1422] Fix typo

---
 docs/advanced-features/navigation-api.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/advanced-features/navigation-api.md b/docs/advanced-features/navigation-api.md
index 44b7c3bee24..d7b24103a56 100644
--- a/docs/advanced-features/navigation-api.md
+++ b/docs/advanced-features/navigation-api.md
@@ -224,7 +224,7 @@ You can access all items in the menu by calling the `getItems` method, which wil
 $items = $menu->getItems();
 ```
 
-The items will automatically be sorted by their priority, with lower numbers coming first, defaulting go the order they were added if no priority is set.
+The items will automatically be sorted by their priority, with lower numbers coming first, defaulting to the order they were added if no priority is set.
 
 ## NavigationItem
 

From 83b1fbc008ab021493c40ef822248c522a2b0273 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 27 Mar 2024 11:59:51 +0100
Subject: [PATCH 1401/1422] Format class names

---
 docs/advanced-features/navigation-api.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/advanced-features/navigation-api.md b/docs/advanced-features/navigation-api.md
index d7b24103a56..b3aedd5f7f4 100644
--- a/docs/advanced-features/navigation-api.md
+++ b/docs/advanced-features/navigation-api.md
@@ -186,7 +186,7 @@ use Hyde\Framework\Features\Navigation\NavigationMenu;
 $menu = new NavigationMenu($items = []);
 ```
 
-Here is how to provide an array or Collection of NavigationItem and/or NavigationGroup instances directly to the constructor.
+Here is how to provide an array or Collection of `NavigationItem` and/or `NavigationGroup` instances directly to the constructor.
 
 ```php
 use Hyde\Framework\Features\Navigation\NavigationMenu;
@@ -218,7 +218,7 @@ $menu = (new NavigationMenu())
 
 ### Accessing Items in the Menu
 
-You can access all items in the menu by calling the `getItems` method, which will return a Collection of all items in the menu.
+You can access all items in the menu by calling the `getItems` method, which will return a `Collection` of all items in the menu.
 
 ```php
 $items = $menu->getItems();
@@ -232,7 +232,7 @@ The `NavigationItem` class is an abstraction for a navigation menu item containi
 
 ### Quick Reference
 
-Here is a quick reference of the methods available on the NavigationItem class:
+Here is a quick reference of the methods available on the `NavigationItem` class:
 
 ```php
 use Hyde\Framework\Features\Navigation\NavigationItem;
@@ -268,7 +268,7 @@ This will output an anchor tag with the correct link and label, and if the item
 
 ### Creating Navigation Items
 
-There are two syntaxes for creating NavigationItem instances, you can use a standard constructor or the static create method.
+There are two syntaxes for creating `NavigationItem` instances, you can use a standard constructor or the static create method.
 Both options provide the exact same signature and functionality, so it's just a matter of preference which one you use.
 
 The constructors take three parameters: the destination, the label, and the optional priority.

From 7d616033fc14369a54427705ef61e0797cfd9581 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 27 Mar 2024 17:21:39 +0100
Subject: [PATCH 1402/1422] Begin new section

---
 docs/advanced-features/navigation-api.md | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/docs/advanced-features/navigation-api.md b/docs/advanced-features/navigation-api.md
index b3aedd5f7f4..5f6360dd2cf 100644
--- a/docs/advanced-features/navigation-api.md
+++ b/docs/advanced-features/navigation-api.md
@@ -393,3 +393,20 @@ This is useful if you want to check for a specific query parameter, or if you wa
 
 The `NavigationGroup` class represents a group of items in a navigation menu. It contains a label, priority, and a collection of navigation items.
 This class is often used to create submenus or dropdowns in a navigation menu.
+
+### Quick Reference
+
+Here is a quick reference of the methods available on the `NavigationGroup` class:
+
+```php
+use Hyde\Framework\Features\Navigation\NavigationGroup;
+
+// Create a new NavigationGroup instance.
+$group = new NavigationGroup($label, $items = [], $priority = 500);
+
+// Add a single item or an array of items to the group.
+$group->add(new NavigationItem());
+
+// Get the label of the group.
+$group->getLabel(): string;
+```

From 41fb7cca9f8bf12fbeeeaff01753f1999d557313 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 27 Mar 2024 18:50:11 +0100
Subject: [PATCH 1403/1422] Change internal group items to be collection

To normalize with the navigation menu types
---
 .../Framework/Features/Navigation/NavigationGroup.php  | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
index ca6e696da2b..a915eb28bf5 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
@@ -6,6 +6,7 @@
 
 use Illuminate\Support\Str;
 use Illuminate\Support\Arr;
+use Illuminate\Support\Collection;
 use Hyde\Pages\DocumentationPage;
 
 use function min;
@@ -16,13 +17,14 @@
  */
 class NavigationGroup
 {
-    /** @var array<\Hyde\Framework\Features\Navigation\NavigationItem> */
-    protected array $items = [];
+    /** @var \Illuminate\Support\Collection<\Hyde\Framework\Features\Navigation\NavigationItem> */
+    protected Collection $items;
     protected string $label;
     protected int $priority;
 
     public function __construct(string $label, array $items = [], int $priority = NavigationMenu::LAST)
     {
+        $this->items = new Collection();
         $this->label = $label;
         $this->priority = $priority;
 
@@ -57,7 +59,7 @@ public function getPriority(): int
     /** @return array<\Hyde\Framework\Features\Navigation\NavigationItem> */
     public function getItems(): array
     {
-        return $this->items;
+        return $this->items->all();
     }
 
     /** @param  \Hyde\Framework\Features\Navigation\NavigationItem|array<\Hyde\Framework\Features\Navigation\NavigationItem>  $items */
@@ -72,7 +74,7 @@ public function add(NavigationItem|array $items): static
 
     protected function addItem(NavigationItem $item): void
     {
-        $this->items[] = $item;
+        $this->items->push($item);
     }
 
     protected function containsOnlyDocumentationPages(): bool

From bfa64bfc13af66b5b672efee36683fe5683cbf30 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 27 Mar 2024 19:38:32 +0100
Subject: [PATCH 1404/1422] Return the items as the collection

---
 .../Features/Navigation/NavigationGroup.php     |  6 +++---
 .../AutomaticNavigationConfigurationsTest.php   |  2 +-
 .../tests/Feature/NavigationAPITest.php         |  2 +-
 .../tests/Unit/NavigationGroupTest.php          | 17 +++++++++--------
 .../framework/tests/Unit/NavigationItemTest.php |  4 ++--
 5 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
index a915eb28bf5..74eefde767a 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
@@ -56,10 +56,10 @@ public function getPriority(): int
         return $this->priority;
     }
 
-    /** @return array<\Hyde\Framework\Features\Navigation\NavigationItem> */
-    public function getItems(): array
+    /** @return \Illuminate\Support\Collection<\Hyde\Framework\Features\Navigation\NavigationItem> */
+    public function getItems(): Collection
     {
-        return $this->items->all();
+        return $this->items;
     }
 
     /** @param  \Hyde\Framework\Features\Navigation\NavigationItem|array<\Hyde\Framework\Features\Navigation\NavigationItem>  $items */
diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 0f5404ee4ef..5ae702cfad8 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -1318,7 +1318,7 @@ public function __construct(TestCase $test, $sidebar = false)
     public function state(): array
     {
         return $this->items->map(function (NavigationItem|NavigationGroup $item): TestNavigationItem {
-            return new TestNavigationItem($item->getLabel(), $item->getPriority(), $item instanceof NavigationGroup ? $item->getItems() : []);
+            return new TestNavigationItem($item->getLabel(), $item->getPriority(), $item instanceof NavigationGroup ? $item->getItems()->all() : []);
         })->toArray();
     }
 
diff --git a/packages/framework/tests/Feature/NavigationAPITest.php b/packages/framework/tests/Feature/NavigationAPITest.php
index b51483e03f1..f396837b0e9 100644
--- a/packages/framework/tests/Feature/NavigationAPITest.php
+++ b/packages/framework/tests/Feature/NavigationAPITest.php
@@ -230,7 +230,7 @@ protected function toArray(NavigationMenu $menu): array
             if ($item instanceof NavigationGroup) {
                 return [
                     $item->getLabel() => [
-                        'items' => Arr::mapWithKeys($item->getItems(), function (NavigationItem $item): array {
+                        'items' => Arr::mapWithKeys($item->getItems()->all(), function (NavigationItem $item): array {
                             return [$item->getLabel() => $item->getLink()];
                         }),
                     ],
diff --git a/packages/framework/tests/Unit/NavigationGroupTest.php b/packages/framework/tests/Unit/NavigationGroupTest.php
index 378a1d7fe52..ad2bf74aebf 100644
--- a/packages/framework/tests/Unit/NavigationGroupTest.php
+++ b/packages/framework/tests/Unit/NavigationGroupTest.php
@@ -45,8 +45,8 @@ public function testCanConstructWithChildren()
         $children = $this->createNavigationItems();
         $item = new NavigationGroup('Foo', $children);
 
-        $this->assertCount(2, $item->getItems());
-        $this->assertSame($children, $item->getItems());
+        $this->assertCount(2, $item->getItems()->all());
+        $this->assertSame($children, $item->getItems()->all());
     }
 
     public function testCanConstructWithChildrenWithoutRoute()
@@ -54,8 +54,8 @@ public function testCanConstructWithChildrenWithoutRoute()
         $children = $this->createNavigationItems();
         $item = new NavigationGroup('Foo', $children);
 
-        $this->assertCount(2, $item->getItems());
-        $this->assertSame($children, $item->getItems());
+        $this->assertCount(2, $item->getItems()->all());
+        $this->assertSame($children, $item->getItems()->all());
     }
 
     public function testCreate()
@@ -71,12 +71,13 @@ public function testGetItems()
         $children = $this->createNavigationItems();
         $item = new NavigationGroup('Foo', $children);
 
-        $this->assertSame($children, $item->getItems());
+        $this->assertSame($children, $item->getItems()->all());
+        $this->assertEquals(collect($children), $item->getItems());
     }
 
     public function testGetItemsWithNoItems()
     {
-        $this->assertEmpty((new NavigationGroup('Foo'))->getItems());
+        $this->assertEmpty((new NavigationGroup('Foo'))->getItems()->all());
     }
 
     public function testCanAddItemToDropdown()
@@ -84,7 +85,7 @@ public function testCanAddItemToDropdown()
         $group = new NavigationGroup('Foo');
         $child = new NavigationItem(new Route(new MarkdownPage()), 'Bar');
 
-        $this->assertSame([$child], $group->add($child)->getItems());
+        $this->assertSame([$child], $group->add($child)->getItems()->all());
     }
 
     public function testAddChildMethodReturnsSelf()
@@ -100,7 +101,7 @@ public function testCanAddMultipleItemsToDropdown()
         $group = new NavigationGroup('Foo');
         $items = $this->createNavigationItems();
 
-        $this->assertSame($items, $group->add($items)->getItems());
+        $this->assertSame($items, $group->add($items)->getItems()->all());
     }
 
     public function testAddChildrenMethodReturnsSelf()
diff --git a/packages/framework/tests/Unit/NavigationItemTest.php b/packages/framework/tests/Unit/NavigationItemTest.php
index 19f4f22f0c1..e0a669adf9a 100644
--- a/packages/framework/tests/Unit/NavigationItemTest.php
+++ b/packages/framework/tests/Unit/NavigationItemTest.php
@@ -279,7 +279,7 @@ public function testDropdownFacade()
         $item = NavigationGroup::create('foo');
 
         $this->assertSame('foo', $item->getLabel());
-        $this->assertSame([], $item->getItems());
+        $this->assertSame([], $item->getItems()->all());
         $this->assertSame(999, $item->getPriority());
     }
 
@@ -290,7 +290,7 @@ public function testDropdownFacadeWithChildren()
         ];
 
         $item = NavigationGroup::create('foo', $children);
-        $this->assertSame($children, $item->getItems());
+        $this->assertSame($children, $item->getItems()->all());
         $this->assertSame(999, $item->getPriority());
     }
 

From 8b2daf0531c2a0738f4a95bf8508e89783b7a704 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 28 Mar 2024 10:54:39 +0100
Subject: [PATCH 1405/1422] Support nesting navigation groups

While the built-in views does not support it (and the generators won't use it), the group class itself now supports containing groups as it's children, allowing developers to utilise the system to create more complex navigation menus.
---
 .../src/Framework/Features/Navigation/NavigationGroup.php | 6 +++---
 packages/framework/tests/Unit/NavigationGroupTest.php     | 8 ++++++++
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
index 74eefde767a..2f811b17835 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
@@ -62,8 +62,8 @@ public function getItems(): Collection
         return $this->items;
     }
 
-    /** @param  \Hyde\Framework\Features\Navigation\NavigationItem|array<\Hyde\Framework\Features\Navigation\NavigationItem>  $items */
-    public function add(NavigationItem|array $items): static
+    /** @param \Hyde\Framework\Features\Navigation\NavigationItem|\Hyde\Framework\Features\Navigation\NavigationGroup|array<\Hyde\Framework\Features\Navigation\NavigationItem|\Hyde\Framework\Features\Navigation\NavigationGroup> $items */
+    public function add(NavigationItem|NavigationGroup|array $items): static
     {
         foreach (Arr::wrap($items) as $item) {
             $this->addItem($item);
@@ -72,7 +72,7 @@ public function add(NavigationItem|array $items): static
         return $this;
     }
 
-    protected function addItem(NavigationItem $item): void
+    protected function addItem(NavigationItem|NavigationGroup $item): void
     {
         $this->items->push($item);
     }
diff --git a/packages/framework/tests/Unit/NavigationGroupTest.php b/packages/framework/tests/Unit/NavigationGroupTest.php
index ad2bf74aebf..3df154561c4 100644
--- a/packages/framework/tests/Unit/NavigationGroupTest.php
+++ b/packages/framework/tests/Unit/NavigationGroupTest.php
@@ -104,6 +104,14 @@ public function testCanAddMultipleItemsToDropdown()
         $this->assertSame($items, $group->add($items)->getItems()->all());
     }
 
+    public function testCanAddGroupsToDropdown()
+    {
+        $group = new NavigationGroup('Foo');
+        $child = new NavigationGroup('Bar');
+
+        $this->assertSame([$child], $group->add($child)->getItems()->all());
+    }
+
     public function testAddChildrenMethodReturnsSelf()
     {
         $group = new NavigationGroup('Foo');

From 62d6930ab3e87d43245efc735c3eba413e5c51c6 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 28 Mar 2024 14:49:41 +0100
Subject: [PATCH 1406/1422] Sort grouped navigation items on retrieval

---
 .../Features/Navigation/NavigationGroup.php   |  2 +-
 .../tests/Unit/NavigationGroupTest.php        | 22 +++++++++++++++++++
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
index 2f811b17835..7f537768899 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
@@ -59,7 +59,7 @@ public function getPriority(): int
     /** @return \Illuminate\Support\Collection<\Hyde\Framework\Features\Navigation\NavigationItem> */
     public function getItems(): Collection
     {
-        return $this->items;
+        return $this->items->sortBy(fn (NavigationItem|NavigationGroup $item) => $item->getPriority())->values();
     }
 
     /** @param \Hyde\Framework\Features\Navigation\NavigationItem|\Hyde\Framework\Features\Navigation\NavigationGroup|array<\Hyde\Framework\Features\Navigation\NavigationItem|\Hyde\Framework\Features\Navigation\NavigationGroup> $items */
diff --git a/packages/framework/tests/Unit/NavigationGroupTest.php b/packages/framework/tests/Unit/NavigationGroupTest.php
index 3df154561c4..a9ad9646633 100644
--- a/packages/framework/tests/Unit/NavigationGroupTest.php
+++ b/packages/framework/tests/Unit/NavigationGroupTest.php
@@ -119,6 +119,28 @@ public function testAddChildrenMethodReturnsSelf()
         $this->assertSame($group, $group->add([]));
     }
 
+    public function testItemsOrderingDefaultsToAddOrder()
+    {
+        $group = new NavigationGroup('Group', [
+            new NavigationItem(new Route(new MarkdownPage()), 'Foo'),
+            new NavigationItem(new Route(new MarkdownPage()), 'Bar'),
+            new NavigationItem(new Route(new MarkdownPage()), 'Baz'),
+        ]);
+
+        $this->assertSame(['Foo', 'Bar', 'Baz'], $group->getItems()->map(fn (NavigationItem $item) => $item->getLabel())->all());
+    }
+
+    public function testItemsAreSortedByPriority()
+    {
+        $group = new NavigationGroup('Group', [
+            new NavigationItem(new Route(new MarkdownPage()), 'Foo', 3),
+            new NavigationItem(new Route(new MarkdownPage()), 'Bar', 2),
+            new NavigationItem(new Route(new MarkdownPage()), 'Baz', 1),
+        ]);
+
+        $this->assertSame(['Baz', 'Bar', 'Foo'], $group->getItems()->map(fn (NavigationItem $item) => $item->getLabel())->all());
+    }
+
     public function testGetPriorityUsesDefaultPriority()
     {
         $this->assertSame(999, (new NavigationGroup('Foo'))->getPriority());

From fa70254b5663330848a25f9ed535ce2558c054c2 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 28 Mar 2024 17:54:03 +0100
Subject: [PATCH 1407/1422] Create HasNavigationItems.php

---
 .../Features/Navigation/HasNavigationItems.php         | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 packages/framework/src/Framework/Features/Navigation/HasNavigationItems.php

diff --git a/packages/framework/src/Framework/Features/Navigation/HasNavigationItems.php b/packages/framework/src/Framework/Features/Navigation/HasNavigationItems.php
new file mode 100644
index 00000000000..20881ed54ef
--- /dev/null
+++ b/packages/framework/src/Framework/Features/Navigation/HasNavigationItems.php
@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Hyde\Framework\Features\Navigation;
+
+trait HasNavigationItems
+{
+    //
+}

From 6b7cc4a8c5fb54e7b867269daddc948f744f32bc Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 28 Mar 2024 17:54:19 +0100
Subject: [PATCH 1408/1422] Use HasNavigationItems

---
 .../src/Framework/Features/Navigation/NavigationGroup.php       | 2 ++
 .../src/Framework/Features/Navigation/NavigationMenu.php        | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
index 7f537768899..5e36a061682 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
@@ -17,6 +17,8 @@
  */
 class NavigationGroup
 {
+    use HasNavigationItems;
+
     /** @var \Illuminate\Support\Collection<\Hyde\Framework\Features\Navigation\NavigationItem> */
     protected Collection $items;
     protected string $label;
diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
index 7329b6bfbe9..787fb765cdf 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
@@ -20,6 +20,8 @@
  */
 class NavigationMenu
 {
+    use HasNavigationItems;
+
     public const DEFAULT = 500;
     public const LAST = 999;
 

From e91503b701cc23bfe51e2c4ce9328a7a40d70ef0 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 28 Mar 2024 17:54:49 +0100
Subject: [PATCH 1409/1422] Document trait abstract

---
 .../Framework/Features/Navigation/HasNavigationItems.php    | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/HasNavigationItems.php b/packages/framework/src/Framework/Features/Navigation/HasNavigationItems.php
index 20881ed54ef..5b06e925196 100644
--- a/packages/framework/src/Framework/Features/Navigation/HasNavigationItems.php
+++ b/packages/framework/src/Framework/Features/Navigation/HasNavigationItems.php
@@ -4,6 +4,12 @@
 
 namespace Hyde\Framework\Features\Navigation;
 
+/**
+ * Contains shared logic for classes that have navigation items.
+ *
+ * @see \Hyde\Framework\Features\Navigation\NavigationMenu
+ * @see \Hyde\Framework\Features\Navigation\NavigationGroup
+ */
 trait HasNavigationItems
 {
     //

From bccde3de5116f316904cf9422246131339676bf4 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 28 Mar 2024 17:56:23 +0100
Subject: [PATCH 1410/1422] Move shared logic to trait

---
 .../Navigation/HasNavigationItems.php         | 41 ++++++++++++++++++-
 .../Features/Navigation/NavigationGroup.php   | 24 -----------
 .../Features/Navigation/NavigationMenu.php    | 39 ------------------
 3 files changed, 40 insertions(+), 64 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/HasNavigationItems.php b/packages/framework/src/Framework/Features/Navigation/HasNavigationItems.php
index 5b06e925196..74baffa70ab 100644
--- a/packages/framework/src/Framework/Features/Navigation/HasNavigationItems.php
+++ b/packages/framework/src/Framework/Features/Navigation/HasNavigationItems.php
@@ -4,6 +4,9 @@
 
 namespace Hyde\Framework\Features\Navigation;
 
+use Illuminate\Support\Arr;
+use Illuminate\Support\Collection;
+
 /**
  * Contains shared logic for classes that have navigation items.
  *
@@ -12,5 +15,41 @@
  */
 trait HasNavigationItems
 {
-    //
+    /** @var \Illuminate\Support\Collection<\Hyde\Framework\Features\Navigation\NavigationItem|\Hyde\Framework\Features\Navigation\NavigationGroup> */
+    protected Collection $items;
+
+    /**
+     * Get the navigation items in the menu.
+     *
+     * Items are automatically sorted by their priority, falling back to the order they were added.
+     *
+     * @return \Illuminate\Support\Collection<\Hyde\Framework\Features\Navigation\NavigationItem|\Hyde\Framework\Features\Navigation\NavigationGroup>
+     */
+    public function getItems(): Collection
+    {
+        // The reason we sort them here is that navigation items can be added from different sources,
+        // so any sorting we do in generator actions will only be partial. This way, we can ensure
+        // that the items are always freshly sorted by their priorities when they are retrieved.
+
+        return $this->items->sortBy(fn (NavigationItem|NavigationGroup $item) => $item->getPriority())->values();
+    }
+
+    /**
+     * Add one or more navigation items to the navigation menu.
+     *
+     * @param  \Hyde\Framework\Features\Navigation\NavigationItem|\Hyde\Framework\Features\Navigation\NavigationGroup|array<\Hyde\Framework\Features\Navigation\NavigationItem|\Hyde\Framework\Features\Navigation\NavigationGroup>  $items
+     */
+    public function add(NavigationItem|NavigationGroup|array $items): static
+    {
+        foreach (Arr::wrap($items) as $item) {
+            $this->addItem($item);
+        }
+
+        return $this;
+    }
+
+    protected function addItem(NavigationItem|NavigationGroup $item): void
+    {
+        $this->items->push($item);
+    }
 }
diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
index 5e36a061682..4017e44d0c4 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
@@ -5,7 +5,6 @@
 namespace Hyde\Framework\Features\Navigation;
 
 use Illuminate\Support\Str;
-use Illuminate\Support\Arr;
 use Illuminate\Support\Collection;
 use Hyde\Pages\DocumentationPage;
 
@@ -19,8 +18,6 @@ class NavigationGroup
 {
     use HasNavigationItems;
 
-    /** @var \Illuminate\Support\Collection<\Hyde\Framework\Features\Navigation\NavigationItem> */
-    protected Collection $items;
     protected string $label;
     protected int $priority;
 
@@ -58,27 +55,6 @@ public function getPriority(): int
         return $this->priority;
     }
 
-    /** @return \Illuminate\Support\Collection<\Hyde\Framework\Features\Navigation\NavigationItem> */
-    public function getItems(): Collection
-    {
-        return $this->items->sortBy(fn (NavigationItem|NavigationGroup $item) => $item->getPriority())->values();
-    }
-
-    /** @param \Hyde\Framework\Features\Navigation\NavigationItem|\Hyde\Framework\Features\Navigation\NavigationGroup|array<\Hyde\Framework\Features\Navigation\NavigationItem|\Hyde\Framework\Features\Navigation\NavigationGroup> $items */
-    public function add(NavigationItem|NavigationGroup|array $items): static
-    {
-        foreach (Arr::wrap($items) as $item) {
-            $this->addItem($item);
-        }
-
-        return $this;
-    }
-
-    protected function addItem(NavigationItem|NavigationGroup $item): void
-    {
-        $this->items->push($item);
-    }
-
     protected function containsOnlyDocumentationPages(): bool
     {
         return count($this->getItems()) && collect($this->getItems())->every(function (NavigationItem $item): bool {
diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
index 787fb765cdf..08f194a502a 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
@@ -4,7 +4,6 @@
 
 namespace Hyde\Framework\Features\Navigation;
 
-use Illuminate\Support\Arr;
 use Illuminate\Support\Collection;
 use Illuminate\Contracts\Support\Arrayable;
 
@@ -25,48 +24,10 @@ class NavigationMenu
     public const DEFAULT = 500;
     public const LAST = 999;
 
-    /** @var \Illuminate\Support\Collection<\Hyde\Framework\Features\Navigation\NavigationItem|\Hyde\Framework\Features\Navigation\NavigationGroup> */
-    protected Collection $items;
-
     public function __construct(Arrayable|array $items = [])
     {
         $this->items = new Collection();
 
         $this->add(evaluate_arrayable($items));
     }
-
-    /**
-     * Get the navigation items in the menu.
-     *
-     * Items are automatically sorted by their priority, falling back to the order they were added.
-     *
-     * @return \Illuminate\Support\Collection<\Hyde\Framework\Features\Navigation\NavigationItem|\Hyde\Framework\Features\Navigation\NavigationGroup>
-     */
-    public function getItems(): Collection
-    {
-        // The reason we sort them here is that navigation items can be added from different sources,
-        // so any sorting we do in generator actions will only be partial. This way, we can ensure
-        // that the items are always freshly sorted by their priorities when they are retrieved.
-
-        return $this->items->sortBy(fn (NavigationItem|NavigationGroup $item) => $item->getPriority())->values();
-    }
-
-    /**
-     * Add one or more navigation items to the navigation menu.
-     *
-     * @param  \Hyde\Framework\Features\Navigation\NavigationItem|\Hyde\Framework\Features\Navigation\NavigationGroup|array<\Hyde\Framework\Features\Navigation\NavigationItem|\Hyde\Framework\Features\Navigation\NavigationGroup>  $items
-     */
-    public function add(NavigationItem|NavigationGroup|array $items): static
-    {
-        foreach (Arr::wrap($items) as $item) {
-            $this->addItem($item);
-        }
-
-        return $this;
-    }
-
-    protected function addItem(NavigationItem|NavigationGroup $item): void
-    {
-        $this->items->push($item);
-    }
 }

From dbc237962e94fa310bc558986bd11dcc744b8076 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 28 Mar 2024 19:53:32 +0100
Subject: [PATCH 1411/1422] Revert "Use HasNavigationItems"

This reverts commit 6b7cc4a8c5fb54e7b867269daddc948f744f32bc.
---
 .../src/Framework/Features/Navigation/NavigationGroup.php       | 2 --
 .../src/Framework/Features/Navigation/NavigationMenu.php        | 2 --
 2 files changed, 4 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
index 4017e44d0c4..29a9012db67 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
@@ -16,8 +16,6 @@
  */
 class NavigationGroup
 {
-    use HasNavigationItems;
-
     protected string $label;
     protected int $priority;
 
diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
index 08f194a502a..9b15d74c950 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
@@ -19,8 +19,6 @@
  */
 class NavigationMenu
 {
-    use HasNavigationItems;
-
     public const DEFAULT = 500;
     public const LAST = 999;
 

From cfe97849e5682e9bf06f536e250bfafc0c4b73a2 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 28 Mar 2024 19:54:11 +0100
Subject: [PATCH 1412/1422] Merge trait back into menu class

This partially reverts commit bccde3de5116f316904cf9422246131339676bf4.
---
 .../Navigation/HasNavigationItems.php         | 41 +------------------
 .../Features/Navigation/NavigationMenu.php    | 39 ++++++++++++++++++
 2 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/HasNavigationItems.php b/packages/framework/src/Framework/Features/Navigation/HasNavigationItems.php
index 74baffa70ab..5b06e925196 100644
--- a/packages/framework/src/Framework/Features/Navigation/HasNavigationItems.php
+++ b/packages/framework/src/Framework/Features/Navigation/HasNavigationItems.php
@@ -4,9 +4,6 @@
 
 namespace Hyde\Framework\Features\Navigation;
 
-use Illuminate\Support\Arr;
-use Illuminate\Support\Collection;
-
 /**
  * Contains shared logic for classes that have navigation items.
  *
@@ -15,41 +12,5 @@
  */
 trait HasNavigationItems
 {
-    /** @var \Illuminate\Support\Collection<\Hyde\Framework\Features\Navigation\NavigationItem|\Hyde\Framework\Features\Navigation\NavigationGroup> */
-    protected Collection $items;
-
-    /**
-     * Get the navigation items in the menu.
-     *
-     * Items are automatically sorted by their priority, falling back to the order they were added.
-     *
-     * @return \Illuminate\Support\Collection<\Hyde\Framework\Features\Navigation\NavigationItem|\Hyde\Framework\Features\Navigation\NavigationGroup>
-     */
-    public function getItems(): Collection
-    {
-        // The reason we sort them here is that navigation items can be added from different sources,
-        // so any sorting we do in generator actions will only be partial. This way, we can ensure
-        // that the items are always freshly sorted by their priorities when they are retrieved.
-
-        return $this->items->sortBy(fn (NavigationItem|NavigationGroup $item) => $item->getPriority())->values();
-    }
-
-    /**
-     * Add one or more navigation items to the navigation menu.
-     *
-     * @param  \Hyde\Framework\Features\Navigation\NavigationItem|\Hyde\Framework\Features\Navigation\NavigationGroup|array<\Hyde\Framework\Features\Navigation\NavigationItem|\Hyde\Framework\Features\Navigation\NavigationGroup>  $items
-     */
-    public function add(NavigationItem|NavigationGroup|array $items): static
-    {
-        foreach (Arr::wrap($items) as $item) {
-            $this->addItem($item);
-        }
-
-        return $this;
-    }
-
-    protected function addItem(NavigationItem|NavigationGroup $item): void
-    {
-        $this->items->push($item);
-    }
+    //
 }
diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
index 9b15d74c950..7329b6bfbe9 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
@@ -4,6 +4,7 @@
 
 namespace Hyde\Framework\Features\Navigation;
 
+use Illuminate\Support\Arr;
 use Illuminate\Support\Collection;
 use Illuminate\Contracts\Support\Arrayable;
 
@@ -22,10 +23,48 @@ class NavigationMenu
     public const DEFAULT = 500;
     public const LAST = 999;
 
+    /** @var \Illuminate\Support\Collection<\Hyde\Framework\Features\Navigation\NavigationItem|\Hyde\Framework\Features\Navigation\NavigationGroup> */
+    protected Collection $items;
+
     public function __construct(Arrayable|array $items = [])
     {
         $this->items = new Collection();
 
         $this->add(evaluate_arrayable($items));
     }
+
+    /**
+     * Get the navigation items in the menu.
+     *
+     * Items are automatically sorted by their priority, falling back to the order they were added.
+     *
+     * @return \Illuminate\Support\Collection<\Hyde\Framework\Features\Navigation\NavigationItem|\Hyde\Framework\Features\Navigation\NavigationGroup>
+     */
+    public function getItems(): Collection
+    {
+        // The reason we sort them here is that navigation items can be added from different sources,
+        // so any sorting we do in generator actions will only be partial. This way, we can ensure
+        // that the items are always freshly sorted by their priorities when they are retrieved.
+
+        return $this->items->sortBy(fn (NavigationItem|NavigationGroup $item) => $item->getPriority())->values();
+    }
+
+    /**
+     * Add one or more navigation items to the navigation menu.
+     *
+     * @param  \Hyde\Framework\Features\Navigation\NavigationItem|\Hyde\Framework\Features\Navigation\NavigationGroup|array<\Hyde\Framework\Features\Navigation\NavigationItem|\Hyde\Framework\Features\Navigation\NavigationGroup>  $items
+     */
+    public function add(NavigationItem|NavigationGroup|array $items): static
+    {
+        foreach (Arr::wrap($items) as $item) {
+            $this->addItem($item);
+        }
+
+        return $this;
+    }
+
+    protected function addItem(NavigationItem|NavigationGroup $item): void
+    {
+        $this->items->push($item);
+    }
 }

From 841d1bfaae9366e1f77b2443733a25972f448f6b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 28 Mar 2024 19:54:58 +0100
Subject: [PATCH 1413/1422] Revert "Create HasNavigationItems.php"

This reverts commit fa70254b5663330848a25f9ed535ce2558c054c2.
---
 .../Features/Navigation/HasNavigationItems.php   | 16 ----------------
 1 file changed, 16 deletions(-)
 delete mode 100644 packages/framework/src/Framework/Features/Navigation/HasNavigationItems.php

diff --git a/packages/framework/src/Framework/Features/Navigation/HasNavigationItems.php b/packages/framework/src/Framework/Features/Navigation/HasNavigationItems.php
deleted file mode 100644
index 5b06e925196..00000000000
--- a/packages/framework/src/Framework/Features/Navigation/HasNavigationItems.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Hyde\Framework\Features\Navigation;
-
-/**
- * Contains shared logic for classes that have navigation items.
- *
- * @see \Hyde\Framework\Features\Navigation\NavigationMenu
- * @see \Hyde\Framework\Features\Navigation\NavigationGroup
- */
-trait HasNavigationItems
-{
-    //
-}

From b412f3429857900b02f3e558bb8ea2d12372726d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 28 Mar 2024 19:55:38 +0100
Subject: [PATCH 1414/1422] Update navigation group to extend menu class

---
 .../src/Framework/Features/Navigation/NavigationGroup.php    | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
index 29a9012db67..b17ecdb0404 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
@@ -14,18 +14,17 @@
 /**
  * Abstraction for a grouped navigation menu item, like a dropdown or a sidebar group.
  */
-class NavigationGroup
+class NavigationGroup extends NavigationMenu
 {
     protected string $label;
     protected int $priority;
 
     public function __construct(string $label, array $items = [], int $priority = NavigationMenu::LAST)
     {
-        $this->items = new Collection();
         $this->label = $label;
         $this->priority = $priority;
 
-        $this->add($items);
+        parent::__construct($items);
     }
 
     public static function create(string $label, array $items = [], int $priority = NavigationMenu::LAST): static

From 8461e60d247b8ad28ba4003f12d6a81754cc422f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 28 Mar 2024 19:55:52 +0100
Subject: [PATCH 1415/1422] Move up parent constructor call

---
 .../src/Framework/Features/Navigation/NavigationGroup.php     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
index b17ecdb0404..c32afc519ae 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
@@ -21,10 +21,10 @@ class NavigationGroup extends NavigationMenu
 
     public function __construct(string $label, array $items = [], int $priority = NavigationMenu::LAST)
     {
+        parent::__construct($items);
+
         $this->label = $label;
         $this->priority = $priority;
-
-        parent::__construct($items);
     }
 
     public static function create(string $label, array $items = [], int $priority = NavigationMenu::LAST): static

From cc803baaec4a1c1963aa2e132ce80b6de3580879 Mon Sep 17 00:00:00 2001
From: StyleCI Bot <bot@styleci.io>
Date: Thu, 28 Mar 2024 18:56:03 +0000
Subject: [PATCH 1416/1422] Remove unused import

---
 .../src/Framework/Features/Navigation/NavigationGroup.php        | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
index c32afc519ae..aacbd30b952 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
@@ -5,7 +5,6 @@
 namespace Hyde\Framework\Features\Navigation;
 
 use Illuminate\Support\Str;
-use Illuminate\Support\Collection;
 use Hyde\Pages\DocumentationPage;
 
 use function min;

From b1f5867d3de4ca59e3749d3bfb1367176799e8e6 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 29 Mar 2024 15:32:51 +0100
Subject: [PATCH 1417/1422] Document the navigation group class

---
 docs/advanced-features/navigation-api.md | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/docs/advanced-features/navigation-api.md b/docs/advanced-features/navigation-api.md
index 5f6360dd2cf..9dcc815ce78 100644
--- a/docs/advanced-features/navigation-api.md
+++ b/docs/advanced-features/navigation-api.md
@@ -392,7 +392,10 @@ This is useful if you want to check for a specific query parameter, or if you wa
 ## NavigationGroup
 
 The `NavigationGroup` class represents a group of items in a navigation menu. It contains a label, priority, and a collection of navigation items.
-This class is often used to create submenus or dropdowns in a navigation menu.
+This class is often used to create submenus or dropdowns in a navigation menu. 
+
+The `NavigationGroup` class extends the `NavigationMenu` class, and thus inherits the same base methods and functionality, 
+while also having shared methods with the `NavigationItem` class to render the groups in a Blade view.
 
 ### Quick Reference
 
@@ -406,7 +409,25 @@ $group = new NavigationGroup($label, $items = [], $priority = 500);
 
 // Add a single item or an array of items to the group.
 $group->add(new NavigationItem());
+$group->add([new NavigationItem()]);
+
+// Get all items in the group as a Collection sorted by priority.
+$group->getItems(): Collection<NavigationItem|NavigationGroup>
 
 // Get the label of the group.
 $group->getLabel(): string;
+
+// Get the priority of the group.
+$group->getPriority(): int;
+
+// Get the group key, which is a normalized kebab-case version of the label.
+$group->getGroupKey(): string;
 ```
+
+As the `NavigationGroup` class extends the `NavigationMenu` class, please see the `NavigationMenu` section for detailed information of the methods available.
+
+### Usage Scenarios
+
+HydePHP uses the `NavigationGroup` class to create dropdowns in the main navigation menu and the category groups in the documentation sidebar.
+
+In your own custom menus, you can use this class for the same types of functionality, and you can even nest groups within groups to create complex navigation structures.

From 604264203b5f369e88e8b96b3ed8669aac6d3aa2 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 29 Mar 2024 16:35:11 +0100
Subject: [PATCH 1418/1422] Unwrap collect calls for already collected items

---
 .../src/Framework/Features/Navigation/NavigationGroup.php    | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
index aacbd30b952..9c472b9366a 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
@@ -8,7 +8,6 @@
 use Hyde\Pages\DocumentationPage;
 
 use function min;
-use function collect;
 
 /**
  * Abstraction for a grouped navigation menu item, like a dropdown or a sidebar group.
@@ -45,7 +44,7 @@ public function getPriority(): int
     {
         if ($this->containsOnlyDocumentationPages()) {
             // For sidebar groups, we use the priority of the lowest priority child, unless the dropdown instance itself has a lower priority.
-            return min($this->priority, collect($this->getItems())->min(fn (NavigationItem $item): int => $item->getPriority()));
+            return min($this->priority, $this->getItems()->min(fn (NavigationItem $item): int => $item->getPriority()));
         }
 
         return $this->priority;
@@ -53,7 +52,7 @@ public function getPriority(): int
 
     protected function containsOnlyDocumentationPages(): bool
     {
-        return count($this->getItems()) && collect($this->getItems())->every(function (NavigationItem $item): bool {
+        return count($this->getItems()) && $this->getItems()->every(function (NavigationItem $item): bool {
             return $item->getPage() instanceof DocumentationPage;
         });
     }

From 89c48900a9b3d2d5b68e715ded6d0783d339a8a1 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 29 Mar 2024 19:23:33 +0100
Subject: [PATCH 1419/1422] Fix formatting

---
 docs/advanced-features/navigation-api.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/advanced-features/navigation-api.md b/docs/advanced-features/navigation-api.md
index 9dcc815ce78..9c5fcad14d2 100644
--- a/docs/advanced-features/navigation-api.md
+++ b/docs/advanced-features/navigation-api.md
@@ -392,9 +392,9 @@ This is useful if you want to check for a specific query parameter, or if you wa
 ## NavigationGroup
 
 The `NavigationGroup` class represents a group of items in a navigation menu. It contains a label, priority, and a collection of navigation items.
-This class is often used to create submenus or dropdowns in a navigation menu. 
+This class is often used to create submenus or dropdowns in a navigation menu.
 
-The `NavigationGroup` class extends the `NavigationMenu` class, and thus inherits the same base methods and functionality, 
+The `NavigationGroup` class extends the `NavigationMenu` class, and thus inherits the same base methods and functionality,
 while also having shared methods with the `NavigationItem` class to render the groups in a Blade view.
 
 ### Quick Reference

From 75de73070e65bc780db7f49d4a623c193efedcc4 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 31 Mar 2024 16:34:33 +0200
Subject: [PATCH 1420/1422] Update navigation documentation for v2 rewrite

---
 docs/digging-deeper/navigation.md | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/docs/digging-deeper/navigation.md b/docs/digging-deeper/navigation.md
index 65bac03a553..155b07b9cab 100644
--- a/docs/digging-deeper/navigation.md
+++ b/docs/digging-deeper/navigation.md
@@ -297,36 +297,33 @@ For example: `_docs/getting-started/installation.md` will be placed in a group c
 
 ## Digging Deeper into the internals
 
-While not required to know, you may find it interesting to learn more about how the navigation is handled internally.
-The best way to learn about this is to look at the source code, so here is a high-level overview with details on where to look in the source code.
+While not required to know, you may find it interesting to learn more about how the navigation is handled internally. Here is a high level overview,
+but you can find more detailed information in the [Navigation API](navigation-api) documentation.
 
-The main navigation menu is the `MainNavigationMenu` class, and the documentation sidebar is the `DocumentationSidebar` class.
-Both extend the same `BaseNavigationMenu` class:
+The main navigation menu is the `MainNavigationMenu` class, and the documentation sidebar is the `DocumentationSidebar` class. Both extend the same base `NavigationMenu` class.
 
 ```php
-// TODO: Update these examples
-
 use Hyde\Framework\Features\Navigation\MainNavigationMenu;
 use Hyde\Framework\Features\Navigation\DocumentationSidebar;
-use Hyde\Framework\Features\Navigation\BaseNavigationMenu;
+use Hyde\Framework\Features\Navigation\NavigationMenu;
 ```
 
-Within the `BaseNavigationMenu` class, you will find the main logic for how the menus are generated,
+Within the base `NavigationMenu` class, you will find the main logic for how the menus are generated,
 while the child implementations contain the extra logic tailored for their specific use cases.
 
-All the navigation menus store the menu items in their `$items` array containing instances of the `NavigationItem` class.
+All the navigation menus store the menu items in their `$items` collection containing instances of the `NavigationItem` class.
 
 The `NavigationItem` class is a simple class that contains the label and URL of the menu item and is used to represent each item in the menu.
-Dropdowns are represented by `DropdownNavigationItem` instances, which extend the `NavigationItem` class and contain an array of additional `NavigationItem` instances.
+Dropdowns are represented by `NavigationGroup` instances, which extend the `NavigationMenu` class and contain a collection of additional `NavigationItem` instances.
 
 ```php
 use Hyde\Framework\Features\Navigation\NavigationItem;
-use Hyde\Framework\Features\Navigation\DropdownNavigationItem;
+use Hyde\Framework\Features\Navigation\NavigationGroup;
 ```
 
 ## The Navigation API
 
-If you want to interact with the site navigation programmatically, or if you want to create complex custom, you can do so through the new Navigation API.
+If you want to interact with the site navigation programmatically, or if you want to create complex custom menus, you can do so through the new Navigation API.
 For most cases you don't need this, as Hyde creates the navigation for you. But it can be useful for advanced users and package developers.
 
 The Navigation API consists of a set of PHP classes, allowing you to fluently interact with the navigation menus. You can learn more about the API in the [Navigation API](navigation-api) documentation.

From 01291420df325c987ac9732d902b5df112e02833 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 31 Mar 2024 17:12:18 +0200
Subject: [PATCH 1421/1422] Create documentation note

---
 docs/digging-deeper/navigation.md                            | 5 +++++
 .../Features/Navigation/NavigationMenuGenerator.php          | 3 ---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/docs/digging-deeper/navigation.md b/docs/digging-deeper/navigation.md
index 155b07b9cab..ff515caf30b 100644
--- a/docs/digging-deeper/navigation.md
+++ b/docs/digging-deeper/navigation.md
@@ -294,6 +294,11 @@ For example: `_docs/getting-started/installation.md` will be placed in a group c
 
 >info Tip: When using subdirectory-based dropdowns, you can set their priority using the directory name as the array key.
 
+#### Dropdown menu notes
+
+Here are some things to keep in mind when using dropdown menus, regardless of the configuration:
+- Dropdowns take priority over standard items. So if you have a dropdown with the key `about` and a page with the key `about`, the dropdown will be created, and the page won't be in the menu.
+  - For example: With this file structure: `_pages/foo.md`, `_pages/foo/bar.md`, `_pages/foo/baz.md`, the link to `foo` will be lost.
 
 ## Digging Deeper into the internals
 
diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
index c0e11aa5a75..d1476b87ac3 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
@@ -158,9 +158,6 @@ protected function getOrCreateGroupItem(string $groupName): NavigationGroup
             // so here we create a new instance to replace the base one, this
             // does mean we lose the destination as we can't link to them.
 
-            // Todo: Add note in documentation about this behavior
-            // Example file structure: _pages/foo.md, _pages/foo/bar.md, _pages/foo/baz.md, here the link to foo will be lost.
-
             $item = new NavigationGroup($group->getLabel(), [], $group->getPriority());
 
             $this->items->put($groupKey, $item);

From cc2756e9c4a2c1dbb38be8bdbd696dff335152e4 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 31 Mar 2024 16:00:57 +0200
Subject: [PATCH 1422/1422] Update RELEASE_NOTES.md

---
 RELEASE_NOTES.md | 60 +++++++++++++++++++++++++++++++++++++-----------
 1 file changed, 47 insertions(+), 13 deletions(-)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 3c8def52a9b..90bac911835 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -11,15 +11,14 @@ This serves two purposes:
 
 ### Added
 - Added a new `\Hyde\Framework\Actions\PreBuildTasks\TransferMediaAssets` build task handle media assets transfers for site builds.
-- Added a new `NavigationItem::getLink()` method contain the previous `NavigationItem::getDestination()` logic, to return the link URL.
 
 ### Changed
+- **Breaking:** The internals of the navigation system has been rewritten into a new Navigation API. This change is breaking for custom navigation implementations. For more information, see below.
+- Minor: Navigation menu items are now no longer filtered by duplicates (meaning two items with the same label can now exist in the same menu) in https://github.com/hydephp/develop/pull/1573
+- Minor: Due to changes in the navigation system, it is possible that existing configuration files will need to be adjusted in order for menus to look the same (in terms of ordering etc.)
+- Minor: The documentation article component now supports disabling the semantic rendering using a falsy value in https://github.com/hydephp/develop/pull/1566
 - Changed how the documentation search is generated, to be an `InMemoryPage` instead of a post-build task.
 - Media asset files are now copied using the new build task instead of the deprecated `BuildService::transferMediaAssets()` method.
-- Minor: The documentation article component now supports disabling the semantic rendering using a falsy value in https://github.com/hydephp/develop/pull/1566
-- Navigation menu items are now no longer filtered by duplicates (meaning two items with the same label can now exist in the same menu) in https://github.com/hydephp/develop/pull/1573
-- Breaking: The `NavigationItem` class now always stores the destination as a `Route` instance.
-- Breaking: The `NavigationItem::getDestination()` method now returns its `Route` instance.
 
 ### Deprecated
 - for soon-to-be removed features.
@@ -45,6 +44,32 @@ Please see the "Breaking changes & upgrade guide" section below for more informa
 
 Please read through this section to ensure your site upgrades smoothly.
 
+## High impact
+
+### Navigation system rewrite
+
+The navigation system has been rewritten into a new Navigation API. This change is breaking for custom navigation implementations, see more down below.
+
+For most users, the only impact will be that configuration files need to be updated to use the new configuration format. Due to the internal changes,
+it's also possible that menu items will be in a slightly different order than before, depending on your setup. Please verify that your site's menus
+look as expected after upgrading, and adjust the configuration files if necessary, before deploying to production.
+
+### Navigation and sidebar configuration changes
+
+The navigation and sidebar configuration files have been updated to use the new Navigation API.
+This means that you will need to update your configuration files to use the new format.
+
+The easiest way to upgrade is to publish updated configuration files (`hyde.php` and `docs.php`) and copy over your customizations.
+
+The following configuration entries have been updated:
+
+-  Changed configuration option `docs.sidebar_order` to `docs.sidebar.order` in https://github.com/hydephp/develop/pull/1583
+-  Upgrade path: Move the `sidebar_order` option's array in the `config/docs.php` file into the `sidebar` array in the same file.
+
+-  Changed configuration option `docs.table_of_contents` to `docs.sidebar.table_of_contents` in https://github.com/hydephp/develop/pull/1584
+-  Upgrade path: Move the `table_of_contents` option's array in the `config/docs.php` file into the `sidebar` array in the same file.
+
+
 ## General impact
 
 ### Documentation search page changes
@@ -53,20 +78,29 @@ The documentation search page and search index have been changed to be generated
 
 The main impact noticeable to most users by this is the implicit changes, like the pages showing up in the dashboard and route list command.
 
-In case you have customized the `GenerateSearch` post-build task you may, depending on what you were trying to do, 
+In case you have customized the `GenerateSearch` post-build task you may, depending on what you were trying to do,
 want to adapt your code to interact with the new `InMemoryPage`, which is generated in the `HydeCoreExtension` class.
 
 For more information, see https://github.com/hydephp/develop/pull/1498.
 
 ## Low impact
 
-### Navigation item changes
+### Navigation internal changes
 
-The `NavigationItem::getDestination()` method now returns its `Route` instance. This allows for deferring the route evaluation.
+The navigation system has been rewritten into a new Navigation API. This change is breaking for custom navigation implementations.
 
-If you have previously used this method directly and expected a string to be returned, you may need to adapt your code to handle the new return type.
+If you have previously in your custom code done any of the following, or similar, you will need to adapt your code to use the new Navigation API:
+- Created custom navigation menus or Blade components
+- Extended or called the navigation related classes directly
+- Customized the navigation system in any way beyond the standard configuration
 
-If you want to retain the previous state where a string is always returned, you can use the new `NavigationItem::getLink()` method instead, which will resolve the route immediately.
+
+#### Upgrade guide
+
+Due to the scope of the rewrite, the easiest and fastest way to upgrade your code is to recreate it using the new Navigation API.
+
+- For a full comparison of the changes, you may see the PR that introduced the new API: https://github.com/hydephp/develop/pull/1568/files
+- For information on how to use the new Navigation API, see the documentation: https://hydephp.com/docs/2.x/navigation-api
 
 ### HTML ID changes
 
@@ -85,14 +119,14 @@ If you have used any of the following selectors in custom code you wrote yoursel
 As the new documentation search implementation brings changes to their code API you may need to adapt your code
 according to the information below in case you wrote custom code that interacted with these parts of the codebase.
 
-- The `GenerateSearch` post-build task has been removed. If you have previously extended or customized this class, 
+- The `GenerateSearch` post-build task has been removed. If you have previously extended or customized this class,
   you will need to adapt your code, as the search index files are now handled implicitly during the standard build process,
   as the search pages are now added to the kernel page and route collection. (https://github.com/hydephp/develop/pull/1498)
 
 - If your site has a custom documentation search page, for example `_docs/search.md` or `_pages/docs/search.blade.php`,
-  that page will no longer be built when using the specific `build:search` command. It will, of course, 
+  that page will no longer be built when using the specific `build:search` command. It will, of course,
   be built using the standard `build` command. https://github.com/hydephp/develop/commit/82dc71f4a0e7b6be7a9f8d822fbebe39d2289ced
- 
+
 - In the highly unlikely event your site customizes any of the search pages by replacing them in the kernel route collection,
   you would now need to do that in the kernel page collection due to the search pages being generated earlier in the lifecycle.
   https://github.com/hydephp/develop/commit/82dc71f4a0e7b6be7a9f8d822fbebe39d2289ced