Update FluentUI (#6228)

dotnet · Nov 7, 2024 · e4ee02e · e4ee02e
1 parent 7007cf6
commit e4ee02e
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -117,8 +117,8 @@
     <PackageVersion Include="KubernetesClient" Version="15.0.1" />
     <PackageVersion Include="JsonPatch.Net" Version="3.1.1" />
     <PackageVersion Include="Microsoft.Data.SqlClient" Version="5.2.2" />
-    <PackageVersion Include="Microsoft.FluentUI.AspNetCore.Components" Version="4.10.1" />
-    <PackageVersion Include="Microsoft.FluentUI.AspNetCore.Components.Icons" Version="4.10.1" />
+    <PackageVersion Include="Microsoft.FluentUI.AspNetCore.Components" Version="4.10.3" />
+    <PackageVersion Include="Microsoft.FluentUI.AspNetCore.Components.Icons" Version="4.10.3" />
     <PackageVersion Include="Milvus.Client" Version="2.3.0-preview.1" />
     <PackageVersion Include="MongoDB.Driver" Version="[2.30.0,3.0.0)" />
     <PackageVersion Include="MongoDB.Driver.Core.Extensions.DiagnosticSources" Version="1.5.0" />

diff --git a/src/Aspire.Dashboard/Components/Layout/MainLayout.razor b/src/Aspire.Dashboard/Components/Layout/MainLayout.razor
@@ -72,10 +72,7 @@
 
     <FluentDialogProvider/>
     <FluentTooltipProvider />
-    @* Temporary work around for https://github.com/microsoft/fluentui-blazor/issues/2736 *@
-    <div style="position: fixed; bottom: 0; z-index: 9900;">
-        <FluentMenuProvider />
-    </div>
+    <FluentMenuProvider />
     <div id="blazor-error-ui">
         @Loc[nameof(Layout.MainLayoutUnhandledErrorMessage)]
         <a href="" class="reload">@Loc[nameof(Layout.MainLayoutUnhandledErrorReload)]</a>

diff --git a/src/Aspire.Dashboard/Components/Layout/MainLayout.razor.css b/src/Aspire.Dashboard/Components/Layout/MainLayout.razor.css
@@ -53,7 +53,7 @@
         grid-area: head;
     }
 
-    ::deep.layout > .nav-menu-container {
+    ::deep.layout > .fluent-appbar {
         grid-area: nav;
         overflow-y: auto;
         background: var(--neutral-layer-4);
@@ -165,7 +165,7 @@
         grid-area: head;
     }
 
-    ::deep.layout > .nav-menu-container {
+    ::deep.layout > .fluent-appbar {
         grid-area: nav;
         overflow-y: auto;
         background: var(--neutral-layer-4);

diff --git a/tests/Aspire.Dashboard.Components.Tests/Controls/TextVisualizerDialogTests.cs b/tests/Aspire.Dashboard.Components.Tests/Controls/TextVisualizerDialogTests.cs
@@ -158,6 +158,11 @@ private IRenderedFragment SetUpDialog(out IDialogService dialogService, ThemeMan
             builder.CloseComponent();
         });
 
+        // Setting a provider ID on menu service is required to simulate <FluentMenuProvider> on the page.
+        // This makes FluentMenu render without error.
+        var menuService = Services.GetRequiredService<IMenuService>();
+        menuService.ProviderId = "Test";
+
         dialogService = Services.GetRequiredService<IDialogService>();
         return cut;
     }