dirty form fix for nested customFields

bmlt-enabled · Nov 10, 2024 · b6e578d · b6e578d
1 parent 703914c
commit b6e578d
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/src/resources/js/components/MeetingEditForm.svelte b/src/resources/js/components/MeetingEditForm.svelte
@@ -991,7 +991,7 @@
         <div class="grid gap-4 md:grid-cols-2">
           <div class="md:col-span-2">
             <Label for={name} class="mb-2">{displayName}</Label>
-            <Input type="text" id={name} name={$data.customFields[name]} bind:value={$data.customFields[name]} />
+            <Input type="text" id={name} name={initialValues.customFields[name]} bind:value={initialValues.customFields[name]} />
             {#if $errors.customFields?.[name]}
               <Helper class="mt-2" color="red">
                 {$errors.customFields[name]}

diff --git a/src/resources/js/lib/utils.ts b/src/resources/js/lib/utils.ts
@@ -23,9 +23,21 @@ export function formIsDirty(initialValues: any, currentValues: any): boolean {
           return true;
         }
       }
-    } else if (initialValues[key] !== currentValues[key]) {
-      isDirty.set(true);
-      return true;
+    }
+    // handle customFields
+    else if (typeof initialValues[key] === 'object' && initialValues[key] !== null) {
+      if (formIsDirty(initialValues[key], currentValues[key])) {
+        isDirty.set(true);
+        return true;
+      }
+    } else {
+      // Treat null and undefined as ''
+      const initial = initialValues[key] ?? '';
+      const current = currentValues[key] ?? '';
+      if (initial !== current) {
+        isDirty.set(true);
+        return true;
+      }
     }
   }
   isDirty.set(false);