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

package/modern/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:
  *
@@ -33,32 +78,24 @@ 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.ampmInClock ?? true;
-  // add "accept" action only when the new date time view renderers are used
-  const actionBarActions = shouldUseNewRenderer ? ['accept'] : [];
+  // 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, {
@@ -72,6 +109,7 @@ const DesktopDateTimePicker = /*#__PURE__*/React.forwardRef(function DesktopDate
     shouldRenderTimeInASingleColumn,
     slots: _extends({
       field: DateTimeField,
+      layout: DesktopDateTimePickerLayout,
       openPickerIcon: CalendarIcon
     }, defaultizedProps.slots),
     slotProps: _extends({}, defaultizedProps.slotProps, {
@@ -81,14 +119,14 @@ const DesktopDateTimePicker = /*#__PURE__*/React.forwardRef(function DesktopDate
       toolbar: _extends({
         hidden: true,
         ampmInClock,
-        toolbarVariant: shouldUseNewRenderer ? 'desktop' : 'mobile'
+        toolbarVariant: 'desktop'
       }, defaultizedProps.slotProps?.toolbar),
       tabs: _extends({
         hidden: true
       }, defaultizedProps.slotProps?.tabs),
-      actionBar: _extends({
+      actionBar: ownerState => _extends({
         actions: actionBarActions
-      }, defaultizedProps.slotProps?.actionBar)
+      }, resolveComponentProps(defaultizedProps.slotProps?.actionBar, ownerState))
     })
   });
   const {
@@ -98,7 +136,8 @@ const DesktopDateTimePicker = /*#__PURE__*/React.forwardRef(function DesktopDate
     valueManager: singleItemValueManager,
     valueType: 'date-time',
     getOpenDialogAriaText: props.localeText?.openDatePickerDialogue ?? localeText.openDatePickerDialogue,
-    validator: validateDateTime
+    validator: validateDateTime,
+    rendererInterceptor
   });
   return renderPicker();
 });
@@ -357,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/modern/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/modern/DesktopDateTimePicker/index.js

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

package/modern/MobileDatePicker/MobileDatePicker.js

@@ -278,7 +278,7 @@ MobileDatePicker.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/modern/MobileDateTimePicker/MobileDateTimePicker.js

@@ -326,7 +326,7 @@ MobileDateTimePicker.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/modern/StaticDatePicker/StaticDatePicker.js

@@ -208,7 +208,7 @@ StaticDatePicker.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/modern/StaticDateTimePicker/StaticDateTimePicker.js

@@ -256,7 +256,7 @@ StaticDateTimePicker.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/modern/index.js

@@ -1,5 +1,5 @@
 /**
- * @mui/x-date-pickers v7.0.0-beta.6
+ * @mui/x-date-pickers v7.0.0
  *
  * @license MIT
  * This source code is licensed under the MIT license found in the

package/modern/internals/components/PickersPopper.js

@@ -146,7 +146,7 @@ function useClickAwayListener(active, onClickAway) {
     // TODO This behavior is not tested automatically
     // It's unclear whether this is due to different update semantics in test (batched in act() vs discrete on click).
     // Or if this is a timing related issues due to different Transition components
-    // Once we get rid of all the manual scheduling (e.g. setTimeout(update, 0)) we can revisit this code+test.
+    // Once we get rid of all the manual scheduling (for example setTimeout(update, 0)) we can revisit this code+test.
     if (active) {
       const doc = ownerDocument(nodeRef.current);
       doc.addEventListener('click', handleClickAway);

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

@@ -152,49 +152,53 @@ const buildSections = params => {
   const sections = [];
   let startSeparator = '';
 
-  // This RegExp test if the beginning of a string corresponds to a supported token
-  const isTokenStartRegExp = new RegExp(`^(${Object.keys(utils.formatTokenMap).sort((a, b) => b.length - a.length) // Sort to put longest word first
-  .join('|')})`, 'g') // used to get access to lastIndex state
-  ;
-  let currentTokenValue = '';
-  for (let i = 0; i < expandedFormat.length; i += 1) {
-    const escapedPartOfCurrentChar = escapedParts.find(escapeIndex => escapeIndex.start <= i && escapeIndex.end >= i);
-    const char = expandedFormat[i];
+  // This RegExp tests if the beginning of a string corresponds to a supported token
+  const validTokens = Object.keys(utils.formatTokenMap).sort((a, b) => b.length - a.length); // Sort to put longest word first
+
+  const regExpFirstWordInFormat = /^([a-zA-Z]+)/;
+  const regExpWordOnlyComposedOfTokens = new RegExp(`^(${validTokens.join('|')})*$`);
+  const regExpFirstTokenInWord = new RegExp(`^(${validTokens.join('|')})`);
+  const getEscapedPartOfCurrentChar = i => escapedParts.find(escapeIndex => escapeIndex.start <= i && escapeIndex.end >= i);
+  let i = 0;
+  while (i < expandedFormat.length) {
+    const escapedPartOfCurrentChar = getEscapedPartOfCurrentChar(i);
     const isEscapedChar = escapedPartOfCurrentChar != null;
-    const potentialToken = `${currentTokenValue}${expandedFormat.slice(i)}`;
-    const regExpMatch = isTokenStartRegExp.test(potentialToken);
-    if (!isEscapedChar && char.match(/([A-Za-z]+)/) && regExpMatch) {
-      currentTokenValue = potentialToken.slice(0, isTokenStartRegExp.lastIndex);
-      i += isTokenStartRegExp.lastIndex - 1;
-    } else {
+    const firstWordInFormat = regExpFirstWordInFormat.exec(expandedFormat.slice(i))?.[1];
+
+    // The first word in the format is only composed of tokens.
+    // We extract those tokens to create a new sections.
+    if (!isEscapedChar && firstWordInFormat != null && regExpWordOnlyComposedOfTokens.test(firstWordInFormat)) {
+      let word = firstWordInFormat;
+      while (word.length > 0) {
+        const firstWord = regExpFirstTokenInWord.exec(word)[1];
+        word = word.slice(firstWord.length);
+        sections.push(createSection(_extends({}, params, {
+          now,
+          token: firstWord,
+          startSeparator
+        })));
+        startSeparator = '';
+      }
+      i += firstWordInFormat.length;
+    }
+    // The remaining format does not start with a token,
+    // We take the first character and add it to the current section's end separator.
+    else {
+      const char = expandedFormat[i];
+
       // If we are on the opening or closing character of an escaped part of the format,
       // Then we ignore this character.
       const isEscapeBoundary = isEscapedChar && escapedPartOfCurrentChar?.start === i || escapedPartOfCurrentChar?.end === i;
       if (!isEscapeBoundary) {
-        if (currentTokenValue !== '') {
-          sections.push(createSection(_extends({}, params, {
-            now,
-            token: currentTokenValue,
-            startSeparator
-          })));
-          currentTokenValue = '';
-        }
         if (sections.length === 0) {
           startSeparator += char;
         } else {
-          startSeparator = '';
           sections[sections.length - 1].endSeparator += char;
         }
       }
+      i += 1;
     }
   }
-  if (currentTokenValue !== '') {
-    sections.push(createSection(_extends({}, params, {
-      now,
-      token: currentTokenValue,
-      startSeparator
-    })));
-  }
   if (sections.length === 0 && startSeparator.length > 0) {
     sections.push({
       type: 'empty',

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

@@ -327,7 +327,7 @@ export const useFieldV7TextField = params => {
           onClick: getInputContainerClickHandler(index)
         },
         content: {
-          tabIndex: isContainerEditable ? undefined : 0,
+          tabIndex: isContainerEditable || index > 0 ? -1 : 0,
           contentEditable: !isContainerEditable && !disabled && !readOnly,
           role: 'spinbutton',
           id: `${id}-${section.type}`,
@@ -366,7 +366,7 @@ export const useFieldV7TextField = params => {
   const valueStr = React.useMemo(() => areAllSectionsEmpty ? '' : fieldValueManager.getV7HiddenInputValueFromSections(state.sections), [areAllSectionsEmpty, state.sections, fieldValueManager]);
   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://next.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 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'));
     }
     if (autoFocus && sectionListRef.current) {
       sectionListRef.current.getSectionContent(sectionOrder.startIndex).focus();
@@ -390,7 +390,7 @@ export const useFieldV7TextField = params => {
       enableAccessibleFieldDOMStructure: true,
       elements,
       // TODO v7: Try to set to undefined when there is a section selected.
-      tabIndex: 0,
+      tabIndex: parsedSelectedSections === 0 ? -1 : 0,
       contentEditable: isContainerEditable,
       value: valueStr,
       onChange: handleValueStrChange,

package/modern/internals/hooks/useOpenState.js

@@ -8,7 +8,7 @@ export const useOpenState = ({
   const [openState, setIsOpenState] = React.useState(false);
 
   // It is required to update inner state in useEffect in order to avoid situation when
-  // Our component is not mounted yet, but `open` state is set to `true` (e.g. initially opened)
+  // Our component is not mounted yet, but `open` state is set to `true` (for example initially opened)
   React.useEffect(() => {
     if (isControllingOpenProp) {
       if (typeof open !== 'boolean') {

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

@@ -1,4 +1,11 @@
 import { areViewsEqual } from './views';
+export const mergeDateAndTime = (utils, dateParam, timeParam) => {
+  let mergedDate = dateParam;
+  mergedDate = utils.setHours(mergedDate, utils.getHours(timeParam));
+  mergedDate = utils.setMinutes(mergedDate, utils.getMinutes(timeParam));
+  mergedDate = utils.setSeconds(mergedDate, utils.getSeconds(timeParam));
+  return mergedDate;
+};
 export const findClosestEnabledDate = ({
   date,
   disableFuture,
@@ -9,7 +16,7 @@ export const findClosestEnabledDate = ({
   utils,
   timezone
 }) => {
-  const today = utils.startOfDay(utils.date(undefined, timezone));
+  const today = mergeDateAndTime(utils, utils.date(undefined, timezone), date);
   if (disablePast && utils.isBefore(minDate, today)) {
     minDate = today;
   }
@@ -72,13 +79,6 @@ export const getMonthsInYear = (utils, year) => {
   }
   return months;
 };
-export const mergeDateAndTime = (utils, dateParam, timeParam) => {
-  let mergedDate = dateParam;
-  mergedDate = utils.setHours(mergedDate, utils.getHours(timeParam));
-  mergedDate = utils.setMinutes(mergedDate, utils.getMinutes(timeParam));
-  mergedDate = utils.setSeconds(mergedDate, utils.getSeconds(timeParam));
-  return mergedDate;
-};
 export const getTodayDate = (utils, timezone, valueType) => valueType === 'date' ? utils.startOfDay(utils.date(undefined, timezone)) : utils.date(undefined, timezone);
 export const formatMeridiem = (utils, meridiem) => {
   const date = utils.setHours(utils.date(), meridiem === 'am' ? 2 : 14);

package/modern/internals/utils/fields.js

@@ -1,6 +1,6 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
 import { DATE_TIME_VALIDATION_PROP_NAMES, DATE_VALIDATION_PROP_NAMES, TIME_VALIDATION_PROP_NAMES } from './validation/extractValidationProps';
-const SHARED_FIELD_INTERNAL_PROP_NAMES = ['value', 'defaultValue', 'referenceDate', 'format', 'formatDensity', 'onChange', 'timezone', 'onError', 'shouldRespectLeadingZeros', 'selectedSections', 'onSelectedSectionsChange', 'unstableFieldRef', 'enableAccessibleFieldDOMStructure', 'disabled', 'readOnly'];
+const SHARED_FIELD_INTERNAL_PROP_NAMES = ['value', 'defaultValue', 'referenceDate', 'format', 'formatDensity', 'onChange', 'timezone', 'onError', 'shouldRespectLeadingZeros', 'selectedSections', 'onSelectedSectionsChange', 'unstableFieldRef', 'enableAccessibleFieldDOMStructure', 'disabled', 'readOnly', 'dateSeparator'];
 export const splitFieldInternalAndForwardedProps = (props, valueType) => {
   const forwardedProps = _extends({}, props);
   const internalProps = {};

package/modern/locales/jaJP.js

@@ -17,11 +17,10 @@ const jaJPPickers = {
   // DateRange labels
   start: '開始',
   end: '終了',
-  // startDate: 'Start date',
-  // startTime: 'Start time',
-  // endDate: 'End date',
-  // endTime: 'End time',
-
+  startDate: '開始日',
+  startTime: '開始時間',
+  endDate: '終了日',
+  endTime: '終了時間',
   // Action bar
   cancelButtonLabel: 'キャンセル',
   clearButtonLabel: 'クリア',
@@ -47,8 +46,7 @@ const jaJPPickers = {
   // Open picker labels
   openDatePickerDialogue: (value, utils) => value !== null && utils.isValid(value) ? `日付を選択してください。選択した日付は ${utils.format(value, 'fullDate')} です` : '日付を選択してください',
   openTimePickerDialogue: (value, utils) => value !== null && utils.isValid(value) ? `時間を選択してください。選択した時間は ${utils.format(value, 'fullTime')} です` : '時間を選択してください',
-  // fieldClearLabel: 'Clear value',
-
+  fieldClearLabel: 'クリア',
   // Table labels
   timeTableLabel: '時間を選択',
   dateTableLabel: '日付を選択',
@@ -60,19 +58,17 @@ const jaJPPickers = {
   fieldHoursPlaceholder: () => 'hh',
   fieldMinutesPlaceholder: () => 'mm',
   fieldSecondsPlaceholder: () => 'ss',
-  fieldMeridiemPlaceholder: () => 'aa'
-
+  fieldMeridiemPlaceholder: () => 'aa',
   // View names
-  // year: 'Year',
-  // month: 'Month',
-  // day: 'Day',
-  // weekDay: 'Week day',
-  // hours: 'Hours',
-  // minutes: 'Minutes',
-  // seconds: 'Seconds',
-  // meridiem: 'Meridiem',
-
+  year: '年',
+  month: '月',
+  day: '日',
+  weekDay: '平日',
+  hours: '時間',
+  minutes: '分',
+  seconds: '秒',
+  meridiem: 'メリディム',
   // Common
-  // empty: 'Empty',
+  empty: '空'
 };
 export const jaJP = getPickersLocalization(jaJPPickers);

package/node/AdapterLuxon/AdapterLuxon.js

@@ -248,6 +248,10 @@ class AdapterLuxon {
       // Extract escaped section to avoid extending them
       const catchEscapedSectionsRegexp = /''|'(''|[^'])+('|$)|[^']*/g;
 
+      // This RegExp tests if a string is only mad of supported tokens
+      const validTokens = [...Object.keys(this.formatTokenMap), 'yyyyy'];
+      const isWordComposedOfTokens = new RegExp(`^(${validTokens.join('|')})+$`);
+
       // Extract words to test if they are a token or a word to escape.
       const catchWordsRegexp = /(?:^|[^a-z])([a-z]+)(?:[^a-z]|$)|([a-z]+)/gi;
       return format.match(catchEscapedSectionsRegexp).map(token => {
@@ -258,12 +262,13 @@ class AdapterLuxon {
         const expandedToken = _luxon.DateTime.expandFormat(token, {
           locale: this.locale
         });
-        return expandedToken.replace(catchWordsRegexp, (correspondance, g1, g2) => {
+        return expandedToken.replace(catchWordsRegexp, (substring, g1, g2) => {
           const word = g1 || g2; // words are either in group 1 or group 2
-          if (word === 'yyyyy' || formatTokenMap[word] !== undefined) {
-            return correspondance;
+
+          if (isWordComposedOfTokens.test(word)) {
+            return substring;
           }
-          return `'${correspondance}'`;
+          return `'${substring}'`;
         });
       }).join('')
       // The returned format can contain `yyyyy` which means year between 4 and 6 digits.

package/node/DateCalendar/DateCalendar.js

@@ -495,7 +495,7 @@ process.env.NODE_ENV !== "production" ? DateCalendar.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/node/DateCalendar/DayCalendar.js

@@ -361,10 +361,11 @@ function DayCalendar(inProps) {
     }
   });
   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/node/DateField/DateField.js

@@ -250,7 +250,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/node/DatePicker/DatePicker.js

@@ -275,7 +275,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/node/DateTimeField/DateTimeField.js

@@ -283,7 +283,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/node/DateTimePicker/DateTimePicker.js

@@ -313,7 +313,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.