Merge branch 'release/18.2.2'

Author: joanpablo

CHANGELOG.md

@@ -1,3 +1,21 @@
+# 18.2.2
+
+## Fixes
+
+- Correct `hasErrors` to check child controls.
+
+## Enhances
+
+- Improve `errors` getter performance.
+- Optimize list and map access.
+
+# 18.2.1
+
+## Enhances
+
+- Added optional parameters to the `clearValidators` method to support automatic validation after 
+  clearing validators.
+
 # 18.2.0
 
 ## Features

README.md

@@ -88,7 +88,7 @@ dependencies:
   flutter:
     sdk: flutter
 
-  reactive_forms: ^18.2.0
+  reactive_forms: ^18.2.2
 ```
 
 Then, run the command `flutter packages get` in the console.

lib/src/models/models.dart

@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 import 'dart:async';
+import 'dart:collection';
 
 import 'package:flutter/foundation.dart';
 import 'package:reactive_forms/reactive_forms.dart';
@@ -29,7 +30,8 @@ abstract class AbstractControl<T> {
       <AsyncValidator<dynamic>>[];
 
   StreamSubscription<Map<String, dynamic>?>? _asyncValidationSubscription;
-  Map<String, dynamic> _errors = <String, dynamic>{};
+  final Map<String, dynamic> _errors = <String, dynamic>{};
+  late final Map<String, dynamic> _errorsView = UnmodifiableMapView(_errors);
   bool _pristine = true;
 
   T? _value;
@@ -106,8 +108,7 @@ abstract class AbstractControl<T> {
   ///
   /// In [FormGroup] these come in handy when you want to perform validation
   /// that considers the value of more than one child control.
-  List<Validator<dynamic>> get validators =>
-      List<Validator<dynamic>>.unmodifiable(_validators);
+  List<Validator<dynamic>> get validators => UnmodifiableListView(_validators);
 
   /// Sets the synchronous [validators] that are active on this control. Calling
   /// this overwrites any existing sync validators.
@@ -142,20 +143,24 @@ abstract class AbstractControl<T> {
   }
 
   /// Empties out the sync validator list.
-  ///
-  /// When you add or remove a validator at run time, you must call
-  /// **updateValueAndValidity()**, or assign a new value to the control for
-  /// the new validation to take effect.
-  void clearValidators() {
+  void clearValidators({
+    bool autoValidate = false,
+    bool updateParent = true,
+    bool emitEvent = true,
+  }) {
     _validators.clear();
+
+    if (autoValidate) {
+      updateValueAndValidity(updateParent: updateParent, emitEvent: emitEvent);
+    }
   }
 
   /// The list of async functions that determines the validity of this control.
   ///
   /// In [FormGroup] these come in handy when you want to perform validation
   /// that considers the value of more than one child control.
   List<AsyncValidator<dynamic>> get asyncValidators =>
-      List<AsyncValidator<dynamic>>.unmodifiable(_asyncValidators);
+      UnmodifiableListView(_asyncValidators);
 
   /// Sets the async [validators] that are active on this control. Calling this
   /// overwrites any existing async validators.
@@ -208,7 +213,7 @@ abstract class AbstractControl<T> {
 
   /// An object containing any errors generated by failing validation,
   /// or empty [Map] if there are no errors.
-  Map<String, Object> get errors => Map<String, Object>.unmodifiable(_errors);
+  Map<String, dynamic> get errors => _errorsView;
 
   /// A [Stream] that emits the status every time it changes.
   Stream<ControlStatus> get statusChanged => _statusChanges.stream;
@@ -237,7 +242,8 @@ abstract class AbstractControl<T> {
   bool get enabled => !disabled;
 
   /// True whether the control has validation errors.
-  bool get hasErrors => errors.isNotEmpty;
+  bool get hasErrors =>
+      _errors.isNotEmpty || anyControls((control) => control.hasErrors);
 
   /// The validation status of the control.
   ///
@@ -643,16 +649,14 @@ abstract class AbstractControl<T> {
     parent?._updateControlsErrors();
   }
 
-  Map<String, dynamic> _runValidators() {
-    final errors = <String, dynamic>{};
-    for (final validator in validators) {
+  void _runValidators() {
+    _errors.clear();
+    for (final validator in _validators) {
       final error = validator.validate(this);
       if (error != null) {
-        errors.addAll(error);
+        _errors.addAll(error);
       }
     }
-
-    return errors;
   }
 
   void _setInitialStatus() {
@@ -687,7 +691,7 @@ abstract class AbstractControl<T> {
     _updateValue();
     if (enabled) {
       _cancelExistingSubscription();
-      _errors = _runValidators();
+      _runValidators();
       _status = _calculateStatus();
       if (_status == ControlStatus.valid || _status == ControlStatus.pending) {
         _runAsyncValidators();
@@ -1457,7 +1461,7 @@ class FormGroup extends FormControlCollection<Map<String, Object?>> {
   }
 
   @override
-  Map<String, Object?> get value => Map.unmodifiable(_value!);
+  Map<String, Object?> get value => UnmodifiableMapView(_value!);
 
   /// Set the complete value for the form group.
   ///
@@ -1528,15 +1532,12 @@ class FormGroup extends FormControlCollection<Map<String, Object?>> {
   ///
   /// Contains all the errors of the group and the child errors.
   @override
-  Map<String, Object> get errors {
-    final allErrors = Map<String, Object>.of(super.errors);
+  Map<String, dynamic> get errors {
+    final allErrors = <String, dynamic>{};
+    allErrors.addAll(_errors);
     _controls.forEach((name, control) {
       if (control.enabled && control.hasErrors) {
-        allErrors.update(
-          name,
-          (_) => control.errors,
-          ifAbsent: () => control.errors,
-        );
+        allErrors[name] = control.errors;
       }
     });
 
@@ -1853,10 +1854,14 @@ class FormArray<T> extends FormControlCollection<List<T?>> {
   /// This method is for internal use only.
   @override
   List<T?>? reduceValue() {
-    return _controls
-        .where((control) => control.enabled || disabled)
-        .map((control) => control.value)
-        .toList();
+    final values = <T?>[];
+    for (final control in _controls) {
+      if (control.enabled || disabled) {
+        values.add(control.value);
+      }
+    }
+
+    return values;
   }
 
   /// Disables the control.
@@ -2167,17 +2172,14 @@ class FormArray<T> extends FormControlCollection<List<T?>> {
   ///
   /// Contains all the errors of the array and the child errors.
   @override
-  Map<String, Object> get errors {
-    final allErrors = Map.of(super.errors);
+  Map<String, dynamic> get errors {
+    final allErrors = <String, dynamic>{};
+    allErrors.addAll(_errors);
     _controls.asMap().entries.forEach((entry) {
       final control = entry.value;
       final name = entry.key.toString();
       if (control.enabled && control.hasErrors) {
-        allErrors.update(
-          name,
-          (_) => control.errors,
-          ifAbsent: () => control.errors,
-        );
+        allErrors[name] = control.errors;
       }
     });
 

pubspec.yaml

@@ -1,6 +1,6 @@
 name: reactive_forms
 description: This is a model-driven approach to handling form inputs and validations, heavily inspired in Angular Reactive Forms.
-version: 18.2.0
+version: 18.2.2
 homepage: "https://github.com/joanpablo/reactive_forms"
 
 environment: