react-hook-form 7.49.3 → 7.50.0

package/dist/index.esm.mjs

@@ -1230,7 +1230,10 @@ function useFieldArray(props) {
             }
             else {
                 const field = get(control._fields, name);
-                if (field && field._f) {
+                if (field &&
+                    field._f &&
+                    !(getValidationModes(control._options.reValidateMode).isOnSubmit &&
+                        getValidationModes(control._options.mode).isOnSubmit)) {
                     validateField(field, control._formValues, control._options.criteriaMode === VALIDATION_MODE.all, control._options.shouldUseNativeValidation, true).then((error) => !isEmptyObject(error) &&
                         control._subjects.state.next({
                             errors: updateFieldArrayRootError(control._formState.errors, error, name),
@@ -1535,8 +1538,8 @@ function createFormControl(props = {}, flushRootRender) {
         disabled: _options.disabled || false,
     };
     let _fields = {};
-    let _defaultValues = isObject(_options.defaultValues) || isObject(_options.values)
-        ? cloneObject(_options.defaultValues || _options.values) || {}
+    let _defaultValues = isObject(_options.values) || isObject(_options.defaultValues)
+        ? cloneObject(_options.values || _options.defaultValues) || {}
         : {};
     let _formValues = _options.shouldUnregister
         ? {}
@@ -2174,6 +2177,7 @@ function createFormControl(props = {}, flushRootRender) {
         }
     };
     const handleSubmit = (onValid, onInvalid) => async (e) => {
+        let onValidError = undefined;
         if (e) {
             e.preventDefault && e.preventDefault();
             e.persist && e.persist();
@@ -2195,7 +2199,12 @@ function createFormControl(props = {}, flushRootRender) {
             _subjects.state.next({
                 errors: {},
             });
-            await onValid(fieldValues, e);
+            try {
+                await onValid(fieldValues, e);
+            }
+            catch (error) {
+                onValidError = error;
+            }
         }
         else {
             if (onInvalid) {
@@ -2207,10 +2216,13 @@ function createFormControl(props = {}, flushRootRender) {
         _subjects.state.next({
             isSubmitted: true,
             isSubmitting: false,
-            isSubmitSuccessful: isEmptyObject(_formState.errors),
+            isSubmitSuccessful: isEmptyObject(_formState.errors) && !onValidError,
             submitCount: _formState.submitCount + 1,
             errors: _formState.errors,
         });
+        if (onValidError) {
+            throw onValidError;
+        }
     };
     const resetField = (name, options = {}) => {
         if (get(_fields, name)) {
@@ -2295,7 +2307,10 @@ function createFormControl(props = {}, flushRootRender) {
             focus: '',
         };
         !_state.mount && flushRootRender();
-        _state.mount = !_proxyFormState.isValid || !!keepStateOptions.keepIsValid;
+        _state.mount =
+            !_proxyFormState.isValid ||
+                !!keepStateOptions.keepIsValid ||
+                !!keepStateOptions.keepDirtyValues;
         _state.watch = !!props.shouldUnregister;
         _subjects.state.next({
             submitCount: keepStateOptions.keepSubmitCount
@@ -2309,7 +2324,9 @@ function createFormControl(props = {}, flushRootRender) {
                 ? _formState.isSubmitted
                 : false,
             dirtyFields: keepStateOptions.keepDirtyValues
-                ? _formState.dirtyFields
+                ? keepStateOptions.keepDefaultValues && _formValues
+                    ? getDirtyFields(_defaultValues, _formValues)
+                    : _formState.dirtyFields
                 : keepStateOptions.keepDefaultValues && formValues
                     ? getDirtyFields(_defaultValues, formValues)
                     : {},
@@ -2529,6 +2546,12 @@ function useForm(props = {}) {
         }
         control._removeUnmounted();
     });
+    React.useEffect(() => {
+        props.shouldUnregister &&
+            control._subjects.values.next({
+                values: control._getWatch(),
+            });
+    }, [props.shouldUnregister, control]);
     _formControl.current.formState = getProxyFormState(formState, control);
     return _formControl.current;
 }