@aehrc/smart-forms-renderer 1.2.12 → 1.2.14

package/src/utils/calculatedExpression.ts

@@ -373,10 +373,6 @@ function applyCalculatedExpressionValuesRecursive(
   let qrItem = qrItemOrItems;
   const childQItems = qItem.item;
   if (childQItems && childQItems.length > 0) {
-    // If item.type is 'group', create empty group qrItem
-    if (qItem.type === 'group') {
-      qrItem = qrItemOrItems ?? structuredClone(createEmptyQrGroup(qItem));
-    }
     const childQrItems = qrItem?.item ?? [];
 
     const indexMap = mapQItemsIndex(qItem);
@@ -395,13 +391,17 @@ function applyCalculatedExpressionValuesRecursive(
       // Update QR items in repeating group
       if (Array.isArray(updatedChildQRItemOrItems)) {
         if (updatedChildQRItemOrItems.length > 0) {
+          // Lazily initialise qrItem so all children are added to the same group object
+          if (!qrItem) {
+            qrItem = structuredClone(createEmptyQrGroup(qItem));
+          }
           updateQrItemsInGroup(
             null,
             {
               linkId: childQItem.linkId,
               qrItems: updatedChildQRItemOrItems
             },
-            qrItem ?? structuredClone(createEmptyQrGroup(qItem)),
+            qrItem,
             indexMap
           );
         }
@@ -411,12 +411,11 @@ function applyCalculatedExpressionValuesRecursive(
       // Update QR items in non-repeating group
       const updatedChildQRItem = updatedChildQRItemOrItems;
       if (updatedChildQRItem) {
-        updateQrItemsInGroup(
-          updatedChildQRItem,
-          null,
-          qrItem ?? structuredClone(createEmptyQrGroup(qItem)),
-          indexMap
-        );
+        // Lazily initialise qrItem so all children are added to the same group object
+        if (!qrItem) {
+          qrItem = structuredClone(createEmptyQrGroup(qItem));
+        }
+        updateQrItemsInGroup(updatedChildQRItem, null, qrItem, indexMap);
       }
     }