Move dropdown accessors to new menu class

Author: emmadesilva

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';
-    }
 }

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';
+    }
 }

packages/framework/tests/Feature/NavigationMenuTest.php

@@ -243,28 +243,28 @@ public function testPagesInSubdirectoriesAreNotAddedToTheNavigationMenuWithConfi
     public function testHasDropdownsReturnsFalseWhenThereAreNoDropdowns()
     {
         config(['hyde.navigation.subdirectories' => 'dropdown']);
-        $menu = $this->createMainNavigationMenu();
+        $menu = $this->createNewMainNavigationMenu();
         $this->assertFalse($menu->hasDropdowns());
     }
 
     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());