Fix types

mui · Sep 13, 2024 · c7a1032 · c7a1032
1 parent b79b5f4
commit c7a1032
Show file tree

Hide file tree

Showing 10 changed files with 30 additions and 10 deletions.
diff --git a/packages/x-date-pickers/src/DesktopDatePicker/DesktopDatePicker.tsx b/packages/x-date-pickers/src/DesktopDatePicker/DesktopDatePicker.tsx
@@ -72,7 +72,7 @@ const DesktopDatePicker = React.forwardRef(function DesktopDatePicker<
     slotProps: {
       ...defaultizedProps.slotProps,
       field: (ownerState: any) => ({
-        ...resolveComponentProps(defaultizedProps.slotProps?.field, ownerState),
+        ...(resolveComponentProps(defaultizedProps.slotProps?.field, ownerState) as any),
         ...extractValidationProps(defaultizedProps),
         ref,
       }),

diff --git a/packages/x-date-pickers/src/DesktopDateTimePicker/DesktopDateTimePicker.tsx b/packages/x-date-pickers/src/DesktopDateTimePicker/DesktopDateTimePicker.tsx
@@ -197,7 +197,7 @@ const DesktopDateTimePicker = React.forwardRef(function DesktopDateTimePicker<
     slotProps: {
       ...defaultizedProps.slotProps,
       field: (ownerState: any) => ({
-        ...resolveComponentProps(defaultizedProps.slotProps?.field, ownerState),
+        ...(resolveComponentProps(defaultizedProps.slotProps?.field, ownerState) as any),
         ...extractValidationProps(defaultizedProps),
         ref,
       }),

diff --git a/packages/x-date-pickers/src/DesktopTimePicker/DesktopTimePicker.tsx b/packages/x-date-pickers/src/DesktopTimePicker/DesktopTimePicker.tsx
@@ -105,7 +105,7 @@ const DesktopTimePicker = React.forwardRef(function DesktopTimePicker<
     slotProps: {
       ...defaultizedProps.slotProps,
       field: (ownerState: any) => ({
-        ...resolveComponentProps(defaultizedProps.slotProps?.field, ownerState),
+        ...(resolveComponentProps(defaultizedProps.slotProps?.field, ownerState) as any),
         ...extractValidationProps(defaultizedProps),
         ref,
       }),

diff --git a/packages/x-date-pickers/src/MobileDatePicker/MobileDatePicker.tsx b/packages/x-date-pickers/src/MobileDatePicker/MobileDatePicker.tsx
@@ -69,7 +69,7 @@ const MobileDatePicker = React.forwardRef(function MobileDatePicker<
     slotProps: {
       ...defaultizedProps.slotProps,
       field: (ownerState: any) => ({
-        ...resolveComponentProps(defaultizedProps.slotProps?.field, ownerState),
+        ...(resolveComponentProps(defaultizedProps.slotProps?.field, ownerState) as any),
         ...extractValidationProps(defaultizedProps),
         ref,
       }),

diff --git a/packages/x-date-pickers/src/MobileDateTimePicker/MobileDateTimePicker.tsx b/packages/x-date-pickers/src/MobileDateTimePicker/MobileDateTimePicker.tsx
@@ -79,7 +79,7 @@ const MobileDateTimePicker = React.forwardRef(function MobileDateTimePicker<
     slotProps: {
       ...defaultizedProps.slotProps,
       field: (ownerState: any) => ({
-        ...resolveComponentProps(defaultizedProps.slotProps?.field, ownerState),
+        ...(resolveComponentProps(defaultizedProps.slotProps?.field, ownerState) as any),
         ...extractValidationProps(defaultizedProps),
         ref,
       }),

diff --git a/packages/x-date-pickers/src/MobileTimePicker/MobileTimePicker.tsx b/packages/x-date-pickers/src/MobileTimePicker/MobileTimePicker.tsx
@@ -72,7 +72,7 @@ const MobileTimePicker = React.forwardRef(function MobileTimePicker<
     slotProps: {
       ...defaultizedProps.slotProps,
       field: (ownerState: any) => ({
-        ...resolveComponentProps(defaultizedProps.slotProps?.field, ownerState),
+        ...(resolveComponentProps(defaultizedProps.slotProps?.field, ownerState) as any),
         ...extractValidationProps(defaultizedProps),
         ref,
       }),

diff --git a/packages/x-date-pickers/src/internals/hooks/useDesktopPicker/useDesktopPicker.types.ts b/packages/x-date-pickers/src/internals/hooks/useDesktopPicker/useDesktopPicker.types.ts
@@ -10,7 +10,11 @@ import {
 } from '../../models/props/basePickerProps';
 import { PickersPopperSlots, PickersPopperSlotProps } from '../../components/PickersPopper';
 import { UsePickerParams, UsePickerProps } from '../usePicker';
-import { BaseSingleInputFieldProps, FieldSection, PickerValidDate } from '../../../models';
+import {
+  BaseSingleInputFieldPropsInPickerSlots,
+  FieldSection,
+  PickerValidDate,
+} from '../../../models';
 import {
   ExportedPickersLayoutSlots,
   ExportedPickersLayoutSlotProps,
@@ -78,7 +82,7 @@ export interface ExportedUseDesktopPickerSlotProps<
     ExportedPickersLayoutSlotProps<TDate | null, TDate, TView>,
     UseClearableFieldSlotProps {
   field?: SlotComponentPropsFromProps<
-    BaseSingleInputFieldProps<
+    BaseSingleInputFieldPropsInPickerSlots<
       TDate | null,
       TDate,
       FieldSection,

diff --git a/packages/x-date-pickers/src/internals/hooks/useMobilePicker/useMobilePicker.tsx b/packages/x-date-pickers/src/internals/hooks/useMobilePicker/useMobilePicker.tsx
@@ -118,6 +118,7 @@ export const useMobilePicker = <
       timezone,
       label,
       name,
+      onOpen: actions.onOpen,
       ...(inputRef ? { inputRef } : {}),
     },
     ownerState: props,

diff --git a/packages/x-date-pickers/src/internals/hooks/useMobilePicker/useMobilePicker.types.ts b/packages/x-date-pickers/src/internals/hooks/useMobilePicker/useMobilePicker.types.ts
@@ -11,7 +11,11 @@ import {
   PickersModalDialogSlotProps,
 } from '../../components/PickersModalDialog';
 import { UsePickerParams, UsePickerProps } from '../usePicker';
-import { BaseSingleInputFieldProps, FieldSection, PickerValidDate } from '../../../models';
+import {
+  BaseSingleInputFieldPropsInPickerSlots,
+  FieldSection,
+  PickerValidDate,
+} from '../../../models';
 import {
   ExportedPickersLayoutSlots,
   ExportedPickersLayoutSlotProps,
@@ -45,7 +49,7 @@ export interface ExportedUseMobilePickerSlotProps<
 > extends PickersModalDialogSlotProps,
     ExportedPickersLayoutSlotProps<TDate | null, TDate, TView> {
   field?: SlotComponentPropsFromProps<
-    BaseSingleInputFieldProps<
+    BaseSingleInputFieldPropsInPickerSlots<
       TDate | null,
       TDate,
       FieldSection,

diff --git a/packages/x-date-pickers/src/models/fields.ts b/packages/x-date-pickers/src/models/fields.ts
@@ -174,6 +174,17 @@ export type BaseSingleInputFieldProps<
 > = BaseFieldProps<TValue, TDate, TSection, TEnableAccessibleFieldDOMStructure, TError> &
   BaseForwardedSingleInputFieldProps<TEnableAccessibleFieldDOMStructure>;
 
+export type BaseSingleInputFieldPropsInPickerSlots<
+  TValue,
+  TDate extends PickerValidDate,
+  TSection extends FieldSection,
+  TEnableAccessibleFieldDOMStructure extends boolean,
+  TError,
+> = Omit<
+  BaseSingleInputFieldProps<TValue, TDate, TSection, TEnableAccessibleFieldDOMStructure, TError>,
+  'onOpen'
+>;
+
 /**
  * Props the text field receives when used with a single input picker.
  * Only contains what the MUI components are passing to the text field, not what users can pass using the `props.slotProps.field` and `props.slotProps.textField`.