react-hook-form 7.49.1 → 7.49.3

package/dist/index.esm.mjs

@@ -447,7 +447,7 @@ function useController(props) {
         field: {
             name,
             value,
-            ...(isBoolean(disabled) || isBoolean(formState.disabled)
+            ...(isBoolean(disabled) || formState.disabled
                 ? { disabled: formState.disabled || disabled }
                 : {}),
             onChange: React.useCallback((event) => _registerProps.current.onChange({
@@ -1532,7 +1532,7 @@ function createFormControl(props = {}, flushRootRender) {
         touchedFields: {},
         dirtyFields: {},
         errors: _options.errors || {},
-        disabled: false,
+        disabled: _options.disabled || false,
     };
     let _fields = {};
     let _defaultValues = isObject(_options.defaultValues) || isObject(_options.values)
@@ -1567,7 +1567,6 @@ 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;
@@ -1656,7 +1655,7 @@ function createFormControl(props = {}, flushRootRender) {
         const output = {
             name,
         };
-        const disabledField = get(_fields, name) && get(_fields, name)._f.disabled;
+        const disabledField = !!(get(_fields, name) && get(_fields, name)._f.disabled);
         if (!isBlurEvent || shouldDirty) {
             if (_proxyFormState.isDirty) {
                 isPreviousDirty = _formState.isDirty;
@@ -1664,7 +1663,7 @@ function createFormControl(props = {}, flushRootRender) {
                 shouldUpdateField = isPreviousDirty !== output.isDirty;
             }
             const isCurrentFieldPristine = disabledField || deepEqual(get(_defaultValues, name), fieldValue);
-            isPreviousDirty = !disabledField && get(_formState.dirtyFields, name);
+            isPreviousDirty = !!(!disabledField && get(_formState.dirtyFields, name));
             isCurrentFieldPristine || disabledField
                 ? unset(_formState.dirtyFields, name)
                 : set(_formState.dirtyFields, name, true);
@@ -2093,6 +2092,7 @@ function createFormControl(props = {}, flushRootRender) {
                 field,
                 disabled: options.disabled,
                 name,
+                value: options.value,
             });
         }
         else {
@@ -2215,11 +2215,11 @@ function createFormControl(props = {}, flushRootRender) {
     const resetField = (name, options = {}) => {
         if (get(_fields, name)) {
             if (isUndefined(options.defaultValue)) {
-                setValue(name, get(_defaultValues, name));
+                setValue(name, cloneObject(get(_defaultValues, name)));
             }
             else {
                 setValue(name, options.defaultValue);
-                set(_defaultValues, name, options.defaultValue);
+                set(_defaultValues, name, cloneObject(options.defaultValue));
             }
             if (!options.keepTouched) {
                 unset(_formState.touchedFields, name);
@@ -2227,7 +2227,7 @@ function createFormControl(props = {}, flushRootRender) {
             if (!options.keepDirty) {
                 unset(_formState.dirtyFields, name);
                 _formState.isDirty = options.defaultValue
-                    ? _getDirty(name, get(_defaultValues, name))
+                    ? _getDirty(name, cloneObject(get(_defaultValues, name)))
                     : _getDirty();
             }
             if (!options.keepError) {
@@ -2247,7 +2247,7 @@ function createFormControl(props = {}, flushRootRender) {
             _defaultValues = updatedValues;
         }
         if (!keepStateOptions.keepValues) {
-            if (keepStateOptions.keepDirtyValues || shouldCaptureDirtyFields) {
+            if (keepStateOptions.keepDirtyValues) {
                 for (const fieldName of _names.mount) {
                     get(_formState.dirtyFields, fieldName)
                         ? set(values, fieldName, get(_formValues, fieldName))
@@ -2471,7 +2471,7 @@ function useForm(props = {}) {
         dirtyFields: {},
         touchedFields: {},
         errors: props.errors || {},
-        disabled: false,
+        disabled: props.disabled || false,
         defaultValues: isFunction(props.defaultValues)
             ? undefined
             : props.defaultValues,