fix: coderabbit findings

TkDodo · TkDodo · commit 8b4148746495 · 2026-03-13T20:22:24.000+01:00
diff --git a/packages/form-core/src/FieldApi.ts b/packages/form-core/src/FieldApi.ts
@@ -1361,6 +1361,10 @@ export class FieldApi<
       const fieldInfo = this.form.fieldInfo[this.name]
       if (!fieldInfo) return
 
+      // If a newer field instance has already been mounted for this name,
+      // avoid touching its shared validation state during teardown.
+      if (fieldInfo.instance !== this) return
+
       for (const [key, validationMeta] of Object.entries(
         fieldInfo.validationMetaMap,
       )) {
@@ -1370,15 +1374,24 @@ export class FieldApi<
         ] = undefined
       }
 
-      // If a newer field instance has already been mounted for this name,
-      // avoid clearing its state during teardown of an older instance.
-      if (fieldInfo.instance !== this) return
-
       this.form.baseStore.setState((prev) => ({
+        // Preserve interaction flags so field-level defaultValue does not
+        // reseed user-entered values on remount.
         ...prev,
         fieldMetaBase: {
           ...prev.fieldMetaBase,
-          [this.name]: defaultFieldMeta,
+          [this.name]: {
+            ...defaultFieldMeta,
+            isTouched:
+              prev.fieldMetaBase[this.name]?.isTouched ??
+              defaultFieldMeta.isTouched,
+            isBlurred:
+              prev.fieldMetaBase[this.name]?.isBlurred ??
+              defaultFieldMeta.isBlurred,
+            isDirty:
+              prev.fieldMetaBase[this.name]?.isDirty ??
+              defaultFieldMeta.isDirty,
+          },
         },
       }))
 
diff --git a/packages/form-core/tests/FieldApi.spec.ts b/packages/form-core/tests/FieldApi.spec.ts
@@ -1671,7 +1671,7 @@ describe('field api', () => {
 
     expect(form.getFieldValue('lastName')).toBe('abc')
     expect(form.state.fieldMeta.lastName).toMatchObject({
-      isTouched: false,
+      isTouched: true,
       isValid: true,
       errors: [],
     })
@@ -1688,10 +1688,39 @@ describe('field api', () => {
 
     remountedLastName.mount()
     expect(remountedLastName.getMeta().errors).toStrictEqual([])
-    expect(remountedLastName.getMeta().isTouched).toBe(false)
+    expect(remountedLastName.getMeta().isTouched).toBe(true)
     expect(remountedLastName.getValue()).toBe('abc')
   })
 
+  it('should preserve field-level defaultValue changes across unmount remount cleanup', () => {
+    const form = new FormApi({
+      defaultValues: {} as { name?: string },
+      cleanupFieldsOnUnmount: true,
+    })
+
+    form.mount()
+
+    const field = new FieldApi({
+      form,
+      name: 'name',
+      defaultValue: 'initial',
+    })
+
+    const unmount = field.mount()
+    field.setValue('changed')
+    expect(unmount).toBeTypeOf('function')
+    unmount()
+
+    const remountedField = new FieldApi({
+      form,
+      name: 'name',
+      defaultValue: 'initial',
+    })
+
+    remountedField.mount()
+    expect(remountedField.getValue()).toBe('changed')
+  })
+
   it('should not apply in-flight async validation results after unmount', async () => {
     vi.useFakeTimers()
 
@@ -1732,7 +1761,7 @@ describe('field api', () => {
     await vi.runAllTimersAsync()
 
     expect(form.state.fieldMeta.name).toMatchObject({
-      isTouched: false,
+      isTouched: true,
       isValid: true,
       errors: [],
     })
@@ -1812,6 +1841,47 @@ describe('field api', () => {
     expect(newField.getMeta().isTouched).toBe(true)
   })
 
+  it('should not cancel newer instance async validation when older instance unmounts', async () => {
+    vi.useFakeTimers()
+
+    const form = new FormApi({
+      defaultValues: {
+        name: '',
+      },
+      cleanupFieldsOnUnmount: true,
+    })
+
+    form.mount()
+
+    const oldField = new FieldApi({
+      form,
+      name: 'name',
+    })
+    const oldUnmount = oldField.mount()
+
+    const newField = new FieldApi({
+      form,
+      name: 'name',
+      validators: {
+        onChangeAsyncDebounceMs: 10,
+        onChangeAsync: async ({ value }) =>
+          value === 'taken' ? 'name is taken' : undefined,
+      },
+    })
+
+    newField.mount()
+    newField.setValue('taken')
+
+    expect(oldUnmount).toBeTypeOf('function')
+    oldUnmount()
+
+    await vi.runAllTimersAsync()
+
+    expect(newField.getMeta().errors).toContain('name is taken')
+
+    vi.useRealTimers()
+  })
+
   it('should show onSubmit errors', async () => {
     const form = new FormApi({
       defaultValues: {
diff --git a/packages/react-form/tests/useField.test.tsx b/packages/react-form/tests/useField.test.tsx
@@ -420,7 +420,7 @@ describe('useField', () => {
     await waitFor(() => expect(submitButton).toBeEnabled())
 
     await user.click(submitButton)
-    expect(onSubmit).toHaveBeenCalledTimes(1)
+    await waitFor(() => expect(onSubmit).toHaveBeenCalledTimes(1))
 
     await user.clear(getByTestId('first-name'))
     await user.type(getByTestId('first-name'), 'a')
