Skip to content

Commit

Permalink
🐛 Fixed MenuItem Click Issue on Mobile Devices
Browse files Browse the repository at this point in the history
  • Loading branch information
@neozhu
neozhu committed Dec 31, 2023
1 parent ec41a88 commit 8728758
Show file tree
Hide file tree
Showing 9 changed files with 30 additions and 30 deletions.
2 changes: 1 addition & 1 deletion src/Server.UI/Components/Localization/LanguageSelector.razor
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
}
else
{
<MudMenuItem OnClick="() => ChangeLanguageAsync(language.Name)">@language.DisplayName</MudMenuItem>
<MudMenuItem OnAction="() => ChangeLanguageAsync(language.Name)">@language.DisplayName</MudMenuItem>
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/Server.UI/Components/Shared/Layout/HeaderMenu.razor
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,5 +64,5 @@
[EditorRequired] [Parameter] public EventCallback OpenSearchDialog { get; set; }
[EditorRequired] [Parameter] public bool RightToLeft { get; set; }
[EditorRequired] [Parameter] public EventCallback RightToLeftToggle { get; set; }
[Parameter] public EventCallback<MouseEventArgs> OnSettingClick { get; set; }
[Parameter] public EventCallback<EventArgs> OnSettingClick { get; set; }
}
4 changes: 2 additions & 2 deletions src/Server.UI/Components/Shared/Layout/UserMenu.razor
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
<MudText>@L["Profile"]</MudText>
</div>
</MudMenuItem>
<MudMenuItem OnClick="OnSettingClick">
<MudMenuItem OnAction="OnSettingClick">
<div class="d-flex">
<MudIcon Class="mx-2"
Icon="@Icons.Material.Filled.Settings"/>
Expand All @@ -72,7 +72,7 @@

@code
{
[Parameter] public EventCallback<MouseEventArgs> OnSettingClick { get; set; }
[Parameter] public EventCallback<EventArgs> OnSettingClick { get; set; }
[Inject] public AuthenticationStateProvider AuthenticationStateProvider { get; set; } = null!;
private bool IsLoading => UserProfileState.Value.IsLoading;
private UserProfile UserProfile => UserProfileState.Value.UserProfile;
Expand Down
4 changes: 2 additions & 2 deletions src/Server.UI/Pages/Customers/Customers.razor
View file
Original file line number Diff line number Diff line change
Expand Up @@ -174,11 +174,11 @@
EndIcon="@Icons.Material.Filled.KeyboardArrowDown" IconColor="Color.Info" AnchorOrigin="Origin.CenterLeft">
@if (_canEdit)
{
<MudMenuItem OnClick="@(() => OnEdit(context.Item))">@ConstantString.Edit</MudMenuItem>
<MudMenuItem OnAction="@(() => OnEdit(context.Item))">@ConstantString.Edit</MudMenuItem>
}
@if (_canDelete)
{
<MudMenuItem OnClick="@(() => OnDelete(context.Item))">@ConstantString.Delete</MudMenuItem>
<MudMenuItem OnAction="@(() => OnDelete(context.Item))">@ConstantString.Delete</MudMenuItem>
}
</MudMenu>
}
Expand Down
12 changes: 6 additions & 6 deletions src/Server.UI/Pages/Documents/Documents.razor
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,14 +87,14 @@
</MudHidden>
<MudHidden Breakpoint="Breakpoint.SmAndDown" Invert="true">
<MudMenu AnchorOrigin="Origin.BottomLeft" StartIcon="@Icons.Material.Filled.KeyboardCommandKey" EndIcon="@Icons.Material.Filled.KeyboardArrowDown" Label="@L["Action"]" Color="Color.Primary" Variant="Variant.Filled">
<MudMenuItem Disabled="@_loading" OnClick="@(() => OnRefresh())">@ConstantString.Refresh</MudMenuItem>
<MudMenuItem Disabled="@_loading" OnAction="@(() => OnRefresh())">@ConstantString.Refresh</MudMenuItem>
@if (_canCreate)
{
<MudMenuItem Disabled="@_loading" OnClick="OnCreate">@L["Upload Pictures"]</MudMenuItem>
<MudMenuItem Disabled="@_loading" OnAction="OnCreate">@L["Upload Pictures"]</MudMenuItem>
}
@if (_canDelete)
{
<MudMenuItem OnClick="OnDeleteChecked">@ConstantString.Delete</MudMenuItem>
<MudMenuItem OnAction="OnDeleteChecked">@ConstantString.Delete</MudMenuItem>
}
</MudMenu>
</MudHidden>
Expand All @@ -120,15 +120,15 @@
EndIcon="@Icons.Material.Filled.KeyboardArrowDown" IconColor="Color.Info" AnchorOrigin="Origin.CenterLeft">
@if (_canEdit)
{
<MudMenuItem OnClick="@(() => OnEdit(context.Item))">@ConstantString.Edit</MudMenuItem>
<MudMenuItem OnAction="@(() => OnEdit(context.Item))">@ConstantString.Edit</MudMenuItem>
}
@if (_canDelete)
{
<MudMenuItem OnClick="@(() => OnDelete(context.Item))">@ConstantString.Delete</MudMenuItem>
<MudMenuItem OnAction="@(() => OnDelete(context.Item))">@ConstantString.Delete</MudMenuItem>
}
@if (_canDownload)
{
<MudMenuItem Disabled="@_downloading" OnClick="@(() => OnDownload(context.Item))">@ConstantString.Download</MudMenuItem>
<MudMenuItem Disabled="@_downloading" OnAction="@(() => OnDownload(context.Item))">@ConstantString.Download</MudMenuItem>
}
</MudMenu>
}
Expand Down
10 changes: 5 additions & 5 deletions src/Server.UI/Pages/Identity/Roles/Roles.razor
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,11 +113,11 @@
<MudMenuItem Disabled="@_loading" OnClick="@(OnRefresh)">@ConstantString.Refresh</MudMenuItem>
@if (_canCreate)
{
<MudMenuItem OnClick="OnCreate">@ConstantString.New</MudMenuItem>
<MudMenuItem OnAction="OnCreate">@ConstantString.New</MudMenuItem>
}
@if (_canDelete)
{
<MudMenuItem OnClick="OnDeleteChecked">@ConstantString.Delete</MudMenuItem>
<MudMenuItem OnAction="OnDeleteChecked">@ConstantString.Delete</MudMenuItem>
}
</MudMenu>
</MudHidden>
Expand All @@ -144,15 +144,15 @@
EndIcon="@Icons.Material.Filled.KeyboardArrowDown" IconColor="Color.Info" AnchorOrigin="Origin.CenterLeft">
@if (_canEdit)
{
<MudMenuItem OnClick="@(() => OnEdit(context.Item))">@ConstantString.Edit</MudMenuItem>
<MudMenuItem OnAction="@(() => OnEdit(context.Item))">@ConstantString.Edit</MudMenuItem>
}
@if (_canDelete)
{
<MudMenuItem OnClick="@(() => OnDelete(context.Item))">@ConstantString.Delete</MudMenuItem>
<MudMenuItem OnAction="@(() => OnDelete(context.Item))">@ConstantString.Delete</MudMenuItem>
}
@if (_canManagePermissions)
{
<MudMenuItem OnClick="@(() => OnSetPermissions(context.Item))">@L["Set Permissions"]</MudMenuItem>
<MudMenuItem OnAction="@(() => OnSetPermissions(context.Item))">@L["Set Permissions"]</MudMenuItem>
}
</MudMenu>
}
Expand Down
12 changes: 6 additions & 6 deletions src/Server.UI/Pages/Identity/Users/Users.razor
View file
Original file line number Diff line number Diff line change
Expand Up @@ -178,30 +178,30 @@
EndIcon="@Icons.Material.Filled.KeyboardArrowDown" IconColor="Color.Info" AnchorOrigin="Origin.CenterLeft">
@if (_canEdit)
{
<MudMenuItem OnClick="@(() => OnEdit(context.Item))">@ConstantString.Edit</MudMenuItem>
<MudMenuItem OnAction="@(() => OnEdit(context.Item))">@ConstantString.Edit</MudMenuItem>
}
@if (_canDelete)
{
<MudMenuItem OnClick="@(() => OnDelete(context.Item))">@ConstantString.Delete</MudMenuItem>
<MudMenuItem OnAction="@(() => OnDelete(context.Item))">@ConstantString.Delete</MudMenuItem>
}
@if (_canManagePermissions)
{
<MudMenuItem OnClick="@(() => OnSetPermissions(context.Item))">@L["Set Permissions"]</MudMenuItem>
<MudMenuItem OnAction="@(() => OnSetPermissions(context.Item))">@L["Set Permissions"]</MudMenuItem>
}
@if (_canActive)
{
@if (context.Item.IsActive)
{
<MudMenuItem OnClick=@(() => OnSetActive(context.Item))>@L["Set Inactive"]</MudMenuItem>
<MudMenuItem OnAction=@(() => OnSetActive(context.Item))>@L["Set Inactive"]</MudMenuItem>
}
else
{
<MudMenuItem OnClick=@(() => OnSetActive(context.Item))>@L["Set Active"]</MudMenuItem>
<MudMenuItem OnAction=@(() => OnSetActive(context.Item))>@L["Set Active"]</MudMenuItem>
}
}
@if (_canRestPassword)
{
<MudMenuItem OnClick=@(() => OnResetPassword(context.Item))>@L["Reset Password"]</MudMenuItem>
<MudMenuItem OnAction=@(() => OnResetPassword(context.Item))>@L["Reset Password"]</MudMenuItem>
}
</MudMenu>
}
Expand Down
4 changes: 2 additions & 2 deletions src/Server.UI/Pages/Products/Products.razor
View file
Original file line number Diff line number Diff line change
Expand Up @@ -188,11 +188,11 @@
EndIcon="@Icons.Material.Filled.KeyboardArrowDown" IconColor="Color.Info" AnchorOrigin="Origin.CenterLeft">
@if (_canEdit)
{
<MudMenuItem OnClick="@(() => OnEdit(context.Item))">@ConstantString.Edit</MudMenuItem>
<MudMenuItem OnAction="@(() => OnEdit(context.Item))">@ConstantString.Edit</MudMenuItem>
}
@if (_canDelete)
{
<MudMenuItem OnClick="@(() => OnDelete(context.Item))">@ConstantString.Delete</MudMenuItem>
<MudMenuItem OnAction="@(() => OnDelete(context.Item))">@ConstantString.Delete</MudMenuItem>
}
</MudMenu>
}
Expand Down
10 changes: 5 additions & 5 deletions src/Server.UI/Pages/Tenants/Tenants.razor
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,14 +72,14 @@
</MudHidden>
<MudHidden Breakpoint="Breakpoint.SmAndDown" Invert="true">
<MudMenu AnchorOrigin="Origin.BottomLeft" StartIcon="@Icons.Material.Filled.KeyboardCommandKey" EndIcon="@Icons.Material.Filled.KeyboardArrowDown" Label="@L["Action"]" Color="Color.Primary" Variant="Variant.Filled">
<MudMenuItem Disabled="@_loading" OnClick="@(() => OnRefresh())">@ConstantString.Refresh</MudMenuItem>
<MudMenuItem Disabled="@_loading" OnAction="@(() => OnRefresh())">@ConstantString.Refresh</MudMenuItem>
@if (_canCreate)
{
<MudMenuItem Disabled="@_loading" OnClick="OnCreate">@ConstantString.New</MudMenuItem>
<MudMenuItem Disabled="@_loading" OnAction="OnCreate">@ConstantString.New</MudMenuItem>
}
@if (_canDelete)
{
<MudMenuItem OnClick="OnDeleteChecked">@ConstantString.Delete</MudMenuItem>
<MudMenuItem OnAction="OnDeleteChecked">@ConstantString.Delete</MudMenuItem>
}

</MudMenu>
Expand All @@ -106,11 +106,11 @@
EndIcon="@Icons.Material.Filled.KeyboardArrowDown" IconColor="Color.Info" AnchorOrigin="Origin.CenterLeft">
@if (_canEdit)
{
<MudMenuItem OnClick="@(() => OnEdit(context.Item))">@ConstantString.Edit</MudMenuItem>
<MudMenuItem OnAction="@(() => OnEdit(context.Item))">@ConstantString.Edit</MudMenuItem>
}
@if (_canDelete)
{
<MudMenuItem OnClick="@(() => OnDelete(context.Item))">@ConstantString.Delete</MudMenuItem>
<MudMenuItem OnAction="@(() => OnDelete(context.Item))">@ConstantString.Delete</MudMenuItem>
}
</MudMenu>
}
Expand Down

0 comments on commit 8728758

Please sign in to comment.