@formio/js 5.0.0 → 5.1.0-rc.1

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

@@ -1,7 +1,6 @@
 import _ from 'lodash';
 import NestedArrayComponent from '../_classes/nestedarray/NestedArrayComponent';
 import { fastCloneDeep, getFocusableElements } from '../../utils/utils';
-import Components from '../Components';
 import dragula from 'dragula';
 export default class DataGridComponent extends NestedArrayComponent {
     static schema(...extend) {
@@ -407,7 +406,6 @@ export default class DataGridComponent extends NestedArrayComponent {
             }
             component.rowIndex = rowIndex;
             component.row = `${rowIndex}-${colIndex}`;
-            component.path = Components.getComponentPath(component);
         });
     }
     updateRowsComponents(rowIndex) {
@@ -473,6 +471,7 @@ export default class DataGridComponent extends NestedArrayComponent {
             const options = _.clone(this.options);
             options.name += `[${rowIndex}]`;
             options.row = `${rowIndex}-${colIndex}`;
+            options.rowIndex = rowIndex;
             let columnComponent;
             if (this.builderMode) {
                 col.id = col.id + rowIndex;
@@ -595,49 +594,6 @@ export default class DataGridComponent extends NestedArrayComponent {
     restoreComponentsContext() {
         this.rows.forEach((row, index) => _.forIn(row, (component) => component.data = this.dataValue[index]));
     }
-    getComponent(path, fn) {
-        path = Array.isArray(path) ? path : [path];
-        const [key, ...remainingPath] = path;
-        let result = [];
-        if (_.isNumber(key) && remainingPath.length) {
-            const compKey = remainingPath.pop();
-            result = this.rows[key][compKey];
-            // If the component is inside a Layout Component, try to find it among all the row's components
-            if (!result) {
-                Object.entries(this.rows[key]).forEach(([, comp]) => {
-                    if ('getComponent' in comp) {
-                        const possibleResult = comp.getComponent([compKey], fn);
-                        if (possibleResult) {
-                            result = possibleResult;
-                        }
-                    }
-                });
-            }
-            if (result && _.isFunction(fn)) {
-                fn(result, this.getComponents());
-            }
-            if (remainingPath.length && 'getComponent' in result) {
-                return result.getComponent(remainingPath, fn);
-            }
-            return result;
-        }
-        if (!_.isString(key)) {
-            return result;
-        }
-        this.everyComponent((component, components) => {
-            if (component.component.key === key) {
-                let comp = component;
-                if (remainingPath.length > 0 && 'getComponent' in component) {
-                    comp = component.getComponent(remainingPath, fn);
-                }
-                else if (fn) {
-                    fn(component, components);
-                }
-                result = result.concat(comp);
-            }
-        });
-        return result.length > 0 ? result : null;
-    }
     toggleGroup(element, index) {
         element.classList.toggle('collapsed');
         _.each(this.refs.chunks[index], row => {

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

@@ -3,7 +3,6 @@ import DataGridComponent from '../datagrid/DataGrid';
 import _ from 'lodash';
 import EventEmitter from 'eventemitter3';
 import { componentValueTypes, getComponentSavedTypes, uniqueKey } from '../../utils/utils';
-import Components from '../Components';
 export default class DataMapComponent extends DataGridComponent {
     static schema(...extend) {
         return Component.schema({
@@ -227,6 +226,7 @@ export default class DataMapComponent extends DataGridComponent {
         options.events = new EventEmitter();
         options.name += `[${rowIndex}]`;
         options.row = `${rowIndex}`;
+        options.rowIndex = rowIndex;
         const components = {};
         components['__key'] = this.createComponent(this.keySchema, options, { __key: this.builderMode ? this.defaultRowKey : key });
         components['__key'].on('componentChange', (event) => {
@@ -236,7 +236,6 @@ export default class DataMapComponent extends DataGridComponent {
             delete dataValue[key];
             const comp = components[this.valueKey];
             comp.component.key = newKey;
-            comp.path = Components.getComponentPath(comp);
             key = newKey;
         });
         const valueComponent = _.clone(this.component.valueComponent);

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

@@ -913,6 +913,7 @@ export default class EditGridComponent extends NestedArrayComponent {
             const options = _.clone(this.options);
             options.name += `[${rowIndex}]`;
             options.row = `${rowIndex}-${colIndex}`;
+            options.rowIndex = rowIndex;
             options.onChange = (flags = {}, changed, modified) => {
                 if (changed.instance.root?.id && (this.root?.id !== changed.instance.root.id)) {
                     changed.instance.root.triggerChange(flags, changed, modified);
@@ -929,7 +930,7 @@ export default class EditGridComponent extends NestedArrayComponent {
                         ...flags,
                         changed,
                     }, editRow.data, editRow.components);
-                    this.validateRow(editRow, false);
+                    this.validateRow(editRow, false, false);
                 }
                 if (this.variableTypeComponentsIndexes.length) {
                     this.checkRowVariableTypeComponents(editRow, rowIndex);
@@ -969,22 +970,24 @@ export default class EditGridComponent extends NestedArrayComponent {
     validateRow(editRow, dirty, forceSilentCheck, fromSubmission) {
         editRow.errors = [];
         if (this.shouldValidateRow(editRow, dirty, fromSubmission)) {
-            const silentCheck = (this.component.rowDrafts && !this.shouldValidateDraft(editRow)) || forceSilentCheck;
+            const silentCheck = forceSilentCheck === false ? false : ((this.component.rowDrafts && !this.shouldValidateDraft(editRow)) || forceSilentCheck);
             const rootValue = fastCloneDeep(this.rootValue);
             const editGridValue = _.get(rootValue, this.path, []);
             editGridValue[editRow.rowIndex] = editRow.data;
             _.set(rootValue, this.path, editGridValue);
             const validationProcessorProcess = (context) => this.validationProcessor(context, { dirty, silentCheck });
             const errors = processSync({
-                components: fastCloneDeep(this.component.components).map((component) => {
-                    component.parentPath = `${this.path}[${editRow.rowIndex}]`;
-                    return component;
-                }),
+                components: this.component.components,
                 data: rootValue,
                 row: editRow.data,
                 process: 'validateRow',
                 instances: this.componentsMap,
                 scope: { errors: [] },
+                parent: this.component,
+                parentPaths: {
+                    ...this.paths,
+                    dataIndex: editRow.rowIndex
+                },
                 processors: [
                     {
                         process: validationProcessorProcess,

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

@@ -21,7 +21,7 @@ export default class FormComponent extends Component {
     get useOriginalRevision(): any;
     setFormRevision(rev: any): void;
     subFormRevision: any;
-    getComponent(path: any, fn: any): any;
+    getComponent(path: any): any;
     getSubOptions(options?: {}): {};
     render(): string;
     asString(value: any): any;
@@ -55,8 +55,6 @@ export default class FormComponent extends Component {
      */
     loadSubForm(fromAttach: boolean): Promise<any>;
     subFormLoading: boolean | undefined;
-    get subFormData(): any;
-    checkComponentValidity(data: any, dirty: any, row: any, options: any, errors?: any[]): any;
     checkComponentConditions(data: any, flags: any, row: any): any;
     calculateValue(data: any, flags: any, row: any): any;
     setPristine(pristine: any): void;
@@ -90,6 +88,13 @@ export default class FormComponent extends Component {
     isHidden(): boolean;
     setValue(submission: any, flags?: {}): boolean;
     setSubFormValue(submission: any, flags: any): void;
+    /**
+     * Sets the subform value
+     * @param {object|null|undefined} submission - The submission to set.
+     * @param {object|null|undefined} flags - Any flags to apply when setting the submission.
+     * @return {void}
+     */
+    onSetSubFormValue(submission: object | null | undefined, flags: object | null | undefined): void;
     areAllComponentsEmpty(data: any): boolean;
     updateSubFormVisibility(): void;
     /**

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

@@ -3,7 +3,7 @@ import _ from 'lodash';
 import Component from '../_classes/component/Component';
 import ComponentModal from '../_classes/componentModal/ComponentModal';
 import EventEmitter from 'eventemitter3';
-import { isMongoId, eachComponent, getStringFromComponentPath, getArrayFromComponentPath, componentValueTypes } from '../../utils/utils';
+import { isMongoId, eachComponent, componentValueTypes } from '../../utils/utils';
 import { Formio } from '../../Formio';
 import Form from '../../Form';
 export default class FormComponent extends Component {
@@ -127,15 +127,11 @@ export default class FormComponent extends Component {
             this.subFormRevision = undefined;
         }
     }
-    getComponent(path, fn) {
-        path = getArrayFromComponentPath(path);
-        if (path[0] === 'data') {
-            path.shift();
-        }
-        const originalPathStr = `${this.path}.data.${getStringFromComponentPath(path)}`;
-        if (this.subForm) {
-            return this.subForm.getComponent(path, fn, originalPathStr);
+    getComponent(path) {
+        if (!this.subForm) {
+            return null;
         }
+        return this.subForm.getComponent(path);
     }
     /* eslint-disable max-statements */
     getSubOptions(options = {}) {
@@ -203,6 +199,7 @@ export default class FormComponent extends Component {
         if (this.options.skipDraftRestore) {
             options.skipDraftRestore = this.options.skipDraftRestore;
         }
+        options.parent = this;
         return options;
     }
     /* eslint-enable max-statements */
@@ -294,6 +291,7 @@ export default class FormComponent extends Component {
                     const modalShouldBeOpened = this.componentModal ? this.componentModal.isOpened : false;
                     const currentValue = modalShouldBeOpened ? this.componentModal.currentValue : this.dataValue;
                     this.componentModal = new ComponentModal(this, element, modalShouldBeOpened, currentValue, this._referenceAttributeName);
+                    this.subForm.element = this.componentModal.refs.componentContent || this.subForm.element;
                     this.setOpenModalElement();
                 }
                 this.calculateValue();
@@ -391,6 +389,10 @@ export default class FormComponent extends Component {
             return (new Form(form, this.getSubOptions())).ready.then((instance) => {
                 this.subForm = instance;
                 this.subForm.currentForm = this;
+                const componentsMap = this.componentsMap;
+                const formComponentsMap = this.subForm.componentsMap;
+                _.assign(componentsMap, formComponentsMap);
+                this.component.components = this.subForm.components.map((comp) => comp.component);
                 this.subForm.parent = this;
                 this.subForm.parentVisible = this.visible;
                 this.subForm.on('change', () => {
@@ -409,6 +411,8 @@ export default class FormComponent extends Component {
                 this.valueChanged = this.hasSetValue;
                 this.onChange();
                 return this.subForm;
+            }).catch((err) => {
+                console.log(err);
             });
         }).then((subForm) => {
             this.updateSubWizards(subForm);
@@ -464,17 +468,6 @@ export default class FormComponent extends Component {
         }
         return Promise.resolve();
     }
-    get subFormData() {
-        return this.dataValue?.data || {};
-    }
-    checkComponentValidity(data, dirty, row, options, errors = []) {
-        options = options || {};
-        const silentCheck = options.silentCheck || false;
-        if (this.subForm) {
-            return this.subForm.checkValidity(this.subFormData, dirty, null, silentCheck, errors);
-        }
-        return super.checkComponentValidity(data, dirty, row, options, errors);
-    }
     checkComponentConditions(data, flags, row) {
         const visible = super.checkComponentConditions(data, flags, row);
         // Return if already hidden
@@ -482,14 +475,14 @@ export default class FormComponent extends Component {
             return visible;
         }
         if (this.subForm) {
-            return this.subForm.checkConditions(this.subFormData);
+            return this.subForm.checkConditions(data, flags, row);
         }
         // There are few cases when subForm is not loaded when a change is triggered,
         // so we need to perform checkConditions after it is ready, or some conditional fields might be hidden in View mode
         else if (this.subFormReady) {
             this.subFormReady.then(() => {
                 if (this.subForm) {
-                    return this.subForm.checkConditions(this.subFormData);
+                    return this.subForm.checkConditions(data, flags, row);
                 }
             });
         }
@@ -497,7 +490,7 @@ export default class FormComponent extends Component {
     }
     calculateValue(data, flags, row) {
         if (this.subForm) {
-            return this.subForm.calculateValue(this.subFormData, flags);
+            return this.subForm.calculateValue(data, flags, row);
         }
         return super.calculateValue(data, flags, row);
     }
@@ -539,7 +532,7 @@ export default class FormComponent extends Component {
                 }
                 this.subForm.nosubmit = false;
                 this.subForm.submitted = true;
-                return this.subForm.submitForm().then(result => {
+                return this.subForm.submitForm({}, true).then(result => {
                     this.subForm.loading = false;
                     this.subForm.showAllErrors = false;
                     this.dataValue = result.submission;
@@ -639,9 +632,18 @@ export default class FormComponent extends Component {
             });
         }
         else {
-            this.subForm.setValue(submission, flags);
+            this.onSetSubFormValue(submission, flags);
         }
     }
+    /**
+     * Sets the subform value
+     * @param {object|null|undefined} submission - The submission to set.
+     * @param {object|null|undefined} flags - Any flags to apply when setting the submission.
+     * @return {void}
+     */
+    onSetSubFormValue(submission, flags) {
+        this.subForm.setValue(submission, flags);
+    }
     isEmpty(value = this.dataValue) {
         return value === null || _.isEqual(value, this.emptyValue) || (this.areAllComponentsEmpty(value?.data) && !value?._id);
     }

package/lib/mjs/components/selectboxes/SelectBoxes.js

@@ -276,7 +276,6 @@ export default class SelectBoxesComponent extends RadioComponent {
         else {
             return super.setCustomValidity(messages, dirty, external);
         }
-        ;
     }
     validateValueAvailability(setting, value) {
         if (!boolValue(setting) || !value) {

package/lib/mjs/components/signature/Signature.d.ts

@@ -22,7 +22,6 @@ export default class SignatureComponent extends Input {
     showCanvas(show: any): void;
     onDisabled(): void;
     checkSize(force: any, scale: any): void;
-    getModalPreviewTemplate(): any;
     signaturePad: SignaturePad | null | undefined;
     observer: any;
     getValueAsString(value: any): "" | "Yes" | "No";

package/lib/mjs/components/signature/Signature.js

@@ -169,7 +169,7 @@ export default class SignatureComponent extends Input {
         return false;
     }
     getModalPreviewTemplate() {
-        return this.renderTemplate('modalPreview', {
+        return this.renderModalPreview({
             previewText: this.dataValue ?
                 `<img src=${this.dataValue} ${this._referenceAttributeName}='openModal' style="width: 100%;height: 100%;" />` :
                 this.t('Click to Sign')

package/lib/mjs/utils/conditionOperators/DateGreaterThan.js

@@ -14,13 +14,13 @@ export default class DateGeaterThan extends ConditionOperator {
         return { date, comparedDate };
     }
     execute(options, functionName = 'isAfter') {
-        const { value, instance, conditionComponentPath } = options;
+        const { value, instance, path } = options;
         if (!value) {
             return false;
         }
         let conditionTriggerComponent = null;
         if (instance?.root?.getComponent) {
-            conditionTriggerComponent = instance.root.getComponent(conditionComponentPath);
+            conditionTriggerComponent = instance.root.getComponent(path);
         }
         if (conditionTriggerComponent && conditionTriggerComponent.isPartialDay && conditionTriggerComponent.isPartialDay(value)) {
             return false;

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

@@ -1,8 +1,8 @@
 export default class IsEmptyValue extends ConditionOperator {
-    execute({ value, instance, conditionComponentPath }: {
+    execute({ value, instance, path }: {
         value: any;
         instance: any;
-        conditionComponentPath: any;
+        path: any;
     }): any;
     getResult(options: any): any;
 }

package/lib/mjs/utils/conditionOperators/IsEmptyValue.js

@@ -10,10 +10,10 @@ export default class IsEmptyValue extends ConditionOperator {
     static get requireValue() {
         return false;
     }
-    execute({ value, instance, conditionComponentPath }) {
+    execute({ value, instance, path }) {
         const isEmptyValue = _.isEmpty(_.isNumber(value) ? String(value) : value);
         if (instance?.root?.getComponent) {
-            const conditionTriggerComponent = instance.root.getComponent(conditionComponentPath);
+            const conditionTriggerComponent = instance.root.getComponent(path);
             return conditionTriggerComponent?.isEmpty ? conditionTriggerComponent.isEmpty() : isEmptyValue;
         }
         return isEmptyValue;

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

@@ -1,9 +1,9 @@
 export default class IsEqualTo extends ConditionOperator {
-    execute({ value, comparedValue, instance, conditionComponentPath }: {
+    execute({ value, comparedValue, instance, path }: {
         value: any;
         comparedValue: any;
         instance: any;
-        conditionComponentPath: any;
+        path: any;
     }): any;
 }
 import ConditionOperator from './ConditionOperator';

package/lib/mjs/utils/conditionOperators/IsEqualTo.js

@@ -8,7 +8,7 @@ export default class IsEqualTo extends ConditionOperator {
     static get displayedName() {
         return 'Is Equal To';
     }
-    execute({ value, comparedValue, instance, conditionComponentPath }) {
+    execute({ value, comparedValue, instance, path }) {
         if ((value || value === false) && comparedValue && typeof value !== typeof comparedValue && _.isString(comparedValue)) {
             try {
                 comparedValue = JSON.parse(comparedValue);
@@ -17,7 +17,7 @@ export default class IsEqualTo extends ConditionOperator {
             catch (e) { }
         }
         if (instance?.root?.getComponent) {
-            const conditionTriggerComponent = instance.root.getComponent(conditionComponentPath);
+            const conditionTriggerComponent = instance.root.getComponent(path);
             if (conditionTriggerComponent
                 && isSelectResourceWithObjectValue(conditionTriggerComponent.component)
                 && conditionTriggerComponent.component?.template) {

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

@@ -1,22 +1,33 @@
-/**
- * Deprecated version of findComponents. Renamed to searchComponents.
- * @param {import('@formio/core').Component[]} components - The components to find components within.
- * @param {object} query - The query to use when searching for the components.
- * @returns {import('@formio/core').Component[]} - The result of the component that is found.
- */
-export function findComponents(components: import('@formio/core').Component[], query: object): import('@formio/core').Component[];
 export const flattenComponents: typeof Utils.flattenComponents;
 export const guid: typeof Utils.guid;
 export const uniqueName: typeof Utils.uniqueName;
-export const MODEL_TYPES: any;
+export const MODEL_TYPES_OF_KNOWN_COMPONENTS: {
+    nestedArray: string[];
+    nestedDataArray: string[];
+    dataObject: string[];
+    object: string[];
+    map: string[];
+    content: string[];
+    string: string[];
+    number: string[];
+    boolean: string[];
+    none: string[];
+    any: string[];
+};
 export const getModelType: typeof Utils.getModelType;
-export const getComponentAbsolutePath: typeof Utils.getComponentAbsolutePath;
-export const getComponentPath: typeof Utils.getComponentPath;
+export const getComponentPath: any;
+export const setComponentScope: typeof Utils.setComponentScope;
+export const resetComponentScope: typeof Utils.resetComponentScope;
 export const isComponentNestedDataType: typeof Utils.isComponentNestedDataType;
 export const componentPath: typeof Utils.componentPath;
-export const componentChildPath: any;
-export const eachComponentDataAsync: (components: Component[], data: DataObject, fn: EachComponentDataAsyncCallback, path?: string | undefined, index?: number | undefined, parent?: any, includeAll?: boolean | undefined) => Promise<void>;
-export const eachComponentData: (components: Component[], data: DataObject, fn: EachComponentDataCallback, path?: string | undefined, index?: number | undefined, parent?: any, includeAll?: boolean | undefined) => void;
+export const getComponentPaths: typeof Utils.getComponentPaths;
+export const componentMatches: typeof Utils.componentMatches;
+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 getComponentKey: typeof Utils.getComponentKey;
 export const getContextualRowPath: typeof Utils.getContextualRowPath;
 export const getContextualRowData: typeof Utils.getContextualRowData;
@@ -24,7 +35,7 @@ export const componentInfo: typeof Utils.componentInfo;
 export const eachComponent: typeof Utils.eachComponent;
 export const eachComponentAsync: typeof Utils.eachComponentAsync;
 export const getComponentData: typeof Utils.getComponentData;
-export const getComponentActualValue: typeof Utils.getComponentActualValue;
+export const getComponentActualValue: any;
 export const isLayoutComponent: typeof Utils.isLayoutComponent;
 export const matchComponent: typeof Utils.matchComponent;
 export const getComponent: typeof Utils.getComponent;

package/lib/mjs/utils/formUtils.js

@@ -1,13 +1,3 @@
 import { Utils } from '@formio/core';
-const { flattenComponents, guid, uniqueName, MODEL_TYPES, getModelType, getComponentAbsolutePath, getComponentPath, isComponentNestedDataType, componentPath, componentChildPath, eachComponentDataAsync, eachComponentData, getComponentKey, getContextualRowPath, getContextualRowData, componentInfo, eachComponent, eachComponentAsync, getComponentData, getComponentActualValue, isLayoutComponent, matchComponent, getComponent, searchComponents, removeComponent, hasCondition, parseFloatExt, formatAsCurrency, escapeRegExCharacters, getValue, getStrings, generateFormChange, applyFormChanges, findComponent, getEmptyValue, isComponentDataEmpty, isSelectResourceWithObjectValue, compareSelectResourceWithObjectTypeValues, getItemTemplateKeys } = Utils;
-/**
- * Deprecated version of findComponents. Renamed to searchComponents.
- * @param {import('@formio/core').Component[]} components - The components to find components within.
- * @param {object} query - The query to use when searching for the components.
- * @returns {import('@formio/core').Component[]} - The result of the component that is found.
- */
-export function findComponents(components, query) {
-    console.warn('formio.js/utils findComponents is deprecated. Use searchComponents instead.');
-    return searchComponents(components, query);
-}
-export { flattenComponents, guid, uniqueName, MODEL_TYPES, getModelType, getComponentAbsolutePath, getComponentPath, isComponentNestedDataType, componentPath, componentChildPath, eachComponentDataAsync, eachComponentData, getComponentKey, getContextualRowPath, getContextualRowData, componentInfo, eachComponent, eachComponentAsync, getComponentData, getComponentActualValue, isLayoutComponent, matchComponent, getComponent, searchComponents, removeComponent, hasCondition, parseFloatExt, formatAsCurrency, escapeRegExCharacters, getValue, getStrings, generateFormChange, applyFormChanges, findComponent, getEmptyValue, isComponentDataEmpty, isSelectResourceWithObjectValue, compareSelectResourceWithObjectTypeValues, getItemTemplateKeys };
+const { flattenComponents, guid, uniqueName, MODEL_TYPES_OF_KNOWN_COMPONENTS, getModelType, getComponentPath, setComponentScope, resetComponentScope, isComponentNestedDataType, componentPath, getComponentPaths, componentMatches, getBestMatch, getComponentFromPath, getComponentValue, findComponents, eachComponentDataAsync, eachComponentData, getComponentKey, getContextualRowPath, getContextualRowData, componentInfo, eachComponent, eachComponentAsync, getComponentData, getComponentActualValue, isLayoutComponent, matchComponent, getComponent, searchComponents, removeComponent, hasCondition, parseFloatExt, formatAsCurrency, escapeRegExCharacters, getValue, getStrings, generateFormChange, applyFormChanges, findComponent, getEmptyValue, isComponentDataEmpty, isSelectResourceWithObjectValue, compareSelectResourceWithObjectTypeValues, getItemTemplateKeys } = Utils;
+export { flattenComponents, guid, uniqueName, MODEL_TYPES_OF_KNOWN_COMPONENTS, getModelType, getComponentPath, setComponentScope, resetComponentScope, isComponentNestedDataType, componentPath, getComponentPaths, componentMatches, getBestMatch, getComponentFromPath, getComponentValue, findComponents, eachComponentDataAsync, eachComponentData, getComponentKey, getContextualRowPath, getContextualRowData, componentInfo, eachComponent, eachComponentAsync, getComponentData, getComponentActualValue, isLayoutComponent, matchComponent, getComponent, searchComponents, removeComponent, hasCondition, parseFloatExt, formatAsCurrency, escapeRegExCharacters, getValue, getStrings, generateFormChange, applyFormChanges, findComponent, getEmptyValue, isComponentDataEmpty, isSelectResourceWithObjectValue, compareSelectResourceWithObjectTypeValues, getItemTemplateKeys };

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

@@ -462,10 +462,9 @@ export function getComponentPathWithoutIndicies(path?: string): string;
 /**
  * Returns a path to the component which based on its schema
  * @param {import('@formio/core').Component} component - Component containing link to its parent's schema in the 'parent' property
- * @param {string} path - Path to the component
  * @returns {string} - Path to the component
  */
-export function getComponentPath(component: import('@formio/core').Component, path?: string): string;
+export function getComponentPath(component: import('@formio/core').Component): string;
 /**
  * Returns a parent component of the passed component instance skipping all the Layout components
  * @param {Component} componentInstance - The component to check for the parent.
@@ -515,7 +514,6 @@ export namespace componentValueTypes {
     let any: string;
 }
 export function interpolateErrors(component: Component, errors: FieldError[], interpolateFn: Function): [];
-import jsonLogic from 'json-logic-js';
 import ConditionOperators from './conditionOperators';
 import { Evaluator } from './Evaluator';
 export const interpolate: typeof Evaluator.interpolate;

package/lib/mjs/utils/utils.js

@@ -25,17 +25,6 @@ jsonLogic.add_operation('relativeMaxDate', (relativeMaxDate) => {
     return moment().add(relativeMaxDate, 'days').toISOString();
 });
 export { jsonLogic, ConditionOperators, moment };
-/**
- * Sets the path to the component and parent schema.
- * @param {import('@formio/core').Component} component - The component to set the path for.
- */
-function setPathToComponentAndPerentSchema(component) {
-    component.path = getComponentPath(component);
-    const dataParent = getDataParentComponent(component);
-    if (dataParent && typeof dataParent === 'object') {
-        dataParent.path = getComponentPath(dataParent);
-    }
-}
 /**
  * Evaluate a method.
  * @param {Function|string|object} func - The function to evaluate.
@@ -227,7 +216,7 @@ export function checkSimpleConditional(component, condition, row, data, instance
                     const value = getComponentActualValue(path, data, row);
                     const ConditionOperator = ConditionOperators[operator];
                     return ConditionOperator
-                        ? new ConditionOperator().getResult({ value, comparedValue, instance, component, conditionComponentPath })
+                        ? new ConditionOperator().getResult({ value, comparedValue, instance, component, path })
                         : true;
                 });
             }
@@ -235,7 +224,7 @@ export function checkSimpleConditional(component, condition, row, data, instance
                 const value = getComponentActualValue(conditionComponentPath, data, row);
                 const СonditionOperator = ConditionOperators[operator];
                 return СonditionOperator
-                    ? new СonditionOperator().getResult({ value, comparedValue, instance, component, conditionComponentPath })
+                    ? new СonditionOperator().getResult({ value, comparedValue, instance, component, path: conditionComponentPath })
                     : true;
             }
         });
@@ -259,12 +248,12 @@ export function checkSimpleConditional(component, condition, row, data, instance
  */
 export function getComponentActualValue(compPath, data, row) {
     let value = null;
-    if (row) {
-        value = getValue({ data: row }, compPath);
-    }
-    if (data && _.isNil(value)) {
+    if (data) {
         value = getValue({ data }, compPath);
     }
+    if (row && _.isNil(value)) {
+        value = getValue({ data: row }, compPath);
+    }
     // FOR-400 - Fix issue where falsey values were being evaluated as show=true
     if (_.isNil(value) || (_.isObject(value) && _.isEmpty(value))) {
         value = '';
@@ -332,17 +321,18 @@ function getRow(component, row, instance, conditional) {
     // If no component's instance passed (happens only in 6.x server), calculate its path based on the schema
     if (!instance) {
         instance = _.cloneDeep(component);
-        setPathToComponentAndPerentSchema(instance);
     }
     const dataParent = getDataParentComponent(instance);
-    const parentPath = dataParent ? getComponentPath(dataParent) : null;
-    const isTriggerCondtionComponentPath = condition.when || !condition.conditions
-        ? condition.when?.startsWith(parentPath)
-        : _.some(condition.conditions, cond => cond.component.startsWith(parentPath));
-    if (dataParent && isTriggerCondtionComponentPath) {
-        const newRow = {};
-        _.set(newRow, parentPath, row);
-        row = newRow;
+    if (dataParent) {
+        const parentPath = dataParent.paths?.localDataPath;
+        const isTriggerCondtionComponentPath = condition.when || !condition.conditions
+            ? condition.when?.startsWith(dataParent.paths?.localPath)
+            : _.some(condition.conditions, cond => cond.component.startsWith(dataParent.paths?.localPath));
+        if (isTriggerCondtionComponentPath) {
+            const newRow = {};
+            _.set(newRow, parentPath, row);
+            row = newRow;
+        }
     }
     return row;
 }
@@ -1478,15 +1468,10 @@ export function getComponentPathWithoutIndicies(path = '') {
 /**
  * Returns a path to the component which based on its schema
  * @param {import('@formio/core').Component} component - Component containing link to its parent's schema in the 'parent' property
- * @param {string} path - Path to the component
  * @returns {string} - Path to the component
  */
-export function getComponentPath(component, path = '') {
-    if (!component || !component.key || component?._form?.display === 'wizard') { // unlike the Webform, the Wizard has the key and it is a duplicate of the panel key
-        return path;
-    }
-    path = component.isInputComponent || component.input === true ? `${component.key}${path ? '.' : ''}${path}` : path;
-    return getComponentPath(component.parent, path);
+export function getComponentPath(component) {
+    return component.paths.localDataPath;
 }
 /**
  * Returns a parent component of the passed component instance skipping all the Layout components

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@formio/js",
-  "version": "5.0.0",
+  "version": "5.1.0-rc.1",
   "description": "JavaScript powered Forms with JSON Form Builder",
   "main": "lib/cjs/index.js",
   "exports": {
@@ -79,10 +79,10 @@
   },
   "homepage": "https://github.com/formio/formio.js#readme",
   "dependencies": {
-    "@formio/bootstrap": "3.0.0",
+    "@formio/bootstrap": "3.1.0-rc.1",
     "@formio/choices.js": "^10.2.1",
-    "@formio/core": "2.3.0",
-    "@formio/text-mask-addons": "^3.8.0-formio.3",
+    "@formio/core": "2.4.0-rc.1",
+    "@formio/text-mask-addons": "^3.8.0-formio.4",
     "@formio/vanilla-text-mask": "^5.1.1-formio.1",
     "abortcontroller-polyfill": "^1.7.5",
     "autocompleter": "^8.0.4",