react-hook-form 7.43.3 → 7.43.5

package/dist/index.esm.mjs

@@ -22,6 +22,42 @@ var getNodeParentName = (name) => name.substring(0, name.search(/\.\d+(\.|$)/))
 
 var isNameInFieldArray = (names, name) => names.has(getNodeParentName(name));
 
+var isPlainObject = (tempObject) => {
+    const prototypeCopy = tempObject.constructor && tempObject.constructor.prototype;
+    return (isObject(prototypeCopy) && prototypeCopy.hasOwnProperty('isPrototypeOf'));
+};
+
+var isWeb = typeof window !== 'undefined' &&
+    typeof window.HTMLElement !== 'undefined' &&
+    typeof document !== 'undefined';
+
+function cloneObject(data) {
+    let copy;
+    const isArray = Array.isArray(data);
+    if (data instanceof Date) {
+        copy = new Date(data);
+    }
+    else if (data instanceof Set) {
+        copy = new Set(data);
+    }
+    else if (!(isWeb && (data instanceof Blob || data instanceof FileList)) &&
+        (isArray || isObject(data))) {
+        copy = isArray ? [] : {};
+        if (!Array.isArray(data) && !isPlainObject(data)) {
+            copy = data;
+        }
+        else {
+            for (const key in data) {
+                copy[key] = cloneObject(data[key]);
+            }
+        }
+    }
+    else {
+        return data;
+    }
+    return copy;
+}
+
 var compact = (value) => Array.isArray(value) ? value.filter(Boolean) : [];
 
 var isUndefined = (val) => val === undefined;
@@ -173,6 +209,7 @@ function useSubscribe(props) {
     _props.current = props;
     React.useEffect(() => {
         const subscription = !props.disabled &&
+            _props.current.subject &&
             _props.current.subject.subscribe({
                 next: _props.current.next,
             });
@@ -269,42 +306,6 @@ var generateWatchOutput = (names, _names, formValues, isGlobal, defaultValue) =>
     return formValues;
 };
 
-var isPlainObject = (tempObject) => {
-    const prototypeCopy = tempObject.constructor && tempObject.constructor.prototype;
-    return (isObject(prototypeCopy) && prototypeCopy.hasOwnProperty('isPrototypeOf'));
-};
-
-var isWeb = typeof window !== 'undefined' &&
-    typeof window.HTMLElement !== 'undefined' &&
-    typeof document !== 'undefined';
-
-function cloneObject(data) {
-    let copy;
-    const isArray = Array.isArray(data);
-    if (data instanceof Date) {
-        copy = new Date(data);
-    }
-    else if (data instanceof Set) {
-        copy = new Set(data);
-    }
-    else if (!(isWeb && (data instanceof Blob || data instanceof FileList)) &&
-        (isArray || isObject(data))) {
-        copy = isArray ? [] : {};
-        if (!Array.isArray(data) && !isPlainObject(data)) {
-            copy = data;
-        }
-        else {
-            for (const key in data) {
-                copy[key] = cloneObject(data[key]);
-            }
-        }
-    }
-    else {
-        return data;
-    }
-    return copy;
-}
-
 /**
  * Custom hook to subscribe to field change and isolate re-rendering at the component level.
  *
@@ -340,6 +341,33 @@ function useWatch(props) {
     return value;
 }
 
+var isKey = (value) => /^\w*$/.test(value);
+
+var stringToPath = (input) => compact(input.replace(/["|']|\]/g, '').split(/\.|\[/));
+
+function set(object, path, value) {
+    let index = -1;
+    const tempPath = isKey(path) ? [path] : stringToPath(path);
+    const length = tempPath.length;
+    const lastIndex = length - 1;
+    while (++index < length) {
+        const key = tempPath[index];
+        let newValue = value;
+        if (index !== lastIndex) {
+            const objValue = object[key];
+            newValue =
+                isObject(objValue) || Array.isArray(objValue)
+                    ? objValue
+                    : !isNaN(+tempPath[index + 1])
+                        ? []
+                        : {};
+        }
+        object[key] = newValue;
+        object = object[key];
+    }
+    return object;
+}
+
 /**
  * Custom hook to work with controlled component, this function provide you with both form and field level state. Re-render is isolated at the hook level.
  *
@@ -383,6 +411,7 @@ function useController(props) {
         value,
     }));
     React.useEffect(() => {
+        const _shouldUnregisterField = control._options.shouldUnregister || shouldUnregister;
         const updateMounted = (name, value) => {
             const field = get(control._fields, name);
             if (field) {
@@ -390,10 +419,12 @@ function useController(props) {
             }
         };
         updateMounted(name, true);
+        if (_shouldUnregisterField) {
+            set(control._defaultValues, name, cloneObject(get(control._options.defaultValues, name)));
+        }
         return () => {
-            const _shouldUnregisterField = control._options.shouldUnregister || shouldUnregister;
             (isArrayField
-                ? _shouldUnregisterField && !control._stateFlags.action
+                ? _shouldUnregisterField && !control._state.action
                 : _shouldUnregisterField)
                 ? control.unregister(name)
                 : updateMounted(name, false);
@@ -505,33 +536,6 @@ var appendErrors = (name, validateAllFieldCriteria, errors, type, message) => va
     }
     : {};
 
-var isKey = (value) => /^\w*$/.test(value);
-
-var stringToPath = (input) => compact(input.replace(/["|']|\]/g, '').split(/\.|\[/));
-
-function set(object, path, value) {
-    let index = -1;
-    const tempPath = isKey(path) ? [path] : stringToPath(path);
-    const length = tempPath.length;
-    const lastIndex = length - 1;
-    while (++index < length) {
-        const key = tempPath[index];
-        let newValue = value;
-        if (index !== lastIndex) {
-            const objValue = object[key];
-            newValue =
-                isObject(objValue) || Array.isArray(objValue)
-                    ? objValue
-                    : !isNaN(+tempPath[index + 1])
-                        ? []
-                        : {};
-        }
-        object[key] = newValue;
-        object = object[key];
-    }
-    return object;
-}
-
 const focusFieldBy = (fields, callback, fieldsNames) => {
     for (const key of fieldsNames || Object.keys(fields)) {
         const field = get(fields, key);
@@ -1082,7 +1086,7 @@ function useFieldArray(props) {
         control._updateFieldArray(name, [...updatedFieldArrayValues], (data) => data, {}, true, false);
     };
     React.useEffect(() => {
-        control._stateFlags.action = false;
+        control._state.action = false;
         isWatched(name, control._names) &&
             control._subjects.state.next({
                 ...control._formState,
@@ -1116,7 +1120,7 @@ function useFieldArray(props) {
         }
         control._subjects.values.next({
             name,
-            values: control._formValues,
+            values: { ...control._formValues },
         });
         control._names.focus &&
             focusFieldBy(control._fields, (key) => !!key && key.startsWith(control._names.focus || ''));
@@ -1149,11 +1153,8 @@ function useFieldArray(props) {
 function createSubject() {
     let _observers = [];
     const next = (value) => {
-        let x = 0;
-        const l = _observers.length;
-        while (x < l) {
-            _observers[x].next(value);
-            ++x;
+        for (const observer of _observers) {
+            observer.next && observer.next(value);
         }
     };
     const subscribe = (observer) => {
@@ -1410,7 +1411,7 @@ function createFormControl(props = {}, flushRootRender) {
     let _formValues = _options.shouldUnregister
         ? {}
         : cloneObject(_defaultValues);
-    let _stateFlags = {
+    let _state = {
         action: false,
         mount: false,
         watch: false,
@@ -1423,7 +1424,6 @@ function createFormControl(props = {}, flushRootRender) {
     };
     let delayErrorCallback;
     let timer = 0;
-    const shouldCaptureDirtyFields = props.resetOptions && props.resetOptions.keepDirtyValues;
     const _proxyFormState = {
         isDirty: false,
         dirtyFields: false,
@@ -1437,6 +1437,7 @@ function createFormControl(props = {}, flushRootRender) {
         array: createSubject(),
         state: createSubject(),
     };
+    const shouldCaptureDirtyFields = props.resetOptions && props.resetOptions.keepDirtyValues;
     const validationModeBeforeSubmit = getValidationModes(_options.mode);
     const validationModeAfterSubmit = getValidationModes(_options.reValidateMode);
     const shouldDisplayAllAssociatedErrors = _options.criteriaMode === VALIDATION_MODE.all;
@@ -1462,7 +1463,7 @@ function createFormControl(props = {}, flushRootRender) {
         });
     const _updateFieldArray = (name, values = [], method, args, shouldSetValues = true, shouldUpdateFieldsAndState = true) => {
         if (args && method) {
-            _stateFlags.action = true;
+            _state.action = true;
             if (shouldUpdateFieldsAndState && Array.isArray(get(_fields, name))) {
                 const fieldValues = method(get(_fields, name), args.argA, args.argB);
                 shouldSetValues && set(_fields, name, fieldValues);
@@ -1509,7 +1510,7 @@ function createFormControl(props = {}, flushRootRender) {
                 shouldSkipSetValueAs
                 ? set(_formValues, name, shouldSkipSetValueAs ? defaultValue : getFieldValue(field._f))
                 : setFieldValue(name, defaultValue);
-            _stateFlags.mount && _updateValid();
+            _state.mount && _updateValid();
         }
     };
     const updateTouchAndDirty = (name, fieldValue, isBlurEvent, shouldDirty, shouldRender) => {
@@ -1582,7 +1583,7 @@ function createFormControl(props = {}, flushRootRender) {
         }
         _updateIsValidating(false);
     };
-    const _executeSchema = async (name) => await _options.resolver(_formValues, _options.context, getResolverOptions(name || _names.mount, _fields, _options.criteriaMode, _options.shouldUseNativeValidation));
+    const _executeSchema = async (name) => _options.resolver(_formValues, _options.context, getResolverOptions(name || _names.mount, _fields, _options.criteriaMode, _options.shouldUseNativeValidation));
     const executeSchemaAndUpdateState = async (names) => {
         const { errors } = await _executeSchema();
         if (names) {
@@ -1641,7 +1642,7 @@ function createFormControl(props = {}, flushRootRender) {
     const _getDirty = (name, data) => (name && data && set(_formValues, name, data),
         !deepEqual(getValues(), _defaultValues));
     const _getWatch = (names, defaultValue, isGlobal) => generateWatchOutput(names, _names, {
-        ...(_stateFlags.mount
+        ...(_state.mount
             ? _formValues
             : isUndefined(defaultValue)
                 ? _defaultValues
@@ -1649,7 +1650,7 @@ function createFormControl(props = {}, flushRootRender) {
                     ? { [names]: defaultValue }
                     : defaultValue),
     }, isGlobal, defaultValue);
-    const _getFieldArray = (name) => compact(get(_stateFlags.mount ? _formValues : _defaultValues, name, props.shouldUnregister ? get(_defaultValues, name, []) : []));
+    const _getFieldArray = (name) => compact(get(_state.mount ? _formValues : _defaultValues, name, props.shouldUnregister ? get(_defaultValues, name, []) : []));
     const setFieldValue = (name, value, options = {}) => {
         const field = get(_fields, name);
         let fieldValue = value;
@@ -1739,7 +1740,7 @@ function createFormControl(props = {}, flushRootRender) {
             name,
             values: { ..._formValues },
         });
-        !_stateFlags.mount && flushRootRender();
+        !_state.mount && flushRootRender();
     };
     const onChange = async (event) => {
         const target = event.target;
@@ -1841,7 +1842,7 @@ function createFormControl(props = {}, flushRootRender) {
     const getValues = (fieldNames) => {
         const values = {
             ..._defaultValues,
-            ...(_stateFlags.mount ? _formValues : {}),
+            ...(_state.mount ? _formValues : {}),
         };
         return isUndefined(fieldNames)
             ? values
@@ -1979,7 +1980,7 @@ function createFormControl(props = {}, flushRootRender) {
                         field._f.mount = false;
                     }
                     (_options.shouldUnregister || options.shouldUnregister) &&
-                        !(isNameInFieldArray(_names.array, name) && _stateFlags.action) &&
+                        !(isNameInFieldArray(_names.array, name) && _state.action) &&
                         _names.unMount.add(name);
                 }
             },
@@ -2094,10 +2095,10 @@ function createFormControl(props = {}, flushRootRender) {
                     : {}
                 : cloneUpdatedValues;
             _subjects.array.next({
-                values,
+                values: { ...values },
             });
             _subjects.values.next({
-                values,
+                values: { ...values },
             });
         }
         _names = {
@@ -2108,10 +2109,9 @@ function createFormControl(props = {}, flushRootRender) {
             watchAll: false,
             focus: '',
         };
-        !_stateFlags.mount && flushRootRender();
-        _stateFlags.mount =
-            !_proxyFormState.isValid || !!keepStateOptions.keepIsValid;
-        _stateFlags.watch = !!props.shouldUnregister;
+        !_state.mount && flushRootRender();
+        _state.mount = !_proxyFormState.isValid || !!keepStateOptions.keepIsValid;
+        _state.watch = !!props.shouldUnregister;
         _subjects.state.next({
             submitCount: keepStateOptions.keepSubmitCount
                 ? _formState.submitCount
@@ -2188,11 +2188,11 @@ function createFormControl(props = {}, flushRootRender) {
             get _formValues() {
                 return _formValues;
             },
-            get _stateFlags() {
-                return _stateFlags;
+            get _state() {
+                return _state;
             },
-            set _stateFlags(value) {
-                _stateFlags = value;
+            set _state(value) {
+                _state = value;
             },
             get _defaultValues() {
                 return _defaultValues;
@@ -2304,12 +2304,12 @@ function useForm(props = {}) {
         }
     }, [props.values, control]);
     React.useEffect(() => {
-        if (!control._stateFlags.mount) {
+        if (!control._state.mount) {
             control._updateValid();
-            control._stateFlags.mount = true;
+            control._state.mount = true;
         }
-        if (control._stateFlags.watch) {
-            control._stateFlags.watch = false;
+        if (control._state.watch) {
+            control._state.watch = false;
             control._subjects.state.next({ ...control._formState });
         }
         control._removeUnmounted();