@mui/x-date-pickers 6.7.0 → 6.9.0

package/AdapterDayjs/AdapterDayjs.d.ts

@@ -30,7 +30,7 @@ export declare class AdapterDayjs implements MuiPickersAdapter<Dayjs, string> {
     isMUIAdapter: boolean;
     isTimezoneCompatible: boolean;
     lib: string;
-    rawDayJsInstance: typeof defaultDayjs;
+    rawDayJsInstance?: typeof defaultDayjs;
     dayjs: Constructor;
     locale?: string;
     formats: AdapterFormats;
@@ -44,6 +44,10 @@ export declare class AdapterDayjs implements MuiPickersAdapter<Dayjs, string> {
     private hasUTCPlugin;
     private hasTimezonePlugin;
     private isSame;
+    /**
+     * Replace "default" by undefined before passing it to `dayjs
+     */
+    private cleanTimezone;
     private createSystemDate;
     private createUTCDate;
     private createTZDate;

package/AdapterDayjs/AdapterDayjs.js

@@ -158,6 +158,7 @@ export class AdapterDayjs {
     formats,
     instance
   } = {}) {
+    var _this$rawDayJsInstanc;
     this.isMUIAdapter = true;
     this.isTimezoneCompatible = true;
     this.lib = 'dayjs';
@@ -183,9 +184,27 @@ export class AdapterDayjs {
       const comparingInValueTimezone = this.setTimezone(comparing, this.getTimezone(value));
       return value.format(comparisonTemplate) === comparingInValueTimezone.format(comparisonTemplate);
     };
+    /**
+     * Replace "default" by undefined before passing it to `dayjs
+     */
+    this.cleanTimezone = timezone => timezone === 'default' ? undefined : timezone;
     this.createSystemDate = value => {
       // TODO v7: Stop using `this.rawDayJsInstance` (drop the `instance` param on the adapters)
-      return this.rawDayJsInstance(value);
+      /* istanbul ignore next */
+      if (this.rawDayJsInstance) {
+        return this.rawDayJsInstance(value);
+      }
+      if (this.hasUTCPlugin() && this.hasTimezonePlugin()) {
+        const timezone = defaultDayjs.tz.guess();
+
+        // We can't change the system timezone in the tests
+        /* istanbul ignore next */
+        if (timezone !== 'UTC') {
+          return defaultDayjs.tz(value, timezone);
+        }
+        return defaultDayjs(value);
+      }
+      return defaultDayjs(value);
     };
     this.createUTCDate = value => {
       /* istanbul ignore next */
@@ -204,9 +223,8 @@ export class AdapterDayjs {
       if (!this.hasTimezonePlugin()) {
         throw new Error(MISSING_TIMEZONE_PLUGIN);
       }
-      const cleanTimezone = timezone === 'default' ? undefined : timezone;
       const keepLocalTime = value !== undefined && !value.endsWith('Z');
-      return defaultDayjs(value).tz(cleanTimezone, keepLocalTime);
+      return defaultDayjs(value).tz(this.cleanTimezone(timezone), keepLocalTime);
     };
     this.getLocaleFormats = () => {
       const locales = defaultDayjs.Ls;
@@ -264,11 +282,12 @@ export class AdapterDayjs {
         }
         return value.utc();
       }
+
+      // We know that we have the UTC plugin.
+      // Otherwise, the value timezone would always equal "system".
+      // And it would be caught by the first "if" of this method.
       if (timezone === 'system') {
-        if (this.hasUTCPlugin()) {
-          return value.local();
-        }
-        return value;
+        return value.local();
       }
       if (!this.hasTimezonePlugin()) {
         if (timezone === 'default') {
@@ -278,8 +297,7 @@ export class AdapterDayjs {
         /* istanbul ignore next */
         throw new Error(MISSING_TIMEZONE_PLUGIN);
       }
-      const cleanZone = timezone === 'default' ? undefined : timezone;
-      return defaultDayjs.tz(value, cleanZone);
+      return defaultDayjs.tz(value, this.cleanTimezone(timezone));
     };
     this.toJsDate = value => {
       return value.toDate();
@@ -338,7 +356,7 @@ export class AdapterDayjs {
       if (value === null && comparing === null) {
         return true;
       }
-      return this.dayjs(value).isSame(comparing);
+      return this.dayjs(value).toDate().getTime() === this.dayjs(comparing).toDate().getTime();
     };
     this.isSameYear = (value, comparing) => {
       return this.isSame(value, comparing, 'YYYY');
@@ -498,9 +516,10 @@ export class AdapterDayjs {
       return [0, 1, 2, 3, 4, 5, 6].map(diff => this.formatByString(start.add(diff, 'day'), 'dd'));
     };
     this.getWeekArray = value => {
-      const cleanLocale = this.setLocaleToValue(value);
-      const start = cleanLocale.startOf('month').startOf('week');
-      const end = cleanLocale.endOf('month').endOf('week');
+      const timezone = this.getTimezone(value);
+      const cleanValue = this.setLocaleToValue(value);
+      const start = cleanValue.startOf('month').startOf('week');
+      const end = cleanValue.endOf('month').endOf('week');
       let count = 0;
       let current = start;
       const nestedWeeks = [];
@@ -509,6 +528,14 @@ export class AdapterDayjs {
         nestedWeeks[weekNumber] = nestedWeeks[weekNumber] || [];
         nestedWeeks[weekNumber].push(current);
         current = current.add(1, 'day');
+
+        // If the new day does not have the same offset as the old one (when switching to summer day time for example),
+        // Then dayjs will not automatically adjust the offset (moment does)
+        // We have to parse again the value to make sure the `fixOffset` method is applied
+        // See https://github.com/iamkun/dayjs/blob/b3624de619d6e734cd0ffdbbd3502185041c1b60/src/plugin/timezone/index.js#L72
+        if (this.hasTimezonePlugin() && timezone !== 'UTC' && timezone !== 'system') {
+          current = current.tz(this.cleanTimezone(timezone), true);
+        }
         count += 1;
       }
       return nestedWeeks;
@@ -530,8 +557,8 @@ export class AdapterDayjs {
     this.getMeridiemText = ampm => {
       return ampm === 'am' ? 'AM' : 'PM';
     };
-    this.rawDayJsInstance = instance || defaultDayjs;
-    this.dayjs = withLocale(this.rawDayJsInstance, _locale);
+    this.rawDayJsInstance = instance;
+    this.dayjs = withLocale((_this$rawDayJsInstanc = this.rawDayJsInstance) != null ? _this$rawDayJsInstanc : defaultDayjs, _locale);
     this.locale = _locale;
     this.formats = _extends({}, defaultFormats, formats);
     defaultDayjs.extend(weekOfYear);

package/AdapterLuxon/AdapterLuxon.d.ts

@@ -37,6 +37,7 @@ export declare class AdapterLuxon implements MuiPickersAdapter<DateTime, string>
     };
     formatTokenMap: FieldFormatTokenMap;
     constructor({ locale, formats }?: AdapterOptions<string, never>);
+    private setLocaleToValue;
     date: (value?: any) => DateTime | null;
     dateWithTimezone: (value: string | null | undefined, timezone: PickersTimezone) => DateTime | null;
     getTimezone: (value: DateTime) => string;

package/AdapterLuxon/AdapterLuxon.js

@@ -178,6 +178,13 @@ export class AdapterLuxon {
       end: "'"
     };
     this.formatTokenMap = formatTokenMap;
+    this.setLocaleToValue = value => {
+      const expectedLocale = this.getCurrentLocaleCode();
+      if (expectedLocale === value.locale) {
+        return value;
+      }
+      return value.setLocale(expectedLocale);
+    };
     this.date = value => {
       if (typeof value === 'undefined') {
         return DateTime.local();
@@ -219,12 +226,11 @@ export class AdapterLuxon {
       });
     };
     this.getTimezone = value => {
-      var _value$zoneName;
       // When using the system zone, we want to return "system", not something like "Europe/Paris"
       if (value.zone.type === 'system') {
         return 'system';
       }
-      return (_value$zoneName = value.zoneName) != null ? _value$zoneName : 'system';
+      return value.zoneName;
     };
     this.setTimezone = (value, timezone) => {
       if (!value.zone.equals(Info.normalizeZone(timezone))) {
@@ -239,7 +245,7 @@ export class AdapterLuxon {
       return DateTime.fromISO(isoString);
     };
     this.toISO = value => {
-      return value.toISO({
+      return value.toUTC().toISO({
         format: 'extended'
       });
     };
@@ -522,11 +528,12 @@ export class AdapterLuxon {
       });
     };
     this.getWeekArray = value => {
+      const cleanValue = this.setLocaleToValue(value);
       const {
         days
-      } = value.endOf('month').endOf('week').diff(value.startOf('month').startOf('week'), 'days').toObject();
+      } = cleanValue.endOf('month').endOf('week').diff(cleanValue.startOf('month').startOf('week'), 'days').toObject();
       const weeks = [];
-      new Array(Math.round(days)).fill(0).map((_, i) => i).map(day => value.startOf('month').startOf('week').plus({
+      new Array(Math.round(days)).fill(0).map((_, i) => i).map(day => cleanValue.startOf('month').startOf('week').plus({
         days: day
       })).forEach((v, i) => {
         if (i === 0 || i % 7 === 0 && i > 6) {

package/AdapterMoment/AdapterMoment.js

@@ -6,7 +6,11 @@ const formatTokenMap = {
   // Year
   Y: 'year',
   YY: 'year',
-  YYYY: 'year',
+  YYYY: {
+    sectionType: 'year',
+    contentType: 'digit',
+    maxLength: 4
+  },
   // Month
   M: {
     sectionType: 'month',
@@ -234,6 +238,9 @@ export class AdapterMoment {
     };
     this.setTimezone = (value, timezone) => {
       var _this$moment$defaultZ2, _this$moment$defaultZ3;
+      if (this.getTimezone(value) === timezone) {
+        return value;
+      }
       if (timezone === 'UTC') {
         return value.clone().utc();
       }
@@ -241,15 +248,17 @@ export class AdapterMoment {
         return value.clone().local();
       }
       if (!this.hasTimezonePlugin()) {
-        if (timezone === 'default') {
-          return value;
-        }
-
         /* istanbul ignore next */
-        throw new Error(MISSING_TIMEZONE_PLUGIN);
+        if (timezone !== 'default') {
+          throw new Error(MISSING_TIMEZONE_PLUGIN);
+        }
+        return value;
       }
       const cleanZone = timezone === 'default' ? // @ts-ignore
       (_this$moment$defaultZ2 = (_this$moment$defaultZ3 = this.moment.defaultZone) == null ? void 0 : _this$moment$defaultZ3.name) != null ? _this$moment$defaultZ2 : 'system' : timezone;
+      if (cleanZone === 'system') {
+        return value.clone().local();
+      }
       const newValue = value.clone();
       newValue.tz(cleanZone);
       return newValue;
@@ -463,9 +472,9 @@ export class AdapterMoment {
       return defaultMoment.weekdaysShort(true);
     };
     this.getWeekArray = value => {
-      const cleanLocale = this.setLocaleToValue(value);
-      const start = cleanLocale.clone().startOf('month').startOf('week');
-      const end = cleanLocale.clone().endOf('month').endOf('week');
+      const cleanValue = this.setLocaleToValue(value);
+      const start = cleanValue.clone().startOf('month').startOf('week');
+      const end = cleanValue.clone().endOf('month').endOf('week');
       let count = 0;
       let current = start;
       const nestedWeeks = [];