Skip to content

Commit 2446858

Browse files
committed
chore: attempt to fix Start and Remix as well
1 parent 88d0d7c commit 2446858

File tree

8 files changed

+23
-193
lines changed

8 files changed

+23
-193
lines changed

examples/react/remix/app/routes/_index/route.tsx

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import {
66
formOptions,
77
mergeForm,
88
useForm,
9-
useMerge,
9+
useTransform,
1010
} from '@tanstack/react-form-remix'
1111
import { useStore } from '@tanstack/react-store'
1212

@@ -56,14 +56,11 @@ export default function Index() {
5656

5757
const form = useForm({
5858
...formOpts,
59+
transform: useTransform(
60+
(baseForm) => mergeForm(baseForm, actionData ?? {}),
61+
[actionData],
62+
),
5963
})
60-
61-
useMerge({
62-
form,
63-
fn: (baseForm) => mergeForm(baseForm, actionData ?? {}),
64-
deps: [actionData],
65-
})
66-
6764
const formErrors = useStore(form.store, (formState) => formState.errors)
6865

6966
return (

examples/react/tanstack-start/src/routes/index.tsx

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { createFileRoute } from '@tanstack/react-router'
2-
import { mergeForm, useForm, useMerge } from '@tanstack/react-form-start'
2+
import { mergeForm, useForm, useTransform } from '@tanstack/react-form-start'
33
import { useStore } from '@tanstack/react-store'
44
import { getFormDataFromServer, handleForm } from 'src/utils/form'
55
import { formOpts } from 'src/utils/form-isomorphic'
@@ -16,12 +16,7 @@ function Home() {
1616

1717
const form = useForm({
1818
...formOpts,
19-
})
20-
21-
useMerge({
22-
form,
23-
fn: (baseForm) => mergeForm(baseForm, state),
24-
deps: [state],
19+
transform: useTransform((baseForm) => mergeForm(baseForm, state), [state]),
2520
})
2621

2722
const formErrors = useStore(form.store, (formState) => formState.errors)

packages/react-form-remix/src/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ export * from '@tanstack/react-form'
22

33
export * from './createServerValidate'
44
export * from './error'
5-
export * from './useMerge'
5+
export * from './useTransform'

packages/react-form-remix/src/useMerge.ts

Lines changed: 0 additions & 88 deletions
This file was deleted.
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
import { useCallback } from 'react'
2+
import type { AnyFormApi } from '@tanstack/react-form'
3+
4+
export const useTransform: (
5+
fn: (formBase: AnyFormApi) => AnyFormApi,
6+
deps?: unknown[],
7+
) => unknown = useCallback as never

packages/react-form-start/src/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ export * from '@tanstack/react-form'
33
export * from './createServerValidate'
44
export * from './getFormData'
55
export * from './error'
6-
export * from './useMerge'
6+
export * from './useTransform'

packages/react-form-start/src/useMerge.ts

Lines changed: 0 additions & 88 deletions
This file was deleted.
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
import { useCallback } from 'react'
2+
import type { AnyFormApi } from '@tanstack/react-form'
3+
4+
export const useTransform: (
5+
fn: (formBase: AnyFormApi) => AnyFormApi,
6+
deps?: unknown[],
7+
) => unknown = useCallback as never

0 commit comments

Comments
 (0)