@formio/js 5.0.0-dev.5917.280d8f5 → 5.0.0-dev.5920.f58ae24

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;
             }
         }
@@ -1188,6 +1175,7 @@ class WebformBuilder extends Component_1.default {
             }
             const rebuild = parentComponent.rebuild() || Promise.resolve();
             return rebuild.then(() => {
+                parentComponent.resetValue();
                 const schema = parentContainer ? parentContainer[index] : (comp ? comp.schema : []);
                 this.emitSaveComponentEvent(schema, originalComp, parentComponent.schema, path, index, isNew, originalComponentSchema);
                 this.emit('change', this.form);

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: false }) : this.validateCurrentPage();
         if (this.alert) {
             this.showErrors(errors, true, true);
         }
@@ -925,14 +927,13 @@ 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];
-                }
-            });
-        }
-        ;
+        // if (this.hasExtraPages) {
+        //   this.subWizards.forEach((subWizard) => {
+        //     if(Array.isArray(subWizard.errors)) {
+        //       errors = [...errors, ...subWizard.errors]
+        //     }
+        //   })
+        // }
         return super.showErrors(errors, triggerEvent);
     }
     focusOnComponent(key) {

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/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;
             }
         }
@@ -1172,6 +1159,7 @@ export default class WebformBuilder extends Component {
             }
             const rebuild = parentComponent.rebuild() || Promise.resolve();
             return rebuild.then(() => {
+                parentComponent.resetValue();
                 const schema = parentContainer ? parentContainer[index] : (comp ? comp.schema : []);
                 this.emitSaveComponentEvent(schema, originalComp, parentComponent.schema, path, index, isNew, originalComponentSchema);
                 this.emit('change', this.form);

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: false }) : this.validateCurrentPage();
         if (this.alert) {
             this.showErrors(errors, true, true);
         }
@@ -912,14 +914,13 @@ 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];
-                }
-            });
-        }
-        ;
+        // if (this.hasExtraPages) {
+        //   this.subWizards.forEach((subWizard) => {
+        //     if(Array.isArray(subWizard.errors)) {
+        //       errors = [...errors, ...subWizard.errors]
+        //     }
+        //   })
+        // }
         return super.showErrors(errors, triggerEvent);
     }
     focusOnComponent(key) {

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