Merge pull request #994 from wri/fix/TM-1810-losing-form-values

[TM-1810] Memoize the source data so we don't update on every render.
wri · Feb 28, 2025 · ed85210 · ed85210
2 parents 22e1d13 + 00c29c4
commit ed85210
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/src/admin/components/EntityEdit/EntityEdit.tsx b/src/admin/components/EntityEdit/EntityEdit.tsx
@@ -58,10 +58,11 @@ export const EntityEdit = () => {
   const framework = formData?.form?.framework_key as Framework;
   const formSteps = useGetCustomFormSteps(formData.form, entity, framework);
 
-  const defaultValues = useNormalizedFormDefaultValue(
-    defaults(formData?.update_request?.content ?? {}, formData?.answers),
-    formSteps
+  const sourceData = useMemo(
+    () => defaults(formData?.update_request?.content ?? {}, formData?.answers),
+    [formData?.answers, formData?.update_request?.content]
   );
+  const defaultValues = useNormalizedFormDefaultValue(sourceData, formSteps);
 
   // @ts-ignore
   const { form_title: title } = formData;

diff --git a/src/pages/entity/[entityName]/edit/[uuid]/EditEntityForm.tsx b/src/pages/entity/[entityName]/edit/[uuid]/EditEntityForm.tsx
@@ -60,11 +60,11 @@ const EditEntityForm = ({ entityName, entityUUID, entity, formData }: EditEntity
     mode?.includes("provide-feedback") ? feedbackFields : undefined
   );
 
-  const defaultValues = useNormalizedFormDefaultValue(
-    defaults(formData?.update_request?.content ?? {}, formData?.answers),
-    formSteps,
-    entity.migrated
+  const sourceData = useMemo(
+    () => defaults(formData?.update_request?.content ?? {}, formData?.answers),
+    [formData?.answers, formData?.update_request?.content]
   );
+  const defaultValues = useNormalizedFormDefaultValue(sourceData, formSteps, entity.migrated);
 
   const reportingWindow = useReportingWindow(entity?.due_at);
   const formTitle =