Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed TypeError on providing only a partial subset of form fields in setErrors for useForm #2224

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fixed TypeError on providing only a partial subset of form fields in setErrors for useForm #2224

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a0adb50
Fixed TypeError on providing only a partial subset of form fields
Verox001 Feb 1, 2025
ac52082
Fixed types for vue and svelte as well
Verox001 Feb 1, 2025
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: 3 additions & 3 deletions packages/react/src/useForm.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ export interface InertiaFormProps<TForm extends FormDataType> {
reset: (...fields: (keyof TForm)[]) => void
clearErrors: (...fields: (keyof TForm)[]) => void
setError(field: keyof TForm, value: string): void
setError(errors: Record<keyof TForm, string>): void
setError(errors: Partial<Record<keyof TForm, string>>): void
submit: (method: Method, url: string, options?: FormOptions) => void
get: (url: string, options?: FormOptions) => void
patch: (url: string, options?: FormOptions) => void
Expand Down Expand Up @@ -216,13 +216,13 @@ export default function useForm<TForm extends FormDataType>(
)

const setError = useCallback(
(fieldOrFields: keyof TForm | Record<keyof TForm, string>, maybeValue?: string) => {
(fieldOrFields: keyof TForm | Partial<Record<keyof TForm, string>>, maybeValue?: string) => {
setErrors((errors) => {
const newErrors = {
...errors,
...(typeof fieldOrFields === 'string'
? { [fieldOrFields]: maybeValue }
: (fieldOrFields as Record<keyof TForm, string>)),
: (fieldOrFields as Partial<Record<keyof TForm, string>>)),
}
setHasErrors(Object.keys(newErrors).length > 0)
return newErrors
Expand Down
6 changes: 3 additions & 3 deletions packages/svelte/src/useForm.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ export interface InertiaFormProps<TForm extends FormDataType> {
reset(...fields: (keyof TForm)[]): this
clearErrors(...fields: (keyof TForm)[]): this
setError(field: keyof TForm, value: string): this
setError(errors: Errors): this
setError(errors: Partial<Errors>): this
submit(method: Method, url: string, options?: FormOptions): void
get(url: string, options?: FormOptions): void
post(url: string, options?: FormOptions): void
Expand Down Expand Up @@ -120,10 +120,10 @@ export default function useForm<TForm extends FormDataType>(

return this
},
setError(fieldOrFields: keyof TForm | Errors, maybeValue?: string) {
setError(fieldOrFields: keyof TForm | Partial<Errors>, maybeValue?: string) {
this.setStore('errors', {
...this.errors,
...((typeof fieldOrFields === 'string' ? { [fieldOrFields]: maybeValue } : fieldOrFields) as Errors),
...((typeof fieldOrFields === 'string' ? { [fieldOrFields]: maybeValue } : fieldOrFields) as Partial<Errors>),
})

return this
Expand Down
4 changes: 2 additions & 2 deletions packages/vue3/src/useForm.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ export interface InertiaFormProps<TForm extends FormDataType> {
reset(...fields: (keyof TForm)[]): this
clearErrors(...fields: (keyof TForm)[]): this
setError(field: keyof TForm, value: string): this
setError(errors: Record<keyof TForm, string>): this
setError(errors: Partial<Record<keyof TForm, string>>): this
submit(method: Method, url: string, options?: FormOptions): void
get(url: string, options?: FormOptions): void
post(url: string, options?: FormOptions): void
Expand Down Expand Up @@ -108,7 +108,7 @@ export default function useForm<TForm extends FormDataType>(

return this
},
setError(fieldOrFields: keyof TForm | Record<keyof TForm, string>, maybeValue?: string) {
setError(fieldOrFields: keyof TForm | Partial<Record<keyof TForm, string>>, maybeValue?: string) {
Object.assign(this.errors, typeof fieldOrFields === 'string' ? { [fieldOrFields]: maybeValue } : fieldOrFields)

this.hasErrors = Object.keys(this.errors).length > 0
Expand Down
5 changes: 5 additions & 0 deletions playgrounds/react/resources/js/Pages/Form.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,11 @@ const Form = () => {
function submit(e) {
e.preventDefault()
form.post('/user')

form.setError({
'name': 'Name is required',
'company': 'Company is required',
})
}

return (
Expand Down
Loading