Skip to content

Commit c8980fc

Browse files
committed
Renamed withFullErrors to withArrayErrors
1 parent 30f01ab commit c8980fc

File tree

6 files changed

+17
-21
lines changed

6 files changed

+17
-21
lines changed

packages/react/src/useForm.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ export interface InertiaFormValidationProps<TForm extends object> {
9292
validateFiles(): InertiaPrecognitiveFormProps<TForm>
9393
validating: boolean
9494
validator: () => Validator
95-
withFullErrors(): InertiaPrecognitiveFormProps<TForm>
95+
withArrayErrors(): InertiaPrecognitiveFormProps<TForm>
9696
withoutFileValidation(): InertiaPrecognitiveFormProps<TForm>
9797
// Backward compatibility for easy migration from the original Precognition libraries
9898
setErrors(errors: FormDataErrors<TForm>): InertiaPrecognitiveFormProps<TForm>
@@ -148,7 +148,7 @@ export default function useForm<TForm extends FormDataType<TForm>>(
148148
const [validating, setValidating] = useState(false)
149149
const [touchedFields, setTouchedFields] = useState<string[]>([])
150150
const [validFields, setValidFields] = useState<string[]>([])
151-
const simpleValidationErrors = useRef(true)
151+
const arrayErrors = useRef(false)
152152

153153
useEffect(() => {
154154
isMounted.current = true
@@ -511,9 +511,9 @@ export default function useForm<TForm extends FormDataType<TForm>>(
511511
setTouchedFields(validator.touched())
512512
})
513513
.on('errorsChanged', () => {
514-
const validationErrors = simpleValidationErrors.current
515-
? toSimpleValidationErrors(validator.errors())
516-
: validator.errors()
514+
const validationErrors = arrayErrors.current
515+
? validator.errors()
516+
: toSimpleValidationErrors(validator.errors())
517517

518518
setErrors(validationErrors as FormDataErrors<TForm>)
519519
setHasErrors(Object.keys(validationErrors).length > 0)
@@ -544,7 +544,7 @@ export default function useForm<TForm extends FormDataType<TForm>>(
544544

545545
return precognitiveForm
546546
},
547-
withFullErrors: () => tap(precognitiveForm, () => (simpleValidationErrors.current = false)),
547+
withArrayErrors: () => tap(precognitiveForm, () => (arrayErrors.current = true)),
548548
setValidationTimeout: (duration: number) =>
549549
tap(precognitiveForm, () => validatorRef.current?.setTimeout(duration)),
550550
validateFiles: () => tap(precognitiveForm, () => validatorRef.current?.validateFiles()),

packages/react/test-app/Pages/FormHelper/Precognition/AllErrors.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ export default () => {
77
})
88
.withPrecognition('post', '/precognition/array-errors')
99
.setValidationTimeout(100)
10-
.withFullErrors()
10+
.withArrayErrors()
1111

1212
return (
1313
<div>

packages/svelte/src/useForm.ts

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ export interface InertiaFormValidationProps<TForm extends object> {
8181
validateFiles(): this
8282
validating: boolean
8383
validator: () => Validator
84-
withFullErrors(): this
84+
withArrayErrors(): this
8585
withoutFileValidation(): this
8686
// Backward compatibility for easy migration from the original Precognition libraries
8787
setErrors(errors: FormDataErrors<TForm> | Record<string, string | string[]>): this
@@ -144,7 +144,7 @@ export default function useForm<TForm extends FormDataType<TForm>>(
144144
const formWithPrecognition = () =>
145145
getStore(store) as any as InertiaPrecognitiveForm<TForm> & InternalPrecognitionState
146146

147-
let simpleValidationErrors = true
147+
let arrayErrors = false
148148

149149
if (!validatorRef) {
150150
const validator = createValidator((client) => {
@@ -167,9 +167,7 @@ export default function useForm<TForm extends FormDataType<TForm>>(
167167
setFormState('__touched', validator.touched())
168168
})
169169
.on('errorsChanged', () => {
170-
const validationErrors = simpleValidationErrors
171-
? toSimpleValidationErrors(validator.errors())
172-
: validator.errors()
170+
const validationErrors = arrayErrors ? validator.errors() : toSimpleValidationErrors(validator.errors())
173171

174172
setFormState('errors', {} as FormDataErrors<TForm>)
175173
formWithPrecognition().setError(validationErrors as FormDataErrors<TForm>)
@@ -234,7 +232,7 @@ export default function useForm<TForm extends FormDataType<TForm>>(
234232
validateFiles: () => tap(formWithPrecognition(), () => validatorRef?.validateFiles()),
235233
setValidationTimeout: (duration: number) =>
236234
tap(formWithPrecognition(), () => validatorRef!.setTimeout(duration)),
237-
withFullErrors: () => tap(formWithPrecognition(), () => (simpleValidationErrors = false)),
235+
withArrayErrors: () => tap(formWithPrecognition(), () => (arrayErrors = true)),
238236
// @ts-expect-error - Not released yet...
239237
withoutFileValidation: () => tap(formWithPrecognition(), () => validatorRef?.withoutFileValidation()),
240238
valid: (field: string) => formWithPrecognition().__valid.includes(field),

packages/svelte/test-app/Pages/FormHelper/Precognition/AllErrors.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
})
88
.withPrecognition('post', '/precognition/array-errors')
99
.setValidationTimeout(100)
10-
.withFullErrors()
10+
.withArrayErrors()
1111
</script>
1212

1313
<div>

packages/vue3/src/useForm.ts

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ export interface InertiaFormValidationProps<TForm extends object> {
7676
validateFiles(): this
7777
validating: boolean
7878
validator: () => Validator
79-
withFullErrors(): this
79+
withArrayErrors(): this
8080
withoutFileValidation(): this
8181
// Backward compatibility for easy migration from the original Precognition libraries
8282
setErrors(errors: FormDataErrors<TForm> | Record<string, string | string[]>): this
@@ -148,7 +148,7 @@ export default function useForm<TForm extends FormDataType<TForm>>(
148148
// We're dynamically adding precognition properties to 'this', so we assert the type
149149
const formWithPrecognition = this as any as InertiaPrecognitiveForm<TForm>
150150

151-
let simpleValidationErrors = true
151+
let arrayErrors = false
152152
const validator = createValidator((client) => {
153153
const { method, url } = precognitionEndpoint!()
154154
const transformedData = transform(this.data()) as Record<string, unknown>
@@ -169,9 +169,7 @@ export default function useForm<TForm extends FormDataType<TForm>>(
169169
formWithPrecognition.__touched = validator.touched()
170170
})
171171
.on('errorsChanged', () => {
172-
const validationErrors = simpleValidationErrors
173-
? toSimpleValidationErrors(validator.errors())
174-
: validator.errors()
172+
const validationErrors = arrayErrors ? validator.errors() : toSimpleValidationErrors(validator.errors())
175173

176174
this.errors = {} as FormDataErrors<TForm>
177175

@@ -190,7 +188,7 @@ export default function useForm<TForm extends FormDataType<TForm>>(
190188
__valid: [],
191189
validating: false,
192190
validator: () => validator,
193-
withFullErrors: () => tap(formWithPrecognition, () => (simpleValidationErrors = false)),
191+
withArrayErrors: () => tap(formWithPrecognition, () => (arrayErrors = true)),
194192
valid: (field: string) => formWithPrecognition.__valid.includes(field),
195193
invalid: (field: string) => field in this.errors,
196194
setValidationTimeout: (duration: number) => tap(formWithPrecognition, () => validator.setTimeout(duration)),

packages/vue3/test-app/Pages/FormHelper/Precognition/AllErrors.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ const form = useForm({
77
})
88
.withPrecognition('post', '/precognition/array-errors')
99
.setValidationTimeout(100)
10-
.withFullErrors()
10+
.withArrayErrors()
1111
</script>
1212

1313
<template>

0 commit comments

Comments
 (0)