@formio/js 5.1.0-dev.6068.e295b11 → 5.1.0-dev.6069.caec01d

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

@@ -165,7 +165,6 @@ declare class Component extends Element {
     get componentsMap(): object;
     parentShouldConditionallyClear(): boolean;
     parentConditionallyHidden(): boolean;
-    parentDefaultHidden(): boolean;
     set data(value: any);
     get data(): any;
     mergeSchema(component?: {}): any;
@@ -229,11 +228,8 @@ declare class Component extends Element {
     get visible(): boolean;
     get logicallyHidden(): any;
     _logicallyHidden: any;
-    shouldConditionallyClearOnPristine(): boolean;
-    shouldConditionallyClear(): boolean;
-    _conditionallyClear: boolean | undefined;
-    conditionallyHidden(): boolean;
-    _conditionallyHidden: boolean | undefined;
+    shouldConditionallyClear(skipParent?: boolean): boolean;
+    conditionallyHidden(skipParent?: boolean): boolean;
     set currentForm(instance: any);
     get currentForm(): any;
     _currentForm: any;

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

@@ -461,8 +461,7 @@ class Component extends Element_1.default {
     parentShouldConditionallyClear() {
         let currentParent = this.parent;
         while (currentParent) {
-            if ((currentParent.allowData && currentParent._conditionallyClear) ||
-                (!currentParent.allowData && currentParent._conditionallyHidden)) {
+            if (currentParent.shouldConditionallyClear(true)) {
                 return true;
             }
             currentParent = currentParent.parent;
@@ -472,17 +471,7 @@ class Component extends Element_1.default {
     parentConditionallyHidden() {
         let currentParent = this.parent;
         while (currentParent) {
-            if (currentParent._conditionallyHidden) {
-                return true;
-            }
-            currentParent = currentParent.parent;
-        }
-        return false;
-    }
-    parentDefaultHidden() {
-        let currentParent = this.parent;
-        while (currentParent) {
-            if (currentParent.component.hidden) {
+            if (currentParent.conditionallyHidden(true)) {
                 return true;
             }
             currentParent = currentParent.parent;
@@ -700,46 +689,48 @@ class Component extends Element_1.default {
         }
         return this._logicallyHidden;
     }
-    shouldConditionallyClearOnPristine() {
-        // If the form is pristine, we should NOT clear the value of a conditionally hidden child component
-        // of a conditionally hidden layout component that defaults to hidden using the "hidden" property.
-        return !this.parentDefaultHidden();
-    }
-    shouldConditionallyClear() {
+    shouldConditionallyClear(skipParent = false) {
         // Skip if this component has clearOnHide set to false.
         if (this.component.clearOnHide === false) {
-            this._conditionallyClear = false;
-            return this._conditionallyClear;
+            return false;
         }
         // If the component is logically hidden, then it is conditionally hidden and should clear.
         if (this.logicallyHidden) {
-            this._conditionallyClear = true;
-            return this._conditionallyClear;
+            return true;
         }
         // If we have a condition and it is not conditionally visible, the it should conditionally clear.
-        if (this.hasCondition() &&
-            !this.conditionallyVisible() &&
-            (!this.rootPristine || this.shouldConditionallyClearOnPristine())) {
-            this._conditionallyClear = true;
-            return this._conditionallyClear;
+        if (this.hasCondition() && !this.conditionallyVisible()) {
+            return true;
+        }
+        if (skipParent) {
+            // Stop recurrsion for the parent checks.
+            return false;
         }
-        this._conditionallyClear = this.hasSetValue ? false : this.parentShouldConditionallyClear();
-        return this._conditionallyClear;
+        // If this component has a set value, then it should ONLY clear if a parent is hidden
+        // and has the clearOnHide set to true.
+        if (this.hasSetValue) {
+            return this.parentShouldConditionallyClear();
+        }
+        // Clear the value if the parent is conditionally hidden.
+        return this.parentConditionallyHidden();
     }
-    conditionallyHidden() {
-        // If it is logically hidden, then it is conditionally hidden.
+    conditionallyHidden(skipParent = false) {
         if (this.logicallyHidden) {
-            this._conditionallyHidden = true;
-            return this._conditionallyHidden;
+            return true;
         }
-        // If it has a condition, and is not conditionally visible, then it is conditionally hidden.
-        if (this.hasCondition() && !this.conditionallyVisible()) {
-            this._conditionallyHidden = true;
-            return this._conditionallyHidden;
+        if (!this.hasCondition() && !skipParent) {
+            return this.parentConditionallyHidden();
+        }
+        // Return if we are not conditionally visible (conditionallyHidden)
+        if (!this.conditionallyVisible()) {
+            return true;
+        }
+        if (skipParent) {
+            // Stop recurrsion for the parent checks.
+            return false;
         }
-        // It is conditionally hidden if its parent is conditionally hidden.
-        this._conditionallyHidden = this.parentConditionallyHidden();
-        return this._conditionallyHidden;
+        // Check the parent.
+        return this.parentConditionallyHidden();
     }
     get currentForm() {
         return this._currentForm;

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

@@ -98,6 +98,7 @@ export default class FormComponent extends Component {
      * @returns {void}
      */
     onSetSubFormValue(submission: object | null | undefined, flags: object | null | undefined): void;
+    areAllComponentsEmpty(data: any): boolean;
     updateSubFormVisibility(): void;
     /**
      * Determines if this form is a Nested Wizard

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

@@ -101,9 +101,6 @@ class FormComponent extends Component_1.default {
         }
         return this.createSubForm();
     }
-    shouldConditionallyClearOnPristine() {
-        return !this.hasSetValue && super.shouldConditionallyClearOnPristine();
-    }
     get dataReady() {
         var _a;
         return ((_a = this.subForm) === null || _a === void 0 ? void 0 : _a.dataReady) || this.subFormReady || Promise.resolve();
@@ -293,13 +290,11 @@ class FormComponent extends Component_1.default {
                     }
                     this.subForm.attach(element);
                     this.valueChanged = this.hasSetValue;
-                    if (!this.shouldConditionallyClear()) {
-                        if (!this.valueChanged && this.dataValue.state !== 'submitted') {
-                            this.setDefaultValue();
-                        }
-                        else {
-                            this.restoreValue();
-                        }
+                    if (!this.valueChanged && this.dataValue.state !== 'submitted') {
+                        this.setDefaultValue();
+                    }
+                    else {
+                        this.restoreValue();
                     }
                 }
                 if (!this.builderMode && this.component.modalEdit) {
@@ -416,7 +411,7 @@ class FormComponent extends Component_1.default {
                 lodash_1.default.assign(componentsMap, formComponentsMap);
                 this.component.components = this.subForm.components.map((comp) => comp.component);
                 this.subForm.on('change', () => {
-                    if (this.subForm && !this.shouldConditionallyClear()) {
+                    if (this.subForm) {
                         this.dataValue = this.subForm.getValue();
                         this.triggerChange({
                             noEmit: true
@@ -684,7 +679,20 @@ class FormComponent extends Component_1.default {
         }
     }
     isEmpty(value = this.dataValue) {
-        return value === null || lodash_1.default.isEqual(value, this.emptyValue);
+        return value === null || lodash_1.default.isEqual(value, this.emptyValue) || (this.areAllComponentsEmpty(value === null || value === void 0 ? void 0 : value.data) && !(value === null || value === void 0 ? void 0 : value._id));
+    }
+    areAllComponentsEmpty(data) {
+        let res = true;
+        if (this.subForm) {
+            this.subForm.everyComponent((comp) => {
+                const componentValue = lodash_1.default.get(data, comp.key);
+                res &= comp.isEmpty(componentValue);
+            });
+        }
+        else {
+            res = false;
+        }
+        return res;
     }
     getValue() {
         if (this.subForm) {

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

@@ -26,8 +26,8 @@ export const getBestMatch: typeof Utils.getBestMatch;
 export const getComponentFromPath: typeof Utils.getComponentFromPath;
 export const getComponentValue: typeof Utils.getComponentValue;
 export const findComponents: typeof Utils.findComponents;
-export const eachComponentDataAsync: (components: Component[], data: DataObject, fn: EachComponentDataAsyncCallback, includeAll?: boolean | undefined, local?: boolean | undefined, parent?: any, parentPaths?: any) => Promise<void>;
-export const eachComponentData: (components: Component[], data: DataObject, fn: EachComponentDataCallback, includeAll?: boolean | undefined, local?: boolean | undefined, parent?: any, parentPaths?: any) => void;
+export const eachComponentDataAsync: (components: import("@formio/core").Component[], data: import("@formio/core").DataObject, fn: import("@formio/core").EachComponentDataAsyncCallback, includeAll?: boolean | undefined, local?: boolean | undefined, parent?: import("@formio/core").Component | undefined, parentPaths?: import("@formio/core").ComponentPaths | undefined) => Promise<void>;
+export const eachComponentData: (components: import("@formio/core").Component[], data: import("@formio/core").DataObject, fn: import("@formio/core").EachComponentDataCallback, includeAll?: boolean | undefined, local?: boolean | undefined, parent?: import("@formio/core").Component | undefined, parentPaths?: import("@formio/core").ComponentPaths | undefined) => void;
 export const getComponentKey: typeof Utils.getComponentKey;
 export const getContextualRowPath: typeof Utils.getContextualRowPath;
 export const getContextualRowData: typeof Utils.getContextualRowData;

package/lib/cjs/utils/utils.js

@@ -34,6 +34,7 @@ const Evaluator_1 = require("./Evaluator");
 Object.defineProperty(exports, "Evaluator", { enumerable: true, get: function () { return Evaluator_1.Evaluator; } });
 const conditionOperators_1 = __importDefault(require("./conditionOperators"));
 exports.ConditionOperators = conditionOperators_1.default;
+const core_1 = require("@formio/core");
 const interpolate = Evaluator_1.Evaluator.interpolate;
 exports.interpolate = interpolate;
 __exportStar(require("./formUtils"), exports);
@@ -271,7 +272,7 @@ function checkSimpleConditional(component, condition, row, data, instance) {
             default:
                 result = lodash_1.default.every(conditionsResult.flat(), res => !!res);
         }
-        return show ? result : !result;
+        return (0, core_1.convertShowToBoolean)(show) ? result : !result;
     }
 }
 exports.checkSimpleConditional = checkSimpleConditional;

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

@@ -165,7 +165,6 @@ declare class Component extends Element {
     get componentsMap(): object;
     parentShouldConditionallyClear(): boolean;
     parentConditionallyHidden(): boolean;
-    parentDefaultHidden(): boolean;
     set data(value: any);
     get data(): any;
     mergeSchema(component?: {}): any;
@@ -229,11 +228,8 @@ declare class Component extends Element {
     get visible(): boolean;
     get logicallyHidden(): any;
     _logicallyHidden: any;
-    shouldConditionallyClearOnPristine(): boolean;
-    shouldConditionallyClear(): boolean;
-    _conditionallyClear: boolean | undefined;
-    conditionallyHidden(): boolean;
-    _conditionallyHidden: boolean | undefined;
+    shouldConditionallyClear(skipParent?: boolean): boolean;
+    conditionallyHidden(skipParent?: boolean): boolean;
     set currentForm(instance: any);
     get currentForm(): any;
     _currentForm: any;

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

@@ -425,8 +425,7 @@ export default class Component extends Element {
     parentShouldConditionallyClear() {
         let currentParent = this.parent;
         while (currentParent) {
-            if ((currentParent.allowData && currentParent._conditionallyClear) ||
-                (!currentParent.allowData && currentParent._conditionallyHidden)) {
+            if (currentParent.shouldConditionallyClear(true)) {
                 return true;
             }
             currentParent = currentParent.parent;
@@ -436,17 +435,7 @@ export default class Component extends Element {
     parentConditionallyHidden() {
         let currentParent = this.parent;
         while (currentParent) {
-            if (currentParent._conditionallyHidden) {
-                return true;
-            }
-            currentParent = currentParent.parent;
-        }
-        return false;
-    }
-    parentDefaultHidden() {
-        let currentParent = this.parent;
-        while (currentParent) {
-            if (currentParent.component.hidden) {
+            if (currentParent.conditionallyHidden(true)) {
                 return true;
             }
             currentParent = currentParent.parent;
@@ -664,46 +653,48 @@ export default class Component extends Element {
         }
         return this._logicallyHidden;
     }
-    shouldConditionallyClearOnPristine() {
-        // If the form is pristine, we should NOT clear the value of a conditionally hidden child component
-        // of a conditionally hidden layout component that defaults to hidden using the "hidden" property.
-        return !this.parentDefaultHidden();
-    }
-    shouldConditionallyClear() {
+    shouldConditionallyClear(skipParent = false) {
         // Skip if this component has clearOnHide set to false.
         if (this.component.clearOnHide === false) {
-            this._conditionallyClear = false;
-            return this._conditionallyClear;
+            return false;
         }
         // If the component is logically hidden, then it is conditionally hidden and should clear.
         if (this.logicallyHidden) {
-            this._conditionallyClear = true;
-            return this._conditionallyClear;
+            return true;
         }
         // If we have a condition and it is not conditionally visible, the it should conditionally clear.
-        if (this.hasCondition() &&
-            !this.conditionallyVisible() &&
-            (!this.rootPristine || this.shouldConditionallyClearOnPristine())) {
-            this._conditionallyClear = true;
-            return this._conditionallyClear;
+        if (this.hasCondition() && !this.conditionallyVisible()) {
+            return true;
+        }
+        if (skipParent) {
+            // Stop recurrsion for the parent checks.
+            return false;
         }
-        this._conditionallyClear = this.hasSetValue ? false : this.parentShouldConditionallyClear();
-        return this._conditionallyClear;
+        // If this component has a set value, then it should ONLY clear if a parent is hidden
+        // and has the clearOnHide set to true.
+        if (this.hasSetValue) {
+            return this.parentShouldConditionallyClear();
+        }
+        // Clear the value if the parent is conditionally hidden.
+        return this.parentConditionallyHidden();
     }
-    conditionallyHidden() {
-        // If it is logically hidden, then it is conditionally hidden.
+    conditionallyHidden(skipParent = false) {
         if (this.logicallyHidden) {
-            this._conditionallyHidden = true;
-            return this._conditionallyHidden;
+            return true;
         }
-        // If it has a condition, and is not conditionally visible, then it is conditionally hidden.
-        if (this.hasCondition() && !this.conditionallyVisible()) {
-            this._conditionallyHidden = true;
-            return this._conditionallyHidden;
+        if (!this.hasCondition() && !skipParent) {
+            return this.parentConditionallyHidden();
+        }
+        // Return if we are not conditionally visible (conditionallyHidden)
+        if (!this.conditionallyVisible()) {
+            return true;
+        }
+        if (skipParent) {
+            // Stop recurrsion for the parent checks.
+            return false;
         }
-        // It is conditionally hidden if its parent is conditionally hidden.
-        this._conditionallyHidden = this.parentConditionallyHidden();
-        return this._conditionallyHidden;
+        // Check the parent.
+        return this.parentConditionallyHidden();
     }
     get currentForm() {
         return this._currentForm;

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

@@ -98,6 +98,7 @@ export default class FormComponent extends Component {
      * @returns {void}
      */
     onSetSubFormValue(submission: object | null | undefined, flags: object | null | undefined): void;
+    areAllComponentsEmpty(data: any): boolean;
     updateSubFormVisibility(): void;
     /**
      * Determines if this form is a Nested Wizard

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

@@ -96,9 +96,6 @@ export default class FormComponent extends Component {
         }
         return this.createSubForm();
     }
-    shouldConditionallyClearOnPristine() {
-        return !this.hasSetValue && super.shouldConditionallyClearOnPristine();
-    }
     get dataReady() {
         return this.subForm?.dataReady || this.subFormReady || Promise.resolve();
     }
@@ -289,13 +286,11 @@ export default class FormComponent extends Component {
                     }
                     this.subForm.attach(element);
                     this.valueChanged = this.hasSetValue;
-                    if (!this.shouldConditionallyClear()) {
-                        if (!this.valueChanged && this.dataValue.state !== 'submitted') {
-                            this.setDefaultValue();
-                        }
-                        else {
-                            this.restoreValue();
-                        }
+                    if (!this.valueChanged && this.dataValue.state !== 'submitted') {
+                        this.setDefaultValue();
+                    }
+                    else {
+                        this.restoreValue();
                     }
                 }
                 if (!this.builderMode && this.component.modalEdit) {
@@ -410,7 +405,7 @@ export default class FormComponent extends Component {
                 _.assign(componentsMap, formComponentsMap);
                 this.component.components = this.subForm.components.map((comp) => comp.component);
                 this.subForm.on('change', () => {
-                    if (this.subForm && !this.shouldConditionallyClear()) {
+                    if (this.subForm) {
                         this.dataValue = this.subForm.getValue();
                         this.triggerChange({
                             noEmit: true
@@ -673,7 +668,20 @@ export default class FormComponent extends Component {
         }
     }
     isEmpty(value = this.dataValue) {
-        return value === null || _.isEqual(value, this.emptyValue);
+        return value === null || _.isEqual(value, this.emptyValue) || (this.areAllComponentsEmpty(value?.data) && !value?._id);
+    }
+    areAllComponentsEmpty(data) {
+        let res = true;
+        if (this.subForm) {
+            this.subForm.everyComponent((comp) => {
+                const componentValue = _.get(data, comp.key);
+                res &= comp.isEmpty(componentValue);
+            });
+        }
+        else {
+            res = false;
+        }
+        return res;
     }
     getValue() {
         if (this.subForm) {

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

@@ -26,8 +26,8 @@ export const getBestMatch: typeof Utils.getBestMatch;
 export const getComponentFromPath: typeof Utils.getComponentFromPath;
 export const getComponentValue: typeof Utils.getComponentValue;
 export const findComponents: typeof Utils.findComponents;
-export const eachComponentDataAsync: (components: Component[], data: DataObject, fn: EachComponentDataAsyncCallback, includeAll?: boolean | undefined, local?: boolean | undefined, parent?: any, parentPaths?: any) => Promise<void>;
-export const eachComponentData: (components: Component[], data: DataObject, fn: EachComponentDataCallback, includeAll?: boolean | undefined, local?: boolean | undefined, parent?: any, parentPaths?: any) => void;
+export const eachComponentDataAsync: (components: import("@formio/core").Component[], data: import("@formio/core").DataObject, fn: import("@formio/core").EachComponentDataAsyncCallback, includeAll?: boolean | undefined, local?: boolean | undefined, parent?: import("@formio/core").Component | undefined, parentPaths?: import("@formio/core").ComponentPaths | undefined) => Promise<void>;
+export const eachComponentData: (components: import("@formio/core").Component[], data: import("@formio/core").DataObject, fn: import("@formio/core").EachComponentDataCallback, includeAll?: boolean | undefined, local?: boolean | undefined, parent?: import("@formio/core").Component | undefined, parentPaths?: import("@formio/core").ComponentPaths | undefined) => void;
 export const getComponentKey: typeof Utils.getComponentKey;
 export const getContextualRowPath: typeof Utils.getContextualRowPath;
 export const getContextualRowData: typeof Utils.getContextualRowData;

package/lib/mjs/utils/utils.js

@@ -8,6 +8,7 @@ import dompurify from 'dompurify';
 import { getValue } from './formUtils';
 import { Evaluator } from './Evaluator';
 import ConditionOperators from './conditionOperators';
+import { convertShowToBoolean } from '@formio/core';
 const interpolate = Evaluator.interpolate;
 export * from './formUtils';
 // Configure JsonLogic
@@ -236,7 +237,7 @@ export function checkSimpleConditional(component, condition, row, data, instance
             default:
                 result = _.every(conditionsResult.flat(), res => !!res);
         }
-        return show ? result : !result;
+        return convertShowToBoolean(show) ? result : !result;
     }
 }
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@formio/js",
-  "version": "5.1.0-dev.6068.e295b11",
+  "version": "5.1.0-dev.6069.caec01d",
   "description": "JavaScript powered Forms with JSON Form Builder",
   "main": "lib/cjs/index.js",
   "exports": {
@@ -81,7 +81,7 @@
   "homepage": "https://github.com/formio/formio.js#readme",
   "dependencies": {
     "@formio/bootstrap": "v3.0.0-dev.121.085d187",
-    "@formio/core": "v2.4.0-dev.2",
+    "@formio/core": "v2.4.0-dev.232.d91b1e4",
     "@formio/text-mask-addons": "3.8.0-formio.4",
     "@formio/vanilla-text-mask": "^5.1.1-formio.1",
     "abortcontroller-polyfill": "^1.7.5",