@mui/x-date-pickers 7.4.0 → 7.5.0

package/modern/AdapterDateFnsJalaliV3/AdapterDateFnsJalaliV3.js

@@ -48,171 +48,7 @@ import { faIR as defaultLocale } from 'date-fns-jalali/locale/fa-IR';
 // date-fns-jalali v2 does not export types
 // @ts-ignore TODO remove when date-fns-jalali-v3 is the default
 
-const formatTokenMap = {
-  // Year
-  y: {
-    sectionType: 'year',
-    contentType: 'digit',
-    maxLength: 4
-  },
-  yy: 'year',
-  yyy: {
-    sectionType: 'year',
-    contentType: 'digit',
-    maxLength: 4
-  },
-  yyyy: 'year',
-  // Month
-  M: {
-    sectionType: 'month',
-    contentType: 'digit',
-    maxLength: 2
-  },
-  MM: 'month',
-  MMMM: {
-    sectionType: 'month',
-    contentType: 'letter'
-  },
-  MMM: {
-    sectionType: 'month',
-    contentType: 'letter'
-  },
-  L: {
-    sectionType: 'month',
-    contentType: 'digit',
-    maxLength: 2
-  },
-  LL: 'month',
-  LLL: {
-    sectionType: 'month',
-    contentType: 'letter'
-  },
-  LLLL: {
-    sectionType: 'month',
-    contentType: 'letter'
-  },
-  // Day of the month
-  d: {
-    sectionType: 'day',
-    contentType: 'digit',
-    maxLength: 2
-  },
-  dd: 'day',
-  do: {
-    sectionType: 'day',
-    contentType: 'digit-with-letter'
-  },
-  // Day of the week
-  E: {
-    sectionType: 'weekDay',
-    contentType: 'letter'
-  },
-  EE: {
-    sectionType: 'weekDay',
-    contentType: 'letter'
-  },
-  EEE: {
-    sectionType: 'weekDay',
-    contentType: 'letter'
-  },
-  EEEE: {
-    sectionType: 'weekDay',
-    contentType: 'letter'
-  },
-  EEEEE: {
-    sectionType: 'weekDay',
-    contentType: 'letter'
-  },
-  i: {
-    sectionType: 'weekDay',
-    contentType: 'digit',
-    maxLength: 1
-  },
-  ii: 'weekDay',
-  iii: {
-    sectionType: 'weekDay',
-    contentType: 'letter'
-  },
-  iiii: {
-    sectionType: 'weekDay',
-    contentType: 'letter'
-  },
-  e: {
-    sectionType: 'weekDay',
-    contentType: 'digit',
-    maxLength: 1
-  },
-  ee: 'weekDay',
-  eee: {
-    sectionType: 'weekDay',
-    contentType: 'letter'
-  },
-  eeee: {
-    sectionType: 'weekDay',
-    contentType: 'letter'
-  },
-  eeeee: {
-    sectionType: 'weekDay',
-    contentType: 'letter'
-  },
-  eeeeee: {
-    sectionType: 'weekDay',
-    contentType: 'letter'
-  },
-  c: {
-    sectionType: 'weekDay',
-    contentType: 'digit',
-    maxLength: 1
-  },
-  cc: 'weekDay',
-  ccc: {
-    sectionType: 'weekDay',
-    contentType: 'letter'
-  },
-  cccc: {
-    sectionType: 'weekDay',
-    contentType: 'letter'
-  },
-  ccccc: {
-    sectionType: 'weekDay',
-    contentType: 'letter'
-  },
-  cccccc: {
-    sectionType: 'weekDay',
-    contentType: 'letter'
-  },
-  // Meridiem
-  a: 'meridiem',
-  aa: 'meridiem',
-  aaa: 'meridiem',
-  // Hours
-  H: {
-    sectionType: 'hours',
-    contentType: 'digit',
-    maxLength: 2
-  },
-  HH: 'hours',
-  h: {
-    sectionType: 'hours',
-    contentType: 'digit',
-    maxLength: 2
-  },
-  hh: 'hours',
-  // Minutes
-  m: {
-    sectionType: 'minutes',
-    contentType: 'digit',
-    maxLength: 2
-  },
-  mm: 'minutes',
-  // Seconds
-  s: {
-    sectionType: 'seconds',
-    contentType: 'digit',
-    maxLength: 2
-  },
-  ss: 'seconds'
-};
+import { AdapterDateFnsBase } from '../AdapterDateFnsBase';
 const defaultFormats = {
   year: 'yyyy',
   month: 'LLLL',
@@ -275,40 +111,25 @@ const NUMBER_SYMBOL_MAP = {
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-export class AdapterDateFnsJalali {
+export class AdapterDateFnsJalali extends AdapterDateFnsBase {
   constructor({
-    locale: _locale,
+    locale,
     formats
   } = {}) {
-    this.isMUIAdapter = true;
-    this.isTimezoneCompatible = false;
-    this.lib = 'date-fns-jalali';
-    this.locale = void 0;
-    this.formats = void 0;
-    this.formatTokenMap = formatTokenMap;
-    this.escapedCharacters = {
-      start: "'",
-      end: "'"
-    };
-    this.date = value => {
-      if (typeof value === 'undefined') {
-        return new Date();
-      }
-      if (value === null) {
-        return null;
-      }
-      return new Date(value);
-    };
-    this.getInvalidDate = () => new Date('Invalid Date');
-    this.getTimezone = () => {
-      return 'default';
-    };
-    this.setTimezone = value => {
-      return value;
-    };
-    this.toJsDate = value => {
-      return value;
-    };
+    if (typeof addDays !== 'function') {
+      throw new Error([`MUI: The \`date-fns-jalali\` package v2.x is not compatible with this adapter.`, 'Please, install v3.x of the package or use the `AdapterDateFnsJalali` instead.'].join('\n'));
+    }
+    if (!longFormatters) {
+      throw new Error('MUI: The minimum supported `date-fns-jalali` package version compatible with this adapter is `3.2.x`.');
+    }
+    super({
+      locale: locale ?? defaultLocale,
+      // some formats are different in jalali adapter,
+      // this ensures that `AdapterDateFnsBase` formats are overridden
+      formats: _extends({}, defaultFormats, formats),
+      longFormatters,
+      lib: 'date-fns-jalali'
+    });
     this.parse = (value, format) => {
       if (value === '') {
         return null;
@@ -320,29 +141,6 @@ export class AdapterDateFnsJalali {
     this.getCurrentLocaleCode = () => {
       return this.locale?.code || 'fa-IR';
     };
-    // Note: date-fns input types are more lenient than this adapter, so we need to expose our more
-    // strict signature and delegate to the more lenient signature. Otherwise, we have downstream type errors upon usage.
-    this.is12HourCycleInCurrentLocale = () => {
-      if (this.locale) {
-        return /a/.test(this.locale.formatLong.time());
-      }
-
-      // By default, date-fns-jalali is using fa-IR locale with am/pm enabled
-      return true;
-    };
-    this.expandFormat = format => {
-      // @see https://github.com/date-fns/date-fns/blob/master/src/format/index.js#L31
-      const longFormatRegexp = /P+p+|P+|p+|''|'(''|[^'])+('|$)|./g;
-      const locale = this.locale ?? defaultLocale;
-      return format.match(longFormatRegexp).map(token => {
-        const firstCharacter = token[0];
-        if (firstCharacter === 'p' || firstCharacter === 'P') {
-          const longFormatter = longFormatters[firstCharacter];
-          return longFormatter(token, locale.formatLong, {});
-        }
-        return token;
-      }).join('');
-    };
     this.isValid = value => {
       if (value == null) {
         return false;
@@ -530,16 +328,5 @@ export class AdapterDateFnsJalali {
       }
       return years;
     };
-    if (typeof addDays !== 'function') {
-      throw new Error([`MUI: The \`date-fns-jalali\` package v2.x is not compatible with this adapter.`, 'Please, install v3.x of the package or use the `AdapterDateFnsJalali` instead.'].join('\n'));
-    }
-    if (!longFormatters) {
-      throw new Error('MUI: The minimum supported `date-fns-jalali` package version compatible with this adapter is `3.2.x`.');
-    }
-    this.locale = _locale;
-    this.formats = _extends({}, defaultFormats, formats);
-  }
-  getDayOfWeek(value) {
-    return value.getDay() + 1;
   }
 }

package/modern/AdapterDateFnsV3/AdapterDateFnsV3.js

@@ -49,7 +49,6 @@ import { enUS } from 'date-fns/locale/en-US';
 // @ts-ignore TODO remove when date-fns-v3 is the default
 
 import { AdapterDateFnsBase } from '../AdapterDateFnsBase';
-
 /**
  * Based on `@date-io/date-fns`
  *

package/modern/AdapterMomentJalaali/AdapterMomentJalaali.js

@@ -163,14 +163,10 @@ export class AdapterMomentJalaali extends AdapterMoment {
       return numberToFormat.replace(/\d/g, match => NUMBER_SYMBOL_MAP[match]).replace(/,/g, '،');
     };
     this.isSameYear = (value, comparing) => {
-      // `isSame` seems to mutate the date on `moment-jalaali`
-      // @ts-ignore
-      return value.clone().isSame(comparing, 'jYear');
+      return value.jYear() === comparing.jYear();
     };
     this.isSameMonth = (value, comparing) => {
-      // `isSame` seems to mutate the date on `moment-jalaali`
-      // @ts-ignore
-      return value.clone().isSame(comparing, 'jMonth');
+      return value.jYear() === comparing.jYear() && value.jMonth() === comparing.jMonth();
     };
     this.isAfterYear = (value, comparing) => {
       return value.jYear() > comparing.jYear();

package/modern/DateCalendar/DateCalendar.js

@@ -198,9 +198,7 @@ export const DateCalendar = /*#__PURE__*/React.forwardRef(function DateCalendar(
       disableFuture,
       reduceAnimations,
       timezone,
-      labelId: gridLabelId,
-      slots,
-      slotProps
+      labelId: gridLabelId
     },
     ownerState: props
   });
@@ -294,7 +292,10 @@ export const DateCalendar = /*#__PURE__*/React.forwardRef(function DateCalendar(
     className: clsx(classes.root, className),
     ownerState: ownerState
   }, other, {
-    children: [/*#__PURE__*/_jsx(CalendarHeader, _extends({}, calendarHeaderProps)), /*#__PURE__*/_jsx(DateCalendarViewTransitionContainer, {
+    children: [/*#__PURE__*/_jsx(CalendarHeader, _extends({}, calendarHeaderProps, {
+      slots: slots,
+      slotProps: slotProps
+    })), /*#__PURE__*/_jsx(DateCalendarViewTransitionContainer, {
       reduceAnimations: reduceAnimations,
       className: classes.viewTransitionContainer,
       transKey: view,

package/modern/PickersLayout/usePickerLayout.js

@@ -63,9 +63,9 @@ const usePickerLayout = props => {
       onClear,
       onCancel,
       onSetToday,
-      actions: wrapperVariant === 'desktop' ? [] : ['cancel', 'accept'],
-      className: classes.actionBar
+      actions: wrapperVariant === 'desktop' ? [] : ['cancel', 'accept']
     },
+    className: classes.actionBar,
     ownerState: _extends({}, props, {
       wrapperVariant
     })
@@ -86,9 +86,9 @@ const usePickerLayout = props => {
       onViewChange,
       views,
       disabled,
-      readOnly,
-      className: classes.toolbar
+      readOnly
     },
+    className: classes.toolbar,
     ownerState: _extends({}, props, {
       wrapperVariant
     })
@@ -117,14 +117,13 @@ const usePickerLayout = props => {
     additionalProps: {
       isValid,
       isLandscape,
-      onChange: onSelectShortcut,
-      className: classes.shortcuts
+      onChange: onSelectShortcut
     },
+    className: classes.shortcuts,
     ownerState: {
       isValid,
       isLandscape,
       onChange: onSelectShortcut,
-      className: classes.shortcuts,
       wrapperVariant
     }
   });

package/modern/index.js

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

package/modern/internals/demo/DemoContainer.js

@@ -3,7 +3,7 @@ import * as React from 'react';
 import Stack, { stackClasses } from '@mui/material/Stack';
 import Typography from '@mui/material/Typography';
 import { textFieldClasses } from '@mui/material/TextField';
-import { pickersTextFieldClasses } from '@mui/x-date-pickers/PickersTextField';
+import { pickersTextFieldClasses } from '../../PickersTextField';
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 const getChildTypeFromChildName = childName => {
   if (childName.match(/^([A-Za-z]+)Range(Calendar|Clock)$/)) {

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

@@ -278,7 +278,7 @@ export const useFieldV6TextField = params => {
     });
   });
   const placeholder = React.useMemo(() => {
-    if (inPlaceholder) {
+    if (inPlaceholder !== undefined) {
       return inPlaceholder;
     }
     return fieldValueManager.getV6InputValueFromSections(getSectionsFromValue(valueManager.emptyValue), localizedDigits, isRTL);

package/modern/internals/hooks/usePicker/usePickerViews.js

@@ -100,6 +100,7 @@ export const usePickerViews = ({
     if (currentViewMode === 'field' && open) {
       onClose();
       setTimeout(() => {
+        fieldRef?.current?.setSelectedSections(view);
         // focusing the input before the range selection is done
         // calling it outside of timeout results in an inconsistent behavior between Safari And Chrome
         fieldRef?.current?.focusField(view);

package/node/AdapterDateFnsBase/AdapterDateFnsBase.js

@@ -227,7 +227,7 @@ class AdapterDateFnsBase {
   constructor(props) {
     this.isMUIAdapter = true;
     this.isTimezoneCompatible = false;
-    this.lib = 'date-fns';
+    this.lib = void 0;
     this.locale = void 0;
     this.formats = void 0;
     this.formatTokenMap = formatTokenMap;
@@ -292,11 +292,13 @@ class AdapterDateFnsBase {
     const {
       locale,
       formats,
-      longFormatters
+      longFormatters,
+      lib
     } = props;
     this.locale = locale;
     this.formats = (0, _extends2.default)({}, defaultFormats, formats);
     this.longFormatters = longFormatters;
+    this.lib = lib || 'date-fns';
   }
 }
 exports.AdapterDateFnsBase = AdapterDateFnsBase;