@mui/x-date-pickers 7.0.0-alpha.2 → 7.0.0-alpha.4

package/internals/components/PickersTextField/pickersTextFieldClasses.d.ts

@@ -0,0 +1,46 @@
+export interface PickersTextFieldClasses {
+    /** Styles applied to the root element. */
+    root: string;
+    /** Styles applied to the root element if focused. */
+    focused: string;
+    /** State class applied to the root element if `disabled=true`. */
+    disabled: string;
+    /** State class applied to the root element if `error=true`. */
+    error: string;
+    /** State class applied to the root element id `required=true` */
+    required: string;
+}
+export type PickersTextFieldClassKey = keyof PickersTextFieldClasses;
+export declare function getPickersTextFieldUtilityClass(slot: string): string;
+export declare const pickersTextFieldClasses: Record<keyof PickersTextFieldClasses, string>;
+export interface PickersInputClasses {
+    /** Styles applied to the root element. */
+    root: string;
+    /** Styles applied to the root element if focused. */
+    focused: string;
+    /** State class applied to the root element if `disabled=true`. */
+    disabled: string;
+    /** State class applied to the root element if `readOnly=true`. */
+    readOnly: string;
+    /** State class applied to the root element if `error=true`. */
+    error: string;
+    /** Styles applied to the NotchedOutline element. */
+    notchedOutline: string;
+    /** Styles applied to the real hidden input element. */
+    input: string;
+    /** Styles applied to the container of the sections. */
+    sectionsContainer: string;
+    /** Styles applied to the content of a section. */
+    sectionContent: string;
+    /** Styles applied to the separator before a section */
+    sectionBefore: string;
+    /** Styles applied to the separator after a section */
+    sectionAfter: string;
+    /** Styles applied to the root if there is a startAdornment present */
+    adornedStart: string;
+    /** Styles applied to the root if there is an endAdornment present */
+    adornedEnd: string;
+}
+export type PickersInputClassKey = keyof PickersInputClasses;
+export declare function getPickersInputUtilityClass(slot: string): string;
+export declare const pickersInputClasses: Record<keyof PickersInputClasses, string>;

package/internals/components/PickersTextField/pickersTextFieldClasses.js

@@ -0,0 +1,9 @@
+import { unstable_generateUtilityClass as generateUtilityClass, unstable_generateUtilityClasses as generateUtilityClasses } from '@mui/utils';
+export function getPickersTextFieldUtilityClass(slot) {
+  return generateUtilityClass('MuiPickersTextField', slot);
+}
+export const pickersTextFieldClasses = generateUtilityClasses('MuiPickersTextField', ['root', 'focused', 'disabled', 'error', 'required']);
+export function getPickersInputUtilityClass(slot) {
+  return generateUtilityClass('MuiPickersInput', slot);
+}
+export const pickersInputClasses = generateUtilityClasses('MuiPickersInput', ['root', 'focused', 'disabled', 'error', 'notchedOutline', 'adornedStart', 'adornedEnd', 'input', 'sectionsContainer', 'sectionContent', 'sectionBefore', 'sectionAfter']);

package/internals/constants/dimensions.d.ts

@@ -2,6 +2,6 @@ export declare const DAY_SIZE = 36;
 export declare const DAY_MARGIN = 2;
 export declare const DIALOG_WIDTH = 320;
 export declare const MAX_CALENDAR_HEIGHT = 280;
-export declare const VIEW_HEIGHT = 334;
+export declare const VIEW_HEIGHT = 336;
 export declare const DIGITAL_CLOCK_VIEW_HEIGHT = 232;
 export declare const MULTI_SECTION_CLOCK_SECTION_WIDTH = 48;

package/internals/constants/dimensions.js

@@ -2,6 +2,6 @@ export const DAY_SIZE = 36;
 export const DAY_MARGIN = 2;
 export const DIALOG_WIDTH = 320;
 export const MAX_CALENDAR_HEIGHT = 280;
-export const VIEW_HEIGHT = 334;
+export const VIEW_HEIGHT = 336;
 export const DIGITAL_CLOCK_VIEW_HEIGHT = 232;
 export const MULTI_SECTION_CLOCK_SECTION_WIDTH = 48;

package/internals/demo/DemoContainer.d.ts

@@ -9,12 +9,16 @@ interface DemoItemProps {
     label?: React.ReactNode;
     component?: string;
     children: React.ReactNode;
+    sx?: SxProps<Theme>;
 }
 /**
  * WARNING: This is an internal component used in documentation to achieve a desired layout.
  * Please do not use it in your application.
  */
 export declare function DemoItem(props: DemoItemProps): React.JSX.Element;
+export declare namespace DemoItem {
+    var displayName: string;
+}
 /**
  * WARNING: This is an internal component used in documentation to achieve a desired layout.
  * Please do not use it in your application.

package/internals/demo/DemoContainer.js

@@ -1,6 +1,6 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
 import * as React from 'react';
-import Stack from '@mui/material/Stack';
+import Stack, { stackClasses } from '@mui/material/Stack';
 import Typography from '@mui/material/Typography';
 import { textFieldClasses } from '@mui/material/TextField';
 import { jsx as _jsx } from "react/jsx-runtime";
@@ -40,20 +40,20 @@ export function DemoItem(props) {
   const {
     label,
     children,
-    component
+    component,
+    sx: sxProp
   } = props;
   let spacing;
-  let sx;
+  let sx = sxProp;
   if (component && getChildTypeFromChildName(component) === 'multi-input-range-field') {
     spacing = 1.5;
-    sx = {
+    sx = _extends({}, sx, {
       [`& .${textFieldClasses.root}`]: {
         flexGrow: 1
       }
-    };
+    });
   } else {
     spacing = 1;
-    sx = undefined;
   }
   return /*#__PURE__*/_jsxs(Stack, {
     direction: "column",
@@ -66,7 +66,14 @@ export function DemoItem(props) {
     }), children]
   });
 }
-
+DemoItem.displayName = 'DemoItem';
+const isDemoItem = child => {
+  if ( /*#__PURE__*/React.isValidElement(child) && typeof child.type !== 'string') {
+    // @ts-ignore
+    return child.type.displayName === 'DemoItem';
+  }
+  return false;
+};
 /**
  * WARNING: This is an internal component used in documentation to achieve a desired layout.
  * Please do not use it in your application.
@@ -91,7 +98,9 @@ export function DemoContainer(props) {
   };
   let direction;
   let spacing;
-  let sx = _extends({
+  let extraSx = {};
+  let demoItemSx = {};
+  const sx = _extends({
     overflow: 'auto',
     // Add padding as overflow can hide the outline text field label.
     pt: 1
@@ -113,38 +122,57 @@ export function DemoContainer(props) {
     // noop
   } else if (childrenTypes.has('single-input-range-field')) {
     if (!childrenSupportedSections.has('date-time')) {
-      sx = _extends({}, sx, {
+      extraSx = {
         [`& > .${textFieldClasses.root}`]: {
           minWidth: 300
         }
-      });
+      };
     } else {
-      sx = _extends({}, sx, {
+      extraSx = {
         [`& > .${textFieldClasses.root}`]: {
           minWidth: {
             xs: 300,
-            md: 400
+            // If demo also contains MultiInputDateTimeRangeField, increase width to avoid cutting off the value.
+            md: childrenTypes.has('multi-input-range-field') ? 460 : 400
           }
         }
-      });
+      };
     }
   } else if (childrenSupportedSections.has('date-time')) {
-    sx = _extends({}, sx, {
+    extraSx = {
       [`& > .${textFieldClasses.root}`]: {
         minWidth: 270
       }
-    });
+    };
+    if (childrenTypes.has('multi-input-range-field')) {
+      // increase width for the multi input date time range fields
+      demoItemSx = {
+        [`& > .${stackClasses.root} > .${textFieldClasses.root}`]: {
+          minWidth: 210
+        }
+      };
+    }
   } else {
-    sx = _extends({}, sx, {
+    extraSx = {
       [`& > .${textFieldClasses.root}`]: {
         minWidth: 200
       }
-    });
+    };
   }
+  const finalSx = _extends({}, sx, extraSx);
   return /*#__PURE__*/_jsx(Stack, {
     direction: direction,
     spacing: spacing,
-    sx: sx,
-    children: children
+    sx: finalSx,
+    children: React.Children.map(children, child => {
+      if ( /*#__PURE__*/React.isValidElement(child) && isDemoItem(child)) {
+        // Inject sx styles to the `DemoItem` if it is a direct child of `DemoContainer`.
+        // @ts-ignore
+        return /*#__PURE__*/React.cloneElement(child, {
+          sx: _extends({}, extraSx, demoItemSx)
+        });
+      }
+      return child;
+    })
   });
 }

package/internals/hooks/useClockReferenceDate.js

@@ -21,6 +21,5 @@ export const useClockReferenceDate = ({
   // We only want to compute the reference date on mount.
   [] // eslint-disable-line react-hooks/exhaustive-deps
   );
-
   return value != null ? value : referenceDate;
 };

package/internals/hooks/useField/useField.utils.js

@@ -125,7 +125,6 @@ export const adjustSectionValue = (utils, timezone, section, keyCode, sectionsVa
       if (delta < 0 || isStart) {
         newSectionValueNumber += step - (step + newSectionValueNumber) % step; // for JS -3 % 5 = -3 (should be 2)
       }
-
       if (delta > 0 || isEnd) {
         newSectionValueNumber -= newSectionValueNumber % step;
       }
@@ -207,49 +206,62 @@ export const addPositionPropertiesToSections = (sections, isRTL) => {
   }
   return newSections;
 };
-const getSectionPlaceholder = (utils, timezone, localeText, sectionConfig, currentTokenValue) => {
+const getSectionPlaceholder = (utils, timezone, localeText, sectionConfig, sectionFormat) => {
   switch (sectionConfig.type) {
     case 'year':
       {
         return localeText.fieldYearPlaceholder({
-          digitAmount: utils.formatByString(utils.date(undefined, timezone), currentTokenValue).length
+          digitAmount: utils.formatByString(utils.date(undefined, timezone), sectionFormat).length,
+          format: sectionFormat
         });
       }
     case 'month':
       {
         return localeText.fieldMonthPlaceholder({
-          contentType: sectionConfig.contentType
+          contentType: sectionConfig.contentType,
+          format: sectionFormat
         });
       }
     case 'day':
       {
-        return localeText.fieldDayPlaceholder();
+        return localeText.fieldDayPlaceholder({
+          format: sectionFormat
+        });
       }
     case 'weekDay':
       {
         return localeText.fieldWeekDayPlaceholder({
-          contentType: sectionConfig.contentType
+          contentType: sectionConfig.contentType,
+          format: sectionFormat
         });
       }
     case 'hours':
       {
-        return localeText.fieldHoursPlaceholder();
+        return localeText.fieldHoursPlaceholder({
+          format: sectionFormat
+        });
       }
     case 'minutes':
       {
-        return localeText.fieldMinutesPlaceholder();
+        return localeText.fieldMinutesPlaceholder({
+          format: sectionFormat
+        });
       }
     case 'seconds':
       {
-        return localeText.fieldSecondsPlaceholder();
+        return localeText.fieldSecondsPlaceholder({
+          format: sectionFormat
+        });
       }
     case 'meridiem':
       {
-        return localeText.fieldMeridiemPlaceholder();
+        return localeText.fieldMeridiemPlaceholder({
+          format: sectionFormat
+        });
       }
     default:
       {
-        return currentTokenValue;
+        return sectionFormat;
       }
   }
 };
@@ -387,7 +399,6 @@ export const splitFormatIntoSections = (utils, timezone, localeText, format, dat
   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);

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

@@ -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/useViews.js

@@ -61,7 +61,6 @@ export function useViews({
       setFocusedView(prevFocusedView => viewToFocus === prevFocusedView ? null : prevFocusedView // If false the blur is due to view switching
       );
     }
-
     onFocusedViewChange == null || onFocusedViewChange(viewToFocus, hasFocus);
   });
   const handleChangeView = useEventCallback(newView => {

package/legacy/AdapterDateFns/AdapterDateFns.js

@@ -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

@@ -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 = {
@@ -528,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 = [];
@@ -549,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);
     }
@@ -562,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

@@ -238,7 +238,6 @@ export var AdapterLuxon = /*#__PURE__*/_createClass(function AdapterLuxon() {
     if (typeof Intl === 'undefined' || typeof Intl.DateTimeFormat === 'undefined') {
       return true; // Luxon defaults to en-US if Intl not found
     }
-
     return Boolean((_Intl$DateTimeFormat = new Intl.DateTimeFormat(_this.locale, {
       hour: 'numeric'
     })) == null || (_Intl$DateTimeFormat = _Intl$DateTimeFormat.resolvedOptions()) == null ? void 0 : _Intl$DateTimeFormat.hour12);
@@ -315,12 +314,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) {
@@ -328,12 +327,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) {
@@ -349,7 +348,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');
@@ -361,7 +365,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');
@@ -463,13 +472,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) {
@@ -482,21 +493,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;
   };