react-hook-form 7.23.0-next.1 → 7.23.0

package/dist/index.esm.mjs

@@ -142,8 +142,10 @@ function useFormState(props) {
         errors: false,
     });
     const _name = React.useRef(name);
+    const _mounted = React.useRef(true);
     _name.current = name;
-    const callback = React.useCallback((value) => shouldSubscribeByName(_name.current, value.name, exact) &&
+    const callback = React.useCallback((value) => _mounted.current &&
+        shouldSubscribeByName(_name.current, value.name, exact) &&
         shouldRenderFormState(value, _localProxyFormState.current) &&
         updateFormState(Object.assign(Object.assign({}, control._formState), value)), [control, exact]);
     useSubscribe({
@@ -151,6 +153,9 @@ function useFormState(props) {
         callback,
         subject: control._subjects.state,
     });
+    React.useEffect(() => () => {
+        _mounted.current = false;
+    }, []);
     return getProxyFormState(formState, control._proxyFormState, _localProxyFormState.current, false);
 }
 
@@ -402,14 +407,14 @@ function insert(data, index, value) {
 }
 
 var moveArrayAt = (data, from, to) => {
-    if (Array.isArray(data)) {
-        if (isUndefined(data[to])) {
-            data[to] = undefined;
-        }
-        data.splice(to, 0, data.splice(from, 1)[0]);
-        return data;
+    if (!Array.isArray(data)) {
+        return [];
     }
-    return [];
+    if (isUndefined(data[to])) {
+        data[to] = undefined;
+    }
+    data.splice(to, 0, data.splice(from, 1)[0]);
+    return data;
 };
 
 function prepend(data, value) {
@@ -537,14 +542,14 @@ const useFieldArray = (props) => {
         control._updateFieldArray(name, updateAt, {
             argA: index,
             argB: value,
-        }, updatedFieldArrayValues, true, false, false);
+        }, updatedFieldArrayValues, true, false);
     };
     const replace = (value) => {
         const updatedFieldArrayValues = convertToArrayPayload(value);
         ids.current = updatedFieldArrayValues.map(generateId);
         updateValues([...updatedFieldArrayValues]);
         setFields([...updatedFieldArrayValues]);
-        control._updateFieldArray(name, () => updatedFieldArrayValues, {}, [...updatedFieldArrayValues], true, false, false);
+        control._updateFieldArray(name, () => updatedFieldArrayValues, {}, [...updatedFieldArrayValues], true, false);
     };
     React.useEffect(() => {
         control._stateFlags.action = false;
@@ -1140,24 +1145,25 @@ function createFormControl(props = {}) {
         }
         return isValid;
     };
-    const _updateFieldArray = (name, method, args, values = [], shouldSetValues = true, shouldSetFields = true, shouldSetError = true) => {
+    const _updateFieldArray = (name, method, args, values = [], shouldSetValues = true, shouldSetFields = true) => {
         _stateFlags.action = true;
-        if (shouldSetFields && get(_fields, name)) {
+        if (shouldSetFields && Array.isArray(get(_fields, name))) {
             const fieldValues = method(get(_fields, name), args.argA, args.argB);
             shouldSetValues && set(_fields, name, fieldValues);
         }
-        if (shouldSetError && Array.isArray(get(_formState.errors, name))) {
+        if (_proxyFormState.errors &&
+            shouldSetFields &&
+            Array.isArray(get(_formState.errors, name))) {
             const errors = method(get(_formState.errors, name), args.argA, args.argB);
             shouldSetValues && set(_formState.errors, name, errors);
             unsetEmptyArray(_formState.errors, name);
         }
-        if (_proxyFormState.touchedFields && get(_formState.touchedFields, name)) {
+        if (_proxyFormState.touchedFields &&
+            Array.isArray(get(_formState.touchedFields, name))) {
             const touchedFields = method(get(_formState.touchedFields, name), args.argA, args.argB);
-            shouldSetValues &&
-                set(_formState.touchedFields, name, touchedFields);
-            unsetEmptyArray(_formState.touchedFields, name);
+            shouldSetValues && set(_formState.touchedFields, name, touchedFields);
         }
-        if (_proxyFormState.dirtyFields || _proxyFormState.isDirty) {
+        if (_proxyFormState.dirtyFields) {
             _formState.dirtyFields = getDirtyFields(_defaultValues, _formValues);
         }
         _subjects.state.next({
@@ -1504,7 +1510,6 @@ function createFormControl(props = {}) {
             : (_formState.errors = {});
         _subjects.state.next({
             errors: _formState.errors,
-            isValid: true,
         });
     };
     const setError = (name, error, options) => {