Fix BindableReactiveProperty validation

Cysharp · Mar 1, 2024 · 0967a71 · 0967a71
1 parent e47c5b7
commit 0967a71
Showing 1 changed file with 14 additions and 6 deletions.
diff --git a/src/R3/BindableReactiveProperty.cs b/src/R3/BindableReactiveProperty.cs
@@ -79,19 +79,24 @@ protected override void OnValueChanged(T value)
     {
         if (enableNotifyError)
         {
+            // comes new value, require to clear error.
+            var previouslyHasErrors = (errors != null && errors.Count != 0);
+            errors?.Clear();
+
             if (validationContext != null)
             {
                 if (errors == null)
                 {
                     errors = new List<ValidationResult>(validationContext.ValidatorCount);
                 }
-                errors.Clear();
 
                 if (!validationContext.TryValidateValue(value, errors))
                 {
                     ErrorsChanged?.Invoke(this, ValueChangedEventArgs.DataErrorsChanged);
-
-                    // set is completed(validation does not call before set) so continue call PropertyChanged
+                }
+                else if (previouslyHasErrors)
+                {
+                    ErrorsChanged?.Invoke(this, ValueChangedEventArgs.DataErrorsChanged);
                 }
             }
             else if (validator != null)
@@ -101,13 +106,16 @@ protected override void OnValueChanged(T value)
                 {
                     OnReceiveError(error);
                 }
+                else if (previouslyHasErrors)
+                {
+                    ErrorsChanged?.Invoke(this, ValueChangedEventArgs.DataErrorsChanged);
+                }
             }
             else
             {
-                // comes new value, clear error
-                if (errors != null && errors.Count != 0)
+                if (previouslyHasErrors)
                 {
-                    errors.Clear();
+                    // notify error was cleared.
                     ErrorsChanged?.Invoke(this, ValueChangedEventArgs.DataErrorsChanged);
                 }
             }