@formio/js 5.0.0-rc.99 → 5.0.1-rc.1

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

@@ -1,9 +1,9 @@
 /*!
  * dist/inputmask
  * https://github.com/RobinHerbots/Inputmask
- * Copyright (c) 2010 - 2023 Robin Herbots
+ * Copyright (c) 2010 - 2024 Robin Herbots
  * Licensed under the MIT license
- * Version: 5.0.8
+ * Version: 5.0.9
  */
 
 /*!
@@ -20,7 +20,9 @@
 
 /*! @license DOMPurify 3.1.6 | (c) Cure53 and other contributors | Released under the Apache license 2.0 and Mozilla Public License 2.0 | github.com/cure53/DOMPurify/blob/3.1.6/LICENSE */
 
-/*! formiojs v5.0.0-rc.99 | https://unpkg.com/formiojs@5.0.0-rc.99/LICENSE.txt */
+/*! formiojs v5.0.1-rc.1 | https://unpkg.com/formiojs@5.0.1-rc.1/LICENSE.txt */
+
+/*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */
 
 /**
  * @license

package/lib/cjs/WebformBuilder.js

@@ -913,13 +913,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',
@@ -1068,6 +1071,7 @@ class WebformBuilder extends Component_1.default {
                     'conditional',
                     'customConditional',
                     'id',
+                    'logic',
                     'fields.day.required',
                     'fields.month.required',
                     'fields.year.required',
@@ -1093,6 +1097,12 @@ class WebformBuilder extends Component_1.default {
                     parentComponent.tabs[tabIndex].splice(index, 1, newComp);
                     newComp.checkValidity = () => true;
                     newComp.build(defaultValueComponent.element);
+                    if (this.preview && !this.preview.defaultChanged) {
+                        const defaultValue = lodash_1.default.get(this.preview._data, this.editForm._data.key);
+                        if (lodash_1.default.isObject(defaultValue) && !lodash_1.default.isArray(defaultValue)) {
+                            this.editForm._data.defaultValue = defaultValue;
+                        }
+                    }
                 }
             }
             else {
@@ -1103,6 +1113,7 @@ class WebformBuilder extends Component_1.default {
                     path.unshift(component.key);
                     dataPath = (0, utils_1.getStringFromComponentPath)(path);
                 }
+                this.preview.defaultChanged = true;
                 lodash_1.default.set(this.preview._data, dataPath, changed.value);
                 lodash_1.default.set(this.webform._data, dataPath, changed.value);
             }
@@ -1187,6 +1198,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.d.ts

@@ -105,7 +105,6 @@ declare class Wizard extends Webform {
     pageId(page: any): any;
     onChange(flags: any, changed: any, modified: any, changes: any): void;
     checkValidity(data: any, dirty: any, row: any, currentPageOnly: any, childErrors?: any[]): any;
-    showErrors(errors: any, triggerEvent: any): void | any[];
     focusOnComponent(key: any): void | Promise<void>;
 }
 declare namespace Wizard {

package/lib/cjs/Wizard.js

@@ -602,7 +602,10 @@ class Wizard extends Webform_1.default {
             }
             this.redraw().then(() => {
                 this.checkData(this.submission.data);
-                this.validateCurrentPage();
+                const errors = this.submitted ? this.validate(this.localData, { dirty: true }) : this.validateCurrentPage();
+                if (this.alert) {
+                    this.showErrors(errors, true, true);
+                }
             });
             return Promise.resolve();
         }
@@ -699,9 +702,11 @@ class Wizard extends Webform_1.default {
                 });
             });
         }
-        // Validate the form, before go to the next page
-        const errors = this.validateCurrentPage({ dirty: true });
-        if (errors.length === 0) {
+        // Validate the form before going to the next page
+        const currentPageErrors = this.validateCurrentPage({ dirty: true });
+        const errors = this.submitted ? this.validate(this.localData, { dirty: true }) : currentPageErrors;
+        // allow going to the next page if the current page is valid, even if there are form level errors
+        if (currentPageErrors.length === 0) {
             this.checkData(this.submission.data);
             return this.beforePage(true).then(() => {
                 return this.setPage(this.getNextPage()).then(() => {
@@ -716,13 +721,14 @@ class Wizard extends Webform_1.default {
         else {
             this.currentPage.components.forEach((comp) => comp.setPristine(false));
             this.scrollIntoView(this.element, true);
-            return Promise.reject(super.showErrors(errors, true));
+            return Promise.reject(this.showErrors(errors, true));
         }
     }
     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 +870,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: true }) : this.validateCurrentPage();
         if (this.alert) {
             this.showErrors(errors, true, true);
         }
@@ -919,21 +926,7 @@ class Wizard extends Webform_1.default {
         return components.reduce((check, comp) => comp.checkValidity(data, dirty, row, currentPageOnly, childErrors) && check, true);
     }
     get errors() {
-        if (!this.isLastPage()) {
-            return this.currentPage.errors;
-        }
-        return super.errors;
-    }
-    showErrors(errors, triggerEvent) {
-        if (this.hasExtraPages) {
-            this.subWizards.forEach((subWizard) => {
-                if (Array.isArray(subWizard.errors)) {
-                    errors = [...errors, ...subWizard.errors];
-                }
-            });
-        }
-        ;
-        return super.showErrors(errors, triggerEvent);
+        return !this.isLastPage() && !this.submitted ? this.currentPage.errors : super.errors;
     }
     focusOnComponent(key) {
         const component = this.getComponent(key);

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/form/Form.js

@@ -148,6 +148,9 @@ 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 options to the subform so those references are stable when the subform is created
+        options.parent = this;
+        options.parentVisible = this.visible;
         if (!this.options) {
             return options;
         }
@@ -395,8 +398,6 @@ 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.parent = this;
-                this.subForm.parentVisible = this.visible;
                 this.subForm.on('change', () => {
                     if (this.subForm) {
                         this.dataValue = this.subForm.getValue();
@@ -476,7 +477,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/html/HTML.js

@@ -10,7 +10,7 @@ class HTMLComponent extends Component_1.default {
         return Component_1.default.schema({
             label: 'HTML',
             type: 'htmlelement',
-            tag: 'p',
+            tag: 'div',
             attrs: [],
             content: '',
             input: false,

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

@@ -9,4 +9,5 @@ import comp8 from './comp8';
 import comp9 from './comp9';
 import comp10 from './comp10';
 import comp11 from './comp11';
-export { comp1, comp2, comp3, comp4, comp5, comp6, comp7, comp8, comp9, comp10, comp11 };
+import scientificNotation from './scientificNotation';
+export { comp1, comp2, comp3, comp4, comp5, comp6, comp7, comp8, comp9, comp10, comp11, scientificNotation };

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

@@ -26,3 +26,5 @@ const comp10_1 = __importDefault(require("./comp10"));
 exports.comp10 = comp10_1.default;
 const comp11_1 = __importDefault(require("./comp11"));
 exports.comp11 = comp11_1.default;
+const scientificNotation_1 = __importDefault(require("./scientificNotation"));
+exports.scientificNotation = scientificNotation_1.default;

package/lib/cjs/components/selectboxes/SelectBoxes.js

@@ -139,6 +139,14 @@ class SelectBoxesComponent extends Radio_1.default {
             checkedValues.forEach((value) => selectData.push(this.templateData[value]));
             lodash_1.default.set(submission.metadata.selectData, this.path, selectData);
         }
+        // Ensure that for dataSrc == 'values' that there are not any other superfluous values.
+        if (this.component.dataSrc === 'values') {
+            for (const key in value) {
+                if (!this.component.values.find((val) => val.value === key)) {
+                    delete value[key];
+                }
+            }
+        }
         return value;
     }
     /**
@@ -267,7 +275,6 @@ class SelectBoxesComponent extends Radio_1.default {
         else {
             return super.setCustomValidity(messages, dirty, external);
         }
-        ;
     }
     validateValueAvailability(setting, value) {
         if (!(0, utils_1.boolValue)(setting) || !value) {

package/lib/mjs/WebformBuilder.js

@@ -897,13 +897,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',
@@ -1052,6 +1055,7 @@ export default class WebformBuilder extends Component {
                     'conditional',
                     'customConditional',
                     'id',
+                    'logic',
                     'fields.day.required',
                     'fields.month.required',
                     'fields.year.required',
@@ -1077,6 +1081,12 @@ export default class WebformBuilder extends Component {
                     parentComponent.tabs[tabIndex].splice(index, 1, newComp);
                     newComp.checkValidity = () => true;
                     newComp.build(defaultValueComponent.element);
+                    if (this.preview && !this.preview.defaultChanged) {
+                        const defaultValue = _.get(this.preview._data, this.editForm._data.key);
+                        if (_.isObject(defaultValue) && !_.isArray(defaultValue)) {
+                            this.editForm._data.defaultValue = defaultValue;
+                        }
+                    }
                 }
             }
             else {
@@ -1087,6 +1097,7 @@ export default class WebformBuilder extends Component {
                     path.unshift(component.key);
                     dataPath = getStringFromComponentPath(path);
                 }
+                this.preview.defaultChanged = true;
                 _.set(this.preview._data, dataPath, changed.value);
                 _.set(this.webform._data, dataPath, changed.value);
             }
@@ -1171,6 +1182,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.d.ts

@@ -105,7 +105,6 @@ declare class Wizard extends Webform {
     pageId(page: any): any;
     onChange(flags: any, changed: any, modified: any, changes: any): void;
     checkValidity(data: any, dirty: any, row: any, currentPageOnly: any, childErrors?: any[]): any;
-    showErrors(errors: any, triggerEvent: any): void | any[];
     focusOnComponent(key: any): void | Promise<void>;
 }
 declare namespace Wizard {

package/lib/mjs/Wizard.js

@@ -594,7 +594,10 @@ export default class Wizard extends Webform {
             }
             this.redraw().then(() => {
                 this.checkData(this.submission.data);
-                this.validateCurrentPage();
+                const errors = this.submitted ? this.validate(this.localData, { dirty: true }) : this.validateCurrentPage();
+                if (this.alert) {
+                    this.showErrors(errors, true, true);
+                }
             });
             return Promise.resolve();
         }
@@ -689,9 +692,11 @@ export default class Wizard extends Webform {
                 });
             });
         }
-        // Validate the form, before go to the next page
-        const errors = this.validateCurrentPage({ dirty: true });
-        if (errors.length === 0) {
+        // Validate the form before going to the next page
+        const currentPageErrors = this.validateCurrentPage({ dirty: true });
+        const errors = this.submitted ? this.validate(this.localData, { dirty: true }) : currentPageErrors;
+        // allow going to the next page if the current page is valid, even if there are form level errors
+        if (currentPageErrors.length === 0) {
             this.checkData(this.submission.data);
             return this.beforePage(true).then(() => {
                 return this.setPage(this.getNextPage()).then(() => {
@@ -706,12 +711,13 @@ export default class Wizard extends Webform {
         else {
             this.currentPage.components.forEach((comp) => comp.setPristine(false));
             this.scrollIntoView(this.element, true);
-            return Promise.reject(super.showErrors(errors, true));
+            return Promise.reject(this.showErrors(errors, true));
         }
     }
     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 +858,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: true }) : this.validateCurrentPage();
         if (this.alert) {
             this.showErrors(errors, true, true);
         }
@@ -906,21 +913,7 @@ export default class Wizard extends Webform {
         return components.reduce((check, comp) => comp.checkValidity(data, dirty, row, currentPageOnly, childErrors) && check, true);
     }
     get errors() {
-        if (!this.isLastPage()) {
-            return this.currentPage.errors;
-        }
-        return super.errors;
-    }
-    showErrors(errors, triggerEvent) {
-        if (this.hasExtraPages) {
-            this.subWizards.forEach((subWizard) => {
-                if (Array.isArray(subWizard.errors)) {
-                    errors = [...errors, ...subWizard.errors];
-                }
-            });
-        }
-        ;
-        return super.showErrors(errors, triggerEvent);
+        return !this.isLastPage() && !this.submitted ? this.currentPage.errors : super.errors;
     }
     focusOnComponent(key) {
         const component = this.getComponent(key);

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/form/Form.js

@@ -142,6 +142,9 @@ 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 options to the subform so those references are stable when the subform is created
+        options.parent = this;
+        options.parentVisible = this.visible;
         if (!this.options) {
             return options;
         }
@@ -391,8 +394,6 @@ export default class FormComponent extends Component {
             return (new Form(form, this.getSubOptions())).ready.then((instance) => {
                 this.subForm = instance;
                 this.subForm.currentForm = this;
-                this.subForm.parent = this;
-                this.subForm.parentVisible = this.visible;
                 this.subForm.on('change', () => {
                     if (this.subForm) {
                         this.dataValue = this.subForm.getValue();
@@ -470,7 +471,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/html/HTML.js

@@ -5,7 +5,7 @@ export default class HTMLComponent extends Component {
         return Component.schema({
             label: 'HTML',
             type: 'htmlelement',
-            tag: 'p',
+            tag: 'div',
             attrs: [],
             content: '',
             input: false,

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

@@ -9,4 +9,5 @@ import comp8 from './comp8';
 import comp9 from './comp9';
 import comp10 from './comp10';
 import comp11 from './comp11';
-export { comp1, comp2, comp3, comp4, comp5, comp6, comp7, comp8, comp9, comp10, comp11 };
+import scientificNotation from './scientificNotation';
+export { comp1, comp2, comp3, comp4, comp5, comp6, comp7, comp8, comp9, comp10, comp11, scientificNotation };

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

@@ -9,4 +9,5 @@ import comp8 from './comp8';
 import comp9 from './comp9';
 import comp10 from './comp10';
 import comp11 from './comp11';
+import scientificNotation from './scientificNotation';
 export { comp1, comp2, comp3, comp4, comp5, comp6, comp7, comp8, comp9, comp10, comp11, scientificNotation };

package/lib/mjs/components/selectboxes/SelectBoxes.js

@@ -141,6 +141,14 @@ export default class SelectBoxesComponent extends RadioComponent {
             checkedValues.forEach((value) => selectData.push(this.templateData[value]));
             _.set(submission.metadata.selectData, this.path, selectData);
         }
+        // Ensure that for dataSrc == 'values' that there are not any other superfluous values.
+        if (this.component.dataSrc === 'values') {
+            for (const key in value) {
+                if (!this.component.values.find((val) => val.value === key)) {
+                    delete value[key];
+                }
+            }
+        }
         return value;
     }
     /**
@@ -268,7 +276,6 @@ export default class SelectBoxesComponent extends RadioComponent {
         else {
             return super.setCustomValidity(messages, dirty, external);
         }
-        ;
     }
     validateValueAvailability(setting, value) {
         if (!boolValue(setting) || !value) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@formio/js",
-  "version": "5.0.0-rc.99",
+  "version": "5.0.1-rc.1",
   "description": "JavaScript powered Forms with JSON Form Builder",
   "main": "lib/cjs/index.js",
   "exports": {
@@ -79,9 +79,9 @@
   },
   "homepage": "https://github.com/formio/formio.js#readme",
   "dependencies": {
-    "@formio/bootstrap": "3.0.0-rc.41",
+    "@formio/bootstrap": "3.0.0",
     "@formio/choices.js": "^10.2.1",
-    "@formio/core": "2.3.0-rc.22",
+    "@formio/core": "2.3.0",
     "@formio/text-mask-addons": "^3.8.0-formio.3",
     "@formio/vanilla-text-mask": "^5.1.1-formio.1",
     "abortcontroller-polyfill": "^1.7.5",