[1.x] useForm wrongly overwrites default values after successful su…

…bmission (#1935) * Hotfix for wrong usage of form.defaults after onSuccess * Update Vue 2 adapter (cherry picked from commit d96f4fa) * Cleanup (cherry picked from commit fe0eb55) * Fix "isDirty" state after form submission --------- Co-authored-by: Pedro Borges <[email protected]>
inertiajs · Sep 21, 2024 · ee1aea7 · ee1aea7
1 parent b1304b6
commit ee1aea7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/packages/vue2/src/useForm.ts b/packages/vue2/src/useForm.ts
@@ -89,6 +89,7 @@ export default function useForm<TForm extends FormDataType>(...args): InertiaFor
       const resolvedData = typeof data === 'object' ? cloneDeep(defaults) : cloneDeep(data())
       const clonedData = cloneDeep(resolvedData)
       if (fields.length === 0) {
+        this.wasSuccessful = false
         defaults = clonedData
         Object.assign(this, resolvedData)
       } else {
@@ -165,7 +166,6 @@ export default function useForm<TForm extends FormDataType>(...args): InertiaFor
           recentlySuccessfulTimeoutId = setTimeout(() => (this.recentlySuccessful = false), 2000)
 
           const onSuccess = options.onSuccess ? await options.onSuccess(page) : null
-          defaults = cloneDeep(this.data())
           this.isDirty = false
           return onSuccess
         },
@@ -236,7 +236,7 @@ export default function useForm<TForm extends FormDataType>(...args): InertiaFor
   watch(
     form,
     (newValue) => {
-      form.isDirty = !isEqual(form.data(), defaults)
+      form.isDirty = !form.wasSuccessful && !isEqual(form.data(), defaults)
       if (rememberKey) {
         router.remember(cloneDeep(newValue.__remember()), rememberKey)
       }

diff --git a/packages/vue3/src/useForm.ts b/packages/vue3/src/useForm.ts
@@ -93,6 +93,7 @@ export default function useForm<TForm extends FormDataType>(
       const resolvedData = typeof data === 'object' ? cloneDeep(defaults) : cloneDeep(data())
       const clonedData = cloneDeep(resolvedData)
       if (fields.length === 0) {
+        this.wasSuccessful = false
         defaults = clonedData
         Object.assign(this, resolvedData)
       } else {
@@ -169,7 +170,6 @@ export default function useForm<TForm extends FormDataType>(
           recentlySuccessfulTimeoutId = setTimeout(() => (this.recentlySuccessful = false), 2000)
 
           const onSuccess = options.onSuccess ? await options.onSuccess(page) : null
-          defaults = cloneDeep(this.data())
           this.isDirty = false
           return onSuccess
         },
@@ -240,7 +240,7 @@ export default function useForm<TForm extends FormDataType>(
   watch(
     form,
     (newValue) => {
-      form.isDirty = !isEqual(form.data(), defaults)
+      form.isDirty = !form.wasSuccessful && !isEqual(form.data(), defaults)
       if (rememberKey) {
         router.remember(newValue.__remember(), rememberKey)
       }