chore: code cleanups

Author: danvick

example/lib/sources/signup_form.dart

@@ -9,6 +9,7 @@ class SignupForm extends StatefulWidget {
 
 class _SignupFormState extends State<SignupForm> {
   final _formKey = GlobalKey<FormBuilderState>();
+  final _emailFieldKey = GlobalKey<FormBuilderFieldState>();
 
   @override
   Widget build(BuildContext context) {
@@ -18,7 +19,7 @@ class _SignupFormState extends State<SignupForm> {
           padding: const EdgeInsets.all(8.0),
           child: FormBuilder(
             key: _formKey,
-            autovalidateMode: AutovalidateMode.onUserInteraction,
+            // autovalidateMode: AutovalidateMode.onUserInteraction,
             child: Column(
               children: [
                 FormBuilderTextField(
@@ -30,6 +31,7 @@ class _SignupFormState extends State<SignupForm> {
                 ),
                 const SizedBox(height: 10),
                 FormBuilderTextField(
+                  key: _emailFieldKey,
                   name: 'email',
                   decoration: InputDecoration(labelText: 'Email'),
                   validator: FormBuilderValidators.compose([
@@ -53,10 +55,9 @@ class _SignupFormState extends State<SignupForm> {
                   autovalidateMode: AutovalidateMode.onUserInteraction,
                   decoration: InputDecoration(
                     labelText: 'Confirm Password',
-                    suffixIcon: (_formKey.currentState != null &&
-                            !(_formKey.currentState?.fields['confirm_password']
-                                    ?.isValid ??
-                                false))
+                    suffixIcon: ((_formKey.currentState
+                                ?.fields['confirm_password']?.hasError ??
+                            false))
                         ? const Icon(Icons.error, color: Colors.red)
                         : const Icon(Icons.check, color: Colors.green),
                   ),
@@ -106,6 +107,14 @@ class _SignupFormState extends State<SignupForm> {
                   color: Theme.of(context).colorScheme.secondary,
                   onPressed: () {
                     if (_formKey.currentState?.saveAndValidate() ?? false) {
+                      if (true) {
+                        // Either invalidate using Form Key
+                        _formKey.currentState?.invalidateField(
+                            name: 'email', errorText: 'Email already taken.');
+                        // OR invalidate using Field Key
+                        // _emailFieldKey.currentState?.invalidate('Email already taken.');
+                      }
+
                       print('Valid');
                     } else {
                       print('Invalid');

lib/src/form_builder.dart

@@ -95,15 +95,11 @@ class FormBuilderState extends State<FormBuilder> {
   Map<String, FormBuilderFieldState> get fields => _fields;
 
   void setInternalFieldValue(String name, dynamic value) {
-    setState(() {
-      _value[name] = value;
-    });
+    setState(() => _value[name] = value);
   }
 
   void removeInternalFieldValue(String name) {
-    setState(() {
-      _value.remove(name);
-    });
+    setState(() => _value.remove(name));
   }
 
   void registerField(String name, FormBuilderFieldState field) {
@@ -155,13 +151,13 @@ class FormBuilderState extends State<FormBuilder> {
       fields.values.first.invalidate(errorText);
 
   bool validate() {
-    final validation = _formKey.currentState!.validate();
-    if (!validation) {
+    final hasError = !_formKey.currentState!.validate();
+    if (hasError) {
       final wrongFields =
           fields.values.where((element) => element.hasError).toList();
       wrongFields.first.requestFocus();
     }
-    return validation;
+    return !hasError;
   }
 
   bool saveAndValidate() {

lib/src/form_builder_field.dart

@@ -101,10 +101,15 @@ class FormBuilderFieldState<F extends FormBuilderField<T?>, T>
   FormBuilderState? _formBuilderState;
 
   @override
-  bool get hasError => super.hasError || widget.decoration.errorText != null;
+  String? get errorText => super.errorText ?? _customErrorText;
 
   @override
-  bool get isValid => super.isValid && widget.decoration.errorText == null;
+  bool get hasError =>
+      super.hasError || decoration.errorText != null || errorText != null;
+
+  @override
+  bool get isValid =>
+      super.isValid && decoration.errorText == null && errorText == null;
 
   bool _touched = false;
 
@@ -175,22 +180,26 @@ class FormBuilderFieldState<F extends FormBuilderField<T?>, T>
   }
 
   @override
-  bool validate() {
-    setState(() => _customErrorText = null);
-    return super.validate() && widget.decoration.errorText == null;
+  bool validate({bool clearCustomError = true}) {
+    print(clearCustomError);
+    if (clearCustomError) {
+      setState(() => _customErrorText = null);
+    }
+    return super.validate() && !hasError;
   }
 
   void requestFocus() {
     FocusScope.of(context).requestFocus(effectiveFocusNode);
     Scrollable.ensureVisible(context);
   }
 
-  void invalidate(String reason) {
-    setState(() => _customErrorText = reason);
+  void invalidate(String errorText) {
+    setState(() => _customErrorText = errorText);
+    validate(clearCustomError: false);
     requestFocus();
   }
 
   InputDecoration get decoration => widget.decoration.copyWith(
-      errorText: widget.decoration.errorText ?? errorText ?? _customErrorText,
-    );
+        errorText: widget.decoration.errorText ?? errorText,
+      );
 }