Skip to content

enhance useForm validation logic with isValid method and improv… #483

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

Merged
merged 1 commit into from
Nov 14, 2025
Merged

enhance useForm validation logic with isValid method and improv… #483

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 18 additions & 4 deletions src/components/form/useForm.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import {useCallback, useMemo, useState} from "react";

export type Validations<Values> = Partial<{
[Key in keyof Values]: (value: Values[Key]) => string | null;
[Key in keyof Values]: (value: Values[Key], values?: Values) => string | null;
}>

export interface FormValidationProps<Values> {
Expand All @@ -30,6 +30,7 @@ export type FormValidationReturn<Values> = [IValidation<Values>, () => void]

export interface IValidation<Values> {
getInputProps<Key extends keyof Values>(key: Key): ValidationProps<Values[Key]>
isValid(): boolean
}

class Validation<Values> implements IValidation<Values> {
Expand All @@ -46,12 +47,25 @@ class Validation<Values> implements IValidation<Values> {
this.initialRender = initial
}

public getInputProps<Key extends keyof Values>(key: Key): ValidationProps<Values[Key]> {
isValid(): boolean {
if (!this.currentValidations) return true
for (const key in this.currentValidations) {
const validateFn = this.currentValidations[key]
if (validateFn) {
const message = validateFn(this.currentValues[key], this.currentValues)
if (message !== null) return false
}
}

return true
}

getInputProps<Key extends keyof Values>(key: Key): ValidationProps<Values[Key]> {

const currentValue = ((this.currentValues[key]) || null)!!
const currentName = key as string
const currentFc = !!this.currentValidations && !!this.currentValidations[key] ? this.currentValidations[key] : (value: typeof currentValue) => null
const message = !this.initialRender ? currentFc(currentValue) : null
const message = !this.initialRender ? currentFc(currentValue, this.currentValues) : null

return {
initialValue: currentValue,
Expand Down Expand Up @@ -87,7 +101,7 @@ export const useForm = <Values extends Record<string, any> = Record<string, any>
let inputProps: IValidation<Values> = new Validation(changeValue, values, validate, false)

setInputProps(() => inputProps)
if (onSubmit) onSubmit(values as Values)
if (onSubmit && inputProps.isValid()) onSubmit(values as Values)

}, [])

Expand Down