react-hook-form 7.55.0-next.7 → 7.55.0-next.9

package/dist/index.esm.mjs

@@ -1268,9 +1268,9 @@ function createFormControl(props = {}) {
         errors: _options.errors || {},
         disabled: _options.disabled || false,
     };
-    let _fields = {};
+    const _fields = {};
     let _defaultValues = isObject(_options.defaultValues) || isObject(_options.values)
-        ? cloneObject(_options.defaultValues || _options.values) || {}
+        ? cloneObject(_options.values || _options.defaultValues) || {}
         : {};
     let _formValues = _options.shouldUnregister
         ? {}
@@ -2107,13 +2107,11 @@ function createFormControl(props = {}) {
                         }
                     }
                 }
-                _fields = {};
+                for (const fieldName of _names.mount) {
+                    setValue(fieldName, get(values, fieldName));
+                }
             }
-            _formValues = _options.shouldUnregister
-                ? keepStateOptions.keepDefaultValues
-                    ? cloneObject(_defaultValues)
-                    : {}
-                : cloneObject(values);
+            _formValues = cloneObject(values);
             _subjects.array.next({
                 values: { ...values },
             });
@@ -2556,8 +2554,15 @@ function useFieldArray(props) {
     React.useEffect(() => {
         !get(control._formValues, name) && control._setFieldArray(name);
         return () => {
-            (control._options.shouldUnregister || shouldUnregister) &&
-                control.unregister(name);
+            const updateMounted = (name, value) => {
+                const field = get(control._fields, name);
+                if (field && field._f) {
+                    field._f.mount = value;
+                }
+            };
+            control._options.shouldUnregister || shouldUnregister
+                ? control.unregister(name)
+                : updateMounted(name, false);
         };
     }, [name, control, keyName, shouldUnregister]);
     return {
@@ -2607,7 +2612,7 @@ function useFieldArray(props) {
  */
 function useForm(props = {}) {
     const _formControl = React.useRef(undefined);
-    const _values = React.useRef(props.values);
+    const _values = React.useRef(undefined);
     const [formState, updateFormState] = React.useState({
         isDirty: false,
         isValidating: false,
@@ -2631,6 +2636,11 @@ function useForm(props = {}) {
             ...(props.formControl ? props.formControl : createFormControl(props)),
             formState,
         };
+        if (props.formControl &&
+            props.defaultValues &&
+            !isFunction(props.defaultValues)) {
+            props.formControl.reset(props.defaultValues, props.resetOptions);
+        }
     }
     const control = _formControl.current.control;
     control._options = props;