fix #893 trigger validation (#900)

react-hook-form · Jan 24, 2020 · 15727ed · 15727ed
1 parent ff7c70b
commit 15727ed
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/src/contextTypes.ts b/src/contextTypes.ts
@@ -90,6 +90,6 @@ export interface FormContextValues<
   getValues: (payload?: { nest: boolean }) => FormValues;
   handleSubmit: (
     callback: OnSubmit<FormValues>,
-  ) => (e: React.BaseSyntheticEvent) => Promise<void>;
+  ) => (e?: React.BaseSyntheticEvent) => Promise<void>;
   control: Control<FormValues>;
 }
diff --git a/src/useForm.ts b/src/useForm.ts
@@ -234,7 +234,6 @@ export function useForm<FormValues extends FieldValues = FieldValues>({
       getFieldValue(fieldsRef.current, fieldsRef.current[name]!.ref);
 
     if (isFieldArray) {
-      console.log(defaultValuesRef.current);
       const fieldArrayName = name.substring(0, name.indexOf('['));
       isDirty = getIsFieldsDifferent(
         transformToNestObject(getFieldsValues(fieldsRef.current))[
@@ -320,8 +319,10 @@ export function useForm<FormValues extends FieldValues = FieldValues>({
 
       if (isArray(payload)) {
         payload.forEach(name => {
-          if (errors[name]) {
-            set(errorsRef.current, name, errors[name]);
+          const error = get(errors, name);
+
+          if (error) {
+            set(errorsRef.current, name, error);
           } else {
             unset(errorsRef.current, [name]);
           }
@@ -868,7 +869,7 @@ export function useForm<FormValues extends FieldValues = FieldValues>({
 
   const handleSubmit = useCallback(
     (callback: OnSubmit<FormValues>) => async (
-      e: React.BaseSyntheticEvent,
+      e?: React.BaseSyntheticEvent,
     ): Promise<void> => {
       if (e) {
         e.preventDefault();