improves fix to be applied only for ranges

mui · Aug 26, 2024 · 0dbc59a · 0dbc59a
1 parent b6769ec
commit 0dbc59a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/packages/x-date-pickers/src/internals/utils/date-time-utils.ts b/packages/x-date-pickers/src/internals/utils/date-time-utils.ts
@@ -18,12 +18,19 @@ export const resolveDateTimeFormat = <TDate extends PickerValidDate>(
     views,
     format,
     ...other
-  }: { format?: string; views: readonly DateOrTimeViewWithMeridiem[]; ampm: boolean },
+  }: {
+    format?: string;
+    views: readonly DateOrTimeViewWithMeridiem[];
+    ampm: boolean;
+    value: TDate | TDate[];
+  },
 ) => {
   if (format) {
     return format;
   }
 
+  const { value } = other;
+
   const dateViews: DateView[] = [];
   const timeViews: TimeView[] = [];
 
@@ -44,7 +51,9 @@ export const resolveDateTimeFormat = <TDate extends PickerValidDate>(
   }
 
   const timeFormat = resolveTimeFormat(utils, { views: timeViews, ...other });
-  const dateFormat = resolveDateFormat(utils, { views: dateViews, ...other }, false);
+  const dateFormat = Array.isArray(value)
+    ? utils.formats.keyboardDate // default for DateTimeRanePicker
+    : resolveDateFormat(utils, { views: dateViews, ...other }, false);
 
   return `${dateFormat} ${timeFormat}`;
 };

diff --git a/packages/x-date-pickers/src/internals/utils/date-utils.ts b/packages/x-date-pickers/src/internals/utils/date-utils.ts
@@ -177,7 +177,7 @@ export const resolveDateFormat = <TDate extends PickerValidDate>(
   }
 
   if (areViewsEqual(views, ['day'])) {
-    return formats.keyboardDate;
+    return formats.dayOfMonth;
   }
 
   if (areViewsEqual(views, ['month', 'year'])) {