LukeParke/form
1
0
Fork 0
mirror of https://github.com/LukeHagar/form.git synced 2025-12-06 04:19:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: errors should no longer throw on intial render (#508)

Browse Source
This commit is contained in:
Corbin Crutchley
2023-11-05 05:59:47 -08:00
committed by GitHub
parent 0982e3fe6c
commit 0dc440d7d9
1 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
packages/form-core/src/FormApi.ts
View File

@@ -177,16 +177,21 @@ export class FormApi<TFormData, ValidatorType> {
mount = () => {
const doValidate = () => {
if (typeof this.options.onMount === 'function') {
return this.options.onMount(this.state.values, this)
}
if (this.options.validator) {
if (
this.options.validator &&
typeof this.options.onMount !== 'function'
) {
return (this.options.validator as Validator<TFormData>)().validate(
this.state.values,
this.options.onMount,
)
}
return (this.options.onMount as ValidateFn<TFormData, ValidatorType>)(
this.state.values,
this,
)
}
if (!this.options.onMount) return
const error = doValidate()
if (error) {
this.store.setState((prev) => ({
@@ -269,17 +274,16 @@ export class FormApi<TFormData, ValidatorType> {
const errorMapKey = getErrorMapKey(cause)
const doValidate = () => {
if (typeof validate === 'function') {
return validate(this.state.values, this) as ValidationError
}
if (this.options.validator && typeof validate !== 'function') {
return (this.options.validator as Validator<TFormData>)().validate(
this.state.values,
validate,
)
}
throw new Error(
`Form validation for ${errorMapKey} failed. ${errorMapKey} should either be a function, or \`validator\` should be correct.`,
return (validate as ValidateFn<TFormData, ValidatorType>)(
this.state.values,
this,
)
}