Merge pull request #19410 from abpframework/web-app-enhancements

abpframework · Mar 25, 2024 · c7ff84a · c7ff84a
2 parents 6e5c1d3 + f02af63
commit c7ff84a
Show file tree

Hide file tree

Showing 2 changed files with 51 additions and 5 deletions.
diff --git a/framework/src/Volo.Abp.AspNetCore.Components.Web.Theming/Bundling/AbpScripts.razor b/framework/src/Volo.Abp.AspNetCore.Components.Web.Theming/Bundling/AbpScripts.razor
@@ -1,5 +1,7 @@
 @using Volo.Abp
+@implements IDisposable
 @inject IComponentBundleManager BundleManager
+@inject PersistentComponentState PersistentComponentState
 
 @if (ScriptFiles != null)
 {
@@ -18,16 +20,37 @@
 
     private List<string>? ScriptFiles { get; set; }
 
+    private PersistingComponentStateSubscription persistingSubscription;
+
     protected override async Task OnInitializedAsync()
     {
         if (BundleName == null)
         {
             throw new AbpException("The BundleName parameter of the AbpScripts component can not be null!");
         }
-        ScriptFiles = (await BundleManager.GetScriptBundleFilesAsync(BundleName!)).ToList();
+
+        persistingSubscription = PersistentComponentState.RegisterOnPersisting(PersistScriptFiles);
+
+        if (PersistentComponentState.TryTakeFromJson<List<string>>(nameof(ScriptFiles), out var restoredStyleFiles))
+        {
+            ScriptFiles = restoredStyleFiles;
+        }
+        else
+        {
+            ScriptFiles = (await BundleManager.GetScriptBundleFilesAsync(BundleName!)).ToList();
+        }
+
         if (OperatingSystem.IsBrowser() && WebAssemblyScriptFiles != null)
         {
-            ScriptFiles.AddRange(WebAssemblyScriptFiles);
+            ScriptFiles?.AddRange(WebAssemblyScriptFiles);
         }
     }
+
+    private Task PersistScriptFiles()
+    {
+        PersistentComponentState.PersistAsJson(nameof(ScriptFiles), ScriptFiles);
+        return Task.CompletedTask;
+    }
+
+    public void Dispose() => persistingSubscription.Dispose();
 }
diff --git a/framework/src/Volo.Abp.AspNetCore.Components.Web.Theming/Bundling/AbpStyles.razor b/framework/src/Volo.Abp.AspNetCore.Components.Web.Theming/Bundling/AbpStyles.razor
@@ -1,11 +1,13 @@
 @using Volo.Abp
+@implements IDisposable
 @inject IComponentBundleManager BundleManager
+@inject PersistentComponentState PersistentComponentState
 
 @if (StyleFiles != null)
 {
     foreach (var file in StyleFiles)
     {
-        <link rel="stylesheet" href="@file"/>
+        <link rel="stylesheet" href="@file" />
     }
 }
 
@@ -18,16 +20,37 @@
 
     private List<string>? StyleFiles { get; set; }
 
+    private PersistingComponentStateSubscription persistingSubscription;
+
     protected override async Task OnInitializedAsync()
     {
         if (BundleName == null)
         {
             throw new AbpException("The BundleName parameter of the AbpStyles component can not be null!");
         }
-        StyleFiles = (await BundleManager.GetStyleBundleFilesAsync(BundleName!)).ToList();
+
+        persistingSubscription = PersistentComponentState.RegisterOnPersisting(PersistStyleFiles);
+
+        if (PersistentComponentState.TryTakeFromJson<List<string>>(nameof(StyleFiles), out var restoredStyleFiles))
+        {
+            StyleFiles = restoredStyleFiles;
+        }
+        else
+        {
+            StyleFiles = (await BundleManager.GetStyleBundleFilesAsync(BundleName!)).ToList();
+        }
+
         if (OperatingSystem.IsBrowser() && WebAssemblyStyleFiles != null)
         {
-            StyleFiles.AddRange(WebAssemblyStyleFiles);
+            StyleFiles?.AddRange(WebAssemblyStyleFiles);
         }
     }
+
+    private Task PersistStyleFiles()
+    {
+        PersistentComponentState.PersistAsJson(nameof(StyleFiles), StyleFiles);
+        return Task.CompletedTask;
+    }
+
+    public void Dispose() => persistingSubscription.Dispose();
 }