@aehrc/smart-forms-renderer 0.25.2 → 0.26.1

package/src/hooks/useDecimalCalculatedExpression.ts

@@ -16,8 +16,7 @@
  */
 
 import { useEffect, useState } from 'react';
-import { createEmptyQrItem } from '../utils/qrItem';
-import type { QuestionnaireItem, QuestionnaireResponseItem } from 'fhir/r4';
+import type { QuestionnaireItem } from 'fhir/r4';
 import { useQuestionnaireStore } from '../stores';
 
 interface UseDecimalCalculatedExpression {
@@ -28,14 +27,20 @@ interface useDecimalCalculatedExpressionProps {
   qItem: QuestionnaireItem;
   inputValue: string;
   precision: number | null;
-  setInputValue: (value: string) => void;
-  onQrItemChange: (qrItem: QuestionnaireResponseItem) => void;
+  onChangeByCalcExpressionDecimal: (calcExpressionValue: number) => void;
+  onChangeByCalcExpressionNull: () => void;
 }
 
 function useDecimalCalculatedExpression(
   props: useDecimalCalculatedExpressionProps
 ): UseDecimalCalculatedExpression {
-  const { qItem, inputValue, precision, setInputValue, onQrItemChange } = props;
+  const {
+    qItem,
+    inputValue,
+    precision,
+    onChangeByCalcExpressionDecimal,
+    onChangeByCalcExpressionNull
+  } = props;
 
   const calculatedExpressions = useQuestionnaireStore.use.calculatedExpressions();
 
@@ -52,10 +57,14 @@ function useDecimalCalculatedExpression(
       }
 
       // only update if calculated value is different from current value
-      if (calcExpression.value !== inputValue && typeof calcExpression.value === 'number') {
-        const calcExpressionValue = precision
-          ? parseFloat(calcExpression.value.toFixed(precision))
-          : calcExpression.value;
+      if (
+        calcExpression.value !== inputValue &&
+        (typeof calcExpression.value === 'number' || calcExpression.value === null)
+      ) {
+        const calcExpressionValue =
+          typeof calcExpression.value === 'number' && typeof precision === 'number'
+            ? parseFloat(calcExpression.value.toFixed(precision))
+            : calcExpression.value;
 
         // only update if calculated value is different from current value
         if (calcExpressionValue !== parseFloat(inputValue)) {
@@ -65,14 +74,14 @@ function useDecimalCalculatedExpression(
             setCalcExpUpdated(false);
           }, 500);
 
-          // update questionnaireResponse
-          setInputValue(
-            precision ? calcExpressionValue.toFixed(precision) : calcExpressionValue.toString()
-          );
-          onQrItemChange({
-            ...createEmptyQrItem(qItem),
-            answer: [{ valueDecimal: calcExpressionValue }]
-          });
+          // calculatedExpression value is null
+          if (calcExpressionValue === null) {
+            onChangeByCalcExpressionNull();
+            return;
+          }
+
+          // calculatedExpression value is a number
+          onChangeByCalcExpressionDecimal(calcExpressionValue);
         }
       }
     },

package/src/hooks/useDisplayCalculatedExpression.ts

@@ -24,11 +24,22 @@ function useDisplayCalculatedExpression(qItem: QuestionnaireItem): string | null
   const calcExpression = calculatedExpressions[qItem.linkId]?.find(
     (exp) => exp.from === 'item._text'
   );
+
   if (!calcExpression) {
     return null;
   }
 
-  if (typeof calcExpression.value === 'string' || typeof calcExpression.value === 'number') {
+  if (
+    typeof calcExpression.value === 'string' ||
+    typeof calcExpression.value === 'number' ||
+    calcExpression.value === null
+  ) {
+    // calculatedExpression value is null
+    if (calcExpression.value === null) {
+      return '';
+    }
+
+    // calculatedExpression value is string or number
     return typeof calcExpression.value === 'string'
       ? calcExpression.value
       : calcExpression.value.toString();

package/src/hooks/useIntegerCalculatedExpression.ts

@@ -16,9 +16,8 @@
  */
 
 import { useEffect, useState } from 'react';
-import { createEmptyQrItem } from '../utils/qrItem';
-import type { QuestionnaireItem, QuestionnaireResponseItem } from 'fhir/r4';
-import { useQuestionnaireStore } from '../stores/questionnaireStore';
+import type { QuestionnaireItem } from 'fhir/r4';
+import { useQuestionnaireStore } from '../stores';
 
 interface UseIntegerCalculatedExpression {
   calcExpUpdated: boolean;
@@ -27,14 +26,15 @@ interface UseIntegerCalculatedExpression {
 interface useIntegerCalculatedExpressionProps {
   qItem: QuestionnaireItem;
   inputValue: string;
-  setInputValue: (value: string) => void;
-  onQrItemChange: (qrItem: QuestionnaireResponseItem) => void;
+  onChangeByCalcExpressionInteger: (calcExpressionValue: number) => void;
+  onChangeByCalcExpressionNull: () => void;
 }
 
 function useIntegerCalculatedExpression(
   props: useIntegerCalculatedExpressionProps
 ): UseIntegerCalculatedExpression {
-  const { qItem, inputValue, setInputValue, onQrItemChange } = props;
+  const { qItem, inputValue, onChangeByCalcExpressionInteger, onChangeByCalcExpressionNull } =
+    props;
 
   const calculatedExpressions = useQuestionnaireStore.use.calculatedExpressions();
 
@@ -51,7 +51,10 @@ function useIntegerCalculatedExpression(
       }
 
       // only update if calculated value is different from current value
-      if (calcExpression.value !== inputValue && typeof calcExpression.value === 'number') {
+      if (
+        calcExpression.value !== inputValue &&
+        (typeof calcExpression.value === 'number' || calcExpression.value === null)
+      ) {
         const calcExpressionValue = calcExpression.value;
 
         if (calcExpressionValue !== parseInt(inputValue)) {
@@ -61,12 +64,14 @@ function useIntegerCalculatedExpression(
             setCalcExpUpdated(false);
           }, 500);
 
-          // update questionnaireResponse
-          setInputValue(calcExpressionValue.toString());
-          onQrItemChange({
-            ...createEmptyQrItem(qItem),
-            answer: [{ valueInteger: calcExpressionValue }]
-          });
+          // calculatedExpression value is null
+          if (calcExpressionValue === null) {
+            onChangeByCalcExpressionNull();
+            return;
+          }
+
+          // calculatedExpression value is a number
+          onChangeByCalcExpressionInteger(calcExpressionValue);
         }
       }
     },

package/src/hooks/useStringCalculatedExpression.ts

@@ -16,8 +16,7 @@
  */
 
 import { useEffect, useState } from 'react';
-import { createEmptyQrItem } from '../utils/qrItem';
-import type { QuestionnaireItem, QuestionnaireResponseItem } from 'fhir/r4';
+import type { QuestionnaireItem } from 'fhir/r4';
 import { useQuestionnaireStore } from '../stores';
 
 interface UseStringCalculatedExpression {
@@ -27,14 +26,14 @@ interface UseStringCalculatedExpression {
 interface useStringCalculatedExpressionProps {
   qItem: QuestionnaireItem;
   inputValue: string;
-  setInputValue: (value: string) => void;
-  onQrItemChange: (qrItem: QuestionnaireResponseItem) => void;
+  onChangeByCalcExpressionString: (newValueString: string) => void;
+  onChangeByCalcExpressionNull: () => void;
 }
 
 function useStringCalculatedExpression(
   props: useStringCalculatedExpressionProps
 ): UseStringCalculatedExpression {
-  const { qItem, inputValue, setInputValue, onQrItemChange } = props;
+  const { qItem, inputValue, onChangeByCalcExpressionString, onChangeByCalcExpressionNull } = props;
 
   const calculatedExpressions = useQuestionnaireStore.use.calculatedExpressions();
 
@@ -53,7 +52,9 @@ function useStringCalculatedExpression(
       // only update if calculated value is different from current value
       if (
         calcExpression.value !== inputValue &&
-        (typeof calcExpression.value === 'string' || typeof calcExpression.value === 'number')
+        (typeof calcExpression.value === 'string' ||
+          typeof calcExpression.value === 'number' ||
+          calcExpression.value === null)
       ) {
         // update ui to show calculated value changes
         setCalcExpUpdated(true);
@@ -61,17 +62,19 @@ function useStringCalculatedExpression(
           setCalcExpUpdated(false);
         }, 500);
 
-        const updatedInputValue =
+        // calculatedExpression value is null
+        if (calcExpression.value === null) {
+          onChangeByCalcExpressionNull();
+          return;
+        }
+
+        // calculatedExpression value is a string or number
+        const newInputValue =
           typeof calcExpression.value === 'string'
             ? calcExpression.value
             : calcExpression.value.toString();
 
-        // update questionnaireResponse
-        setInputValue(updatedInputValue);
-        onQrItemChange({
-          ...createEmptyQrItem(qItem),
-          answer: [{ valueString: updatedInputValue }]
-        });
+        onChangeByCalcExpressionString(newInputValue);
       }
     },
     // Only trigger this effect if calculatedExpression of item changes

package/src/interfaces/calculatedExpression.interface.ts

@@ -1,5 +1,5 @@
 export interface CalculatedExpression {
   expression: string;
   from: 'item' | 'item._text';
-  value?: number | string | boolean | object;
+  value?: number | string | boolean | object | null;
 }

package/src/stores/questionnaireResponseStore.ts

@@ -16,7 +16,12 @@
  */
 
 import { createStore } from 'zustand/vanilla';
-import type { OperationOutcome, Questionnaire, QuestionnaireResponse } from 'fhir/r4';
+import type {
+  OperationOutcome,
+  Questionnaire,
+  QuestionnaireResponse,
+  QuestionnaireResponseItem
+} from 'fhir/r4';
 import { emptyResponse } from '../utils/emptyResource';
 import cloneDeep from 'lodash.clonedeep';
 import type { Diff } from 'deep-diff';
@@ -24,10 +29,12 @@ import { diff } from 'deep-diff';
 import { createSelectors } from './selector';
 import { validateQuestionnaire } from '../utils/validateQuestionnaire';
 import { questionnaireStore } from './questionnaireStore';
+import { createQuestionnaireResponseItemMap } from '../utils/questionnaireResponseStoreUtils/updatableResponseItems';
 
 interface QuestionnaireResponseStoreType {
   sourceResponse: QuestionnaireResponse;
   updatableResponse: QuestionnaireResponse;
+  updatableResponseItems: Record<string, QuestionnaireResponseItem[]>;
   formChangesHistory: (Diff<QuestionnaireResponse, QuestionnaireResponse>[] | null)[];
   invalidItems: Record<string, OperationOutcome>;
   responseIsValid: boolean;
@@ -47,6 +54,7 @@ export const questionnaireResponseStore = createStore<QuestionnaireResponseStore
   (set, get) => ({
     sourceResponse: cloneDeep(emptyResponse),
     updatableResponse: cloneDeep(emptyResponse),
+    updatableResponseItems: {},
     formChangesHistory: [],
     invalidItems: {},
     responseIsValid: true,
@@ -74,13 +82,15 @@ export const questionnaireResponseStore = createStore<QuestionnaireResponseStore
     buildSourceResponse: (questionnaireResponse: QuestionnaireResponse) => {
       set(() => ({
         sourceResponse: questionnaireResponse,
-        updatableResponse: questionnaireResponse
+        updatableResponse: questionnaireResponse,
+        updatableResponseItems: createQuestionnaireResponseItemMap(questionnaireResponse)
       }));
     },
     setUpdatableResponseAsPopulated: (populatedResponse: QuestionnaireResponse) => {
       const formChanges = diff(get().updatableResponse, populatedResponse) ?? null;
       set(() => ({
         updatableResponse: populatedResponse,
+        updatableResponseItems: createQuestionnaireResponseItemMap(populatedResponse),
         formChangesHistory: [...get().formChangesHistory, formChanges]
       }));
     },
@@ -88,6 +98,7 @@ export const questionnaireResponseStore = createStore<QuestionnaireResponseStore
       const formChanges = diff(get().updatableResponse, updatedResponse) ?? null;
       set(() => ({
         updatableResponse: updatedResponse,
+        updatableResponseItems: createQuestionnaireResponseItemMap(updatedResponse),
         formChangesHistory: [...get().formChangesHistory, formChanges]
       }));
     },
@@ -95,17 +106,20 @@ export const questionnaireResponseStore = createStore<QuestionnaireResponseStore
       set(() => ({
         sourceResponse: savedResponse,
         updatableResponse: savedResponse,
+        updatableResponseItems: createQuestionnaireResponseItemMap(savedResponse),
         formChangesHistory: []
       })),
     setUpdatableResponseAsEmpty: (clearedResponse: QuestionnaireResponse) =>
       set(() => ({
         updatableResponse: clearedResponse,
+        updatableResponseItems: createQuestionnaireResponseItemMap(clearedResponse),
         formChangesHistory: []
       })),
     destroySourceResponse: () =>
       set(() => ({
         sourceResponse: cloneDeep(emptyResponse),
         updatableResponse: cloneDeep(emptyResponse),
+        updatableResponseItems: createQuestionnaireResponseItemMap(cloneDeep(emptyResponse)),
         formChangesHistory: []
       }))
   })

package/src/stores/questionnaireStore.ts

@@ -45,6 +45,7 @@ import { terminologyServerStore } from './terminologyServerStore';
 import { createSelectors } from './selector';
 import { mutateRepeatEnableWhenExpressionInstances } from '../utils/enableWhenExpression';
 import { questionnaireResponseStore } from './questionnaireResponseStore';
+import { createQuestionnaireResponseItemMap } from '../utils/questionnaireResponseStoreUtils/updatableResponseItems';
 
 interface QuestionnaireStoreType {
   sourceQuestionnaire: Questionnaire;
@@ -63,6 +64,7 @@ interface QuestionnaireStoreType {
   processedValueSetUrls: Record<string, string>;
   cachedValueSetCodings: Record<string, Coding[]>;
   fhirPathContext: Record<string, any>;
+  populatedContext: Record<string, any>;
   focusedLinkId: string;
   readOnly: boolean;
   buildSourceQuestionnaire: (
@@ -90,9 +92,11 @@ interface QuestionnaireStoreType {
   addCodingToCache: (valueSetUrl: string, codings: Coding[]) => void;
   updatePopulatedProperties: (
     populatedResponse: QuestionnaireResponse,
+    populatedContext?: Record<string, any>,
     persistTabIndex?: boolean
   ) => QuestionnaireResponse;
   onFocusLinkId: (linkId: string) => void;
+  setPopulatedContext: (newPopulatedContext: Record<string, any>) => void;
 }
 
 export const questionnaireStore = createStore<QuestionnaireStoreType>()((set, get) => ({
@@ -112,6 +116,7 @@ export const questionnaireStore = createStore<QuestionnaireStoreType>()((set, ge
   processedValueSetUrls: {},
   cachedValueSetCodings: {},
   fhirPathContext: {},
+  populatedContext: {},
   focusedLinkId: '',
   readOnly: false,
   buildSourceQuestionnaire: async (
@@ -232,6 +237,7 @@ export const questionnaireStore = createStore<QuestionnaireStoreType>()((set, ge
 
     const { updatedEnableWhenExpressions, isUpdated } = mutateRepeatEnableWhenExpressionInstances({
       questionnaireResponse: questionnaireResponseStore.getState().updatableResponse,
+      questionnaireResponseItemMap: questionnaireResponseStore.getState().updatableResponseItems,
       variablesFhirPath: get().variables.fhirPathVariables,
       existingFhirPathContext: get().fhirPathContext,
       enableWhenExpressions: enableWhenExpressions,
@@ -250,6 +256,7 @@ export const questionnaireStore = createStore<QuestionnaireStoreType>()((set, ge
   toggleEnableWhenActivation: (isActivated: boolean) =>
     set(() => ({ enableWhenIsActivated: isActivated })),
   updateExpressions: (updatedResponse: QuestionnaireResponse) => {
+    const updatedResponseItemMap = createQuestionnaireResponseItemMap(updatedResponse);
     const {
       isUpdated,
       updatedEnableWhenExpressions,
@@ -257,6 +264,7 @@ export const questionnaireStore = createStore<QuestionnaireStoreType>()((set, ge
       updatedFhirPathContext
     } = evaluateUpdatedExpressions({
       updatedResponse,
+      updatedResponseItemMap,
       enableWhenExpressions: get().enableWhenExpressions,
       calculatedExpressions: get().calculatedExpressions,
       variablesFhirPath: get().variables.fhirPathVariables,
@@ -283,9 +291,16 @@ export const questionnaireStore = createStore<QuestionnaireStoreType>()((set, ge
         [valueSetUrl]: codings
       }
     })),
-  updatePopulatedProperties: (populatedResponse: QuestionnaireResponse, persistTabIndex) => {
+  updatePopulatedProperties: (
+    populatedResponse: QuestionnaireResponse,
+    populatedContext?: Record<string, any>,
+    persistTabIndex?: boolean
+  ) => {
+    const initialResponseItemMap = createQuestionnaireResponseItemMap(populatedResponse);
+
     const evaluateInitialCalculatedExpressionsResult = evaluateInitialCalculatedExpressions({
       initialResponse: populatedResponse,
+      initialResponseItemMap: initialResponseItemMap,
       calculatedExpressions: get().calculatedExpressions,
       variablesFhirPath: get().variables.fhirPathVariables,
       existingFhirPathContext: get().fhirPathContext
@@ -321,7 +336,8 @@ export const questionnaireStore = createStore<QuestionnaireStoreType>()((set, ge
       enableWhenExpressions: initialEnableWhenExpressions,
       calculatedExpressions: initialCalculatedExpressions,
       currentTabIndex: persistTabIndex ? get().currentTabIndex : firstVisibleTab,
-      fhirPathContext: updatedFhirPathContext
+      fhirPathContext: updatedFhirPathContext,
+      populatedContext: populatedContext ?? get().populatedContext
     }));
 
     return updatedResponse;
@@ -329,6 +345,10 @@ export const questionnaireStore = createStore<QuestionnaireStoreType>()((set, ge
   onFocusLinkId: (linkId: string) =>
     set(() => ({
       focusedLinkId: linkId
+    })),
+  setPopulatedContext: (newPopulatedContext: Record<string, any>) =>
+    set(() => ({
+      populatedContext: newPopulatedContext
     }))
 }));
 

package/src/utils/calculatedExpression.ts

@@ -37,6 +37,7 @@ import dayjs from 'dayjs';
 
 interface EvaluateInitialCalculatedExpressionsParams {
   initialResponse: QuestionnaireResponse;
+  initialResponseItemMap: Record<string, QuestionnaireResponseItem[]>;
   calculatedExpressions: Record<string, CalculatedExpression[]>;
   variablesFhirPath: Record<string, Expression[]>;
   existingFhirPathContext: Record<string, any>;
@@ -48,8 +49,13 @@ export function evaluateInitialCalculatedExpressions(
   initialCalculatedExpressions: Record<string, CalculatedExpression[]>;
   updatedFhirPathContext: Record<string, any>;
 } {
-  const { initialResponse, calculatedExpressions, variablesFhirPath, existingFhirPathContext } =
-    params;
+  const {
+    initialResponse,
+    initialResponseItemMap,
+    calculatedExpressions,
+    variablesFhirPath,
+    existingFhirPathContext
+  } = params;
 
   // Return early if initialResponse is empty or there are no calculated expressions to evaluate
   if (
@@ -65,10 +71,11 @@ export function evaluateInitialCalculatedExpressions(
   const initialCalculatedExpressions: Record<string, CalculatedExpression[]> = {
     ...calculatedExpressions
   };
+
   const updatedFhirPathContext = createFhirPathContext(
     initialResponse,
-    variablesFhirPath,
-    existingFhirPathContext
+    initialResponseItemMap,
+    variablesFhirPath
   );
 
   for (const linkId in initialCalculatedExpressions) {
@@ -83,7 +90,8 @@ export function evaluateInitialCalculatedExpressions(
           fhirpath_r4_model
         );
 
-        if (!_isEqual(calcExpression.value, result[0])) {
+        // Only update calculatedExpressions if length of result array > 0
+        if (result.length > 0 && !_isEqual(calcExpression.value, result[0])) {
           calcExpression.value = result[0];
         }
       } catch (e) {
@@ -124,11 +132,17 @@ export function evaluateCalculatedExpressions(
           fhirpath_r4_model
         );
 
-        if (result.length > 0) {
-          if (!_isEqual(calcExpression.value, result[0])) {
-            isUpdated = true;
-            calcExpression.value = result[0];
-          }
+        // Update calculatedExpressions if length of result array > 0
+        // Only update when current calcExpression value is different from the result, otherwise it will result in an infinite loop as per issue #733
+        if (result.length > 0 && !_isEqual(calcExpression.value, result[0])) {
+          isUpdated = true;
+          calcExpression.value = result[0];
+        }
+
+        // Update calculatedExpression value to null if no result is returned
+        if (result.length === 0 && calcExpression.value !== null) {
+          isUpdated = true;
+          calcExpression.value = null;
         }
       } catch (e) {
         console.warn(e.message, `LinkId: ${linkId}\nExpression: ${calcExpression.expression}`);

package/src/utils/enableWhenExpression.ts

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import type { Expression, QuestionnaireResponse } from 'fhir/r4';
+import type { Expression, QuestionnaireResponse, QuestionnaireResponseItem } from 'fhir/r4';
 import { createFhirPathContext } from './fhirpath';
 import fhirpath from 'fhirpath';
 import fhirpath_r4_model from 'fhirpath/fhir-context/r4';
@@ -27,9 +27,9 @@ import type {
 
 interface EvaluateInitialEnableWhenExpressionsParams {
   initialResponse: QuestionnaireResponse;
+  initialResponseItemMap: Record<string, QuestionnaireResponseItem[]>;
   enableWhenExpressions: EnableWhenExpressions;
   variablesFhirPath: Record<string, Expression[]>;
-  existingFhirPathContext: Record<string, any>;
 }
 
 export function evaluateInitialEnableWhenExpressions(
@@ -38,7 +38,7 @@ export function evaluateInitialEnableWhenExpressions(
   initialEnableWhenExpressions: EnableWhenExpressions;
   updatedFhirPathContext: Record<string, any>;
 } {
-  const { initialResponse, enableWhenExpressions, variablesFhirPath, existingFhirPathContext } =
+  const { initialResponse, initialResponseItemMap, enableWhenExpressions, variablesFhirPath } =
     params;
 
   const initialEnableWhenExpressions: EnableWhenExpressions = {
@@ -46,8 +46,8 @@ export function evaluateInitialEnableWhenExpressions(
   };
   const updatedFhirPathContext = createFhirPathContext(
     initialResponse,
-    variablesFhirPath,
-    existingFhirPathContext
+    initialResponseItemMap,
+    variablesFhirPath
   );
 
   const initialEnableWhenSingleExpressions = evaluateEnableWhenSingleExpressions(
@@ -85,12 +85,18 @@ function evaluateEnableWhenSingleExpressions(
       const result = fhirpath.evaluate('', expression, updatedFhirPathContext, fhirpath_r4_model);
 
       // Update enableWhenExpressions if length of result array > 0
-      // Only update when current isEnabled value is different from the result, otherwise it will result in am infinite loop as per #733
+      // Only update when current isEnabled value is different from the result, otherwise it will result in an infinite loop as per issue #733
       if (result.length > 0 && initialValue !== result[0] && typeof result[0] === 'boolean') {
         enableWhenSingleExpressions[linkId].isEnabled = result[0];
         isUpdated = true;
       }
 
+      // Update isEnabled value to false if no result is returned
+      if (result.length === 0 && initialValue !== false) {
+        enableWhenSingleExpressions[linkId].isEnabled = false;
+        isUpdated = true;
+      }
+
       // handle intersect edge case - evaluate() returns empty array if result is false
       if (
         enableWhenSingleExpressions[linkId].expression.includes('intersect') &&
@@ -198,6 +204,12 @@ export function evaluateEnableWhenRepeatExpressionInstance(
       isUpdated = true;
     }
 
+    // Update isEnabled value to false if no result is returned
+    if (result.length === 0 && initialValue !== false) {
+      isEnabled = false;
+      isUpdated = true;
+    }
+
     // handle intersect edge case - evaluate() returns empty array if result is false
     if (expression.includes('intersect') && result.length === 0 && initialValue !== result[0]) {
       isEnabled = false;
@@ -245,6 +257,7 @@ export function evaluateEnableWhenExpressions(
 
 interface MutateRepeatEnableWhenExpressionInstancesParams {
   questionnaireResponse: QuestionnaireResponse;
+  questionnaireResponseItemMap: Record<string, QuestionnaireResponseItem[]>;
   variablesFhirPath: Record<string, Expression[]>;
   existingFhirPathContext: Record<string, any>;
   enableWhenExpressions: EnableWhenExpressions;
@@ -258,8 +271,8 @@ export function mutateRepeatEnableWhenExpressionInstances(
 ): { updatedEnableWhenExpressions: EnableWhenExpressions; isUpdated: boolean } {
   const {
     questionnaireResponse,
+    questionnaireResponseItemMap,
     variablesFhirPath,
-    existingFhirPathContext,
     enableWhenExpressions,
     parentRepeatGroupLinkId,
     parentRepeatGroupIndex,
@@ -270,8 +283,8 @@ export function mutateRepeatEnableWhenExpressionInstances(
 
   const updatedFhirPathContext = createFhirPathContext(
     questionnaireResponse,
-    variablesFhirPath,
-    existingFhirPathContext
+    questionnaireResponseItemMap,
+    variablesFhirPath
   );
 
   let isUpdated = false;