react-hook-form 7.55.0-next.0 → 7.55.0-next.2

package/dist/index.esm.mjs

@@ -396,45 +396,41 @@ function useController(props) {
             get: () => get(formState.errors, name),
         },
     }), [formState, name]);
+    const onChange = React.useCallback((event) => _registerProps.current.onChange({
+        target: {
+            value: getEventValue(event),
+            name: name,
+        },
+        type: EVENTS.CHANGE,
+    }), [name]);
+    const onBlur = React.useCallback(() => _registerProps.current.onBlur({
+        target: {
+            value: get(control._formValues, name),
+            name: name,
+        },
+        type: EVENTS.BLUR,
+    }), [name, control._formValues]);
+    const ref = React.useCallback((elm) => {
+        const field = get(control._fields, name);
+        if (field && elm) {
+            field._f.ref = {
+                focus: () => elm.focus(),
+                select: () => elm.select(),
+                setCustomValidity: (message) => elm.setCustomValidity(message),
+                reportValidity: () => elm.reportValidity(),
+            };
+        }
+    }, [control._fields, name]);
     const field = React.useMemo(() => ({
         name,
         value,
         ...(isBoolean(disabled) || formState.disabled
             ? { disabled: formState.disabled || disabled }
             : {}),
-        onChange: (event) => _registerProps.current.onChange({
-            target: {
-                value: getEventValue(event),
-                name: name,
-            },
-            type: EVENTS.CHANGE,
-        }),
-        onBlur: () => _registerProps.current.onBlur({
-            target: {
-                value: get(control._formValues, name),
-                name: name,
-            },
-            type: EVENTS.BLUR,
-        }),
-        ref: (elm) => {
-            const field = get(control._fields, name);
-            if (field && elm) {
-                field._f.ref = {
-                    focus: () => elm.focus(),
-                    select: () => elm.select(),
-                    setCustomValidity: (message) => elm.setCustomValidity(message),
-                    reportValidity: () => elm.reportValidity(),
-                };
-            }
-        },
-    }), [
-        name,
-        control._formValues,
-        disabled,
-        formState.disabled,
-        value,
-        control._fields,
-    ]);
+        onChange,
+        onBlur,
+        ref,
+    }), [name, disabled, formState.disabled, onChange, onBlur, ref, value]);
     React.useEffect(() => {
         const _shouldUnregisterField = control._options.shouldUnregister || shouldUnregister;
         const updateMounted = (name, value) => {
@@ -463,7 +459,6 @@ function useController(props) {
     React.useEffect(() => {
         control._setDisabledField({
             disabled,
-            fields: control._fields,
             name,
         });
     }, [disabled, name, control]);
@@ -1411,18 +1406,15 @@ function createFormControl(props = {}) {
             name,
         };
         if (!_options.disabled) {
-            const disabledField = !!(get(_fields, name) &&
-                get(_fields, name)._f &&
-                get(_fields, name)._f.disabled);
             if (!isBlurEvent || shouldDirty) {
                 if (_proxyFormState.isDirty || _proxySubscribeFormState.isDirty) {
                     isPreviousDirty = _formState.isDirty;
                     _formState.isDirty = output.isDirty = _getDirty();
                     shouldUpdateField = isPreviousDirty !== output.isDirty;
                 }
-                const isCurrentFieldPristine = disabledField || deepEqual(get(_defaultValues, name), fieldValue);
-                isPreviousDirty = !!(!disabledField && get(_formState.dirtyFields, name));
-                isCurrentFieldPristine || disabledField
+                const isCurrentFieldPristine = deepEqual(get(_defaultValues, name), fieldValue);
+                isPreviousDirty = !!get(_formState.dirtyFields, name);
+                isCurrentFieldPristine
                     ? unset(_formState.dirtyFields, name)
                     : set(_formState.dirtyFields, name, true);
                 output.dirtyFields = _formState.dirtyFields;
@@ -1878,12 +1870,11 @@ function createFormControl(props = {}) {
         });
         !options.keepIsValid && _setValid();
     };
-    const _setDisabledField = ({ disabled, name, field, fields, }) => {
+    const _setDisabledField = ({ disabled, name, }) => {
         if ((isBoolean(disabled) && _state.mount) ||
             !!disabled ||
             _names.disabled.has(name)) {
             disabled ? _names.disabled.add(name) : _names.disabled.delete(name);
-            updateTouchAndDirty(name, getFieldValue(field ? field._f : get(fields, name)._f), false, false, true);
         }
     };
     const register = (name, options = {}) => {
@@ -1901,7 +1892,6 @@ function createFormControl(props = {}) {
         _names.mount.add(name);
         if (field) {
             _setDisabledField({
-                field,
                 disabled: isBoolean(options.disabled)
                     ? options.disabled
                     : _options.disabled,
@@ -2627,7 +2617,7 @@ function useForm(props = {}) {
     });
     if (!_formControl.current) {
         _formControl.current = {
-            ...(props.control ? props.control : createFormControl(props)),
+            ...(props.formControl ? props.formControl : createFormControl(props)),
             formState,
         };
     }