@formio/js 5.0.0-dev.5643.9c5173a → 5.0.0-dev.5646.8734cf4

package/lib/mjs/components/datagrid/fixtures/index.js

@@ -6,6 +6,7 @@ import comp5 from './comp5';
 import comp6 from './comp6';
 import comp7 from './comp7';
 import comp8 from './comp8';
+import comp9 from './comp9';
 import withDefValue from './comp-with-def-value';
 import withRowGroupsAndDefValue from './comp-row-groups-with-def-value';
 import modalWithRequiredFields from './comp-modal-with-required-fields';
@@ -14,5 +15,4 @@ import withLogic from './comp-with-logic';
 import withCollapsibleRowGroups from './comp-with-collapsible-groups';
 import withAllowCalculateOverride from './comp-with-allow-calculate-override';
 import twoWithAllowCalculatedOverride from './two-comp-with-allow-calculate-override';
-import withCheckboxes from './comp-with-checkboxes';
-export { comp1, comp2, comp3, comp4, comp5, comp6, comp7, comp8, withCollapsibleRowGroups, withConditionalFieldsAndValidations, withDefValue, withLogic, withRowGroupsAndDefValue, modalWithRequiredFields, withAllowCalculateOverride, twoWithAllowCalculatedOverride, withCheckboxes };
+export { comp1, comp2, comp3, comp4, comp5, comp6, comp7, comp8, comp9, withCollapsibleRowGroups, withConditionalFieldsAndValidations, withDefValue, withLogic, withRowGroupsAndDefValue, modalWithRequiredFields, withAllowCalculateOverride, twoWithAllowCalculatedOverride };

package/lib/mjs/components/file/File.js

@@ -649,8 +649,7 @@ export default class FileComponent extends Field {
         // Check if file with the same name is being uploaded
         const fileWithSameNameUploading = this.filesToSync.filesToUpload
             .some(fileToSync => fileToSync.file?.name === file.name);
-        const fileWithSameNameUploaded = this.dataValue
-            .some(fileStatus => fileStatus.originalName === file.name);
+        const fileWithSameNameUploaded = _.some(this.dataValue, fileStatus => fileStatus.originalName === file.name);
         return fileWithSameNameUploaded || fileWithSameNameUploading
             ? {
                 status: 'error',

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

@@ -440,7 +440,7 @@ export default class FormComponent extends Component {
         }
         else if (this.formSrc) {
             this.subFormLoading = true;
-            const options = this.root.formio?.base && this.root.formio?.projectUrl
+            const options = this.root?.formio?.base && this.root?.formio?.projectUrl
                 ? {
                     base: this.root.formio.base,
                     project: this.root.formio.projectUrl,
@@ -624,7 +624,7 @@ export default class FormComponent extends Component {
         if (shouldLoadSubmissionById || shouldLoadDraftById) {
             const formId = submission.form || this.formObj.form || this.component.form;
             const submissionUrl = `${this.subForm.formio.formsUrl}/${formId}/submission/${submission._id || this.subForm.submission._id}`;
-            const options = this.root.formio?.base && this.root.formio?.projectUrl
+            const options = this.root?.formio?.base && this.root?.formio?.projectUrl
                 ? {
                     base: this.root.formio.base,
                     project: this.root.formio.projectUrl,

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

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

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

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

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

@@ -17,7 +17,7 @@ export default class IsEqualTo extends ConditionOperator {
             catch (e) { }
         }
         if (instance && instance.root) {
-            const conditionTriggerComponent = instance.root.getComponent(conditionComponentPath);
+            const conditionTriggerComponent = instance.root?.getComponent && instance.root.getComponent(conditionComponentPath);
             if (conditionTriggerComponent
                 && isSelectResourceWithObjectValue(conditionTriggerComponent.component)
                 && conditionTriggerComponent.component?.template) {

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

@@ -60,16 +60,6 @@ export function isMongoId(text: any): any[] | {
  *   The full submission data.
  */
 export function checkCalculated(component: Object, submission: Object, rowData: any): void;
-/**
- * Check if a simple conditional evaluates to true.
- *
- * @param condition
- * @param condition
- * @param row
- * @param data
- * @param instance
- * @returns {boolean}
- */
 export function checkSimpleConditional(component: any, condition: any, row: any, data: any, instance: any): boolean;
 export function getComponentActualValue(compPath: any, data: any, row: any): any;
 /**

package/lib/mjs/utils/utils.js

@@ -201,6 +201,44 @@ export function checkCalculated(component, submission, rowData) {
  * @param instance
  * @returns {boolean}
  */
+function getConditionalPathsRecursive(conditionPaths, data) {
+    let currentGlobalIndex = 0;
+    const conditionalPathsArray = [];
+    const getConditionalPaths = (data, currentPath = '', localIndex = 0) => {
+        currentPath = currentPath.replace(/^\.+|\.+$/g, '');
+        const currentLocalIndex = localIndex;
+        const currentData = _.get(data, currentPath);
+        if (Array.isArray(currentData) && currentData.filter(Boolean).length > 0) {
+            if (currentData.some(element => typeof element !== 'object')) {
+                return;
+            }
+            const hasInnerDataArray = currentData.find(x => Array.isArray(x[conditionPaths[currentLocalIndex]]));
+            if (hasInnerDataArray) {
+                currentData.forEach((_, indexOutside) => {
+                    const innerCompDataPath = `${currentPath}[${indexOutside}].${conditionPaths[currentLocalIndex]}`;
+                    getConditionalPaths(data, innerCompDataPath, currentLocalIndex + 1);
+                });
+            }
+            else {
+                currentData.forEach((x, index) => {
+                    if (!_.isNil(x[conditionPaths[currentLocalIndex]])) {
+                        const compDataPath = `${currentPath}[${index}].${conditionPaths[currentLocalIndex]}`;
+                        conditionalPathsArray.push(compDataPath);
+                    }
+                });
+            }
+        }
+        else {
+            if (!conditionPaths[currentGlobalIndex]) {
+                return;
+            }
+            currentGlobalIndex = currentGlobalIndex + 1;
+            getConditionalPaths(data, `${currentPath}.${conditionPaths[currentGlobalIndex - 1]}`, currentGlobalIndex);
+        }
+    };
+    getConditionalPaths(data);
+    return conditionalPathsArray;
+}
 export function checkSimpleConditional(component, condition, row, data, instance) {
     if (condition.when) {
         const value = getComponentActualValue(condition.when, data, row);
@@ -226,19 +264,32 @@ export function checkSimpleConditional(component, condition, row, data, instance
             if (!conditionComponentPath) {
                 return true;
             }
-            const value = getComponentActualValue(conditionComponentPath, data, row);
-            const ConditionOperator = ConditionOperators[operator];
-            return ConditionOperator
-                ? new ConditionOperator().getResult({ value, comparedValue, instance, component, conditionComponentPath })
-                : true;
+            const splittedConditionPath = conditionComponentPath.split('.');
+            const conditionalPaths = instance?.parent?.type === 'datagrid' || instance?.parent?.type === 'editgrid' ? [] : getConditionalPathsRecursive(splittedConditionPath, data);
+            if (conditionalPaths.length > 0) {
+                return conditionalPaths.map((path) => {
+                    const value = getComponentActualValue(path, data, row);
+                    const ConditionOperator = ConditionOperators[operator];
+                    return ConditionOperator
+                        ? new ConditionOperator().getResult({ value, comparedValue, instance, component, conditionComponentPath })
+                        : true;
+                });
+            }
+            else {
+                const value = getComponentActualValue(conditionComponentPath, data, row);
+                const СonditionOperator = ConditionOperators[operator];
+                return СonditionOperator
+                    ? new СonditionOperator().getResult({ value, comparedValue, instance, component, conditionComponentPath })
+                    : true;
+            }
         });
         let result = false;
         switch (conjunction) {
             case 'any':
-                result = _.some(conditionsResult, res => !!res);
+                result = _.some(conditionsResult.flat(), res => !!res);
                 break;
             default:
-                result = _.every(conditionsResult, res => !!res);
+                result = _.every(conditionsResult.flat(), res => !!res);
         }
         return show ? result : !result;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@formio/js",
-  "version": "5.0.0-dev.5643.9c5173a",
+  "version": "5.0.0-dev.5646.8734cf4",
   "description": "JavaScript powered Forms with JSON Form Builder",
   "main": "lib/cjs/index.js",
   "exports": {
@@ -77,7 +77,7 @@
   "dependencies": {
     "@formio/bootstrap": "^3.0.0-rc.22",
     "@formio/choices.js": "^10.2.1",
-    "@formio/core": "2.0.0-dev.102.df37631",
+    "@formio/core": "2.0.0-dev.105.e92d9a1",
     "@formio/text-mask-addons": "^3.8.0-formio.2",
     "@formio/vanilla-text-mask": "^5.1.1-formio.1",
     "abortcontroller-polyfill": "^1.7.5",

package/lib/cjs/components/datagrid/fixtures/comp-with-checkboxes.d.ts

@@ -1,29 +0,0 @@
-declare namespace _default {
-    let label: string;
-    let reorder: boolean;
-    let addAnotherPosition: string;
-    let layoutFixed: boolean;
-    let enableRowGroups: boolean;
-    let initEmpty: boolean;
-    let tableView: boolean;
-    let defaultValue: {}[];
-    let key: string;
-    let type: string;
-    let input: boolean;
-    let components: {
-        label: string;
-        optionsLabelPosition: string;
-        inline: boolean;
-        tableView: boolean;
-        values: {
-            label: string;
-            value: string;
-            shortcut: string;
-        }[];
-        key: string;
-        type: string;
-        input: boolean;
-        inputType: string;
-    }[];
-}
-export default _default;

package/lib/cjs/components/datagrid/fixtures/comp-with-checkboxes.js

@@ -1,36 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = {
-    'label': 'Data Grid',
-    'reorder': false,
-    'addAnotherPosition': 'bottom',
-    'layoutFixed': false,
-    'enableRowGroups': false,
-    'initEmpty': false,
-    'tableView': false,
-    'defaultValue': [
-        {}
-    ],
-    'key': 'dataGrid',
-    'type': 'datagrid',
-    'input': true,
-    'components': [
-        {
-            'label': 'Radio',
-            'optionsLabelPosition': 'right',
-            'inline': false,
-            'tableView': false,
-            'values': [
-                {
-                    'label': 'yes',
-                    'value': 'yes',
-                    'shortcut': ''
-                }
-            ],
-            'key': 'radio',
-            'type': 'radio',
-            'input': true,
-            'inputType': 'checkbox'
-        }
-    ]
-};

package/lib/mjs/components/datagrid/fixtures/comp-with-checkboxes.d.ts

@@ -1,29 +0,0 @@
-declare namespace _default {
-    let label: string;
-    let reorder: boolean;
-    let addAnotherPosition: string;
-    let layoutFixed: boolean;
-    let enableRowGroups: boolean;
-    let initEmpty: boolean;
-    let tableView: boolean;
-    let defaultValue: {}[];
-    let key: string;
-    let type: string;
-    let input: boolean;
-    let components: {
-        label: string;
-        optionsLabelPosition: string;
-        inline: boolean;
-        tableView: boolean;
-        values: {
-            label: string;
-            value: string;
-            shortcut: string;
-        }[];
-        key: string;
-        type: string;
-        input: boolean;
-        inputType: string;
-    }[];
-}
-export default _default;

package/lib/mjs/components/datagrid/fixtures/comp-with-checkboxes.js

@@ -1,34 +0,0 @@
-export default {
-    'label': 'Data Grid',
-    'reorder': false,
-    'addAnotherPosition': 'bottom',
-    'layoutFixed': false,
-    'enableRowGroups': false,
-    'initEmpty': false,
-    'tableView': false,
-    'defaultValue': [
-        {}
-    ],
-    'key': 'dataGrid',
-    'type': 'datagrid',
-    'input': true,
-    'components': [
-        {
-            'label': 'Radio',
-            'optionsLabelPosition': 'right',
-            'inline': false,
-            'tableView': false,
-            'values': [
-                {
-                    'label': 'yes',
-                    'value': 'yes',
-                    'shortcut': ''
-                }
-            ],
-            'key': 'radio',
-            'type': 'radio',
-            'input': true,
-            'inputType': 'checkbox'
-        }
-    ]
-};