Browse Source

correctly use icon in MudBlazor menu items

pull/25235/head
İsmail ÇAĞDAŞ 8 months ago
parent
commit
35bfbfc5b0
  1. 25
      modules/basic-theme/src/Volo.Abp.AspNetCore.Components.Web.MudBlazorBasicTheme/Themes/Basic/FirstLevelNavMenuItem.razor
  2. 27
      modules/basic-theme/src/Volo.Abp.AspNetCore.Components.Web.MudBlazorBasicTheme/Themes/Basic/NavMenu.razor
  3. 25
      modules/basic-theme/src/Volo.Abp.AspNetCore.Components.Web.MudBlazorBasicTheme/Themes/Basic/SecondLevelNavMenuItem.razor

25
modules/basic-theme/src/Volo.Abp.AspNetCore.Components.Web.MudBlazorBasicTheme/Themes/Basic/FirstLevelNavMenuItem.razor

@ -13,7 +13,7 @@
}
else
{
<MudNavGroup Title="@MenuItem.DisplayName" Icon="@GetIcon(MenuItem.Icon)">
<MudNavGroup Title="@MenuItem.DisplayName" Icon="@MenuItem.Icon">
@foreach (var item in MenuItem.Items)
{
@if (item.Items.Any())
@ -22,11 +22,7 @@ else
}
else
{
<MudNavLink Href="@(item.Url?.TrimStart('/', '~') ?? "#")" Match="@(item.Url != null ? NavLinkMatch.All : NavLinkMatch.Prefix)">
@if (!string.IsNullOrEmpty(item.Icon))
{
<MudIcon Icon="@GetIcon(item.Icon)" Class="me-2" />
}
<MudNavLink Href="@(item.Url?.TrimStart('/', '~') ?? "#")" Icon="@item.Icon" Match="@(item.Url != null ? NavLinkMatch.All : NavLinkMatch.Prefix)">
@item.DisplayName
</MudNavLink>
}
@ -55,23 +51,6 @@ else
{
NavigationManager.LocationChanged -= OnLocationChanged;
}
private string? GetIcon(string? icon)
{
if (string.IsNullOrEmpty(icon))
{
return null;
}
// Convert FontAwesome icons to Material icons if needed
if (icon.StartsWith("fa"))
{
// Map common FontAwesome icons to Material icons
return icon.Replace("fa-", "").Replace("-", "_");
}
return icon;
}
}
@implements IDisposable

27
modules/basic-theme/src/Volo.Abp.AspNetCore.Components.Web.MudBlazorBasicTheme/Themes/Basic/NavMenu.razor

@ -6,11 +6,7 @@
{
@if (menuItem.Items.IsNullOrEmpty())
{
<MudNavLink Href="@menuItem.Url" Match="@(menuItem.Url != null ? NavLinkMatch.All : NavLinkMatch.Prefix)">
@if (!string.IsNullOrEmpty(menuItem.Icon))
{
<MudIcon Icon="@GetIcon(menuItem.Icon)" Class="me-2" />
}
<MudNavLink Href="@menuItem.Url" Icon="@menuItem.Icon" Match="@(menuItem.Url != null ? NavLinkMatch.All : NavLinkMatch.Prefix)">
@menuItem.DisplayName
</MudNavLink>
}
@ -19,24 +15,5 @@
<FirstLevelNavMenuItem MenuItem="menuItem" />
}
}
</MudNavMenu>
}
@code {
private string? GetIcon(string? icon)
{
if (string.IsNullOrEmpty(icon))
{
return null;
}
// Convert FontAwesome icons to Material icons if needed
if (icon.StartsWith("fa"))
{
// Map common FontAwesome icons to Material icons
return icon.Replace("fa-", "").Replace("-", "_");
}
return icon;
}
</MudNavMenu>
}

25
modules/basic-theme/src/Volo.Abp.AspNetCore.Components.Web.MudBlazorBasicTheme/Themes/Basic/SecondLevelNavMenuItem.razor

@ -13,14 +13,10 @@
}
else
{
<MudNavGroup Title="@MenuItem.DisplayName" Icon="@GetIcon(MenuItem.Icon)">
<MudNavGroup Title="@MenuItem.DisplayName" Icon="@MenuItem.Icon">
@foreach (var item in MenuItem.Items)
{
<MudNavLink Href="@(item.Url?.TrimStart('/', '~') ?? "#")" Match="@(item.Url != null ? NavLinkMatch.All : NavLinkMatch.Prefix)">
@if (!string.IsNullOrEmpty(item.Icon))
{
<MudIcon Icon="@GetIcon(item.Icon)" Class="me-2" />
}
<MudNavLink Href="@(item.Url?.TrimStart('/', '~') ?? "#")" Icon="@item.Icon" Match="@(item.Url != null ? NavLinkMatch.All : NavLinkMatch.Prefix)">
@item.DisplayName
</MudNavLink>
}
@ -48,23 +44,6 @@ else
{
NavigationManager.LocationChanged -= OnLocationChanged;
}
private string? GetIcon(string? icon)
{
if (string.IsNullOrEmpty(icon))
{
return null;
}
// Convert FontAwesome icons to Material icons if needed
if (icon.StartsWith("fa"))
{
// Map common FontAwesome icons to Material icons
return icon.Replace("fa-", "").Replace("-", "_");
}
return icon;
}
}
@implements IDisposable

Loading…
Cancel
Save