Refactor to handle priority search in generators

Author: emmadesilva

packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php

@@ -123,8 +123,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 +143,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;
+    }
 }

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

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(Str::slug($label)) ?? 999, $label, $items);
+        return new static('', $label, $priority ?? 999, $label, $items);
     }
 
     /**
@@ -207,10 +207,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;
-    }
 }

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]];

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());
-    }
 }