Merge pull request #816 from neozhu/bugfix/DrawerOverlayAutoClose

fixed: themedrawer auto close
neozhu · Jan 24, 2025 · 5a617ad · 5a617ad
2 parents f70e382 + 892ce94
commit 5a617ad
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 28 deletions.
diff --git a/src/Server.UI/Components/Shared/Layout/AppLayout.razor b/src/Server.UI/Components/Shared/Layout/AppLayout.razor
@@ -18,11 +18,9 @@
                         OnSettingClick="@(() => _themingDrawerOpen = true)"/>
             <NavigationMenu DrawerOpen="_navigationMenuDrawerOpen" Roles="@(UserProfile?.AssignedRoles??[])"
                             DrawerOpenChanged="NavigationMenuDrawerOpenChangedHandler"/>
-            <ThemesMenu ThemingDrawerOpen="_themingDrawerOpen"
-                        ThemingDrawerOpenChanged="ThemingDrawerOpenChangedHandler"
-                        UserPreferences="@LayoutService.UserPreferences"
+            <ThemesMenu UserPreferences="@LayoutService.UserPreferences"
                         UserPreferencesChanged="LayoutService.UpdateUserPreferences"/>
-            <ThemesButton OnClick="@(() => _themingDrawerOpen = true)"/>
+
             <MudMainContent>
                 <MudContainer MaxWidth="MaxWidth.ExtraLarge" Class="mb-4 mt-4">
                     <ErrorBoundary @ref="ErrorBoundary">

diff --git a/src/Server.UI/Components/Shared/Layout/MainLayout.razor b/src/Server.UI/Components/Shared/Layout/MainLayout.razor
@@ -5,7 +5,6 @@
 @inject LayoutService LayoutService
 <PageTitle>@ApplicationSettings.AppName</PageTitle>
 <MudRTLProvider RightToLeft="@LayoutService.IsRTL">
-    <MudThemeProvider />
     <MudPopoverProvider />
     <MudDialogProvider />
     <MudSnackbarProvider />

diff --git a/src/Server.UI/Components/Shared/Themes/ThemesMenu.razor b/src/Server.UI/Components/Shared/Themes/ThemesMenu.razor
@@ -5,23 +5,20 @@
 @inject IStringLocalizer<ThemesMenu> L
 
 <MudDrawer Anchor="LayoutService.IsRTL ? Anchor.Start : Anchor.End"
-           @bind-Open="@ThemingDrawerOpen"
+           @bind-Open="@_open"
            OverlayAutoClose="true"
-           Overlay="false"
            Elevation="1"
-           Variant="@DrawerVariant.Temporary"
-           Width="260px">
+           Variant="@DrawerVariant.Temporary">
     <MudDrawerHeader Class="align-center">
         <MudText Typo="Typo.body1">
             <b>@L["Themes"]</b>
         </MudText>
         <MudSpacer />
         <MudIconButton Color="Color.Default"
                        Icon="@Icons.Material.Filled.Close"
-                       OnClick="_ => ThemingDrawerOpenChanged.InvokeAsync(false)"
+                       OnClick="@(() => _open = false)"
                        Size="Size.Small" />
     </MudDrawerHeader>
-
     <div class="ma-6">
         <MudText Typo="Typo.body2">
             <b>@L["Mode"]</b>
@@ -122,47 +119,39 @@
         </MudText>
         <MudGrid Class="my-3"
                  Spacing="2">
-
             <MudItem xs="12">
                 <MudSlider Value="@UserPreferences.BorderRadius" Min="0" Max="@MaxValue" Immediate="false" Step="1" Color="Color.Primary"
                            @oninput="@(e => ChangedSelection(e))">
                     @UserPreferences.BorderRadius.ToString()
                 </MudSlider>
             </MudItem>
-
         </MudGrid>
         <MudText Typo="Typo.body2">
             <b>@L["Default Font Size"]</b>
         </MudText>
         <MudGrid Class="my-3"
                  Spacing="2">
-
             <MudItem xs="12">
                 <MudSlider Value="@UserPreferences.DefaultFontSize" Min="0.625" Max="1.125" Immediate="false" Step="0.0625" Color="Color.Primary"
                            @oninput="@(e => ChangedFontSize(e))">
                     @($"{UserPreferences.DefaultFontSize.ToString()} rem")
                 </MudSlider>
             </MudItem>
-
         </MudGrid>
         <MudText Typo="Typo.body2">
             <b>@L["Online Users"]</b>
         </MudText>
         <OnlineUsersTracker></OnlineUsersTracker>
     </div>
 </MudDrawer>
-<MudOverlay DarkBackground="true" Absolute="true"
-            AutoClose="true"
-            OnClosed="_=> ThemingDrawerOpenChanged.InvokeAsync(false)"
-            @bind-Visible="ThemingDrawerOpen" />
+<ThemesButton OnClick="@(() => _open = true)" />
 <style>
 
     .mode-button {
         border: 1px solid var(--mud-palette-table-lines);
         height: 64px;
     }
 
-
     .color-square {
         width: 35px;
         height: 35px;
@@ -171,7 +160,6 @@
         box-shadow: 0 2px 5px rgba(0, 0, 0, 0.2);
     }
 
-
     .color-square-selected {
         width: 35px;
         height: 35px;
@@ -220,17 +208,15 @@
 @code
 {
 
-    [Parameter] public bool ThemingDrawerOpen { get; set; }
-
-    [Parameter] public EventCallback<bool> ThemingDrawerOpenChanged { get; set; }
+    private bool _open { get; set; }
 
     [EditorRequired][Parameter] public UserPreference UserPreferences { get; set; } = new();
 
     [EditorRequired][Parameter] public EventCallback<UserPreference> UserPreferencesChanged { get; set; }
 
-    [Parameter] public double Radius { get; set; }
+    public double Radius { get; set; }
 
-    [Parameter] public double MaxValue { get; set; } = 32;
+    public double MaxValue { get; set; } = 32;
 
     private async Task UpdateThemePrimaryColor(string color)
     {

diff --git a/src/Server.UI/Pages/Identity/Users/Users.razor b/src/Server.UI/Pages/Identity/Users/Users.razor
@@ -231,9 +231,9 @@
                 </div>
             </CellTemplate>
         </PropertyColumn>
-        <PropertyColumn Property="x => x.Created" Title="@L[_currentDto.GetMemberDescription(x => x.Created)]">
+        <PropertyColumn Property="x => x.LastModified" Title="@L[_currentDto.GetMemberDescription(x => x.LastModified)]">
             <CellTemplate>
-                <UtcToLocal UTCDateTime="@context.Item.Created"></UtcToLocal>
+                <UtcToLocal UTCDateTime="@(context.Item.LastModified??context.Item.Created)" Format="yyyy-MM-dd"></UtcToLocal>
             </CellTemplate>
         </PropertyColumn>
     </Columns>