Corrected minLength and maxLength validators. (#273)

flutter-form-builder-ecosystem · May 15, 2020 · 929f63d · 929f63d
1 parent 58d7545
commit 929f63d
Showing 1 changed file with 2 additions and 9 deletions.
diff --git a/lib/src/form_builder_validators.dart b/lib/src/form_builder_validators.dart
@@ -76,10 +76,8 @@ class FormBuilderValidators {
     String errorText,
   }) {
     return (valueCandidate) {
-      if (allowEmpty && (valueCandidate == null || valueCandidate?.length == 0))
-        return errorText ??
-            "Value must have a length greater than or equal to $minLength";
-      if (valueCandidate != null && valueCandidate.length < minLength) {
+      final valueLength = valueCandidate?.length ?? 0;
+      if (valueLength < minLength && (!allowEmpty || valueLength > 0)) {
         return errorText ??
             "Value must have a length greater than or equal to $minLength";
       }
@@ -92,13 +90,8 @@ class FormBuilderValidators {
   static FormFieldValidator maxLength(
     num maxLength, {
     String errorText,
-    bool allowEmpty = false,
   }) {
     return (valueCandidate) {
-      if (allowEmpty && (valueCandidate == null || valueCandidate?.length == 0))
-        return errorText ??
-            "Value must have a length greater than or equal to $minLength";
-
       if (valueCandidate != null && valueCandidate.length > maxLength) {
         return errorText ??
             "Value must have a length less than or equal to $maxLength";