@formio/js 5.0.0-dev.5915.7385833 → 5.0.0-dev.5919.408636c

package/lib/cjs/WebformBuilder.js

@@ -808,31 +808,18 @@ class WebformBuilder extends Component_1.default {
         // Show an error if siblings are disabled for a component and such a component already exists.
         const compKey = (group === 'resource') ? `component-${key}` : key;
         const draggableComponent = ((_a = this.groups[group]) === null || _a === void 0 ? void 0 : _a.components[compKey]) || {};
-        if (draggableComponent.disableSiblings) {
+        if (draggableComponent.disableSiblings || draggableComponent.uniqueComponent) {
             let isCompAlreadyExists = false;
             (0, formUtils_1.eachComponent)(this.webform.components, (component) => {
-                if (component.type === draggableComponent.schema.type) {
+                if ((draggableComponent.disableSiblings && component.type === draggableComponent.schema.type) ||
+                    (draggableComponent.uniqueComponent && component.component.key === draggableComponent.schema.key)) {
                     isCompAlreadyExists = true;
                     return;
                 }
             }, true);
             if (isCompAlreadyExists) {
                 this.webform.redraw();
-                this.webform.setAlert('danger', `You cannot add more than one ${draggableComponent.key} component to one page.`);
-                return;
-            }
-        }
-        if (draggableComponent.uniqueComponent) {
-            let isCompAlreadyExists = false;
-            (0, formUtils_1.eachComponent)(this.webform.components, (component) => {
-                if (component.key === draggableComponent.schema.key) {
-                    isCompAlreadyExists = true;
-                    return;
-                }
-            }, true);
-            if (isCompAlreadyExists) {
-                this.webform.redraw();
-                this.webform.setAlert('danger', `You cannot add more than one ${draggableComponent.title} component to one page.`);
+                this.webform.setAlert('danger', `You cannot add more than one ${lodash_1.default.get(draggableComponent, draggableComponent.uniqueComponent ? 'title' : 'key')} component to one page.`);
                 return;
             }
         }
@@ -914,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/components/_classes/component/editForm/Component.edit.validation.js

@@ -27,7 +27,7 @@ exports.default = [
         weight: 100,
         type: 'checkbox',
         label: 'Validate When Hidden',
-        tooltip: 'Validates the component when it is hidden/conditionally hidden. Vaildation errors are displayed in the error alert on the form submission.',
+        tooltip: 'Validates the component when it is hidden/conditionally hidden. Vaildation errors are displayed in the error alert on the form submission. Use caution when enabling this setting, as it can cause a hidden component to be invalid with no way for the form user to correct it.',
         key: 'validateWhenHidden',
         input: true
     },

package/lib/cjs/components/hidden/Hidden.d.ts

@@ -10,7 +10,6 @@ export default class HiddenComponent extends Input {
     };
     get inputInfo(): any;
     labelIsHidden(): boolean;
-    get emptyValue(): string;
     setValue(value: any, flags?: {}): boolean;
 }
 import Input from '../_classes/input/Input';

package/lib/cjs/components/hidden/Hidden.js

@@ -48,7 +48,7 @@ class HiddenComponent extends Input_1.default {
         return true;
     }
     get emptyValue() {
-        return '';
+        return null;
     }
     setValue(value, flags = {}) {
         return this.updateValue(value, flags);

package/lib/cjs/components/select/editForm/Select.edit.data.d.ts

@@ -1099,6 +1099,7 @@ declare const _default: ({
     alwaysEnabled?: undefined;
 } | {
     key: string;
+    type: string;
     conditional: {
         json: {
             and: ({
@@ -1149,7 +1150,6 @@ declare const _default: ({
         };
     };
     data?: undefined;
-    type?: undefined;
     weight?: undefined;
     input?: undefined;
     label?: undefined;

package/lib/cjs/components/select/editForm/Select.edit.data.js

@@ -687,6 +687,7 @@ exports.default = [
     },
     {
         key: 'selectData',
+        type: 'hidden',
         conditional: {
             json: {
                 and: [

package/lib/mjs/WebformBuilder.js

@@ -793,31 +793,18 @@ export default class WebformBuilder extends Component {
         // Show an error if siblings are disabled for a component and such a component already exists.
         const compKey = (group === 'resource') ? `component-${key}` : key;
         const draggableComponent = this.groups[group]?.components[compKey] || {};
-        if (draggableComponent.disableSiblings) {
+        if (draggableComponent.disableSiblings || draggableComponent.uniqueComponent) {
             let isCompAlreadyExists = false;
             eachComponent(this.webform.components, (component) => {
-                if (component.type === draggableComponent.schema.type) {
+                if ((draggableComponent.disableSiblings && component.type === draggableComponent.schema.type) ||
+                    (draggableComponent.uniqueComponent && component.component.key === draggableComponent.schema.key)) {
                     isCompAlreadyExists = true;
                     return;
                 }
             }, true);
             if (isCompAlreadyExists) {
                 this.webform.redraw();
-                this.webform.setAlert('danger', `You cannot add more than one ${draggableComponent.key} component to one page.`);
-                return;
-            }
-        }
-        if (draggableComponent.uniqueComponent) {
-            let isCompAlreadyExists = false;
-            eachComponent(this.webform.components, (component) => {
-                if (component.key === draggableComponent.schema.key) {
-                    isCompAlreadyExists = true;
-                    return;
-                }
-            }, true);
-            if (isCompAlreadyExists) {
-                this.webform.redraw();
-                this.webform.setAlert('danger', `You cannot add more than one ${draggableComponent.title} component to one page.`);
+                this.webform.setAlert('danger', `You cannot add more than one ${_.get(draggableComponent, draggableComponent.uniqueComponent ? 'title' : 'key')} component to one page.`);
                 return;
             }
         }
@@ -898,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/components/_classes/component/editForm/Component.edit.validation.js

@@ -22,7 +22,7 @@ export default [
         weight: 100,
         type: 'checkbox',
         label: 'Validate When Hidden',
-        tooltip: 'Validates the component when it is hidden/conditionally hidden. Vaildation errors are displayed in the error alert on the form submission.',
+        tooltip: 'Validates the component when it is hidden/conditionally hidden. Vaildation errors are displayed in the error alert on the form submission. Use caution when enabling this setting, as it can cause a hidden component to be invalid with no way for the form user to correct it.',
         key: 'validateWhenHidden',
         input: true
     },

package/lib/mjs/components/hidden/Hidden.d.ts

@@ -10,7 +10,6 @@ export default class HiddenComponent extends Input {
     };
     get inputInfo(): any;
     labelIsHidden(): boolean;
-    get emptyValue(): string;
     setValue(value: any, flags?: {}): boolean;
 }
 import Input from '../_classes/input/Input';

package/lib/mjs/components/hidden/Hidden.js

@@ -43,7 +43,7 @@ export default class HiddenComponent extends Input {
         return true;
     }
     get emptyValue() {
-        return '';
+        return null;
     }
     setValue(value, flags = {}) {
         return this.updateValue(value, flags);

package/lib/mjs/components/select/editForm/Select.edit.data.d.ts

@@ -1099,6 +1099,7 @@ declare const _default: ({
     alwaysEnabled?: undefined;
 } | {
     key: string;
+    type: string;
     conditional: {
         json: {
             and: ({
@@ -1149,7 +1150,6 @@ declare const _default: ({
         };
     };
     data?: undefined;
-    type?: undefined;
     weight?: undefined;
     input?: undefined;
     label?: undefined;

package/lib/mjs/components/select/editForm/Select.edit.data.js

@@ -681,6 +681,7 @@ export default [
     },
     {
         key: 'selectData',
+        type: 'hidden',
         conditional: {
             json: {
                 and: [

package/package.json

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