@mui/x-date-pickers 6.6.0 → 6.7.0

package/MobileTimePicker/MobileTimePicker.js

@@ -5,13 +5,16 @@ import { resolveComponentProps } from '@mui/base/utils';
 import { singleItemValueManager } from '../internals/utils/valueManagers';
 import { TimeField } from '../TimeField';
 import { useTimePickerDefaultizedProps } from '../TimePicker/shared';
-import { useLocaleText, validateTime } from '../internals';
+import { useLocaleText, useUtils } from '../internals/hooks/useUtils';
+import { validateTime } from '../internals/utils/validation/validateTime';
 import { useMobilePicker } from '../internals/hooks/useMobilePicker';
 import { extractValidationProps } from '../internals/utils/validation/extractValidationProps';
 import { renderTimeViewClock } from '../timeViewRenderers';
+import { resolveTimeFormat } from '../internals/utils/time-utils';
 const MobileTimePicker = /*#__PURE__*/React.forwardRef(function MobileTimePicker(inProps, ref) {
   var _defaultizedProps$amp, _defaultizedProps$slo2;
   const localeText = useLocaleText();
+  const utils = useUtils();
 
   // Props with the default values common to all time pickers
   const defaultizedProps = useTimePickerDefaultizedProps(inProps, 'MuiMobileTimePicker');
@@ -26,6 +29,7 @@ const MobileTimePicker = /*#__PURE__*/React.forwardRef(function MobileTimePicker
   const props = _extends({}, defaultizedProps, {
     ampmInClock,
     viewRenderers,
+    format: resolveTimeFormat(utils, defaultizedProps),
     slots: _extends({
       field: TimeField
     }, defaultizedProps.slots),

package/TimePicker/shared.d.ts

@@ -56,6 +56,6 @@ export interface BaseTimePickerProps<TDate, TView extends TimeViewWithMeridiem>
      */
     viewRenderers?: Partial<PickerViewRendererLookup<TDate | null, TView, TimeViewRendererProps<TView, BaseClockProps<TDate, TView>>, {}>>;
 }
-type UseTimePickerDefaultizedProps<TDate, TView extends TimeViewWithMeridiem, Props extends BaseTimePickerProps<TDate, TView>> = LocalizedComponent<TDate, Omit<DefaultizedProps<Props, 'views' | 'openTo' | keyof BaseTimeValidationProps>, 'components' | 'componentsProps'>>;
+type UseTimePickerDefaultizedProps<TDate, TView extends TimeViewWithMeridiem, Props extends BaseTimePickerProps<TDate, TView>> = LocalizedComponent<TDate, Omit<DefaultizedProps<Props, 'views' | 'openTo' | 'ampm' | keyof BaseTimeValidationProps>, 'components' | 'componentsProps'>>;
 export declare function useTimePickerDefaultizedProps<TDate, TView extends TimeViewWithMeridiem, Props extends BaseTimePickerProps<TDate, TView>>(props: Props, name: string): UseTimePickerDefaultizedProps<TDate, TView, Props>;
 export {};

package/index.js

@@ -1,5 +1,5 @@
 /**
- * @mui/x-date-pickers v6.6.0
+ * @mui/x-date-pickers v6.7.0
  *
  * @license MIT
  * This source code is licensed under the MIT license found in the

package/internals/utils/date-time-utils.d.ts

@@ -0,0 +1,6 @@
+import { DateOrTimeView, MuiPickersAdapter } from '../../models';
+export declare const resolveDateTimeFormat: (utils: MuiPickersAdapter<any>, { views, format, ...other }: {
+    format?: string | undefined;
+    views: readonly DateOrTimeView[];
+    ampm: boolean;
+}) => string;

package/internals/utils/date-time-utils.js

@@ -0,0 +1,41 @@
+import _extends from "@babel/runtime/helpers/esm/extends";
+import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWithoutPropertiesLoose";
+const _excluded = ["views", "format"];
+import { resolveTimeFormat, isTimeView } from './time-utils';
+import { resolveDateFormat } from './date-utils';
+export const resolveDateTimeFormat = (utils, _ref) => {
+  let {
+      views,
+      format
+    } = _ref,
+    other = _objectWithoutPropertiesLoose(_ref, _excluded);
+  if (format) {
+    return format;
+  }
+  const dateViews = [];
+  const timeViews = [];
+  views.forEach(view => {
+    if (isTimeView(view)) {
+      timeViews.push(view);
+    } else {
+      dateViews.push(view);
+    }
+  });
+  if (timeViews.length === 0) {
+    return resolveDateFormat(utils, _extends({
+      views: dateViews
+    }, other), false);
+  }
+  if (dateViews.length === 0) {
+    return resolveTimeFormat(utils, _extends({
+      views: timeViews
+    }, other));
+  }
+  const timeFormat = resolveTimeFormat(utils, _extends({
+    views: timeViews
+  }, other));
+  const dateFormat = resolveDateFormat(utils, _extends({
+    views: dateViews
+  }, other), false);
+  return `${dateFormat} ${timeFormat}`;
+};

package/internals/utils/date-utils.d.ts

@@ -18,4 +18,8 @@ export declare const getMonthsInYear: <TDate>(utils: MuiPickersAdapter<TDate, an
 export declare const mergeDateAndTime: <TDate>(utils: MuiPickersAdapter<TDate, any>, dateParam: TDate, timeParam: TDate) => TDate;
 export declare const getTodayDate: <TDate>(utils: MuiPickersAdapter<TDate, any>, valueType: FieldValueType) => TDate;
 export declare const isDatePickerView: (view: DateOrTimeViewWithMeridiem) => view is DateView;
+export declare const resolveDateFormat: (utils: MuiPickersAdapter<any>, { format, views }: {
+    format?: string | undefined;
+    views: readonly DateView[];
+}, isInToolbar: boolean) => string;
 export {};

package/internals/utils/date-utils.js

@@ -1,3 +1,4 @@
+import { areViewsEqual } from './views';
 export const findClosestEnabledDate = ({
   date,
   disableFuture,
@@ -88,4 +89,35 @@ export const mergeDateAndTime = (utils, dateParam, timeParam) => {
 };
 export const getTodayDate = (utils, valueType) => valueType === 'date' ? utils.startOfDay(utils.date()) : utils.date();
 const dateViews = ['year', 'month', 'day'];
-export const isDatePickerView = view => dateViews.includes(view);
+export const isDatePickerView = view => dateViews.includes(view);
+export const resolveDateFormat = (utils, {
+  format,
+  views
+}, isInToolbar) => {
+  if (format != null) {
+    return format;
+  }
+  const formats = utils.formats;
+  if (areViewsEqual(views, ['year'])) {
+    return formats.year;
+  }
+  if (areViewsEqual(views, ['month'])) {
+    return formats.month;
+  }
+  if (areViewsEqual(views, ['day'])) {
+    return formats.dayOfMonth;
+  }
+  if (areViewsEqual(views, ['month', 'year'])) {
+    return `${formats.month} ${formats.year}`;
+  }
+  if (areViewsEqual(views, ['day', 'month'])) {
+    return `${formats.month} ${formats.dayOfMonth}`;
+  }
+  if (isInToolbar) {
+    // Little localization hack (Google is doing the same for android native pickers):
+    // For english localization it is convenient to include weekday into the date "Mon, Jun 1".
+    // For other locales using strings like "June 1", without weekday.
+    return /en/.test(utils.getCurrentLocaleCode()) ? formats.normalDateWithWeekday : formats.normalDate;
+  }
+  return formats.keyboardDate;
+};

package/internals/utils/time-utils.d.ts

@@ -1,4 +1,4 @@
-import { MuiPickersAdapter } from '../../models';
+import { MuiPickersAdapter, TimeView } from '../../models';
 import { DateOrTimeViewWithMeridiem, TimeViewWithMeridiem } from '../models';
 export declare const isTimeView: (view: DateOrTimeViewWithMeridiem) => boolean;
 export declare const isInternalTimeView: (view: DateOrTimeViewWithMeridiem) => view is TimeViewWithMeridiem;
@@ -8,3 +8,8 @@ export declare const convertValueToMeridiem: (value: number, meridiem: Meridiem
 export declare const convertToMeridiem: <TDate>(time: TDate, meridiem: Meridiem, ampm: boolean, utils: MuiPickersAdapter<TDate, any>) => TDate;
 export declare const getSecondsInDay: <TDate>(date: TDate, utils: MuiPickersAdapter<TDate, any>) => number;
 export declare const createIsAfterIgnoreDatePart: <TDate>(disableIgnoringDatePartForTimeValidation: boolean, utils: MuiPickersAdapter<TDate, any>) => (dateLeft: TDate, dateRight: TDate) => boolean;
+export declare const resolveTimeFormat: (utils: MuiPickersAdapter<any>, { format, views, ampm }: {
+    format?: string | undefined;
+    views: readonly TimeView[];
+    ampm: boolean;
+}) => string;

package/internals/utils/time-utils.js

@@ -1,3 +1,4 @@
+import { areViewsEqual } from './views';
 const timeViews = ['hours', 'minutes', 'seconds'];
 export const isTimeView = view => timeViews.includes(view);
 export const isInternalTimeView = view => timeViews.includes(view) || view === 'meridiem';
@@ -28,4 +29,30 @@ export const createIsAfterIgnoreDatePart = (disableIgnoringDatePartForTimeValida
     return utils.isAfter(dateLeft, dateRight);
   }
   return getSecondsInDay(dateLeft, utils) > getSecondsInDay(dateRight, utils);
+};
+export const resolveTimeFormat = (utils, {
+  format,
+  views,
+  ampm
+}) => {
+  if (format != null) {
+    return format;
+  }
+  const formats = utils.formats;
+  if (areViewsEqual(views, ['hours'])) {
+    return ampm ? `${formats.hours12h} ${formats.meridiem}` : formats.hours24h;
+  }
+  if (areViewsEqual(views, ['minutes'])) {
+    return formats.minutes;
+  }
+  if (areViewsEqual(views, ['seconds'])) {
+    return formats.seconds;
+  }
+  if (areViewsEqual(views, ['minutes', 'seconds'])) {
+    return `${formats.minutes}:${formats.seconds}`;
+  }
+  if (areViewsEqual(views, ['hours', 'minutes', 'seconds'])) {
+    return ampm ? `${formats.hours12h}:${formats.minutes}:${formats.seconds} ${formats.meridiem}` : `${formats.hours24h}:${formats.minutes}:${formats.seconds}`;
+  }
+  return ampm ? `${formats.hours12h}:${formats.minutes} ${formats.meridiem}` : `${formats.hours24h}:${formats.minutes}`;
 };

package/internals/utils/validation/extractValidationProps.d.ts

@@ -8,4 +8,4 @@ export declare const DATE_TIME_VALIDATION_PROP_NAMES: (keyof DateTimeValidationP
  */
 export declare const extractValidationProps: <Props extends {
     [key: string]: any;
-}>(props: Props) => Pick<Props, "disableFuture" | "disablePast" | "maxDate" | "minDate" | "shouldDisableDate" | "shouldDisableMonth" | "shouldDisableYear" | "minutesStep" | "minTime" | "maxTime" | "ampm" | "shouldDisableTime" | "shouldDisableClock" | "disableIgnoringDatePartForTimeValidation" | "minDateTime" | "maxDateTime">;
+}>(props: Props) => Pick<Props, "ampm" | "disableFuture" | "disablePast" | "maxDate" | "minDate" | "shouldDisableDate" | "shouldDisableMonth" | "shouldDisableYear" | "minutesStep" | "minTime" | "maxTime" | "shouldDisableTime" | "shouldDisableClock" | "disableIgnoringDatePartForTimeValidation" | "minDateTime" | "maxDateTime">;

package/internals/utils/views.d.ts

@@ -1,7 +1,6 @@
-import { DateView } from '../../models';
+import { DateOrTimeView } from '../../models';
 import { DateOrTimeViewWithMeridiem } from '../models';
-export declare const isYearOnlyView: (views: readonly DateView[]) => views is readonly "year"[];
-export declare const isYearAndMonthViews: (views: readonly DateView[]) => views is readonly ("month" | "year")[];
+export declare const areViewsEqual: <TView extends DateOrTimeView>(views: ReadonlyArray<DateOrTimeView>, expectedViews: TView[]) => views is readonly TView[];
 export declare const applyDefaultViewProps: <TView extends DateOrTimeViewWithMeridiem>({ openTo, defaultOpenTo, views, defaultViews, }: {
     openTo: TView | undefined;
     defaultOpenTo: TView;

package/internals/utils/views.js

@@ -1,5 +1,9 @@
-export const isYearOnlyView = views => views.length === 1 && views[0] === 'year';
-export const isYearAndMonthViews = views => views.length === 2 && views.indexOf('month') !== -1 && views.indexOf('year') !== -1;
+export const areViewsEqual = (views, expectedViews) => {
+  if (views.length !== expectedViews.length) {
+    return false;
+  }
+  return expectedViews.every(expectedView => views.includes(expectedView));
+};
 export const applyDefaultViewProps = ({
   openTo,
   defaultOpenTo,

package/legacy/AdapterDateFns/AdapterDateFns.js

@@ -226,33 +226,34 @@ var formatTokenMap = {
   ss: 'seconds'
 };
 var defaultFormats = {
+  year: 'yyyy',
+  month: 'LLLL',
+  monthShort: 'MMM',
   dayOfMonth: 'd',
+  weekday: 'EEEE',
+  weekdayShort: 'EEE',
+  hours24h: 'HH',
+  hours12h: 'hh',
+  meridiem: 'aa',
+  minutes: 'mm',
+  seconds: 'ss',
   fullDate: 'PP',
   fullDateWithWeekday: 'PPPP',
-  fullDateTime: 'PP p',
-  fullDateTime12h: 'PP hh:mm aa',
-  fullDateTime24h: 'PP HH:mm',
+  keyboardDate: 'P',
+  shortDate: 'MMM d',
+  normalDate: 'd MMMM',
+  normalDateWithWeekday: 'EEE, MMM d',
+  monthAndYear: 'LLLL yyyy',
+  monthAndDate: 'MMMM d',
   fullTime: 'p',
   fullTime12h: 'hh:mm aa',
   fullTime24h: 'HH:mm',
-  hours12h: 'hh',
-  hours24h: 'HH',
-  keyboardDate: 'P',
+  fullDateTime: 'PP p',
+  fullDateTime12h: 'PP hh:mm aa',
+  fullDateTime24h: 'PP HH:mm',
   keyboardDateTime: 'P p',
   keyboardDateTime12h: 'P hh:mm aa',
-  keyboardDateTime24h: 'P HH:mm',
-  minutes: 'mm',
-  month: 'LLLL',
-  monthAndDate: 'MMMM d',
-  monthAndYear: 'LLLL yyyy',
-  monthShort: 'MMM',
-  weekday: 'EEEE',
-  weekdayShort: 'EEE',
-  normalDate: 'd MMMM',
-  normalDateWithWeekday: 'EEE, MMM d',
-  seconds: 'ss',
-  shortDate: 'MMM d',
-  year: 'yyyy'
+  keyboardDateTime24h: 'P HH:mm'
 };
 
 /**

package/legacy/AdapterDateFnsJalali/AdapterDateFnsJalali.js

@@ -226,33 +226,34 @@ var formatTokenMap = {
   ss: 'seconds'
 };
 var defaultFormats = {
+  year: 'yyyy',
+  month: 'LLLL',
+  monthShort: 'MMM',
   dayOfMonth: 'd',
+  weekday: 'EEEE',
+  weekdayShort: 'EEE',
+  hours24h: 'HH',
+  hours12h: 'hh',
+  meridiem: 'aa',
+  minutes: 'mm',
+  seconds: 'ss',
   fullDate: 'PPP',
   fullDateWithWeekday: 'PPPP',
+  keyboardDate: 'P',
+  shortDate: 'd MMM',
+  normalDate: 'd MMMM',
+  normalDateWithWeekday: 'EEE, d MMMM',
+  monthAndYear: 'LLLL yyyy',
+  monthAndDate: 'd MMMM',
   fullDateTime: 'PPP p',
   fullDateTime12h: 'PPP hh:mm aa',
   fullDateTime24h: 'PPP HH:mm',
   fullTime: 'p',
   fullTime12h: 'hh:mm aaa',
   fullTime24h: 'HH:mm',
-  hours12h: 'hh',
-  hours24h: 'HH',
-  keyboardDate: 'P',
   keyboardDateTime: 'P p',
   keyboardDateTime12h: 'P hh:mm aa',
-  keyboardDateTime24h: 'P HH:mm',
-  minutes: 'mm',
-  month: 'LLLL',
-  monthAndDate: 'd MMMM',
-  monthAndYear: 'LLLL yyyy',
-  monthShort: 'MMM',
-  weekday: 'EEEE',
-  weekdayShort: 'EEE',
-  normalDate: 'd MMMM',
-  normalDateWithWeekday: 'EEE, d MMMM',
-  seconds: 'ss',
-  shortDate: 'd MMM',
-  year: 'yyyy'
+  keyboardDateTime24h: 'P HH:mm'
 };
 var NUMBER_SYMBOL_MAP = {
   '1': '۱',

package/legacy/AdapterDayjs/AdapterDayjs.js

@@ -97,30 +97,31 @@ var formatTokenMap = {
   ss: 'seconds'
 };
 var defaultFormats = {
-  normalDateWithWeekday: 'ddd, MMM D',
-  normalDate: 'D MMMM',
-  shortDate: 'MMM D',
-  monthAndDate: 'MMMM D',
-  dayOfMonth: 'D',
   year: 'YYYY',
   month: 'MMMM',
   monthShort: 'MMM',
-  monthAndYear: 'MMMM YYYY',
+  dayOfMonth: 'D',
   weekday: 'dddd',
   weekdayShort: 'ddd',
-  minutes: 'mm',
-  hours12h: 'hh',
   hours24h: 'HH',
+  hours12h: 'hh',
+  meridiem: 'A',
+  minutes: 'mm',
   seconds: 'ss',
+  fullDate: 'll',
+  fullDateWithWeekday: 'dddd, LL',
+  keyboardDate: 'L',
+  shortDate: 'MMM D',
+  normalDate: 'D MMMM',
+  normalDateWithWeekday: 'ddd, MMM D',
+  monthAndYear: 'MMMM YYYY',
+  monthAndDate: 'MMMM D',
   fullTime: 'LT',
   fullTime12h: 'hh:mm A',
   fullTime24h: 'HH:mm',
-  fullDate: 'll',
-  fullDateWithWeekday: 'dddd, LL',
   fullDateTime: 'lll',
   fullDateTime12h: 'll hh:mm A',
   fullDateTime24h: 'll HH:mm',
-  keyboardDate: 'L',
   keyboardDateTime: 'L LT',
   keyboardDateTime12h: 'L hh:mm A',
   keyboardDateTime24h: 'L HH:mm'

package/legacy/AdapterLuxon/AdapterLuxon.js

@@ -111,33 +111,34 @@ var formatTokenMap = {
   ss: 'seconds'
 };
 var defaultFormats = {
+  year: 'yyyy',
+  month: 'LLLL',
+  monthShort: 'MMM',
   dayOfMonth: 'd',
+  weekday: 'cccc',
+  weekdayShort: 'ccc',
+  hours24h: 'HH',
+  hours12h: 'hh',
+  meridiem: 'a',
+  minutes: 'mm',
+  seconds: 'ss',
   fullDate: 'DD',
   fullDateWithWeekday: 'DDDD',
-  fullDateTime: 'ff',
-  fullDateTime12h: 'DD, hh:mm a',
-  fullDateTime24h: 'DD, T',
+  keyboardDate: 'D',
+  shortDate: 'MMM d',
+  normalDate: 'd MMMM',
+  normalDateWithWeekday: 'EEE, MMM d',
+  monthAndYear: 'LLLL yyyy',
+  monthAndDate: 'MMMM d',
   fullTime: 't',
   fullTime12h: 'hh:mm a',
   fullTime24h: 'HH:mm',
-  hours12h: 'hh',
-  hours24h: 'HH',
-  keyboardDate: 'D',
+  fullDateTime: 'ff',
+  fullDateTime12h: 'DD, hh:mm a',
+  fullDateTime24h: 'DD, T',
   keyboardDateTime: 'D t',
   keyboardDateTime12h: 'D hh:mm a',
-  keyboardDateTime24h: 'D T',
-  minutes: 'mm',
-  seconds: 'ss',
-  month: 'LLLL',
-  monthAndDate: 'MMMM d',
-  monthAndYear: 'LLLL yyyy',
-  monthShort: 'MMM',
-  weekday: 'cccc',
-  weekdayShort: 'ccc',
-  normalDate: 'd MMMM',
-  normalDateWithWeekday: 'EEE, MMM d',
-  shortDate: 'MMM d',
-  year: 'yyyy'
+  keyboardDateTime24h: 'D T'
 };
 
 /**

package/legacy/AdapterMoment/AdapterMoment.js

@@ -96,30 +96,31 @@ var formatTokenMap = {
   ss: 'seconds'
 };
 var defaultFormats = {
-  normalDateWithWeekday: 'ddd, MMM D',
-  normalDate: 'D MMMM',
-  shortDate: 'MMM D',
-  monthAndDate: 'MMMM D',
-  dayOfMonth: 'D',
   year: 'YYYY',
   month: 'MMMM',
   monthShort: 'MMM',
-  monthAndYear: 'MMMM YYYY',
+  dayOfMonth: 'D',
   weekday: 'dddd',
   weekdayShort: 'ddd',
-  minutes: 'mm',
-  hours12h: 'hh',
   hours24h: 'HH',
+  hours12h: 'hh',
+  meridiem: 'A',
+  minutes: 'mm',
   seconds: 'ss',
+  fullDate: 'll',
+  fullDateWithWeekday: 'dddd, LL',
+  keyboardDate: 'L',
+  shortDate: 'MMM D',
+  normalDate: 'D MMMM',
+  normalDateWithWeekday: 'ddd, MMM D',
+  monthAndYear: 'MMMM YYYY',
+  monthAndDate: 'MMMM D',
   fullTime: 'LT',
   fullTime12h: 'hh:mm A',
   fullTime24h: 'HH:mm',
-  fullDate: 'll',
-  fullDateWithWeekday: 'dddd, LL',
   fullDateTime: 'lll',
   fullDateTime12h: 'll hh:mm A',
   fullDateTime24h: 'll HH:mm',
-  keyboardDate: 'L',
   keyboardDateTime: 'L LT',
   keyboardDateTime12h: 'L hh:mm A',
   keyboardDateTime24h: 'L HH:mm'

package/legacy/AdapterMomentHijri/AdapterMomentHijri.js

@@ -74,33 +74,34 @@ var formatTokenMap = {
   ss: 'seconds'
 };
 var defaultFormats = {
+  year: 'iYYYY',
+  month: 'iMMMM',
+  monthShort: 'iMMM',
   dayOfMonth: 'iD',
+  weekday: 'dddd',
+  weekdayShort: 'ddd',
+  hours24h: 'HH',
+  hours12h: 'hh',
+  meridiem: 'A',
+  minutes: 'mm',
+  seconds: 'ss',
   fullDate: 'iYYYY, iMMMM Do',
   fullDateWithWeekday: 'iYYYY, iMMMM Do, dddd',
-  fullDateTime: 'iYYYY, iMMMM Do, hh:mm A',
-  fullDateTime12h: 'iD iMMMM hh:mm A',
-  fullDateTime24h: 'iD iMMMM HH:mm',
+  keyboardDateTime: 'iYYYY/iMM/iDD LT',
+  shortDate: 'iD iMMM',
+  normalDate: 'dddd, iD iMMM',
+  normalDateWithWeekday: 'DD iMMMM',
+  monthAndYear: 'iMMMM iYYYY',
+  monthAndDate: 'iD iMMMM',
   fullTime: 'LT',
   fullTime12h: 'hh:mm A',
   fullTime24h: 'HH:mm',
-  hours12h: 'hh',
-  hours24h: 'HH',
+  fullDateTime: 'iYYYY, iMMMM Do, hh:mm A',
+  fullDateTime12h: 'iD iMMMM hh:mm A',
+  fullDateTime24h: 'iD iMMMM HH:mm',
   keyboardDate: 'iYYYY/iMM/iDD',
-  keyboardDateTime: 'iYYYY/iMM/iDD LT',
   keyboardDateTime12h: 'iYYYY/iMM/iDD hh:mm A',
-  keyboardDateTime24h: 'iYYYY/iMM/iDD HH:mm',
-  minutes: 'mm',
-  month: 'iMMMM',
-  monthAndDate: 'iD iMMMM',
-  monthAndYear: 'iMMMM iYYYY',
-  monthShort: 'iMMM',
-  weekday: 'dddd',
-  weekdayShort: 'ddd',
-  normalDate: 'dddd, iD iMMM',
-  normalDateWithWeekday: 'DD iMMMM',
-  seconds: 'ss',
-  shortDate: 'iD iMMM',
-  year: 'iYYYY'
+  keyboardDateTime24h: 'iYYYY/iMM/iDD HH:mm'
 };
 var NUMBER_SYMBOL_MAP = {
   '1': '١',

package/legacy/AdapterMomentJalaali/AdapterMomentJalaali.js

@@ -72,33 +72,34 @@ var formatTokenMap = {
   ss: 'seconds'
 };
 var defaultFormats = {
+  year: 'jYYYY',
+  month: 'jMMMM',
+  monthShort: 'jMMM',
   dayOfMonth: 'jD',
+  weekday: 'dddd',
+  weekdayShort: 'ddd',
+  hours24h: 'HH',
+  hours12h: 'hh',
+  meridiem: 'A',
+  minutes: 'mm',
+  seconds: 'ss',
   fullDate: 'jYYYY, jMMMM Do',
   fullDateWithWeekday: 'dddd Do jMMMM jYYYY',
-  fullDateTime: 'jYYYY, jMMMM Do, hh:mm A',
-  fullDateTime12h: 'jD jMMMM hh:mm A',
-  fullDateTime24h: 'jD jMMMM HH:mm',
+  keyboardDate: 'jYYYY/jMM/jDD',
+  shortDate: 'jD jMMM',
+  normalDate: 'dddd, jD jMMM',
+  normalDateWithWeekday: 'DD MMMM',
+  monthAndYear: 'jMMMM jYYYY',
+  monthAndDate: 'jD jMMMM',
   fullTime: 'LT',
   fullTime12h: 'hh:mm A',
   fullTime24h: 'HH:mm',
-  hours12h: 'hh',
-  hours24h: 'HH',
-  keyboardDate: 'jYYYY/jMM/jDD',
+  fullDateTime: 'jYYYY, jMMMM Do, hh:mm A',
+  fullDateTime12h: 'jD jMMMM hh:mm A',
+  fullDateTime24h: 'jD jMMMM HH:mm',
   keyboardDateTime: 'jYYYY/jMM/jDD LT',
   keyboardDateTime12h: 'jYYYY/jMM/jDD hh:mm A',
-  keyboardDateTime24h: 'jYYYY/jMM/jDD HH:mm',
-  minutes: 'mm',
-  month: 'jMMMM',
-  monthAndDate: 'jD jMMMM',
-  monthAndYear: 'jMMMM jYYYY',
-  monthShort: 'jMMM',
-  weekday: 'dddd',
-  weekdayShort: 'ddd',
-  normalDate: 'dddd, jD jMMM',
-  normalDateWithWeekday: 'DD MMMM',
-  seconds: 'ss',
-  shortDate: 'jD jMMM',
-  year: 'jYYYY'
+  keyboardDateTime24h: 'jYYYY/jMM/jDD HH:mm'
 };
 var NUMBER_SYMBOL_MAP = {
   '1': '۱',

package/legacy/DatePicker/DatePickerToolbar.js

@@ -8,8 +8,8 @@ import { styled, useThemeProps } from '@mui/material/styles';
 import { unstable_composeClasses as composeClasses } from '@mui/utils';
 import { PickersToolbar } from '../internals/components/PickersToolbar';
 import { useLocaleText, useUtils } from '../internals/hooks/useUtils';
-import { isYearOnlyView, isYearAndMonthViews } from '../internals/utils/views';
 import { getDatePickerToolbarUtilityClass } from './datePickerToolbarClasses';
+import { resolveDateFormat } from '../internals/utils/date-utils';
 import { jsx as _jsx } from "react/jsx-runtime";
 var useUtilityClasses = function useUtilityClasses(ownerState) {
   var classes = ownerState.classes;
@@ -62,20 +62,11 @@ var DatePickerToolbar = /*#__PURE__*/React.forwardRef(function DatePickerToolbar
     if (!value) {
       return toolbarPlaceholder;
     }
-    if (toolbarFormat) {
-      return utils.formatByString(value, toolbarFormat);
-    }
-    if (isYearOnlyView(views)) {
-      return utils.format(value, 'year');
-    }
-    if (isYearAndMonthViews(views)) {
-      return utils.format(value, 'month');
-    }
-
-    // Little localization hack (Google is doing the same for android native pickers):
-    // For english localization it is convenient to include weekday into the date "Mon, Jun 1".
-    // For other locales using strings like "June 1", without weekday.
-    return /en/.test(utils.getCurrentLocaleCode()) ? utils.format(value, 'normalDateWithWeekday') : utils.format(value, 'normalDate');
+    var formatFromViews = resolveDateFormat(utils, {
+      format: toolbarFormat,
+      views: views
+    }, true);
+    return utils.formatByString(value, formatFromViews);
   }, [value, toolbarFormat, toolbarPlaceholder, utils, views]);
   var ownerState = props;
   return /*#__PURE__*/_jsx(DatePickerToolbarRoot, _extends({

package/legacy/DatePicker/shared.js

@@ -2,24 +2,10 @@ import _extends from "@babel/runtime/helpers/esm/extends";
 import * as React from 'react';
 import { useThemeProps } from '@mui/material/styles';
 import { useDefaultDates, useUtils } from '../internals/hooks/useUtils';
-import { applyDefaultViewProps, isYearAndMonthViews, isYearOnlyView } from '../internals/utils/views';
+import { applyDefaultViewProps } from '../internals/utils/views';
 import { applyDefaultDate } from '../internals/utils/date-utils';
 import { DatePickerToolbar } from './DatePickerToolbar';
 import { uncapitalizeObjectKeys } from '../internals/utils/slots-migration';
-export var getDatePickerFieldFormat = function getDatePickerFieldFormat(utils, _ref) {
-  var format = _ref.format,
-    views = _ref.views;
-  if (format != null) {
-    return format;
-  }
-  if (isYearOnlyView(views)) {
-    return utils.formats.year;
-  }
-  if (isYearAndMonthViews(views)) {
-    return utils.formats.monthAndYear;
-  }
-  return undefined;
-};
 export function useDatePickerDefaultizedProps(props, name) {
   var _themeProps$slots, _themeProps$disableFu, _themeProps$disablePa, _themeProps$slotProps;
   var utils = useUtils();