@formio/js 5.1.0-dev.6035.9508dc1 → 5.1.0-dev.6036.0df1d6a

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;
+    get parentConditionallyHidden(): any;
     set data(value: any);
     get data(): any;
     mergeSchema(component?: {}): any;
@@ -239,6 +233,7 @@ declare class Component extends Element {
      * @returns {boolean} - Whether the component is conditionally hidden.
      */
     checkConditionallyHidden(data?: object, row?: object): boolean;
+    _conditionallyHidden: any;
     set currentForm(instance: any);
     get currentForm(): any;
     _currentForm: any;

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

@@ -356,8 +356,7 @@ class Component extends Element_1.default {
          * 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;
+        this.checkConditionallyHidden(null, data);
         /**
          * Determines if this component is visible, or not.
          */
@@ -465,6 +464,18 @@ class Component extends Element_1.default {
         var _a;
         return ((_a = this.root) === null || _a === void 0 ? void 0 : _a.childComponentsMap) || {};
     }
+    get parentConditionallyHidden() {
+        let parentHidden = false;
+        let currentParent = this.parent;
+        while (currentParent) {
+            parentHidden = parentHidden || currentParent._conditionallyHidden;
+            if (parentHidden) {
+                break;
+            }
+            currentParent = currentParent.parent;
+        }
+        return parentHidden;
+    }
     get data() {
         return this._data;
     }
@@ -505,7 +516,7 @@ class Component extends Element_1.default {
     init() {
         var _a;
         this.disabled = this.shouldDisabled;
-        this._conditionallyHidden = this.checkConditionallyHidden();
+        this.checkConditionallyHidden();
         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));
@@ -672,7 +683,7 @@ class Component extends Element_1.default {
         return this._visible && this._parentVisible;
     }
     get conditionallyHidden() {
-        return this._conditionallyHidden || this._parentConditionallyHidden;
+        return this._conditionallyHidden || this.parentConditionallyHidden;
     }
     /**
      * Evaluates whether the component is conditionally hidden (as opposed to intentionally hidden, e.g. via the `hidden` component schema property).
@@ -681,10 +692,13 @@ class Component extends Element_1.default {
      * @returns {boolean} - Whether the component is conditionally hidden.
      */
     checkConditionallyHidden(data = null, row = null) {
+        this._conditionallyHidden = false;
         if (!this.hasCondition()) {
-            return false;
+            this._conditionallyHidden = this.parentConditionallyHidden;
+            return this._conditionallyHidden;
         }
-        return !this.conditionallyVisible(data, row);
+        this._conditionallyHidden = !this.conditionallyVisible(data, row) || this.parentConditionallyHidden;
+        return this._conditionallyHidden;
     }
     get currentForm() {
         return this._currentForm;
@@ -1951,12 +1965,7 @@ class Component extends Element_1.default {
             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;
-        }
+        const shouldClear = this.checkConditionallyHidden(data, row);
         // Check visibility
         const visible = (this.hasCondition() ? !this.conditionallyHidden : !this.component.hidden);
         if (this.visible !== visible) {
@@ -2494,8 +2503,7 @@ class Component extends Element_1.default {
      * @returns {*} - The value for this component.
      */
     get dataValue() {
-        if (!this.key ||
-            (this.conditionallyHidden && this.component.clearOnHide && !this.rootPristine)) {
+        if (!this.key) {
             return this.emptyValue;
         }
         if (!this.hasValue() && this.shouldAddDefaultValue) {
@@ -2512,9 +2520,7 @@ class Component extends Element_1.default {
      * @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)) {

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

@@ -85,18 +85,16 @@ class NestedComponent extends Field_1.default {
         const visibilityChanged = this._visible !== value;
         this._visible = value;
         const isVisible = this.visible;
-        const isConditionallyHidden = this.checkConditionallyHidden();
+        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.checkConditionallyHidden();
             }
             else {
                 visible = !component.component.hidden;
@@ -377,7 +375,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;

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/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.checkConditionallyHidden();
         }
         else {
             visible = !this.component.hidden;

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/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;
+    get parentConditionallyHidden(): any;
     set data(value: any);
     get data(): any;
     mergeSchema(component?: {}): any;
@@ -239,6 +233,7 @@ declare class Component extends Element {
      * @returns {boolean} - Whether the component is conditionally hidden.
      */
     checkConditionallyHidden(data?: object, row?: object): boolean;
+    _conditionallyHidden: any;
     set currentForm(instance: any);
     get currentForm(): any;
     _currentForm: any;

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

@@ -321,8 +321,7 @@ export default class Component extends Element {
          * 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;
+        this.checkConditionallyHidden(null, data);
         /**
          * Determines if this component is visible, or not.
          */
@@ -429,6 +428,18 @@ export default class Component extends Element {
     get componentsMap() {
         return this.root?.childComponentsMap || {};
     }
+    get parentConditionallyHidden() {
+        let parentHidden = false;
+        let currentParent = this.parent;
+        while (currentParent) {
+            parentHidden = parentHidden || currentParent._conditionallyHidden;
+            if (parentHidden) {
+                break;
+            }
+            currentParent = currentParent.parent;
+        }
+        return parentHidden;
+    }
     get data() {
         return this._data;
     }
@@ -468,7 +479,7 @@ export default class Component extends Element {
     }
     init() {
         this.disabled = this.shouldDisabled;
-        this._conditionallyHidden = this.checkConditionallyHidden();
+        this.checkConditionallyHidden();
         this._visible = (this.hasCondition() ? !this.conditionallyHidden : !this.component.hidden);
         if (this.component.addons?.length) {
             this.component.addons.forEach((addon) => this.createAddon(addon));
@@ -636,7 +647,7 @@ export default class Component extends Element {
         return this._visible && this._parentVisible;
     }
     get conditionallyHidden() {
-        return this._conditionallyHidden || this._parentConditionallyHidden;
+        return this._conditionallyHidden || this.parentConditionallyHidden;
     }
     /**
      * Evaluates whether the component is conditionally hidden (as opposed to intentionally hidden, e.g. via the `hidden` component schema property).
@@ -645,10 +656,13 @@ export default class Component extends Element {
      * @returns {boolean} - Whether the component is conditionally hidden.
      */
     checkConditionallyHidden(data = null, row = null) {
+        this._conditionallyHidden = false;
         if (!this.hasCondition()) {
-            return false;
+            this._conditionallyHidden = this.parentConditionallyHidden;
+            return this._conditionallyHidden;
         }
-        return !this.conditionallyVisible(data, row);
+        this._conditionallyHidden = !this.conditionallyVisible(data, row) || this.parentConditionallyHidden;
+        return this._conditionallyHidden;
     }
     get currentForm() {
         return this._currentForm;
@@ -1917,12 +1931,7 @@ export default class Component extends Element {
             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;
-        }
+        const shouldClear = this.checkConditionallyHidden(data, row);
         // Check visibility
         const visible = (this.hasCondition() ? !this.conditionallyHidden : !this.component.hidden);
         if (this.visible !== visible) {
@@ -2463,8 +2472,7 @@ export default class Component extends Element {
      * @returns {*} - The value for this component.
      */
     get dataValue() {
-        if (!this.key ||
-            (this.conditionallyHidden && this.component.clearOnHide && !this.rootPristine)) {
+        if (!this.key) {
             return this.emptyValue;
         }
         if (!this.hasValue() && this.shouldAddDefaultValue) {
@@ -2481,9 +2489,7 @@ export default class Component extends Element {
      * @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)) {

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

@@ -81,18 +81,16 @@ export default class NestedComponent extends Field {
         const visibilityChanged = this._visible !== value;
         this._visible = value;
         const isVisible = this.visible;
-        const isConditionallyHidden = this.checkConditionallyHidden();
+        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.checkConditionallyHidden();
             }
             else {
                 visible = !component.component.hidden;
@@ -373,7 +371,6 @@ export default class NestedComponent extends Field {
         data = data || this.data;
         options.parent = this;
         options.parentVisible = this.visible;
-        options.parentConditionallyHidden = this.conditionallyHidden;
         options.root = options?.root || this.root || this;
         options.localRoot = this.localRoot;
         options.skipInit = true;

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

@@ -1150,9 +1150,6 @@ export default class EditGridComponent extends NestedArrayComponent {
             }
         }
         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) => {
@@ -1183,7 +1180,6 @@ export default class EditGridComponent extends NestedArrayComponent {
         this.editRows = this.editRows.slice(0, dataLength);
         this.openWhenEmpty();
         this.updateOnChange(flags, changed);
-        this.checkData();
         this.changeState(changed, flags);
         return changed;
     }

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

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

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

@@ -138,6 +138,7 @@ export default class TabsComponent extends NestedComponent {
             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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@formio/js",
-  "version": "5.1.0-dev.6035.9508dc1",
+  "version": "5.1.0-dev.6036.0df1d6a",
   "description": "JavaScript powered Forms with JSON Form Builder",
   "main": "lib/cjs/index.js",
   "exports": {