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

* [NavMenu] Revert fix for #2097. Needsa different/better solution * [Demo] Make NavGroup.Expanded bindable
microsoft · Jun 28, 2024 · 8f57600 · 8f57600
1 parent 56dfe63
commit 8f57600
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 22 deletions.
diff --git a/examples/Demo/Shared/Shared/DemoNavMenuItem.razor b/examples/Demo/Shared/Shared/DemoNavMenuItem.razor
@@ -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>

diff --git a/examples/Demo/Shared/Shared/NavItem.cs b/examples/Demo/Shared/Shared/NavItem.cs
@@ -1,4 +1,4 @@
-// ------------------------------------------------------------------------
+// ------------------------------------------------------------------------
 // MIT License - Copyright (c) Microsoft Corporation. All rights reserved.
 // ------------------------------------------------------------------------
 
@@ -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; }
 

diff --git a/src/Core/Components/NavMenu/FluentNavGroup.razor.cs b/src/Core/Components/NavMenu/FluentNavGroup.razor.cs
@@ -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")
@@ -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);
         }
     }