Simplify code

Author: ScarletKuro

src/MudBlazor.ThemeManager.TestApp/Shared/MainLayout.razor

@@ -1,6 +1,6 @@
 @inherits LayoutComponentBase
 
-<MudThemeProvider @ref="@_mudThemeProvider" @bind-IsDarkMode="@_isDarkMode" />
+<MudThemeProvider @ref="@_mudThemeProvider" Theme="_themeManager.Theme" @bind-IsDarkMode="@_isDarkMode" />
 <MudPopoverProvider />
 <MudDialogProvider />
 <MudSnackbarProvider />
@@ -46,14 +46,12 @@
     private void DarkModeToggle()
     {
         _isDarkMode = !_isDarkMode;
-        _mudThemeProvider.IsDarkMode = _isDarkMode;
         StateHasChanged();
     }
 
     private void UpdateTheme(ThemeManagerTheme value)
     {
         _themeManager = value;
-        _mudThemeProvider.Theme = _themeManager.Theme;
         StateHasChanged();
     }
 

src/MudBlazor.ThemeManager.TestApp/_Imports.razor

@@ -6,8 +6,7 @@
 @using Microsoft.AspNetCore.Components.Web.Virtualization
 @using Microsoft.AspNetCore.Components.WebAssembly.Http
 @using Microsoft.JSInterop
-@using MudBlazor.ThemeManager.TestApp
-@using MudBlazor.ThemeManager.TestApp.Shared
-
 @using MudBlazor
-@using MudBlazor.ThemeManager  
+@using MudBlazor.ThemeManager
+@using MudBlazor.ThemeManager.TestApp
+@using MudBlazor.ThemeManager.TestApp.Shared

src/MudBlazor.ThemeManager/Components/MudThemeManager.razor.cs

@@ -1,6 +1,7 @@
 using Microsoft.AspNetCore.Components;
 using MudBlazor.State;
 using MudBlazor.ThemeManager.Extensions;
+using System.Diagnostics.CodeAnalysis;
 
 namespace MudBlazor.ThemeManager;
 
@@ -11,9 +12,10 @@ public partial class MudThemeManager : ComponentBaseWithState
     private readonly ParameterState<bool> _openState;
     private readonly ParameterState<bool> _isDarkModeState;
 
-    private PaletteDark? _currentPaletteDark;
     private PaletteLight? _currentPaletteLight;
+    private PaletteDark? _currentPaletteDark;
     private Palette _currentPalette;
+    private MudTheme? _customTheme;
 
     public MudThemeManager()
     {
@@ -27,8 +29,6 @@ public MudThemeManager()
         _currentPalette = GetPalette();
     }
 
-    public static MudTheme? _customTheme { get; set; }
-
     public string ThemePresets { get; set; } = "Not Implemented";
 
     [Parameter]
@@ -49,6 +49,7 @@ public MudThemeManager()
     [Parameter]
     public EventCallback<ThemeManagerTheme> ThemeChanged { get; set; }
 
+    [RequiresUnreferencedCode("JSON serialization and deserialization might require types that cannot be statically analyzed.")]
     protected override void OnInitialized()
     {
         base.OnInitialized();
@@ -69,12 +70,7 @@ public Task UpdatePalette(ThemeUpdatedValue value)
     {
         UpdateCustomTheme();
 
-        if (Theme is null)
-        {
-            return Task.CompletedTask;
-        }
-
-        if (_customTheme is null)
+        if (Theme is null || _customTheme is null)
         {
             return Task.CompletedTask;
         }
@@ -239,12 +235,7 @@ private Task OnDefaultBorderRadiusAsync(int value)
 
     private Task OnDefaultElevationAsync(int value)
     {
-        if (Theme is null)
-        {
-            return Task.CompletedTask;
-        }
-
-        if (_customTheme is null)
+        if (Theme is null || _customTheme is null)
         {
             return Task.CompletedTask;
         }
@@ -287,12 +278,7 @@ private Task OnDrawerElevationAsync(int value)
 
     private Task OnFontFamilyAsync(string value)
     {
-        if (Theme is null)
-        {
-            return Task.CompletedTask;
-        }
-
-        if (_customTheme is null)
+        if (Theme is null || _customTheme is null)
         {
             return Task.CompletedTask;
         }

src/MudBlazor.ThemeManager/Extensions/Extension.cs

@@ -3,19 +3,20 @@
 
 namespace MudBlazor.ThemeManager.Extensions;
 
-public static class Extension
+internal static class Extension
 {
+    private static readonly JsonSerializerOptions JsonOptions = new();
+
     [RequiresUnreferencedCode("JSON serialization and deserialization might require types that cannot be statically analyzed.")]
     public static T? DeepClone<T>(this T source)
     {
         if (source is not null)
         {
-            var serializeStr = JsonSerializer.Serialize(source);
-            JsonSerializerOptions options = new JsonSerializerOptions();
-            var copyObj = JsonSerializer.Deserialize<T>(serializeStr, options);
+            var serializeStr = JsonSerializer.Serialize(source, JsonOptions);
+            var copyObj = JsonSerializer.Deserialize<T>(serializeStr, JsonOptions);
             return copyObj;
         }
 
-        return default(T);
+        return default;
     }
 }

src/MudBlazor.ThemeManager/_Imports.razor

@@ -1,4 +1,4 @@
 @using Microsoft.AspNetCore.Components.Web
-@using MudBlazor.ThemeManager
 @using MudBlazor
-@using MudBlazor.Utilities
+@using MudBlazor.Utilities
+@using MudBlazor.ThemeManager