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
6 changes: 6 additions & 0 deletions .changeset/quiet-ids-return.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
'@tanstack/react-form': patch
'@tanstack/preact-form': patch
---

Fix an infinite render loop in `useForm` and `useAppForm` when `formId` changes from a defined value to `undefined`. The form now falls back to its generated `formId` instead.
4 changes: 2 additions & 2 deletions packages/preact-form/src/useForm.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ export function useForm<
>,
) {
const fallbackFormId = useFormId()
const [prevFormId, setPrevFormId] = useState<string>(opts?.formId as never)
const [prevFormId, setPrevFormId] = useState(opts?.formId)

const [formApi, setFormApi] = useState(() => {
return new FormApi<
Expand All @@ -222,7 +222,7 @@ export function useForm<
if (prevFormId !== opts?.formId) {
const formId = opts?.formId ?? fallbackFormId
setFormApi(new FormApi({ ...opts, formId }))
setPrevFormId(formId)
setPrevFormId(opts?.formId)
}

const extendedFormApi = useMemo(() => {
Expand Down
27 changes: 27 additions & 0 deletions packages/preact-form/tests/useForm.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -898,6 +898,33 @@ describe('useForm', () => {
expect(result).toHaveTextContent('1')
})

it('should restore the generated formId when formId changes back to undefined', () => {
let renderCount = 0

function Comp({ formId }: { formId?: string }) {
renderCount++
if (renderCount > 50) {
throw new Error('Render loop detected')
}

const form = useForm({ formId })

return <span data-testid="formId">{form.formId}</span>
}

const { getByTestId, rerender } = render(<Comp />)
const generatedFormId = getByTestId('formId').textContent

rerender(<Comp formId="test" />)
expect(getByTestId('formId').textContent).toBe('test')

rerender(<Comp formId={undefined} />)
expect(getByTestId('formId').textContent).toBe(generatedFormId)

rerender(<Comp formId="test" />)
expect(getByTestId('formId').textContent).toBe('test')
})

it('should allow custom component keys for arrays', async () => {
function Comp() {
const form = useForm({
Expand Down
4 changes: 2 additions & 2 deletions packages/react-form/src/useForm.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ export function useForm<
>,
) {
const fallbackFormId = useFormId()
const [prevFormId, setPrevFormId] = useState<string>(opts?.formId as never)
const [prevFormId, setPrevFormId] = useState(opts?.formId)

const [formApi, setFormApi] = useState(() => {
return new FormApi<
Expand All @@ -223,7 +223,7 @@ export function useForm<
if (prevFormId !== opts?.formId) {
const formId = opts?.formId ?? fallbackFormId
setFormApi(new FormApi({ ...opts, formId }))
setPrevFormId(formId)
setPrevFormId(opts?.formId)
}

const extendedFormApi = useMemo(() => {
Expand Down
20 changes: 20 additions & 0 deletions packages/react-form/tests/useForm.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -893,6 +893,26 @@ describe('useForm', () => {
expect(result).toHaveTextContent('1')
})

it('should restore the generated formId when formId changes back to undefined', () => {
function Comp({ formId }: { formId?: string }) {
const form = useForm({ formId })

return <span data-testid="formId">{form.formId}</span>
}

const { getByTestId, rerender } = render(<Comp />)
const generatedFormId = getByTestId('formId').textContent

rerender(<Comp formId="test" />)
expect(getByTestId('formId').textContent).toBe('test')

rerender(<Comp formId={undefined} />)
expect(getByTestId('formId').textContent).toBe(generatedFormId)

rerender(<Comp formId="test" />)
expect(getByTestId('formId').textContent).toBe('test')
})

it('should allow custom component keys for arrays', async () => {
function Comp() {
const form = useForm({
Expand Down