@formio/js 5.0.0-dev.5923.b428b7b → 5.0.0-dev.5925.ef39512

package/lib/cjs/WebformBuilder.js

@@ -901,13 +901,16 @@ class WebformBuilder extends Component_1.default {
             keyboardActionsEnabled = keyboardActionsEnabled === 'true';
         }
         this.keyboardActionsEnabled = keyboardActionsEnabled;
-        const isSubmitButton = (comp) => {
-            return (comp.type === 'button') && ((comp.action === 'submit') || !comp.action);
-        };
-        const isShowSubmitButton = !this.options.noDefaultSubmitButton
-            && (!form.components.length || !form.components.find(comp => isSubmitButton(comp)));
+        const { display, noAddSubmitButton, noDefaultSubmitButton } = this.options;
+        const { _id, components } = form;
+        const isSubmitButton = ({ type, action }) => type === 'button' && (action === 'submit' || !action);
+        const hasSubmitButton = components.some(isSubmitButton);
+        // Add submit button if form display was switched from wizard
+        // Don't add if there is noAddSubmitButton flag passed, or the form has id, or the form has a submit button already
+        const shouldAddSubmitButton = (display === 'wizard' && !hasSubmitButton) ||
+            (!noAddSubmitButton && !_id && !hasSubmitButton);
         // Ensure there is at least a submit button.
-        if (isShowSubmitButton) {
+        if (!noDefaultSubmitButton && shouldAddSubmitButton) {
             form.components.push({
                 type: 'button',
                 label: 'Submit',

package/lib/cjs/Wizard.d.ts

@@ -105,7 +105,6 @@ 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,9 +720,10 @@ class Wizard extends Webform_1.default {
         }
     }
     validateCurrentPage(flags = {}) {
-        var _a;
+        var _a, _b;
+        const components = (_a = this.currentPage) === null || _a === void 0 ? void 0 : _a.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 (_a = this.currentPage) === null || _a === void 0 ? void 0 : _a.parent.validateComponents(this.currentPage.component.components, this.currentPage.parent.data, flags);
+        return (_b = this.currentPage) === null || _b === void 0 ? void 0 : _b.parent.validateComponents(components, this.currentPage.parent.data, flags);
     }
     emitPrevPage() {
         this.emit('prevPage', { page: this.page, submission: this.submission });
@@ -864,7 +865,8 @@ class Wizard extends Webform_1.default {
     onChange(flags, changed, modified, changes) {
         var _a, _b;
         super.onChange(flags, changed, modified, changes);
-        const errors = this.validate(this.localData, { dirty: false });
+        // The onChange loop doesn't need all components for wizards
+        const errors = this.submitted ? this.validate(this.localData, { dirty: true }) : this.validateCurrentPage();
         if (this.alert) {
             this.showErrors(errors, true, true);
         }
@@ -924,17 +926,6 @@ 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 && !this.isNestedWizard) {
+        if (this.subForm) {
             return this.subForm.checkValidity(this.subFormData, dirty, null, silentCheck, errors);
         }
         return super.checkComponentValidity(data, dirty, row, options, errors);

package/lib/cjs/components/selectboxes/SelectBoxes.d.ts

@@ -1,7 +1,8 @@
 export default class SelectBoxesComponent extends RadioComponent {
     static savedValueTypes(schema: any): string[];
     constructor(...args: any[]);
-    get emptyValue(): any;
+    get emptyValue(): {};
+    get defaultValue(): {};
     /**
      * Only empty if the values are all false.
      * @param {any} value - The value to check if empty.

package/lib/cjs/components/selectboxes/SelectBoxes.js

@@ -65,12 +65,7 @@ class SelectBoxesComponent extends Radio_1.default {
         return info;
     }
     get emptyValue() {
-        return this.component.values.reduce((prev, value) => {
-            if (value.value) {
-                prev[value.value] = false;
-            }
-            return prev;
-        }, {});
+        return {};
     }
     get defaultValue() {
         let defaultValue = this.emptyValue;
@@ -267,7 +262,6 @@ class SelectBoxesComponent extends Radio_1.default {
         else {
             return super.setCustomValidity(messages, dirty, external);
         }
-        ;
     }
     validateValueAvailability(setting, value) {
         if (!(0, utils_1.boolValue)(setting) || !value) {

package/lib/mjs/WebformBuilder.js

@@ -885,13 +885,16 @@ export default class WebformBuilder extends Component {
             keyboardActionsEnabled = keyboardActionsEnabled === 'true';
         }
         this.keyboardActionsEnabled = keyboardActionsEnabled;
-        const isSubmitButton = (comp) => {
-            return (comp.type === 'button') && ((comp.action === 'submit') || !comp.action);
-        };
-        const isShowSubmitButton = !this.options.noDefaultSubmitButton
-            && (!form.components.length || !form.components.find(comp => isSubmitButton(comp)));
+        const { display, noAddSubmitButton, noDefaultSubmitButton } = this.options;
+        const { _id, components } = form;
+        const isSubmitButton = ({ type, action }) => type === 'button' && (action === 'submit' || !action);
+        const hasSubmitButton = components.some(isSubmitButton);
+        // Add submit button if form display was switched from wizard
+        // Don't add if there is noAddSubmitButton flag passed, or the form has id, or the form has a submit button already
+        const shouldAddSubmitButton = (display === 'wizard' && !hasSubmitButton) ||
+            (!noAddSubmitButton && !_id && !hasSubmitButton);
         // Ensure there is at least a submit button.
-        if (isShowSubmitButton) {
+        if (!noDefaultSubmitButton && shouldAddSubmitButton) {
             form.components.push({
                 type: 'button',
                 label: 'Submit',

package/lib/mjs/Wizard.d.ts

@@ -105,7 +105,6 @@ 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,8 +710,9 @@ 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(this.currentPage.component.components, this.currentPage.parent.data, flags);
+        return this.currentPage?.parent.validateComponents(components, this.currentPage.parent.data, flags);
     }
     emitPrevPage() {
         this.emit('prevPage', { page: this.page, submission: this.submission });
@@ -852,7 +853,8 @@ export default class Wizard extends Webform {
     }
     onChange(flags, changed, modified, changes) {
         super.onChange(flags, changed, modified, changes);
-        const errors = this.validate(this.localData, { dirty: false });
+        // The onChange loop doesn't need all components for wizards
+        const errors = this.submitted ? this.validate(this.localData, { dirty: true }) : this.validateCurrentPage();
         if (this.alert) {
             this.showErrors(errors, true, true);
         }
@@ -911,17 +913,6 @@ 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 && !this.isNestedWizard) {
+        if (this.subForm) {
             return this.subForm.checkValidity(this.subFormData, dirty, null, silentCheck, errors);
         }
         return super.checkComponentValidity(data, dirty, row, options, errors);

package/lib/mjs/components/selectboxes/SelectBoxes.d.ts

@@ -1,7 +1,8 @@
 export default class SelectBoxesComponent extends RadioComponent {
     static savedValueTypes(schema: any): string[];
     constructor(...args: any[]);
-    get emptyValue(): any;
+    get emptyValue(): {};
+    get defaultValue(): {};
     /**
      * Only empty if the values are all false.
      * @param {any} value - The value to check if empty.

package/lib/mjs/components/selectboxes/SelectBoxes.js

@@ -67,12 +67,7 @@ export default class SelectBoxesComponent extends RadioComponent {
         return info;
     }
     get emptyValue() {
-        return this.component.values.reduce((prev, value) => {
-            if (value.value) {
-                prev[value.value] = false;
-            }
-            return prev;
-        }, {});
+        return {};
     }
     get defaultValue() {
         let defaultValue = this.emptyValue;
@@ -268,7 +263,6 @@ export default class SelectBoxesComponent extends RadioComponent {
         else {
             return super.setCustomValidity(messages, dirty, external);
         }
-        ;
     }
     validateValueAvailability(setting, value) {
         if (!boolValue(setting) || !value) {

package/package.json

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