Browse Source

Fix Blazor basic theme dropdown menu position in RTL

pull/26361/head
maliming 2 weeks ago
parent
commit
b8477fcd2c
  1. 5
      modules/basic-theme/src/Volo.Abp.AspNetCore.Components.Server.BasicTheme/Themes/Basic/LanguageSwitch.razor
  2. 2
      modules/basic-theme/src/Volo.Abp.AspNetCore.Components.Server.BasicTheme/Themes/Basic/LoginDisplay.razor
  3. 4
      modules/basic-theme/src/Volo.Abp.AspNetCore.Components.Server.BasicTheme/Themes/Basic/LoginDisplay.razor.cs
  4. 5
      modules/basic-theme/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/LanguageSwitch.razor
  5. 2
      modules/basic-theme/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/LoginDisplay.razor
  6. 4
      modules/basic-theme/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/LoginDisplay.razor.cs

5
modules/basic-theme/src/Volo.Abp.AspNetCore.Components.Server.BasicTheme/Themes/Basic/LanguageSwitch.razor

@ -11,7 +11,7 @@
<DropdownToggle Color="Color.Default">
@_currentLanguage.DisplayName
</DropdownToggle>
<DropdownMenu>
<DropdownMenu Style="@MenuStyle">
@foreach (var language in _otherLanguages)
{
<DropdownItem Clicked="() => ChangeLanguage(language)">@language.DisplayName</DropdownItem>
@ -23,6 +23,9 @@
private IReadOnlyList<LanguageInfo> _otherLanguages;
private LanguageInfo _currentLanguage;
// Blazorise's dropdown-menu-end sets right: 0, which wins over the computed left offset in an RTL layout
private static string MenuStyle => CultureHelper.IsRtl ? "right: auto" : null;
protected override async Task OnInitializedAsync()
{
var languages = await LanguageProvider.GetLanguagesAsync();

2
modules/basic-theme/src/Volo.Abp.AspNetCore.Components.Server.BasicTheme/Themes/Basic/LoginDisplay.razor

@ -23,7 +23,7 @@
<span>@CurrentUser.UserName</span>
}
</DropdownToggle>
<DropdownMenu>
<DropdownMenu Style="@MenuStyle">
@if (Menu != null)
{
@foreach (var menuItem in Menu.Items)

4
modules/basic-theme/src/Volo.Abp.AspNetCore.Components.Server.BasicTheme/Themes/Basic/LoginDisplay.razor.cs

@ -4,6 +4,7 @@ using Microsoft.AspNetCore.Components;
using Microsoft.AspNetCore.Components.Routing;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.RequestLocalization;
using Volo.Abp.Localization;
using Volo.Abp.UI.Navigation;
namespace Volo.Abp.AspNetCore.Components.Server.BasicTheme.Themes.Basic;
@ -18,6 +19,9 @@ public partial class LoginDisplay : IDisposable
protected ApplicationMenu Menu { get; set; }
// Blazorise's dropdown-menu-end sets right: 0, which wins over the computed left offset in an RTL layout
protected static string MenuStyle => CultureHelper.IsRtl ? "right: auto" : null;
protected override async Task OnInitializedAsync()
{
Menu = await MenuManager.GetAsync(StandardMenus.User);

5
modules/basic-theme/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/LanguageSwitch.razor

@ -16,7 +16,7 @@
<DropdownToggle Color="Color.Default">
@_currentLanguage.DisplayName
</DropdownToggle>
<DropdownMenu>
<DropdownMenu Style="@MenuStyle">
@foreach (var language in _otherLanguages)
{
<DropdownItem Clicked="() => ChangeLanguageAsync(language)">@language.DisplayName</DropdownItem>
@ -29,6 +29,9 @@
private LanguageInfo _currentLanguage;
private bool _useRouteBasedCulture;
// Blazorise's dropdown-menu-end sets right: 0, which wins over the computed left offset in an RTL layout
private static string MenuStyle => CultureHelper.IsRtl ? "right: auto" : null;
protected override async Task OnInitializedAsync()
{
var config = await ConfigurationClient.GetAsync();

2
modules/basic-theme/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/LoginDisplay.razor

@ -22,7 +22,7 @@
<span>@CurrentUser.UserName</span>
}
</DropdownToggle>
<DropdownMenu>
<DropdownMenu Style="@MenuStyle">
@if (Menu != null)
{
@foreach (var menuItem in Menu.Items)

4
modules/basic-theme/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/LoginDisplay.razor.cs

@ -7,6 +7,7 @@ using Microsoft.JSInterop;
using Volo.Abp.AspNetCore.Components.Web;
using Volo.Abp.AspNetCore.Components.Web.Security;
using Volo.Abp.AspNetCore.Components.WebAssembly;
using Volo.Abp.Localization;
using Volo.Abp.UI.Navigation;
namespace Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme.Themes.Basic;
@ -24,6 +25,9 @@ public partial class LoginDisplay : IDisposable
protected ApplicationMenu Menu { get; set; }
// Blazorise's dropdown-menu-end sets right: 0, which wins over the computed left offset in an RTL layout
protected static string MenuStyle => CultureHelper.IsRtl ? "right: auto" : null;
protected string LoginUrl { get; set; } = string.Empty;
protected string LogoutUrl { get; set; } = string.Empty;

Loading…
Cancel
Save