Skip to content

[NavMenu] Revert fix for when prerender set to false #2293

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

Merged
vnbaaij merged 3 commits into from
Jun 28, 2024
Merged

[NavMenu] Revert fix for when prerender set to false #2293

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
428e49a
[Demo] Make NavGroup.Expanded bindable
vnbaaij Jun 28, 2024
d9d8339
Undo remove PageScript block
vnbaaij Jun 28, 2024
bfb437f
Merge branch 'dev' into users/vnbaaij/fix-navmenu-issues
vnbaaij Jun 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
4 changes: 2 additions & 2 deletions examples/Demo/Shared/Shared/DemoNavMenuItem.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
@using NavLink = FluentUI.Demo.Shared.NavLink

@switch(Value)
@switch (Value)
{
case NavGroup group:
<FluentNavGroup Expanded="@group.Expanded" Gap="@group.Gap" Icon="@group.Icon">
<FluentNavGroup @bind-Expanded="@group.Expanded" Gap="@group.Gap" Icon="@group.Icon" >
<TitleTemplate>
<h3>@group.Title</h3></TitleTemplate>
<ChildContent>
Expand Down
4 changes: 2 additions & 2 deletions examples/Demo/Shared/Shared/NavItem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// ------------------------------------------------------------------------
// ------------------------------------------------------------------------
// MIT License - Copyright (c) Microsoft Corporation. All rights reserved.
// ------------------------------------------------------------------------

Expand Down Expand Up @@ -28,7 +28,7 @@ public NavLink(string? href, Icon icon, string title, NavLinkMatch match = NavLi

public record NavGroup : NavItem
{
public bool Expanded { get; init; }
public bool Expanded { get; set; }
public string Gap { get; init; }
public IReadOnlyList<NavItem> Children { get; }

Expand Down
19 changes: 1 addition & 18 deletions src/Core/Components/NavMenu/FluentNavGroup.razor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,6 @@ public partial class FluentNavGroup : FluentNavBase
private readonly RenderFragment _renderButton;
private bool _open;

private static int _renderCount = 0;
private static bool _negate = false;

protected string? ClassValue =>
new CssBuilder("fluent-nav-group")
.AddClass("fluent-nav-item")
Expand Down Expand Up @@ -105,30 +102,16 @@ public FluentNavGroup()
_renderButton = RenderButton;
}

protected override void OnInitialized()
{
_renderCount ++;
if (_renderCount > 1)
{
_negate = true;
}
}

private async Task ToggleExpandedAsync()
{

if (_negate)
{
Expanded = !Expanded;
}

if (!Owner.Expanded && Owner.CollapsedChildNavigation)
{
await SetExpandedAsync(!_open);
}
else
{
await SetExpandedAsync(Expanded);
await SetExpandedAsync(!Expanded);
}
}

Expand Down