Refactor component state

Author: Stedra Kristóf

src/AutSoft.AspNetCore.Blazor/ComponentState/ComponentStateStorage.cs

@@ -18,27 +18,19 @@ public void SaveStateForComponent(string instanceKey, ComponentBase component)
 
         var propertiesToSave = GetPropertiesFromHierarchy(componentType, BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic)
             .Where(prop => prop.IsDefined(typeof(PreserveStateAttribute), false))
+            .Where(prop => prop.GetValue(component) != null)
+            .Select(prop => new StateEntry(prop, prop.GetValue(component)!))
             .ToList();
 
-        foreach (var property in propertiesToSave)
-        {
-            var value = property.GetValue(component);
-
-            if (value != null)
-                componentStates.Add(new StateEntry(property, value));
-        }
+        componentStates.AddRange(propertiesToSave);
 
         var fieldsToSave = GetFieldsFromHierarchy(componentType, BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic)
-            .Where(prop => prop.IsDefined(typeof(PreserveStateAttribute), false))
+            .Where(field => field.IsDefined(typeof(PreserveStateAttribute), false))
+            .Where(field => field.GetValue(component) != null)
+            .Select(field => new StateEntry(field, field.GetValue(component)!))
             .ToList();
 
-        foreach (var field in fieldsToSave)
-        {
-            var value = field.GetValue(component);
-
-            if (value != null)
-                componentStates.Add(new StateEntry(field, value));
-        }
+        componentStates.AddRange(fieldsToSave);
 
         _currentComponentStates[instanceKey] = componentStates;
     }
@@ -47,12 +39,16 @@ public void SaveStateForComponent(string instanceKey, ComponentBase component)
     public void RestoreStateForComponent(string instanceKey, ComponentBase component)
     {
         if (!_currentComponentStates.ContainsKey(instanceKey))
+        {
             return;
+        }
 
         foreach (var state in _currentComponentStates[instanceKey])
         {
             if (state.Member is PropertyInfo pi)
+            {
                 pi.SetValue(component, state.Value);
+            }
             else if (state.Member is FieldInfo fi)
             {
                 fi.SetValue(component, state.Value);
@@ -73,24 +69,36 @@ public void ClearComponentStates()
     private IEnumerable<PropertyInfo> GetPropertiesFromHierarchy(Type type, BindingFlags bindingFlags)
     {
         foreach (var property in type.GetProperties(bindingFlags))
+        {
             yield return property;
+        }
 
         if (type.BaseType == null)
+        {
             yield break;
+        }
 
         foreach (var property in GetPropertiesFromHierarchy(type.BaseType, bindingFlags))
+        {
             yield return property;
+        }
     }
 
     private IEnumerable<FieldInfo> GetFieldsFromHierarchy(Type type, BindingFlags bindingFlags)
     {
         foreach (var field in type.GetFields(bindingFlags))
+        {
             yield return field;
+        }
 
         if (type.BaseType == null)
+        {
             yield break;
+        }
 
         foreach (var field in GetFieldsFromHierarchy(type.BaseType, bindingFlags))
+        {
             yield return field;
+        }
     }
 }

src/AutSoft.AspNetCore.Blazor/ComponentState/IComponentStateStorage.cs

@@ -8,21 +8,21 @@ namespace AutSoft.AspNetCore.Blazor.ComponentState;
 public interface IComponentStateStorage
 {
     /// <summary>
-    /// Saves the component state.
+    /// Saves the state of the component to the specified instance key.
     /// </summary>
-    /// <param name="instanceKey">Key of the instance.</param>
+    /// <param name="instanceKey">Key of the instance where to save.</param>
     /// <param name="component">Component to save.</param>
     void SaveStateForComponent(string instanceKey, ComponentBase component);
 
     /// <summary>
-    /// Restores the component state.
+    /// Restores the state of the component from the specified instance key.
     /// </summary>
-    /// <param name="instanceKey">Key of the instance.</param>
+    /// <param name="instanceKey">Key of the instance from which to reload.</param>
     /// <param name="component">Component to restore.</param>
     void RestoreStateForComponent(string instanceKey, ComponentBase component);
 
     /// <summary>
-    /// Clears the component state.
+    /// Clear all component states.
     /// </summary>
     void ClearComponentStates();
 }

src/AutSoft.AspNetCore.Blazor/ComponentState/StateEntry.cs

@@ -3,7 +3,7 @@
 namespace AutSoft.AspNetCore.Blazor.ComponentState;
 
 /// <summary>
-/// State of the entry.
+/// State entry for the component.
 /// </summary>
 public class StateEntry
 {

src/AutSoft.AspNetCore.Blazor/ComponentState/StatefulComponentBase.cs

@@ -9,15 +9,17 @@ namespace AutSoft.AspNetCore.Blazor.ComponentState;
 public class StatefulComponentBase : ComponentBase, IDisposable
 {
     private string? _instanceKey;
-    private bool _disposed;
+    private bool _isDisposed;
 
     /// <summary>
     /// Indicates that the component state should be saved.
     /// </summary>
     protected virtual bool ShouldSaveState { get; } = true;
 
+    [Inject]
     private IComponentStateStorage ComponentStateStorage { get; set; } = null!;
 
+    [Inject]
     private IJSRuntime JSRuntime { get; set; } = null!;
 
     /// <inheritdoc />
@@ -42,12 +44,16 @@ public void Dispose()
     /// <inheritdoc />
     protected virtual void Dispose(bool disposing)
     {
-        if (_disposed)
+        if (_isDisposed)
+        {
             return;
+        }
 
         if (disposing && !string.IsNullOrEmpty(_instanceKey))
+        {
             ComponentStateStorage.SaveStateForComponent(_instanceKey, this);
+        }
 
-        _disposed = true;
+        _isDisposed = true;
     }
 }