@formio/js 5.1.0-dev.6181.dd734d1 → 5.1.0-dev.6182.657a3eb

package/lib/cjs/PDFBuilder.js

@@ -454,18 +454,20 @@ class PDFBuilder extends WebformBuilder_1.default {
         const repeatablePathsComps = this.findComponentsWithRepeatablePaths();
         // update elements which path was duplicated if any pathes have been changed
         if (!lodash_1.default.isEqual(this.repeatablePathsComps, repeatablePathsComps)) {
-            (0, utils_1.eachComponent)(this.webform.getComponents(), (comp) => {
-                if (this.repeatablePathsComps.includes(comp.component)) {
-                    this.webform.postMessage({ name: 'updateElement', data: comp.component });
-                }
-            });
+            if (!lodash_1.default.isEmpty(this.repeatablePathsComps)) {
+                (0, utils_1.eachComponent)(this.webform.getComponents(), (comp) => {
+                    if (this.repeatablePathsComps.includes(comp.component)) {
+                        this.webform.postMessage({ name: 'updateElement', data: comp.component });
+                    }
+                });
+            }
             this.repeatablePathsComps = repeatablePathsComps;
         }
         if (!repeatablePathsComps.length) {
             return;
         }
         (0, utils_1.eachComponent)(this.webform.getComponents(), (comp) => {
-            if (this.repeatablePathsComps.includes(comp)) {
+            if (this.repeatablePathsComps.includes(comp.component)) {
                 this.webform.postMessage({
                     name: 'showBuilderErrors',
                     data: {

package/lib/cjs/Webform.js

@@ -361,6 +361,14 @@ class Webform extends NestedDataComponent_1.default {
     get shadowRoot() {
         return this.options.shadowRoot;
     }
+    // Webforms have no default value setting, so this should be always false
+    // I does not affect setting default value to nested forms
+    get shouldAddDefaultValue() {
+        return false;
+    }
+    get componentsMap() {
+        return this.childComponentsMap || {};
+    }
     /**
      * Add a language for translations
      * @param {string} code - The language code for the language being added.

package/lib/cjs/WebformBuilder.js

@@ -83,8 +83,16 @@ class WebformBuilder extends Component_1.default {
         }
         this.groupOrder = this.groupOrder
             .filter(group => group && !group.ignore)
-            .sort((a, b) => a.weight - b.weight)
-            .map(group => group.key);
+            .sort((a, b) => a.weight - b.weight);
+        const defaultOpenedGroup = this.groupOrder.find(x => x.key !== 'basic' && x.default);
+        if (defaultOpenedGroup) {
+            this.groupOrder.forEach(x => {
+                if ('default' in x && x.key !== defaultOpenedGroup.key) {
+                    x.default = false;
+                }
+            });
+        }
+        this.groupOrder = this.groupOrder.map(group => group.key);
         for (const type in Components_1.default.components) {
             const component = Components_1.default.components[type];
             if (component.builderInfo && component.builderInfo.schema) {
@@ -1099,7 +1107,7 @@ class WebformBuilder extends Component_1.default {
                     const newComp = parentComponent.addComponent(defaultValueComponent.component, defaultValueComponent.data, sibling);
                     lodash_1.default.pull(newComp.validators, 'required');
                     parentComponent.tabs[tabIndex].splice(index, 1, newComp);
-                    newComp.checkValidity = () => true;
+                    newComp.processOwnValidation = true;
                     newComp.build(defaultValueComponent.element);
                     if (this.preview && !this.preview.defaultChanged) {
                         const defaultValue = lodash_1.default.get(this.preview._data, this.editForm._data.key);

package/lib/cjs/Wizard.js

@@ -599,7 +599,7 @@ class Wizard extends Webform_1.default {
             if (!this._seenPages.includes(parentNum)) {
                 this._seenPages = this._seenPages.concat(parentNum);
             }
-            this.redraw().then(() => {
+            return this.redraw().then(() => {
                 this.checkData(this.submission.data);
                 this.triggerCaptcha(this.currentPage.components);
                 const errors = this.submitted ? this.validate(this.localData, { dirty: true }) : this.validateCurrentPage();
@@ -607,7 +607,6 @@ class Wizard extends Webform_1.default {
                     this.showErrors(errors, true, true);
                 }
             });
-            return Promise.resolve();
         }
         else if (!this.pages.length) {
             this.redraw();
@@ -821,6 +820,11 @@ class Wizard extends Webform_1.default {
         }
     }
     setValue(submission, flags = {}, ignoreEstablishment) {
+        if (!submission || !submission.data) {
+            submission = {
+                data: {},
+            };
+        }
         const changed = this.getPages({ all: true }).reduce((changed, page) => {
             return this.setNestedValue(page, submission.data, flags, changed) || changed;
         }, false);
@@ -931,10 +935,7 @@ class Wizard extends Webform_1.default {
             if (pageIndex >= 0) {
                 const page = this.pages[pageIndex];
                 if (page && page !== this.currentPage) {
-                    return this.setPage(pageIndex).then(() => {
-                        this.showErrors(this.validate(this.localData, { dirty: true }));
-                        super.focusOnComponent(key);
-                    });
+                    return this.setPage(pageIndex).then(() => super.focusOnComponent(key));
                 }
             }
         }

package/lib/cjs/components/_classes/component/Component.js

@@ -2563,7 +2563,7 @@ class Component extends Element_1.default {
         if ((value !== null) && (value !== undefined)) {
             value = this.hook('setDataValue', value, this.key, this._data);
         }
-        if ((value === null) || (value === undefined)) {
+        if ((value === null) || (value === undefined) || lodash_1.default.isNaN(value)) {
             this.unset();
             return;
         }

package/lib/cjs/components/_classes/nested/NestedComponent.d.ts

@@ -155,7 +155,7 @@ export default class NestedComponent extends Field {
      * @param {import('@formio/core').Component[]} components - The components to attach logic to.
      */
     attachComponentsLogic(components: import('@formio/core').Component[]): void;
-    attachComponents(element: any, components: any, container: any): Promise<any>;
+    attachComponents(element: any, components: any, container: any): Promise<void> | Promise<any[]>;
     /**
      * Remove a component from the components array and from the children object
      * @param {import('@formio/core').Component} component - The component to remove from the components.

package/lib/cjs/components/_classes/nested/NestedComponent.js

@@ -538,8 +538,7 @@ class NestedComponent extends Field_1.default {
         container = container || this.component.components;
         element = this.hook('attachComponents', element, components, container, this);
         if (!element) {
-            // Return a non-resolving promise.
-            return (new Promise(() => { }));
+            return Promise.resolve();
         }
         let index = 0;
         const promises = [];
@@ -558,12 +557,16 @@ class NestedComponent extends Field_1.default {
      * @param {boolean} [all] - If set to TRUE will cascade remove all components.
      */
     removeComponent(component, components, all = false) {
+        var _a, _b;
         components = components || this.components;
         component.destroy(all);
         lodash_1.default.remove(components, { id: component.id });
         if (this.componentsMap[component.path]) {
             delete this.componentsMap[component.path];
         }
+        if ((_a = this.root) === null || _a === void 0 ? void 0 : _a.componentsMap[component.path]) {
+            (_b = this.root) === null || _b === void 0 ? true : delete _b.componentsMap[component.path];
+        }
     }
     /**
      * Removes a component provided the API key of that component.

package/lib/cjs/components/address/Address.js

@@ -571,11 +571,11 @@ class AddressComponent extends Container_1.default {
         }
         if (valueInManualMode) {
             if (this.component.manualModeViewString) {
-                return this.interpolate(this.component.manualModeViewString, {
+                return this.evaluate(this.component.manualModeViewString, {
                     address,
-                    data: this.data,
+                    data: value,
                     component: this.component,
-                });
+                }, 'value');
             }
             return this.getComponents()
                 .filter((component) => component.hasValue(address))

package/lib/cjs/components/address/editForm/Address.edit.provider.js

@@ -147,7 +147,7 @@ exports.default = [
         key: 'manualModeViewString',
         label: 'Manual Mode View String',
         placeholder: 'Enter Manual Mode View String',
-        description: '"address" variable references component value, "data" - submission data and "component" - address component schema.',
+        description: '"data.address" references component value and "component" - address component schema.',
         weight: 60,
         rows: 5,
         editor: 'ace',

package/lib/cjs/components/editgrid/EditGrid.d.ts

@@ -73,10 +73,10 @@ export default class EditGridComponent extends NestedArrayComponent {
         rowIndex: any;
     } | undefined;
     emptyRow: any;
-    addRowModal(rowIndex: any): Promise<any>;
+    addRowModal(rowIndex: any): Promise<void> | Promise<any[]>;
     alert: Alert | null | undefined;
     showDialog(rowIndex: any): Promise<any>;
-    editRow(rowIndex: any): Promise<any>;
+    editRow(rowIndex: any): Promise<void> | Promise<any[]>;
     clearErrors(rowIndex: any): void;
     cancelRow(rowIndex: any): void;
     saveRow(rowIndex: any, modified: any): boolean | undefined;

package/lib/cjs/components/form/Form.d.ts

@@ -29,7 +29,7 @@ export default class FormComponent extends Component {
      * Prints out the value of form components as a datagrid value.
      */
     getValueAsString(value: any, options: any): any;
-    attach(element: any): Promise<void>;
+    attach(element: any): Promise<any>;
     get hasLoadedForm(): any;
     get isRevisionChanged(): any;
     get subFormData(): any;

package/lib/cjs/components/form/Form.js

@@ -290,29 +290,34 @@ class FormComponent extends Component_1.default {
                     return;
                 }
                 this.setContent(element, this.render());
+                const postAttach = () => {
+                    if (!this.builderMode && this.component.modalEdit) {
+                        const modalShouldBeOpened = this.componentModal ? this.componentModal.isOpened : false;
+                        const currentValue = modalShouldBeOpened ? this.componentModal.currentValue : this.dataValue;
+                        this.componentModal = new ComponentModal_1.default(this, element, modalShouldBeOpened, currentValue, this._referenceAttributeName);
+                        this.subForm.element = this.componentModal.refs.componentContent || this.subForm.element;
+                        this.setOpenModalElement();
+                    }
+                    this.calculateValue();
+                };
                 if (this.subForm) {
                     if (this.isNestedWizard) {
                         element = this.root.element;
                     }
-                    this.subForm.attach(element);
-                    this.valueChanged = this.hasSetValue;
-                    if (!this.shouldConditionallyClear()) {
-                        if (!this.valueChanged && this.dataValue.state !== 'submitted') {
-                            this.setDefaultValue();
-                        }
-                        else {
-                            this.restoreValue();
+                    return this.subForm.attach(element).then(() => {
+                        this.valueChanged = this.hasSetValue;
+                        if (!this.shouldConditionallyClear()) {
+                            if (!this.valueChanged && this.dataValue.state !== 'submitted') {
+                                this.setDefaultValue();
+                            }
+                            else {
+                                this.restoreValue();
+                            }
                         }
-                    }
-                }
-                if (!this.builderMode && this.component.modalEdit) {
-                    const modalShouldBeOpened = this.componentModal ? this.componentModal.isOpened : false;
-                    const currentValue = modalShouldBeOpened ? this.componentModal.currentValue : this.dataValue;
-                    this.componentModal = new ComponentModal_1.default(this, element, modalShouldBeOpened, currentValue, this._referenceAttributeName);
-                    this.subForm.element = this.componentModal.refs.componentContent || this.subForm.element;
-                    this.setOpenModalElement();
+                        postAttach();
+                    });
                 }
-                this.calculateValue();
+                postAttach();
             });
         });
     }

package/lib/cjs/components/tags/Tags.js

@@ -160,6 +160,13 @@ class TagsComponent extends Input_1.default {
             this.refs.input[0].parentNode.lastChild.focus();
         }
     }
+    getValue() {
+        if (this.choices) {
+            const value = this.choices.getValue(true);
+            return value.join(`${this.delimiter}`);
+        }
+        return super.getValue();
+    }
     getValueAsString(value) {
         if (!value) {
             return '';

package/lib/mjs/PDFBuilder.js

@@ -447,18 +447,20 @@ export default class PDFBuilder extends WebformBuilder {
         const repeatablePathsComps = this.findComponentsWithRepeatablePaths();
         // update elements which path was duplicated if any pathes have been changed
         if (!_.isEqual(this.repeatablePathsComps, repeatablePathsComps)) {
-            eachComponent(this.webform.getComponents(), (comp) => {
-                if (this.repeatablePathsComps.includes(comp.component)) {
-                    this.webform.postMessage({ name: 'updateElement', data: comp.component });
-                }
-            });
+            if (!_.isEmpty(this.repeatablePathsComps)) {
+                eachComponent(this.webform.getComponents(), (comp) => {
+                    if (this.repeatablePathsComps.includes(comp.component)) {
+                        this.webform.postMessage({ name: 'updateElement', data: comp.component });
+                    }
+                });
+            }
             this.repeatablePathsComps = repeatablePathsComps;
         }
         if (!repeatablePathsComps.length) {
             return;
         }
         eachComponent(this.webform.getComponents(), (comp) => {
-            if (this.repeatablePathsComps.includes(comp)) {
+            if (this.repeatablePathsComps.includes(comp.component)) {
                 this.webform.postMessage({
                     name: 'showBuilderErrors',
                     data: {

package/lib/mjs/Webform.js

@@ -333,6 +333,14 @@ export default class Webform extends NestedDataComponent {
     get shadowRoot() {
         return this.options.shadowRoot;
     }
+    // Webforms have no default value setting, so this should be always false
+    // I does not affect setting default value to nested forms
+    get shouldAddDefaultValue() {
+        return false;
+    }
+    get componentsMap() {
+        return this.childComponentsMap || {};
+    }
     /**
      * Add a language for translations
      * @param {string} code - The language code for the language being added.

package/lib/mjs/WebformBuilder.js

@@ -63,8 +63,16 @@ export default class WebformBuilder extends Component {
         }
         this.groupOrder = this.groupOrder
             .filter(group => group && !group.ignore)
-            .sort((a, b) => a.weight - b.weight)
-            .map(group => group.key);
+            .sort((a, b) => a.weight - b.weight);
+        const defaultOpenedGroup = this.groupOrder.find(x => x.key !== 'basic' && x.default);
+        if (defaultOpenedGroup) {
+            this.groupOrder.forEach(x => {
+                if ('default' in x && x.key !== defaultOpenedGroup.key) {
+                    x.default = false;
+                }
+            });
+        }
+        this.groupOrder = this.groupOrder.map(group => group.key);
         for (const type in Components.components) {
             const component = Components.components[type];
             if (component.builderInfo && component.builderInfo.schema) {
@@ -1082,7 +1090,7 @@ export default class WebformBuilder extends Component {
                     const newComp = parentComponent.addComponent(defaultValueComponent.component, defaultValueComponent.data, sibling);
                     _.pull(newComp.validators, 'required');
                     parentComponent.tabs[tabIndex].splice(index, 1, newComp);
-                    newComp.checkValidity = () => true;
+                    newComp.processOwnValidation = true;
                     newComp.build(defaultValueComponent.element);
                     if (this.preview && !this.preview.defaultChanged) {
                         const defaultValue = _.get(this.preview._data, this.editForm._data.key);

package/lib/mjs/Wizard.js

@@ -591,7 +591,7 @@ export default class Wizard extends Webform {
             if (!this._seenPages.includes(parentNum)) {
                 this._seenPages = this._seenPages.concat(parentNum);
             }
-            this.redraw().then(() => {
+            return this.redraw().then(() => {
                 this.checkData(this.submission.data);
                 this.triggerCaptcha(this.currentPage.components);
                 const errors = this.submitted ? this.validate(this.localData, { dirty: true }) : this.validateCurrentPage();
@@ -599,7 +599,6 @@ export default class Wizard extends Webform {
                     this.showErrors(errors, true, true);
                 }
             });
-            return Promise.resolve();
         }
         else if (!this.pages.length) {
             this.redraw();
@@ -810,6 +809,11 @@ export default class Wizard extends Webform {
         }
     }
     setValue(submission, flags = {}, ignoreEstablishment) {
+        if (!submission || !submission.data) {
+            submission = {
+                data: {},
+            };
+        }
         const changed = this.getPages({ all: true }).reduce((changed, page) => {
             return this.setNestedValue(page, submission.data, flags, changed) || changed;
         }, false);
@@ -919,10 +923,7 @@ export default class Wizard extends Webform {
             if (pageIndex >= 0) {
                 const page = this.pages[pageIndex];
                 if (page && page !== this.currentPage) {
-                    return this.setPage(pageIndex).then(() => {
-                        this.showErrors(this.validate(this.localData, { dirty: true }));
-                        super.focusOnComponent(key);
-                    });
+                    return this.setPage(pageIndex).then(() => super.focusOnComponent(key));
                 }
             }
         }

package/lib/mjs/components/_classes/component/Component.js

@@ -2555,7 +2555,7 @@ export default class Component extends Element {
         if ((value !== null) && (value !== undefined)) {
             value = this.hook('setDataValue', value, this.key, this._data);
         }
-        if ((value === null) || (value === undefined)) {
+        if ((value === null) || (value === undefined) || _.isNaN(value)) {
             this.unset();
             return;
         }

package/lib/mjs/components/_classes/nested/NestedComponent.d.ts

@@ -155,7 +155,7 @@ export default class NestedComponent extends Field {
      * @param {import('@formio/core').Component[]} components - The components to attach logic to.
      */
     attachComponentsLogic(components: import('@formio/core').Component[]): void;
-    attachComponents(element: any, components: any, container: any): Promise<any>;
+    attachComponents(element: any, components: any, container: any): Promise<void> | Promise<any[]>;
     /**
      * Remove a component from the components array and from the children object
      * @param {import('@formio/core').Component} component - The component to remove from the components.

package/lib/mjs/components/_classes/nested/NestedComponent.js

@@ -534,8 +534,7 @@ export default class NestedComponent extends Field {
         container = container || this.component.components;
         element = this.hook('attachComponents', element, components, container, this);
         if (!element) {
-            // Return a non-resolving promise.
-            return (new Promise(() => { }));
+            return Promise.resolve();
         }
         let index = 0;
         const promises = [];
@@ -560,6 +559,9 @@ export default class NestedComponent extends Field {
         if (this.componentsMap[component.path]) {
             delete this.componentsMap[component.path];
         }
+        if (this.root?.componentsMap[component.path]) {
+            delete this.root?.componentsMap[component.path];
+        }
     }
     /**
      * Removes a component provided the API key of that component.

package/lib/mjs/components/address/Address.js

@@ -564,11 +564,11 @@ export default class AddressComponent extends ContainerComponent {
         }
         if (valueInManualMode) {
             if (this.component.manualModeViewString) {
-                return this.interpolate(this.component.manualModeViewString, {
+                return this.evaluate(this.component.manualModeViewString, {
                     address,
-                    data: this.data,
+                    data: value,
                     component: this.component,
-                });
+                }, 'value');
             }
             return this.getComponents()
                 .filter((component) => component.hasValue(address))

package/lib/mjs/components/address/editForm/Address.edit.provider.js

@@ -142,7 +142,7 @@ export default [
         key: 'manualModeViewString',
         label: 'Manual Mode View String',
         placeholder: 'Enter Manual Mode View String',
-        description: '"address" variable references component value, "data" - submission data and "component" - address component schema.',
+        description: '"data.address" references component value and "component" - address component schema.',
         weight: 60,
         rows: 5,
         editor: 'ace',

package/lib/mjs/components/editgrid/EditGrid.d.ts

@@ -73,10 +73,10 @@ export default class EditGridComponent extends NestedArrayComponent {
         rowIndex: any;
     } | undefined;
     emptyRow: any;
-    addRowModal(rowIndex: any): Promise<any>;
+    addRowModal(rowIndex: any): Promise<void> | Promise<any[]>;
     alert: Alert | null | undefined;
     showDialog(rowIndex: any): Promise<any>;
-    editRow(rowIndex: any): Promise<any>;
+    editRow(rowIndex: any): Promise<void> | Promise<any[]>;
     clearErrors(rowIndex: any): void;
     cancelRow(rowIndex: any): void;
     saveRow(rowIndex: any, modified: any): boolean | undefined;

package/lib/mjs/components/form/Form.d.ts

@@ -29,7 +29,7 @@ export default class FormComponent extends Component {
      * Prints out the value of form components as a datagrid value.
      */
     getValueAsString(value: any, options: any): any;
-    attach(element: any): Promise<void>;
+    attach(element: any): Promise<any>;
     get hasLoadedForm(): any;
     get isRevisionChanged(): any;
     get subFormData(): any;

package/lib/mjs/components/form/Form.js

@@ -286,29 +286,34 @@ export default class FormComponent extends Component {
                     return;
                 }
                 this.setContent(element, this.render());
+                const postAttach = () => {
+                    if (!this.builderMode && this.component.modalEdit) {
+                        const modalShouldBeOpened = this.componentModal ? this.componentModal.isOpened : false;
+                        const currentValue = modalShouldBeOpened ? this.componentModal.currentValue : this.dataValue;
+                        this.componentModal = new ComponentModal(this, element, modalShouldBeOpened, currentValue, this._referenceAttributeName);
+                        this.subForm.element = this.componentModal.refs.componentContent || this.subForm.element;
+                        this.setOpenModalElement();
+                    }
+                    this.calculateValue();
+                };
                 if (this.subForm) {
                     if (this.isNestedWizard) {
                         element = this.root.element;
                     }
-                    this.subForm.attach(element);
-                    this.valueChanged = this.hasSetValue;
-                    if (!this.shouldConditionallyClear()) {
-                        if (!this.valueChanged && this.dataValue.state !== 'submitted') {
-                            this.setDefaultValue();
-                        }
-                        else {
-                            this.restoreValue();
+                    return this.subForm.attach(element).then(() => {
+                        this.valueChanged = this.hasSetValue;
+                        if (!this.shouldConditionallyClear()) {
+                            if (!this.valueChanged && this.dataValue.state !== 'submitted') {
+                                this.setDefaultValue();
+                            }
+                            else {
+                                this.restoreValue();
+                            }
                         }
-                    }
-                }
-                if (!this.builderMode && this.component.modalEdit) {
-                    const modalShouldBeOpened = this.componentModal ? this.componentModal.isOpened : false;
-                    const currentValue = modalShouldBeOpened ? this.componentModal.currentValue : this.dataValue;
-                    this.componentModal = new ComponentModal(this, element, modalShouldBeOpened, currentValue, this._referenceAttributeName);
-                    this.subForm.element = this.componentModal.refs.componentContent || this.subForm.element;
-                    this.setOpenModalElement();
+                        postAttach();
+                    });
                 }
-                this.calculateValue();
+                postAttach();
             });
         });
     }

package/lib/mjs/components/tags/Tags.js

@@ -158,6 +158,13 @@ export default class TagsComponent extends Input {
             this.refs.input[0].parentNode.lastChild.focus();
         }
     }
+    getValue() {
+        if (this.choices) {
+            const value = this.choices.getValue(true);
+            return value.join(`${this.delimiter}`);
+        }
+        return super.getValue();
+    }
     getValueAsString(value) {
         if (!value) {
             return '';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@formio/js",
-  "version": "5.1.0-dev.6181.dd734d1",
+  "version": "5.1.0-dev.6182.657a3eb",
   "description": "JavaScript powered Forms with JSON Form Builder",
   "main": "lib/cjs/index.js",
   "exports": {