react-hook-form 7.49.2 → 7.50.0

package/dist/index.esm.mjs

@@ -447,7 +447,7 @@ function useController(props) {
         field: {
             name,
             value,
-            ...(isBoolean(disabled) || isBoolean(formState.disabled)
+            ...(isBoolean(disabled) || formState.disabled
                 ? { disabled: formState.disabled || disabled }
                 : {}),
             onChange: React.useCallback((event) => _registerProps.current.onChange({
@@ -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),
@@ -1532,11 +1535,11 @@ function createFormControl(props = {}, flushRootRender) {
         touchedFields: {},
         dirtyFields: {},
         errors: _options.errors || {},
-        disabled: false,
+        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
         ? {}
@@ -1567,7 +1570,6 @@ function createFormControl(props = {}, flushRootRender) {
         array: createSubject(),
         state: createSubject(),
     };
-    const shouldCaptureDirtyFields = props.resetOptions && props.resetOptions.keepDirtyValues;
     const validationModeBeforeSubmit = getValidationModes(_options.mode);
     const validationModeAfterSubmit = getValidationModes(_options.reValidateMode);
     const shouldDisplayAllAssociatedErrors = _options.criteriaMode === VALIDATION_MODE.all;
@@ -2175,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();
@@ -2196,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) {
@@ -2208,19 +2216,22 @@ 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)) {
             if (isUndefined(options.defaultValue)) {
-                setValue(name, get(_defaultValues, name));
+                setValue(name, cloneObject(get(_defaultValues, name)));
             }
             else {
                 setValue(name, options.defaultValue);
-                set(_defaultValues, name, options.defaultValue);
+                set(_defaultValues, name, cloneObject(options.defaultValue));
             }
             if (!options.keepTouched) {
                 unset(_formState.touchedFields, name);
@@ -2228,7 +2239,7 @@ function createFormControl(props = {}, flushRootRender) {
             if (!options.keepDirty) {
                 unset(_formState.dirtyFields, name);
                 _formState.isDirty = options.defaultValue
-                    ? _getDirty(name, get(_defaultValues, name))
+                    ? _getDirty(name, cloneObject(get(_defaultValues, name)))
                     : _getDirty();
             }
             if (!options.keepError) {
@@ -2248,7 +2259,7 @@ function createFormControl(props = {}, flushRootRender) {
             _defaultValues = updatedValues;
         }
         if (!keepStateOptions.keepValues) {
-            if (keepStateOptions.keepDirtyValues || shouldCaptureDirtyFields) {
+            if (keepStateOptions.keepDirtyValues) {
                 for (const fieldName of _names.mount) {
                     get(_formState.dirtyFields, fieldName)
                         ? set(values, fieldName, get(_formValues, fieldName))
@@ -2296,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
@@ -2310,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)
                     : {},
@@ -2472,7 +2488,7 @@ function useForm(props = {}) {
         dirtyFields: {},
         touchedFields: {},
         errors: props.errors || {},
-        disabled: false,
+        disabled: props.disabled || false,
         defaultValues: isFunction(props.defaultValues)
             ? undefined
             : props.defaultValues,
@@ -2530,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;
 }