Merge pull request #15 from josh-wer/develop

Develop
joshuauyi · Dec 5, 2020 · 502d097 · 502d097
2 parents c575c8b + 89da301
commit 502d097
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 8 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "formidate",
-  "version": "0.2.2",
+  "version": "0.2.3",
   "description": "Form validation library",
   "author": "Joshua Uyi <joshuaouyi@gmail.com>",
   "main": "lib/index.js",

diff --git a/src/FormGroup.ts b/src/FormGroup.ts
@@ -178,7 +178,6 @@ class FormGroup {
         .async(this._values, toValidateRules, this.options)
         .then(() => {
           this.mappedErrors = {};
-          this.controls[name].setTouched(true).setErrors([]);
         })
         .catch((err: any) => {
           if (err instanceof Error) {
@@ -191,13 +190,11 @@ class FormGroup {
           }
 
           this.mappedErrors = err || {};
-          const foundErrors: { [key: string]: string[] } = this.getGroupedErrors(this.mappedErrors);
-
-          // validate currently change field
-          this.controls[name].setTouched(true); // touch currently edited control
-          this.considered.forEach(controlName => this.controls[controlName].setErrors(foundErrors[controlName] || []));
         })
         .finally(() => {
+          this.controls[name].setTouched(true); // touch currently edited control
+          const foundErrors: { [key: string]: string[] } = this.getGroupedErrors(this.mappedErrors);
+          this.considered.forEach(controlName => this.controls[controlName].setErrors(foundErrors[controlName] || []));
           this.controls[name].setLoading(controlIsLoading);
           this.updateValidState();
         });