Increase performance by getting rid of unneeed updates in calculatedE…

…xpression. Closes #81
beda-software · Oct 10, 2024 · 3a305e8 · 3a305e8
1 parent fc07701
commit 3a305e8
Showing 1 changed file with 17 additions and 4 deletions.
diff --git a/sdc-qrf/src/components.tsx b/sdc-qrf/src/components.tsx
@@ -7,7 +7,13 @@ import { QuestionnaireItem } from 'shared/src/contrib/aidbox';
 
 import { useQuestionnaireResponseFormContext } from '.';
 import { QRFContext } from './context';
-import { ItemContext, QRFContextData, QuestionItemProps, QuestionItemsProps } from './types';
+import {
+    FormAnswerItems,
+    ItemContext,
+    QRFContextData,
+    QuestionItemProps,
+    QuestionItemsProps,
+} from './types';
 import { calcContext, getBranchItems, getEnabledQuestions, wrapAnswerValue } from './utils';
 
 export function usePreviousValue<T = any>(value: T) {
@@ -72,7 +78,9 @@ export function QuestionItem(props: QuestionItemProps) {
                   calcContext(initialContext, variable, branchItems.qItem, curQRItem),
               )
             : calcContext(initialContext, variable, branchItems.qItem, branchItems.qrItems[0]!);
-    const prevAnswers = usePreviousValue(_.get(formValues, fieldPath));
+    const prevAnswers: FormAnswerItems[] | undefined = usePreviousValue(
+        _.get(formValues, fieldPath),
+    );
 
     useEffect(() => {
         if (!isGroupItem(questionItem, context) && calculatedExpression) {
@@ -84,15 +92,20 @@ export function QuestionItem(props: QuestionItemProps) {
                         calculatedExpression.expression!,
                         context as ItemContext,
                     );
-                    const newAnswers = newValues.length
+                    const newAnswers: FormAnswerItems[] | undefined = newValues.length
                         ? repeats
                             ? newValues.map((answer: any) => ({
                                   value: wrapAnswerValue(type, answer),
                               }))
                             : [{ value: wrapAnswerValue(type, newValues[0]) }]
                         : undefined;
 
-                    if (!isEqual(newAnswers, prevAnswers)) {
+                    if (
+                        !isEqual(
+                            newAnswers?.map((answer) => answer.value),
+                            prevAnswers?.map((answer) => answer.value),
+                        )
+                    ) {
                         const allValues = _.set(_.cloneDeep(formValues), fieldPath, newAnswers);
                         setFormValues(allValues, fieldPath, newAnswers);
                     }