@formio/js 5.1.0-dev.6218.dde7b07 → 5.1.0-dev.6221.d976115

package/lib/cjs/Element.js

@@ -533,9 +533,9 @@ class Element {
         if (this.component.filter === string && !this.options.building) {
             const evalContext = this.evalContext(data);
             evalContext.data = lodash_1.default.mapValues(evalContext.data, (val) => lodash_1.default.isString(val) ? encodeURIComponent(val) : val);
-            return utils_1.default.Evaluator.interpolate(string, evalContext, options);
+            return utils_1.default.interpolate(string, evalContext, options);
         }
-        return utils_1.default.Evaluator.interpolate(string, this.evalContext(data), options);
+        return utils_1.default.interpolate(string, this.evalContext(data), options);
     }
     /**
      * Performs an evaluation using the evaluation context of this component.

package/lib/cjs/WebformBuilder.js

@@ -529,8 +529,8 @@ class WebformBuilder extends Component_1.default {
                     }
                     return elem;
                 };
-                const hideShow = (group, show) => {
-                    if (show) {
+                const hideShow = (group, forceShow, toggle = false) => {
+                    if (forceShow || (toggle && !Array.from(group.classList).includes('show'))) {
                         group.classList.add(['show']);
                         group.style.display = 'inherit';
                     }
@@ -552,7 +552,9 @@ class WebformBuilder extends Component_1.default {
                             const openByDefault = getAttribute(group, 'default') === 'true';
                             const groupId = group.getAttribute('id').slice('group-'.length);
                             const groupParent = getAttribute(group, 'parent').slice('#builder-sidebar-'.length);
-                            hideShow(group, ((openByDefault && groupParent === clickedId) || groupId === clickedParentId || groupIndex === index));
+                            if (((openByDefault && groupParent === clickedId) || groupId === clickedParentId || groupIndex === index)) {
+                                hideShow(group, false, true);
+                            }
                         });
                     }, true);
                 });
@@ -1206,6 +1208,7 @@ class WebformBuilder extends Component_1.default {
             submissionData = submissionData.componentJson || submissionData;
             if (submissionData.components && this.originalDefaultValue) {
                 submissionData.components = this.originalDefaultValue.components;
+                this.originalDefaultValue = null;
             }
             const fieldsToRemoveDoubleQuotes = ['label', 'tooltip'];
             this.replaceDoubleQuotes(submissionData, fieldsToRemoveDoubleQuotes);

package/lib/cjs/WizardBuilder.js

@@ -183,6 +183,10 @@ class WizardBuilder extends WebformBuilder_1.default {
         this.navigationDragula = null;
         super.detach();
     }
+    destroy(all = false) {
+        this.off('saveComponent');
+        super.destroy(all);
+    }
     rebuild() {
         var _a;
         const page = this.currentPage;

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

@@ -42,6 +42,7 @@ export default class FormComponent extends Component {
     everyComponent(...args: any[]): any;
     setSubFormDisabled(subForm: any): void;
     updateSubWizards(subForm: any): void;
+    setComponentsMap(): void;
     /**
      * Create a subform instance.
      * @param {boolean} [fromAttach] - This function is being called from an `attach` method.

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

@@ -315,6 +315,7 @@ class FormComponent extends Component_1.default {
                             }
                         }
                         postAttach();
+                        this.setComponentsMap();
                     });
                 }
                 postAttach();
@@ -395,6 +396,14 @@ class FormComponent extends Component_1.default {
             this.emit('subWizardsUpdated', subForm);
         }
     }
+    setComponentsMap() {
+        if (!this.subForm) {
+            return;
+        }
+        const componentsMap = this.componentsMap;
+        const formComponentsMap = this.subForm.componentsMap;
+        lodash_1.default.assign(componentsMap, formComponentsMap);
+    }
     /**
      * Create a subform instance.
      * @param {boolean} [fromAttach] - This function is being called from an `attach` method.
@@ -420,9 +429,6 @@ class FormComponent extends Component_1.default {
                 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 = (_a = this.subForm._form) === null || _a === void 0 ? void 0 : _a.components;
                 this.component.display = (_b = this.subForm._form) === null || _b === void 0 ? void 0 : _b.display;
                 this.subForm.on('change', () => {

package/lib/cjs/components/number/Number.js

@@ -91,10 +91,13 @@ class NumberComponent extends Input_1.default {
     }
     get defaultValue() {
         let defaultValue = super.defaultValue;
-        if (typeof defaultValue === 'string') {
+        if (typeof defaultValue === 'string' && defaultValue) {
             // Default value may be a string or have custom thousands separators or decimal symbols, so we need to call
             // parseNumber on it
             defaultValue = this.parseNumber(defaultValue);
+            if (lodash_1.default.isNaN(defaultValue)) {
+                defaultValue = null;
+            }
         }
         if (!defaultValue && this.component.defaultValue === 0) {
             defaultValue = this.component.defaultValue;

package/lib/cjs/formio.form.d.ts

@@ -23,4 +23,5 @@ import { Formio } from './Formio';
 import Licenses from './licenses';
 import EventEmitter from './EventEmitter';
 import Webform from './Webform';
-export { Components, Displays, Providers, Widgets, Templates, Utils, Form, Formio, Licenses, EventEmitter, Webform };
+import { DefaultEvaluator } from './utils';
+export { Components, Displays, Providers, Widgets, Templates, Utils, Form, Formio, Licenses, EventEmitter, Webform, DefaultEvaluator };

package/lib/cjs/formio.form.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.Webform = exports.EventEmitter = exports.Licenses = exports.Formio = exports.Form = exports.Utils = exports.Templates = exports.Widgets = exports.Providers = exports.Displays = exports.Components = exports.FormioCore = exports.useModule = exports.registerModule = void 0;
+exports.DefaultEvaluator = exports.Webform = exports.EventEmitter = exports.Licenses = exports.Formio = exports.Form = exports.Utils = exports.Templates = exports.Widgets = exports.Providers = exports.Displays = exports.Components = exports.FormioCore = exports.useModule = exports.registerModule = void 0;
 const lodash_1 = __importDefault(require("lodash"));
 const Formio_1 = require("./Formio");
 Object.defineProperty(exports, "Formio", { enumerable: true, get: function () { return Formio_1.Formio; } });
@@ -30,6 +30,7 @@ const Webform_1 = __importDefault(require("./Webform"));
 exports.Webform = Webform_1.default;
 const core_1 = require("@formio/core");
 const utils_2 = require("./utils");
+Object.defineProperty(exports, "DefaultEvaluator", { enumerable: true, get: function () { return utils_2.DefaultEvaluator; } });
 Formio_1.Formio.loadModules = (path = `${Formio_1.Formio.getApiUrl()}/externalModules.js`, name = 'externalModules') => {
     Formio_1.Formio.requireLibrary(name, name, path, true)
         .then((modules) => {

package/lib/cjs/utils/index.d.ts

@@ -2,7 +2,7 @@ export * from "./utils";
 export * from "./formUtils";
 export default FormioUtils;
 declare const FormioUtils: {
-    Evaluator: import("./Evaluator").DefaultEvaluator;
+    Evaluator: DefaultEvaluator;
     interpolate: typeof interpolate;
     ConditionOperators: {
         [x: string]: typeof import("./conditionOperators/IsEqualTo").default | typeof import("./conditionOperators/DateGreaterThan").default;
@@ -164,7 +164,8 @@ declare const FormioUtils: {
     interpolateErrors: (component: Component, errors: FieldError[], interpolateFn: Function) => [];
 };
 import { Evaluator } from './Evaluator';
+import { DefaultEvaluator } from './Evaluator';
 import { registerEvaluator } from './Evaluator';
 import { interpolate } from './Evaluator';
 import moment from 'moment';
-export { FormioUtils as Utils, Evaluator, registerEvaluator };
+export { FormioUtils as Utils, Evaluator, DefaultEvaluator, registerEvaluator };

package/lib/cjs/utils/index.js

@@ -29,12 +29,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.registerEvaluator = exports.Evaluator = exports.Utils = void 0;
+exports.registerEvaluator = exports.DefaultEvaluator = exports.Evaluator = exports.Utils = void 0;
 const utils = __importStar(require("./utils"));
 const formUtils = __importStar(require("./formUtils"));
 const Evaluator_1 = require("./Evaluator");
 Object.defineProperty(exports, "Evaluator", { enumerable: true, get: function () { return Evaluator_1.Evaluator; } });
 Object.defineProperty(exports, "registerEvaluator", { enumerable: true, get: function () { return Evaluator_1.registerEvaluator; } });
+Object.defineProperty(exports, "DefaultEvaluator", { enumerable: true, get: function () { return Evaluator_1.DefaultEvaluator; } });
 const conditionOperators_1 = __importDefault(require("./conditionOperators"));
 const lodash_1 = __importDefault(require("lodash"));
 const moment_1 = __importDefault(require("moment"));

package/lib/mjs/Element.js

@@ -525,9 +525,9 @@ export default class Element {
         if (this.component.filter === string && !this.options.building) {
             const evalContext = this.evalContext(data);
             evalContext.data = _.mapValues(evalContext.data, (val) => _.isString(val) ? encodeURIComponent(val) : val);
-            return FormioUtils.Evaluator.interpolate(string, evalContext, options);
+            return FormioUtils.interpolate(string, evalContext, options);
         }
-        return FormioUtils.Evaluator.interpolate(string, this.evalContext(data), options);
+        return FormioUtils.interpolate(string, this.evalContext(data), options);
     }
     /**
      * Performs an evaluation using the evaluation context of this component.

package/lib/mjs/WebformBuilder.js

@@ -515,8 +515,8 @@ export default class WebformBuilder extends Component {
                     }
                     return elem;
                 };
-                const hideShow = (group, show) => {
-                    if (show) {
+                const hideShow = (group, forceShow, toggle = false) => {
+                    if (forceShow || (toggle && !Array.from(group.classList).includes('show'))) {
                         group.classList.add(['show']);
                         group.style.display = 'inherit';
                     }
@@ -538,7 +538,9 @@ export default class WebformBuilder extends Component {
                             const openByDefault = getAttribute(group, 'default') === 'true';
                             const groupId = group.getAttribute('id').slice('group-'.length);
                             const groupParent = getAttribute(group, 'parent').slice('#builder-sidebar-'.length);
-                            hideShow(group, ((openByDefault && groupParent === clickedId) || groupId === clickedParentId || groupIndex === index));
+                            if (((openByDefault && groupParent === clickedId) || groupId === clickedParentId || groupIndex === index)) {
+                                hideShow(group, false, true);
+                            }
                         });
                     }, true);
                 });
@@ -1188,6 +1190,7 @@ export default class WebformBuilder extends Component {
             submissionData = submissionData.componentJson || submissionData;
             if (submissionData.components && this.originalDefaultValue) {
                 submissionData.components = this.originalDefaultValue.components;
+                this.originalDefaultValue = null;
             }
             const fieldsToRemoveDoubleQuotes = ['label', 'tooltip'];
             this.replaceDoubleQuotes(submissionData, fieldsToRemoveDoubleQuotes);

package/lib/mjs/WizardBuilder.js

@@ -178,6 +178,10 @@ export default class WizardBuilder extends WebformBuilder {
         this.navigationDragula = null;
         super.detach();
     }
+    destroy(all = false) {
+        this.off('saveComponent');
+        super.destroy(all);
+    }
     rebuild() {
         const page = this.currentPage;
         this.webform.setForm({

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

@@ -42,6 +42,7 @@ export default class FormComponent extends Component {
     everyComponent(...args: any[]): any;
     setSubFormDisabled(subForm: any): void;
     updateSubWizards(subForm: any): void;
+    setComponentsMap(): void;
     /**
      * Create a subform instance.
      * @param {boolean} [fromAttach] - This function is being called from an `attach` method.

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

@@ -311,6 +311,7 @@ export default class FormComponent extends Component {
                             }
                         }
                         postAttach();
+                        this.setComponentsMap();
                     });
                 }
                 postAttach();
@@ -389,6 +390,14 @@ export default class FormComponent extends Component {
             this.emit('subWizardsUpdated', subForm);
         }
     }
+    setComponentsMap() {
+        if (!this.subForm) {
+            return;
+        }
+        const componentsMap = this.componentsMap;
+        const formComponentsMap = this.subForm.componentsMap;
+        _.assign(componentsMap, formComponentsMap);
+    }
     /**
      * Create a subform instance.
      * @param {boolean} [fromAttach] - This function is being called from an `attach` method.
@@ -413,9 +422,6 @@ export default class FormComponent extends Component {
                 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._form?.components;
                 this.component.display = this.subForm._form?.display;
                 this.subForm.on('change', () => {

package/lib/mjs/components/number/Number.js

@@ -89,10 +89,13 @@ export default class NumberComponent extends Input {
     }
     get defaultValue() {
         let defaultValue = super.defaultValue;
-        if (typeof defaultValue === 'string') {
+        if (typeof defaultValue === 'string' && defaultValue) {
             // Default value may be a string or have custom thousands separators or decimal symbols, so we need to call
             // parseNumber on it
             defaultValue = this.parseNumber(defaultValue);
+            if (_.isNaN(defaultValue)) {
+                defaultValue = null;
+            }
         }
         if (!defaultValue && this.component.defaultValue === 0) {
             defaultValue = this.component.defaultValue;

package/lib/mjs/formio.form.d.ts

@@ -23,4 +23,5 @@ import { Formio } from './Formio';
 import Licenses from './licenses';
 import EventEmitter from './EventEmitter';
 import Webform from './Webform';
-export { Components, Displays, Providers, Widgets, Templates, Utils, Form, Formio, Licenses, EventEmitter, Webform };
+import { DefaultEvaluator } from './utils';
+export { Components, Displays, Providers, Widgets, Templates, Utils, Form, Formio, Licenses, EventEmitter, Webform, DefaultEvaluator };

package/lib/mjs/formio.form.js

@@ -12,7 +12,7 @@ import Licenses from './licenses';
 import EventEmitter from './EventEmitter';
 import Webform from './Webform';
 import { I18n } from '@formio/core';
-import { Evaluator, registerEvaluator } from './utils';
+import { Evaluator, registerEvaluator, DefaultEvaluator } from './utils';
 Formio.loadModules = (path = `${Formio.getApiUrl()}/externalModules.js`, name = 'externalModules') => {
     Formio.requireLibrary(name, name, path, true)
         .then((modules) => {
@@ -130,4 +130,4 @@ export function useModule(defaultFn = null) {
 Formio.use = useModule();
 export { Formio as FormioCore } from './Formio';
 // Export the components.
-export { Components, Displays, Providers, Widgets, Templates, Utils, Form, Formio, Licenses, EventEmitter, Webform };
+export { Components, Displays, Providers, Widgets, Templates, Utils, Form, Formio, Licenses, EventEmitter, Webform, DefaultEvaluator };

package/lib/mjs/utils/index.d.ts

@@ -2,7 +2,7 @@ export * from "./utils";
 export * from "./formUtils";
 export default FormioUtils;
 declare const FormioUtils: {
-    Evaluator: import("./Evaluator").DefaultEvaluator;
+    Evaluator: DefaultEvaluator;
     interpolate: typeof interpolate;
     ConditionOperators: {
         [x: string]: typeof import("./conditionOperators/IsEqualTo").default | typeof import("./conditionOperators/DateGreaterThan").default;
@@ -164,7 +164,8 @@ declare const FormioUtils: {
     interpolateErrors: (component: Component, errors: FieldError[], interpolateFn: Function) => [];
 };
 import { Evaluator } from './Evaluator';
+import { DefaultEvaluator } from './Evaluator';
 import { registerEvaluator } from './Evaluator';
 import { interpolate } from './Evaluator';
 import moment from 'moment';
-export { FormioUtils as Utils, Evaluator, registerEvaluator };
+export { FormioUtils as Utils, Evaluator, DefaultEvaluator, registerEvaluator };

package/lib/mjs/utils/index.js

@@ -1,6 +1,6 @@
 import * as utils from './utils';
 import * as formUtils from './formUtils';
-import { Evaluator, registerEvaluator, interpolate } from './Evaluator';
+import { Evaluator, registerEvaluator, interpolate, DefaultEvaluator } from './Evaluator';
 import ConditionOperators from './conditionOperators';
 import _ from 'lodash';
 import moment from 'moment';
@@ -17,7 +17,7 @@ if (typeof global === 'object') {
     global.FormioUtils = FormioUtils;
 }
 export { FormioUtils as Utils };
-export { Evaluator, registerEvaluator };
+export { Evaluator, DefaultEvaluator, registerEvaluator };
 export * from './utils';
 export * from './formUtils';
 export default FormioUtils;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@formio/js",
-  "version": "5.1.0-dev.6218.dde7b07",
+  "version": "5.1.0-dev.6221.d976115",
   "description": "JavaScript powered Forms with JSON Form Builder",
   "main": "lib/cjs/index.js",
   "exports": {