react-hook-form 7.19.0 → 7.19.4

package/dist/index.esm.js

@@ -187,8 +187,8 @@ function useWatch(props) {
         subject: control._subjects.watch,
         callback: (formState) => {
             if (shouldSubscribeByName(_name.current, formState.name)) {
-                const fieldValues = generateWatchOutput(_name.current, control._names, control._formValues);
-                updateValue(isObject(fieldValues)
+                const fieldValues = generateWatchOutput(_name.current, control._names, formState.values || control._formValues);
+                updateValue(isUndefined(_name.current)
                     ? Object.assign({}, fieldValues) : Array.isArray(fieldValues)
                     ? [...fieldValues]
                     : fieldValues);
@@ -232,7 +232,7 @@ function useController(props) {
             if (isNameInFieldArray(control._names.array, name)
                 ? _shouldUnregisterField && !control._stateFlags.action
                 : _shouldUnregisterField) {
-                control.unregister(name);
+                control.unregister(name, { keepDefaultValue: true });
             }
             else {
                 updateMounted(name, false);
@@ -431,7 +431,6 @@ const useFieldArray = (props) => {
         const updatedFieldArrayValues = omitKeys(updatedFieldArrayValuesWithKey, keyName);
         _actioned.current = true;
         set(control._formValues, name, updatedFieldArrayValues);
-        setFields(updatedFieldArrayValuesWithKey);
         return updatedFieldArrayValues;
     }, [control, name, keyName]);
     const append$1 = (value, options) => {
@@ -440,6 +439,7 @@ const useFieldArray = (props) => {
         control._updateFieldArray(name, append, {
             argA: fillEmptyArray(value),
         }, updateValues(updatedFieldArrayValuesWithKey));
+        setFields(updatedFieldArrayValuesWithKey);
         control._names.focus = getFocusFieldName(name, updatedFieldArrayValuesWithKey.length - appendValue.length, options);
     };
     const prepend$1 = (value, options) => {
@@ -447,6 +447,7 @@ const useFieldArray = (props) => {
         control._updateFieldArray(name, prepend, {
             argA: fillEmptyArray(value),
         }, updateValues(updatedFieldArrayValuesWithKey));
+        setFields(updatedFieldArrayValuesWithKey);
         control._names.focus = getFocusFieldName(name, 0, options);
     };
     const remove = (index) => {
@@ -454,6 +455,7 @@ const useFieldArray = (props) => {
         control._updateFieldArray(name, removeArrayAt, {
             argA: index,
         }, updateValues(updatedFieldArrayValuesWithKey));
+        setFields(updatedFieldArrayValuesWithKey);
     };
     const insert$1 = (index, value, options) => {
         const updatedFieldArrayValuesWithKey = insert(mapCurrentIds(control._getFieldArray(name), _fieldIds, keyName), index, mapIds(convertToArrayPayload(value), keyName));
@@ -461,6 +463,7 @@ const useFieldArray = (props) => {
             argA: index,
             argB: fillEmptyArray(value),
         }, updateValues(updatedFieldArrayValuesWithKey));
+        setFields(updatedFieldArrayValuesWithKey);
         control._names.focus = getFocusFieldName(name, index, options);
     };
     const swap = (indexA, indexB) => {
@@ -470,6 +473,7 @@ const useFieldArray = (props) => {
             argA: indexA,
             argB: indexB,
         }, updateValues(updatedFieldArrayValuesWithKey), false);
+        setFields(updatedFieldArrayValuesWithKey);
     };
     const move = (from, to) => {
         const updatedFieldArrayValuesWithKey = mapCurrentIds(control._getFieldArray(name), _fieldIds, keyName);
@@ -478,6 +482,7 @@ const useFieldArray = (props) => {
             argA: from,
             argB: to,
         }, updateValues(updatedFieldArrayValuesWithKey), false);
+        setFields(updatedFieldArrayValuesWithKey);
     };
     const update = (index, value) => {
         const updatedFieldArrayValuesWithKey = mapCurrentIds(control._getFieldArray(name), _fieldIds, keyName);
@@ -487,10 +492,12 @@ const useFieldArray = (props) => {
             argA: index,
             argB: value,
         }, updateValues(_fieldIds.current), true, false);
+        setFields(_fieldIds.current);
     };
     const replace = (value) => {
         const updatedFieldArrayValuesWithKey = mapIds(convertToArrayPayload(value), keyName);
         control._updateFieldArray(name, () => updatedFieldArrayValuesWithKey, {}, updateValues(updatedFieldArrayValuesWithKey), true, false);
+        setFields(updatedFieldArrayValuesWithKey);
     };
     React.useEffect(() => {
         control._stateFlags.action = false;
@@ -1526,6 +1533,7 @@ function createFormControl(props = {}) {
         });
         _names.mount.add(name);
         !isUndefined(options.value) &&
+            !options.disabled &&
             set(_formValues, name, get(_formValues, name, options.value));
         field
             ? isBoolean(options.disabled) &&
@@ -1582,7 +1590,9 @@ function createFormControl(props = {}) {
             e.persist && e.persist();
         }
         let hasNoPromiseError = true;
-        let fieldValues = Object.assign({}, _formValues);
+        let fieldValues = _options.shouldUnregister
+            ? cloneObject(_formValues)
+            : Object.assign({}, _formValues);
         _subjects.state.next({
             isSubmitting: true,
         });
@@ -1840,7 +1850,6 @@ function useForm(props = {}) {
         }
         control._removeUnmounted();
     });
-    React.useEffect(() => () => Object.values(control._subjects).forEach((subject) => subject.unsubscribe()), [control]);
     _formControl.current.formState = getProxyFormState(formState, control._proxyFormState);
     return _formControl.current;
 }