Feedback

Author: javiercn

src/Components/Components/src/IPersistentComponentStateSerializer.cs

@@ -9,4 +9,4 @@ internal interface IPersistentComponentStateSerializer
 {
     void Persist(Type type, object value, IBufferWriter<byte> writer);
     object Restore(Type type, ReadOnlySequence<byte> data);
-}
+}

src/Components/Components/src/PersistentState/PersistentValueProviderComponentSubscription.cs

@@ -30,7 +30,7 @@ internal partial class PersistentValueProviderComponentSubscription : IDisposabl
     private readonly RestoringComponentStateSubscription? _restoringSubscription;
     private object? _lastValue = _uninitializedValue;
     private bool _hasPendingInitialValue;
-    private bool _ignoreUpdatedValues;
+    private bool _ignoreComponentPropertyValue;
     private string? _storageKey;
 
     public PersistentValueProviderComponentSubscription(
@@ -59,6 +59,12 @@ public PersistentValueProviderComponentSubscription(
             new RestoreOptions { RestoreBehavior = attribute.RestoreBehavior, AllowUpdates = attribute.AllowUpdates });
     }
 
+    // GetOrComputeLastValue is a bit of a special provider.
+    // Right after a Restore operation it will capture the last value and return that, but it must support the user
+    // overriding the property at a later point, so to support that, we need to keep track of whether or not we have
+    // delivered the last value, and if so, instead of returning the _lastValue, we simply read the property and return
+    // that instead. That way, if the component updates the property in SetParametersAsync, we won't revert it to the
+    // value we restored from the persistent state.
     internal object? GetOrComputeLastValue()
     {
         var isInitialized = !ReferenceEquals(_lastValue, _uninitializedValue);
@@ -74,12 +80,12 @@ public PersistentValueProviderComponentSubscription(
         }
         else
         {
-            if (_ignoreUpdatedValues)
+            if (_ignoreComponentPropertyValue)
             {
                 // At this point, we just received a value update from `RestoreProperty`.
                 // The property value might have been modified by the component and in this
                 // case we want to overwrite it with the value we just restored.
-                _ignoreUpdatedValues = false;
+                _ignoreComponentPropertyValue = false;
                 return _lastValue;
             }
             else
@@ -124,7 +130,7 @@ internal void RestoreProperty()
                 _lastValue = _customSerializer.Restore(_propertyType, sequence);
                 if (!skipNotifications)
                 {
-                    _ignoreUpdatedValues = true;
+                    _ignoreComponentPropertyValue = true;
                     _subscriber.NotifyCascadingValueChanged(ParameterViewLifetime.Unbound);
                 }
             }
@@ -141,7 +147,7 @@ internal void RestoreProperty()
                 _lastValue = value;
                 if (!skipNotifications)
                 {
-                    _ignoreUpdatedValues = true;
+                    _ignoreComponentPropertyValue = true;
                     _subscriber.NotifyCascadingValueChanged(ParameterViewLifetime.Unbound);
                 }
             }