react-hook-form 7.55.0-next.2 → 7.55.0-next.4

package/dist/index.esm.mjs

@@ -106,7 +106,6 @@ var set = (object, path, value) => {
         object[key] = newValue;
         object = object[key];
     }
-    return object;
 };
 
 const EVENTS = {
@@ -315,6 +314,7 @@ function useWatch(props) {
     const methods = useFormContext();
     const { control = methods.control, name, defaultValue, disabled, exact, } = props || {};
     const _name = React.useRef(name);
+    const _defaultValue = React.useRef(defaultValue);
     _name.current = name;
     React.useEffect(() => control._subscribe({
         name: _name.current,
@@ -323,8 +323,8 @@ function useWatch(props) {
         },
         exact,
         callback: (formState) => !disabled &&
-            updateValue(cloneObject(generateWatchOutput(_name.current, control._names, formState.values || control._formValues, false, defaultValue))),
-    }), [control, defaultValue, disabled, exact]);
+            updateValue(generateWatchOutput(_name.current, control._names, formState.values || control._formValues, false, _defaultValue.current)),
+    }), [control, disabled, exact]);
     const [value, updateValue] = React.useState(control._getWatch(name, defaultValue));
     React.useEffect(() => control._removeUnmounted());
     return value;
@@ -369,6 +369,7 @@ function useController(props) {
         name,
         exact: true,
     });
+    const _props = React.useRef(props);
     const _registerProps = React.useRef(control.register(name, {
         ...props.rules,
         value,
@@ -433,6 +434,12 @@ function useController(props) {
     }), [name, disabled, formState.disabled, onChange, onBlur, ref, value]);
     React.useEffect(() => {
         const _shouldUnregisterField = control._options.shouldUnregister || shouldUnregister;
+        control.register(name, {
+            ..._props.current.rules,
+            ...(isBoolean(_props.current.disabled)
+                ? { disabled: _props.current.disabled }
+                : {}),
+        });
         const updateMounted = (name, value) => {
             const field = get(control._fields, name);
             if (field && field._f) {
@@ -1590,7 +1597,7 @@ function createFormControl(props = {}) {
                     if (!fieldReference.ref.type) {
                         _subjects.state.next({
                             name,
-                            values: { ..._formValues },
+                            values: cloneObject(_formValues),
                         });
                     }
                 }
@@ -1621,7 +1628,7 @@ function createFormControl(props = {}) {
         if (isFieldArray) {
             _subjects.array.next({
                 name,
-                values: { ..._formValues },
+                values: cloneObject(_formValues),
             });
             if ((_proxyFormState.isDirty ||
                 _proxyFormState.dirtyFields ||
@@ -1643,7 +1650,7 @@ function createFormControl(props = {}) {
         isWatched(name, _names) && _subjects.state.next({ ..._formState });
         _subjects.state.next({
             name: _state.mount ? name : undefined,
-            values: { ..._formValues },
+            values: cloneObject(_formValues),
         });
     };
     const onChange = async (event) => {
@@ -1685,7 +1692,7 @@ function createFormControl(props = {}) {
                 _subjects.state.next({
                     name,
                     type: event.type,
-                    values: { ..._formValues },
+                    values: cloneObject(_formValues),
                 });
             if (shouldSkipValidation) {
                 if (_proxyFormState.isValid || _proxySubscribeFormState.isValid) {
@@ -1826,7 +1833,7 @@ function createFormControl(props = {}) {
             if (shouldSubscribeByName(props.name, formState.name, props.exact) &&
                 shouldRenderFormState(formState, props.formState || _proxyFormState, _setFormState, props.reRenderRoot)) {
                 props.callback({
-                    values: _formValues,
+                    values: { ..._formValues },
                     ..._formState,
                     ...formState,
                 });
@@ -1862,7 +1869,7 @@ function createFormControl(props = {}) {
                 unset(_defaultValues, fieldName);
         }
         _subjects.state.next({
-            values: { ..._formValues },
+            values: cloneObject(_formValues),
         });
         _subjects.state.next({
             ..._formState,
@@ -1988,11 +1995,6 @@ function createFormControl(props = {}) {
             e.persist && e.persist();
         }
         let fieldValues = cloneObject(_formValues);
-        if (_names.disabled.size) {
-            for (const name of _names.disabled) {
-                set(fieldValues, name, undefined);
-            }
-        }
         _subjects.state.next({
             isSubmitting: true,
         });
@@ -2004,6 +2006,11 @@ function createFormControl(props = {}) {
         else {
             await executeBuiltInValidation(_fields);
         }
+        if (_names.disabled.size) {
+            for (const name of _names.disabled) {
+                set(fieldValues, name, undefined);
+            }
+        }
         unset(_formState.errors, 'root');
         if (isEmptyObject(_formState.errors)) {
             _subjects.state.next({
@@ -2526,7 +2533,7 @@ function useFieldArray(props) {
         }
         control._subjects.state.next({
             name,
-            values: { ...control._formValues },
+            values: cloneObject(control._formValues),
         });
         control._names.focus &&
             iterateFieldsByAction(control._fields, (ref, key) => {