react-hook-form 7.12.1 → 7.12.2

package/dist/index.esm.js

@@ -301,29 +301,30 @@ var mapIds = (values = [], keyName) => values.map((value) => (Object.assign({ [k
 
 var isPrimitive = (value) => isNullOrUndefined(value) || !isObjectType(value);
 
-function deepEqual(object1, object2, isErrorObject) {
+function deepEqual(object1, object2) {
     if (isPrimitive(object1) ||
         isPrimitive(object2) ||
         isDateObject(object1) ||
         isDateObject(object2)) {
         return object1 === object2;
     }
-    if (!React.isValidElement(object1)) {
-        const keys1 = Object.keys(object1);
-        const keys2 = Object.keys(object2);
-        if (keys1.length !== keys2.length) {
+    const keys1 = Object.keys(object1);
+    const keys2 = Object.keys(object2);
+    if (keys1.length !== keys2.length) {
+        return false;
+    }
+    for (const key of keys1) {
+        const val1 = object1[key];
+        if (!keys2.includes(key)) {
             return false;
         }
-        for (const key of keys1) {
-            const val1 = object1[key];
-            if (!(isErrorObject && key === 'ref')) {
-                const val2 = object2[key];
-                if ((isObject(val1) || Array.isArray(val1)) &&
-                    (isObject(val2) || Array.isArray(val2))
-                    ? !deepEqual(val1, val2, isErrorObject)
-                    : val1 !== val2) {
-                    return false;
-                }
+        if (key !== 'ref') {
+            const val2 = object2[key];
+            if ((isObject(val1) || Array.isArray(val1)) &&
+                (isObject(val2) || Array.isArray(val2))
+                ? !deepEqual(val1, val2)
+                : val1 !== val2) {
+                return false;
             }
         }
     }
@@ -1067,12 +1068,21 @@ function useForm({ mode = VALIDATION_MODE.onSubmit, reValidateMode = VALIDATION_
             errors: formStateRef.current.errors,
         });
     };
+    const shouldRenderBaseOnValid = async () => {
+        const isValid = await validateForm(fieldsRef.current, true);
+        if (isValid !== formStateRef.current.isValid) {
+            formStateRef.current.isValid = isValid;
+            subjectsRef.current.state.next({
+                isValid,
+            });
+        }
+    };
     const shouldRenderBaseOnError = React.useCallback(async (shouldSkipRender, name, error, fieldState, isValidFromResolver, isWatched) => {
         const previousError = get(formStateRef.current.errors, name);
         const isValid = readFormStateRef.current.isValid
             ? resolver
                 ? isValidFromResolver
-                : await validateForm(fieldsRef.current, true)
+                : shouldRenderBaseOnValid()
             : false;
         if (delayError && error) {
             _delayCallback.current =
@@ -1085,11 +1095,11 @@ function useForm({ mode = VALIDATION_MODE.onSubmit, reValidateMode = VALIDATION_
                 : unset(formStateRef.current.errors, name);
         }
         if ((isWatched ||
-            (error ? !deepEqual(previousError, error, true) : previousError) ||
+            (error ? !deepEqual(previousError, error) : previousError) ||
             !isEmptyObject(fieldState) ||
             formStateRef.current.isValid !== isValid) &&
             !shouldSkipRender) {
-            const updatedFormState = Object.assign(Object.assign({}, fieldState), { isValid: !!isValid, errors: formStateRef.current.errors, name });
+            const updatedFormState = Object.assign(Object.assign(Object.assign({}, fieldState), (resolver ? { isValid: !!isValid } : {})), { errors: formStateRef.current.errors, name });
             formStateRef.current = Object.assign(Object.assign({}, formStateRef.current), updatedFormState);
             subjectsRef.current.state.next(isWatched ? { name } : updatedFormState);
         }