@formio/js 5.0.0-dev.5920.f1002ff → 5.0.0-dev.5923.b428b7b

package/lib/cjs/WebformBuilder.js

@@ -1056,6 +1056,7 @@ class WebformBuilder extends Component_1.default {
                     'conditional',
                     'customConditional',
                     'id',
+                    'logic',
                     'fields.day.required',
                     'fields.month.required',
                     'fields.year.required',

package/lib/cjs/Wizard.d.ts

@@ -105,6 +105,7 @@ declare class Wizard extends Webform {
     pageId(page: any): any;
     onChange(flags: any, changed: any, modified: any, changes: any): void;
     checkValidity(data: any, dirty: any, row: any, currentPageOnly: any, childErrors?: any[]): any;
+    showErrors(errors: any, triggerEvent: any): void | any[];
     focusOnComponent(key: any): void | Promise<void>;
 }
 declare namespace Wizard {

package/lib/cjs/Wizard.js

@@ -720,10 +720,9 @@ class Wizard extends Webform_1.default {
         }
     }
     validateCurrentPage(flags = {}) {
-        var _a, _b;
-        const components = (_a = this.currentPage) === null || _a === void 0 ? void 0 : _a.components.map((component) => component.component);
+        var _a;
         // Accessing the parent ensures the right instance (whether it's the parent Wizard or a nested Wizard) performs its validation
-        return (_b = this.currentPage) === null || _b === void 0 ? void 0 : _b.parent.validateComponents(components, this.currentPage.parent.data, flags);
+        return (_a = this.currentPage) === null || _a === void 0 ? void 0 : _a.parent.validateComponents(this.currentPage.component.components, this.currentPage.parent.data, flags);
     }
     emitPrevPage() {
         this.emit('prevPage', { page: this.page, submission: this.submission });
@@ -865,8 +864,7 @@ class Wizard extends Webform_1.default {
     onChange(flags, changed, modified, changes) {
         var _a, _b;
         super.onChange(flags, changed, modified, changes);
-        // The onChange loop doesn't need all components for wizards
-        const errors = this.submitted ? this.validate(this.localData, { dirty: true }) : this.validateCurrentPage();
+        const errors = this.validate(this.localData, { dirty: false });
         if (this.alert) {
             this.showErrors(errors, true, true);
         }
@@ -926,6 +924,17 @@ class Wizard extends Webform_1.default {
         }
         return super.errors;
     }
+    showErrors(errors, triggerEvent) {
+        if (this.hasExtraPages) {
+            this.subWizards.forEach((subWizard) => {
+                if (Array.isArray(subWizard.errors)) {
+                    errors = [...errors, ...subWizard.errors];
+                }
+            });
+        }
+        ;
+        return super.showErrors(errors, triggerEvent);
+    }
     focusOnComponent(key) {
         const component = this.getComponent(key);
         if (component) {

package/lib/cjs/components/form/Form.js

@@ -476,7 +476,7 @@ class FormComponent extends Component_1.default {
     checkComponentValidity(data, dirty, row, options, errors = []) {
         options = options || {};
         const silentCheck = options.silentCheck || false;
-        if (this.subForm) {
+        if (this.subForm && !this.isNestedWizard) {
             return this.subForm.checkValidity(this.subFormData, dirty, null, silentCheck, errors);
         }
         return super.checkComponentValidity(data, dirty, row, options, errors);

package/lib/mjs/WebformBuilder.js

@@ -1040,6 +1040,7 @@ export default class WebformBuilder extends Component {
                     'conditional',
                     'customConditional',
                     'id',
+                    'logic',
                     'fields.day.required',
                     'fields.month.required',
                     'fields.year.required',

package/lib/mjs/Wizard.d.ts

@@ -105,6 +105,7 @@ declare class Wizard extends Webform {
     pageId(page: any): any;
     onChange(flags: any, changed: any, modified: any, changes: any): void;
     checkValidity(data: any, dirty: any, row: any, currentPageOnly: any, childErrors?: any[]): any;
+    showErrors(errors: any, triggerEvent: any): void | any[];
     focusOnComponent(key: any): void | Promise<void>;
 }
 declare namespace Wizard {

package/lib/mjs/Wizard.js

@@ -710,9 +710,8 @@ export default class Wizard extends Webform {
         }
     }
     validateCurrentPage(flags = {}) {
-        const components = this.currentPage?.components.map((component) => component.component);
         // Accessing the parent ensures the right instance (whether it's the parent Wizard or a nested Wizard) performs its validation
-        return this.currentPage?.parent.validateComponents(components, this.currentPage.parent.data, flags);
+        return this.currentPage?.parent.validateComponents(this.currentPage.component.components, this.currentPage.parent.data, flags);
     }
     emitPrevPage() {
         this.emit('prevPage', { page: this.page, submission: this.submission });
@@ -853,8 +852,7 @@ export default class Wizard extends Webform {
     }
     onChange(flags, changed, modified, changes) {
         super.onChange(flags, changed, modified, changes);
-        // The onChange loop doesn't need all components for wizards
-        const errors = this.submitted ? this.validate(this.localData, { dirty: true }) : this.validateCurrentPage();
+        const errors = this.validate(this.localData, { dirty: false });
         if (this.alert) {
             this.showErrors(errors, true, true);
         }
@@ -913,6 +911,17 @@ export default class Wizard extends Webform {
         }
         return super.errors;
     }
+    showErrors(errors, triggerEvent) {
+        if (this.hasExtraPages) {
+            this.subWizards.forEach((subWizard) => {
+                if (Array.isArray(subWizard.errors)) {
+                    errors = [...errors, ...subWizard.errors];
+                }
+            });
+        }
+        ;
+        return super.showErrors(errors, triggerEvent);
+    }
     focusOnComponent(key) {
         const component = this.getComponent(key);
         if (component) {

package/lib/mjs/components/form/Form.js

@@ -470,7 +470,7 @@ export default class FormComponent extends Component {
     checkComponentValidity(data, dirty, row, options, errors = []) {
         options = options || {};
         const silentCheck = options.silentCheck || false;
-        if (this.subForm) {
+        if (this.subForm && !this.isNestedWizard) {
             return this.subForm.checkValidity(this.subFormData, dirty, null, silentCheck, errors);
         }
         return super.checkComponentValidity(data, dirty, row, options, errors);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@formio/js",
-  "version": "5.0.0-dev.5920.f1002ff",
+  "version": "5.0.0-dev.5923.b428b7b",
   "description": "JavaScript powered Forms with JSON Form Builder",
   "main": "lib/cjs/index.js",
   "exports": {