@formio/js 5.1.0-rc.5 → 5.1.0-rc.7

package/dist/formio.utils.min.js.LICENSE.txt

@@ -20,7 +20,7 @@
 
 /*! @license DOMPurify 3.2.3 | (c) Cure53 and other contributors | Released under the Apache license 2.0 and Mozilla Public License 2.0 | github.com/cure53/DOMPurify/blob/3.2.3/LICENSE */
 
-/*! formiojs v5.1.0-rc.5 | https://unpkg.com/formiojs@5.1.0-rc.5/LICENSE.txt */
+/*! formiojs v5.1.0-rc.7 | https://unpkg.com/formiojs@5.1.0-rc.7/LICENSE.txt */
 
 /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */
 

package/lib/cjs/Wizard.js

@@ -667,7 +667,7 @@ class Wizard extends Webform_1.default {
         return this.page - 1;
     }
     beforeSubmit() {
-        const pages = this.getPages();
+        const pages = this.getPages({ all: true });
         return Promise.all(pages.map((page) => {
             page.options.beforeSubmit = true;
             return page.beforeSubmit();

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

@@ -218,7 +218,7 @@ class AddressComponent extends Container_1.default {
         super.dataValue = value;
     }
     get dataValue() {
-        const resultValue = lodash_1.default.get(this._data, this.component.path);
+        const resultValue = lodash_1.default.get(this._data, this.path);
         if (!lodash_1.default.isArray(resultValue) && this.component.multiple) {
             return [resultValue];
         }

package/lib/cjs/components/address/fixtures/comp5.d.ts

@@ -0,0 +1,46 @@
+declare namespace _default {
+    let type: string;
+    let display: string;
+    let title: string;
+    let name: string;
+    let path: string;
+    let components: ({
+        label: string;
+        tableView: boolean;
+        multiple: boolean;
+        provider: string;
+        validateWhenHidden: boolean;
+        key: string;
+        providerOptions: {
+            params: {
+                autocompleteOptions: {};
+            };
+        };
+        type: string;
+        input: boolean;
+        components: {
+            label: string;
+            tableView: boolean;
+            key: string;
+            type: string;
+            input: boolean;
+            customConditional: string;
+        }[];
+        defaultValue: {}[];
+        disableOnInvalid?: undefined;
+    } | {
+        type: string;
+        label: string;
+        key: string;
+        disableOnInvalid: boolean;
+        input: boolean;
+        tableView: boolean;
+        multiple?: undefined;
+        provider?: undefined;
+        validateWhenHidden?: undefined;
+        providerOptions?: undefined;
+        components?: undefined;
+        defaultValue?: undefined;
+    })[];
+}
+export default _default;

package/lib/cjs/components/address/fixtures/comp5.js

@@ -0,0 +1,87 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = {
+    type: 'form',
+    display: 'form',
+    title: 'FIO-9527',
+    name: 'fio9527',
+    path: 'fio9527',
+    components: [
+        {
+            label: 'Address',
+            tableView: false,
+            multiple: true,
+            provider: 'nominatim',
+            validateWhenHidden: false,
+            key: 'address',
+            providerOptions: {
+                params: {
+                    autocompleteOptions: {}
+                }
+            },
+            type: 'address',
+            input: true,
+            components: [
+                {
+                    label: 'Address 1',
+                    tableView: false,
+                    key: 'address1',
+                    type: 'textfield',
+                    input: true,
+                    customConditional: "show = _.get(instance, 'parent.manualMode', false);"
+                },
+                {
+                    label: 'Address 2',
+                    tableView: false,
+                    key: 'address2',
+                    type: 'textfield',
+                    input: true,
+                    customConditional: "show = _.get(instance, 'parent.manualMode', false);"
+                },
+                {
+                    label: 'City',
+                    tableView: false,
+                    key: 'city',
+                    type: 'textfield',
+                    input: true,
+                    customConditional: "show = _.get(instance, 'parent.manualMode', false);"
+                },
+                {
+                    label: 'State',
+                    tableView: false,
+                    key: 'state',
+                    type: 'textfield',
+                    input: true,
+                    customConditional: "show = _.get(instance, 'parent.manualMode', false);"
+                },
+                {
+                    label: 'Country',
+                    tableView: false,
+                    key: 'country',
+                    type: 'textfield',
+                    input: true,
+                    customConditional: "show = _.get(instance, 'parent.manualMode', false);"
+                },
+                {
+                    label: 'Zip Code',
+                    tableView: false,
+                    key: 'zip',
+                    type: 'textfield',
+                    input: true,
+                    customConditional: "show = _.get(instance, 'parent.manualMode', false);"
+                }
+            ],
+            defaultValue: [
+                {}
+            ]
+        },
+        {
+            type: 'button',
+            label: 'Submit',
+            key: 'submit',
+            disableOnInvalid: true,
+            input: true,
+            tableView: false
+        }
+    ]
+};

package/lib/cjs/components/address/fixtures/index.d.ts

@@ -2,4 +2,5 @@ import comp1 from './comp1';
 import comp2 from './comp2';
 import comp3 from './comp3';
 import comp4 from './comp4';
-export { comp1, comp2, comp3, comp4 };
+import comp5 from './comp5';
+export { comp1, comp2, comp3, comp4, comp5 };

package/lib/cjs/components/address/fixtures/index.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.comp4 = exports.comp3 = exports.comp2 = exports.comp1 = void 0;
+exports.comp5 = exports.comp4 = exports.comp3 = exports.comp2 = exports.comp1 = void 0;
 const comp1_1 = __importDefault(require("./comp1"));
 exports.comp1 = comp1_1.default;
 const comp2_1 = __importDefault(require("./comp2"));
@@ -12,3 +12,5 @@ const comp3_1 = __importDefault(require("./comp3"));
 exports.comp3 = comp3_1.default;
 const comp4_1 = __importDefault(require("./comp4"));
 exports.comp4 = comp4_1.default;
+const comp5_1 = __importDefault(require("./comp5"));
+exports.comp5 = comp5_1.default;

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

@@ -144,6 +144,8 @@ class FormComponent extends Component_1.default {
         options.events = this.createEmitter();
         // Make sure to not show the submit button in wizards in the nested forms.
         lodash_1.default.set(options, 'buttonSettings.showSubmit', false);
+        // Set the parent option to the subform so those references are stable when the subform is created
+        options.parent = this;
         if (!this.options) {
             return options;
         }
@@ -393,12 +395,11 @@ class FormComponent extends Component_1.default {
             return (new Form_1.default(form, this.getSubOptions())).ready.then((instance) => {
                 this.subForm = instance;
                 this.subForm.currentForm = this;
+                this.subForm.parentVisible = this.visible;
                 const componentsMap = this.componentsMap;
                 const formComponentsMap = this.subForm.componentsMap;
                 lodash_1.default.assign(componentsMap, formComponentsMap);
                 this.component.components = this.subForm.components.map((comp) => comp.component);
-                this.subForm.parent = this;
-                this.subForm.parentVisible = this.visible;
                 this.subForm.on('change', () => {
                     if (this.subForm) {
                         this.dataValue = this.subForm.getValue();
@@ -582,11 +583,21 @@ class FormComponent extends Component_1.default {
             this.dataValue = submission;
             return Promise.resolve(this.dataValue);
         }
-        return this.submitSubForm(false)
-            .then(() => {
-            return this.dataValue;
-        })
-            .then(() => super.beforeSubmit());
+        if (this.isSubFormLazyLoad() && !this.subFormLoading) {
+            return this.createSubForm(true)
+                .then(this.submitSubForm(false))
+                .then(() => {
+                return this.dataValue;
+            })
+                .then(() => super.beforeSubmit());
+        }
+        else {
+            return this.submitSubForm(false)
+                .then(() => {
+                return this.dataValue;
+            })
+                .then(() => super.beforeSubmit());
+        }
     }
     isSubFormLazyLoad() {
         var _a, _b;

package/lib/mjs/Wizard.js

@@ -657,7 +657,7 @@ export default class Wizard extends Webform {
         return this.page - 1;
     }
     beforeSubmit() {
-        const pages = this.getPages();
+        const pages = this.getPages({ all: true });
         return Promise.all(pages.map((page) => {
             page.options.beforeSubmit = true;
             return page.beforeSubmit();

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

@@ -214,7 +214,7 @@ export default class AddressComponent extends ContainerComponent {
         super.dataValue = value;
     }
     get dataValue() {
-        const resultValue = _.get(this._data, this.component.path);
+        const resultValue = _.get(this._data, this.path);
         if (!_.isArray(resultValue) && this.component.multiple) {
             return [resultValue];
         }

package/lib/mjs/components/address/fixtures/comp5.d.ts

@@ -0,0 +1,46 @@
+declare namespace _default {
+    let type: string;
+    let display: string;
+    let title: string;
+    let name: string;
+    let path: string;
+    let components: ({
+        label: string;
+        tableView: boolean;
+        multiple: boolean;
+        provider: string;
+        validateWhenHidden: boolean;
+        key: string;
+        providerOptions: {
+            params: {
+                autocompleteOptions: {};
+            };
+        };
+        type: string;
+        input: boolean;
+        components: {
+            label: string;
+            tableView: boolean;
+            key: string;
+            type: string;
+            input: boolean;
+            customConditional: string;
+        }[];
+        defaultValue: {}[];
+        disableOnInvalid?: undefined;
+    } | {
+        type: string;
+        label: string;
+        key: string;
+        disableOnInvalid: boolean;
+        input: boolean;
+        tableView: boolean;
+        multiple?: undefined;
+        provider?: undefined;
+        validateWhenHidden?: undefined;
+        providerOptions?: undefined;
+        components?: undefined;
+        defaultValue?: undefined;
+    })[];
+}
+export default _default;

package/lib/mjs/components/address/fixtures/comp5.js

@@ -0,0 +1,85 @@
+export default {
+    type: 'form',
+    display: 'form',
+    title: 'FIO-9527',
+    name: 'fio9527',
+    path: 'fio9527',
+    components: [
+        {
+            label: 'Address',
+            tableView: false,
+            multiple: true,
+            provider: 'nominatim',
+            validateWhenHidden: false,
+            key: 'address',
+            providerOptions: {
+                params: {
+                    autocompleteOptions: {}
+                }
+            },
+            type: 'address',
+            input: true,
+            components: [
+                {
+                    label: 'Address 1',
+                    tableView: false,
+                    key: 'address1',
+                    type: 'textfield',
+                    input: true,
+                    customConditional: "show = _.get(instance, 'parent.manualMode', false);"
+                },
+                {
+                    label: 'Address 2',
+                    tableView: false,
+                    key: 'address2',
+                    type: 'textfield',
+                    input: true,
+                    customConditional: "show = _.get(instance, 'parent.manualMode', false);"
+                },
+                {
+                    label: 'City',
+                    tableView: false,
+                    key: 'city',
+                    type: 'textfield',
+                    input: true,
+                    customConditional: "show = _.get(instance, 'parent.manualMode', false);"
+                },
+                {
+                    label: 'State',
+                    tableView: false,
+                    key: 'state',
+                    type: 'textfield',
+                    input: true,
+                    customConditional: "show = _.get(instance, 'parent.manualMode', false);"
+                },
+                {
+                    label: 'Country',
+                    tableView: false,
+                    key: 'country',
+                    type: 'textfield',
+                    input: true,
+                    customConditional: "show = _.get(instance, 'parent.manualMode', false);"
+                },
+                {
+                    label: 'Zip Code',
+                    tableView: false,
+                    key: 'zip',
+                    type: 'textfield',
+                    input: true,
+                    customConditional: "show = _.get(instance, 'parent.manualMode', false);"
+                }
+            ],
+            defaultValue: [
+                {}
+            ]
+        },
+        {
+            type: 'button',
+            label: 'Submit',
+            key: 'submit',
+            disableOnInvalid: true,
+            input: true,
+            tableView: false
+        }
+    ]
+};

package/lib/mjs/components/address/fixtures/index.d.ts

@@ -2,4 +2,5 @@ import comp1 from './comp1';
 import comp2 from './comp2';
 import comp3 from './comp3';
 import comp4 from './comp4';
-export { comp1, comp2, comp3, comp4 };
+import comp5 from './comp5';
+export { comp1, comp2, comp3, comp4, comp5 };

package/lib/mjs/components/address/fixtures/index.js

@@ -2,4 +2,5 @@ import comp1 from './comp1';
 import comp2 from './comp2';
 import comp3 from './comp3';
 import comp4 from './comp4';
-export { comp1, comp2, comp3, comp4 };
+import comp5 from './comp5';
+export { comp1, comp2, comp3, comp4, comp5 };

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

@@ -138,6 +138,8 @@ export default class FormComponent extends Component {
         options.events = this.createEmitter();
         // Make sure to not show the submit button in wizards in the nested forms.
         _.set(options, 'buttonSettings.showSubmit', false);
+        // Set the parent option to the subform so those references are stable when the subform is created
+        options.parent = this;
         if (!this.options) {
             return options;
         }
@@ -389,12 +391,11 @@ export default class FormComponent extends Component {
             return (new Form(form, this.getSubOptions())).ready.then((instance) => {
                 this.subForm = instance;
                 this.subForm.currentForm = this;
+                this.subForm.parentVisible = this.visible;
                 const componentsMap = this.componentsMap;
                 const formComponentsMap = this.subForm.componentsMap;
                 _.assign(componentsMap, formComponentsMap);
                 this.component.components = this.subForm.components.map((comp) => comp.component);
-                this.subForm.parent = this;
-                this.subForm.parentVisible = this.visible;
                 this.subForm.on('change', () => {
                     if (this.subForm) {
                         this.dataValue = this.subForm.getValue();
@@ -576,11 +577,21 @@ export default class FormComponent extends Component {
             this.dataValue = submission;
             return Promise.resolve(this.dataValue);
         }
-        return this.submitSubForm(false)
-            .then(() => {
-            return this.dataValue;
-        })
-            .then(() => super.beforeSubmit());
+        if (this.isSubFormLazyLoad() && !this.subFormLoading) {
+            return this.createSubForm(true)
+                .then(this.submitSubForm(false))
+                .then(() => {
+                return this.dataValue;
+            })
+                .then(() => super.beforeSubmit());
+        }
+        else {
+            return this.submitSubForm(false)
+                .then(() => {
+                return this.dataValue;
+            })
+                .then(() => super.beforeSubmit());
+        }
     }
     isSubFormLazyLoad() {
         return this.root?._form?.display === 'wizard' && this.component.lazyLoad;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@formio/js",
-  "version": "5.1.0-rc.5",
+  "version": "5.1.0-rc.7",
   "description": "JavaScript powered Forms with JSON Form Builder",
   "main": "lib/cjs/index.js",
   "exports": {
@@ -81,7 +81,7 @@
   "dependencies": {
     "@formio/bootstrap": "3.1.0-rc.1",
     "@formio/choices.js": "^10.2.1",
-    "@formio/core": "2.4.0-rc.4",
+    "@formio/core": "2.4.0-rc.5",
     "@formio/text-mask-addons": "^3.8.0-formio.4",
     "@formio/vanilla-text-mask": "^5.1.1-formio.1",
     "abortcontroller-polyfill": "^1.7.5",