Fix duplicated validations

NewOldMax · Feb 3, 2021 · ee59c64 · ee59c64
1 parent f07be7a
commit ee59c64
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 23 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-form-validator-core",
-  "version": "1.0.1",
+  "version": "1.1.0",
   "description": "Core validator component for react forms.",
   "main": "./lib/index.js",
   "scripts": {

diff --git a/src/ValidatorComponent.jsx b/src/ValidatorComponent.jsx
@@ -84,7 +84,7 @@ class ValidatorComponent extends React.Component {
             this.state.validators.map(validator => ValidatorForm.getValidator(validator, value, includeRequired)),
         );
 
-        validations.then((results) => {
+        return validations.then((results) => {
             this.invalid = [];
             let valid = true;
             results.forEach((result, key) => {
@@ -98,6 +98,7 @@ class ValidatorComponent extends React.Component {
                     this.props.validatorListener(this.state.isValid);
                 });
             }
+            return valid;
         });
     }
 

diff --git a/src/ValidatorForm.jsx b/src/ValidatorForm.jsx
@@ -108,29 +108,14 @@ class ValidatorForm extends React.Component {
     )
 
     validate = (input, includeRequired, dryRun) => (
-        new Promise((resolve) => {
+        new Promise(async (resolve) => {
             const { value, validators } = input.props;
             const result = [];
-            let valid = true;
-            const validations = Promise.all(
-                validators.map(validator => (
-                    Promise.all([
-                        this.constructor.getValidator(validator, value, includeRequired),
-                    ]).then((data) => {
-                        result.push({ input, result: data && data[0] });
-                        input.validate(input.props.value, true, dryRun);
-                    })
-                )),
-            );
-            validations.then(() => {
-                result.forEach((item) => {
-                    if (!item.result) {
-                        valid = false;
-                        this.errors.push(item.input);
-                    }
-                });
-                resolve(valid);
-            });
+            const valid = await input.validate(input.props.value, includeRequired, dryRun);
+            if (!valid) {
+                this.errors.push(input);
+            }
+            resolve(valid);
         })
     )