react-hook-form 7.21.3-beta.0 → 7.22.3

package/dist/index.esm.mjs

@@ -235,14 +235,11 @@ function useController(props) {
         updateMounted(name, true);
         return () => {
             const _shouldUnregisterField = control._options.shouldUnregister || shouldUnregister;
-            if (isArrayField
+            isArrayField
                 ? _shouldUnregisterField && !control._stateFlags.action
-                : _shouldUnregisterField) {
-                control.unregister(name, { keepDefaultValue: true });
-            }
-            else {
-                updateMounted(name, false);
-            }
+                : _shouldUnregisterField
+                    ? control.unregister(name)
+                    : updateMounted(name, false);
         };
     }, [name, control, isArrayField, shouldUnregister]);
     return {
@@ -1314,7 +1311,7 @@ function createFormControl(props = {}) {
                     : defaultValue));
         return generateWatchOutput(names, _names, fieldValues, isGlobal);
     };
-    const _getFieldArray = (name) => get(_stateFlags.mount ? _formValues : _defaultValues, name, props.shouldUnregister ? get(_defaultValues, name, []) : []);
+    const _getFieldArray = (name) => compact(get(_stateFlags.mount ? _formValues : _defaultValues, name, props.shouldUnregister ? get(_defaultValues, name, []) : []));
     const setFieldValue = (name, value, options = {}) => {
         const field = get(_fields, name);
         let fieldValue = value;
@@ -1673,14 +1670,14 @@ function createFormControl(props = {}) {
     const reset = (formValues, keepStateOptions = {}) => {
         const updatedValues = formValues || _defaultValues;
         const cloneUpdatedValues = cloneObject(updatedValues);
-        const values = !isEmptyObject(formValues)
+        const values = formValues && !isEmptyObject(formValues)
             ? cloneUpdatedValues
             : _defaultValues;
         if (!keepStateOptions.keepDefaultValues) {
             _defaultValues = updatedValues;
         }
         if (!keepStateOptions.keepValues) {
-            if (isWeb) {
+            if (isWeb && isUndefined(formValues)) {
                 for (const name of _names.mount) {
                     const field = get(_fields, name);
                     if (field && field._f) {
@@ -1702,10 +1699,10 @@ function createFormControl(props = {}) {
                     : {}
                 : cloneUpdatedValues;
             _fields = {};
-            _subjects.watch.next({
+            _subjects.array.next({
                 values,
             });
-            _subjects.array.next({
+            _subjects.watch.next({
                 values,
             });
         }
@@ -1717,6 +1714,9 @@ function createFormControl(props = {}) {
             watchAll: false,
             focus: '',
         };
+        _stateFlags.mount =
+            !_proxyFormState.isValid || !!keepStateOptions.keepIsValid;
+        _stateFlags.watch = !!props.shouldUnregister;
         _subjects.state.next({
             submitCount: keepStateOptions.keepSubmitCount
                 ? _formState.submitCount
@@ -1743,9 +1743,6 @@ function createFormControl(props = {}) {
             isSubmitting: false,
             isSubmitSuccessful: false,
         });
-        _stateFlags.mount =
-            !_proxyFormState.isValid || !!keepStateOptions.keepIsValid;
-        _stateFlags.watch = !!props.shouldUnregister;
     };
     const setFocus = (name) => {
         const field = get(_fields, name)._f;