@formio/js 5.0.0-dev.5910.f7a730e → 5.0.0-dev.5911.81fbc1f

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;
             }
         }

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

@@ -10,6 +10,7 @@ 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 null;
+        return '';
     }
     setValue(value, flags = {}) {
         return this.updateValue(value, flags);

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

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

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

@@ -687,7 +687,6 @@ 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;
             }
         }

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

@@ -10,6 +10,7 @@ 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 null;
+        return '';
     }
     setValue(value, flags = {}) {
         return this.updateValue(value, flags);

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

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

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

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

package/package.json

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