@mui/x-date-pickers 6.3.0 → 6.4.0

package/AdapterDateFns/AdapterDateFns.d.ts

@@ -1,10 +1,6 @@
 import defaultLocale from 'date-fns/locale/en-US';
-import { AdapterFormats, AdapterUnits, FieldFormatTokenMap, MuiPickersAdapter } from '../models';
+import { AdapterFormats, AdapterOptions, AdapterUnits, FieldFormatTokenMap, MuiPickersAdapter } from '../models';
 type DateFnsLocale = typeof defaultLocale;
-interface AdapterDateFnsOptions {
-    locale?: DateFnsLocale;
-    formats?: Partial<AdapterFormats>;
-}
 /**
  * Based on `@date-io/date-fns`
  *
@@ -30,7 +26,7 @@ interface AdapterDateFnsOptions {
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-export declare class AdapterDateFns implements MuiPickersAdapter<Date> {
+export declare class AdapterDateFns implements MuiPickersAdapter<Date, DateFnsLocale> {
     isMUIAdapter: boolean;
     lib: string;
     locale?: DateFnsLocale;
@@ -40,7 +36,7 @@ export declare class AdapterDateFns implements MuiPickersAdapter<Date> {
         start: string;
         end: string;
     };
-    constructor({ locale, formats }?: AdapterDateFnsOptions);
+    constructor({ locale, formats }?: AdapterOptions<DateFnsLocale, never>);
     date: (value?: any) => Date | null;
     toJsDate: (value: Date) => Date;
     parseISO: (isoString: string) => Date;

package/AdapterDateFns/AdapterDateFns.js

@@ -22,7 +22,6 @@ import endOfWeek from 'date-fns/endOfWeek';
 import endOfYear from 'date-fns/endOfYear';
 import dateFnsFormat from 'date-fns/format';
 import getDate from 'date-fns/getDate';
-import getDay from 'date-fns/getDay';
 import getDaysInMonth from 'date-fns/getDaysInMonth';
 import getHours from 'date-fns/getHours';
 import getMinutes from 'date-fns/getMinutes';
@@ -559,17 +558,12 @@ export class AdapterDateFns {
       let count = 0;
       let current = start;
       const nestedWeeks = [];
-      let lastDay = null;
       while (isBefore(current, end)) {
         const weekNumber = Math.floor(count / 7);
         nestedWeeks[weekNumber] = nestedWeeks[weekNumber] || [];
-        const day = getDay(current);
-        if (lastDay !== day) {
-          lastDay = day;
-          nestedWeeks[weekNumber].push(current);
-          count += 1;
-        }
+        nestedWeeks[weekNumber].push(current);
         current = addDays(current, 1);
+        count += 1;
       }
       return nestedWeeks;
     };

package/AdapterDateFnsJalali/AdapterDateFnsJalali.d.ts

@@ -1,10 +1,6 @@
 import defaultLocale from 'date-fns-jalali/locale/fa-IR';
-import { AdapterFormats, AdapterUnits, FieldFormatTokenMap, MuiPickersAdapter } from '../models';
+import { AdapterFormats, AdapterOptions, AdapterUnits, FieldFormatTokenMap, MuiPickersAdapter } from '../models';
 type DateFnsLocale = typeof defaultLocale;
-interface AdapterDateFnsJalaliOptions {
-    locale?: DateFnsLocale;
-    formats?: Partial<AdapterFormats>;
-}
 /**
  * Based on `@date-io/date-fns-jalali`
  *
@@ -30,7 +26,7 @@ interface AdapterDateFnsJalaliOptions {
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-export declare class AdapterDateFnsJalali implements MuiPickersAdapter<Date> {
+export declare class AdapterDateFnsJalali implements MuiPickersAdapter<Date, DateFnsLocale> {
     isMUIAdapter: boolean;
     lib: string;
     locale?: DateFnsLocale;
@@ -40,7 +36,7 @@ export declare class AdapterDateFnsJalali implements MuiPickersAdapter<Date> {
         start: string;
         end: string;
     };
-    constructor({ locale, formats }?: AdapterDateFnsJalaliOptions);
+    constructor({ locale, formats }?: AdapterOptions<DateFnsLocale, never>);
     date: (value?: any) => Date | null;
     toJsDate: (value: Date) => Date;
     parseISO: (isoString: string) => Date;

package/AdapterDateFnsJalali/AdapterDateFnsJalali.js

@@ -28,7 +28,6 @@ import getWeek from 'date-fns-jalali/getWeek';
 import getYear from 'date-fns-jalali/getYear';
 import getMonth from 'date-fns-jalali/getMonth';
 import getDate from 'date-fns-jalali/getDate';
-import getDay from 'date-fns-jalali/getDay';
 import getDaysInMonth from 'date-fns-jalali/getDaysInMonth';
 import getMinutes from 'date-fns-jalali/getMinutes';
 import isAfter from 'date-fns-jalali/isAfter';
@@ -571,17 +570,12 @@ export class AdapterDateFnsJalali {
       let count = 0;
       let current = start;
       const nestedWeeks = [];
-      let lastDay = null;
       while (isBefore(current, end)) {
         const weekNumber = Math.floor(count / 7);
         nestedWeeks[weekNumber] = nestedWeeks[weekNumber] || [];
-        const day = getDay(current);
-        if (lastDay !== day) {
-          lastDay = day;
-          nestedWeeks[weekNumber].push(current);
-          count += 1;
-        }
+        nestedWeeks[weekNumber].push(current);
         current = addDays(current, 1);
+        count += 1;
       }
       return nestedWeeks;
     };

package/AdapterDayjs/AdapterDayjs.d.ts

@@ -1,11 +1,5 @@
 import defaultDayjs, { Dayjs } from 'dayjs';
-import { FieldFormatTokenMap, MuiPickersAdapter, AdapterFormats, AdapterUnits } from '../models';
-interface AdapterDayjsOptions {
-    locale?: string;
-    /** Make sure that your dayjs instance extends customParseFormat and advancedFormat */
-    instance?: typeof defaultDayjs;
-    formats?: Partial<AdapterFormats>;
-}
+import { FieldFormatTokenMap, MuiPickersAdapter, AdapterFormats, AdapterUnits, AdapterOptions } from '../models';
 type Constructor = (...args: Parameters<typeof defaultDayjs>) => Dayjs;
 /**
  * Based on `@date-io/dayjs`
@@ -32,7 +26,7 @@ type Constructor = (...args: Parameters<typeof defaultDayjs>) => Dayjs;
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-export declare class AdapterDayjs implements MuiPickersAdapter<Dayjs> {
+export declare class AdapterDayjs implements MuiPickersAdapter<Dayjs, string> {
     isMUIAdapter: boolean;
     lib: string;
     rawDayJsInstance: typeof defaultDayjs;
@@ -44,7 +38,7 @@ export declare class AdapterDayjs implements MuiPickersAdapter<Dayjs> {
         end: string;
     };
     formatTokenMap: FieldFormatTokenMap;
-    constructor({ locale, formats, instance }?: AdapterDayjsOptions);
+    constructor({ locale, formats, instance }?: AdapterOptions<string, typeof defaultDayjs>);
     private getLocaleFormats;
     date: (value?: any) => defaultDayjs.Dayjs | null;
     toJsDate: (value: Dayjs) => Date;

package/AdapterDayjs/AdapterDayjs.js

@@ -167,8 +167,7 @@ export class AdapterDayjs {
     };
     this.formatTokenMap = formatTokenMap;
     this.getLocaleFormats = () => {
-      var _this$rawDayJsInstanc;
-      const locales = (_this$rawDayJsInstanc = this.rawDayJsInstance.Ls) != null ? _this$rawDayJsInstanc : defaultDayjs.Ls;
+      const locales = defaultDayjs.Ls;
       const locale = this.locale || 'en';
       let localeObject = locales[locale];
       if (localeObject === undefined) {
@@ -370,7 +369,7 @@ export class AdapterDayjs {
       const monthArray = [firstMonth];
       while (monthArray.length < 12) {
         const prevMonth = monthArray[monthArray.length - 1];
-        monthArray.push(this.getNextMonth(prevMonth));
+        monthArray.push(this.addMonths(prevMonth, 1));
       }
       return monthArray;
     };

package/AdapterLuxon/AdapterLuxon.d.ts

@@ -1,9 +1,5 @@
 import { DateTime } from 'luxon';
-import { AdapterFormats, AdapterUnits, FieldFormatTokenMap, MuiPickersAdapter } from '../models';
-interface AdapterLuxonOptions {
-    formats?: Partial<AdapterFormats>;
-    locale?: string;
-}
+import { AdapterFormats, AdapterOptions, AdapterUnits, FieldFormatTokenMap, MuiPickersAdapter } from '../models';
 /**
  * Based on `@date-io/luxon`
  *
@@ -29,7 +25,7 @@ interface AdapterLuxonOptions {
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-export declare class AdapterLuxon implements MuiPickersAdapter<DateTime> {
+export declare class AdapterLuxon implements MuiPickersAdapter<DateTime, string> {
     isMUIAdapter: boolean;
     lib: string;
     locale: string;
@@ -39,7 +35,7 @@ export declare class AdapterLuxon implements MuiPickersAdapter<DateTime> {
         end: string;
     };
     formatTokenMap: FieldFormatTokenMap;
-    constructor({ locale, formats }?: AdapterLuxonOptions);
+    constructor({ locale, formats }?: AdapterOptions<string, never>);
     date: (value?: any) => DateTime | null;
     toJsDate: (value: DateTime) => Date;
     parseISO: (isoString: string) => DateTime;
@@ -105,4 +101,3 @@ export declare class AdapterLuxon implements MuiPickersAdapter<DateTime> {
     getYearRange: (start: DateTime, end: DateTime) => DateTime[];
     getMeridiemText: (ampm: 'am' | 'pm') => string;
 }
-export {};

package/AdapterLuxon/AdapterLuxon.js

@@ -9,7 +9,11 @@ const formatTokenMap = {
     maxLength: 4
   },
   yy: 'year',
-  yyyy: 'year',
+  yyyy: {
+    sectionType: 'year',
+    contentType: 'digit',
+    maxLength: 4
+  },
   // Month
   L: {
     sectionType: 'month',
@@ -228,9 +232,6 @@ export class AdapterLuxon {
       })) == null ? void 0 : (_Intl$DateTimeFormat$ = _Intl$DateTimeFormat.resolvedOptions()) == null ? void 0 : _Intl$DateTimeFormat$.hour12);
     };
     this.expandFormat = format => {
-      if (!DateTime.expandFormat) {
-        throw Error('Your luxon version does not support `expandFormat`. Consider upgrading it to v3.0.2');
-      }
       // Extract escaped section to avoid extending them
       const longFormatRegexp = /''|'(''|[^'])+('|$)|[^']*/g;
       return format.match(longFormatRegexp).map(token => {
@@ -454,7 +455,7 @@ export class AdapterLuxon {
       const monthArray = [firstMonth];
       while (monthArray.length < 12) {
         const prevMonth = monthArray[monthArray.length - 1];
-        monthArray.push(this.getNextMonth(prevMonth));
+        monthArray.push(this.addMonths(prevMonth, 1));
       }
       return monthArray;
     };

package/AdapterMoment/AdapterMoment.d.ts

@@ -1,10 +1,5 @@
 import defaultMoment, { Moment } from 'moment';
-import { AdapterFormats, AdapterUnits, FieldFormatTokenMap, MuiPickersAdapter } from '../models';
-interface AdapterMomentOptions {
-    locale?: string;
-    instance?: typeof defaultMoment;
-    formats?: Partial<AdapterFormats>;
-}
+import { AdapterFormats, AdapterOptions, AdapterUnits, FieldFormatTokenMap, MuiPickersAdapter } from '../models';
 /**
  * Based on `@date-io/moment`
  *
@@ -30,7 +25,7 @@ interface AdapterMomentOptions {
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-export declare class AdapterMoment implements MuiPickersAdapter<Moment> {
+export declare class AdapterMoment implements MuiPickersAdapter<Moment, string> {
     isMUIAdapter: boolean;
     lib: string;
     moment: typeof defaultMoment;
@@ -41,7 +36,7 @@ export declare class AdapterMoment implements MuiPickersAdapter<Moment> {
         end: string;
     };
     formatTokenMap: FieldFormatTokenMap;
-    constructor({ locale, formats, instance }?: AdapterMomentOptions);
+    constructor({ locale, formats, instance }?: AdapterOptions<string, typeof defaultMoment>);
     date: (value?: any) => defaultMoment.Moment | null;
     toJsDate: (value: Moment) => Date;
     parseISO: (isoString: string) => defaultMoment.Moment;
@@ -107,4 +102,3 @@ export declare class AdapterMoment implements MuiPickersAdapter<Moment> {
     getYearRange: (start: Moment, end: Moment) => defaultMoment.Moment[];
     getMeridiemText: (ampm: 'am' | 'pm') => string;
 }
-export {};

package/AdapterMoment/AdapterMoment.js

@@ -359,7 +359,7 @@ export class AdapterMoment {
       return value.clone().subtract(1, 'month');
     };
     this.getMonthArray = value => {
-      const firstMonth = value.clone().startOf('year');
+      const firstMonth = this.startOfYear(value);
       const monthArray = [firstMonth];
       while (monthArray.length < 12) {
         const prevMonth = monthArray[monthArray.length - 1];
@@ -405,7 +405,7 @@ export class AdapterMoment {
     this.getMeridiemText = ampm => {
       if (this.is12HourCycleInCurrentLocale()) {
         // AM/PM translation only possible in those who have 12 hour cycle in locale.
-        return this.moment.localeData(this.getCurrentLocaleCode()).meridiem(ampm === 'am' ? 0 : 13, 0, false);
+        return defaultMoment.localeData(this.getCurrentLocaleCode()).meridiem(ampm === 'am' ? 0 : 13, 0, false);
       }
       return ampm === 'am' ? 'AM' : 'PM'; // fallback for de, ru, ...etc
     };

package/AdapterMomentHijri/AdapterMomentHijri.d.ts

@@ -1,10 +1,6 @@
 import defaultHMoment, { Moment } from 'moment-hijri';
 import { AdapterMoment } from '../AdapterMoment';
-import { AdapterFormats, FieldFormatTokenMap, MuiPickersAdapter } from '../models';
-interface AdapterMomentHijriOptions {
-    instance?: typeof defaultHMoment;
-    formats?: Partial<AdapterFormats>;
-}
+import { AdapterOptions, FieldFormatTokenMap, MuiPickersAdapter } from '../models';
 /**
  * Based on `@date-io/hijri`
  *
@@ -30,15 +26,11 @@ interface AdapterMomentHijriOptions {
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-export declare class AdapterMomentHijri extends AdapterMoment implements MuiPickersAdapter<Moment> {
-    isMUIAdapter: boolean;
+export declare class AdapterMomentHijri extends AdapterMoment implements MuiPickersAdapter<Moment, string> {
+    lib: string;
+    moment: typeof defaultHMoment;
     formatTokenMap: FieldFormatTokenMap;
-    escapedCharacters: {
-        start: string;
-        end: string;
-    };
-    constructor({ formats, instance }?: AdapterMomentHijriOptions);
-    private toIMoment;
+    constructor({ formats, instance }?: AdapterOptions<string, typeof defaultHMoment>);
     date: (value?: any) => defaultHMoment.Moment | null;
     parse: (value: string, format: string) => defaultHMoment.Moment | null;
     getFormatHelperText: (format: string) => string;
@@ -64,4 +56,3 @@ export declare class AdapterMomentHijri extends AdapterMoment implements MuiPick
     getYearRange: (start: Moment, end: Moment) => defaultHMoment.Moment[];
     getMeridiemText: (ampm: 'am' | 'pm') => string;
 }
-export {};

package/AdapterMomentHijri/AdapterMomentHijri.js

@@ -142,15 +142,9 @@ export class AdapterMomentHijri extends AdapterMoment {
       locale: 'ar-SA',
       instance
     });
-    this.isMUIAdapter = true;
+    this.lib = 'moment-hijri';
+    this.moment = void 0;
     this.formatTokenMap = formatTokenMap;
-    this.escapedCharacters = {
-      start: '[',
-      end: ']'
-    };
-    this.toIMoment = value => {
-      return this.moment(value ? value.clone() : undefined).locale('ar-SA');
-    };
     this.date = value => {
       if (value === null) {
         return null;
@@ -219,7 +213,7 @@ export class AdapterMomentHijri extends AdapterMoment {
     };
     this.getWeekdays = () => {
       return [0, 1, 2, 3, 4, 5, 6].map(dayOfWeek => {
-        return this.toIMoment().weekday(dayOfWeek).format('dd');
+        return this.date().weekday(dayOfWeek).format('dd');
       });
     };
     this.getWeekArray = value => {
@@ -260,7 +254,7 @@ export class AdapterMomentHijri extends AdapterMoment {
       return years;
     };
     this.getMeridiemText = ampm => {
-      return ampm === 'am' ? this.toIMoment().hours(2).format('A') : this.toIMoment().hours(14).format('A');
+      return ampm === 'am' ? this.date().hours(2).format('A') : this.date().hours(14).format('A');
     };
     this.moment = instance || defaultHMoment;
     this.locale = 'ar-SA';

package/AdapterMomentJalaali/AdapterMomentJalaali.d.ts

@@ -1,10 +1,6 @@
 import defaultJMoment, { Moment } from 'moment-jalaali';
 import { AdapterMoment } from '../AdapterMoment';
-import { AdapterFormats, FieldFormatTokenMap, MuiPickersAdapter } from '../models';
-interface AdapterMomentJalaaliOptions {
-    instance?: typeof defaultJMoment;
-    formats?: Partial<AdapterFormats>;
-}
+import { AdapterOptions, FieldFormatTokenMap, MuiPickersAdapter } from '../models';
 /**
  * Based on `@date-io/jalaali`
  *
@@ -30,25 +26,20 @@ interface AdapterMomentJalaaliOptions {
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-export declare class AdapterMomentJalaali extends AdapterMoment implements MuiPickersAdapter<Moment> {
-    isMUIAdapter: boolean;
+export declare class AdapterMomentJalaali extends AdapterMoment implements MuiPickersAdapter<Moment, string> {
     lib: string;
     moment: typeof defaultJMoment;
-    locale?: string;
-    formats: AdapterFormats;
     formatTokenMap: FieldFormatTokenMap;
-    escapedCharacters: {
-        start: string;
-        end: string;
-    };
-    constructor({ formats, instance }?: AdapterMomentJalaaliOptions);
-    private toJMoment;
+    constructor({ formats, instance }?: AdapterOptions<string, typeof defaultJMoment>);
     date: (value?: any) => defaultJMoment.Moment | null;
+    parseISO: (isoString: string) => defaultJMoment.Moment;
     parse: (value: string, format: string) => defaultJMoment.Moment | null;
     getFormatHelperText: (format: string) => string;
     isValid: (value: any) => boolean;
     formatNumber: (numberToFormat: string) => string;
     isEqual: (value: any, comparing: any) => boolean;
+    isSameYear: (value: Moment, comparing: Moment) => boolean;
+    isSameMonth: (value: Moment, comparing: Moment) => boolean;
     isAfterYear: (value: Moment, comparing: Moment) => boolean;
     isBeforeYear: (value: Moment, comparing: Moment) => boolean;
     startOfYear: (value: Moment) => defaultJMoment.Moment;
@@ -71,4 +62,3 @@ export declare class AdapterMomentJalaali extends AdapterMoment implements MuiPi
     getYearRange: (start: Moment, end: Moment) => defaultJMoment.Moment[];
     getMeridiemText: (ampm: 'am' | 'pm') => string;
 }
-export {};

package/AdapterMomentJalaali/AdapterMomentJalaali.js

@@ -140,25 +140,18 @@ export class AdapterMomentJalaali extends AdapterMoment {
       locale: 'fa',
       instance
     });
-    this.isMUIAdapter = true;
     this.lib = 'moment-jalaali';
     this.moment = void 0;
-    this.locale = void 0;
-    this.formats = void 0;
     this.formatTokenMap = formatTokenMap;
-    this.escapedCharacters = {
-      start: '[',
-      end: ']'
-    };
-    this.toJMoment = value => {
-      return this.moment(value ? value.clone() : undefined).locale('fa');
-    };
     this.date = value => {
       if (value === null) {
         return null;
       }
       return this.moment(value).locale('fa');
     };
+    this.parseISO = isoString => {
+      return this.moment(isoString).locale('fa');
+    };
     this.parse = (value, format) => {
       if (value === '') {
         return null;
@@ -184,6 +177,16 @@ export class AdapterMomentJalaali extends AdapterMoment {
       }
       return this.moment(value).isSame(comparing);
     };
+    this.isSameYear = (value, comparing) => {
+      // `isSame` seems to mutate the date on `moment-jalaali`
+      // @ts-ignore
+      return value.clone().isSame(comparing, 'jYear');
+    };
+    this.isSameMonth = (value, comparing) => {
+      // `isSame` seems to mutate the date on `moment-jalaali`
+      // @ts-ignore
+      return value.clone().isSame(comparing, 'jMonth');
+    };
     this.isAfterYear = (value, comparing) => {
       return value.jYear() > comparing.jYear();
     };
@@ -234,7 +237,7 @@ export class AdapterMomentJalaali extends AdapterMoment {
     };
     this.getWeekdays = () => {
       return [0, 1, 2, 3, 4, 5, 6].map(dayOfWeek => {
-        return this.toJMoment().weekday(dayOfWeek).format('dd');
+        return this.date().weekday(dayOfWeek).format('dd');
       });
     };
     this.getWeekArray = value => {
@@ -267,7 +270,7 @@ export class AdapterMomentJalaali extends AdapterMoment {
       return years;
     };
     this.getMeridiemText = ampm => {
-      return ampm === 'am' ? this.toJMoment().hours(2).format('A') : this.toJMoment().hours(14).format('A');
+      return ampm === 'am' ? this.date().hours(2).format('A') : this.date().hours(14).format('A');
     };
     this.moment = instance || defaultJMoment;
     this.locale = 'fa';

package/CHANGELOG.md

@@ -3,6 +3,109 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## v6.4.0
+
+_May 12, 2023_
+
+We'd like to offer a big thanks to the 12 contributors who made this release possible. Here are some highlights ✨:
+
+- 🎁 Introduce clipboard paste support for `DataGridPremium`:
+
+  https://github.com/mui/mui-x/assets/13808724/abfcb5c6-9db6-4677-9ba7-ae97de441080
+
+  See [the documentation](https://mui.com/x/react-data-grid/clipboard/#clipboard-paste) for more information
+
+- 🌍 Improve French (fr-FR), German (de-DE), Portuguese (pt-BR) and Ukrainian (uk-UA) locales on the data grid
+- 🌍 Add Slovak (sk-SK) locale on the pickers
+- 🐞 Bugfixes
+- 📚 Documentation improvements
+
+### `@mui/x-data-grid@v6.4.0` / `@mui/x-data-grid-pro@v6.4.0` / `@mui/x-data-grid-premium@v6.4.0`
+
+#### Changes
+
+- [DataGrid] Fix DataGrid rendering in JSDOM (#8968) @cherniavskii
+- [DataGrid] Fix layout when rendered inside a parent with `display: grid` (#8577) @cherniavskii
+- [DataGrid] Add Joy UI icon slots (#8940) @siriwatknp
+- [DataGrid] Add Joy UI pagination slot (#8871) @cherniavskii
+- [DataGrid] Extract `baseChip` slot (#8748) @cherniavskii
+- [DataGridPremium] Implement Clipboard import (#7389) @cherniavskii
+- [l10n] Improve French (fr-FR) locale (#8825) @vallereaugabriel
+- [l10n] Improve German (de-DE) locale (#8898) @marcauberer
+- [l10n] Improve Portuguese (pt-BR) locale (#8960) @Sorriso337
+- [l10n] Improve Ukrainian (uk-UA) locale (#8863) @Neonin
+
+### `@mui/x-date-pickers@v6.4.0` / `@mui/x-date-pickers-pro@v6.4.0`
+
+#### Changes
+
+- [pickers] Fix trailing zeros inconsistency in `LuxonAdapter` (#8955) @alexfauquette
+- [pickers] Stop using deprecated adapter methods (#8735) @flaviendelangle
+- [pickers] Strictly type the `adapterLocale` prop of `LocalizationProvider` (#8780) @flaviendelangle
+- [l10n] Add Slovak (sk-SK) locale (#8875) @MatejFacko
+
+### Docs
+
+- [docs] Fix date pickers typo in the docs  (#8939) @richbustos
+- [docs] Fix master detail demo (#8894) @m4theushw
+- [docs] Fix typo in clipboard docs (#8971) @MBilalShafi
+- [docs] Reduce list of dependencies in Codesandbox/Stackblitz demos (#8535) @cherniavskii
+
+### Core
+
+- [core] Improve testing of the adapters (#8789) @flaviendelangle
+- [core] Update license key for tests (#8917) @LukasTy
+- [charts] Make introduction docs pages for each chart (#8869) @alexfauquette
+- [charts] Document Tooltip and Highlighs (#8867) @alexfauquette
+- [test] Cover row grouping regression with a unit test (#8870) @cherniavskii
+- [test] Fix flaky regression tests (#8954) @cherniavskii
+
+## 6.3.1
+
+_May 5, 2023_
+
+We'd like to offer a big thanks to the 7 contributors who made this release possible. Here are some highlights ✨:
+
+- 🐞 Bugfixes
+- 📚 Documentation improvements
+
+### `@mui/x-data-grid@v6.3.1` / `@mui/x-data-grid-pro@v6.3.1` / `@mui/x-data-grid-premium@v6.3.1`
+
+#### Changes
+
+- [DataGrid] Fix broken filtering in the value formatter demo (#8621) @cherniavskii
+- [DataGrid] Fix falsy filter values not showing in filter button tooltip (#8550) @ithrforu
+- [DataGrid] Fix missing watermark in Pro and Premium packages (#8797) @cherniavskii
+- [DataGrid] Remove unwarranted warning log (#8847) @romgrk
+- [DataGrid] Add Joy UI slots (`Select`, `SelectOption`, `InputLabel`, `FormControl`) (#8747) @cherniavskii
+- [DataGridPremium] Fix expanded groups being collapsed after calling `updateRows` (#8823) @cherniavskii
+
+### `@mui/x-date-pickers@v6.3.1` / `@mui/x-date-pickers-pro@v6.3.1`
+
+#### Changes
+
+- [pickers] Fix `minutesStep` validation prop behavior (#8794) @LukasTy
+- [pickers] Fix time picker `viewRenderers` overriding (#8830) @LukasTy
+- [pickers] Remove last additional character when using LTR (#8848) @alexfauquette
+
+### Docs
+
+- [docs] Fix controlled mode demo on Editing page (#8800) @yaredtsy
+- [docs] Fix scrolling demo not working with React 18 (#6489) @cherniavskii
+- [docs] Update demo to support agregation on popular feature cell (#8617) @BalaM314
+- [docs] Clarify what `<path>` is (#8764) @alexfauquette
+
+### Core
+
+- [core] Do not include playground pages in `yarn typescript` script (#8822) @cherniavskii
+- [core] Limit `typescript:ci` step memory limit (#8796) @LukasTy
+- [core] Upgrade monorepo (#8835) @cherniavskii
+- [test] Use `fake` clock on `MobileDateRangePicker` (#8861) @LukasTy
+- [charts] Clean some styling (#8778) @alexfauquette
+- [charts] Improve tooltip (#8792) @alexfauquette
+- [charts] Improvement and docs on axis (#8654) @alexfauquette
+- [charts] Defaultize attributes (#8788) @alexfauquette
+
 ## 6.3.0
 
 _Apr 28, 2023_
@@ -264,9 +367,9 @@ We'd like to offer a big thanks to the 9 contributors who made this release poss
 
 - [fields] Add missing tokens to `AdapterDateFnsJalali` (#8402) @flaviendelangle
 - [fields] Clean the active date manager (#8370) @flaviendelangle
-- [fields] Cleanup `useFieldState`  (#8292) @flaviendelangle
+- [fields] Cleanup `useFieldState` (#8292) @flaviendelangle
 - [fields] Only add RTL characters when needed (#8325) @flaviendelangle
-- [pickers] Add support for single input fields in range pickers  (#7927) @flaviendelangle
+- [pickers] Add support for single input fields in range pickers (#7927) @flaviendelangle
 - [pickers] Allows non token characters in format (#8256) @alexfauquette
 - [pickers] Avoid root imports and move public models to the models folder (#8337) @flaviendelangle
 - [pickers] Update `view` when `views` or `openTo` changes (#8361) @LukasTy

package/DateCalendar/DateCalendar.js

@@ -14,7 +14,7 @@ import { MonthCalendar } from '../MonthCalendar';
 import { YearCalendar } from '../YearCalendar';
 import { useViews } from '../internals/hooks/useViews';
 import { PickersCalendarHeader } from './PickersCalendarHeader';
-import { findClosestEnabledDate, applyDefaultDate } from '../internals/utils/date-utils';
+import { findClosestEnabledDate, applyDefaultDate, mergeDateAndTime } from '../internals/utils/date-utils';
 import { PickerViewRoot } from '../internals/components/PickerViewRoot';
 import { defaultReduceAnimations } from '../internals/utils/defaultReduceAnimations';
 import { getDateCalendarUtilityClass } from './dateCalendarClasses';
@@ -209,7 +209,7 @@ export const DateCalendar = /*#__PURE__*/React.forwardRef(function DateCalendar(
   const handleSelectedDayChange = useEventCallback(day => {
     if (value && day) {
       // If there is a date already selected, then we want to keep its time
-      return setValueAndGoToNextView(utils.mergeDateAndTime(day, value), 'finish');
+      return setValueAndGoToNextView(mergeDateAndTime(utils, day, value), 'finish');
     }
     return setValueAndGoToNextView(day, 'finish');
   });