@formio/js 5.1.0-dev.6040.debc859 → 5.1.0-dev.6044.20a9acc

package/lib/cjs/WebformBuilder.js

@@ -1623,7 +1623,7 @@ class WebformBuilder extends Component_1.default {
             info.type);
     }
     hasEditTabs(type) {
-        const editTabs = (0, formUtils_1.getComponent)(Components_1.default.components[type].editForm().components, 'tabs', true).components;
+        const editTabs = (0, formUtils_1.getComponent)(Components_1.default.components[type === 'custom' ? 'unknown' : type].editForm().components, 'tabs', true).components;
         const hiddenEditTabs = lodash_1.default.filter(lodash_1.default.get(this.options, `editForm.${type}`, []), 'ignore');
         return lodash_1.default.intersectionBy(editTabs, hiddenEditTabs, 'key').length !== editTabs.length;
     }

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

@@ -119,13 +119,6 @@ declare class Component extends Element {
      */
     paths: import('@formio/core').ComponentPaths;
     _path: string;
-    /**
-     * Determines if this component is conditionally hidden. Should generally not be set outside of conditional logic pipeline.
-     * This is necessary because of clearOnHide behavior that only clears when conditionally hidden - we need to track
-     * conditionallyHidden separately from "regular" visibility.
-     */
-    _parentConditionallyHidden: any;
-    _conditionallyHidden: any;
     /**
      * Determines if this component is visible, or not.
      */
@@ -170,6 +163,7 @@ declare class Component extends Element {
      */
     info: any;
     get componentsMap(): object;
+    parentConditionallyHidden(): boolean;
     set data(value: any);
     get data(): any;
     mergeSchema(component?: {}): any;
@@ -231,14 +225,9 @@ declare class Component extends Element {
      * @returns {boolean} - Whether the component is visible or not.
      */
     get visible(): boolean;
-    get conditionallyHidden(): any;
-    /**
-     * Evaluates whether the component is conditionally hidden (as opposed to intentionally hidden, e.g. via the `hidden` component schema property).
-     * @param {object} data - The data object to evaluate the condition against.
-     * @param {object} row - The row object to evaluate the condition against.
-     * @returns {boolean} - Whether the component is conditionally hidden.
-     */
-    checkConditionallyHidden(data?: object, row?: object): boolean;
+    get logicallyHidden(): any;
+    _logicallyHidden: any;
+    conditionallyHidden(skipParent?: boolean): any;
     set currentForm(instance: any);
     get currentForm(): any;
     _currentForm: any;

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

@@ -351,18 +351,11 @@ class Component extends Element_1.default {
         this._path = '';
         // Needs for Nextgen Rules Engine
         this.resetCaches();
-        /**
-         * Determines if this component is conditionally hidden. Should generally not be set outside of conditional logic pipeline.
-         * This is necessary because of clearOnHide behavior that only clears when conditionally hidden - we need to track
-         * conditionallyHidden separately from "regular" visibility.
-         */
-        this._parentConditionallyHidden = this.options.hasOwnProperty('parentConditionallyHidden') ? this.options.parentConditionallyHidden : false;
-        this._conditionallyHidden = this.checkConditionallyHidden(null, data) || this._parentConditionallyHidden;
         /**
          * Determines if this component is visible, or not.
          */
         this._parentVisible = this.options.hasOwnProperty('parentVisible') ? this.options.parentVisible : true;
-        this._visible = this._parentVisible && (this.hasCondition() ? !this._conditionallyHidden : !this.component.hidden);
+        this._visible = this._parentVisible && (this.hasCondition() ? !this.conditionallyHidden() : !this.component.hidden);
         this._parentDisabled = false;
         /**
          * The reference attribute name for this component
@@ -431,7 +424,7 @@ class Component extends Element_1.default {
             if (this.allowData && this.key) {
                 this.options.name += `[${this.key}]`;
                 // If component is visible or not set to clear on hide, set the default value.
-                if (!(this.conditionallyHidden && this.component.clearOnHide)) {
+                if (!(this.conditionallyHidden() && this.component.clearOnHide)) {
                     if (!this.hasValue()) {
                         if (this.shouldAddDefaultValue) {
                             this.dataValue = this.defaultValue;
@@ -465,6 +458,16 @@ class Component extends Element_1.default {
         var _a;
         return ((_a = this.root) === null || _a === void 0 ? void 0 : _a.childComponentsMap) || {};
     }
+    parentConditionallyHidden() {
+        let currentParent = this.parent;
+        while (currentParent) {
+            if (currentParent.conditionallyHidden(true)) {
+                return true;
+            }
+            currentParent = currentParent.parent;
+        }
+        return false;
+    }
     get data() {
         return this._data;
     }
@@ -505,8 +508,7 @@ class Component extends Element_1.default {
     init() {
         var _a;
         this.disabled = this.shouldDisabled;
-        this._conditionallyHidden = this.checkConditionallyHidden();
-        this._visible = (this.hasCondition() ? !this.conditionallyHidden : !this.component.hidden);
+        this._visible = (this.hasCondition() ? !this.conditionallyHidden() : !this.component.hidden);
         if ((_a = this.component.addons) === null || _a === void 0 ? void 0 : _a.length) {
             this.component.addons.forEach((addon) => this.createAddon(addon));
         }
@@ -671,20 +673,17 @@ class Component extends Element_1.default {
         }
         return this._visible && this._parentVisible;
     }
-    get conditionallyHidden() {
-        return this._conditionallyHidden || this._parentConditionallyHidden;
+    get logicallyHidden() {
+        if (this._logicallyHidden && !this.component.hidden) {
+            this._logicallyHidden = false;
+        }
+        return this._logicallyHidden;
     }
-    /**
-     * Evaluates whether the component is conditionally hidden (as opposed to intentionally hidden, e.g. via the `hidden` component schema property).
-     * @param {object} data - The data object to evaluate the condition against.
-     * @param {object} row - The row object to evaluate the condition against.
-     * @returns {boolean} - Whether the component is conditionally hidden.
-     */
-    checkConditionallyHidden(data = null, row = null) {
+    conditionallyHidden(skipParent = false) {
         if (!this.hasCondition()) {
-            return false;
+            return this.logicallyHidden || (skipParent ? false : this.parentConditionallyHidden());
         }
-        return !this.conditionallyVisible(data, row);
+        return !this.conditionallyVisible() || this.logicallyHidden || (skipParent ? false : this.parentConditionallyHidden());
     }
     get currentForm() {
         return this._currentForm;
@@ -1852,7 +1851,7 @@ class Component extends Element_1.default {
     rebuild() {
         this.destroy();
         this.init();
-        this.visible = this.hasCondition() ? !this.conditionallyHidden : !this.component.hidden;
+        this.visible = this.hasCondition() ? !this.conditionallyHidden() : !this.component.hidden;
         return this.redraw();
     }
     /**
@@ -1950,23 +1949,12 @@ class Component extends Element_1.default {
         if (!this.builderMode & !this.previewMode && this.fieldLogic(data, row)) {
             this.redraw();
         }
-        // Check advanced conditions (and cache the result)
-        const isConditionallyHidden = this.checkConditionallyHidden(data, row) || this._parentConditionallyHidden;
-        let shouldClear = false;
-        if (isConditionallyHidden !== this._conditionallyHidden) {
-            this._conditionallyHidden = isConditionallyHidden;
-            shouldClear = true;
-        }
         // Check visibility
-        const visible = (this.hasCondition() ? !this.conditionallyHidden : !this.component.hidden);
+        const visible = (this.hasCondition() ? !this.conditionallyHidden() : !this.component.hidden);
         if (this.visible !== visible) {
             this.visible = visible;
         }
-        // Wait for visibility to update for nested components, so the component state is up-to-date when
-        // calling clearOnHide
-        if (shouldClear) {
-            this.clearOnHide();
-        }
+        this.clearOnHide();
         return visible;
     }
     /**
@@ -2075,9 +2063,9 @@ class Component extends Element_1.default {
                     if (!lodash_1.default.isEqual(lodash_1.default.get(this.component, property), lodash_1.default.get(newComponent, property))) {
                         // Advanced Logic can modify the component's hidden property; because we track conditionally hidden state
                         // separately from the component's hidden property, and technically this Advanced Logic conditionally hides
-                        // a component, we need to set _conditionallyHidden to the new value
+                        // a component, we need to set a temporary variable to the new value
                         if (property === 'hidden') {
-                            this._conditionallyHidden = newComponent.hidden;
+                            this._logicallyHidden = newComponent.hidden;
                         }
                         changed = true;
                     }
@@ -2092,7 +2080,7 @@ class Component extends Element_1.default {
                         component: newComponent,
                         result,
                     });
-                    if (!lodash_1.default.isEqual(oldValue, newValue) && !(this.component.clearOnHide && this.conditionallyHidden)) {
+                    if (!lodash_1.default.isEqual(oldValue, newValue) && !(this.component.clearOnHide && this.conditionallyHidden())) {
                         this.setValue(newValue);
                         if (this.viewOnly) {
                             this.dataValue = newValue;
@@ -2125,7 +2113,7 @@ class Component extends Element_1.default {
                         component: newComponent,
                         result,
                     }, 'value');
-                    if (!lodash_1.default.isEqual(oldValue, newValue) && !(this.component.clearOnHide && this.conditionallyHidden)) {
+                    if (!lodash_1.default.isEqual(oldValue, newValue) && !(this.component.clearOnHide && this.conditionallyHidden())) {
                         this.setValue(newValue);
                         if (this.viewOnly) {
                             this.dataValue = newValue;
@@ -2236,7 +2224,7 @@ class Component extends Element_1.default {
             this.component.clearOnHide !== false &&
             !this.options.readOnly &&
             !this.options.showHiddenFields) {
-            if (this.conditionallyHidden) {
+            if (this.conditionallyHidden()) {
                 this.deleteValue();
             }
             else if (!this.hasValue() && this.shouldAddDefaultValue) {
@@ -2494,27 +2482,17 @@ class Component extends Element_1.default {
      * @returns {*} - The value for this component.
      */
     get dataValue() {
-        if (!this.key ||
-            (this.conditionallyHidden && this.component.clearOnHide && !this.rootPristine)) {
-            return this.emptyValue;
-        }
-        if (!this.hasValue() && this.shouldAddDefaultValue) {
-            const empty = this.component.multiple ? [] : this.emptyValue;
-            if (!this.rootPristine) {
-                this.dataValue = empty;
-            }
-            return empty;
+        if (!this.key) {
+            return this.component.multiple ? [] : this.emptyValue;
         }
-        return lodash_1.default.get(this._data, this.key);
+        return lodash_1.default.get(this._data, this.key, this.component.multiple ? [] : this.emptyValue);
     }
     /**
      * Sets the static value of this component.
      * @param {*} value - The value to set for this component.
      */
     set dataValue(value) {
-        if (!this.allowData ||
-            !this.key ||
-            (this.conditionallyHidden && this.component.clearOnHide && !this.rootPristine)) {
+        if (!this.allowData || !this.key) {
             return;
         }
         if ((value !== null) && (value !== undefined)) {
@@ -2835,7 +2813,7 @@ class Component extends Element_1.default {
         // If no calculated value or
         // hidden and set to clearOnHide (Don't calculate a value for a hidden field set to clear when hidden)
         const { clearOnHide } = this.component;
-        const shouldBeCleared = this.conditionallyHidden && clearOnHide;
+        const shouldBeCleared = this.conditionallyHidden() && clearOnHide;
         const allowOverride = lodash_1.default.get(this.component, 'allowCalculateOverride', false);
         if (shouldBeCleared) {
             // remove calculated value so that the value is recalculated once component becomes visible
@@ -3485,7 +3463,7 @@ class Component extends Element_1.default {
                         // If component definition changed, replace it.
                         if (!lodash_1.default.isEqual(this.component, newComponent)) {
                             this.component = newComponent;
-                            const visible = this.hasCondition() ? !this.conditionallyHidden : !this.component.hidden;
+                            const visible = this.hasCondition() ? !this.conditionallyHidden() : !this.component.hidden;
                             const disabled = this.shouldDisabled;
                             // Change states which won't be recalculated during redrawing
                             if (this.visible !== visible) {

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

@@ -85,18 +85,15 @@ class NestedComponent extends Field_1.default {
         const visibilityChanged = this._visible !== value;
         this._visible = value;
         const isVisible = this.visible;
-        const isConditionallyHidden = this.checkConditionallyHidden();
         const forceShow = this.shouldForceShow();
         const forceHide = this.shouldForceHide();
         this.components.forEach((component) => {
             // Set the parent visibility first since we may have nested components within nested components
             // and they need to be able to determine their visibility based on the parent visibility.
             component.parentVisible = isVisible;
-            component._parentConditionallyHidden = isConditionallyHidden;
             let visible;
             if (component.hasCondition()) {
-                component._conditionallyHidden = component.checkConditionallyHidden() || component._parentConditionallyHidden;
-                visible = !component.conditionallyHidden;
+                visible = !component.conditionallyHidden();
             }
             else {
                 visible = !component.component.hidden;
@@ -377,7 +374,6 @@ class NestedComponent extends Field_1.default {
         data = data || this.data;
         options.parent = this;
         options.parentVisible = this.visible;
-        options.parentConditionallyHidden = this.conditionallyHidden;
         options.root = (options === null || options === void 0 ? void 0 : options.root) || this.root || this;
         options.localRoot = this.localRoot;
         options.skipInit = true;
@@ -636,7 +632,7 @@ class NestedComponent extends Field_1.default {
     clearOnHide(show) {
         super.clearOnHide(show);
         if (this.component.clearOnHide) {
-            if (this.allowData && !this.hasValue() && !this.conditionallyHidden) {
+            if (this.allowData && !this.hasValue() && !this.conditionallyHidden()) {
                 this.dataValue = this.defaultValue;
             }
             if (this.hasValue()) {
@@ -665,7 +661,7 @@ class NestedComponent extends Field_1.default {
     }
     calculateValue(data, flags, row) {
         // Do not iterate into children and calculateValues if this nested component is conditionally hidden.
-        if (this.conditionallyHidden) {
+        if (this.conditionallyHidden()) {
             return false;
         }
         return this.getComponents().reduce((changed, comp) => comp.calculateValue(data, flags, row) || changed, super.calculateValue(data, flags, row));

package/lib/cjs/components/datamap/DataMap.js

@@ -73,14 +73,10 @@ class DataMapComponent extends DataGrid_1.default {
         return {};
     }
     get dataValue() {
-        if (!this.key ||
-            (this.conditionallyHidden && this.component.clearOnHide)) {
+        if (!this.key) {
             return this.emptyValue;
         }
-        if (!this.hasValue() && this.shouldAddDefaultValue) {
-            this.dataValue = this.emptyValue;
-        }
-        return lodash_1.default.get(this.data, this.key);
+        return lodash_1.default.get(this.data, this.key, this.emptyValue);
     }
     set dataValue(value) {
         super.dataValue = value;

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

@@ -1159,9 +1159,6 @@ class EditGridComponent extends NestedArrayComponent_1.default {
             }
         }
         const changed = this.hasChanged(value, this.dataValue);
-        if (this.parent) {
-            this.parent.checkComponentConditions();
-        }
         this.dataValue = value;
         // Refresh editRow data when data changes.
         this.dataValue.forEach((row, rowIndex) => {
@@ -1192,7 +1189,6 @@ class EditGridComponent extends NestedArrayComponent_1.default {
         this.editRows = this.editRows.slice(0, dataLength);
         this.openWhenEmpty();
         this.updateOnChange(flags, changed);
-        this.checkData();
         this.changeState(changed, flags);
         return changed;
     }

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

@@ -448,7 +448,7 @@ class FormComponent extends Component_1.default {
     loadSubForm(fromAttach, beforeSubmit) {
         var _a, _b, _c, _d, _e;
         const loadHiddenForm = beforeSubmit && !this.component.clearOnHide;
-        if (this.builderMode || (this.conditionallyHidden && !loadHiddenForm) || (this.isSubFormLazyLoad() && !fromAttach)) {
+        if (this.builderMode || (this.conditionallyHidden() && !loadHiddenForm) || (this.isSubFormLazyLoad() && !fromAttach)) {
             return Promise.resolve();
         }
         if (this.hasLoadedForm && !this.isRevisionChanged &&
@@ -520,7 +520,7 @@ class FormComponent extends Component_1.default {
      * @returns {*|boolean} - TRUE if the subform should be submitted, FALSE if it should not.
      */
     get shouldSubmit() {
-        return this.subFormReady && (!this.component.hasOwnProperty('reference') || this.component.reference) && (!this.conditionallyHidden || !this.component.clearOnHide);
+        return this.subFormReady && (!this.component.hasOwnProperty('reference') || this.component.reference) && (!this.conditionallyHidden() || !this.component.clearOnHide);
     }
     /**
      * Returns the data for the subform.

package/lib/cjs/components/html/HTML.js

@@ -58,8 +58,7 @@ class HTMLComponent extends Component_1.default {
         super.checkRefreshOn(changed);
         let visible;
         if (this.hasCondition()) {
-            this._conditionallyHidden = this.checkConditionallyHidden();
-            visible = !this.conditionallyHidden;
+            visible = !this.conditionallyHidden();
         }
         else {
             visible = !this.component.hidden;

package/lib/cjs/components/radio/Radio.js

@@ -365,7 +365,7 @@ class RadioComponent extends ListComponent_1.default {
             const value = this.dataValue;
             this.refs.wrapper.forEach((wrapper, index) => {
                 const input = this.refs.input[index];
-                const checked = (input.type === 'checkbox') ? value[input.value] || input.checked : (input.value.toString() === value.toString());
+                const checked = (value === undefined || value === null) ? false : (input.type === 'checkbox') ? value[input.value] || input.checked : (input.value.toString() === value.toString());
                 if (checked) {
                     //add class to container when selected
                     this.addClass(wrapper, this.optionSelectedClass);

package/lib/cjs/components/tabs/Tabs.js

@@ -143,6 +143,7 @@ class TabsComponent extends NestedComponent_1.default {
             this.addClass(this.refs[this.tabLinkKey][index], 'active');
             this.addClass(this.refs[this.tabLinkKey][index], 'formio-tab-link-active');
         }
+        this.setValue(this.data);
         this.triggerChange();
     }
     beforeFocus(component) {

package/lib/mjs/WebformBuilder.js

@@ -1626,7 +1626,7 @@ export default class WebformBuilder extends Component {
             info.type);
     }
     hasEditTabs(type) {
-        const editTabs = getComponent(Components.components[type].editForm().components, 'tabs', true).components;
+        const editTabs = getComponent(Components.components[type === 'custom' ? 'unknown' : type].editForm().components, 'tabs', true).components;
         const hiddenEditTabs = _.filter(_.get(this.options, `editForm.${type}`, []), 'ignore');
         return _.intersectionBy(editTabs, hiddenEditTabs, 'key').length !== editTabs.length;
     }

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

@@ -119,13 +119,6 @@ declare class Component extends Element {
      */
     paths: import('@formio/core').ComponentPaths;
     _path: string;
-    /**
-     * Determines if this component is conditionally hidden. Should generally not be set outside of conditional logic pipeline.
-     * This is necessary because of clearOnHide behavior that only clears when conditionally hidden - we need to track
-     * conditionallyHidden separately from "regular" visibility.
-     */
-    _parentConditionallyHidden: any;
-    _conditionallyHidden: any;
     /**
      * Determines if this component is visible, or not.
      */
@@ -170,6 +163,7 @@ declare class Component extends Element {
      */
     info: any;
     get componentsMap(): object;
+    parentConditionallyHidden(): boolean;
     set data(value: any);
     get data(): any;
     mergeSchema(component?: {}): any;
@@ -231,14 +225,9 @@ declare class Component extends Element {
      * @returns {boolean} - Whether the component is visible or not.
      */
     get visible(): boolean;
-    get conditionallyHidden(): any;
-    /**
-     * Evaluates whether the component is conditionally hidden (as opposed to intentionally hidden, e.g. via the `hidden` component schema property).
-     * @param {object} data - The data object to evaluate the condition against.
-     * @param {object} row - The row object to evaluate the condition against.
-     * @returns {boolean} - Whether the component is conditionally hidden.
-     */
-    checkConditionallyHidden(data?: object, row?: object): boolean;
+    get logicallyHidden(): any;
+    _logicallyHidden: any;
+    conditionallyHidden(skipParent?: boolean): any;
     set currentForm(instance: any);
     get currentForm(): any;
     _currentForm: any;

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

@@ -316,18 +316,11 @@ export default class Component extends Element {
         this._path = '';
         // Needs for Nextgen Rules Engine
         this.resetCaches();
-        /**
-         * Determines if this component is conditionally hidden. Should generally not be set outside of conditional logic pipeline.
-         * This is necessary because of clearOnHide behavior that only clears when conditionally hidden - we need to track
-         * conditionallyHidden separately from "regular" visibility.
-         */
-        this._parentConditionallyHidden = this.options.hasOwnProperty('parentConditionallyHidden') ? this.options.parentConditionallyHidden : false;
-        this._conditionallyHidden = this.checkConditionallyHidden(null, data) || this._parentConditionallyHidden;
         /**
          * Determines if this component is visible, or not.
          */
         this._parentVisible = this.options.hasOwnProperty('parentVisible') ? this.options.parentVisible : true;
-        this._visible = this._parentVisible && (this.hasCondition() ? !this._conditionallyHidden : !this.component.hidden);
+        this._visible = this._parentVisible && (this.hasCondition() ? !this.conditionallyHidden() : !this.component.hidden);
         this._parentDisabled = false;
         /**
          * The reference attribute name for this component
@@ -396,7 +389,7 @@ export default class Component extends Element {
             if (this.allowData && this.key) {
                 this.options.name += `[${this.key}]`;
                 // If component is visible or not set to clear on hide, set the default value.
-                if (!(this.conditionallyHidden && this.component.clearOnHide)) {
+                if (!(this.conditionallyHidden() && this.component.clearOnHide)) {
                     if (!this.hasValue()) {
                         if (this.shouldAddDefaultValue) {
                             this.dataValue = this.defaultValue;
@@ -429,6 +422,16 @@ export default class Component extends Element {
     get componentsMap() {
         return this.root?.childComponentsMap || {};
     }
+    parentConditionallyHidden() {
+        let currentParent = this.parent;
+        while (currentParent) {
+            if (currentParent.conditionallyHidden(true)) {
+                return true;
+            }
+            currentParent = currentParent.parent;
+        }
+        return false;
+    }
     get data() {
         return this._data;
     }
@@ -468,8 +471,7 @@ export default class Component extends Element {
     }
     init() {
         this.disabled = this.shouldDisabled;
-        this._conditionallyHidden = this.checkConditionallyHidden();
-        this._visible = (this.hasCondition() ? !this.conditionallyHidden : !this.component.hidden);
+        this._visible = (this.hasCondition() ? !this.conditionallyHidden() : !this.component.hidden);
         if (this.component.addons?.length) {
             this.component.addons.forEach((addon) => this.createAddon(addon));
         }
@@ -635,20 +637,17 @@ export default class Component extends Element {
         }
         return this._visible && this._parentVisible;
     }
-    get conditionallyHidden() {
-        return this._conditionallyHidden || this._parentConditionallyHidden;
+    get logicallyHidden() {
+        if (this._logicallyHidden && !this.component.hidden) {
+            this._logicallyHidden = false;
+        }
+        return this._logicallyHidden;
     }
-    /**
-     * Evaluates whether the component is conditionally hidden (as opposed to intentionally hidden, e.g. via the `hidden` component schema property).
-     * @param {object} data - The data object to evaluate the condition against.
-     * @param {object} row - The row object to evaluate the condition against.
-     * @returns {boolean} - Whether the component is conditionally hidden.
-     */
-    checkConditionallyHidden(data = null, row = null) {
+    conditionallyHidden(skipParent = false) {
         if (!this.hasCondition()) {
-            return false;
+            return this.logicallyHidden || (skipParent ? false : this.parentConditionallyHidden());
         }
-        return !this.conditionallyVisible(data, row);
+        return !this.conditionallyVisible() || this.logicallyHidden || (skipParent ? false : this.parentConditionallyHidden());
     }
     get currentForm() {
         return this._currentForm;
@@ -1818,7 +1817,7 @@ export default class Component extends Element {
     rebuild() {
         this.destroy();
         this.init();
-        this.visible = this.hasCondition() ? !this.conditionallyHidden : !this.component.hidden;
+        this.visible = this.hasCondition() ? !this.conditionallyHidden() : !this.component.hidden;
         return this.redraw();
     }
     /**
@@ -1916,23 +1915,12 @@ export default class Component extends Element {
         if (!this.builderMode & !this.previewMode && this.fieldLogic(data, row)) {
             this.redraw();
         }
-        // Check advanced conditions (and cache the result)
-        const isConditionallyHidden = this.checkConditionallyHidden(data, row) || this._parentConditionallyHidden;
-        let shouldClear = false;
-        if (isConditionallyHidden !== this._conditionallyHidden) {
-            this._conditionallyHidden = isConditionallyHidden;
-            shouldClear = true;
-        }
         // Check visibility
-        const visible = (this.hasCondition() ? !this.conditionallyHidden : !this.component.hidden);
+        const visible = (this.hasCondition() ? !this.conditionallyHidden() : !this.component.hidden);
         if (this.visible !== visible) {
             this.visible = visible;
         }
-        // Wait for visibility to update for nested components, so the component state is up-to-date when
-        // calling clearOnHide
-        if (shouldClear) {
-            this.clearOnHide();
-        }
+        this.clearOnHide();
         return visible;
     }
     /**
@@ -2041,9 +2029,9 @@ export default class Component extends Element {
                     if (!_.isEqual(_.get(this.component, property), _.get(newComponent, property))) {
                         // Advanced Logic can modify the component's hidden property; because we track conditionally hidden state
                         // separately from the component's hidden property, and technically this Advanced Logic conditionally hides
-                        // a component, we need to set _conditionallyHidden to the new value
+                        // a component, we need to set a temporary variable to the new value
                         if (property === 'hidden') {
-                            this._conditionallyHidden = newComponent.hidden;
+                            this._logicallyHidden = newComponent.hidden;
                         }
                         changed = true;
                     }
@@ -2058,7 +2046,7 @@ export default class Component extends Element {
                         component: newComponent,
                         result,
                     });
-                    if (!_.isEqual(oldValue, newValue) && !(this.component.clearOnHide && this.conditionallyHidden)) {
+                    if (!_.isEqual(oldValue, newValue) && !(this.component.clearOnHide && this.conditionallyHidden())) {
                         this.setValue(newValue);
                         if (this.viewOnly) {
                             this.dataValue = newValue;
@@ -2091,7 +2079,7 @@ export default class Component extends Element {
                         component: newComponent,
                         result,
                     }, 'value');
-                    if (!_.isEqual(oldValue, newValue) && !(this.component.clearOnHide && this.conditionallyHidden)) {
+                    if (!_.isEqual(oldValue, newValue) && !(this.component.clearOnHide && this.conditionallyHidden())) {
                         this.setValue(newValue);
                         if (this.viewOnly) {
                             this.dataValue = newValue;
@@ -2202,7 +2190,7 @@ export default class Component extends Element {
             this.component.clearOnHide !== false &&
             !this.options.readOnly &&
             !this.options.showHiddenFields) {
-            if (this.conditionallyHidden) {
+            if (this.conditionallyHidden()) {
                 this.deleteValue();
             }
             else if (!this.hasValue() && this.shouldAddDefaultValue) {
@@ -2463,27 +2451,17 @@ export default class Component extends Element {
      * @returns {*} - The value for this component.
      */
     get dataValue() {
-        if (!this.key ||
-            (this.conditionallyHidden && this.component.clearOnHide && !this.rootPristine)) {
-            return this.emptyValue;
-        }
-        if (!this.hasValue() && this.shouldAddDefaultValue) {
-            const empty = this.component.multiple ? [] : this.emptyValue;
-            if (!this.rootPristine) {
-                this.dataValue = empty;
-            }
-            return empty;
+        if (!this.key) {
+            return this.component.multiple ? [] : this.emptyValue;
         }
-        return _.get(this._data, this.key);
+        return _.get(this._data, this.key, this.component.multiple ? [] : this.emptyValue);
     }
     /**
      * Sets the static value of this component.
      * @param {*} value - The value to set for this component.
      */
     set dataValue(value) {
-        if (!this.allowData ||
-            !this.key ||
-            (this.conditionallyHidden && this.component.clearOnHide && !this.rootPristine)) {
+        if (!this.allowData || !this.key) {
             return;
         }
         if ((value !== null) && (value !== undefined)) {
@@ -2803,7 +2781,7 @@ export default class Component extends Element {
         // If no calculated value or
         // hidden and set to clearOnHide (Don't calculate a value for a hidden field set to clear when hidden)
         const { clearOnHide } = this.component;
-        const shouldBeCleared = this.conditionallyHidden && clearOnHide;
+        const shouldBeCleared = this.conditionallyHidden() && clearOnHide;
         const allowOverride = _.get(this.component, 'allowCalculateOverride', false);
         if (shouldBeCleared) {
             // remove calculated value so that the value is recalculated once component becomes visible
@@ -3448,7 +3426,7 @@ export default class Component extends Element {
                         // If component definition changed, replace it.
                         if (!_.isEqual(this.component, newComponent)) {
                             this.component = newComponent;
-                            const visible = this.hasCondition() ? !this.conditionallyHidden : !this.component.hidden;
+                            const visible = this.hasCondition() ? !this.conditionallyHidden() : !this.component.hidden;
                             const disabled = this.shouldDisabled;
                             // Change states which won't be recalculated during redrawing
                             if (this.visible !== visible) {