@formio/js 5.0.0-dev.5932.9b8cb6d → 5.0.0-dev.5935.c16c9d9

package/lib/cjs/Wizard.js

@@ -602,7 +602,10 @@ class Wizard extends Webform_1.default {
             }
             this.redraw().then(() => {
                 this.checkData(this.submission.data);
-                this.validateCurrentPage();
+                const errors = this.submitted ? this.validate(this.localData, { dirty: true }) : this.validateCurrentPage();
+                if (this.alert) {
+                    this.showErrors(errors, true, true);
+                }
             });
             return Promise.resolve();
         }
@@ -699,9 +702,11 @@ class Wizard extends Webform_1.default {
                 });
             });
         }
-        // Validate the form, before go to the next page
-        const errors = this.validateCurrentPage({ dirty: true });
-        if (errors.length === 0) {
+        // Validate the form before going to the next page
+        const currentPageErrors = this.validateCurrentPage({ dirty: true });
+        const errors = this.submitted ? this.validate(this.localData, { dirty: true }) : currentPageErrors;
+        // allow going to the next page if the current page is valid, even if there are form level errors
+        if (currentPageErrors.length === 0) {
             this.checkData(this.submission.data);
             return this.beforePage(true).then(() => {
                 return this.setPage(this.getNextPage()).then(() => {
@@ -716,7 +721,7 @@ class Wizard extends Webform_1.default {
         else {
             this.currentPage.components.forEach((comp) => comp.setPristine(false));
             this.scrollIntoView(this.element, true);
-            return Promise.reject(super.showErrors(errors, true));
+            return Promise.reject(this.showErrors(errors, true));
         }
     }
     validateCurrentPage(flags = {}) {
@@ -921,10 +926,7 @@ class Wizard extends Webform_1.default {
         return components.reduce((check, comp) => comp.checkValidity(data, dirty, row, currentPageOnly, childErrors) && check, true);
     }
     get errors() {
-        if (!this.isLastPage()) {
-            return this.currentPage.errors;
-        }
-        return super.errors;
+        return !this.isLastPage() && !this.submitted ? this.currentPage.errors : super.errors;
     }
     focusOnComponent(key) {
         const component = this.getComponent(key);

package/lib/cjs/components/editgrid/EditGrid.js

@@ -987,7 +987,7 @@ class EditGridComponent extends NestedArrayComponent_1.default {
             dirty;
     }
     validateRow(editRow, dirty, forceSilentCheck, fromSubmission) {
-        var _a;
+        var _a, _b;
         editRow.errors = [];
         if (this.shouldValidateRow(editRow, dirty, fromSubmission)) {
             const silentCheck = (this.component.rowDrafts && !this.shouldValidateDraft(editRow)) || forceSilentCheck;
@@ -1037,9 +1037,12 @@ class EditGridComponent extends NestedArrayComponent_1.default {
                 });
             }
         }
-        if (!this.component.rowDrafts || ((_a = this.root) === null || _a === void 0 ? void 0 : _a.submitted)) {
+        if (editRow.alerts && (!this.component.rowDrafts || ((_a = this.root) === null || _a === void 0 ? void 0 : _a.submitted))) {
             this.showRowErrorAlerts(editRow, editRow.errors);
         }
+        else if ((_b = editRow.errors) === null || _b === void 0 ? void 0 : _b.length) {
+            this.setCustomValidity(editRow.errors, dirty);
+        }
         return editRow.errors;
     }
     showRowErrorAlerts(editRow, errors) {

package/lib/mjs/Wizard.js

@@ -594,7 +594,10 @@ export default class Wizard extends Webform {
             }
             this.redraw().then(() => {
                 this.checkData(this.submission.data);
-                this.validateCurrentPage();
+                const errors = this.submitted ? this.validate(this.localData, { dirty: true }) : this.validateCurrentPage();
+                if (this.alert) {
+                    this.showErrors(errors, true, true);
+                }
             });
             return Promise.resolve();
         }
@@ -689,9 +692,11 @@ export default class Wizard extends Webform {
                 });
             });
         }
-        // Validate the form, before go to the next page
-        const errors = this.validateCurrentPage({ dirty: true });
-        if (errors.length === 0) {
+        // Validate the form before going to the next page
+        const currentPageErrors = this.validateCurrentPage({ dirty: true });
+        const errors = this.submitted ? this.validate(this.localData, { dirty: true }) : currentPageErrors;
+        // allow going to the next page if the current page is valid, even if there are form level errors
+        if (currentPageErrors.length === 0) {
             this.checkData(this.submission.data);
             return this.beforePage(true).then(() => {
                 return this.setPage(this.getNextPage()).then(() => {
@@ -706,7 +711,7 @@ export default class Wizard extends Webform {
         else {
             this.currentPage.components.forEach((comp) => comp.setPristine(false));
             this.scrollIntoView(this.element, true);
-            return Promise.reject(super.showErrors(errors, true));
+            return Promise.reject(this.showErrors(errors, true));
         }
     }
     validateCurrentPage(flags = {}) {
@@ -908,10 +913,7 @@ export default class Wizard extends Webform {
         return components.reduce((check, comp) => comp.checkValidity(data, dirty, row, currentPageOnly, childErrors) && check, true);
     }
     get errors() {
-        if (!this.isLastPage()) {
-            return this.currentPage.errors;
-        }
-        return super.errors;
+        return !this.isLastPage() && !this.submitted ? this.currentPage.errors : super.errors;
     }
     focusOnComponent(key) {
         const component = this.getComponent(key);

package/lib/mjs/components/editgrid/EditGrid.js

@@ -1026,9 +1026,12 @@ export default class EditGridComponent extends NestedArrayComponent {
                 });
             }
         }
-        if (!this.component.rowDrafts || this.root?.submitted) {
+        if (editRow.alerts && (!this.component.rowDrafts || this.root?.submitted)) {
             this.showRowErrorAlerts(editRow, editRow.errors);
         }
+        else if (editRow.errors?.length) {
+            this.setCustomValidity(editRow.errors, dirty);
+        }
         return editRow.errors;
     }
     showRowErrorAlerts(editRow, errors) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@formio/js",
-  "version": "5.0.0-dev.5932.9b8cb6d",
+  "version": "5.0.0-dev.5935.c16c9d9",
   "description": "JavaScript powered Forms with JSON Form Builder",
   "main": "lib/cjs/index.js",
   "exports": {