@formio/js 5.1.0-dev.6046.0d30acf → 5.1.0-dev.6048.569bfc1

package/lib/cjs/components/_classes/component/Component.d.ts

@@ -129,6 +129,16 @@ declare class Component extends Element {
      * The reference attribute name for this component
      */
     _referenceAttributeName: string;
+    /**
+     * Sometimes the customDefaultValue does not set the "value" within the script, but is just a script to execute. This
+     * flag is used to determine if the customDefaultValue should be used to set the value of the component or not based on
+     * if there is a "value=" within the script.
+     */
+    shouldSetCustomDefault: any;
+    /**
+     * Same as customDefaultValue, but for calculateValue.
+     */
+    shouldSetCalculatedValue: any;
     triggerChange: (...args: any[]) => any;
     /**
      * Used to trigger a redraw event within this component.
@@ -778,6 +788,10 @@ declare class Component extends Element {
      * @returns {void}
      */
     setElementInvalid(element: HTMLElement, invalid: boolean): void;
+    /**
+     * Clear any conditionally hidden components for this component only.
+     */
+    clearComponentOnHide(): void;
     /**
      * Clears the components data if it is conditionally hidden AND clearOnHide is set to true for this component.
      */

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

@@ -361,6 +361,22 @@ class Component extends Element_1.default {
          * The reference attribute name for this component
          */
         this._referenceAttributeName = 'ref';
+        /**
+         * Sometimes the customDefaultValue does not set the "value" within the script, but is just a script to execute. This
+         * flag is used to determine if the customDefaultValue should be used to set the value of the component or not based on
+         * if there is a "value=" within the script.
+         */
+        this.shouldSetCustomDefault = true;
+        if (this.component.customDefaultValue && (typeof this.component.customDefaultValue === 'string')) {
+            this.shouldSetCustomDefault = this.component.customDefaultValue.match(/value\s*=/);
+        }
+        /**
+         * Same as customDefaultValue, but for calculateValue.
+         */
+        this.shouldSetCalculatedValue = true;
+        if (this.component.calculateValue && (typeof this.component.calculateValue === 'string')) {
+            this.shouldSetCalculatedValue = this.component.calculateValue.match(/value\s*=/);
+        }
         /**
          * Used to trigger a new change in this component.
          * @type {Function} - Call to trigger a change in this component.
@@ -1954,7 +1970,7 @@ class Component extends Element_1.default {
         if (this.visible !== visible) {
             this.visible = visible;
         }
-        this.clearOnHide();
+        this.clearComponentOnHide();
         return visible;
     }
     /**
@@ -2214,16 +2230,11 @@ class Component extends Element_1.default {
         element.setAttribute('aria-invalid', invalid ? 'true' : 'false');
     }
     /**
-     * Clears the components data if it is conditionally hidden AND clearOnHide is set to true for this component.
+     * Clear any conditionally hidden components for this component only.
      */
-    clearOnHide() {
+    clearComponentOnHide() {
         // clearOnHide defaults to true for old forms (without the value set) so only trigger if the value is false.
-        if (
-        // if change happens inside EditGrid's row, it doesn't trigger change on the root level, so rootPristine will be true
-        (!this.rootPristine || this.options.server || (0, utils_1.isInsideScopingComponent)(this)) &&
-            this.component.clearOnHide !== false &&
-            !this.options.readOnly &&
-            !this.options.showHiddenFields) {
+        if (this.component.clearOnHide !== false && !this.options.readOnly && !this.options.showHiddenFields) {
             if (this.conditionallyHidden()) {
                 this.deleteValue();
             }
@@ -2235,6 +2246,12 @@ class Component extends Element_1.default {
             }
         }
     }
+    /**
+     * Clears the components data if it is conditionally hidden AND clearOnHide is set to true for this component.
+     */
+    clearOnHide() {
+        this.clearComponentOnHide();
+    }
     /**
      * Triggers a debounced onChange event for the root component (usually Webform).
      * @param {...any} args - The arguments to pass to the onChange event.
@@ -2535,7 +2552,10 @@ class Component extends Element_1.default {
     }
     getCustomDefaultValue(defaultValue) {
         if (this.component.customDefaultValue && !this.options.preview) {
-            defaultValue = this.evaluate(this.component.customDefaultValue, { value: '' }, 'value');
+            const customDefaultValue = this.evaluate(this.component.customDefaultValue, { value: '' }, 'value');
+            if (this.shouldSetCustomDefault) {
+                defaultValue = customDefaultValue;
+            }
         }
         return defaultValue;
     }
@@ -2795,7 +2815,7 @@ class Component extends Element_1.default {
     }
     doValueCalculation(dataValue, data, row) {
         var _a;
-        return this.evaluate(this.component.calculateValue, {
+        const calculatedValue = this.evaluate(this.component.calculateValue, {
             value: dataValue,
             data,
             row: row || this.data,
@@ -2803,6 +2823,10 @@ class Component extends Element_1.default {
                 data: this.rootValue
             }
         }, 'value');
+        if (this.shouldSetCalculatedValue) {
+            return calculatedValue;
+        }
+        return dataValue;
     }
     /* eslint-disable max-statements */
     calculateComponentValue(data, flags, row) {

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

@@ -181,7 +181,6 @@ export default class NestedComponent extends Field {
     checkData(data: any, flags: any, row: any, components: any): true | undefined;
     checkConditions(data: any, flags: any, row: any): boolean;
     clearOnHide(show: any): void;
-    restoreComponentsContext(): void;
     /**
      * Allow components to hook into the next page trigger to perform their own logic.
      * @param {Function} next - The callback to continue to the next page.

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

@@ -631,19 +631,8 @@ class NestedComponent extends Field_1.default {
     }
     clearOnHide(show) {
         super.clearOnHide(show);
-        if (this.component.clearOnHide) {
-            if (this.allowData && !this.hasValue() && !this.conditionallyHidden()) {
-                this.dataValue = this.defaultValue;
-            }
-            if (this.hasValue()) {
-                this.restoreComponentsContext();
-            }
-        }
         this.getComponents().forEach(component => component.clearOnHide(show));
     }
-    restoreComponentsContext() {
-        this.getComponents().forEach((component) => component.data = this.dataValue);
-    }
     /**
      * Allow components to hook into the next page trigger to perform their own logic.
      * @param {Function} next - The callback to continue to the next page.

package/lib/cjs/components/address/Address.d.ts

@@ -36,6 +36,7 @@ export default class AddressComponent extends ContainerComponent {
     get autocompleteMode(): boolean;
     get manualMode(): boolean;
     get manualModeEnabled(): boolean;
+    restoreComponentsContext(): void;
     get isMultiple(): boolean;
     set address(value: any);
     get address(): any;

package/lib/cjs/components/datagrid/DataGrid.js

@@ -613,9 +613,6 @@ class DataGridComponent extends NestedArrayComponent_1.default {
         this.updateOnChange(flags, changed);
         return changed;
     }
-    restoreComponentsContext() {
-        this.rows.forEach((row, index) => lodash_1.default.forIn(row, (component) => component.data = this.dataValue[index]));
-    }
     toggleGroup(element, index) {
         element.classList.toggle('collapsed');
         lodash_1.default.each(this.refs.chunks[index], row => {

package/lib/cjs/components/editgrid/EditGrid.js

@@ -553,14 +553,6 @@ class EditGridComponent extends NestedArrayComponent_1.default {
             }
         });
     }
-    restoreComponentsContext() {
-        this.getComponents().forEach((component) => {
-            var _a;
-            const rowData = this.dataValue[component.rowIndex];
-            const editRowData = (_a = this.editRows[component.rowIndex]) === null || _a === void 0 ? void 0 : _a.data;
-            component.data = rowData || editRowData;
-        });
-    }
     flattenComponents(rowIndex) {
         const result = {};
         this.everyComponent((component) => {

package/lib/cjs/components/select/editForm/Select.edit.data.js

@@ -208,7 +208,7 @@ exports.default = [
         label: 'Value Property',
         key: 'valueProperty',
         skipMerge: true,
-        clearOnHide: true,
+        clearOnHide: false,
         tooltip: 'The field to use as the value.',
         weight: 11,
         refreshOn: 'data.resource',

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

@@ -478,14 +478,6 @@ export function getDataParentComponent(componentInstance: Component): Component
  * @returns {boolean} - TRUE if the value is a promise; FALSE otherwise
  */
 export function isPromise(value: any): boolean;
-/**
- * Determines if the component has a scoping parent in tree (a component which scopes its children and manages its
- * changes by itself, e.g. EditGrid)
- * @param {Component} componentInstance - The component to check for the scoping parent.
- * @param {boolean} firstPass - Whether it is the first pass of the function
- * @returns {boolean|*} - TRUE if the component has a scoping parent; FALSE otherwise
- */
-export function isInsideScopingComponent(componentInstance: Component, firstPass?: boolean): boolean | any;
 /**
  * Returns all the focusable elements within the provided dom element.
  * @param {HTMLElement} element - The element to get the focusable elements from.

package/lib/cjs/utils/utils.js

@@ -19,7 +19,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.firstNonNil = exports.unfold = exports.bootstrapVersion = exports.uniqueKey = exports.iterateKey = exports.delay = exports.fieldData = exports.getCurrencyAffixes = exports.getNumberDecimalLimit = exports.getNumberSeparators = exports.matchInputMask = exports.unmaskValue = exports.getInputMask = exports.convertFormatToMask = exports.convertFormatToMoment = exports.convertFormatToFlatpickr = exports.getLocaleDateFormatInfo = exports.formatOffset = exports.formatDate = exports.momentDate = exports.loadZones = exports.shouldLoadZones = exports.zonesLoaded = exports.offsetDate = exports.currentTimezone = exports.isValidDate = exports.getDateSetting = exports.guid = exports.uniqueName = exports.convertStringToHTMLElement = exports.unescapeHTML = exports.removeHTML = exports.setActionProperty = exports.checkTrigger = exports.checkCondition = exports.checkJsonConditional = exports.checkCustomConditional = exports.getComponentActualValue = exports.checkSimpleConditional = exports.checkCalculated = exports.isMongoId = exports.boolValue = exports.getScriptPlugin = exports.getElementRect = exports.getPropertyValue = exports.getRandomComponentId = exports.evaluate = exports.moment = exports.ConditionOperators = exports.jsonLogic = void 0;
-exports.interpolateErrors = exports.getComponentSavedTypes = exports.componentValueTypes = exports._ = exports.getFocusableElements = exports.isInsideScopingComponent = exports.isPromise = exports.getDataParentComponent = exports.getComponentPath = exports.getComponentPathWithoutIndicies = exports.getBrowserInfo = exports.getIEBrowserVersion = exports.round = exports.getStringFromComponentPath = exports.isChildOf = exports.getArrayFromComponentPath = exports.isInputComponent = exports.interpolate = exports.Evaluator = exports.fastCloneDeep = exports.sanitize = exports.translateHTMLTemplate = exports.getContextButtons = exports.getContextComponents = exports.observeOverload = exports.withSwitch = void 0;
+exports.interpolateErrors = exports.getComponentSavedTypes = exports.componentValueTypes = exports._ = exports.getFocusableElements = exports.isPromise = exports.getDataParentComponent = exports.getComponentPath = exports.getComponentPathWithoutIndicies = exports.getBrowserInfo = exports.getIEBrowserVersion = exports.round = exports.getStringFromComponentPath = exports.isChildOf = exports.getArrayFromComponentPath = exports.isInputComponent = exports.interpolate = exports.Evaluator = exports.fastCloneDeep = exports.sanitize = exports.translateHTMLTemplate = exports.getContextButtons = exports.getContextComponents = exports.observeOverload = exports.withSwitch = void 0;
 const lodash_1 = __importDefault(require("lodash"));
 exports._ = lodash_1.default;
 const json_logic_js_1 = __importDefault(require("json-logic-js"));
@@ -1593,27 +1593,6 @@ function isPromise(value) {
         && Object.prototype.toString.call(value) === '[object Promise]';
 }
 exports.isPromise = isPromise;
-/**
- * Determines if the component has a scoping parent in tree (a component which scopes its children and manages its
- * changes by itself, e.g. EditGrid)
- * @param {Component} componentInstance - The component to check for the scoping parent.
- * @param {boolean} firstPass - Whether it is the first pass of the function
- * @returns {boolean|*} - TRUE if the component has a scoping parent; FALSE otherwise
- */
-function isInsideScopingComponent(componentInstance, firstPass = true) {
-    if (!firstPass && (componentInstance === null || componentInstance === void 0 ? void 0 : componentInstance.hasScopedChildren)) {
-        return true;
-    }
-    const dataParent = getDataParentComponent(componentInstance);
-    if (dataParent === null || dataParent === void 0 ? void 0 : dataParent.hasScopedChildren) {
-        return true;
-    }
-    else if (dataParent === null || dataParent === void 0 ? void 0 : dataParent.parent) {
-        return isInsideScopingComponent(dataParent.parent, false);
-    }
-    return false;
-}
-exports.isInsideScopingComponent = isInsideScopingComponent;
 /**
  * Returns all the focusable elements within the provided dom element.
  * @param {HTMLElement} element - The element to get the focusable elements from.

package/lib/mjs/components/_classes/component/Component.d.ts

@@ -129,6 +129,16 @@ declare class Component extends Element {
      * The reference attribute name for this component
      */
     _referenceAttributeName: string;
+    /**
+     * Sometimes the customDefaultValue does not set the "value" within the script, but is just a script to execute. This
+     * flag is used to determine if the customDefaultValue should be used to set the value of the component or not based on
+     * if there is a "value=" within the script.
+     */
+    shouldSetCustomDefault: any;
+    /**
+     * Same as customDefaultValue, but for calculateValue.
+     */
+    shouldSetCalculatedValue: any;
     triggerChange: (...args: any[]) => any;
     /**
      * Used to trigger a redraw event within this component.
@@ -778,6 +788,10 @@ declare class Component extends Element {
      * @returns {void}
      */
     setElementInvalid(element: HTMLElement, invalid: boolean): void;
+    /**
+     * Clear any conditionally hidden components for this component only.
+     */
+    clearComponentOnHide(): void;
     /**
      * Clears the components data if it is conditionally hidden AND clearOnHide is set to true for this component.
      */

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

@@ -6,7 +6,7 @@ import isMobile from 'ismobilejs';
 import { processOne, processOneSync, validateProcessInfo } from '@formio/core/process';
 import { Formio } from '../../../Formio';
 import * as FormioUtils from '../../../utils/utils';
-import { fastCloneDeep, boolValue, isInsideScopingComponent, currentTimezone, getScriptPlugin, getContextualRowData } from '../../../utils/utils';
+import { fastCloneDeep, boolValue, currentTimezone, getScriptPlugin, getContextualRowData } from '../../../utils/utils';
 import Element from '../../../Element';
 import ComponentModal from '../componentModal/ComponentModal';
 import Widgets from '../../../widgets';
@@ -326,6 +326,22 @@ export default class Component extends Element {
          * The reference attribute name for this component
          */
         this._referenceAttributeName = 'ref';
+        /**
+         * Sometimes the customDefaultValue does not set the "value" within the script, but is just a script to execute. This
+         * flag is used to determine if the customDefaultValue should be used to set the value of the component or not based on
+         * if there is a "value=" within the script.
+         */
+        this.shouldSetCustomDefault = true;
+        if (this.component.customDefaultValue && (typeof this.component.customDefaultValue === 'string')) {
+            this.shouldSetCustomDefault = this.component.customDefaultValue.match(/value\s*=/);
+        }
+        /**
+         * Same as customDefaultValue, but for calculateValue.
+         */
+        this.shouldSetCalculatedValue = true;
+        if (this.component.calculateValue && (typeof this.component.calculateValue === 'string')) {
+            this.shouldSetCalculatedValue = this.component.calculateValue.match(/value\s*=/);
+        }
         /**
          * Used to trigger a new change in this component.
          * @type {Function} - Call to trigger a change in this component.
@@ -1920,7 +1936,7 @@ export default class Component extends Element {
         if (this.visible !== visible) {
             this.visible = visible;
         }
-        this.clearOnHide();
+        this.clearComponentOnHide();
         return visible;
     }
     /**
@@ -2180,16 +2196,11 @@ export default class Component extends Element {
         element.setAttribute('aria-invalid', invalid ? 'true' : 'false');
     }
     /**
-     * Clears the components data if it is conditionally hidden AND clearOnHide is set to true for this component.
+     * Clear any conditionally hidden components for this component only.
      */
-    clearOnHide() {
+    clearComponentOnHide() {
         // clearOnHide defaults to true for old forms (without the value set) so only trigger if the value is false.
-        if (
-        // if change happens inside EditGrid's row, it doesn't trigger change on the root level, so rootPristine will be true
-        (!this.rootPristine || this.options.server || isInsideScopingComponent(this)) &&
-            this.component.clearOnHide !== false &&
-            !this.options.readOnly &&
-            !this.options.showHiddenFields) {
+        if (this.component.clearOnHide !== false && !this.options.readOnly && !this.options.showHiddenFields) {
             if (this.conditionallyHidden()) {
                 this.deleteValue();
             }
@@ -2201,6 +2212,12 @@ export default class Component extends Element {
             }
         }
     }
+    /**
+     * Clears the components data if it is conditionally hidden AND clearOnHide is set to true for this component.
+     */
+    clearOnHide() {
+        this.clearComponentOnHide();
+    }
     /**
      * Triggers a debounced onChange event for the root component (usually Webform).
      * @param {...any} args - The arguments to pass to the onChange event.
@@ -2504,7 +2521,10 @@ export default class Component extends Element {
     }
     getCustomDefaultValue(defaultValue) {
         if (this.component.customDefaultValue && !this.options.preview) {
-            defaultValue = this.evaluate(this.component.customDefaultValue, { value: '' }, 'value');
+            const customDefaultValue = this.evaluate(this.component.customDefaultValue, { value: '' }, 'value');
+            if (this.shouldSetCustomDefault) {
+                defaultValue = customDefaultValue;
+            }
         }
         return defaultValue;
     }
@@ -2763,7 +2783,7 @@ export default class Component extends Element {
         return value;
     }
     doValueCalculation(dataValue, data, row) {
-        return this.evaluate(this.component.calculateValue, {
+        const calculatedValue = this.evaluate(this.component.calculateValue, {
             value: dataValue,
             data,
             row: row || this.data,
@@ -2771,6 +2791,10 @@ export default class Component extends Element {
                 data: this.rootValue
             }
         }, 'value');
+        if (this.shouldSetCalculatedValue) {
+            return calculatedValue;
+        }
+        return dataValue;
     }
     /* eslint-disable max-statements */
     calculateComponentValue(data, flags, row) {

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

@@ -181,7 +181,6 @@ export default class NestedComponent extends Field {
     checkData(data: any, flags: any, row: any, components: any): true | undefined;
     checkConditions(data: any, flags: any, row: any): boolean;
     clearOnHide(show: any): void;
-    restoreComponentsContext(): void;
     /**
      * Allow components to hook into the next page trigger to perform their own logic.
      * @param {Function} next - The callback to continue to the next page.

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

@@ -627,19 +627,8 @@ export default class NestedComponent extends Field {
     }
     clearOnHide(show) {
         super.clearOnHide(show);
-        if (this.component.clearOnHide) {
-            if (this.allowData && !this.hasValue() && !this.conditionallyHidden()) {
-                this.dataValue = this.defaultValue;
-            }
-            if (this.hasValue()) {
-                this.restoreComponentsContext();
-            }
-        }
         this.getComponents().forEach(component => component.clearOnHide(show));
     }
-    restoreComponentsContext() {
-        this.getComponents().forEach((component) => component.data = this.dataValue);
-    }
     /**
      * Allow components to hook into the next page trigger to perform their own logic.
      * @param {Function} next - The callback to continue to the next page.

package/lib/mjs/components/address/Address.d.ts

@@ -36,6 +36,7 @@ export default class AddressComponent extends ContainerComponent {
     get autocompleteMode(): boolean;
     get manualMode(): boolean;
     get manualModeEnabled(): boolean;
+    restoreComponentsContext(): void;
     get isMultiple(): boolean;
     set address(value: any);
     get address(): any;

package/lib/mjs/components/datagrid/DataGrid.js

@@ -609,9 +609,6 @@ export default class DataGridComponent extends NestedArrayComponent {
         this.updateOnChange(flags, changed);
         return changed;
     }
-    restoreComponentsContext() {
-        this.rows.forEach((row, index) => _.forIn(row, (component) => component.data = this.dataValue[index]));
-    }
     toggleGroup(element, index) {
         element.classList.toggle('collapsed');
         _.each(this.refs.chunks[index], row => {

package/lib/mjs/components/editgrid/EditGrid.js

@@ -546,13 +546,6 @@ export default class EditGridComponent extends NestedArrayComponent {
             }
         });
     }
-    restoreComponentsContext() {
-        this.getComponents().forEach((component) => {
-            const rowData = this.dataValue[component.rowIndex];
-            const editRowData = this.editRows[component.rowIndex]?.data;
-            component.data = rowData || editRowData;
-        });
-    }
     flattenComponents(rowIndex) {
         const result = {};
         this.everyComponent((component) => {

package/lib/mjs/components/select/editForm/Select.edit.data.js

@@ -202,7 +202,7 @@ export default [
         label: 'Value Property',
         key: 'valueProperty',
         skipMerge: true,
-        clearOnHide: true,
+        clearOnHide: false,
         tooltip: 'The field to use as the value.',
         weight: 11,
         refreshOn: 'data.resource',

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

@@ -478,14 +478,6 @@ export function getDataParentComponent(componentInstance: Component): Component
  * @returns {boolean} - TRUE if the value is a promise; FALSE otherwise
  */
 export function isPromise(value: any): boolean;
-/**
- * Determines if the component has a scoping parent in tree (a component which scopes its children and manages its
- * changes by itself, e.g. EditGrid)
- * @param {Component} componentInstance - The component to check for the scoping parent.
- * @param {boolean} firstPass - Whether it is the first pass of the function
- * @returns {boolean|*} - TRUE if the component has a scoping parent; FALSE otherwise
- */
-export function isInsideScopingComponent(componentInstance: Component, firstPass?: boolean): boolean | any;
 /**
  * Returns all the focusable elements within the provided dom element.
  * @param {HTMLElement} element - The element to get the focusable elements from.

package/lib/mjs/utils/utils.js

@@ -1502,26 +1502,6 @@ export function isPromise(value) {
         && typeof value.then === 'function'
         && Object.prototype.toString.call(value) === '[object Promise]';
 }
-/**
- * Determines if the component has a scoping parent in tree (a component which scopes its children and manages its
- * changes by itself, e.g. EditGrid)
- * @param {Component} componentInstance - The component to check for the scoping parent.
- * @param {boolean} firstPass - Whether it is the first pass of the function
- * @returns {boolean|*} - TRUE if the component has a scoping parent; FALSE otherwise
- */
-export function isInsideScopingComponent(componentInstance, firstPass = true) {
-    if (!firstPass && componentInstance?.hasScopedChildren) {
-        return true;
-    }
-    const dataParent = getDataParentComponent(componentInstance);
-    if (dataParent?.hasScopedChildren) {
-        return true;
-    }
-    else if (dataParent?.parent) {
-        return isInsideScopingComponent(dataParent.parent, false);
-    }
-    return false;
-}
 /**
  * Returns all the focusable elements within the provided dom element.
  * @param {HTMLElement} element - The element to get the focusable elements from.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@formio/js",
-  "version": "5.1.0-dev.6046.0d30acf",
+  "version": "5.1.0-dev.6048.569bfc1",
   "description": "JavaScript powered Forms with JSON Form Builder",
   "main": "lib/cjs/index.js",
   "exports": {