@openmrs/esm-form-engine-lib 4.1.1-pre.2348 → 4.1.1-pre.2357

package/dist/components/repeat/helpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../../src/components/repeat/helpers.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAI9D,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,SAAS,EAAE,KAAK,EAAE,eAAe,EAAE,QAAQ,EAAE,MAAM,aAoD7F;AAED,wBAAgB,yBAAyB,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,UAQjG;AAED,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,OAAO,EAAE,MAAM,WAM7E"}
+{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../../src/components/repeat/helpers.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAI9D,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,SAAS,EAAE,KAAK,EAAE,eAAe,EAAE,QAAQ,EAAE,MAAM,aAoD7F;AAED,wBAAgB,yBAAyB,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,UAajG;AAED,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,OAAO,EAAE,MAAM,WAM7E"}

package/dist/components/repeat/helpers.js

@@ -45,15 +45,16 @@ export function cloneRepeatField(srcField, value, idSuffix) {
     return clonedField;
 }
 export function updateFieldIdInExpression(expression, index, questionIds) {
-    let uniqueQuestionIds = [
+    const uniqueQuestionIds = [
         ...new Set(questionIds)
     ];
-    uniqueQuestionIds.forEach((id)=>{
-        if (expression.match(id)) {
-            expression = expression.replace(new RegExp(id, 'g'), `${id}_${index}`);
-        }
-    });
-    return expression;
+    if (!uniqueQuestionIds.length) {
+        return expression;
+    }
+    // Sort by length desc so longer ids are tried before their shorter prefixes (e.g. `status_code` before `status`).
+    // Word boundaries keep the match from landing inside a longer identifier; regex metachars in ids are escaped.
+    const pattern = uniqueQuestionIds.slice().sort((a, b)=>b.length - a.length).map((id)=>id.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')).join('|');
+    return expression.replace(new RegExp(`\\b(?:${pattern})\\b`, 'g'), (match)=>`${match}_${index}`);
 }
 export function disableRepeatAddButton(limit, counter) {
     const repeatLimit = Number(limit);

package/dist/components/repeat/repeat.component.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"repeat.component.d.ts","sourceRoot":"","sources":["../../../src/components/repeat/repeat.component.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAoD,MAAM,OAAO,CAAC;AAEzE,OAAO,KAAK,EAAa,mBAAmB,EAAc,MAAM,aAAa,CAAC;AAkB9E,QAAA,MAAM,MAAM,EAAE,KAAK,CAAC,EAAE,CAAC,mBAAmB,CAsKzC,CAAC;AAmBF,eAAe,MAAM,CAAC"}
+{"version":3,"file":"repeat.component.d.ts","sourceRoot":"","sources":["../../../src/components/repeat/repeat.component.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAoD,MAAM,OAAO,CAAC;AACzE,OAAO,KAAK,EAAa,mBAAmB,EAAc,MAAM,aAAa,CAAC;AAkB9E,QAAA,MAAM,MAAM,EAAE,KAAK,CAAC,EAAE,CAAC,mBAAmB,CAwKzC,CAAC;AAmBF,eAAe,MAAM,CAAC"}

package/dist/components/repeat/repeat.component.js

@@ -1,5 +1,4 @@
 import React, { useCallback, useEffect, useMemo, useState } from "react";
-import { useTranslation } from "react-i18next";
 import { evaluateAsyncExpression, evaluateExpression } from "../../utils/expression-runner.js";
 import { isEmpty } from "../../validators/form-validator.js";
 import styles from "./repeat.scss";
@@ -16,15 +15,11 @@ const renderingByTypeMap = {
     diagnosis: 'ui-select-extended'
 };
 const Repeat = ({ field })=>{
-    const { t } = useTranslation();
-    const isGrouped = useMemo(()=>field.questions?.length > 1, [
-        field
-    ]);
     const [counter, setCounter] = useState(0);
     const [rows, setRows] = useState([]);
     const context = useFormProviderContext();
     const { handleConfirmQuestionDeletion } = useFormFactory();
-    const { patient, sessionMode, formFieldAdapters, formFields, methods: { getValues, setValue }, addFormField, removeFormField, deletedFields, setDeletedFields, visit } = context;
+    const { patient, sessionMode, formFieldAdapters, formFields, methods: { getValues, setValue, unregister }, addFormField, removeFormField, deletedFields, setDeletedFields, visit } = context;
     useEffect(()=>{
         const repeatedFields = formFields.filter((_field)=>_field.questionOptions.concept === field.questionOptions.concept && _field.id.startsWith(field.id) && !_field.meta?.repeat?.wasDeleted);
         setCounter(repeatedFields.length - 1);
@@ -108,6 +103,10 @@ const Repeat = ({ field })=>{
             }
         } else {
             clearSubmission(field);
+            // Unregister from react-hook-form so a re-added row with the same id
+            // starts empty instead of rehydrating the deleted row's value.
+            unregister(field.id);
+            field.questions?.forEach((child)=>unregister(child.id));
         }
         setRows(rows.filter((q)=>q.id !== field.id));
         setDeletedFields([

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openmrs/esm-form-engine-lib",
-  "version": "4.1.1-pre.2348",
+  "version": "4.1.1-pre.2357",
   "description": "React Form Engine for O3",
   "main": "dist/index.js",
   "module": "dist/index.js",

package/src/components/repeat/helpers.ts

@@ -59,13 +59,18 @@ export function cloneRepeatField(srcField: FormField, value: OpenmrsResource, id
 }
 
 export function updateFieldIdInExpression(expression: string, index: number, questionIds: string[]) {
-  let uniqueQuestionIds = [...new Set(questionIds)];
-  uniqueQuestionIds.forEach((id) => {
-    if (expression.match(id)) {
-      expression = expression.replace(new RegExp(id, 'g'), `${id}_${index}`);
-    }
-  });
-  return expression;
+  const uniqueQuestionIds = [...new Set(questionIds)];
+  if (!uniqueQuestionIds.length) {
+    return expression;
+  }
+  // Sort by length desc so longer ids are tried before their shorter prefixes (e.g. `status_code` before `status`).
+  // Word boundaries keep the match from landing inside a longer identifier; regex metachars in ids are escaped.
+  const pattern = uniqueQuestionIds
+    .slice()
+    .sort((a, b) => b.length - a.length)
+    .map((id) => id.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'))
+    .join('|');
+  return expression.replace(new RegExp(`\\b(?:${pattern})\\b`, 'g'), (match) => `${match}_${index}`);
 }
 
 export function disableRepeatAddButton(limit: string | number, counter: number) {

package/src/components/repeat/repeat.component.tsx

@@ -1,5 +1,4 @@
 import React, { useCallback, useEffect, useMemo, useState } from 'react';
-import { useTranslation } from 'react-i18next';
 import type { FormField, FormFieldInputProps, RenderType } from '../../types';
 import { evaluateAsyncExpression, evaluateExpression } from '../../utils/expression-runner';
 import { isEmpty } from '../../validators/form-validator';
@@ -19,8 +18,6 @@ const renderingByTypeMap: Record<string, RenderType> = {
 };
 
 const Repeat: React.FC<FormFieldInputProps> = ({ field }) => {
-  const { t } = useTranslation();
-  const isGrouped = useMemo(() => field.questions?.length > 1, [field]);
   const [counter, setCounter] = useState(0);
   const [rows, setRows] = useState([]);
   const context = useFormProviderContext();
@@ -30,7 +27,7 @@ const Repeat: React.FC<FormFieldInputProps> = ({ field }) => {
     sessionMode,
     formFieldAdapters,
     formFields,
-    methods: { getValues, setValue },
+    methods: { getValues, setValue, unregister },
     addFormField,
     removeFormField,
     deletedFields,
@@ -117,6 +114,10 @@ const Repeat: React.FC<FormFieldInputProps> = ({ field }) => {
       }
     } else {
       clearSubmission(field);
+      // Unregister from react-hook-form so a re-added row with the same id
+      // starts empty instead of rehydrating the deleted row's value.
+      unregister(field.id);
+      field.questions?.forEach((child) => unregister(child.id));
     }
     setRows(rows.filter((q) => q.id !== field.id));
     setDeletedFields([...deletedFields, field]);