react-hook-form 6.9.4 → 6.9.5

package/dist/index.umd.development.js

@@ -836,13 +836,14 @@
           }
           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),
@@ -952,6 +953,22 @@
               });
       }, [isValidateAllFieldCriteria]);
       const removeFieldEventListener = React.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 = React.useCallback((field, forceDelete) => {
           if (field) {
               removeFieldEventListener(field, forceDelete);
@@ -967,6 +984,7 @@
                       dirtyFields: formStateRef.current.dirtyFields,
                   });
                   resolverRef.current && validateResolver();
+                  updateWatchedValue(field.ref.name);
               }
           }
       }, [validateResolver, removeFieldEventListener]);
@@ -1122,16 +1140,14 @@
           }
           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 {
@@ -1215,13 +1231,11 @@
           }
           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);
       };
       React.useEffect(() => {
@@ -1252,15 +1266,13 @@
           register: React.useCallback(register, [defaultValuesRef.current]),
           unregister: React.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,
@@ -1408,7 +1420,7 @@
           }
       }
       const focusIndexRef = React.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 = React.useRef([
           ...(get(fieldArrayDefaultValuesRef.current, fieldArrayParentName)
@@ -1608,20 +1620,7 @@
               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];
@@ -1673,7 +1672,7 @@
                   : defaultValuesRef.current
           : defaultValue);
       const idRef = React.useRef();
-      const defaultValueRef = React.useRef(value);
+      const defaultValueRef = React.useRef(defaultValue);
       const updateWatchValue = React.useCallback(() => {
           const value = watchInternal(name, defaultValueRef.current, idRef.current);
           setValue(isObject(value)