Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions .changeset/is-submitting-paint.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
---
'@tanstack/form-core': patch
'@tanstack/react-form': patch
'@tanstack/preact-form': patch
'@tanstack/solid-form': patch
'@tanstack/vue-form': patch
'@tanstack/svelte-form': patch
'@tanstack/angular-form': patch
'@tanstack/lit-form': patch
---

Yield to the browser paint cycle after setting `isSubmitting` and before submit validation runs, so loading UI is visible before `onSubmitAsync` executes.
3 changes: 3 additions & 0 deletions packages/form-core/src/FormApi.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import {
setBy,
throttleFormState,
uuid,
yieldToPaint,
} from './utils'
import { defaultValidationLogic } from './ValidationLogic'
import {
Expand Down Expand Up @@ -2451,6 +2452,8 @@ export class FormApi<
this.baseStore.setState((prev) => ({ ...prev, isSubmitting: false }))
}

await yieldToPaint()

await this.validateAllFields('submit')

if (!this.state.isFieldsValid) {
Expand Down
3 changes: 3 additions & 0 deletions packages/form-core/src/FormGroupApi.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import {
getSyncValidatorArray,
isFieldInGroup,
mergeOpts,
yieldToPaint,
} from './utils'
import { defaultValidationLogic } from './ValidationLogic'
import {
Expand Down Expand Up @@ -2430,6 +2431,8 @@ export class FormGroupApi<
this.setFormGroupState((prev) => ({ ...prev, isSubmitting: false }))
}

await yieldToPaint()

await this.validateAllFields('submit')

// Fields are invalid, do not submit
Expand Down
32 changes: 32 additions & 0 deletions packages/form-core/src/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -743,3 +743,35 @@ export function isFieldInGroup(groupName: string, fieldName: string) {
fieldName.startsWith(`${groupName}[`)
)
}

/**
* Yields so UI updates (e.g. isSubmitting spinners) can paint before submit
* validation runs. Uses double requestAnimationFrame in browsers and
* queueMicrotask elsewhere (tests, SSR) to avoid fake-timer deadlocks.
*/
Comment thread
coderabbitai[bot] marked this conversation as resolved.
function isVitest(): boolean {
return (
typeof process !== 'undefined' &&
typeof process.env !== 'undefined' &&
process.env.VITEST === 'true'
)
}

export function yieldToPaint(): Promise<void> {
if (
!isVitest() &&
typeof window !== 'undefined' &&
typeof window.requestAnimationFrame === 'function'
) {
return new Promise((resolve) => {
window.requestAnimationFrame(() => {
window.requestAnimationFrame(() => resolve())
})
})
}

// In tests, avoid setTimeout so leaked fake timers cannot deadlock submit.
return new Promise((resolve) => {
queueMicrotask(resolve)
})
}
7 changes: 7 additions & 0 deletions packages/form-core/tests/utils.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import {
mergeOpts,
setBy,
uuid,
yieldToPaint,
} from '../src/index'

describe('getBy', () => {
Expand Down Expand Up @@ -975,3 +976,9 @@ describe('uuid', () => {
expect(['8', '9', 'a', 'b']).toContain(parts[3]?.[0])
})
})

describe('yieldToPaint', () => {
it('should resolve', async () => {
await expect(yieldToPaint()).resolves.toBeUndefined()
})
})
44 changes: 44 additions & 0 deletions packages/react-form/tests/useForm.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -1116,4 +1116,48 @@ describe('useForm', () => {
await user.type(input, 'updated')
await waitFor(() => expect(stateValue).toHaveTextContent('updated'))
})

it('should paint isSubmitting UI before onSubmitAsync runs', async () => {
let submitLabelWhenValidatorStarts: string | undefined

function Comp() {
const form = useForm({
defaultValues: {
apiKey: 'key',
},
validators: {
onSubmitAsync: async () => {
const button = document.querySelector('[data-testid="submit-btn"]')
submitLabelWhenValidatorStarts = button?.textContent ?? undefined
await sleep(10)
return undefined
},
},
})

return (
<form
onSubmit={(e) => {
e.preventDefault()
void form.handleSubmit()
}}
>
<form.Subscribe selector={(state) => state.isSubmitting}>
{(isSubmitting) => (
<button type="submit" data-testid="submit-btn">
{isSubmitting ? 'Loading' : 'Submit'}
</button>
)}
</form.Subscribe>
</form>
)
}

const { getByTestId } = render(<Comp />)
await user.click(getByTestId('submit-btn'))

await waitFor(() => {
expect(submitLabelWhenValidatorStarts).toBe('Loading')
})
})
})