@formio/js 5.1.0-dev.5522.293c9bf → 5.1.0-dev.5892.54c1dc7

package/lib/cjs/WebformBuilder.js

@@ -1129,11 +1129,14 @@ class WebformBuilder extends Component_1.default {
         const repeatablePaths = [];
         const keys = new Map();
         (0, utils_1.eachComponent)(this.form.components, (comp, path, components, parent, paths) => {
-            if (keys.has(paths.dataPath)) {
-                repeatablePaths.push(paths.dataPath);
-            }
-            else {
-                keys.set(paths.dataPath, true);
+            const isLayout = (0, utils_1.componentInfo)(comp).layout;
+            if (!isLayout) {
+                if (keys.has(paths.dataPath)) {
+                    repeatablePaths.push(paths.dataPath);
+                }
+                else {
+                    keys.set(paths.dataPath, true);
+                }
             }
         }, true);
         return repeatablePaths;
@@ -1150,10 +1153,13 @@ class WebformBuilder extends Component_1.default {
                 comp.setCustomValidity(this.t('apiKey', { key: comp.key }));
                 hasInvalidComponents = true;
             }
-            if (comp.key.replace(badCharacters, '') === '') {
+            else if (comp.key.replace(badCharacters, '') === '') {
                 comp.setCustomValidity(this.t('apiKeyNotValid', { key: comp.key }));
                 hasInvalidComponents = true;
             }
+            else {
+                comp.setCustomValidity();
+            }
         });
         this.emit('builderFormValidityChange', hasInvalidComponents);
     }

package/lib/cjs/components/button/Button.d.ts

@@ -7,7 +7,7 @@ export default class ButtonComponent extends Field {
         weight: number;
         schema: any;
     };
-    static savedValueTypes(schema: any): any;
+    static savedValueTypes(schema: any): string[];
     constructor(component: any, options: any, data: any);
     filesUploading: number;
     get inputInfo(): any;

package/lib/cjs/components/button/Button.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const lodash_1 = __importDefault(require("lodash"));
 const Field_1 = __importDefault(require("../_classes/field/Field"));
 const Input_1 = __importDefault(require("../_classes/input/Input"));
-const formUtils_1 = require("../../utils/formUtils");
+const utils_1 = require("../../utils");
 class ButtonComponent extends Field_1.default {
     static schema(...extend) {
         return Input_1.default.schema({
@@ -35,7 +35,7 @@ class ButtonComponent extends Field_1.default {
         };
     }
     static savedValueTypes(schema) {
-        return (0, formUtils_1.getComponentSavedTypes)(schema) || [formUtils_1.componentValueTypes.boolean];
+        return (0, utils_1.getComponentSavedTypes)(schema) || [utils_1.componentValueTypes.boolean];
     }
     constructor(component, options, data) {
         super(component, options, data);
@@ -306,7 +306,7 @@ class ButtonComponent extends Field_1.default {
                 const form = this.getRoot();
                 const flattened = {};
                 const components = {};
-                (0, formUtils_1.eachComponent)(form.components, (componentWrapper, path) => {
+                (0, utils_1.eachComponent)(form.components, (componentWrapper, path) => {
                     const component = componentWrapper.component || componentWrapper;
                     flattened[path] = component;
                     components[component.key] = component;
@@ -447,7 +447,7 @@ class ButtonComponent extends Field_1.default {
         }, 100);
     }
     get oauthComponentPath() {
-        const pathArray = (0, formUtils_1.getArrayFromComponentPath)(this.path);
+        const pathArray = (0, utils_1.getArrayFromComponentPath)(this.path);
         return lodash_1.default.chain(pathArray).filter(pathPart => !lodash_1.default.isNumber(pathPart)).join('.').value();
     }
     focus() {

package/lib/cjs/components/radio/Radio.d.ts

@@ -28,6 +28,7 @@ export default class RadioComponent extends ListComponent {
     optionsLoaded: boolean | undefined;
     loadedOptions: any[] | undefined;
     beforeSubmit(): Promise<any>;
+    convertValues(values: any): any;
     render(): string;
     attach(element: any): Promise<void>;
     detach(element: any): void;
@@ -41,5 +42,12 @@ export default class RadioComponent extends ListComponent {
     setSelectedClasses(): void;
     updateValue(value: any, flags: any): boolean;
     currentValue: any;
+    /**
+     * Normalize values coming into updateValue. For example, depending on the configuration, string value `"true"` will be normalized to boolean `true`.
+     * @param {*} value - The value to normalize
+     * @returns {*} - Returns the normalized value
+     */
+    convertByDataType(value: any): any;
+    normalizeValue(value: any): any;
 }
 import ListComponent from '../_classes/list/ListComponent';

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

@@ -153,6 +153,12 @@ class RadioComponent extends ListComponent_1.default {
             this.dataReady.then(() => res(true));
         });
     }
+    convertValues(values) {
+        if (this.options.renderMode === 'html' && this.type === 'radio') {
+            return values.map(x => (Object.assign(Object.assign({}, x), { value: this.convertByDataType(x.value) })));
+        }
+        return values;
+    }
     render() {
         if (!this.optionsLoaded) {
             return super.render(this.renderTemplate('loader'));
@@ -160,7 +166,7 @@ class RadioComponent extends ListComponent_1.default {
         return super.render(this.renderTemplate('radio', {
             input: this.inputInfo,
             inline: this.component.inline,
-            values: this.component.dataSrc === 'values' ? this.component.values : this.loadedOptions,
+            values: this.component.dataSrc === 'values' ? this.convertValues(this.component.values) : this.loadedOptions,
             value: this.dataValue,
             row: this.row,
         }));
@@ -406,7 +412,7 @@ class RadioComponent extends ListComponent_1.default {
      * @param {*} value - The value to normalize
      * @returns {*} - Returns the normalized value
      */
-    normalizeValue(value) {
+    convertByDataType(value) {
         const dataType = this.component.dataType || 'auto';
         if (value === this.emptyValue) {
             return value;
@@ -438,14 +444,18 @@ class RadioComponent extends ListComponent_1.default {
                 value = !(!value || value.toString() === 'false');
                 break;
         }
-        if (this.isSelectURL && this.templateData && this.templateData[value]) {
+        return value;
+    }
+    normalizeValue(value) {
+        const valueConverted = this.convertByDataType(value);
+        if (this.isSelectURL && this.templateData && this.templateData[valueConverted]) {
             const submission = this.root.submission;
             if (!submission.metadata.selectData) {
                 submission.metadata.selectData = {};
             }
-            lodash_1.default.set(submission.metadata.selectData, this.path, this.templateData[value]);
+            lodash_1.default.set(submission.metadata.selectData, this.path, this.templateData[valueConverted]);
         }
-        return super.normalizeValue(value);
+        return super.normalizeValue(valueConverted);
     }
 }
 exports.default = RadioComponent;

package/lib/cjs/components/selectboxes/SelectBoxes.d.ts

@@ -8,6 +8,12 @@ export default class SelectBoxesComponent extends RadioComponent {
      * @returns {boolean} - If the value is empty.
      */
     isEmpty(value?: any): boolean;
+    /**
+     * Normalize values coming into updateValue.
+     * @param {any} value - The value to normalize.
+     * @returns {*} - The normalized value
+     */
+    normalizeValue(value: any): any;
     setInputsDisabled(value: any, onlyUnchecked: any): void;
     checkComponentValidity(data: any, dirty: any, rowData: any, options: any, errors?: any[]): boolean;
 }

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

@@ -1,3 +1,10 @@
+/**
+ * For backwards compatibility we a standalone interpolate function. This merely calls the
+ * global mutable Evaluator instance's interpolate function.
+ * @param  {...any} args - interpolate arguments, typically "rawTemplate", "data", and "options"
+ * @returns {any} the interpolation result.
+ */
+export function interpolate(...args: any[]): any;
 /**
  * Set the evaluator to use for evaluating expressions.
  * @param {CoreEvaluator} override - The new evaluator instance to use.
@@ -11,5 +18,4 @@ export class DefaultEvaluator extends CoreEvaluator {
     interpolate(rawTemplate: any, data: any, _options: any): any;
 }
 export let Evaluator: DefaultEvaluator;
-export function interpolate(rawTemplate: any, data: any, _options: any): any;
 import { DefaultEvaluator as CoreEvaluator } from '@formio/core';

package/lib/cjs/utils/Evaluator.js

@@ -62,7 +62,16 @@ class DefaultEvaluator extends core_1.DefaultEvaluator {
 exports.DefaultEvaluator = DefaultEvaluator;
 exports.Evaluator = new DefaultEvaluator();
 // preserve the standalone interpolate function for backwards compatibility
-exports.interpolate = exports.Evaluator.interpolate;
+/**
+ * For backwards compatibility we a standalone interpolate function. This merely calls the
+ * global mutable Evaluator instance's interpolate function.
+ * @param  {...any} args - interpolate arguments, typically "rawTemplate", "data", and "options"
+ * @returns {any} the interpolation result.
+ */
+function interpolate(...args) {
+    return exports.Evaluator.interpolate(...args);
+}
+exports.interpolate = interpolate;
 /**
  * Set the evaluator to use for evaluating expressions.
  * @param {CoreEvaluator} override - The new evaluator instance to use.

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

@@ -3,7 +3,12 @@ export * from "./formUtils";
 export default FormioUtils;
 declare const FormioUtils: {
     Evaluator: import("./Evaluator").DefaultEvaluator;
-    interpolate: (rawTemplate: any, data: any, _options: any) => any;
+    interpolate: typeof interpolate;
+    ConditionOperators: {
+        [x: string]: typeof import("./conditionOperators/IsEqualTo").default | typeof import("./conditionOperators/DateGreaterThan").default;
+    };
+    _: any;
+    moment: typeof moment;
     flattenComponents: typeof import("@formio/core/lib/utils/formUtil").flattenComponents;
     guid: typeof import("@formio/core/lib/utils/formUtil").guid;
     uniqueName: typeof import("@formio/core/lib/utils/formUtil").uniqueName;
@@ -160,4 +165,6 @@ declare const FormioUtils: {
 };
 import { Evaluator } from './Evaluator';
 import { registerEvaluator } from './Evaluator';
+import { interpolate } from './Evaluator';
+import moment from 'moment';
 export { FormioUtils as Utils, Evaluator, registerEvaluator };

package/lib/cjs/utils/index.js

@@ -25,6 +25,9 @@ var __importStar = (this && this.__importStar) || function (mod) {
 var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.registerEvaluator = exports.Evaluator = exports.Utils = void 0;
 const utils = __importStar(require("./utils"));
@@ -32,8 +35,14 @@ const formUtils = __importStar(require("./formUtils"));
 const Evaluator_1 = require("./Evaluator");
 Object.defineProperty(exports, "Evaluator", { enumerable: true, get: function () { return Evaluator_1.Evaluator; } });
 Object.defineProperty(exports, "registerEvaluator", { enumerable: true, get: function () { return Evaluator_1.registerEvaluator; } });
+const conditionOperators_1 = __importDefault(require("./conditionOperators"));
+const lodash_1 = __importDefault(require("lodash"));
+const moment_1 = __importDefault(require("moment"));
 const FormioUtils = Object.assign(Object.assign(Object.assign({}, utils), formUtils), { Evaluator: Evaluator_1.Evaluator,
-    interpolate: Evaluator_1.interpolate });
+    interpolate: Evaluator_1.interpolate,
+    ConditionOperators: conditionOperators_1.default,
+    _: lodash_1.default,
+    moment: moment_1.default });
 exports.Utils = FormioUtils;
 if (typeof global === 'object') {
     global.FormioUtils = FormioUtils;

package/lib/cjs/utils/utils.js

@@ -209,13 +209,20 @@ function checkSimpleConditional(component, condition, row, data, instance) {
             return true;
         }
         const conditionsResult = lodash_1.default.map(conditions, (cond) => {
-            var _a, _b;
             const { value: comparedValue, operator, component: conditionComponentPath } = cond;
             if (!conditionComponentPath) {
                 return true;
             }
             const splittedConditionPath = conditionComponentPath.split('.');
-            const conditionalPaths = ((_a = instance === null || instance === void 0 ? void 0 : instance.parent) === null || _a === void 0 ? void 0 : _a.type) === 'datagrid' || ((_b = instance === null || instance === void 0 ? void 0 : instance.parent) === null || _b === void 0 ? void 0 : _b.type) === 'editgrid' ? [] : getConditionalPathsRecursive(splittedConditionPath, data);
+            const checkParentTypeInTree = (instance, componentType) => {
+                if (!(instance === null || instance === void 0 ? void 0 : instance.parent)) {
+                    return false;
+                }
+                return (instance === null || instance === void 0 ? void 0 : instance.parent.type) === componentType || checkParentTypeInTree(instance.parent, componentType);
+            };
+            const conditionalPaths = checkParentTypeInTree(instance, 'datagrid') || checkParentTypeInTree(instance, 'editgrid')
+                ? []
+                : getConditionalPathsRecursive(splittedConditionPath, data);
             if (conditionalPaths.length > 0) {
                 return conditionalPaths.map((path) => {
                     const value = getComponentActualValue(path, data, row);
@@ -334,7 +341,7 @@ function getRow(component, row, instance, conditional) {
     }
     const dataParent = getDataParentComponent(instance);
     if (dataParent) {
-        const parentPath = (_a = dataParent.paths) === null || _a === void 0 ? void 0 : _a.localDataPath;
+        const parentPath = (_a = dataParent.paths) === null || _a === void 0 ? void 0 : _a.localPath;
         const isTriggerCondtionComponentPath = condition.when || !condition.conditions
             ? (_b = condition.when) === null || _b === void 0 ? void 0 : _b.startsWith((_c = dataParent.paths) === null || _c === void 0 ? void 0 : _c.localPath)
             : lodash_1.default.some(condition.conditions, cond => { var _a; return cond.component.startsWith((_a = dataParent.paths) === null || _a === void 0 ? void 0 : _a.localPath); });

package/lib/mjs/WebformBuilder.js

@@ -3,7 +3,7 @@ import Component from './components/_classes/component/Component';
 import tippy from 'tippy.js';
 import Components from './components/Components';
 import { Formio } from './Formio';
-import { fastCloneDeep, bootstrapVersion, getArrayFromComponentPath, getStringFromComponentPath, eachComponent, getComponent, } from './utils';
+import { fastCloneDeep, bootstrapVersion, getArrayFromComponentPath, getStringFromComponentPath, eachComponent, getComponent, componentInfo } from './utils';
 import BuilderUtils from './utils/builder';
 import _ from 'lodash';
 import autoScroll from 'dom-autoscroller';
@@ -1112,11 +1112,14 @@ export default class WebformBuilder extends Component {
         const repeatablePaths = [];
         const keys = new Map();
         eachComponent(this.form.components, (comp, path, components, parent, paths) => {
-            if (keys.has(paths.dataPath)) {
-                repeatablePaths.push(paths.dataPath);
-            }
-            else {
-                keys.set(paths.dataPath, true);
+            const isLayout = componentInfo(comp).layout;
+            if (!isLayout) {
+                if (keys.has(paths.dataPath)) {
+                    repeatablePaths.push(paths.dataPath);
+                }
+                else {
+                    keys.set(paths.dataPath, true);
+                }
             }
         }, true);
         return repeatablePaths;
@@ -1133,10 +1136,13 @@ export default class WebformBuilder extends Component {
                 comp.setCustomValidity(this.t('apiKey', { key: comp.key }));
                 hasInvalidComponents = true;
             }
-            if (comp.key.replace(badCharacters, '') === '') {
+            else if (comp.key.replace(badCharacters, '') === '') {
                 comp.setCustomValidity(this.t('apiKeyNotValid', { key: comp.key }));
                 hasInvalidComponents = true;
             }
+            else {
+                comp.setCustomValidity();
+            }
         });
         this.emit('builderFormValidityChange', hasInvalidComponents);
     }

package/lib/mjs/components/button/Button.d.ts

@@ -7,7 +7,7 @@ export default class ButtonComponent extends Field {
         weight: number;
         schema: any;
     };
-    static savedValueTypes(schema: any): any;
+    static savedValueTypes(schema: any): string[];
     constructor(component: any, options: any, data: any);
     filesUploading: number;
     get inputInfo(): any;

package/lib/mjs/components/button/Button.js

@@ -1,7 +1,7 @@
 import _ from 'lodash';
 import Field from '../_classes/field/Field';
 import Input from '../_classes/input/Input';
-import { componentValueTypes, eachComponent, getArrayFromComponentPath, getComponentSavedTypes } from '../../utils/formUtils';
+import { componentValueTypes, eachComponent, getArrayFromComponentPath, getComponentSavedTypes } from '../../utils';
 export default class ButtonComponent extends Field {
     static schema(...extend) {
         return Input.schema({

package/lib/mjs/components/radio/Radio.d.ts

@@ -28,6 +28,7 @@ export default class RadioComponent extends ListComponent {
     optionsLoaded: boolean | undefined;
     loadedOptions: any[] | undefined;
     beforeSubmit(): Promise<any>;
+    convertValues(values: any): any;
     render(): string;
     attach(element: any): Promise<void>;
     detach(element: any): void;
@@ -41,5 +42,12 @@ export default class RadioComponent extends ListComponent {
     setSelectedClasses(): void;
     updateValue(value: any, flags: any): boolean;
     currentValue: any;
+    /**
+     * Normalize values coming into updateValue. For example, depending on the configuration, string value `"true"` will be normalized to boolean `true`.
+     * @param {*} value - The value to normalize
+     * @returns {*} - Returns the normalized value
+     */
+    convertByDataType(value: any): any;
+    normalizeValue(value: any): any;
 }
 import ListComponent from '../_classes/list/ListComponent';

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

@@ -153,6 +153,12 @@ export default class RadioComponent extends ListComponent {
             this.dataReady.then(() => res(true));
         });
     }
+    convertValues(values) {
+        if (this.options.renderMode === 'html' && this.type === 'radio') {
+            return values.map(x => ({ ...x, value: this.convertByDataType(x.value) }));
+        }
+        return values;
+    }
     render() {
         if (!this.optionsLoaded) {
             return super.render(this.renderTemplate('loader'));
@@ -160,7 +166,7 @@ export default class RadioComponent extends ListComponent {
         return super.render(this.renderTemplate('radio', {
             input: this.inputInfo,
             inline: this.component.inline,
-            values: this.component.dataSrc === 'values' ? this.component.values : this.loadedOptions,
+            values: this.component.dataSrc === 'values' ? this.convertValues(this.component.values) : this.loadedOptions,
             value: this.dataValue,
             row: this.row,
         }));
@@ -406,7 +412,7 @@ export default class RadioComponent extends ListComponent {
      * @param {*} value - The value to normalize
      * @returns {*} - Returns the normalized value
      */
-    normalizeValue(value) {
+    convertByDataType(value) {
         const dataType = this.component.dataType || 'auto';
         if (value === this.emptyValue) {
             return value;
@@ -438,13 +444,17 @@ export default class RadioComponent extends ListComponent {
                 value = !(!value || value.toString() === 'false');
                 break;
         }
-        if (this.isSelectURL && this.templateData && this.templateData[value]) {
+        return value;
+    }
+    normalizeValue(value) {
+        const valueConverted = this.convertByDataType(value);
+        if (this.isSelectURL && this.templateData && this.templateData[valueConverted]) {
             const submission = this.root.submission;
             if (!submission.metadata.selectData) {
                 submission.metadata.selectData = {};
             }
-            _.set(submission.metadata.selectData, this.path, this.templateData[value]);
+            _.set(submission.metadata.selectData, this.path, this.templateData[valueConverted]);
         }
-        return super.normalizeValue(value);
+        return super.normalizeValue(valueConverted);
     }
 }

package/lib/mjs/components/selectboxes/SelectBoxes.d.ts

@@ -8,6 +8,12 @@ export default class SelectBoxesComponent extends RadioComponent {
      * @returns {boolean} - If the value is empty.
      */
     isEmpty(value?: any): boolean;
+    /**
+     * Normalize values coming into updateValue.
+     * @param {any} value - The value to normalize.
+     * @returns {*} - The normalized value
+     */
+    normalizeValue(value: any): any;
     setInputsDisabled(value: any, onlyUnchecked: any): void;
     checkComponentValidity(data: any, dirty: any, rowData: any, options: any, errors?: any[]): boolean;
 }

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

@@ -1,3 +1,10 @@
+/**
+ * For backwards compatibility we a standalone interpolate function. This merely calls the
+ * global mutable Evaluator instance's interpolate function.
+ * @param  {...any} args - interpolate arguments, typically "rawTemplate", "data", and "options"
+ * @returns {any} the interpolation result.
+ */
+export function interpolate(...args: any[]): any;
 /**
  * Set the evaluator to use for evaluating expressions.
  * @param {CoreEvaluator} override - The new evaluator instance to use.
@@ -11,5 +18,4 @@ export class DefaultEvaluator extends CoreEvaluator {
     interpolate(rawTemplate: any, data: any, _options: any): any;
 }
 export let Evaluator: DefaultEvaluator;
-export function interpolate(rawTemplate: any, data: any, _options: any): any;
 import { DefaultEvaluator as CoreEvaluator } from '@formio/core';

package/lib/mjs/utils/Evaluator.js

@@ -52,7 +52,15 @@ export class DefaultEvaluator extends CoreEvaluator {
 }
 export let Evaluator = new DefaultEvaluator();
 // preserve the standalone interpolate function for backwards compatibility
-export const interpolate = Evaluator.interpolate;
+/**
+ * For backwards compatibility we a standalone interpolate function. This merely calls the
+ * global mutable Evaluator instance's interpolate function.
+ * @param  {...any} args - interpolate arguments, typically "rawTemplate", "data", and "options"
+ * @returns {any} the interpolation result.
+ */
+export function interpolate(...args) {
+    return Evaluator.interpolate(...args);
+}
 /**
  * Set the evaluator to use for evaluating expressions.
  * @param {CoreEvaluator} override - The new evaluator instance to use.

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

@@ -3,7 +3,12 @@ export * from "./formUtils";
 export default FormioUtils;
 declare const FormioUtils: {
     Evaluator: import("./Evaluator").DefaultEvaluator;
-    interpolate: (rawTemplate: any, data: any, _options: any) => any;
+    interpolate: typeof interpolate;
+    ConditionOperators: {
+        [x: string]: typeof import("./conditionOperators/IsEqualTo").default | typeof import("./conditionOperators/DateGreaterThan").default;
+    };
+    _: any;
+    moment: typeof moment;
     flattenComponents: typeof import("@formio/core/lib/utils/formUtil").flattenComponents;
     guid: typeof import("@formio/core/lib/utils/formUtil").guid;
     uniqueName: typeof import("@formio/core/lib/utils/formUtil").uniqueName;
@@ -160,4 +165,6 @@ declare const FormioUtils: {
 };
 import { Evaluator } from './Evaluator';
 import { registerEvaluator } from './Evaluator';
+import { interpolate } from './Evaluator';
+import moment from 'moment';
 export { FormioUtils as Utils, Evaluator, registerEvaluator };

package/lib/mjs/utils/index.js

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

package/lib/mjs/utils/utils.js

@@ -199,7 +199,15 @@ export function checkSimpleConditional(component, condition, row, data, instance
                 return true;
             }
             const splittedConditionPath = conditionComponentPath.split('.');
-            const conditionalPaths = instance?.parent?.type === 'datagrid' || instance?.parent?.type === 'editgrid' ? [] : getConditionalPathsRecursive(splittedConditionPath, data);
+            const checkParentTypeInTree = (instance, componentType) => {
+                if (!instance?.parent) {
+                    return false;
+                }
+                return instance?.parent.type === componentType || checkParentTypeInTree(instance.parent, componentType);
+            };
+            const conditionalPaths = checkParentTypeInTree(instance, 'datagrid') || checkParentTypeInTree(instance, 'editgrid')
+                ? []
+                : getConditionalPathsRecursive(splittedConditionPath, data);
             if (conditionalPaths.length > 0) {
                 return conditionalPaths.map((path) => {
                     const value = getComponentActualValue(path, data, row);
@@ -313,7 +321,7 @@ function getRow(component, row, instance, conditional) {
     }
     const dataParent = getDataParentComponent(instance);
     if (dataParent) {
-        const parentPath = dataParent.paths?.localDataPath;
+        const parentPath = dataParent.paths?.localPath;
         const isTriggerCondtionComponentPath = condition.when || !condition.conditions
             ? condition.when?.startsWith(dataParent.paths?.localPath)
             : _.some(condition.conditions, cond => cond.component.startsWith(dataParent.paths?.localPath));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@formio/js",
-  "version": "5.1.0-dev.5522.293c9bf",
+  "version": "5.1.0-dev.5892.54c1dc7",
   "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": "2.4.0-dev.245.326cac7",
+    "@formio/core": "v2.4.0-dev.255.7fab6ff",
     "@formio/text-mask-addons": "3.8.0-formio.4",
     "@formio/vanilla-text-mask": "^5.1.1-formio.1",
     "abortcontroller-polyfill": "^1.7.5",