Work

Author: flaviendelangle

packages/x-date-pickers/src/valueManagers/getDateTimeValueManager.ts

@@ -37,6 +37,13 @@ export interface DateTimeFieldInternalPropsWithDefaults<
 > extends UseFieldInternalProps<false, TEnableAccessibleFieldDOMStructure, DateTimeValidationError>,
     ValidateDateTimeProps {}
 
+type DateTimeFieldPropsToDefault =
+  | 'format'
+  // minTime and maxTime can still be undefined after applying defaults.
+  | 'minTime'
+  | 'maxTime'
+  | ValidateDateTimePropsToDefault;
+
 export const getDateTimeFieldInternalPropsDefaults = <
   TEnableAccessibleFieldDOMStructure extends boolean,
 >({
@@ -46,22 +53,18 @@ export const getDateTimeFieldInternalPropsDefaults = <
 }: Pick<MuiPickersAdapterContextValue, 'defaultDates' | 'utils'> & {
   internalProps: Pick<
     DateTimeFieldInternalProps<TEnableAccessibleFieldDOMStructure>,
-    | 'format'
-    | 'ampm'
-    | 'minDateTime'
-    | 'maxDateTime'
-    | 'minTime'
-    | 'maxTime'
-    | ValidateDateTimePropsToDefault
+    DateTimeFieldPropsToDefault | 'minDateTime' | 'maxDateTime' | 'ampm'
   >;
-}) => {
+}): Pick<
+  DateTimeFieldInternalPropsWithDefaults<TEnableAccessibleFieldDOMStructure>,
+  DateTimeFieldPropsToDefault | 'disableIgnoringDatePartForTimeValidation'
+> => {
   const ampm = internalProps.ampm ?? utils.is12HourCycleInCurrentLocale();
   const defaultFormat = ampm
     ? utils.formats.keyboardDateTime12h
     : utils.formats.keyboardDateTime24h;
 
   return {
-    ampm,
     disablePast: internalProps.disablePast ?? false,
     disableFuture: internalProps.disableFuture ?? false,
     format: internalProps.format ?? defaultFormat,

packages/x-date-pickers/src/valueManagers/getDateValueManager.ts

@@ -35,6 +35,8 @@ export interface DateFieldInternalPropsWithDefaults<
 > extends UseFieldInternalProps<false, TEnableAccessibleFieldDOMStructure, DateValidationError>,
     ValidateDateProps {}
 
+type DateFieldPropsToDefault = 'format' | ValidateDatePropsToDefault;
+
 export const getDateFieldInternalPropsDefaults = <
   TEnableAccessibleFieldDOMStructure extends boolean,
 >({
@@ -44,12 +46,15 @@ export const getDateFieldInternalPropsDefaults = <
 }: Pick<MuiPickersAdapterContextValue, 'defaultDates' | 'utils'> & {
   internalProps: Pick<
     DateFieldInternalProps<TEnableAccessibleFieldDOMStructure>,
-    'format' | ValidateDatePropsToDefault
+    DateFieldPropsToDefault
   >;
-}) => ({
+}): Pick<
+  DateFieldInternalPropsWithDefaults<TEnableAccessibleFieldDOMStructure>,
+  DateFieldPropsToDefault
+> => ({
+  format: internalProps.format ?? utils.formats.keyboardDate,
   disablePast: internalProps.disablePast ?? false,
   disableFuture: internalProps.disableFuture ?? false,
-  format: internalProps.format ?? utils.formats.keyboardDate,
   minDate: applyDefaultDate(utils, internalProps.minDate, defaultDates.minDate),
   maxDate: applyDefaultDate(utils, internalProps.maxDate, defaultDates.maxDate),
 });

packages/x-date-pickers/src/valueManagers/getTimeValueManager.ts

@@ -36,6 +36,8 @@ export interface TimeFieldInternalPropsWithDefaults<
 > extends UseFieldInternalProps<false, TEnableAccessibleFieldDOMStructure, TimeValidationError>,
     ValidateTimeProps {}
 
+type TimeFieldPropsToDefault = 'format' | ValidateTimePropsToDefault;
+
 export const getTimeFieldInternalPropsDefaults = <
   TEnableAccessibleFieldDOMStructure extends boolean,
 >({
@@ -44,14 +46,16 @@ export const getTimeFieldInternalPropsDefaults = <
 }: Pick<MuiPickersAdapterContextValue, 'utils'> & {
   internalProps: Pick<
     TimeFieldInternalProps<TEnableAccessibleFieldDOMStructure>,
-    'format' | 'ampm' | ValidateTimePropsToDefault
+    TimeFieldPropsToDefault | 'ampm'
   >;
-}) => {
+}): Pick<
+  TimeFieldInternalPropsWithDefaults<TEnableAccessibleFieldDOMStructure>,
+  TimeFieldPropsToDefault
+> => {
   const ampm = internalProps.ampm ?? utils.is12HourCycleInCurrentLocale();
   const defaultFormat = ampm ? utils.formats.fullTime12h : utils.formats.fullTime24h;
 
   return {
-    ampm,
     disablePast: internalProps.disablePast ?? false,
     disableFuture: internalProps.disableFuture ?? false,
     format: internalProps.format ?? defaultFormat,