Update navigation menu generator to remove duplicates after sorting

This means that the duplication filter will run based on the defined item priorities, giving config items precedence, fixing #1406
hydephp · Oct 28, 2023 · 793d6b6 · 793d6b6
1 parent ddd432a
commit 793d6b6
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/packages/framework/src/Framework/Features/Navigation/BaseNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/BaseNavigationMenu.php
@@ -26,8 +26,8 @@ public static function create(): static
         $menu = new static();
 
         $menu->generate();
-        $menu->removeDuplicateItems();
         $menu->sortByPriority();
+        $menu->removeDuplicateItems();
 
         return $menu;
     }

diff --git a/packages/framework/tests/Feature/NavigationMenuTest.php b/packages/framework/tests/Feature/NavigationMenuTest.php
@@ -161,7 +161,22 @@ public function test_duplicates_are_removed_when_adding_in_config_regardless_of_
         $this->assertEquals($expected, $menu->items);
     }
 
-    // TODO test when there are duplicates, config items take precedence
+    public function test_config_items_take_precedence_over_generated_items()
+    {
+        $this->file('_pages/foo.md');
+
+        config(['hyde.navigation.custom' => [NavItem::forLink('bar', 'Foo')]]);
+
+        $menu = NavigationMenu::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 test_documentation_pages_that_are_not_index_are_not_added_to_the_menu()
     {