@bpmn-io/form-js-viewer 2.0.0 → 2.1.0

package/dist/index.es.js

@@ -1,5 +1,5 @@
 import { Ids } from 'ids';
-import { isString, get, isNil, isObject, some, isNumber, set, isDefined, findIndex, isArray, values, uniqueBy, isFunction, bind, assign, groupBy, isUndefined } from 'min-dash';
+import { isString, get, isNil, isObject, some, merge, isNumber, set, isDefined, findIndex, isArray, values, uniqueBy, isFunction, bind, assign, groupBy, isUndefined } from 'min-dash';
 import Big from 'big.js';
 import classNames from 'classnames';
 import { jsx, jsxs, Fragment } from 'preact/jsx-runtime';
@@ -191,7 +191,7 @@ const _linearizePathExpression = root => {
 
   // Traverse the tree and collect path components
   while (node.name === 'PathExpression') {
-    parts.push(node.children[1]);
+    parts.push(node.children[node.children.length - 1]);
     node = node.children[0];
   }
 
@@ -223,7 +223,7 @@ const _buildSimpleFeelStructureTree = (parseTree, feelString) => {
       if (node.type.name === 'VariableName') {
         nodeRepresentation.variableName = feelString.slice(node.from, node.to);
       }
-      if (node.type.name === 'Name') {
+      if (['Name', 'PathName'].includes(node.type.name)) {
         nodeRepresentation.variableName = feelString.slice(node.from, node.to);
       }
       stack.push(nodeRepresentation);
@@ -1408,10 +1408,11 @@ function useFilteredFormData() {
   const conditionChecker = useService('conditionChecker', false);
   return useMemo(() => {
     const newData = conditionChecker ? conditionChecker.applyConditions(data, data) : data;
-    return {
-      ...initialData,
-      ...newData
-    };
+
+    // deep-merge newData over a clone of initialData, so keys pruned from
+    // newData (e.g. by a hidden group) fall back to their initial value
+    // instead of the whole branch disappearing
+    return merge(clone(initialData || {}), newData);
   }, [conditionChecker, data, initialData]);
 }