Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[2.x] Always place navigation menu items in dropdowns when set in front matter #1597

Merged
merged 4 commits into from
Feb 28, 2024
Merged

[2.x] Always place navigation menu items in dropdowns when set in front matter #1597

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d02531b
Rename test methods names to be clearer
caendesilva Feb 28, 2024
080d204
Move up conditional
caendesilva Feb 28, 2024
8f171ad
Expect root item with the group name and the children as the pages
caendesilva Feb 28, 2024
353603b
Expect that menu items are always grouped when set in front matter
caendesilva Feb 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
25 changes: 10 additions & 15 deletions packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,29 +200,21 @@ 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

$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']),
new MarkdownPage('baz', ['navigation.group' => 'Group 1']),
]);
}

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

$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']),
Expand Down Expand Up @@ -292,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']),
Expand Down Expand Up @@ -494,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']),
Expand Down
Loading