react-hook-form 7.51.3 → 7.51.5

package/dist/index.esm.mjs

@@ -78,6 +78,36 @@ var get = (object, path, defaultValue) => {
 
 var isBoolean = (value) => typeof value === 'boolean';
 
+var isKey = (value) => /^\w*$/.test(value);
+
+var stringToPath = (input) => compact(input.replace(/["|']|\]/g, '').split(/\.|\[/));
+
+var 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])
+                        ? []
+                        : {};
+        }
+        if (key === '__proto__') {
+            return;
+        }
+        object[key] = newValue;
+        object = object[key];
+    }
+    return object;
+};
+
 const EVENTS = {
     BLUR: 'blur',
     FOCUS_OUT: 'focusout',
@@ -340,33 +370,6 @@ function useWatch(props) {
     return value;
 }
 
-var isKey = (value) => /^\w*$/.test(value);
-
-var stringToPath = (input) => compact(input.replace(/["|']|\]/g, '').split(/\.|\[/));
-
-var 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.
  *
@@ -2025,8 +2028,7 @@ function createFormControl(props = {}) {
     };
     const getValues = (fieldNames) => {
         const values = {
-            ..._defaultValues,
-            ...(_state.mount ? _formValues : {}),
+            ...(_state.mount ? _formValues : _defaultValues),
         };
         return isUndefined(fieldNames)
             ? values
@@ -2050,7 +2052,11 @@ function createFormControl(props = {}) {
     };
     const setError = (name, error, options) => {
         const ref = (get(_fields, name, { _f: {} })._f || {}).ref;
+        const currentError = get(_formState.errors, name) || {};
+        // Don't override existing error messages elsewhere in the object tree.
+        const { ref: currentRef, message, type, ...restOfErrorTree } = currentError;
         set(_formState.errors, name, {
+            ...restOfErrorTree,
             ...error,
             ref,
         });
@@ -2093,7 +2099,7 @@ function createFormControl(props = {}) {
         !options.keepIsValid && _updateValid();
     };
     const _updateDisabledField = ({ disabled, name, field, fields, value, }) => {
-        if (isBoolean(disabled)) {
+        if ((isBoolean(disabled) && _state.mount) || !!disabled) {
             const inputValue = disabled
                 ? undefined
                 : isUndefined(value)
@@ -2193,12 +2199,15 @@ function createFormControl(props = {}) {
         if (isBoolean(disabled)) {
             _subjects.state.next({ disabled });
             iterateFieldsByAction(_fields, (ref, name) => {
-                let requiredDisabledState = disabled;
                 const currentField = get(_fields, name);
-                if (currentField && isBoolean(currentField._f.disabled)) {
-                    requiredDisabledState || (requiredDisabledState = currentField._f.disabled);
+                if (currentField) {
+                    ref.disabled = currentField._f.disabled || disabled;
+                    if (Array.isArray(currentField._f.refs)) {
+                        currentField._f.refs.forEach((inputRef) => {
+                            inputRef.disabled = currentField._f.disabled || disabled;
+                        });
+                    }
                 }
-                ref.disabled = requiredDisabledState;
             }, 0, false);
         }
     };