Skip to content

A Swiss Army knife for developers.

MAUI Blazor - Fixed navigation on click. (#801)

Etienne BAUDOUXb2f6ba584729
diff --git a/src/app/dev/DevToys.Business/ViewModels/MainWindowViewModel.cs b/src/app/dev/DevToys.Business/ViewModels/MainWindowViewModel.cs
index 35a8d8c8e..f1528df3e 100644
--- a/src/app/dev/DevToys.Business/ViewModels/MainWindowViewModel.cs
+++ b/src/app/dev/DevToys.Business/ViewModels/MainWindowViewModel.cs
@@ -58,13 +58,13 @@ internal sealed partial class MainWindowViewModel : ObservableRecipient
/// <summary>
/// Gets a flat list containing all the footer tools available, ordered.
/// </summary>
- internal ReadOnlyObservableCollection<GuiToolViewItem> FooterToolViewItems => _guiToolProvider.FooterToolViewItems;
+ internal ReadOnlyObservableCollection<INotifyPropertyChanged> FooterToolViewItems => _guiToolProvider.FooterToolViewItems;
// Can't use CommunityToolkit.MVVM due to https://github.com/dotnet/roslyn/issues/57239#issuecomment-1437895948
/// <summary>
/// Gets or sets the selected menu item in the NavitationView.
/// </summary>
- internal INotifyPropertyChanged? SelectedMenuItem
+ public INotifyPropertyChanged? SelectedMenuItem
{
get => _selectedMenuItem;
set
diff --git a/src/app/dev/DevToys.Core/Tools/GuiToolProvider.cs b/src/app/dev/DevToys.Core/Tools/GuiToolProvider.cs
index c76ae2a90..c3e9a4010 100644
--- a/src/app/dev/DevToys.Core/Tools/GuiToolProvider.cs
+++ b/src/app/dev/DevToys.Core/Tools/GuiToolProvider.cs
@@ -45,8 +45,8 @@ public sealed partial class GuiToolProvider
private ObservableCollection<INotifyPropertyChanged>? _headerAndBodyToolViewItems;
private ReadOnlyObservableCollection<INotifyPropertyChanged>? _headerAndBodyToolViewItemsReadOnly;
- private ObservableCollection<GuiToolViewItem>? _footerToolViewItems;
- private ReadOnlyObservableCollection<GuiToolViewItem>? _footerToolViewItemsReadOnly;
+ private ObservableCollection<INotifyPropertyChanged>? _footerToolViewItems;
+ private ReadOnlyObservableCollection<INotifyPropertyChanged>? _footerToolViewItemsReadOnly;
private GroupViewItem? _favoriteToolsGroupViewItem;
private SeparatorViewItem? _separatorAfterAllToolsItem;
private SeparatorViewItem? _separatorAfterRecentTools;
@@ -100,7 +100,7 @@ public sealed partial class GuiToolProvider
/// <summary>
/// Gets a flat list containing all the footer tools available, ordered.
/// </summary>
- public ReadOnlyObservableCollection<GuiToolViewItem> FooterToolViewItems
+ public ReadOnlyObservableCollection<INotifyPropertyChanged> FooterToolViewItems
{
get
{
@@ -256,9 +256,10 @@ public sealed partial class GuiToolProvider
{
for (int i = 0; i < FooterToolViewItems.Count; i++)
{
- if (FooterToolViewItems[i].ToolInstance == guiToolInstance)
+ INotifyPropertyChanged item = FooterToolViewItems[i];
+ if (item is GuiToolViewItem guiToolViewItem && guiToolViewItem.ToolInstance == guiToolInstance)
{
- yield return FooterToolViewItems[i];
+ yield return guiToolViewItem;
}
}
@@ -287,7 +288,11 @@ public sealed partial class GuiToolProvider
{
for (int i = 0; i < FooterToolViewItems.Count; i++)
{
- action(FooterToolViewItems[i]);
+ INotifyPropertyChanged item = FooterToolViewItems[i];
+ if (item is GuiToolViewItem guiToolViewItem)
+ {
+ action(guiToolViewItem);
+ }
}
for (int i = 0; i < HeaderAndBodyToolViewItems.Count; i++)
diff --git a/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Components/Navbar/Navbar.razor b/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Components/Navbar/Navbar.razor
index d9c71231f..ae9d30087 100644
--- a/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Components/Navbar/Navbar.razor
+++ b/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Components/Navbar/Navbar.razor
@@ -1,4 +1,5 @@
@namespace DevToys.MauiBlazor.Components
+@using DevToys.Core.Tools.ViewItems;
@inherits MefLayoutComponentBase
<CascadingValue Value="this" Name="NavMenu" IsFixed="true">
@@ -10,7 +11,7 @@
<Button Class="navbar-toggler"
title="Navbar Toggler" aria-controls="navbarNav" aria-expanded="@CollapsedName" aria-label="Toggle navigation"
Appearance="@ButtonAppearance.Stealth"
- IconOnly="true" @onclick=@OnClickAsync>
+ IconOnly="true" @onclick=@OnTogglePaneButtonClickAsync>
<i class="icon-ic_fluent_navigation_24_regular"></i>
</Button>
}
@@ -24,7 +25,78 @@
</div>
</FormItem>
}
- @ChildContent
+
+ <ul class="nav-items scrollable vertical">
+ @if (MenuItemsSource is not null)
+ {
+ @foreach (INotifyPropertyChanged item in MenuItemsSource)
+ {
+ if (item is GuiToolViewItem guiToolViewItem)
+ {
+ <NavbarItem Item="item"
+ Selected="item == SelectedItem"
+ OnSelected=@OnItemSelectedAsync />
+ }
+ else if (item is GroupViewItem groupViewItem)
+ {
+ if (groupViewItem.Children is not null)
+ {
+ <NavbarGroup Item="item"
+ Selected="item == SelectedItem"
+ OnSelected=@OnItemSelectedAsync>
+ @foreach (var childItem in groupViewItem.Children)
+ {
+ <NavbarItem Item="childItem"
+ Selected="childItem == SelectedItem"
+ OnSelected=@OnItemSelectedAsync/>
+ }
+ </NavbarGroup>
+ }
+ else
+ {
+ <NavbarItem Item="item"
+ Selected="item == SelectedItem"
+ OnSelected=@OnItemSelectedAsync/>
+ }
+ }
+ else if (item is SeparatorViewItem)
+ {
+ <li class="nav-item nav-separator"></li>
+ }
+ else
+ {
+ ThrowHelper.ThrowNotSupportedException();
+ }
+ }
+ }
+ </ul>
+
+ <ul class="nav-items sticky-bottom">
+ @if (FooterMenuItemsSource is not null)
+ {
+ @foreach (var item in FooterMenuItemsSource)
+ {
+ if (item is GuiToolViewItem guiToolViewItem)
+ {
+ <NavbarItem Item="item"
+ Selected="item == SelectedItem"
+ OnSelected=@OnItemSelectedAsync/>
+ }
+ else if (item is SeparatorViewItem)
+ {
+ <li class="nav-item nav-separator"></li>
+ }
+ else
+ {
+ ThrowHelper.ThrowNotSupportedException();
+ }
+ }
+ }
+ </ul>
</nav>
</CascadingValue>
+
+ <main class="page">
+ @Content
+ </main>
</CascadingValue>
\ No newline at end of file
diff --git a/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Components/Navbar/Navbar.razor.cs b/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Components/Navbar/Navbar.razor.cs
index 0d9e1d088..3ecebeee0 100644
--- a/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Components/Navbar/Navbar.razor.cs
+++ b/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Components/Navbar/Navbar.razor.cs
@@ -1,4 +1,4 @@
-using DevToys.MauiBlazor.Core.Enums;
+using System.Collections.ObjectModel;
namespace DevToys.MauiBlazor.Components;
@@ -43,7 +43,19 @@ public partial class Navbar : MefLayoutComponentBase
}
[Parameter]
- public RenderFragment? ChildContent { get; set; }
+ public RenderFragment? Content { get; set; }
+
+ [Parameter]
+ public ReadOnlyObservableCollection<INotifyPropertyChanged>? MenuItemsSource { get; set; }
+
+ [Parameter]
+ public ReadOnlyObservableCollection<INotifyPropertyChanged>? FooterMenuItemsSource { get; set; }
+
+ [Parameter]
+ public INotifyPropertyChanged? SelectedItem { get; set; }
+
+ [Parameter]
+ public EventCallback<INotifyPropertyChanged?> SelectedItemChanged { get; set; }
[JSInvokable]
public bool ToggleResizeTracking()
@@ -67,13 +79,20 @@ public partial class Navbar : MefLayoutComponentBase
}
}
- internal async Task OnClickAsync()
+ internal async Task OnTogglePaneButtonClickAsync()
{
Collapsed = !Collapsed;
HasManualCollapsed = !HasManualCollapsed;
await InvokeAsync(StateHasChanged);
}
+ internal Task OnItemSelectedAsync(INotifyPropertyChanged item)
+ {
+ SelectedItem = item;
+ SelectedItemChanged.InvokeAsync(item);
+ return Task.CompletedTask;
+ }
+
protected override void AppendClasses(ClassHelper helper)
{
helper.Append("navbar");
diff --git a/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Components/Navbar/NavbarAnchor.razor b/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Components/Navbar/NavbarAnchor.razor
deleted file mode 100644
index 9e29a8d16..000000000
--- a/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Components/Navbar/NavbarAnchor.razor
+++ /dev/null
@@ -1,13 +0,0 @@
-@namespace DevToys.MauiBlazor.Components
-@inherits MefLayoutComponentBase
-
-<a id="@Id"
- href="@Href"
- class="@CssClasses"
- title="@Title"
- @ref=Element
- @onclick=@OnClickAsync
- @onclick:preventDefault="true"
- @attributes="@AdditionalAttributes">
- @ChildContent
-</a>
diff --git a/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Components/Navbar/NavbarAnchor.razor.cs b/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Components/Navbar/NavbarAnchor.razor.cs
deleted file mode 100644
index c83d32b28..000000000
--- a/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Components/Navbar/NavbarAnchor.razor.cs
+++ /dev/null
@@ -1,104 +0,0 @@
-using System.Globalization;
-using System.Web;
-using Microsoft.AspNetCore.Components.Routing;
-using Microsoft.AspNetCore.Components.Web;
-
-namespace DevToys.MauiBlazor.Components;
-public partial class NavbarAnchor : MefLayoutComponentBase, IDisposable
-{
- private const string DefaultActiveClass = "active";
-
- private bool _isActive;
- private string _hrefAbsolute = string.Empty;
- private string _class = string.Empty;
- private string _href = string.Empty;
-
- [Inject]
- private NavigationManager NavigationManager { get; set; } = default!;
-
- [Parameter]
- public string Href
- {
- get => _href;
- set
- {
- _href = HttpUtility.UrlEncode(value);
- }
- }
-
- [Parameter]
- public string? Title { get; set; } = string.Empty;
-
- [CascadingParameter]
- public NavbarItem? NavbarItem { get; set; }
-
- [Parameter]
- public RenderFragment? ChildContent { get; set; }
-
- [Parameter]
- public EventCallback<bool> Clicked { get; set; }
-
- protected override void AppendClasses(ClassHelper helper)
- {
- helper.Append("item-link");
- if (_isActive)
- {
- helper.Append("active");
- }
- base.AppendClasses(helper);
- }
-
- protected override void OnInitialized()
- {
- NavigationManager.LocationChanged += OnLocationChanged;
- base.OnInitialized();
- }
-
- protected override void OnParametersSet()
- {
- string? href = Href;
- if (AdditionalAttributes != null && AdditionalAttributes.TryGetValue("href", out object? obj))
- {
- href = Convert.ToString(obj, CultureInfo.InvariantCulture);
- }
-
- _hrefAbsolute = href == null ? null : NavigationManager.ToAbsoluteUri(href).AbsoluteUri;
- _isActive = ShouldMatch(NavigationManager.Uri);
- if (_isActive)
- {
- ClassesHasChanged();
- StateHasChanged();
- }
- base.OnParametersSet();
- }
-
- protected async Task OnClickAsync(MouseEventArgs eventArgs)
- {
- NavigationManager.NavigateTo(Href, false);
- await Clicked.InvokeAsync();
- }
-
- private void OnLocationChanged(object? sender, LocationChangedEventArgs args)
- {
- bool shouldBeActiveNow = ShouldMatch(args.Location);
- Clicked.InvokeAsync(shouldBeActiveNow);
- if (shouldBeActiveNow != _isActive)
- {
- _isActive = shouldBeActiveNow;
- ClassesHasChanged();
- InvokeAsync(StateHasChanged);
- }
- }
-
- private bool ShouldMatch(string uri)
- {
- if (uri.Equals(_hrefAbsolute, StringComparison.OrdinalIgnoreCase))
- {
- return true;
- }
- return false;
- }
-
- public void Dispose()
- => NavigationManager.LocationChanged -= OnLocationChanged;
-}
diff --git a/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Components/Navbar/NavbarGroup.razor b/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Components/Navbar/NavbarGroup.razor
index 838976729..04e107711 100644
--- a/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Components/Navbar/NavbarGroup.razor
+++ b/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Components/Navbar/NavbarGroup.razor
@@ -3,11 +3,11 @@
@inherits NavbarItem
<CascadingValue Value="this" IsFixed="true">
- <NavbarItem Class="nav-group" Item="Item">
+ <NavbarItem Class="nav-group" Item="Item" Selected="Selected" OnSelected="OnSelected">
<div @onclick:stopPropagation="true" @onclick:preventDefault="true">
<Button Type="@ButtonType.Button" Appearance="@ButtonAppearance.Stealth" IconOnly="true"
class="collapsed"
- @onclick=OnClickAsync
+ @onclick=OnToggleExpanderClickAsync
aria-expanded="true">
<i class="icon-active icon-ic_fluent_chevron_down_48_regular"></i>
</Button>
diff --git a/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Components/Navbar/NavbarGroup.razor.cs b/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Components/Navbar/NavbarGroup.razor.cs
index 3b5d0f3e7..d37ec5c98 100644
--- a/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Components/Navbar/NavbarGroup.razor.cs
+++ b/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Components/Navbar/NavbarGroup.razor.cs
@@ -74,7 +74,7 @@ public partial class NavbarGroup : NavbarItem
}
// Todo Handle collapse animation
- internal new async Task OnClickAsync(MouseEventArgs eventArgs)
+ internal async Task OnToggleExpanderClickAsync(MouseEventArgs eventArgs)
{
Expanded = !Expanded;
ToggleExpended();
diff --git a/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Components/Navbar/NavbarItem.razor b/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Components/Navbar/NavbarItem.razor
index 0229cb1ea..ac0825733 100644
--- a/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Components/Navbar/NavbarItem.razor
+++ b/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Components/Navbar/NavbarItem.razor
@@ -4,8 +4,7 @@
<CascadingValue Value="this" IsFixed="true">
<li id="@Id" class="@CssClasses">
<span class="item-link custom"
- @onclick=@OnClickHandler
- @onclick:preventDefault="true">
+ @onclick=@OnClickAsync>
<i class="devtoys-icon icon-ic_fluent_home_48_regular"></i>
<span class="item-content">
@DisplayName
diff --git a/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Components/Navbar/NavbarItem.razor.cs b/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Components/Navbar/NavbarItem.razor.cs
index 6ed2e9a0b..f7c881e85 100644
--- a/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Components/Navbar/NavbarItem.razor.cs
+++ b/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Components/Navbar/NavbarItem.razor.cs
@@ -27,6 +27,9 @@ public partial class NavbarItem : MefLayoutComponentBase
[Parameter]
public INotifyPropertyChanged Item { get; set; } = default!;
+ [Parameter]
+ public EventCallback<INotifyPropertyChanged> OnSelected { get; set; }
+
[Parameter]
public bool Expanded { get; set; }
@@ -55,7 +58,7 @@ public partial class NavbarItem : MefLayoutComponentBase
protected override void AppendClasses(ClassHelper helper)
{
helper.Append("nav-item");
- if (_selected)
+ if (Selected)
{
helper.Append("active");
}
@@ -66,7 +69,7 @@ public partial class NavbarItem : MefLayoutComponentBase
{
if (firstRender)
{
- if (_selected)
+ if (Selected)
{
ClassesHasChanged();
}
@@ -95,15 +98,8 @@ public partial class NavbarItem : MefLayoutComponentBase
base.OnParametersSet();
}
- internal async Task OnClickHandler(MouseEventArgs eventArgs)
- {
- //await Clicked.InvokeAsync();
- await Task.CompletedTask;
- }
-
- internal async void HandleClickEventAsync(bool isSelected)
+ internal Task OnClickAsync(MouseEventArgs eventArgs)
{
- Selected = isSelected;
- await Task.CompletedTask;
+ return OnSelected.InvokeAsync(Item);
}
}
diff --git a/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Components/Navbar/NavbarItems.razor b/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Components/Navbar/NavbarItems.razor
deleted file mode 100644
index 29cbedd83..000000000
--- a/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Components/Navbar/NavbarItems.razor
+++ /dev/null
@@ -1,9 +0,0 @@
-@namespace DevToys.MauiBlazor.Components
-@inherits MefLayoutComponentBase
-
-<CascadingValue Value="this" IsFixed="true">
- <ul id="@Id"
- class="@CssClasses">
- @ChildContent
- </ul>
-</CascadingValue>
diff --git a/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Components/Navbar/NavbarItems.razor.cs b/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Components/Navbar/NavbarItems.razor.cs
deleted file mode 100644
index 126b8a549..000000000
--- a/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Components/Navbar/NavbarItems.razor.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-namespace DevToys.MauiBlazor.Components;
-
-public partial class NavbarItems : MefLayoutComponentBase
-{
- [Parameter]
- public bool IsScrollable { get; set; }
-
- [Parameter]
- public bool IsScrollableVertical { get; set; }
-
- [Parameter]
- public bool IsFixedBottom { get; set; }
-
- [Parameter]
- public RenderFragment? ChildContent { get; set; }
-
- protected override void AppendClasses(ClassHelper helper)
- {
- helper.Append("nav-items");
- if (IsScrollable)
- {
- helper.Append("scrollable");
- }
- if (IsScrollableVertical)
- {
- helper.Append("vertical");
- }
-
- if (IsFixedBottom)
- {
- helper.Append("sticky-bottom");
- }
-
- base.AppendClasses(helper);
- }
-}
diff --git a/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Pages/Index.razor b/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Pages/Index.razor
index bb38a60d8..adfad8a28 100644
--- a/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Pages/Index.razor
+++ b/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Pages/Index.razor
@@ -1,45 +1,29 @@
@page "/"
-@page "/{Name}"
-@using Microsoft.Fast.Components.FluentUI
-@using System.Web;
+@using DevToys.Core.Tools.ViewItems;
-<h1>@Name - (@EncodedName)</h1>
+@inherits MefLayoutComponentBase
+<Navbar Id="navbar"
+ IsCollapsible="true"
+ HasSearch="false"
+ IsVertical="true"
+ MenuItemsSource="@ViewModel.HeaderAndBodyToolViewItems"
+ FooterMenuItemsSource="@ViewModel.FooterToolViewItems"
+ @bind-SelectedItem="ViewModel.SelectedMenuItem">
-@functions {
-
- private string _name = string.Empty;
- private string _encodedName = string.Empty;
-
- public string EncodedName
- {
- get => _encodedName;
- set
+ <Content>
+ @if (ViewModel.SelectedMenuItem is GuiToolViewItem guiToolViewItem)
{
- if (string.IsNullOrWhiteSpace(value))
- {
- _encodedName = string.Empty;
- return;
- }
- _encodedName = value;
- }
- }
+ <h1>You selected a TOOL: @guiToolViewItem.ToolInstance.LongOrShortDisplayTitle</h1>
+ <!-- TODO: Place here a component that takes in argument the guiToolViewItem -->
- // Define a property to contain the parameter passed from the auth page
- [Parameter]
- public string Name {
- get => _name;
- set
+ <Button @onclick="OnSetFavoriteAsync">Set favorite</Button>
+ }
+ else if (ViewModel.SelectedMenuItem is GroupViewItem groupToolViewItem)
{
- if (string.IsNullOrWhiteSpace(value))
- {
- EncodedName = string.Empty;
- _name = string.Empty;
- return;
- }
- EncodedName = value;
- _name = HttpUtility.UrlDecode(value);
+ <h1>You selected a GROUP: @groupToolViewItem.DisplayTitle</h1>
+ <!-- TODO: Place here a component that takes in argument the groupToolViewItem -->
}
- }
-}
+ </Content>
+</Navbar>
\ No newline at end of file
diff --git a/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Pages/Index.razor.cs b/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Pages/Index.razor.cs
new file mode 100644
index 000000000..99b8c2181
--- /dev/null
+++ b/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Pages/Index.razor.cs
@@ -0,0 +1,33 @@
+using DevToys.Business.ViewModels;
+using DevToys.Core.Tools;
+using DevToys.Core.Tools.ViewItems;
+using DevToys.MauiBlazor.Components;
+
+namespace DevToys.MauiBlazor.Pages;
+
+public partial class Index : MefLayoutComponentBase
+{
+ [Import]
+ internal MainWindowViewModel ViewModel { get; set; } = default!;
+
+ [Import]
+ internal GuiToolProvider GuiToolProvider { get; set; } = default!;
+
+ protected override void OnInitialized()
+ {
+ base.OnInitialized();
+ ViewModel.SelectedMenuItem = ViewModel.HeaderAndBodyToolViewItems[0];
+ }
+
+ internal Task OnSetFavoriteAsync()
+ {
+ // WARNING: This should be done in ToolPageViewModel. Doing it here just for demo.
+ if (ViewModel.SelectedMenuItem is GuiToolViewItem guiToolViewItem)
+ {
+ bool isFavorite = GuiToolProvider.GetToolIsFavorite(guiToolViewItem.ToolInstance);
+ GuiToolProvider.SetToolIsFavorite(guiToolViewItem.ToolInstance, !isFavorite);
+ }
+
+ return Task.CompletedTask;
+ }
+}
diff --git a/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Shared/MainLayout.razor b/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Shared/MainLayout.razor
index 26b619633..9c61dbbf2 100644
--- a/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Shared/MainLayout.razor
+++ b/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Shared/MainLayout.razor
@@ -1,58 +1,3 @@
-@using DevToys.Core.Tools.ViewItems
+@inherits MefLayoutComponentBase
-@using Microsoft.Fast.Components.FluentUI
-@using Microsoft.Fast.Components.FluentUI.DesignTokens
-
-@inherits MefLayoutComponentBase
-
-<header>
-</header>
-
-<Navbar Id="navbar" IsCollapsible="true" HasSearch="false" IsVertical="true">
- <NavbarItems IsScrollable="true" IsScrollableVertical="true">
- @foreach (var navItem in ViewModel.HeaderAndBodyToolViewItems)
- {
- if (navItem is GuiToolViewItem guiToolViewItem)
- {
- <NavbarItem Item="navItem" Selected="navItem == ViewModel.SelectedMenuItem" />
- }
- else if (navItem is GroupViewItem groupViewItem)
- {
- if (groupViewItem.Children is not null)
- {
- <NavbarGroup Item="navItem" Selected="navItem == ViewModel.SelectedMenuItem">
- @foreach (var childItem in groupViewItem.Children)
- {
- <NavbarItem Item="childItem" Selected="navItem == ViewModel.SelectedMenuItem" />
- }
- </NavbarGroup>
- }
- else
- {
- <NavbarItem Item="navItem" Selected="navItem == ViewModel.SelectedMenuItem" />
- }
- }
- else
- {
- <li class="nav-item nav-separator"></li>
- }
- }
- </NavbarItems>
- <NavbarItems IsFixedBottom="true">
- @foreach (var navItem in ViewModel.FooterToolViewItems)
- {
- if (navItem is GuiToolViewItem guiToolViewItem)
- {
- <NavbarItem Item="navItem" Selected="navItem == ViewModel.SelectedMenuItem" />
- }
- else
- {
- <li class="nav-item nav-separator"></li>
- }
- }
- </NavbarItems>
-</Navbar>
-
-<main class="page">
- @Body
-</main>
+@Body
\ No newline at end of file
diff --git a/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Shared/MainLayout.razor.cs b/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Shared/MainLayout.razor.cs
index a95dcb7fb..88bba84fb 100644
--- a/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Shared/MainLayout.razor.cs
+++ b/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Shared/MainLayout.razor.cs
@@ -1,5 +1,4 @@
using DevToys.Api.Core.Theme;
-using DevToys.Business.ViewModels;
using DevToys.MauiBlazor.Components;
using Microsoft.Fast.Components.FluentUI;
@@ -10,9 +9,6 @@ public partial class MainLayout : MefLayoutComponentBase
[Import]
private IThemeListener ThemeListener { get; set; } = default!;
- [Import]
- internal MainWindowViewModel ViewModel { get; set; } = default!;
-
[Inject]
private GlobalState GlobalState { get; set; } = default!;
@@ -32,7 +28,6 @@ public partial class MainLayout : MefLayoutComponentBase
ApplyTheme();
}
- ViewModel.SelectedMenuItem = ViewModel.HeaderAndBodyToolViewItems[0];
await base.OnAfterRenderAsync(firstRender);
}
diff --git a/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Shared/MainLayout.razor.css b/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Shared/MainLayout.razor.css
deleted file mode 100644
index 7b8fc5759..000000000
--- a/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Shared/MainLayout.razor.css
+++ /dev/null
@@ -1,14 +0,0 @@
-#container {
- width: 100%;
- height: 100%;
- position: fixed;
- top: 0;
- left: 0;
- background-color: var(--neutral-layer-3);
-}
-
-main {
- width: 100%;
- background-color: var(--neutral-layer-2);
- border-top-left-radius: 8px 8px;
-}