@mui/x-date-pickers 7.0.0-beta.6 → 7.0.0

package/DateCalendar/DayCalendar.js

@@ -133,7 +133,6 @@ const PickersCalendarWeek = styled('div', {
   justifyContent: 'center'
 });
 function WrappedDay(_ref) {
-  var _slots$day;
   let {
       parentProps,
       day,
@@ -158,11 +157,11 @@ function WrappedDay(_ref) {
   const isFocusableDay = focusableDay !== null && utils.isSameDay(day, focusableDay);
   const isSelected = selectedDays.some(selectedDay => utils.isSameDay(selectedDay, day));
   const isToday = utils.isSameDay(day, now);
-  const Day = (_slots$day = slots == null ? void 0 : slots.day) != null ? _slots$day : PickersDay;
+  const Day = slots?.day ?? PickersDay;
   // We don't want to pass to ownerState down, to avoid re-rendering all the day whenever a prop changes.
   const _useSlotProps = useSlotProps({
       elementType: Day,
-      externalSlotProps: slotProps == null ? void 0 : slotProps.day,
+      externalSlotProps: slotProps?.day,
       additionalProps: _extends({
         disableHighlightToday,
         showDaysOutsideCurrentMonth,
@@ -268,7 +267,7 @@ export function DayCalendar(inProps) {
     name: 'DayCalendar',
     state: 'hasFocus',
     controlled: hasFocus,
-    default: autoFocus != null ? autoFocus : false
+    default: autoFocus ?? false
   });
   const [internalFocusedDay, setInternalFocusedDay] = React.useState(() => focusedDay || now);
   const handleDaySelect = useEventCallback(day => {
@@ -281,7 +280,7 @@ export function DayCalendar(inProps) {
     if (!isDateDisabled(day)) {
       onFocusedDayChange(day);
       setInternalFocusedDay(day);
-      onFocusedViewChange == null || onFocusedViewChange(true);
+      onFocusedViewChange?.(true);
       setInternalHasFocus(true);
     }
   };
@@ -350,14 +349,15 @@ export function DayCalendar(inProps) {
   const handleFocus = useEventCallback((event, day) => focusDay(day));
   const handleBlur = useEventCallback((event, day) => {
     if (internalHasFocus && utils.isSameDay(internalFocusedDay, day)) {
-      onFocusedViewChange == null || onFocusedViewChange(false);
+      onFocusedViewChange?.(false);
     }
   });
   const currentMonthNumber = utils.getMonth(currentMonth);
+  const currentYearNumber = utils.getYear(currentMonth);
   const validSelectedDays = React.useMemo(() => selectedDays.filter(day => !!day).map(day => utils.startOfDay(day)), [utils, selectedDays]);
 
   // need a new ref whenever the `key` of the transition changes: https://reactcommunity.org/react-transition-group/transition/#Transition-prop-nodeRef.
-  const transitionKey = currentMonthNumber;
+  const transitionKey = `${currentYearNumber}-${currentMonthNumber}`;
   // eslint-disable-next-line react-hooks/exhaustive-deps
   const slideNodeRef = React.useMemo(() => /*#__PURE__*/React.createRef(), [transitionKey]);
   const startOfCurrentWeek = utils.startOfWeek(now);

package/DateField/DateField.js

@@ -23,7 +23,6 @@ import { jsx as _jsx } from "react/jsx-runtime";
  * - [DateField API](https://mui.com/x/api/date-pickers/date-field/)
  */
 const DateField = /*#__PURE__*/React.forwardRef(function DateField(inProps, inRef) {
-  var _slots$textField;
   const themeProps = useThemeProps({
     props: inProps,
     name: 'MuiDateField'
@@ -36,10 +35,10 @@ const DateField = /*#__PURE__*/React.forwardRef(function DateField(inProps, inRe
     } = themeProps,
     other = _objectWithoutPropertiesLoose(themeProps, _excluded);
   const ownerState = themeProps;
-  const TextField = (_slots$textField = slots == null ? void 0 : slots.textField) != null ? _slots$textField : inProps.enableAccessibleFieldDOMStructure ? PickersTextField : MuiTextField;
+  const TextField = slots?.textField ?? (inProps.enableAccessibleFieldDOMStructure ? PickersTextField : MuiTextField);
   const textFieldProps = useSlotProps({
     elementType: TextField,
-    externalSlotProps: slotProps == null ? void 0 : slotProps.textField,
+    externalSlotProps: slotProps?.textField,
     externalForwardedProps: other,
     additionalProps: {
       ref: inRef
@@ -242,7 +241,7 @@ process.env.NODE_ENV !== "production" ? DateField.propTypes = {
   /**
    * Disable specific date.
    *
-   * Warning: This function can be called multiple times (e.g. when rendering date calendar, checking if focus can be moved to a certain date, etc.). Expensive computations can impact performance.
+   * Warning: This function can be called multiple times (for example when rendering date calendar, checking if focus can be moved to a certain date, etc.). Expensive computations can impact performance.
    *
    * @template TDate
    * @param {TDate} day The date to test.

package/DatePicker/DatePicker.js

@@ -266,7 +266,7 @@ process.env.NODE_ENV !== "production" ? DatePicker.propTypes = {
   /**
    * Disable specific date.
    *
-   * Warning: This function can be called multiple times (e.g. when rendering date calendar, checking if focus can be moved to a certain date, etc.). Expensive computations can impact performance.
+   * Warning: This function can be called multiple times (for example when rendering date calendar, checking if focus can be moved to a certain date, etc.). Expensive computations can impact performance.
    *
    * @template TDate
    * @param {TDate} day The date to test.

package/DatePicker/shared.d.ts

@@ -18,6 +18,7 @@ export interface BaseDatePickerSlots<TDate extends PickerValidDate> extends Date
 export interface BaseDatePickerSlotProps<TDate extends PickerValidDate> extends DateCalendarSlotProps<TDate> {
     toolbar?: ExportedDatePickerToolbarProps;
 }
+export type DatePickerViewRenderers<TDate extends PickerValidDate, TView extends DateView, TAdditionalProps extends {} = {}> = PickerViewRendererLookup<TDate | null, TView, DateViewRendererProps<TDate, TView>, TAdditionalProps>;
 export interface BaseDatePickerProps<TDate extends PickerValidDate> extends BasePickerInputProps<TDate | null, TDate, DateView, DateValidationError>, ExportedDateCalendarProps<TDate> {
     /**
      * Overridable component slots.
@@ -34,7 +35,7 @@ export interface BaseDatePickerProps<TDate extends PickerValidDate> extends Base
      * If `null`, the section will only have field editing.
      * If `undefined`, internally defined view will be the used.
      */
-    viewRenderers?: Partial<PickerViewRendererLookup<TDate | null, DateView, DateViewRendererProps<TDate, DateView>, {}>>;
+    viewRenderers?: Partial<DatePickerViewRenderers<TDate, DateView>>;
 }
 type UseDatePickerDefaultizedProps<TDate extends PickerValidDate, Props extends BaseDatePickerProps<TDate>> = LocalizedComponent<TDate, DefaultizedProps<Props, 'views' | 'openTo' | keyof BaseDateValidationProps<TDate>>>;
 export declare function useDatePickerDefaultizedProps<TDate extends PickerValidDate, Props extends BaseDatePickerProps<TDate>>(props: Props, name: string): UseDatePickerDefaultizedProps<TDate, Props>;

package/DatePicker/shared.js

@@ -6,7 +6,6 @@ import { applyDefaultViewProps } from '../internals/utils/views';
 import { applyDefaultDate } from '../internals/utils/date-utils';
 import { DatePickerToolbar } from './DatePickerToolbar';
 export function useDatePickerDefaultizedProps(props, name) {
-  var _themeProps$disableFu, _themeProps$disablePa;
   const utils = useUtils();
   const defaultDates = useDefaultDates();
   const themeProps = useThemeProps({
@@ -14,8 +13,7 @@ export function useDatePickerDefaultizedProps(props, name) {
     name
   });
   const localeText = React.useMemo(() => {
-    var _themeProps$localeTex;
-    if (((_themeProps$localeTex = themeProps.localeText) == null ? void 0 : _themeProps$localeTex.toolbarTitle) == null) {
+    if (themeProps.localeText?.toolbarTitle == null) {
       return themeProps.localeText;
     }
     return _extends({}, themeProps.localeText, {
@@ -30,8 +28,8 @@ export function useDatePickerDefaultizedProps(props, name) {
     defaultViews: ['year', 'day'],
     defaultOpenTo: 'day'
   }), {
-    disableFuture: (_themeProps$disableFu = themeProps.disableFuture) != null ? _themeProps$disableFu : false,
-    disablePast: (_themeProps$disablePa = themeProps.disablePast) != null ? _themeProps$disablePa : false,
+    disableFuture: themeProps.disableFuture ?? false,
+    disablePast: themeProps.disablePast ?? false,
     minDate: applyDefaultDate(utils, themeProps.minDate, defaultDates.minDate),
     maxDate: applyDefaultDate(utils, themeProps.maxDate, defaultDates.maxDate),
     slots: _extends({

package/DateTimeField/DateTimeField.js

@@ -23,7 +23,6 @@ import { jsx as _jsx } from "react/jsx-runtime";
  * - [DateTimeField API](https://mui.com/x/api/date-pickers/date-time-field/)
  */
 const DateTimeField = /*#__PURE__*/React.forwardRef(function DateTimeField(inProps, inRef) {
-  var _slots$textField;
   const themeProps = useThemeProps({
     props: inProps,
     name: 'MuiDateTimeField'
@@ -36,10 +35,10 @@ const DateTimeField = /*#__PURE__*/React.forwardRef(function DateTimeField(inPro
     } = themeProps,
     other = _objectWithoutPropertiesLoose(themeProps, _excluded);
   const ownerState = themeProps;
-  const TextField = (_slots$textField = slots == null ? void 0 : slots.textField) != null ? _slots$textField : inProps.enableAccessibleFieldDOMStructure ? PickersTextField : MuiTextField;
+  const TextField = slots?.textField ?? (inProps.enableAccessibleFieldDOMStructure ? PickersTextField : MuiTextField);
   const textFieldProps = useSlotProps({
     elementType: TextField,
-    externalSlotProps: slotProps == null ? void 0 : slotProps.textField,
+    externalSlotProps: slotProps?.textField,
     externalForwardedProps: other,
     ownerState,
     additionalProps: {
@@ -275,7 +274,7 @@ process.env.NODE_ENV !== "production" ? DateTimeField.propTypes = {
   /**
    * Disable specific date.
    *
-   * Warning: This function can be called multiple times (e.g. when rendering date calendar, checking if focus can be moved to a certain date, etc.). Expensive computations can impact performance.
+   * Warning: This function can be called multiple times (for example when rendering date calendar, checking if focus can be moved to a certain date, etc.). Expensive computations can impact performance.
    *
    * @template TDate
    * @param {TDate} day The date to test.

package/DateTimePicker/DateTimePicker.js

@@ -304,7 +304,7 @@ process.env.NODE_ENV !== "production" ? DateTimePicker.propTypes = {
   /**
    * Disable specific date.
    *
-   * Warning: This function can be called multiple times (e.g. when rendering date calendar, checking if focus can be moved to a certain date, etc.). Expensive computations can impact performance.
+   * Warning: This function can be called multiple times (for example when rendering date calendar, checking if focus can be moved to a certain date, etc.). Expensive computations can impact performance.
    *
    * @template TDate
    * @param {TDate} day The date to test.

package/DateTimePicker/DateTimePickerToolbar.js

@@ -208,7 +208,7 @@ function DateTimePickerToolbar(inProps) {
   const classes = useUtilityClasses(_extends({}, ownerState, {
     theme
   }));
-  const toolbarTitle = inToolbarTitle != null ? inToolbarTitle : localeText.dateTimePickerToolbarTitle;
+  const toolbarTitle = inToolbarTitle ?? localeText.dateTimePickerToolbarTitle;
   const formatHours = time => ampm ? utils.format(time, 'hours12h') : utils.format(time, 'hours24h');
   const dateText = React.useMemo(() => {
     if (!value) {

package/DateTimePicker/shared.d.ts

@@ -35,6 +35,7 @@ export interface BaseDateTimePickerSlotProps<TDate extends PickerValidDate> exte
      */
     toolbar?: ExportedDateTimePickerToolbarProps;
 }
+export type DateTimePickerViewRenderers<TDate extends PickerValidDate, TView extends DateOrTimeViewWithMeridiem, TAdditionalProps extends {} = {}> = PickerViewRendererLookup<TDate | null, TView, Omit<DateViewRendererProps<TDate, TView>, 'slots' | 'slotProps'> & Omit<TimeViewRendererProps<TimeViewWithMeridiem, BaseClockProps<TDate, TimeViewWithMeridiem>>, 'slots' | 'slotProps'>, TAdditionalProps>;
 export interface BaseDateTimePickerProps<TDate extends PickerValidDate, TView extends DateOrTimeViewWithMeridiem> extends BasePickerInputProps<TDate | null, TDate, TView, DateTimeValidationError>, Omit<ExportedDateCalendarProps<TDate>, 'onViewChange'>, ExportedBaseClockProps<TDate>, DateTimeValidationProps<TDate> {
     /**
      * Display ampm controls under the clock (instead of in the toolbar).
@@ -56,7 +57,7 @@ export interface BaseDateTimePickerProps<TDate extends PickerValidDate, TView ex
      * If `null`, the section will only have field editing.
      * If `undefined`, internally defined view will be the used.
      */
-    viewRenderers?: Partial<PickerViewRendererLookup<TDate | null, TView, DateViewRendererProps<TDate, TView> & TimeViewRendererProps<TimeViewWithMeridiem, BaseClockProps<TDate, TimeViewWithMeridiem>>, {}>>;
+    viewRenderers?: Partial<DateTimePickerViewRenderers<TDate, TView>>;
 }
 type UseDateTimePickerDefaultizedProps<TDate extends PickerValidDate, TView extends DateOrTimeViewWithMeridiem, Props extends BaseDateTimePickerProps<TDate, TView>> = LocalizedComponent<TDate, DefaultizedProps<Props, 'views' | 'openTo' | 'orientation' | 'ampm' | keyof BaseDateValidationProps<TDate> | keyof BaseTimeValidationProps>>;
 export declare function useDateTimePickerDefaultizedProps<TDate extends PickerValidDate, TView extends DateOrTimeViewWithMeridiem, Props extends BaseDateTimePickerProps<TDate, TView>>(props: Props, name: string): UseDateTimePickerDefaultizedProps<TDate, TView, Props>;

package/DateTimePicker/shared.js

@@ -7,17 +7,15 @@ import { DateTimePickerTabs } from './DateTimePickerTabs';
 import { DateTimePickerToolbar } from './DateTimePickerToolbar';
 import { applyDefaultViewProps } from '../internals/utils/views';
 export function useDateTimePickerDefaultizedProps(props, name) {
-  var _themeProps$ampm, _themeProps$orientati, _themeProps$disableIg, _themeProps$disableFu, _themeProps$disablePa, _themeProps$minDateTi, _themeProps$maxDateTi, _themeProps$minDateTi2, _themeProps$maxDateTi2, _themeProps$slotProps;
   const utils = useUtils();
   const defaultDates = useDefaultDates();
   const themeProps = useThemeProps({
     props,
     name
   });
-  const ampm = (_themeProps$ampm = themeProps.ampm) != null ? _themeProps$ampm : utils.is12HourCycleInCurrentLocale();
+  const ampm = themeProps.ampm ?? utils.is12HourCycleInCurrentLocale();
   const localeText = React.useMemo(() => {
-    var _themeProps$localeTex;
-    if (((_themeProps$localeTex = themeProps.localeText) == null ? void 0 : _themeProps$localeTex.toolbarTitle) == null) {
+    if (themeProps.localeText?.toolbarTitle == null) {
       return themeProps.localeText;
     }
     return _extends({}, themeProps.localeText, {
@@ -32,17 +30,17 @@ export function useDateTimePickerDefaultizedProps(props, name) {
   }), {
     ampm,
     localeText,
-    orientation: (_themeProps$orientati = themeProps.orientation) != null ? _themeProps$orientati : 'portrait',
+    orientation: themeProps.orientation ?? 'portrait',
     // TODO: Remove from public API
-    disableIgnoringDatePartForTimeValidation: (_themeProps$disableIg = themeProps.disableIgnoringDatePartForTimeValidation) != null ? _themeProps$disableIg : Boolean(themeProps.minDateTime || themeProps.maxDateTime ||
+    disableIgnoringDatePartForTimeValidation: themeProps.disableIgnoringDatePartForTimeValidation ?? Boolean(themeProps.minDateTime || themeProps.maxDateTime ||
     // allow time clock to correctly check time validity: https://github.com/mui/mui-x/issues/8520
     themeProps.disablePast || themeProps.disableFuture),
-    disableFuture: (_themeProps$disableFu = themeProps.disableFuture) != null ? _themeProps$disableFu : false,
-    disablePast: (_themeProps$disablePa = themeProps.disablePast) != null ? _themeProps$disablePa : false,
-    minDate: applyDefaultDate(utils, (_themeProps$minDateTi = themeProps.minDateTime) != null ? _themeProps$minDateTi : themeProps.minDate, defaultDates.minDate),
-    maxDate: applyDefaultDate(utils, (_themeProps$maxDateTi = themeProps.maxDateTime) != null ? _themeProps$maxDateTi : themeProps.maxDate, defaultDates.maxDate),
-    minTime: (_themeProps$minDateTi2 = themeProps.minDateTime) != null ? _themeProps$minDateTi2 : themeProps.minTime,
-    maxTime: (_themeProps$maxDateTi2 = themeProps.maxDateTime) != null ? _themeProps$maxDateTi2 : themeProps.maxTime,
+    disableFuture: themeProps.disableFuture ?? false,
+    disablePast: themeProps.disablePast ?? false,
+    minDate: applyDefaultDate(utils, themeProps.minDateTime ?? themeProps.minDate, defaultDates.minDate),
+    maxDate: applyDefaultDate(utils, themeProps.maxDateTime ?? themeProps.maxDate, defaultDates.maxDate),
+    minTime: themeProps.minDateTime ?? themeProps.minTime,
+    maxTime: themeProps.maxDateTime ?? themeProps.maxTime,
     slots: _extends({
       toolbar: DateTimePickerToolbar,
       tabs: DateTimePickerTabs
@@ -50,7 +48,7 @@ export function useDateTimePickerDefaultizedProps(props, name) {
     slotProps: _extends({}, themeProps.slotProps, {
       toolbar: _extends({
         ampm
-      }, (_themeProps$slotProps = themeProps.slotProps) == null ? void 0 : _themeProps$slotProps.toolbar)
+      }, themeProps.slotProps?.toolbar)
     })
   });
 }

package/DesktopDatePicker/DesktopDatePicker.js

@@ -24,7 +24,6 @@ import { resolveDateFormat } from '../internals/utils/date-utils';
  * - [DesktopDatePicker API](https://mui.com/x/api/date-pickers/desktop-date-picker/)
  */
 const DesktopDatePicker = /*#__PURE__*/React.forwardRef(function DesktopDatePicker(inProps, ref) {
-  var _defaultizedProps$yea, _defaultizedProps$slo2, _props$localeText$ope, _props$localeText;
   const localeText = useLocaleText();
   const utils = useUtils();
 
@@ -40,21 +39,18 @@ const DesktopDatePicker = /*#__PURE__*/React.forwardRef(function DesktopDatePick
   const props = _extends({}, defaultizedProps, {
     viewRenderers,
     format: resolveDateFormat(utils, defaultizedProps, false),
-    yearsPerRow: (_defaultizedProps$yea = defaultizedProps.yearsPerRow) != null ? _defaultizedProps$yea : 4,
+    yearsPerRow: defaultizedProps.yearsPerRow ?? 4,
     slots: _extends({
       openPickerIcon: CalendarIcon,
       field: DateField
     }, defaultizedProps.slots),
     slotProps: _extends({}, defaultizedProps.slotProps, {
-      field: ownerState => {
-        var _defaultizedProps$slo;
-        return _extends({}, resolveComponentProps((_defaultizedProps$slo = defaultizedProps.slotProps) == null ? void 0 : _defaultizedProps$slo.field, ownerState), extractValidationProps(defaultizedProps), {
-          ref
-        });
-      },
+      field: ownerState => _extends({}, resolveComponentProps(defaultizedProps.slotProps?.field, ownerState), extractValidationProps(defaultizedProps), {
+        ref
+      }),
       toolbar: _extends({
         hidden: true
-      }, (_defaultizedProps$slo2 = defaultizedProps.slotProps) == null ? void 0 : _defaultizedProps$slo2.toolbar)
+      }, defaultizedProps.slotProps?.toolbar)
     })
   });
   const {
@@ -63,7 +59,7 @@ const DesktopDatePicker = /*#__PURE__*/React.forwardRef(function DesktopDatePick
     props,
     valueManager: singleItemValueManager,
     valueType: 'date',
-    getOpenDialogAriaText: (_props$localeText$ope = (_props$localeText = props.localeText) == null ? void 0 : _props$localeText.openDatePickerDialogue) != null ? _props$localeText$ope : localeText.openDatePickerDialogue,
+    getOpenDialogAriaText: props.localeText?.openDatePickerDialogue ?? localeText.openDatePickerDialogue,
     validator: validateDate
   });
   return renderPicker();
@@ -285,7 +281,7 @@ DesktopDatePicker.propTypes = {
   /**
    * Disable specific date.
    *
-   * Warning: This function can be called multiple times (e.g. when rendering date calendar, checking if focus can be moved to a certain date, etc.). Expensive computations can impact performance.
+   * Warning: This function can be called multiple times (for example when rendering date calendar, checking if focus can be moved to a certain date, etc.). Expensive computations can impact performance.
    *
    * @template TDate
    * @param {TDate} day The date to test.

package/DesktopDateTimePicker/DesktopDateTimePicker.js

@@ -1,19 +1,64 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
+import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWithoutPropertiesLoose";
+const _excluded = ["openTo", "focusedView", "timeViewsCount"];
 import * as React from 'react';
 import PropTypes from 'prop-types';
 import { resolveComponentProps } from '@mui/base/utils';
 import { refType } from '@mui/utils';
+import Divider from '@mui/material/Divider';
 import { singleItemValueManager } from '../internals/utils/valueManagers';
 import { DateTimeField } from '../DateTimeField';
 import { useDateTimePickerDefaultizedProps } from '../DateTimePicker/shared';
 import { renderDateViewCalendar } from '../dateViewRenderers/dateViewRenderers';
-import { renderDesktopDateTimeView } from '../dateTimeViewRenderers';
 import { useLocaleText, useUtils } from '../internals/hooks/useUtils';
 import { validateDateTime } from '../internals/utils/validation/validateDateTime';
 import { CalendarIcon } from '../icons';
 import { useDesktopPicker } from '../internals/hooks/useDesktopPicker';
 import { extractValidationProps } from '../internals/utils/validation/extractValidationProps';
 import { resolveDateTimeFormat, resolveTimeViewsResponse } from '../internals/utils/date-time-utils';
+import { renderDigitalClockTimeView, renderMultiSectionDigitalClockTimeView } from '../timeViewRenderers';
+import { VIEW_HEIGHT, isDatePickerView, isInternalTimeView } from '../internals';
+import { multiSectionDigitalClockClasses, multiSectionDigitalClockSectionClasses } from '../MultiSectionDigitalClock';
+import { digitalClockClasses } from '../DigitalClock';
+import { DesktopDateTimePickerLayout } from './DesktopDateTimePickerLayout';
+import { jsx as _jsx } from "react/jsx-runtime";
+import { jsxs as _jsxs } from "react/jsx-runtime";
+const rendererInterceptor = function rendererInterceptor(inViewRenderers, popperView, rendererProps) {
+  const {
+      openTo,
+      focusedView,
+      timeViewsCount
+    } = rendererProps,
+    otherProps = _objectWithoutPropertiesLoose(rendererProps, _excluded);
+  const finalProps = _extends({}, otherProps, {
+    focusedView: null,
+    sx: [{
+      [`&.${multiSectionDigitalClockClasses.root}`]: {
+        borderBottom: 0
+      },
+      [`&.${multiSectionDigitalClockClasses.root}, .${multiSectionDigitalClockSectionClasses.root}, &.${digitalClockClasses.root}`]: {
+        maxHeight: VIEW_HEIGHT
+      }
+    }]
+  });
+  const isTimeViewActive = isInternalTimeView(popperView);
+  return /*#__PURE__*/_jsxs(React.Fragment, {
+    children: [inViewRenderers[!isTimeViewActive ? popperView : 'day']?.(_extends({}, rendererProps, {
+      view: !isTimeViewActive ? popperView : 'day',
+      focusedView: focusedView && isDatePickerView(focusedView) ? focusedView : null,
+      views: rendererProps.views.filter(isDatePickerView)
+    })), timeViewsCount > 0 && /*#__PURE__*/_jsxs(React.Fragment, {
+      children: [/*#__PURE__*/_jsx(Divider, {
+        orientation: "vertical"
+      }), inViewRenderers[isTimeViewActive ? popperView : 'hours']?.(_extends({}, finalProps, {
+        view: isTimeViewActive ? popperView : 'hours',
+        focusedView: focusedView && isInternalTimeView(focusedView) ? focusedView : null,
+        openTo: isInternalTimeView(openTo) ? openTo : 'hours',
+        views: rendererProps.views.filter(isInternalTimeView)
+      }))]
+    })]
+  });
+};
 /**
  * Demos:
  *
@@ -25,7 +70,6 @@ import { resolveDateTimeFormat, resolveTimeViewsResponse } from '../internals/ut
  * - [DesktopDateTimePicker API](https://mui.com/x/api/date-pickers/desktop-date-time-picker/)
  */
 const DesktopDateTimePicker = /*#__PURE__*/React.forwardRef(function DesktopDateTimePicker(inProps, ref) {
-  var _defaultizedProps$amp, _defaultizedProps$yea, _defaultizedProps$slo2, _defaultizedProps$slo3, _defaultizedProps$slo4, _props$localeText$ope, _props$localeText;
   const localeText = useLocaleText();
   const utils = useUtils();
 
@@ -34,65 +78,55 @@ const DesktopDateTimePicker = /*#__PURE__*/React.forwardRef(function DesktopDate
   const {
     shouldRenderTimeInASingleColumn,
     thresholdToRenderTimeInASingleColumn,
-    views,
+    views: resolvedViews,
     timeSteps
   } = resolveTimeViewsResponse(defaultizedProps);
-  const shouldUseNewRenderer = !defaultizedProps.viewRenderers || Object.keys(defaultizedProps.viewRenderers).length === 0;
-  const viewRenderers =
-  // we can only ensure the expected two-column layout if none of the renderers are overridden
-  shouldUseNewRenderer ? {
-    day: renderDesktopDateTimeView,
-    month: renderDesktopDateTimeView,
-    year: renderDesktopDateTimeView,
-    hours: renderDesktopDateTimeView,
-    minutes: renderDesktopDateTimeView,
-    seconds: renderDesktopDateTimeView,
-    meridiem: renderDesktopDateTimeView
-  } : _extends({
+  const renderTimeView = shouldRenderTimeInASingleColumn ? renderDigitalClockTimeView : renderMultiSectionDigitalClockTimeView;
+  const viewRenderers = _extends({
     day: renderDateViewCalendar,
     month: renderDateViewCalendar,
     year: renderDateViewCalendar,
-    hours: null,
-    minutes: null,
-    seconds: null,
-    meridiem: null
+    hours: renderTimeView,
+    minutes: renderTimeView,
+    seconds: renderTimeView,
+    meridiem: renderTimeView
   }, defaultizedProps.viewRenderers);
-  const ampmInClock = (_defaultizedProps$amp = defaultizedProps.ampmInClock) != null ? _defaultizedProps$amp : true;
-  // add "accept" action only when the new date time view renderers are used
-  const actionBarActions = shouldUseNewRenderer ? ['accept'] : [];
+  const ampmInClock = defaultizedProps.ampmInClock ?? true;
+  // Need to avoid adding the `meridiem` view when unexpected renderer is specified
+  const shouldHoursRendererContainMeridiemView = viewRenderers.hours?.name === renderMultiSectionDigitalClockTimeView.name;
+  const views = !shouldHoursRendererContainMeridiemView ? resolvedViews.filter(view => view !== 'meridiem') : resolvedViews;
+  const actionBarActions = shouldRenderTimeInASingleColumn ? [] : ['accept'];
 
   // Props with the default values specific to the desktop variant
   const props = _extends({}, defaultizedProps, {
     viewRenderers,
     format: resolveDateTimeFormat(utils, defaultizedProps),
     views,
-    yearsPerRow: (_defaultizedProps$yea = defaultizedProps.yearsPerRow) != null ? _defaultizedProps$yea : 4,
+    yearsPerRow: defaultizedProps.yearsPerRow ?? 4,
     ampmInClock,
     timeSteps,
     thresholdToRenderTimeInASingleColumn,
     shouldRenderTimeInASingleColumn,
     slots: _extends({
       field: DateTimeField,
+      layout: DesktopDateTimePickerLayout,
       openPickerIcon: CalendarIcon
     }, defaultizedProps.slots),
     slotProps: _extends({}, defaultizedProps.slotProps, {
-      field: ownerState => {
-        var _defaultizedProps$slo;
-        return _extends({}, resolveComponentProps((_defaultizedProps$slo = defaultizedProps.slotProps) == null ? void 0 : _defaultizedProps$slo.field, ownerState), extractValidationProps(defaultizedProps), {
-          ref
-        });
-      },
+      field: ownerState => _extends({}, resolveComponentProps(defaultizedProps.slotProps?.field, ownerState), extractValidationProps(defaultizedProps), {
+        ref
+      }),
       toolbar: _extends({
         hidden: true,
         ampmInClock,
-        toolbarVariant: shouldUseNewRenderer ? 'desktop' : 'mobile'
-      }, (_defaultizedProps$slo2 = defaultizedProps.slotProps) == null ? void 0 : _defaultizedProps$slo2.toolbar),
+        toolbarVariant: 'desktop'
+      }, defaultizedProps.slotProps?.toolbar),
       tabs: _extends({
         hidden: true
-      }, (_defaultizedProps$slo3 = defaultizedProps.slotProps) == null ? void 0 : _defaultizedProps$slo3.tabs),
-      actionBar: _extends({
+      }, defaultizedProps.slotProps?.tabs),
+      actionBar: ownerState => _extends({
         actions: actionBarActions
-      }, (_defaultizedProps$slo4 = defaultizedProps.slotProps) == null ? void 0 : _defaultizedProps$slo4.actionBar)
+      }, resolveComponentProps(defaultizedProps.slotProps?.actionBar, ownerState))
     })
   });
   const {
@@ -101,8 +135,9 @@ const DesktopDateTimePicker = /*#__PURE__*/React.forwardRef(function DesktopDate
     props,
     valueManager: singleItemValueManager,
     valueType: 'date-time',
-    getOpenDialogAriaText: (_props$localeText$ope = (_props$localeText = props.localeText) == null ? void 0 : _props$localeText.openDatePickerDialogue) != null ? _props$localeText$ope : localeText.openDatePickerDialogue,
-    validator: validateDateTime
+    getOpenDialogAriaText: props.localeText?.openDatePickerDialogue ?? localeText.openDatePickerDialogue,
+    validator: validateDateTime,
+    rendererInterceptor
   });
   return renderPicker();
 });
@@ -361,7 +396,7 @@ DesktopDateTimePicker.propTypes = {
   /**
    * Disable specific date.
    *
-   * Warning: This function can be called multiple times (e.g. when rendering date calendar, checking if focus can be moved to a certain date, etc.). Expensive computations can impact performance.
+   * Warning: This function can be called multiple times (for example when rendering date calendar, checking if focus can be moved to a certain date, etc.). Expensive computations can impact performance.
    *
    * @template TDate
    * @param {TDate} day The date to test.

package/DesktopDateTimePicker/DesktopDateTimePickerLayout.d.ts

@@ -0,0 +1,12 @@
+import * as React from 'react';
+import { PickersLayoutProps } from '../PickersLayout';
+import { PickerValidDate } from '../models';
+import { DateOrTimeViewWithMeridiem } from '../internals';
+/**
+ * @ignore - internal component.
+ */
+declare function DesktopDateTimePickerLayout<TValue, TDate extends PickerValidDate, TView extends DateOrTimeViewWithMeridiem>(props: PickersLayoutProps<TValue, TDate, TView>): React.JSX.Element;
+declare namespace DesktopDateTimePickerLayout {
+    var propTypes: any;
+}
+export { DesktopDateTimePickerLayout };

package/DesktopDateTimePicker/DesktopDateTimePickerLayout.js

@@ -0,0 +1,101 @@
+import * as React from 'react';
+import PropTypes from 'prop-types';
+import clsx from 'clsx';
+import Divider from '@mui/material/Divider';
+import { PickersLayoutContentWrapper, PickersLayoutRoot, pickersLayoutClasses, usePickerLayout } from '../PickersLayout';
+import { jsx as _jsx } from "react/jsx-runtime";
+import { jsxs as _jsxs } from "react/jsx-runtime";
+/**
+ * @ignore - internal component.
+ */
+function DesktopDateTimePickerLayout(props) {
+  const {
+    toolbar,
+    tabs,
+    content,
+    actionBar,
+    shortcuts
+  } = usePickerLayout(props);
+  const {
+    sx,
+    className,
+    isLandscape,
+    ref
+  } = props;
+  const isActionBarVisible = actionBar && (actionBar.props.actions?.length ?? 0) > 0;
+  return /*#__PURE__*/_jsxs(PickersLayoutRoot, {
+    ref: ref,
+    className: clsx(className, pickersLayoutClasses.root),
+    sx: [{
+      [`& .${pickersLayoutClasses.tabs}`]: {
+        gridRow: 4,
+        gridColumn: '1 / 4'
+      },
+      [`& .${pickersLayoutClasses.actionBar}`]: {
+        gridRow: 5
+      }
+    }, ...(Array.isArray(sx) ? sx : [sx])],
+    ownerState: props,
+    children: [isLandscape ? shortcuts : toolbar, isLandscape ? toolbar : shortcuts, /*#__PURE__*/_jsxs(PickersLayoutContentWrapper, {
+      className: pickersLayoutClasses.contentWrapper,
+      sx: {
+        display: 'grid'
+      },
+      children: [content, tabs, isActionBarVisible && /*#__PURE__*/_jsx(Divider, {
+        sx: {
+          gridRow: 3,
+          gridColumn: '1 / 4'
+        }
+      })]
+    }), actionBar]
+  });
+}
+process.env.NODE_ENV !== "production" ? DesktopDateTimePickerLayout.propTypes = {
+  // ----------------------------- Warning --------------------------------
+  // | These PropTypes are generated from the TypeScript type definitions |
+  // | To update them edit the TypeScript types and run "yarn proptypes"  |
+  // ----------------------------------------------------------------------
+  children: PropTypes.node,
+  /**
+   * Override or extend the styles applied to the component.
+   */
+  classes: PropTypes.object,
+  className: PropTypes.string,
+  disabled: PropTypes.bool,
+  isLandscape: PropTypes.bool.isRequired,
+  isValid: PropTypes.func.isRequired,
+  onAccept: PropTypes.func.isRequired,
+  onCancel: PropTypes.func.isRequired,
+  onChange: PropTypes.func.isRequired,
+  onClear: PropTypes.func.isRequired,
+  onClose: PropTypes.func.isRequired,
+  onDismiss: PropTypes.func.isRequired,
+  onOpen: PropTypes.func.isRequired,
+  onSelectShortcut: PropTypes.func.isRequired,
+  onSetToday: PropTypes.func.isRequired,
+  onViewChange: PropTypes.func.isRequired,
+  /**
+   * Force rendering in particular orientation.
+   */
+  orientation: PropTypes.oneOf(['landscape', 'portrait']),
+  readOnly: PropTypes.bool,
+  /**
+   * The props used for each component slot.
+   * @default {}
+   */
+  slotProps: PropTypes.object,
+  /**
+   * Overridable component slots.
+   * @default {}
+   */
+  slots: PropTypes.object,
+  /**
+   * The system prop that allows defining system overrides as well as additional CSS styles.
+   */
+  sx: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.oneOfType([PropTypes.func, PropTypes.object, PropTypes.bool])), PropTypes.func, PropTypes.object]),
+  value: PropTypes.any,
+  view: PropTypes.oneOf(['day', 'hours', 'meridiem', 'minutes', 'month', 'seconds', 'year']),
+  views: PropTypes.arrayOf(PropTypes.oneOf(['day', 'hours', 'meridiem', 'minutes', 'month', 'seconds', 'year']).isRequired).isRequired,
+  wrapperVariant: PropTypes.oneOf(['desktop', 'mobile'])
+} : void 0;
+export { DesktopDateTimePickerLayout };

package/DesktopDateTimePicker/index.d.ts

@@ -1,2 +1,3 @@
 export { DesktopDateTimePicker } from './DesktopDateTimePicker';
+export { DesktopDateTimePickerLayout } from './DesktopDateTimePickerLayout';
 export type { DesktopDateTimePickerProps, DesktopDateTimePickerSlots, DesktopDateTimePickerSlotProps, } from './DesktopDateTimePicker.types';

package/DesktopDateTimePicker/index.js

@@ -1 +1,2 @@
-export { DesktopDateTimePicker } from './DesktopDateTimePicker';
+export { DesktopDateTimePicker } from './DesktopDateTimePicker';
+export { DesktopDateTimePickerLayout } from './DesktopDateTimePickerLayout';