react-hook-form 7.5.2 → 7.5.3

package/dist/index.esm.js

@@ -133,10 +133,10 @@ function useFormState(props) {
 
 function useController({ name, rules, defaultValue, control, shouldUnregister, }) {
     const methods = useFormContext();
-    const { defaultValuesRef, register, fieldsRef, unregister, fieldArrayNamesRef, controllerSubjectRef, shouldUnmountUnregister, } = control || methods.control;
+    const { defaultValuesRef, register, fieldsRef, unregister, fieldArrayNamesRef, controllerSubjectRef, shouldUnmountUnregister, inFieldArrayActionRef, } = control || methods.control;
     const { onChange, onBlur, ref } = register(name, rules);
-    const [value, setInputStateValue] = React.useState(isUndefined(get(fieldsRef.current, name)._f.value) ||
-        isNameInFieldArray(fieldArrayNamesRef.current, name)
+    const isFieldArray = isNameInFieldArray(fieldArrayNamesRef.current, name);
+    const [value, setInputStateValue] = React.useState(isUndefined(get(fieldsRef.current, name)._f.value) || isFieldArray
         ? isUndefined(defaultValue)
             ? get(defaultValuesRef.current, name)
             : defaultValue
@@ -153,7 +153,10 @@ function useController({ name, rules, defaultValue, control, shouldUnregister, }
         });
         return () => {
             controllerSubscription.unsubscribe();
-            if (shouldUnmountUnregister || shouldUnregister) {
+            const shouldUnmount = shouldUnmountUnregister || shouldUnregister;
+            if (isFieldArray
+                ? shouldUnmount && !inFieldArrayActionRef.current
+                : shouldUnmount) {
                 unregister(name);
             }
             else if (get(fieldsRef.current, name)) {
@@ -462,7 +465,7 @@ function unset(object, path) {
 const useFieldArray = ({ control, name, keyName = 'id', shouldUnregister, }) => {
     const methods = useFormContext();
     const focusNameRef = React.useRef('');
-    const { isWatchAllRef, watchFieldsRef, getIsDirty, watchSubjectRef, fieldArraySubjectRef, fieldArrayNamesRef, fieldsRef, defaultValuesRef, formStateRef, formStateSubjectRef, readFormStateRef, validFieldsRef, fieldsWithValidationRef, fieldArrayDefaultValuesRef, unregister, shouldUnmountUnregister, } = control || methods.control;
+    const { isWatchAllRef, watchFieldsRef, getIsDirty, watchSubjectRef, fieldArraySubjectRef, fieldArrayNamesRef, fieldsRef, defaultValuesRef, formStateRef, formStateSubjectRef, readFormStateRef, validFieldsRef, fieldsWithValidationRef, fieldArrayDefaultValuesRef, unregister, shouldUnmountUnregister, inFieldArrayActionRef, } = control || methods.control;
     const [fields, setFields] = React.useState(mapIds(get(fieldsRef.current, name)
         ? get(getFieldsValues(fieldsRef), name)
         : get(fieldArrayDefaultValuesRef.current, getNodeParentName(name))
@@ -490,6 +493,7 @@ const useFieldArray = ({ control, name, keyName = 'id', shouldUnregister, }) =>
     const updateDirtyFieldsWithDefaultValues = (updatedFieldArrayValues) => updatedFieldArrayValues &&
         set(formStateRef.current.dirtyFields, name, setFieldArrayDirtyFields(omitKey(updatedFieldArrayValues), get(defaultValuesRef.current, name, []), get(formStateRef.current.dirtyFields, name, [])));
     const batchStateUpdate = (method, args, updatedFieldArrayValues = [], shouldSet = true) => {
+        inFieldArrayActionRef.current = true;
         if (get(fieldsRef.current, name)) {
             const output = method(get(fieldsRef.current, name), args.argA, args.argB);
             shouldSet && set(fieldsRef.current, name, output);
@@ -597,6 +601,7 @@ const useFieldArray = ({ control, name, keyName = 'id', shouldUnregister, }) =>
         }, fieldValues, false);
     };
     React.useEffect(() => {
+        inFieldArrayActionRef.current = false;
         if (isWatchAllRef.current) {
             formStateSubjectRef.current.next({});
         }
@@ -988,6 +993,7 @@ function useForm({ mode = VALIDATION_MODE.onSubmit, reValidateMode = VALIDATION_
     const controllerSubjectRef = React.useRef(new Subject());
     const fieldArraySubjectRef = React.useRef(new Subject());
     const fieldArrayDefaultValuesRef = React.useRef({});
+    const inFieldArrayActionRef = React.useRef(false);
     const watchFieldsRef = React.useRef(new Set());
     const isMountedRef = React.useRef(false);
     const fieldsWithValidationRef = React.useRef({});
@@ -1484,9 +1490,12 @@ function useForm({ mode = VALIDATION_MODE.onSubmit, reValidateMode = VALIDATION_
                     }
                     else {
                         const field = get(fieldsRef.current, name);
+                        const shouldUnmount = shouldUnregister || (options && options.shouldUnregister);
                         field && (field._f.mount = false);
                         if (isWeb &&
-                            (shouldUnregister || (options && options.shouldUnregister))) {
+                            (isNameInFieldArray(fieldArrayNamesRef.current, name)
+                                ? shouldUnmount && !inFieldArrayActionRef.current
+                                : shouldUnmount)) {
                             unregisterFieldsNamesRef.current.add(name);
                         }
                     }
@@ -1648,6 +1657,7 @@ function useForm({ mode = VALIDATION_MODE.onSubmit, reValidateMode = VALIDATION_
         control: React.useMemo(() => ({
             register,
             isWatchAllRef,
+            inFieldArrayActionRef,
             watchFieldsRef,
             getIsDirty,
             formStateSubjectRef,