@formio/js 5.0.0-dev.5643.17b8168 → 5.0.0-dev.5646.8734cf4

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.17b8168",
+  "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'
-        }
-    ]
-};