@mui/x-date-pickers 8.0.0-beta.3 → 8.1.0

package/esm/internals/components/PickerProvider.d.ts

@@ -6,6 +6,7 @@ import { PickersInputLocaleText } from "../../locales/index.js";
 import { DateOrTimeViewWithMeridiem, PickerOrientation, PickerValidValue, PickerVariant } from "../models/index.js";
 import { PickerFieldPrivateContextValue } from "../hooks/useNullableFieldPrivateContext.js";
 import type { PickersShortcutsItemContext } from '../../PickersShortcuts';
+import type { PickersActionBarAction } from '../../PickersActionBar';
 export declare const PickerActionsContext: React.Context<PickerActionsContextValue<any, any, any> | null>;
 export declare const PickerPrivateContext: React.Context<PickerPrivateContextValue>;
 /**
@@ -281,4 +282,12 @@ export interface PickerPrivateContextValue {
    * It is always equal to null if the component you are accessing the context from is not wrapped with a Picker.
    */
   viewContainerRole: 'dialog' | 'tooltip' | null;
+  /**
+   * The actions to render in the action bar if the user doesn't provide any.
+   */
+  defaultActionBarActions: PickersActionBarAction[];
+  /**
+   * The function to call when the Popper is closing animation is finished.
+   */
+  onPopperExited: (() => void) | undefined;
 }

package/esm/internals/components/PickerProvider.js

@@ -22,7 +22,9 @@ export const PickerPrivateContext = /*#__PURE__*/React.createContext({
   hasUIView: true,
   getCurrentViewMode: () => 'UI',
   triggerElement: null,
-  viewContainerRole: null
+  viewContainerRole: null,
+  defaultActionBarActions: [],
+  onPopperExited: undefined
 });
 
 /**

package/esm/internals/components/PickersArrowSwitcher/PickersArrowSwitcher.js

@@ -17,15 +17,13 @@ import { usePickerPrivateContext } from "../../hooks/usePickerPrivateContext.js"
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 const PickersArrowSwitcherRoot = styled('div', {
   name: 'MuiPickersArrowSwitcher',
-  slot: 'Root',
-  overridesResolver: (props, styles) => styles.root
+  slot: 'Root'
 })({
   display: 'flex'
 });
 const PickersArrowSwitcherSpacer = styled('div', {
   name: 'MuiPickersArrowSwitcher',
-  slot: 'Spacer',
-  overridesResolver: (props, styles) => styles.spacer
+  slot: 'Spacer'
 })(({
   theme
 }) => ({
@@ -33,8 +31,7 @@ const PickersArrowSwitcherSpacer = styled('div', {
 }));
 const PickersArrowSwitcherButton = styled(IconButton, {
   name: 'MuiPickersArrowSwitcher',
-  slot: 'Button',
-  overridesResolver: (props, styles) => styles.button
+  slot: 'Button'
 })({
   variants: [{
     props: {

package/esm/internals/components/PickersToolbar.js

@@ -20,8 +20,7 @@ const useUtilityClasses = classes => {
 };
 const PickersToolbarRoot = styled('div', {
   name: 'MuiPickersToolbar',
-  slot: 'Root',
-  overridesResolver: (props, styles) => styles.root
+  slot: 'Root'
 })(({
   theme
 }) => ({
@@ -46,7 +45,6 @@ const PickersToolbarRoot = styled('div', {
 const PickersToolbarContent = styled('div', {
   name: 'MuiPickersToolbar',
   slot: 'Content',
-  overridesResolver: (props, styles) => styles.content,
   shouldForwardProp: prop => shouldForwardProp(prop) && prop !== 'landscapeDirection'
 })({
   display: 'flex',

package/esm/internals/components/PickersToolbarButton.js

@@ -17,8 +17,7 @@ const useUtilityClasses = classes => {
 };
 const PickersToolbarButtonRoot = styled(Button, {
   name: 'MuiPickersToolbarButton',
-  slot: 'Root',
-  overridesResolver: (_, styles) => styles.root
+  slot: 'Root'
 })({
   padding: 0,
   minWidth: 16,

package/esm/internals/components/PickersToolbarText.js

@@ -16,8 +16,7 @@ const useUtilityClasses = classes => {
 };
 const PickersToolbarTextRoot = styled(Typography, {
   name: 'MuiPickersToolbarText',
-  slot: 'Root',
-  overridesResolver: (_, styles) => [styles.root]
+  slot: 'Root'
 })(({
   theme
 }) => ({

package/esm/internals/hooks/useField/buildSectionsFromFormat.js

@@ -193,6 +193,7 @@ const buildSections = parameters => {
           startSeparator += char;
         } else {
           sections[sections.length - 1].endSeparator += char;
+          sections[sections.length - 1].isEndFormatSeparator = true;
         }
       }
       i += 1;

package/esm/internals/hooks/useField/useFieldRootProps.js

@@ -32,6 +32,7 @@ export function useFieldRootProps(parameters) {
       updateValueFromValueStr
     },
     internalPropsWithDefaults: {
+      disabled = false,
       readOnly = false
     }
   } = parameters;
@@ -44,7 +45,7 @@ export function useFieldRootProps(parameters) {
   });
   const containerClickTimeout = useTimeout();
   const handleClick = useEventCallback(event => {
-    if (!domGetters.isReady()) {
+    if (disabled || !domGetters.isReady()) {
       return;
     }
     setFocused(true);
@@ -112,7 +113,7 @@ export function useFieldRootProps(parameters) {
     updateValueFromValueStr(pastedValue);
   });
   const handleFocus = useEventCallback(() => {
-    if (focused || !domGetters.isReady()) {
+    if (focused || disabled || !domGetters.isReady()) {
       return;
     }
     const activeElement = getActiveElement(document);

package/esm/internals/hooks/useField/useFieldSectionContainerProps.d.ts

@@ -1,5 +1,6 @@
 import * as React from 'react';
 import { UseFieldStateReturnValue } from "./useFieldState.js";
+import { UseFieldInternalProps } from "./useField.types.js";
 /**
  * Generate the props to pass to the container element of each section of the field.
  * It is not used by the non-accessible DOM structure (with an <input /> element for editing).
@@ -10,6 +11,7 @@ import { UseFieldStateReturnValue } from "./useFieldState.js";
 export declare function useFieldSectionContainerProps(parameters: UseFieldSectionContainerPropsParameters): UseFieldSectionContainerPropsReturnValue;
 interface UseFieldSectionContainerPropsParameters {
   stateResponse: UseFieldStateReturnValue<any>;
+  internalPropsWithDefaults: UseFieldInternalProps<any, any, any>;
 }
 type UseFieldSectionContainerPropsReturnValue = (sectionIndex: number) => React.HTMLAttributes<HTMLSpanElement>;
 export {};

package/esm/internals/hooks/useField/useFieldSectionContainerProps.js

@@ -12,12 +12,15 @@ export function useFieldSectionContainerProps(parameters) {
     stateResponse: {
       // Methods to update the states
       setSelectedSections
+    },
+    internalPropsWithDefaults: {
+      disabled = false
     }
   } = parameters;
   const createHandleClick = useEventCallback(sectionIndex => event => {
     // The click event on the clear button would propagate to the input, trigger this handler and result in a wrong section selection.
     // We avoid this by checking if the call to this function is actually intended, or a side effect.
-    if (event.isDefaultPrevented()) {
+    if (disabled || event.isDefaultPrevented()) {
       return;
     }
     setSelectedSections(sectionIndex);

package/esm/internals/hooks/useField/useFieldSectionContentProps.d.ts

@@ -1,8 +1,8 @@
-import * as React from 'react';
 import { UseFieldStateReturnValue } from "./useFieldState.js";
 import { FieldSection, PickerManager } from "../../../models/index.js";
 import { UseFieldDOMGetters, UseFieldInternalProps } from "./useField.types.js";
 import { UseFieldCharacterEditingReturnValue } from "./useFieldCharacterEditing.js";
+import { PickersSectionElement } from "../../../PickersSectionList/index.js";
 /**
  * Generate the props to pass to the content element of each section of the field.
  * It is not used by the non-accessible DOM structure (with an <input /> element for editing).
@@ -19,5 +19,5 @@ interface UseFieldSectionContentPropsParameters {
   domGetters: UseFieldDOMGetters;
   focused: boolean;
 }
-type UseFieldSectionContentPropsReturnValue = (section: FieldSection, sectionIndex: number) => React.HTMLAttributes<HTMLSpanElement>;
+type UseFieldSectionContentPropsReturnValue = (section: FieldSection, sectionIndex: number) => PickersSectionElement['content'];
 export {};

package/esm/internals/hooks/useField/useFieldSectionContentProps.js

@@ -129,6 +129,9 @@ export function useFieldSectionContentProps(parameters) {
     event.dataTransfer.dropEffect = 'none';
   });
   const createFocusHandler = useEventCallback(sectionIndex => () => {
+    if (disabled) {
+      return;
+    }
     setSelectedSections(sectionIndex);
   });
   return React.useCallback((section, sectionIndex) => {
@@ -158,10 +161,10 @@ export function useFieldSectionContentProps(parameters) {
       contentEditable: !isContainerEditable && !disabled && !readOnly,
       role: 'spinbutton',
       id: `${id}-${section.type}`,
+      'data-range-position': section.dateName || undefined,
       spellCheck: isEditable ? false : undefined,
       autoCapitalize: isEditable ? 'off' : undefined,
       autoCorrect: isEditable ? 'off' : undefined,
-      [parseInt(React.version, 10) >= 17 ? 'enterKeyHint' : 'enterkeyhint']: isEditable ? 'next' : undefined,
       children: section.value || section.placeholder,
       inputMode: section.contentType === 'letter' ? 'text' : 'numeric'
     };

package/esm/internals/hooks/useField/useFieldV7TextField.js

@@ -83,7 +83,7 @@ export const useFieldV7TextField = parameters => {
   const openPickerAriaLabel = useOpenPickerButtonAriaLabel(value);
   const [focused, setFocused] = React.useState(false);
   function focusField(newSelectedSections = 0) {
-    if (!sectionListRef.current ||
+    if (disabled || !sectionListRef.current ||
     // if the field is already focused, we don't need to focus it again
     getActiveSectionIndex(sectionListRef) != null) {
       return;
@@ -106,7 +106,8 @@ export const useFieldV7TextField = parameters => {
     stateResponse
   });
   const createSectionContainerProps = useFieldSectionContainerProps({
-    stateResponse
+    stateResponse,
+    internalPropsWithDefaults
   });
   const createSectionContentProps = useFieldSectionContentProps({
     manager,
@@ -129,6 +130,11 @@ export const useFieldV7TextField = parameters => {
     rootProps.onFocus(event);
   });
   const handleRootClick = useEventCallback(event => {
+    // The click event on the clear or open button would propagate to the input, trigger this handler and result in an inadvertent section selection.
+    // We avoid this by checking if the call of `handleInputClick` is actually intended, or a propagated call, which should be skipped.
+    if (event.isDefaultPrevented()) {
+      return;
+    }
     onClick?.(event);
     rootProps.onClick(event);
   });
@@ -152,22 +158,26 @@ export const useFieldV7TextField = parameters => {
     }
   });
   const elements = React.useMemo(() => {
-    return state.sections.map((section, sectionIndex) => ({
-      container: createSectionContainerProps(sectionIndex),
-      content: createSectionContentProps(section, sectionIndex),
-      before: {
-        children: section.startSeparator
-      },
-      after: {
-        children: section.endSeparator
-      }
-    }));
+    return state.sections.map((section, sectionIndex) => {
+      const content = createSectionContentProps(section, sectionIndex);
+      return {
+        container: createSectionContainerProps(sectionIndex),
+        content: createSectionContentProps(section, sectionIndex),
+        before: {
+          children: section.startSeparator
+        },
+        after: {
+          children: section.endSeparator,
+          'data-range-position': section.isEndFormatSeparator ? content['data-range-position'] : undefined
+        }
+      };
+    });
   }, [state.sections, createSectionContainerProps, createSectionContentProps]);
   React.useEffect(() => {
     if (sectionListRef.current == null) {
-      throw new Error(['MUI X: The `sectionListRef` prop has not been initialized by `PickersSectionList`', 'You probably tried to pass a component to the `textField` slot that contains an `<input />` element instead of a `PickersSectionList`.', '', 'If you want to keep using an `<input />` HTML element for the editing, please remove the `enableAccessibleFieldDOMStructure` prop from your Picker or Field component:', '', '<DatePicker slots={{ textField: MyCustomTextField }} />', '', 'Learn more about the field accessible DOM structure on the MUI documentation: https://mui.com/x/react-date-pickers/fields/#fields-to-edit-a-single-element'].join('\n'));
+      throw new Error(['MUI X: The `sectionListRef` prop has not been initialized by `PickersSectionList`', 'You probably tried to pass a component to the `textField` slot that contains an `<input />` element instead of a `PickersSectionList`.', '', 'If you want to keep using an `<input />` HTML element for the editing, please add the `enableAccessibleFieldDOMStructure={false}` prop to your Picker or Field component:', '', '<DatePicker enableAccessibleFieldDOMStructure={false} slots={{ textField: MyCustomTextField }} />', '', 'Learn more about the field accessible DOM structure on the MUI documentation: https://mui.com/x/react-date-pickers/fields/#fields-to-edit-a-single-element'].join('\n'));
     }
-    if (autoFocus && sectionListRef.current) {
+    if (autoFocus && !disabled && sectionListRef.current) {
       sectionListRef.current.getSectionContent(sectionOrder.startIndex).focus();
     }
   }, []); // eslint-disable-line react-hooks/exhaustive-deps
@@ -196,7 +206,7 @@ export const useFieldV7TextField = parameters => {
     getSections: () => state.sections,
     getActiveSectionIndex: () => getActiveSectionIndex(sectionListRef),
     setSelectedSections: newSelectedSections => {
-      if (!sectionListRef.current) {
+      if (disabled || !sectionListRef.current) {
         return;
       }
       const newParsedSelectedSections = parseSelectedSections(newSelectedSections, state.sections);

package/esm/internals/hooks/usePicker/hooks/useValueAndOpenStates.js

@@ -93,8 +93,8 @@ export function useValueAndOpenStates(parameters) {
     if (newOpen && onOpen) {
       onOpen();
     }
-    if (!newOpen && onClose) {
-      onClose();
+    if (!newOpen) {
+      onClose?.();
     }
   });
   const setValue = useEventCallback((newValue, options) => {
@@ -160,6 +160,7 @@ export function useValueAndOpenStates(parameters) {
         clockShallowValue: newValue,
         hasBeenModifiedSinceMount: true
       }));
+      return;
     }
     setValue(newValue, {
       changeImportance: selectionState === 'finish' && closeOnSelect ? 'accept' : 'set'

package/esm/internals/hooks/usePicker/usePicker.d.ts

@@ -7,6 +7,7 @@ export declare const usePicker: <TValue extends PickerValidValue, TView extends
   valueType,
   variant,
   validator,
+  onPopperExited,
   autoFocusView,
   rendererInterceptor: RendererInterceptor,
   localeText,

package/esm/internals/hooks/usePicker/usePicker.js

@@ -20,6 +20,7 @@ export const usePicker = ({
   valueType,
   variant,
   validator,
+  onPopperExited,
   autoFocusView,
   rendererInterceptor: RendererInterceptor,
   localeText,
@@ -36,6 +37,7 @@ export const usePicker = ({
     reduceAnimations: reduceAnimationsProp,
     orientation: orientationProp,
     disableOpenPicker,
+    closeOnSelect,
     // Form props
     disabled,
     readOnly,
@@ -95,14 +97,18 @@ export const usePicker = ({
     defaultView,
     focusedView,
     setFocusedView,
-    setValueAndGoToNextView
+    setValueAndGoToNextView,
+    goToNextStep,
+    hasNextStep,
+    hasSeveralSteps
   } = useViews({
     view: viewProp,
     views,
     openTo,
     onChange: setValueFromView,
     onViewChange,
-    autoFocus: autoFocusView
+    autoFocus: autoFocusView,
+    getStepNavigation
   });
   const clearValue = useEventCallback(() => setValue(valueManager.emptyValue));
   const setValueToToday = useEventCallback(() => setValue(valueManager.getTodayValue(utils, timezone, valueType)));
@@ -191,13 +197,13 @@ export const usePicker = ({
     }
     return 'enabled';
   }, [disableOpenPicker, hasUIView, disabled, readOnly]);
-  const stepNavigation = getStepNavigation({
-    setView,
-    view,
-    initialView: initialView ?? views[0],
-    views
-  });
-  const wrappedGoToNextStep = useEventCallback(stepNavigation.goToNextStep);
+  const wrappedGoToNextStep = useEventCallback(goToNextStep);
+  const defaultActionBarActions = React.useMemo(() => {
+    if (closeOnSelect && !hasSeveralSteps) {
+      return [];
+    }
+    return ['cancel', 'nextOrAccept'];
+  }, [closeOnSelect, hasSeveralSteps]);
   const actionsContextValue = React.useMemo(() => ({
     setValue,
     setOpen,
@@ -224,14 +230,14 @@ export const usePicker = ({
     reduceAnimations,
     triggerRef,
     triggerStatus,
-    hasNextStep: stepNavigation.hasNextStep,
+    hasNextStep,
     fieldFormat: format ?? '',
     name,
     label,
     rootSx: sx,
     rootRef,
     rootClassName: className
-  }), [actionsContextValue, value, rootRef, variant, orientation, reduceAnimations, disabled, readOnly, format, className, name, label, sx, triggerStatus, stepNavigation.hasNextStep, timezone, state.open, popperView, views, initialView, autoFocus]);
+  }), [actionsContextValue, value, rootRef, variant, orientation, reduceAnimations, disabled, readOnly, format, className, name, label, sx, triggerStatus, hasNextStep, timezone, state.open, popperView, views, initialView, autoFocus]);
   const privateContextValue = React.useMemo(() => ({
     dismissViews,
     ownerState,
@@ -240,8 +246,10 @@ export const usePicker = ({
     rootRefObject,
     labelId,
     triggerElement,
-    viewContainerRole
-  }), [dismissViews, ownerState, hasUIView, getCurrentViewMode, labelId, triggerElement, viewContainerRole]);
+    viewContainerRole,
+    defaultActionBarActions,
+    onPopperExited
+  }), [dismissViews, ownerState, hasUIView, getCurrentViewMode, labelId, triggerElement, viewContainerRole, defaultActionBarActions, onPopperExited]);
   const fieldPrivateContextValue = React.useMemo(() => ({
     formatDensity,
     enableAccessibleFieldDOMStructure,

package/esm/internals/hooks/usePicker/usePicker.types.d.ts

@@ -12,7 +12,7 @@ import { CreateStepNavigationReturnValue } from "../../utils/createStepNavigatio
  * Props common to all Picker headless implementations.
  * Those props are exposed on all the Pickers.
  */
-export interface UsePickerBaseProps<TValue extends PickerValidValue, TView extends DateOrTimeViewWithMeridiem, TError, TExternalProps extends UsePickerProps<TValue, TView, TError, any>> extends OnErrorProps<TValue, TError>, Omit<UseViewsOptions<any, TView>, 'onChange' | 'onFocusedViewChange' | 'focusedView'>, TimezoneProps, FormProps {
+export interface UsePickerBaseProps<TValue extends PickerValidValue, TView extends DateOrTimeViewWithMeridiem, TError, TExternalProps extends UsePickerProps<TValue, TView, TError, any>> extends OnErrorProps<TValue, TError>, Omit<UseViewsOptions<any, TView>, 'onChange' | 'onFocusedViewChange' | 'focusedView' | 'getStepNavigation'>, TimezoneProps, FormProps {
   /**
    * The selected value.
    * Used when the component is controlled.
@@ -90,7 +90,7 @@ export interface UsePickerNonStaticProps extends Omit<PickerFieldPrivateContextV
   format?: string;
   /**
    * If `true`, the button to open the Picker will not be rendered (it will only render the field).
-   * @deprecated Use the [field component](https://next.mui.com/x/react-date-pickers/fields/) instead.
+   * @deprecated Use the [field component](https://mui.com/x/react-date-pickers/fields/) instead.
    * @default false
    */
   disableOpenPicker?: boolean;
@@ -132,6 +132,7 @@ export interface UsePickerParameters<TValue extends PickerValidValue, TView exte
   rendererInterceptor?: React.JSXElementConstructor<PickerRendererInterceptorProps<TValue, TView, TExternalProps>>;
   props: TExternalProps;
   getStepNavigation: CreateStepNavigationReturnValue;
+  onPopperExited?: () => void;
 }
 export interface UsePickerReturnValue<TValue extends PickerValidValue> {
   ownerState: PickerOwnerState;

package/esm/internals/hooks/useViews.d.ts

@@ -2,6 +2,7 @@ import { MakeOptional } from '@mui/x-internals/types';
 import type { PickerSelectionState } from './usePicker';
 import { DateOrTimeViewWithMeridiem, PickerValidValue } from "../models/index.js";
 import { PickerValidDate } from "../../models/index.js";
+import { CreateStepNavigationReturnValue } from "../utils/createStepNavigation.js";
 export type PickerOnChangeFn = (date: PickerValidDate | null, selectionState?: PickerSelectionState) => void;
 export interface UseViewsOptions<TValue extends PickerValidValue, TView extends DateOrTimeViewWithMeridiem> {
   /**
@@ -53,8 +54,9 @@ export interface UseViewsOptions<TValue extends PickerValidValue, TView extends
    * @param {boolean} hasFocus `true` if the view should be focused.
    */
   onFocusedViewChange?: (view: TView, hasFocus: boolean) => void;
+  getStepNavigation?: CreateStepNavigationReturnValue;
 }
-export interface ExportedUseViewsOptions<TValue extends PickerValidValue, TView extends DateOrTimeViewWithMeridiem> extends MakeOptional<UseViewsOptions<TValue, TView>, 'onChange' | 'openTo' | 'views'> {}
+export interface ExportedUseViewsOptions<TValue extends PickerValidValue, TView extends DateOrTimeViewWithMeridiem> extends Omit<MakeOptional<UseViewsOptions<TValue, TView>, 'onChange' | 'openTo' | 'views'>, 'getStepNavigation'> {}
 interface UseViewsResponse<TValue extends PickerValidValue, TView extends DateOrTimeViewWithMeridiem> {
   view: TView;
   setView: (view: TView) => void;
@@ -65,6 +67,9 @@ interface UseViewsResponse<TValue extends PickerValidValue, TView extends DateOr
   defaultView: TView;
   goToNextView: () => void;
   setValueAndGoToNextView: (value: TValue, currentViewSelectionState?: PickerSelectionState, selectedView?: TView) => void;
+  hasNextStep: boolean;
+  hasSeveralSteps: boolean;
+  goToNextStep: () => void;
 }
 export declare function useViews<TValue extends PickerValidValue, TView extends DateOrTimeViewWithMeridiem>({
   onChange,
@@ -74,6 +79,7 @@ export declare function useViews<TValue extends PickerValidValue, TView extends
   views,
   autoFocus,
   focusedView: inFocusedView,
-  onFocusedViewChange
+  onFocusedViewChange,
+  getStepNavigation
 }: UseViewsOptions<TValue, TView>): UseViewsResponse<TValue, TView>;
 export {};

package/esm/internals/hooks/useViews.js

@@ -1,6 +1,8 @@
+import _extends from "@babel/runtime/helpers/esm/extends";
 import * as React from 'react';
 import useEventCallback from '@mui/utils/useEventCallback';
 import useControlled from '@mui/utils/useControlled';
+import { DEFAULT_STEP_NAVIGATION } from "../utils/createStepNavigation.js";
 let warnedOnceNotValidView = false;
 export function useViews({
   onChange,
@@ -10,7 +12,8 @@ export function useViews({
   views,
   autoFocus,
   focusedView: inFocusedView,
-  onFocusedViewChange
+  onFocusedViewChange,
+  getStepNavigation
 }) {
   if (process.env.NODE_ENV !== 'production') {
     if (!warnedOnceNotValidView) {
@@ -40,6 +43,12 @@ export function useViews({
     controlled: inFocusedView,
     default: defaultFocusedView.current
   });
+  const stepNavigation = getStepNavigation ? getStepNavigation({
+    setView,
+    view,
+    defaultView: defaultView.current,
+    views
+  }) : DEFAULT_STEP_NAVIGATION;
   React.useEffect(() => {
     // Update the current view when `openTo` or `views` props change
     if (previousOpenTo.current && previousOpenTo.current !== openTo || previousViews.current && previousViews.current.some(previousView => !views.includes(previousView))) {
@@ -86,19 +95,25 @@ export function useViews({
     views.indexOf(selectedView) < views.length - 1 : Boolean(nextView);
     const globalSelectionState = isSelectionFinishedOnCurrentView && hasMoreViews ? 'partial' : currentViewSelectionState;
     onChange(value, globalSelectionState, selectedView);
-    // Detects if the selected view is not the active one.
-    // Can happen if multiple views are displayed, like in `DesktopDateTimePicker` or `MultiSectionDigitalClock`.
-    if (selectedView && selectedView !== view) {
-      const nextViewAfterSelected = views[views.indexOf(selectedView) + 1];
-      if (nextViewAfterSelected) {
-        // move to next view after the selected one
-        handleChangeView(nextViewAfterSelected);
-      }
+
+    // The selected view can be different from the active view,
+    // This can happen if multiple views are displayed, like in `DesktopDateTimePicker` or `MultiSectionDigitalClock`.
+    let currentView = null;
+    if (selectedView != null && selectedView !== view) {
+      currentView = selectedView;
     } else if (isSelectionFinishedOnCurrentView) {
-      goToNextView();
+      currentView = view;
+    }
+    if (currentView == null) {
+      return;
     }
+    const viewToNavigateTo = views[views.indexOf(currentView) + 1];
+    if (viewToNavigateTo == null || !stepNavigation.areViewsInSameStep(currentView, viewToNavigateTo)) {
+      return;
+    }
+    handleChangeView(viewToNavigateTo);
   });
-  return {
+  return _extends({}, stepNavigation, {
     view,
     setView: handleChangeView,
     focusedView,
@@ -109,5 +124,5 @@ export function useViews({
     defaultView: views.includes(openTo) ? openTo : views[0],
     goToNextView,
     setValueAndGoToNextView
-  };
+  });
 }

package/esm/internals/utils/createNonRangePickerStepNavigation.js

@@ -5,17 +5,17 @@ export function createNonRangePickerStepNavigation(parameters) {
   } = parameters;
   return createStepNavigation({
     steps,
-    isCurrentViewMatchingStep: (view, step) => {
+    isViewMatchingStep: (view, step) => {
       return step.views == null || step.views.includes(view);
     },
     onStepChange: ({
       step,
-      initialView,
+      defaultView,
       setView,
       view,
       views
     }) => {
-      const targetView = step.views == null ? initialView : step.views.find(viewBis => views.includes(viewBis));
+      const targetView = step.views == null ? defaultView : step.views.find(viewBis => views.includes(viewBis));
       if (targetView !== view) {
         setView(targetView);
       }

package/esm/internals/utils/createStepNavigation.d.ts

@@ -1,4 +1,10 @@
 import { DateOrTimeViewWithMeridiem } from "../models/index.js";
+export declare const DEFAULT_STEP_NAVIGATION: {
+  hasNextStep: boolean;
+  hasSeveralSteps: boolean;
+  goToNextStep: () => void;
+  areViewsInSameStep: () => boolean;
+};
 /**
  * Create an object that determines whether there is a next step and allows to go to the next step.
  * @param {CreateStepNavigationParameters<TStep>} parameters The parameters of the createStepNavigation function
@@ -7,7 +13,7 @@ import { DateOrTimeViewWithMeridiem } from "../models/index.js";
 export declare function createStepNavigation<TStep extends {}>(parameters: CreateStepNavigationParameters<TStep>): CreateStepNavigationReturnValue;
 interface CreateStepNavigationParameters<TStep extends {}> {
   steps: TStep[] | null;
-  isCurrentViewMatchingStep: (view: DateOrTimeViewWithMeridiem, step: TStep) => boolean;
+  isViewMatchingStep: (view: DateOrTimeViewWithMeridiem, step: TStep) => boolean;
   onStepChange: (parameters: UseRangePickerStepNavigationOnStepChangeParameters<TStep>) => void;
 }
 export type CreateStepNavigationReturnValue = (parameters: CreateStepNavigationReturnValueParameters) => {
@@ -15,13 +21,24 @@ export type CreateStepNavigationReturnValue = (parameters: CreateStepNavigationR
    * Whether there is a next step.
    */
   hasNextStep: boolean;
+  /**
+   * Whether there are several steps.
+   */
+  hasSeveralSteps: boolean;
   /**
    * Go to the next step if any.
    */
   goToNextStep: () => void;
+  /**
+   * Whether the two views are in the same step.
+   * @param {DateOrTimeViewWithMeridiem} viewA The first view to compare.
+   * @param {DateOrTimeViewWithMeridiem} viewB The second view to compare.
+   * @returns {boolean} Whether the two views are in the same step.
+   */
+  areViewsInSameStep: (viewA: DateOrTimeViewWithMeridiem, viewB: DateOrTimeViewWithMeridiem) => boolean;
 };
 export interface CreateStepNavigationReturnValueParameters {
-  initialView: DateOrTimeViewWithMeridiem;
+  defaultView: DateOrTimeViewWithMeridiem;
   view: DateOrTimeViewWithMeridiem;
   views: readonly DateOrTimeViewWithMeridiem[];
   setView: (view: any) => void;