feat(hook): Enhanced handleSubmit.

jaywcjlove · Nov 3, 2021 · ea2ccb2 · ea2ccb2
1 parent 5a1623a
commit ea2ccb2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/packages/hook/README.md b/packages/hook/README.md
@@ -89,7 +89,7 @@ export declare function useValidator(props?: UseValidator): {
   validator: Validator;
   forceUpdate: () => void;
   /** Only `Form` Support */
-  handleSubmit: (handle?: ((value: Values) => void) | undefined) => (evn: React.FormEvent<HTMLFormElement>) => void;
+  handleSubmit: (handle?: ((value: Values, valid: boolean) => void) | undefined) => (evn: React.FormEvent<HTMLFormElement>) => void;
   /** Only `Form` Support */
   handleReset: (handle?: ((value: Values) => void) | undefined) => (evn: React.FormEvent<HTMLFormElement>) => void;
 };

diff --git a/packages/hook/src/index.ts b/packages/hook/src/index.ts
@@ -14,13 +14,13 @@ export function useValidator(props: UseValidator = {}) {
   }, [props.form, validator.current]);
 
   const handleForceUpdate = () => forceUpdate(upState + 1);
-  const handleSubmit = (handle?: (value: Values) => void) => (evn: React.FormEvent<HTMLFormElement>) => {
+  const handleSubmit = (handle?: (value: Values, valid: boolean) => void) => (evn: React.FormEvent<HTMLFormElement>) => {
     evn && evn.preventDefault();
     validator.current.showMessages();
     forceUpdate(upState + 1);
     if (handle) {
-      const val = validator.current.values;
-      handle({ ...validator.current.values });
+      const valid = validator.current.allValid();
+      handle({ ...validator.current.values }, valid);
     }
   }
   const handleReset = (handle?: (value: Values) => void) => (evn: React.FormEvent<HTMLFormElement>) => {