react-hook-form 7.43.2 → 7.43.4

package/dist/index.esm.mjs

@@ -328,7 +328,7 @@ function useWatch(props) {
     _name.current = name;
     useSubscribe({
         disabled,
-        subject: control._subjects.watch,
+        subject: control._subjects.values,
         next: (formState) => {
             if (shouldSubscribeByName(_name.current, formState.name, exact)) {
                 updateValue(cloneObject(generateWatchOutput(_name.current, control._names, formState.values || control._formValues, false, defaultValue)));
@@ -393,7 +393,7 @@ function useController(props) {
         return () => {
             const _shouldUnregisterField = control._options.shouldUnregister || shouldUnregister;
             (isArrayField
-                ? _shouldUnregisterField && !control._stateFlags.action
+                ? _shouldUnregisterField && !control._state.action
                 : _shouldUnregisterField)
                 ? control.unregister(name)
                 : updateMounted(name, false);
@@ -1082,8 +1082,11 @@ function useFieldArray(props) {
         control._updateFieldArray(name, [...updatedFieldArrayValues], (data) => data, {}, true, false);
     };
     React.useEffect(() => {
-        control._stateFlags.action = false;
-        isWatched(name, control._names) && control._subjects.state.next({});
+        control._state.action = false;
+        isWatched(name, control._names) &&
+            control._subjects.state.next({
+                ...control._formState,
+            });
         if (_actioned.current &&
             (!getValidationModes(control._options.mode).isOnSubmit ||
                 control._formState.isSubmitted)) {
@@ -1111,9 +1114,9 @@ function useFieldArray(props) {
                 }
             }
         }
-        control._subjects.watch.next({
+        control._subjects.values.next({
             name,
-            values: control._formValues,
+            values: { ...control._formValues },
         });
         control._names.focus &&
             focusFieldBy(control._fields, (key) => !!key && key.startsWith(control._names.focus || ''));
@@ -1146,11 +1149,8 @@ function useFieldArray(props) {
 function createSubject() {
     let _observers = [];
     const next = (value) => {
-        let x = 0;
-        const l = _observers.length;
-        while (x < l) {
-            _observers[x].next(value);
-            ++x;
+        for (const observer of _observers) {
+            observer.next && observer.next(value);
         }
     };
     const subscribe = (observer) => {
@@ -1255,9 +1255,7 @@ function getDirtyFieldsFromDefaultValues(data, formValues, dirtyFieldsFromValues
                 }
             }
             else {
-                deepEqual(data[key], formValues[key])
-                    ? delete dirtyFieldsFromValues[key]
-                    : (dirtyFieldsFromValues[key] = true);
+                dirtyFieldsFromValues[key] = !deepEqual(data[key], formValues[key]);
             }
         }
     }
@@ -1409,7 +1407,7 @@ function createFormControl(props = {}, flushRootRender) {
     let _formValues = _options.shouldUnregister
         ? {}
         : cloneObject(_defaultValues);
-    let _stateFlags = {
+    let _state = {
         action: false,
         mount: false,
         watch: false,
@@ -1422,7 +1420,6 @@ function createFormControl(props = {}, flushRootRender) {
     };
     let delayErrorCallback;
     let timer = 0;
-    const shouldCaptureDirtyFields = props.resetOptions && props.resetOptions.keepDirtyValues;
     const _proxyFormState = {
         isDirty: false,
         dirtyFields: false,
@@ -1432,10 +1429,11 @@ function createFormControl(props = {}, flushRootRender) {
         errors: false,
     };
     const _subjects = {
-        watch: createSubject(),
+        values: createSubject(),
         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;
@@ -1461,7 +1459,7 @@ function createFormControl(props = {}, flushRootRender) {
         });
     const _updateFieldArray = (name, values = [], method, args, shouldSetValues = true, shouldUpdateFieldsAndState = true) => {
         if (args && method) {
-            _stateFlags.action = true;
+            _state.action = true;
             if (shouldUpdateFieldsAndState && Array.isArray(get(_fields, name))) {
                 const fieldValues = method(get(_fields, name), args.argA, args.argB);
                 shouldSetValues && set(_fields, name, fieldValues);
@@ -1508,7 +1506,7 @@ function createFormControl(props = {}, flushRootRender) {
                 shouldSkipSetValueAs
                 ? set(_formValues, name, shouldSkipSetValueAs ? defaultValue : getFieldValue(field._f))
                 : setFieldValue(name, defaultValue);
-            _stateFlags.mount && _updateValid();
+            _state.mount && _updateValid();
         }
     };
     const updateTouchAndDirty = (name, fieldValue, isBlurEvent, shouldDirty, shouldRender) => {
@@ -1581,7 +1579,7 @@ function createFormControl(props = {}, flushRootRender) {
         }
         _updateIsValidating(false);
     };
-    const _executeSchema = async (name) => await _options.resolver(_formValues, _options.context, getResolverOptions(name || _names.mount, _fields, _options.criteriaMode, _options.shouldUseNativeValidation));
+    const _executeSchema = async (name) => _options.resolver(_formValues, _options.context, getResolverOptions(name || _names.mount, _fields, _options.criteriaMode, _options.shouldUseNativeValidation));
     const executeSchemaAndUpdateState = async (names) => {
         const { errors } = await _executeSchema();
         if (names) {
@@ -1640,7 +1638,7 @@ function createFormControl(props = {}, flushRootRender) {
     const _getDirty = (name, data) => (name && data && set(_formValues, name, data),
         !deepEqual(getValues(), _defaultValues));
     const _getWatch = (names, defaultValue, isGlobal) => generateWatchOutput(names, _names, {
-        ...(_stateFlags.mount
+        ...(_state.mount
             ? _formValues
             : isUndefined(defaultValue)
                 ? _defaultValues
@@ -1648,7 +1646,7 @@ function createFormControl(props = {}, flushRootRender) {
                     ? { [names]: defaultValue }
                     : defaultValue),
     }, isGlobal, defaultValue);
-    const _getFieldArray = (name) => compact(get(_stateFlags.mount ? _formValues : _defaultValues, name, props.shouldUnregister ? get(_defaultValues, name, []) : []));
+    const _getFieldArray = (name) => compact(get(_state.mount ? _formValues : _defaultValues, name, props.shouldUnregister ? get(_defaultValues, name, []) : []));
     const setFieldValue = (name, value, options = {}) => {
         const field = get(_fields, name);
         let fieldValue = value;
@@ -1684,8 +1682,9 @@ function createFormControl(props = {}, flushRootRender) {
                 else {
                     fieldReference.ref.value = fieldValue;
                     if (!fieldReference.ref.type) {
-                        _subjects.watch.next({
+                        _subjects.values.next({
                             name,
+                            values: { ..._formValues },
                         });
                     }
                 }
@@ -1716,7 +1715,7 @@ function createFormControl(props = {}, flushRootRender) {
         if (isFieldArray) {
             _subjects.array.next({
                 name,
-                values: _formValues,
+                values: { ..._formValues },
             });
             if ((_proxyFormState.isDirty || _proxyFormState.dirtyFields) &&
                 options.shouldDirty) {
@@ -1732,11 +1731,12 @@ function createFormControl(props = {}, flushRootRender) {
                 ? setValues(name, cloneValue, options)
                 : setFieldValue(name, cloneValue, options);
         }
-        isWatched(name, _names) && _subjects.state.next({});
-        _subjects.watch.next({
+        isWatched(name, _names) && _subjects.state.next({ ..._formState });
+        _subjects.values.next({
             name,
+            values: { ..._formValues },
         });
-        !_stateFlags.mount && flushRootRender();
+        !_state.mount && flushRootRender();
     };
     const onChange = async (event) => {
         const target = event.target;
@@ -1765,16 +1765,17 @@ function createFormControl(props = {}, flushRootRender) {
             const fieldState = updateTouchAndDirty(name, fieldValue, isBlurEvent, false);
             const shouldRender = !isEmptyObject(fieldState) || watched;
             !isBlurEvent &&
-                _subjects.watch.next({
+                _subjects.values.next({
                     name,
                     type: event.type,
+                    values: { ..._formValues },
                 });
             if (shouldSkipValidation) {
                 _proxyFormState.isValid && _updateValid();
                 return (shouldRender &&
                     _subjects.state.next({ name, ...(watched ? {} : fieldState) }));
             }
-            !isBlurEvent && watched && _subjects.state.next({});
+            !isBlurEvent && watched && _subjects.state.next({ ..._formState });
             _updateIsValidating(true);
             if (_options.resolver) {
                 const { errors } = await _executeSchema([name]);
@@ -1837,7 +1838,7 @@ function createFormControl(props = {}, flushRootRender) {
     const getValues = (fieldNames) => {
         const values = {
             ..._defaultValues,
-            ...(_stateFlags.mount ? _formValues : {}),
+            ...(_state.mount ? _formValues : {}),
         };
         return isUndefined(fieldNames)
             ? values
@@ -1872,7 +1873,7 @@ function createFormControl(props = {}, flushRootRender) {
         options && options.shouldFocus && ref && ref.focus && ref.focus();
     };
     const watch = (name, defaultValue) => isFunction(name)
-        ? _subjects.watch.subscribe({
+        ? _subjects.values.subscribe({
             next: (payload) => name(_getWatch(undefined, defaultValue), payload),
         })
         : _getWatch(name, defaultValue, true);
@@ -1893,7 +1894,9 @@ function createFormControl(props = {}, flushRootRender) {
                     unset(_defaultValues, fieldName);
             }
         }
-        _subjects.watch.next({});
+        _subjects.values.next({
+            values: { ..._formValues },
+        });
         _subjects.state.next({
             ..._formState,
             ...(!options.keepDirty ? {} : { isDirty: _getDirty() }),
@@ -1973,7 +1976,7 @@ function createFormControl(props = {}, flushRootRender) {
                         field._f.mount = false;
                     }
                     (_options.shouldUnregister || options.shouldUnregister) &&
-                        !(isNameInFieldArray(_names.array, name) && _stateFlags.action) &&
+                        !(isNameInFieldArray(_names.array, name) && _state.action) &&
                         _names.unMount.add(name);
                 }
             },
@@ -2088,10 +2091,10 @@ function createFormControl(props = {}, flushRootRender) {
                     : {}
                 : cloneUpdatedValues;
             _subjects.array.next({
-                values,
+                values: { ...values },
             });
-            _subjects.watch.next({
-                values,
+            _subjects.values.next({
+                values: { ...values },
             });
         }
         _names = {
@@ -2102,10 +2105,9 @@ function createFormControl(props = {}, flushRootRender) {
             watchAll: false,
             focus: '',
         };
-        !_stateFlags.mount && flushRootRender();
-        _stateFlags.mount =
-            !_proxyFormState.isValid || !!keepStateOptions.keepIsValid;
-        _stateFlags.watch = !!props.shouldUnregister;
+        !_state.mount && flushRootRender();
+        _state.mount = !_proxyFormState.isValid || !!keepStateOptions.keepIsValid;
+        _state.watch = !!props.shouldUnregister;
         _subjects.state.next({
             submitCount: keepStateOptions.keepSubmitCount
                 ? _formState.submitCount
@@ -2182,11 +2184,11 @@ function createFormControl(props = {}, flushRootRender) {
             get _formValues() {
                 return _formValues;
             },
-            get _stateFlags() {
-                return _stateFlags;
+            get _state() {
+                return _state;
             },
-            set _stateFlags(value) {
-                _stateFlags = value;
+            set _state(value) {
+                _state = value;
             },
             get _defaultValues() {
                 return _defaultValues;
@@ -2293,21 +2295,21 @@ function useForm(props = {}) {
         },
     });
     React.useEffect(() => {
-        if (!control._stateFlags.mount) {
+        if (props.values && !deepEqual(props.values, control._defaultValues)) {
+            control._reset(props.values, control._options.resetOptions);
+        }
+    }, [props.values, control]);
+    React.useEffect(() => {
+        if (!control._state.mount) {
             control._updateValid();
-            control._stateFlags.mount = true;
+            control._state.mount = true;
         }
-        if (control._stateFlags.watch) {
-            control._stateFlags.watch = false;
-            control._subjects.state.next({});
+        if (control._state.watch) {
+            control._state.watch = false;
+            control._subjects.state.next({ ...control._formState });
         }
         control._removeUnmounted();
     });
-    React.useEffect(() => {
-        if (props.values && !deepEqual(props.values, control._defaultValues)) {
-            control._reset(props.values, control._options.resetOptions);
-        }
-    }, [props.values, control]);
     _formControl.current.formState = getProxyFormState(formState, control);
     return _formControl.current;
 }