diff --git a/Directory.Packages.props b/Directory.Packages.props index 687d56057a..c1cfc9fd3a 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -117,8 +117,8 @@ - - + + diff --git a/src/Aspire.Dashboard/Components/Layout/MainLayout.razor b/src/Aspire.Dashboard/Components/Layout/MainLayout.razor index 81c4ab55f5..fe5dc78c97 100644 --- a/src/Aspire.Dashboard/Components/Layout/MainLayout.razor +++ b/src/Aspire.Dashboard/Components/Layout/MainLayout.razor @@ -72,10 +72,7 @@ - @* Temporary work around for https://github.com/microsoft/fluentui-blazor/issues/2736 *@ -
- -
+
@Loc[nameof(Layout.MainLayoutUnhandledErrorMessage)] @Loc[nameof(Layout.MainLayoutUnhandledErrorReload)] diff --git a/src/Aspire.Dashboard/Components/Layout/MainLayout.razor.css b/src/Aspire.Dashboard/Components/Layout/MainLayout.razor.css index 5116923bfa..a06b2cb2e6 100644 --- 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 index c4b9b3d0c7..5114a9334e 100644 --- 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 on the page. + // This makes FluentMenu render without error. + var menuService = Services.GetRequiredService(); + menuService.ProviderId = "Test"; + dialogService = Services.GetRequiredService(); return cut; }