updates no change support

Royal-Code · Nov 29, 2023 · cb6bc13 · cb6bc13
1 parent 2af0e36
commit cb6bc13
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 20 deletions.
diff --git a/RoyalCode.Yasamen/RoyalCode.Yasamen.Forms/FieldBase.cs b/RoyalCode.Yasamen/RoyalCode.Yasamen.Forms/FieldBase.cs
@@ -346,6 +346,10 @@ public override Task SetParametersAsync(ParameterView parameters)
             throw new InvalidOperationException(
                 $"{GetType()} does not support changing the {nameof(ModelContext<object>)} dynamically.");
         }
+        else
+        {
+            changeSupport!.HasCurrentValue(Value);
+        }
 
         if (ModelContext is null)
             throw new InvalidOperationException(

diff --git a/RoyalCode.Yasamen/RoyalCode.Yasamen.Forms/Support/ChangeSupport.cs b/RoyalCode.Yasamen/RoyalCode.Yasamen.Forms/Support/ChangeSupport.cs
@@ -23,6 +23,7 @@ public sealed class ChangeSupport
     private List<IPropertyChangeListener>? listeners;
     private bool initialized;
     private object? initialValue;
+    private object? currentValue;
     private bool notifying;
 
     internal ChangeSupport(string name,
@@ -66,7 +67,7 @@ public ChangeSupportListener<TProperty> OnChanged<TProperty>(PropertyChangedHand
             throw new ArgumentNullException(nameof(handler));
 
         var listener = new InternalListener<TProperty>(handler);
-        listeners ??= new();
+        listeners ??= [];
         listeners.Add(listener);
 
         var supportListener = new ChangeSupportListener<TProperty>(() =>
@@ -92,7 +93,7 @@ public ChangeSupportListener OnAnyChanged(AnyPropertyChangedHandler handler)
             throw new ArgumentNullException(nameof(handler));
 
         var listener = new InternalListener(handler);
-        listeners ??= new();
+        listeners ??= [];
         listeners.Add(listener);
 
         return new ChangeSupportListener(() =>
@@ -109,7 +110,7 @@ public void Include<TValue, TIncludedProperty>(
         var includedChangeSupport = collection.GetChangeSupport(changeSupportName);
         var include = new IncludeChangeSupport<TValue, TIncludedProperty>(includedChangeSupport, includedHandler);
 
-        includes ??= new();
+        includes ??= [];
         includes.Add(include);
     }
 
@@ -131,23 +132,21 @@ internal void Initialize<TValue>(FieldIdentifier identifier, TValue initialValue
         Identifier = identifier;
         FieldType = typeof(TValue);
         this.initialValue = initialValue;
+        currentValue = initialValue;
 
         InitializeIncludes(identifier, initialValue);
     }
 
-    internal void InitializeIncludes<TValue>(FieldIdentifier identifier, TValue initialValue)
+    internal void HasCurrentValue<TValue>(TValue value)
     {
-        includes?.ForEach(i => i.Initialize(identifier, initialValue));
-        parentPropertyChangeSupport?.GetChangeSupport(Name).InitializeIncludes(identifier, initialValue);
+        if (Identifier is not null && currentValue is TValue previousValue && !Equals(previousValue, value))
+            PropertyHasChanged(Identifier.Value, previousValue, value);
     }
 
-    //TODO: ver se isso é necessário.
-    internal void SetIdentifier(FieldIdentifier identifier)
+    internal void InitializeIncludes<TValue>(FieldIdentifier identifier, TValue initialValue)
     {
-        if (!initialized)
-            throw new InvalidOperationException($"The {nameof(ChangeSupport)} must be initialized");
-
-        Identifier = identifier;
+        includes?.ForEach(i => i.Initialize(identifier, initialValue));
+        parentPropertyChangeSupport?.GetChangeSupport(Name).InitializeIncludes(identifier, initialValue);
     }
 
     internal void Reset()
@@ -156,6 +155,7 @@ internal void Reset()
         Identifier = default;
         FieldType = null;
         initialValue = default;
+        currentValue = default;
 
         includes?.ForEach(i => i.Reset());
 
@@ -169,6 +169,8 @@ internal void PropertyHasChanged<TProperty>(FieldIdentifier fieldIdentifier, TPr
 
         notifying = true;
 
+        currentValue = newValue;
+
         listeners?.ForEach(l =>
         {
             if (l is IPropertyChangeListener<TProperty> typedListener)

diff --git a/RoyalCode.Yasamen/RoyalCode.Yasamen.Forms/Support/ChangeSupportCollection.cs b/RoyalCode.Yasamen/RoyalCode.Yasamen.Forms/Support/ChangeSupportCollection.cs
@@ -7,7 +7,7 @@ namespace RoyalCode.Yasamen.Forms.Support;
 ///     A collection of <see cref="ChangeSupport"/>.
 /// </para>
 /// <para>
-///     This class manages the <see cref="ChangeSupport"/> and its lifecycle.
+///     This class manages the <see cref="ChangeSupport"/> and its life-cycle.
 /// </para>
 /// </summary>
 public sealed class ChangeSupportCollection

diff --git a/RoyalCode.Yasamen/RoyalCode.Yasamen.Forms/Support/PropertyChangeSupport.cs b/RoyalCode.Yasamen/RoyalCode.Yasamen.Forms/Support/PropertyChangeSupport.cs
@@ -23,8 +23,8 @@ namespace RoyalCode.Yasamen.Forms.Support;
 public sealed class PropertyChangeSupport
 {
     private readonly ChangeSupportCollection changeSupports;
+    private readonly PropertyChangeSupport? parent;
     private Dictionary<string, object>? properties;
-    private PropertyChangeSupport? parent;
 
     /// <summary>
     /// Creates new <see cref="PropertyChangeSupport"/> without parent.
@@ -81,11 +81,12 @@ public void PropertyHasChanged<TProperty>(FieldIdentifier fieldIdentifier, TProp
 
     public PropertySupported<TValue> Property<TValue>(string name)
     {
-        properties ??= new();
+        properties ??= [];
         if (properties.TryGetValue(name, out var obj))
         {
             if (obj is not PropertySupported<TValue> supported)
-                throw new InvalidOperationException($"The property with name '{name}' has other type them ('{typeof(TValue).Name}')");
+                throw new InvalidOperationException(
+                    $"The property with name '{name}' has other type them ('{typeof(TValue).Name}')");
 
             return supported;
         }

diff --git a/...e.Yasamen/RoyalCode.Yasamen.Services/Extensions/YasamenDataServiceCollectionExtensions.cs b/...e.Yasamen/RoyalCode.Yasamen.Services/Extensions/YasamenDataServiceCollectionExtensions.cs
@@ -13,6 +13,5 @@ public static void AddDataServices(this IServiceCollection services)
     {
         services.AddScoped<IDataServicesProvider, DataServicesProvider>();
         services.AddScoped(typeof(FinderPerformerService<,>));
-
     }
 }
diff --git a/RoyalCode.Yasamen/version.targets b/RoyalCode.Yasamen/version.targets
@@ -4,9 +4,9 @@
 	<PropertyGroup>
 		<TargetFramework>net8.0</TargetFramework>
 
-		<Version>0.1.3.3</Version>
-		<AssemblyVersion>0.1.3.3</AssemblyVersion>
-		<FileVersion>0.1.3.3</FileVersion>
+		<Version>0.1.3.4</Version>
+		<AssemblyVersion>0.1.3.4</AssemblyVersion>
+		<FileVersion>0.1.3.4</FileVersion>
 
 	</PropertyGroup>
 	<ItemGroup>
-Original file line number
+Diff line change
@@ Expand Up @@
         {
             services.AddScoped<IDataServicesProvider, DataServicesProvider>();
             services.AddScoped(typeof(FinderPerformerService<,>));
         }
     }