Fix attachment panel on on settings bug.

edgett · Dec 13, 2023 · 180883b · 180883b
1 parent 16958f7
commit 180883b
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 17 deletions.
diff --git a/PalmHill.BlazorChat/Client/Components/Chat/ChatInput.razor b/PalmHill.BlazorChat/Client/Components/Chat/ChatInput.razor
@@ -11,7 +11,7 @@
 
 <FluentFooter Class="w-100" Style="position:fixed; bottom:15px;">
     <FluentStack Class="chat-messages input-area">
-        <div class="file-input-area" @onclick="Controller!.ShowAttachments">
+        <div class="file-input-area" @onclick="Controller!.ToggleAttachmentsVisible">
             <FluentCounterBadge Count="Controller?.UploadedFiles.Count ?? 0"
                                 ShowZero="true"
                                 BottomPosition="-10">

diff --git a/PalmHill.BlazorChat/Client/MainLayout.razor b/PalmHill.BlazorChat/Client/MainLayout.razor
@@ -12,16 +12,3 @@
 <FluentTooltipProvider />
 <FluentMessageBarProvider />
 
-@code {
-    private bool darkMode = false;
-    public static bool Expanded { get; set; } = true;
-    protected override async Task OnAfterRenderAsync(bool firstRender)
-    {
-        if (firstRender)
-        {
-
-            await ThemeControl.ChangeTheme(darkMode);
-            StateHasChanged();
-        }
-    }
-}
diff --git a/PalmHill.BlazorChat/Client/Pages/Index.razor b/PalmHill.BlazorChat/Client/Pages/Index.razor
@@ -1,5 +1,6 @@
 @page "/"
 @inject ChatService Controller;
+@inject LocalStorageService LocalStorage;
 
 <FluentHeader Class="chat-header">
     <FluentButton
@@ -32,6 +33,7 @@
     protected override async Task OnInitializedAsync()
     {
         attachControllerEvents();
+        await LocalStorage.SyncTheme();
         await Controller.StartChat();
     }
 

diff --git a/PalmHill.BlazorChat/Client/Services/ChatService.cs b/PalmHill.BlazorChat/Client/Services/ChatService.cs
@@ -60,7 +60,7 @@ BlazorChatApi blazorChatApi
         /// <summary>
         /// Show the attachment panel.
         /// </summary>
-        public bool AttachmentsVisible { get; private set; } = false;
+        public bool AttachmentsVisible { get; set; } = false;
         /// <summary>
         /// The list of files that have been selected for Chat. This is non-functional for now.
         /// </summary>
@@ -213,7 +213,7 @@ public async Task ShowSettings()
             if (dialogResult?.Cancelled == true)
             {
                 //Reset the theme if cancel.
-                await _themeControl.ChangeTheme(LocalStorageSettings.DarkMode);
+                await _localStorageService.SyncTheme();
             }
             else
             {

diff --git a/PalmHill.BlazorChat/Client/Services/LocalStorageService.cs b/PalmHill.BlazorChat/Client/Services/LocalStorageService.cs
@@ -35,10 +35,14 @@ public LocalStorageService(ILocalStorageService localStorage, ThemeService theme
         public async Task<LocalStorageSettings> GetSettings()
         {
             LocalStorageSettings = await _getMigratedSettings();
-            await _themeControl.ChangeTheme(LocalStorageSettings.DarkMode);
             return LocalStorageSettings;
         }
 
+        public async Task SyncTheme()
+        {
+            await _themeControl.ChangeTheme(LocalStorageSettings.DarkMode);
+        }
+
         /// <summary>
         /// Save the settings to local storage.
         /// </summary>