[fields] Pass the manager directly to useField

packages/x-date-pickers-pro/src/SingleInputDateRangeField/useSingleInputDateRangeField.ts

@@ -1,12 +1,14 @@
 'use client';
 import {
   useField,
-  useFieldInternalPropsWithDefaults,
   PickerRangeValue,
+  PickerManagerFieldInternalProps,
+  PickerManagerFieldInternalPropsWithDefaults,
 } from '@mui/x-date-pickers/internals';
 import { useSplitFieldProps } from '@mui/x-date-pickers/hooks';
 import { UseSingleInputDateRangeFieldProps } from './SingleInputDateRangeField.types';
 import { useDateRangeManager } from '../managers';
+import { DateRangeValidationError } from '../models';
 
 export const useSingleInputDateRangeField = <
   TEnableAccessibleFieldDOMStructure extends boolean,
@@ -16,22 +18,17 @@ export const useSingleInputDateRangeField = <
 ) => {
   const manager = useDateRangeManager(props);
   const { forwardedProps, internalProps } = useSplitFieldProps(props, 'date');
-  const internalPropsWithDefaults = useFieldInternalPropsWithDefaults({
-    manager,
-    internalProps,
-  });
 
   return useField<
     PickerRangeValue,
     TEnableAccessibleFieldDOMStructure,
-    typeof forwardedProps,
-    typeof internalPropsWithDefaults
+    DateRangeValidationError,
+    PickerManagerFieldInternalProps<typeof manager>,
+    PickerManagerFieldInternalPropsWithDefaults<typeof manager>,
+    typeof forwardedProps
   >({
+    manager,
     forwardedProps,
-    internalProps: internalPropsWithDefaults,
-    valueManager: manager.internal_valueManager,
-    fieldValueManager: manager.internal_fieldValueManager,
-    validator: manager.validator,
-    valueType: manager.valueType,
+    internalProps,
   });
 };

packages/x-date-pickers-pro/src/SingleInputDateTimeRangeField/useSingleInputDateTimeRangeField.ts

@@ -1,12 +1,14 @@
 'use client';
 import {
   useField,
-  useFieldInternalPropsWithDefaults,
   PickerRangeValue,
+  PickerManagerFieldInternalProps,
+  PickerManagerFieldInternalPropsWithDefaults,
 } from '@mui/x-date-pickers/internals';
 import { useSplitFieldProps } from '@mui/x-date-pickers/hooks';
 import { UseSingleInputDateTimeRangeFieldProps } from './SingleInputDateTimeRangeField.types';
 import { useDateTimeRangeManager } from '../managers';
+import { DateTimeRangeValidationError } from '../models';
 
 export const useSingleInputDateTimeRangeField = <
   TEnableAccessibleFieldDOMStructure extends boolean,
@@ -16,22 +18,17 @@ export const useSingleInputDateTimeRangeField = <
 ) => {
   const manager = useDateTimeRangeManager(props);
   const { forwardedProps, internalProps } = useSplitFieldProps(props, 'date-time');
-  const internalPropsWithDefaults = useFieldInternalPropsWithDefaults({
-    manager,
-    internalProps,
-  });
 
   return useField<
     PickerRangeValue,
     TEnableAccessibleFieldDOMStructure,
-    typeof forwardedProps,
-    typeof internalPropsWithDefaults
+    DateTimeRangeValidationError,
+    PickerManagerFieldInternalProps<typeof manager>,
+    PickerManagerFieldInternalPropsWithDefaults<typeof manager>,
+    typeof forwardedProps
   >({
+    manager,
     forwardedProps,
-    internalProps: internalPropsWithDefaults,
-    valueManager: manager.internal_valueManager,
-    fieldValueManager: manager.internal_fieldValueManager,
-    validator: manager.validator,
-    valueType: manager.valueType,
+    internalProps,
   });
 };

packages/x-date-pickers-pro/src/SingleInputTimeRangeField/useSingleInputTimeRangeField.ts

@@ -1,12 +1,14 @@
 'use client';
 import {
   useField,
-  useFieldInternalPropsWithDefaults,
   PickerRangeValue,
+  PickerManagerFieldInternalProps,
+  PickerManagerFieldInternalPropsWithDefaults,
 } from '@mui/x-date-pickers/internals';
 import { useSplitFieldProps } from '@mui/x-date-pickers/hooks';
 import { UseSingleInputTimeRangeFieldProps } from './SingleInputTimeRangeField.types';
 import { useTimeRangeManager } from '../managers';
+import { TimeRangeValidationError } from '../models';
 
 export const useSingleInputTimeRangeField = <
   TEnableAccessibleFieldDOMStructure extends boolean,
@@ -16,22 +18,17 @@ export const useSingleInputTimeRangeField = <
 ) => {
   const manager = useTimeRangeManager(props);
   const { forwardedProps, internalProps } = useSplitFieldProps(props, 'time');
-  const internalPropsWithDefaults = useFieldInternalPropsWithDefaults({
-    manager,
-    internalProps,
-  });
 
   return useField<
     PickerRangeValue,
     TEnableAccessibleFieldDOMStructure,
-    typeof forwardedProps,
-    typeof internalPropsWithDefaults
+    TimeRangeValidationError,
+    PickerManagerFieldInternalProps<typeof manager>,
+    PickerManagerFieldInternalPropsWithDefaults<typeof manager>,
+    typeof forwardedProps
   >({
+    manager,
     forwardedProps,
-    internalProps: internalPropsWithDefaults,
-    valueManager: manager.internal_valueManager,
-    fieldValueManager: manager.internal_fieldValueManager,
-    validator: manager.validator,
-    valueType: manager.valueType,
+    internalProps,
   });
 };

packages/x-date-pickers-pro/src/internals/hooks/useMultiInputRangeField/useMultiInputDateRangeField.ts

@@ -5,7 +5,7 @@ import {
   FieldChangeHandlerContext,
   PickerRangeValue,
   PickerValue,
-  UseFieldResponse,
+  UseFieldReturnValue,
   useControlledValueWithTimezone,
   useFieldInternalPropsWithDefaults,
 } from '@mui/x-date-pickers/internals';
@@ -137,11 +137,14 @@ export const useMultiInputDateRangeField = <
   const startDateResponse = useDateField<
     TEnableAccessibleFieldDOMStructure,
     typeof startFieldProps
-  >(startFieldProps) as UseFieldResponse<TEnableAccessibleFieldDOMStructure, TTextFieldSlotProps>;
+  >(startFieldProps) as UseFieldReturnValue<
+    TEnableAccessibleFieldDOMStructure,
+    TTextFieldSlotProps
+  >;
 
   const endDateResponse = useDateField<TEnableAccessibleFieldDOMStructure, typeof endFieldProps>(
     endFieldProps,
-  ) as UseFieldResponse<TEnableAccessibleFieldDOMStructure, TTextFieldSlotProps>;
+  ) as UseFieldReturnValue<TEnableAccessibleFieldDOMStructure, TTextFieldSlotProps>;
 
   /* TODO: Undo this change when a clearable behavior for multiple input range fields is implemented */
   return {

packages/x-date-pickers-pro/src/internals/hooks/useMultiInputRangeField/useMultiInputDateTimeRangeField.ts

@@ -5,7 +5,7 @@ import {
   FieldChangeHandlerContext,
   PickerRangeValue,
   PickerValue,
-  UseFieldResponse,
+  UseFieldReturnValue,
   useControlledValueWithTimezone,
   useFieldInternalPropsWithDefaults,
 } from '@mui/x-date-pickers/internals';
@@ -137,12 +137,15 @@ export const useMultiInputDateTimeRangeField = <
   const startDateResponse = useDateTimeField<
     TEnableAccessibleFieldDOMStructure,
     typeof startFieldProps
-  >(startFieldProps) as UseFieldResponse<TEnableAccessibleFieldDOMStructure, TTextFieldSlotProps>;
+  >(startFieldProps) as UseFieldReturnValue<
+    TEnableAccessibleFieldDOMStructure,
+    TTextFieldSlotProps
+  >;
 
   const endDateResponse = useDateTimeField<
     TEnableAccessibleFieldDOMStructure,
     typeof endFieldProps
-  >(endFieldProps) as UseFieldResponse<TEnableAccessibleFieldDOMStructure, TTextFieldSlotProps>;
+  >(endFieldProps) as UseFieldReturnValue<TEnableAccessibleFieldDOMStructure, TTextFieldSlotProps>;
 
   /* TODO: Undo this change when a clearable behavior for multiple input range fields is implemented */
   return {

packages/x-date-pickers-pro/src/internals/hooks/useMultiInputRangeField/useMultiInputRangeField.types.ts

@@ -1,4 +1,4 @@
-import { UseFieldResponse } from '@mui/x-date-pickers/internals';
+import { UseFieldReturnValue } from '@mui/x-date-pickers/internals';
 import { MultiInputFieldRefs } from '../../../models';
 
 export interface UseMultiInputRangeFieldParams<
@@ -14,6 +14,6 @@ export interface UseMultiInputRangeFieldResponse<
   TEnableAccessibleFieldDOMStructure extends boolean,
   TForwardedProps extends {},
 > {
-  startDate: UseFieldResponse<TEnableAccessibleFieldDOMStructure, TForwardedProps>;
-  endDate: UseFieldResponse<TEnableAccessibleFieldDOMStructure, TForwardedProps>;
+  startDate: UseFieldReturnValue<TEnableAccessibleFieldDOMStructure, TForwardedProps>;
+  endDate: UseFieldReturnValue<TEnableAccessibleFieldDOMStructure, TForwardedProps>;
 }

packages/x-date-pickers-pro/src/internals/hooks/useMultiInputRangeField/useMultiInputTimeRangeField.ts

@@ -5,7 +5,7 @@ import {
   FieldChangeHandlerContext,
   PickerRangeValue,
   PickerValue,
-  UseFieldResponse,
+  UseFieldReturnValue,
   useControlledValueWithTimezone,
   useFieldInternalPropsWithDefaults,
 } from '@mui/x-date-pickers/internals';
@@ -137,11 +137,14 @@ export const useMultiInputTimeRangeField = <
   const startDateResponse = useTimeField<
     TEnableAccessibleFieldDOMStructure,
     typeof startFieldProps
-  >(startFieldProps) as UseFieldResponse<TEnableAccessibleFieldDOMStructure, TTextFieldSlotProps>;
+  >(startFieldProps) as UseFieldReturnValue<
+    TEnableAccessibleFieldDOMStructure,
+    TTextFieldSlotProps
+  >;
 
   const endDateResponse = useTimeField<TEnableAccessibleFieldDOMStructure, typeof endFieldProps>(
     endFieldProps,
-  ) as UseFieldResponse<TEnableAccessibleFieldDOMStructure, TTextFieldSlotProps>;
+  ) as UseFieldReturnValue<TEnableAccessibleFieldDOMStructure, TTextFieldSlotProps>;
 
   /* TODO: Undo this change when a clearable behavior for multiple input range fields is implemented */
   return {

packages/x-date-pickers-pro/src/models/fields.ts

@@ -1,6 +1,6 @@
 import * as React from 'react';
 import {
-  UseFieldResponse,
+  UseFieldReturnValue,
   FormProps,
   PickerValue,
   PickerRangeValue,
@@ -63,5 +63,5 @@ export type PickerRangeFieldSlotProps<TEnableAccessibleFieldDOMStructure extends
 export type BaseMultiInputPickersTextFieldProps<
   TEnableAccessibleFieldDOMStructure extends boolean,
 > = UseClearableFieldResponse<
-  UseFieldResponse<TEnableAccessibleFieldDOMStructure, MultiInputFieldSlotTextFieldProps>
+  UseFieldReturnValue<TEnableAccessibleFieldDOMStructure, MultiInputFieldSlotTextFieldProps>
 >;

packages/x-date-pickers/src/DateField/useDateField.ts

@@ -1,9 +1,14 @@
 'use client';
-import { useField, useFieldInternalPropsWithDefaults } from '../internals/hooks/useField';
+import { useField } from '../internals/hooks/useField';
 import { UseDateFieldProps } from './DateField.types';
 import { useSplitFieldProps } from '../hooks';
 import { useDateManager } from '../managers';
-import { PickerValue } from '../internals/models';
+import {
+  PickerManagerFieldInternalProps,
+  PickerManagerFieldInternalPropsWithDefaults,
+  PickerValue,
+} from '../internals/models';
+import { DateValidationError } from '../models/validation';
 
 export const useDateField = <
   TEnableAccessibleFieldDOMStructure extends boolean,
@@ -13,22 +18,17 @@ export const useDateField = <
 ) => {
   const manager = useDateManager(props);
   const { forwardedProps, internalProps } = useSplitFieldProps(props, 'date');
-  const internalPropsWithDefaults = useFieldInternalPropsWithDefaults({
-    manager,
-    internalProps,
-  });
 
   return useField<
     PickerValue,
     TEnableAccessibleFieldDOMStructure,
-    typeof forwardedProps,
-    typeof internalPropsWithDefaults
+    DateValidationError,
+    PickerManagerFieldInternalProps<typeof manager>,
+    PickerManagerFieldInternalPropsWithDefaults<typeof manager>,
+    typeof forwardedProps
   >({
+    manager,
     forwardedProps,
-    internalProps: internalPropsWithDefaults,
-    valueManager: manager.internal_valueManager,
-    fieldValueManager: manager.internal_fieldValueManager,
-    validator: manager.validator,
-    valueType: manager.valueType,
+    internalProps,
   });
 };

packages/x-date-pickers/src/DateTimeField/useDateTimeField.ts

@@ -1,9 +1,14 @@
 'use client';
-import { useField, useFieldInternalPropsWithDefaults } from '../internals/hooks/useField';
+import { useField } from '../internals/hooks/useField';
 import { UseDateTimeFieldProps } from './DateTimeField.types';
 import { useSplitFieldProps } from '../hooks';
 import { useDateTimeManager } from '../managers';
-import { PickerValue } from '../internals/models';
+import {
+  PickerManagerFieldInternalProps,
+  PickerManagerFieldInternalPropsWithDefaults,
+  PickerValue,
+} from '../internals/models';
+import { DateTimeValidationError } from '../models/validation';
 
 export const useDateTimeField = <
   TEnableAccessibleFieldDOMStructure extends boolean,
@@ -13,22 +18,17 @@ export const useDateTimeField = <
 ) => {
   const manager = useDateTimeManager(props);
   const { forwardedProps, internalProps } = useSplitFieldProps(props, 'date-time');
-  const internalPropsWithDefaults = useFieldInternalPropsWithDefaults({
-    manager,
-    internalProps,
-  });
 
   return useField<
     PickerValue,
     TEnableAccessibleFieldDOMStructure,
-    typeof forwardedProps,
-    typeof internalPropsWithDefaults
+    DateTimeValidationError,
+    PickerManagerFieldInternalProps<typeof manager>,
+    PickerManagerFieldInternalPropsWithDefaults<typeof manager>,
+    typeof forwardedProps
   >({
+    manager,
     forwardedProps,
-    internalProps: internalPropsWithDefaults,
-    valueManager: manager.internal_valueManager,
-    fieldValueManager: manager.internal_fieldValueManager,
-    validator: manager.validator,
-    valueType: manager.valueType,
+    internalProps,
   });
 };

packages/x-date-pickers/src/TimeField/useTimeField.ts

@@ -1,9 +1,14 @@
 'use client';
-import { useField, useFieldInternalPropsWithDefaults } from '../internals/hooks/useField';
+import { useField } from '../internals/hooks/useField';
 import { UseTimeFieldProps } from './TimeField.types';
 import { useSplitFieldProps } from '../hooks';
 import { useTimeManager } from '../managers';
-import { PickerValue } from '../internals/models';
+import {
+  PickerManagerFieldInternalProps,
+  PickerManagerFieldInternalPropsWithDefaults,
+  PickerValue,
+} from '../internals/models';
+import { TimeValidationError } from '../models/validation';
 
 export const useTimeField = <
   TEnableAccessibleFieldDOMStructure extends boolean,
@@ -13,22 +18,17 @@ export const useTimeField = <
 ) => {
   const manager = useTimeManager(props);
   const { forwardedProps, internalProps } = useSplitFieldProps(props, 'time');
-  const internalPropsWithDefaults = useFieldInternalPropsWithDefaults({
-    manager,
-    internalProps,
-  });
 
   return useField<
     PickerValue,
     TEnableAccessibleFieldDOMStructure,
-    typeof forwardedProps,
-    typeof internalPropsWithDefaults
+    TimeValidationError,
+    PickerManagerFieldInternalProps<typeof manager>,
+    PickerManagerFieldInternalPropsWithDefaults<typeof manager>,
+    typeof forwardedProps
   >({
+    manager,
     forwardedProps,
-    internalProps: internalPropsWithDefaults,
-    valueManager: manager.internal_valueManager,
-    fieldValueManager: manager.internal_fieldValueManager,
-    validator: manager.validator,
-    valueType: manager.valueType,
+    internalProps,
   });
 };

packages/x-date-pickers/src/internals/hooks/useField/index.ts

@@ -2,8 +2,8 @@ export { useField, useFieldInternalPropsWithDefaults } from './useField';
 export type {
   FieldValueManager,
   UseFieldInternalProps,
-  UseFieldParams,
-  UseFieldResponse,
+  UseFieldParameters,
+  UseFieldReturnValue,
   FieldChangeHandler,
   FieldChangeHandlerContext,
 } from './useField.types';