@formio/js 5.0.0-dev.5922.87eeb2f → 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',
@@ -1056,6 +1059,7 @@ class WebformBuilder extends Component_1.default {
                     'conditional',
                     'customConditional',
                     'id',
+                    'logic',
                     'fields.day.required',
                     'fields.month.required',
                     'fields.year.required',

package/lib/cjs/Wizard.js

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

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',
@@ -1040,6 +1043,7 @@ export default class WebformBuilder extends Component {
                     'conditional',
                     'customConditional',
                     'id',
+                    'logic',
                     'fields.day.required',
                     'fields.month.required',
                     'fields.year.required',

package/lib/mjs/Wizard.js

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

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.5922.87eeb2f",
+  "version": "5.0.0-dev.5925.ef39512",
   "description": "JavaScript powered Forms with JSON Form Builder",
   "main": "lib/cjs/index.js",
   "exports": {