react-hook-form 6.9.4 → 6.9.5

package/dist/index.esm.js

@@ -832,13 +832,14 @@ function useForm({ mode = VALIDATION_MODE.onSubmit, reValidateMode = VALIDATION_
         }
         else if (!isPrimitive(value)) {
             setInternalValues(name, value, config);
-            if (fieldArrayNamesRef.current.has(name) && config.shouldDirty) {
+            if (fieldArrayNamesRef.current.has(name)) {
                 fieldArrayDefaultValuesRef.current[name] = value;
                 resetFieldArrayFunctionRef.current[name]({
                     [name]: value,
                 });
-                if (readFormStateRef.current.isDirty ||
-                    readFormStateRef.current.dirtyFields) {
+                if ((readFormStateRef.current.isDirty ||
+                    readFormStateRef.current.dirtyFields) &&
+                    config.shouldDirty) {
                     set(formStateRef.current.dirtyFields, name, setFieldArrayDirtyFields(value, get(defaultValuesRef.current, name, []), get(formStateRef.current.dirtyFields, name, [])));
                     updateFormState({
                         isDirty: !deepEqual(Object.assign(Object.assign({}, getValues()), { [name]: value }), defaultValuesRef.current),
@@ -948,6 +949,22 @@ function useForm({ mode = VALIDATION_MODE.onSubmit, reValidateMode = VALIDATION_
             });
     }, [isValidateAllFieldCriteria]);
     const removeFieldEventListener = useCallback((field, forceDelete) => findRemovedFieldAndRemoveListener(fieldsRef, handleChangeRef.current, field, shallowFieldsStateRef, shouldUnregister, forceDelete), [shouldUnregister]);
+    const updateWatchedValue = (name) => {
+        if (isWatchAllRef.current) {
+            updateFormState();
+        }
+        else if (watchFieldsRef) {
+            let shouldRenderUseWatch = true;
+            for (const watchField of watchFieldsRef.current) {
+                if (watchField.startsWith(name)) {
+                    updateFormState();
+                    shouldRenderUseWatch = false;
+                    break;
+                }
+            }
+            shouldRenderUseWatch && renderWatchedInputs(name);
+        }
+    };
     const removeFieldEventListenerAndRef = useCallback((field, forceDelete) => {
         if (field) {
             removeFieldEventListener(field, forceDelete);
@@ -963,6 +980,7 @@ function useForm({ mode = VALIDATION_MODE.onSubmit, reValidateMode = VALIDATION_
                     dirtyFields: formStateRef.current.dirtyFields,
                 });
                 resolverRef.current && validateResolver();
+                updateWatchedValue(field.ref.name);
             }
         }
     }, [validateResolver, removeFieldEventListener]);
@@ -1118,16 +1136,14 @@ function useForm({ mode = VALIDATION_MODE.onSubmit, reValidateMode = VALIDATION_
         }
         let fieldErrors = {};
         let fieldValues = setFieldArrayDefaultValues(getFieldsValues(fieldsRef, shallowFieldsStateRef, true));
-        if (readFormStateRef.current.isSubmitting) {
+        readFormStateRef.current.isSubmitting &&
             updateFormState({
                 isSubmitting: true,
             });
-        }
         try {
             if (resolverRef.current) {
                 const { errors, values } = await resolverRef.current(fieldValues, contextRef.current, isValidateAllFieldCriteria);
-                formStateRef.current.errors = errors;
-                fieldErrors = errors;
+                formStateRef.current.errors = fieldErrors = errors;
                 fieldValues = values;
             }
             else {
@@ -1211,13 +1227,11 @@ function useForm({ mode = VALIDATION_MODE.onSubmit, reValidateMode = VALIDATION_
         }
         fieldsRef.current = {};
         defaultValuesRef.current = cloneObject(values || defaultValuesRef.current);
-        if (values) {
-            renderWatchedInputs('');
-        }
+        values && renderWatchedInputs('');
+        Object.values(resetFieldArrayFunctionRef.current).forEach((resetFieldArray) => isFunction(resetFieldArray) && resetFieldArray());
         shallowFieldsStateRef.current = shouldUnregister
             ? {}
             : cloneObject(values) || {};
-        Object.values(resetFieldArrayFunctionRef.current).forEach((resetFieldArray) => isFunction(resetFieldArray) && resetFieldArray());
         resetRefs(omitResetState);
     };
     useEffect(() => {
@@ -1249,15 +1263,13 @@ function useForm({ mode = VALIDATION_MODE.onSubmit, reValidateMode = VALIDATION_
         register: useCallback(register, [defaultValuesRef.current]),
         unregister: useCallback(unregister, []),
     };
-    const control = Object.assign({ renderWatchedInputs,
+    const control = Object.assign({ updateWatchedValue,
         shouldUnregister,
         removeFieldEventListener,
         watchInternal, mode: modeRef.current, reValidateMode: {
             isReValidateOnBlur,
             isReValidateOnChange,
         }, fieldsRef,
-        isWatchAllRef,
-        watchFieldsRef,
         resetFieldArrayFunctionRef,
         useWatchFieldsRef,
         useWatchRenderFunctionsRef,
@@ -1405,7 +1417,7 @@ const useFieldArray = ({ control, name, keyName = 'id', }) => {
         }
     }
     const focusIndexRef = useRef(-1);
-    const { isWatchAllRef, resetFieldArrayFunctionRef, fieldArrayNamesRef, fieldsRef, defaultValuesRef, removeFieldEventListener, formStateRef, shallowFieldsStateRef, updateFormState, readFormStateRef, watchFieldsRef, validFieldsRef, fieldsWithValidationRef, fieldArrayDefaultValuesRef, validateResolver, renderWatchedInputs, getValues, shouldUnregister, } = control || methods.control;
+    const { updateWatchedValue, resetFieldArrayFunctionRef, fieldArrayNamesRef, fieldsRef, defaultValuesRef, removeFieldEventListener, formStateRef, shallowFieldsStateRef, updateFormState, readFormStateRef, validFieldsRef, fieldsWithValidationRef, fieldArrayDefaultValuesRef, validateResolver, getValues, shouldUnregister, } = control || methods.control;
     const fieldArrayParentName = getFieldArrayParentName(name);
     const memoizedDefaultValues = useRef([
         ...(get(fieldArrayDefaultValuesRef.current, fieldArrayParentName)
@@ -1605,20 +1617,7 @@ const useFieldArray = ({ control, name, keyName = 'id', }) => {
             defaultValues.pop();
             set(fieldArrayDefaultValuesRef.current, name, defaultValues);
         }
-        if (isWatchAllRef.current) {
-            updateFormState();
-        }
-        else if (watchFieldsRef) {
-            let shouldRenderUseWatch = true;
-            for (const watchField of watchFieldsRef.current) {
-                if (watchField.startsWith(name)) {
-                    updateFormState();
-                    shouldRenderUseWatch = false;
-                    break;
-                }
-            }
-            shouldRenderUseWatch && renderWatchedInputs(name);
-        }
+        updateWatchedValue(name);
         if (focusIndexRef.current > -1) {
             for (const key in fieldsRef.current) {
                 const field = fieldsRef.current[key];
@@ -1670,7 +1669,7 @@ function useWatch({ control, name, defaultValue, }) {
                 : defaultValuesRef.current
         : defaultValue);
     const idRef = useRef();
-    const defaultValueRef = useRef(value);
+    const defaultValueRef = useRef(defaultValue);
     const updateWatchValue = useCallback(() => {
         const value = watchInternal(name, defaultValueRef.current, idRef.current);
         setValue(isObject(value)