@mui/x-date-pickers 7.0.0-alpha.1 → 7.0.0-alpha.3

package/internals/hooks/usePicker/usePickerValue.js

@@ -221,9 +221,7 @@ export const usePickerValue = ({
       const context = {
         validationError
       };
-
-      // TODO v7: Remove 2nd condition
-      if (action.name === 'setValueFromShortcut' && action.shortcut != null) {
+      if (action.name === 'setValueFromShortcut') {
         context.shortcut = action.shortcut;
       }
       handleValueChange(action.value, context);
@@ -288,12 +286,10 @@ export const usePickerValue = ({
     value: newValue,
     selectionState
   }));
-
-  // TODO v7: Make changeImportance and label mandatory.
   const handleSelectShortcut = useEventCallback((newValue, changeImportance, shortcut) => updateDate({
     name: 'setValueFromShortcut',
     value: newValue,
-    changeImportance: changeImportance != null ? changeImportance : 'accept',
+    changeImportance,
     shortcut
   }));
   const handleChangeFromField = useEventCallback((newValue, context) => updateDate({

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

@@ -132,7 +132,7 @@ export interface UsePickerValueState<TValue> {
      * Then we might want to apply some custom logic.
      *
      * For example, when the component is not controlled and `defaultValue` is defined.
-     * Then clicking on "Accept", "Today" or "Clear" should fire `onAccept` with `defaultValue`, but clicking on "Cancel" or dimissing the picker should not.
+     * Then clicking on "Accept", "Today" or "Clear" should fire `onAccept` with `defaultValue`, but clicking on "Cancel" or dismissing the picker should not.
      */
     hasBeenModifiedSinceMount: boolean;
 }
@@ -165,7 +165,7 @@ export type PickerValueUpdateAction<TValue, TError> = {
     name: 'setValueFromShortcut';
     value: TValue;
     changeImportance: PickerShortcutChangeImportance;
-    shortcut?: PickersShortcutsItemContext;
+    shortcut: PickersShortcutsItemContext;
 };
 /**
  * Props used to handle the value that are common to all pickers.
@@ -269,7 +269,7 @@ export interface UsePickerValueViewsResponse<TValue> {
 export interface UsePickerValueLayoutResponse<TValue> extends UsePickerValueActions {
     value: TValue;
     onChange: (newValue: TValue) => void;
-    onSelectShortcut: (newValue: TValue, changeImportance?: PickerShortcutChangeImportance) => void;
+    onSelectShortcut: (newValue: TValue, changeImportance: PickerShortcutChangeImportance, shortcut: PickersShortcutsItemContext) => void;
     isValid: (value: TValue) => boolean;
 }
 export interface UsePickerValueResponse<TValue, TSection extends FieldSection, TError> {

package/internals/hooks/useUtils.js

@@ -22,7 +22,7 @@ export const useNow = timezone => {
   const utils = useUtils();
   const now = React.useRef();
   if (now.current === undefined) {
-    now.current = utils.dateWithTimezone(undefined, timezone);
+    now.current = utils.date(undefined, timezone);
   }
   return now.current;
 };

package/internals/hooks/useViews.js

@@ -84,7 +84,7 @@ export function useViews({
     const isSelectionFinishedOnCurrentView = currentViewSelectionState === 'finish';
     const hasMoreViews = selectedView ?
     // handles case like `DateTimePicker`, where a view might return a `finish` selection state
-    // but we it's not the final view given all `views` -> overall selection state should be `partial`.
+    // but when it's not the final view given all `views` -> overall selection state should be `partial`.
     views.indexOf(selectedView) < views.length - 1 : Boolean(nextView);
     const globalSelectionState = isSelectionFinishedOnCurrentView && hasMoreViews ? 'partial' : currentViewSelectionState;
     onChange(value, globalSelectionState);
@@ -106,7 +106,7 @@ export function useViews({
     setFocusedView: handleFocusedViewChange,
     nextView,
     previousView,
-    // Always return up to date default view instead of the initial one (i.e. defaultView.current)
+    // Always return up-to-date default view instead of the initial one (i.e. defaultView.current)
     defaultView: views.includes(openTo) ? openTo : views[0],
     goToNextView,
     setValueAndGoToNextView,

package/internals/models/validation.d.ts

@@ -44,14 +44,6 @@ export interface TimeValidationProps<TDate> {
      * @returns {boolean} If `true` the time will be disabled.
      */
     shouldDisableTime?: (value: TDate, view: TimeView) => boolean;
-    /**
-     * Disable specific clock time.
-     * @param {number} clockValue The value to check.
-     * @param {TimeView} view The clock type of the timeValue.
-     * @returns {boolean} If `true` the time will be disabled.
-     * @deprecated Consider using `shouldDisableTime`.
-     */
-    shouldDisableClock?: (clockValue: number, view: TimeView) => boolean;
     /**
      * Do not ignore date part when validating min/max time.
      * @default false

package/internals/utils/date-utils.js

@@ -9,7 +9,7 @@ export const findClosestEnabledDate = ({
   utils,
   timezone
 }) => {
-  const today = utils.startOfDay(utils.dateWithTimezone(undefined, timezone));
+  const today = utils.startOfDay(utils.date(undefined, timezone));
   if (disablePast && utils.isBefore(minDate, today)) {
     minDate = today;
   }
@@ -79,7 +79,7 @@ export const mergeDateAndTime = (utils, dateParam, timeParam) => {
   mergedDate = utils.setSeconds(mergedDate, utils.getSeconds(timeParam));
   return mergedDate;
 };
-export const getTodayDate = (utils, timezone, valueType) => valueType === 'date' ? utils.startOfDay(utils.dateWithTimezone(undefined, timezone)) : utils.dateWithTimezone(undefined, timezone);
+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);
   return utils.format(date, 'meridiem');

package/internals/utils/validation/extractValidationProps.d.ts

@@ -8,4 +8,4 @@ export declare const DATE_TIME_VALIDATION_PROP_NAMES: (keyof DateTimeValidationP
  */
 export declare const extractValidationProps: <Props extends {
     [key: string]: any;
-}>(props: Props) => Pick<Props, "ampm" | "disableFuture" | "disablePast" | "maxDate" | "minDate" | "minutesStep" | "shouldDisableDate" | "shouldDisableMonth" | "shouldDisableYear" | "minTime" | "maxTime" | "shouldDisableTime" | "shouldDisableClock" | "disableIgnoringDatePartForTimeValidation" | "minDateTime" | "maxDateTime">;
+}>(props: Props) => Pick<Props, "ampm" | "disableFuture" | "disablePast" | "maxDate" | "minDate" | "minutesStep" | "shouldDisableDate" | "shouldDisableMonth" | "shouldDisableYear" | "minTime" | "maxTime" | "shouldDisableTime" | "disableIgnoringDatePartForTimeValidation" | "minDateTime" | "maxDateTime">;

package/internals/utils/validation/extractValidationProps.js

@@ -1,5 +1,5 @@
 export const DATE_VALIDATION_PROP_NAMES = ['disablePast', 'disableFuture', 'minDate', 'maxDate', 'shouldDisableDate', 'shouldDisableMonth', 'shouldDisableYear'];
-export const TIME_VALIDATION_PROP_NAMES = ['disablePast', 'disableFuture', 'minTime', 'maxTime', 'shouldDisableClock', 'shouldDisableTime', 'minutesStep', 'ampm', 'disableIgnoringDatePartForTimeValidation'];
+export const TIME_VALIDATION_PROP_NAMES = ['disablePast', 'disableFuture', 'minTime', 'maxTime', 'shouldDisableTime', 'minutesStep', 'ampm', 'disableIgnoringDatePartForTimeValidation'];
 export const DATE_TIME_VALIDATION_PROP_NAMES = ['minDateTime', 'maxDateTime'];
 const VALIDATION_PROP_NAMES = [...DATE_VALIDATION_PROP_NAMES, ...TIME_VALIDATION_PROP_NAMES, ...DATE_TIME_VALIDATION_PROP_NAMES];
 /**

package/internals/utils/validation/validateDate.js

@@ -15,7 +15,7 @@ export const validateDate = ({
     disableFuture,
     timezone
   } = props;
-  const now = adapter.utils.dateWithTimezone(undefined, timezone);
+  const now = adapter.utils.date(undefined, timezone);
   const minDate = applyDefaultDate(adapter.utils, props.minDate, adapter.defaultDates.minDate);
   const maxDate = applyDefaultDate(adapter.utils, props.maxDate, adapter.defaultDates.maxDate);
   switch (true) {

package/internals/utils/validation/validateTime.js

@@ -11,14 +11,13 @@ export const validateTime = ({
     minTime,
     maxTime,
     minutesStep,
-    shouldDisableClock,
     shouldDisableTime,
     disableIgnoringDatePartForTimeValidation = false,
     disablePast,
     disableFuture,
     timezone
   } = props;
-  const now = adapter.utils.dateWithTimezone(undefined, timezone);
+  const now = adapter.utils.date(undefined, timezone);
   const isAfter = createIsAfterIgnoreDatePart(disableIgnoringDatePartForTimeValidation, adapter.utils);
   switch (true) {
     case !adapter.utils.isValid(value):
@@ -37,12 +36,6 @@ export const validateTime = ({
       return 'shouldDisableTime-minutes';
     case Boolean(shouldDisableTime && shouldDisableTime(value, 'seconds')):
       return 'shouldDisableTime-seconds';
-    case Boolean(shouldDisableClock && shouldDisableClock(adapter.utils.getHours(value), 'hours')):
-      return 'shouldDisableClock-hours';
-    case Boolean(shouldDisableClock && shouldDisableClock(adapter.utils.getMinutes(value), 'minutes')):
-      return 'shouldDisableClock-minutes';
-    case Boolean(shouldDisableClock && shouldDisableClock(adapter.utils.getSeconds(value), 'seconds')):
-      return 'shouldDisableClock-seconds';
     case Boolean(minutesStep && adapter.utils.getMinutes(value) % minutesStep !== 0):
       return 'minutesStep';
     default:

package/legacy/AdapterDateFns/AdapterDateFns.js

@@ -288,8 +288,8 @@ export var AdapterDateFns = /*#__PURE__*/_createClass(function AdapterDateFns()
     }
     return new Date(value);
   };
-  this.dateWithTimezone = function (value) {
-    return _this.date(value);
+  this.getInvalidDate = function () {
+    return new Date('Invalid Date');
   };
   this.getTimezone = function () {
     return 'default';
@@ -387,10 +387,10 @@ export var AdapterDateFns = /*#__PURE__*/_createClass(function AdapterDateFns()
     return isBefore(value, comparing);
   };
   this.isBeforeYear = function (value, comparing) {
-    return isBefore(value, startOfYear(comparing));
+    return isBefore(value, _this.startOfYear(comparing));
   };
   this.isBeforeDay = function (value, comparing) {
-    return isBefore(value, startOfDay(comparing));
+    return isBefore(value, _this.startOfDay(comparing));
   };
   this.isWithinRange = function (value, _ref2) {
     var _ref3 = _slicedToArray(_ref2, 2),
@@ -496,20 +496,16 @@ export var AdapterDateFns = /*#__PURE__*/_createClass(function AdapterDateFns()
     return getDaysInMonth(value);
   };
   this.getWeekArray = function (value) {
-    var start = startOfWeek(startOfMonth(value), {
-      locale: _this.locale
-    });
-    var end = endOfWeek(endOfMonth(value), {
-      locale: _this.locale
-    });
+    var start = _this.startOfWeek(_this.startOfMonth(value));
+    var end = _this.endOfWeek(_this.endOfMonth(value));
     var count = 0;
     var current = start;
     var nestedWeeks = [];
-    while (isBefore(current, end)) {
+    while (_this.isBefore(current, end)) {
       var weekNumber = Math.floor(count / 7);
       nestedWeeks[weekNumber] = nestedWeeks[weekNumber] || [];
       nestedWeeks[weekNumber].push(current);
-      current = addDays(current, 1);
+      current = _this.addDays(current, 1);
       count += 1;
     }
     return nestedWeeks;
@@ -523,13 +519,13 @@ export var AdapterDateFns = /*#__PURE__*/_createClass(function AdapterDateFns()
     var _ref5 = _slicedToArray(_ref4, 2),
       start = _ref5[0],
       end = _ref5[1];
-    var startDate = startOfYear(start);
-    var endDate = endOfYear(end);
+    var startDate = _this.startOfYear(start);
+    var endDate = _this.endOfYear(end);
     var years = [];
     var current = startDate;
-    while (isBefore(current, endDate)) {
+    while (_this.isBefore(current, endDate)) {
       years.push(current);
-      current = addYears(current, 1);
+      current = _this.addYears(current, 1);
     }
     return years;
   };

package/legacy/AdapterDateFnsJalali/AdapterDateFnsJalali.js

@@ -300,8 +300,8 @@ export var AdapterDateFnsJalali = /*#__PURE__*/_createClass(function AdapterDate
     }
     return new Date(value);
   };
-  this.dateWithTimezone = function (value) {
-    return _this.date(value);
+  this.getInvalidDate = function () {
+    return new Date('Invalid Date');
   };
   this.getTimezone = function () {
     return 'default';
@@ -392,19 +392,19 @@ export var AdapterDateFnsJalali = /*#__PURE__*/_createClass(function AdapterDate
     return isAfter(value, comparing);
   };
   this.isAfterYear = function (value, comparing) {
-    return isAfter(value, endOfYear(comparing));
+    return isAfter(value, _this.endOfYear(comparing));
   };
   this.isAfterDay = function (value, comparing) {
-    return isAfter(value, endOfDay(comparing));
+    return isAfter(value, _this.endOfDay(comparing));
   };
   this.isBefore = function (value, comparing) {
     return isBefore(value, comparing);
   };
   this.isBeforeYear = function (value, comparing) {
-    return isBefore(value, startOfYear(comparing));
+    return isBefore(value, _this.startOfYear(comparing));
   };
   this.isBeforeDay = function (value, comparing) {
-    return isBefore(value, startOfDay(comparing));
+    return isBefore(value, _this.startOfDay(comparing));
   };
   this.isWithinRange = function (value, _ref2) {
     var _ref3 = _slicedToArray(_ref2, 2),
@@ -510,20 +510,16 @@ export var AdapterDateFnsJalali = /*#__PURE__*/_createClass(function AdapterDate
     return getDaysInMonth(value);
   };
   this.getWeekArray = function (value) {
-    var start = startOfWeek(startOfMonth(value), {
-      locale: _this.locale
-    });
-    var end = endOfWeek(endOfMonth(value), {
-      locale: _this.locale
-    });
+    var start = _this.startOfWeek(_this.startOfMonth(value));
+    var end = _this.endOfWeek(_this.endOfMonth(value));
     var count = 0;
     var current = start;
     var nestedWeeks = [];
-    while (isBefore(current, end)) {
+    while (_this.isBefore(current, end)) {
       var weekNumber = Math.floor(count / 7);
       nestedWeeks[weekNumber] = nestedWeeks[weekNumber] || [];
       nestedWeeks[weekNumber].push(current);
-      current = addDays(current, 1);
+      current = _this.addDays(current, 1);
       count += 1;
     }
     return nestedWeeks;
@@ -537,13 +533,13 @@ export var AdapterDateFnsJalali = /*#__PURE__*/_createClass(function AdapterDate
     var _ref5 = _slicedToArray(_ref4, 2),
       start = _ref5[0],
       end = _ref5[1];
-    var startDate = startOfYear(start);
-    var endDate = endOfYear(end);
+    var startDate = _this.startOfYear(start);
+    var endDate = _this.endOfYear(end);
     var years = [];
     var current = startDate;
-    while (isBefore(current, endDate)) {
+    while (_this.isBefore(current, endDate)) {
       years.push(current);
-      current = addYears(current, 1);
+      current = _this.addYears(current, 1);
     }
     return years;
   };

package/legacy/AdapterDayjs/AdapterDayjs.js

@@ -4,13 +4,13 @@ import _createClass from "@babel/runtime/helpers/esm/createClass";
 import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
 /* eslint-disable class-methods-use-this */
 import defaultDayjs from 'dayjs';
-import weekOfYear from 'dayjs/plugin/weekOfYear';
+import weekOfYearPlugin from 'dayjs/plugin/weekOfYear';
 import customParseFormatPlugin from 'dayjs/plugin/customParseFormat';
 import localizedFormatPlugin from 'dayjs/plugin/localizedFormat';
 import isBetweenPlugin from 'dayjs/plugin/isBetween';
 import { buildWarning } from '../internals/utils/warning';
-defaultDayjs.extend(customParseFormatPlugin);
 defaultDayjs.extend(localizedFormatPlugin);
+defaultDayjs.extend(weekOfYearPlugin);
 defaultDayjs.extend(isBetweenPlugin);
 var localeNotFoundWarning = buildWarning(['Your locale has not been found.', 'Either the locale key is not a supported one. Locales supported by dayjs are available here: https://github.com/iamkun/dayjs/tree/dev/src/locale', "Or you forget to import the locale from 'dayjs/locale/{localeUsed}'", 'fallback on English locale']);
 var formatTokenMap = {
@@ -272,12 +272,7 @@ export var AdapterDayjs = /*#__PURE__*/_createClass(function AdapterDayjs() {
     return value;
   };
   this.date = function (value) {
-    if (value === null) {
-      return null;
-    }
-    return _this.dayjs(value);
-  };
-  this.dateWithTimezone = function (value, timezone) {
+    var timezone = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'default';
     if (value === null) {
       return null;
     }
@@ -294,6 +289,9 @@ export var AdapterDayjs = /*#__PURE__*/_createClass(function AdapterDayjs() {
     }
     return parsedValue.locale(_this.locale);
   };
+  this.getInvalidDate = function () {
+    return defaultDayjs(new Date('Invalid date'));
+  };
   this.getTimezone = function (value) {
     if (_this.hasTimezonePlugin()) {
       var _value$$x;
@@ -530,8 +528,8 @@ export var AdapterDayjs = /*#__PURE__*/_createClass(function AdapterDayjs() {
   };
   this.getWeekArray = function (value) {
     var cleanValue = _this.setLocaleToValue(value);
-    var start = cleanValue.startOf('month').startOf('week');
-    var end = cleanValue.endOf('month').endOf('week');
+    var start = _this.startOfWeek(_this.startOfMonth(cleanValue));
+    var end = _this.endOfWeek(_this.endOfMonth(cleanValue));
     var count = 0;
     var current = start;
     var nestedWeeks = [];
@@ -551,11 +549,11 @@ export var AdapterDayjs = /*#__PURE__*/_createClass(function AdapterDayjs() {
     var _ref5 = _slicedToArray(_ref4, 2),
       start = _ref5[0],
       end = _ref5[1];
-    var startDate = start.startOf('year');
-    var endDate = end.endOf('year');
+    var startDate = _this.startOfYear(start);
+    var endDate = _this.endOfYear(end);
     var years = [];
     var current = startDate;
-    while (current < endDate) {
+    while (_this.isBefore(current, endDate)) {
       years.push(current);
       current = _this.addYears(current, 1);
     }
@@ -564,5 +562,8 @@ export var AdapterDayjs = /*#__PURE__*/_createClass(function AdapterDayjs() {
   this.dayjs = withLocale(defaultDayjs, _locale);
   this.locale = _locale;
   this.formats = _extends({}, defaultFormats, formats);
-  defaultDayjs.extend(weekOfYear);
+
+  // Moved plugins to the constructor to allow for users to use options on the library
+  // for reference: https://github.com/mui/mui-x/pull/11151
+  defaultDayjs.extend(customParseFormatPlugin);
 });

package/legacy/AdapterLuxon/AdapterLuxon.js

@@ -184,28 +184,7 @@ export var AdapterLuxon = /*#__PURE__*/_createClass(function AdapterLuxon() {
     return value.setLocale(expectedLocale);
   };
   this.date = function (value) {
-    if (typeof value === 'undefined') {
-      return DateTime.local();
-    }
-    if (value === null) {
-      return null;
-    }
-    if (typeof value === 'string') {
-      // @ts-ignore
-      return DateTime.fromJSDate(new Date(value), {
-        locale: _this.locale
-      });
-    }
-    if (DateTime.isDateTime(value)) {
-      return value;
-    }
-
-    // @ts-ignore
-    return DateTime.fromJSDate(value, {
-      locale: _this.locale
-    });
-  };
-  this.dateWithTimezone = function (value, timezone) {
+    var timezone = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'default';
     if (value === null) {
       return null;
     }
@@ -223,6 +202,9 @@ export var AdapterLuxon = /*#__PURE__*/_createClass(function AdapterLuxon() {
       zone: timezone
     });
   };
+  this.getInvalidDate = function () {
+    return DateTime.fromJSDate(new Date('Invalid Date'));
+  };
   this.getTimezone = function (value) {
     // When using the system zone, we want to return "system", not something like "Europe/Paris"
     if (value.zone.type === 'system') {
@@ -333,12 +315,12 @@ export var AdapterLuxon = /*#__PURE__*/_createClass(function AdapterLuxon() {
   };
   this.isAfterYear = function (value, comparing) {
     var comparingInValueTimezone = _this.setTimezone(comparing, _this.getTimezone(value));
-    var diff = value.diff(comparingInValueTimezone.endOf('year'), 'years').toObject();
+    var diff = value.diff(_this.endOfYear(comparingInValueTimezone), 'years').toObject();
     return diff.years > 0;
   };
   this.isAfterDay = function (value, comparing) {
     var comparingInValueTimezone = _this.setTimezone(comparing, _this.getTimezone(value));
-    var diff = value.diff(comparingInValueTimezone.endOf('day'), 'days').toObject();
+    var diff = value.diff(_this.endOfDay(comparingInValueTimezone), 'days').toObject();
     return diff.days > 0;
   };
   this.isBefore = function (value, comparing) {
@@ -346,12 +328,12 @@ export var AdapterLuxon = /*#__PURE__*/_createClass(function AdapterLuxon() {
   };
   this.isBeforeYear = function (value, comparing) {
     var comparingInValueTimezone = _this.setTimezone(comparing, _this.getTimezone(value));
-    var diff = value.diff(comparingInValueTimezone.startOf('year'), 'years').toObject();
+    var diff = value.diff(_this.startOfYear(comparingInValueTimezone), 'years').toObject();
     return diff.years < 0;
   };
   this.isBeforeDay = function (value, comparing) {
     var comparingInValueTimezone = _this.setTimezone(comparing, _this.getTimezone(value));
-    var diff = value.diff(comparingInValueTimezone.startOf('day'), 'days').toObject();
+    var diff = value.diff(_this.startOfDay(comparingInValueTimezone), 'days').toObject();
     return diff.days < 0;
   };
   this.isWithinRange = function (value, _ref2) {
@@ -367,7 +349,12 @@ export var AdapterLuxon = /*#__PURE__*/_createClass(function AdapterLuxon() {
     return value.startOf('month');
   };
   this.startOfWeek = function (value) {
-    return value.startOf('week');
+    return value.startOf('week',
+    // TODO: remove when `@types/luxon` add support for the parameter.
+    // @ts-ignore
+    {
+      useLocaleWeeks: true
+    });
   };
   this.startOfDay = function (value) {
     return value.startOf('day');
@@ -379,7 +366,12 @@ export var AdapterLuxon = /*#__PURE__*/_createClass(function AdapterLuxon() {
     return value.endOf('month');
   };
   this.endOfWeek = function (value) {
-    return value.endOf('week');
+    return value.endOf('week',
+    // TODO: remove when `@types/luxon` add support for the parameter.
+    // @ts-ignore
+    {
+      useLocaleWeeks: true
+    });
   };
   this.endOfDay = function (value) {
     return value.endOf('day');
@@ -481,13 +473,15 @@ export var AdapterLuxon = /*#__PURE__*/_createClass(function AdapterLuxon() {
   };
   this.getWeekArray = function (value) {
     var cleanValue = _this.setLocaleToValue(value);
-    var _cleanValue$endOf$end = cleanValue.endOf('month').endOf('week').diff(cleanValue.startOf('month').startOf('week'), 'days').toObject(),
-      days = _cleanValue$endOf$end.days;
+    var firstDay = _this.startOfWeek(_this.startOfMonth(cleanValue));
+    var lastDay = _this.endOfWeek(_this.endOfMonth(cleanValue));
+    var _lastDay$diff$toObjec = lastDay.diff(firstDay, 'days').toObject(),
+      days = _lastDay$diff$toObjec.days;
     var weeks = [];
     new Array(Math.round(days)).fill(0).map(function (_, i) {
       return i;
     }).map(function (day) {
-      return cleanValue.startOf('month').startOf('week').plus({
+      return firstDay.plus({
         days: day
       });
     }).forEach(function (v, i) {
@@ -500,21 +494,22 @@ export var AdapterLuxon = /*#__PURE__*/_createClass(function AdapterLuxon() {
     return weeks;
   };
   this.getWeekNumber = function (value) {
-    return value.weekNumber;
+    var _value$localeWeekNumb;
+    // TODO: remove when `@types/luxon` add support for the parameter.
+    // @ts-ignore
+    return (_value$localeWeekNumb = value.localeWeekNumber) != null ? _value$localeWeekNumb : value.weekNumber;
   };
   this.getYearRange = function (_ref4) {
     var _ref5 = _slicedToArray(_ref4, 2),
       start = _ref5[0],
       end = _ref5[1];
-    var startDate = start.startOf('year');
-    var endDate = end.endOf('year');
-    var current = startDate;
+    var startDate = _this.startOfYear(start);
+    var endDate = _this.endOfYear(end);
     var years = [];
-    while (current < endDate) {
+    var current = startDate;
+    while (_this.isBefore(current, endDate)) {
       years.push(current);
-      current = current.plus({
-        year: 1
-      });
+      current = _this.addYears(current, 1);
     }
     return years;
   };