@mui/x-date-pickers-pro 8.5.3 → 8.7.0

package/internals/utils/date-range-manager.js

@@ -5,9 +5,16 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.calculateRangeChange = calculateRangeChange;
 exports.calculateRangePreview = calculateRangePreview;
+exports.resolveReferenceDate = resolveReferenceDate;
 var _internals = require("@mui/x-date-pickers/internals");
+function resolveReferenceDate(referenceDate, rangePosition) {
+  if (Array.isArray(referenceDate)) {
+    return rangePosition === 'start' ? referenceDate[0] : referenceDate[1];
+  }
+  return referenceDate;
+}
 function calculateRangeChange({
-  utils,
+  adapter,
   range,
   newDate: selectedDate,
   rangePosition,
@@ -15,18 +22,18 @@ function calculateRangeChange({
   shouldMergeDateAndTime = false,
   referenceDate
 }) {
-  const start = !utils.isValid(range[0]) ? null : range[0];
-  const end = !utils.isValid(range[1]) ? null : range[1];
+  const start = !adapter.isValid(range[0]) ? null : range[0];
+  const end = !adapter.isValid(range[1]) ? null : range[1];
   if (shouldMergeDateAndTime && selectedDate) {
     // If there is a date already selected, then we want to keep its time
     if (start && rangePosition === 'start') {
-      selectedDate = (0, _internals.mergeDateAndTime)(utils, selectedDate, start);
+      selectedDate = (0, _internals.mergeDateAndTime)(adapter, selectedDate, start);
     }
     if (end && rangePosition === 'end') {
-      selectedDate = (0, _internals.mergeDateAndTime)(utils, selectedDate, end);
+      selectedDate = (0, _internals.mergeDateAndTime)(adapter, selectedDate, end);
     }
   }
-  const newSelectedDate = referenceDate && selectedDate && shouldMergeDateAndTime ? (0, _internals.mergeDateAndTime)(utils, selectedDate, referenceDate) : selectedDate;
+  const newSelectedDate = referenceDate && selectedDate && shouldMergeDateAndTime ? (0, _internals.mergeDateAndTime)(adapter, selectedDate, resolveReferenceDate(referenceDate, rangePosition)) : selectedDate;
   if (rangePosition === 'start') {
     const truthyResult = allowRangeFlip ? {
       nextSelection: 'start',
@@ -35,7 +42,7 @@ function calculateRangeChange({
       nextSelection: 'end',
       newRange: [newSelectedDate, null]
     };
-    return Boolean(end) && utils.isAfter(newSelectedDate, end) ? truthyResult : {
+    return Boolean(end) && adapter.isAfter(newSelectedDate, end) ? truthyResult : {
       nextSelection: 'end',
       newRange: [newSelectedDate, end]
     };
@@ -47,7 +54,7 @@ function calculateRangeChange({
     nextSelection: 'end',
     newRange: [newSelectedDate, null]
   };
-  return Boolean(start) && utils.isBeforeDay(newSelectedDate, start) ? truthyResult : {
+  return Boolean(start) && adapter.isBeforeDay(newSelectedDate, start) ? truthyResult : {
     nextSelection: 'start',
     newRange: [start, newSelectedDate]
   };

package/internals/utils/date-utils.d.ts

@@ -1,7 +1,7 @@
 import { AdapterFormats, MuiPickersAdapter, PickerValidDate } from '@mui/x-date-pickers/models';
 import { PickerNonNullableRangeValue, PickerRangeValue } from '@mui/x-date-pickers/internals';
-export declare const isRangeValid: (utils: MuiPickersAdapter, range: PickerRangeValue) => range is PickerNonNullableRangeValue;
-export declare const isWithinRange: (utils: MuiPickersAdapter, day: PickerValidDate, range: PickerRangeValue) => boolean;
-export declare const isStartOfRange: (utils: MuiPickersAdapter, day: PickerValidDate, range: PickerRangeValue) => boolean;
-export declare const isEndOfRange: (utils: MuiPickersAdapter, day: PickerValidDate, range: PickerRangeValue) => boolean;
-export declare const formatRange: (utils: MuiPickersAdapter, range: PickerRangeValue, formatKey: keyof AdapterFormats) => string | null;
+export declare const isRangeValid: (adapter: MuiPickersAdapter, range: PickerRangeValue) => range is PickerNonNullableRangeValue;
+export declare const isWithinRange: (adapter: MuiPickersAdapter, day: PickerValidDate, range: PickerRangeValue) => boolean;
+export declare const isStartOfRange: (adapter: MuiPickersAdapter, day: PickerValidDate, range: PickerRangeValue) => boolean;
+export declare const isEndOfRange: (adapter: MuiPickersAdapter, day: PickerValidDate, range: PickerRangeValue) => boolean;
+export declare const formatRange: (adapter: MuiPickersAdapter, range: PickerRangeValue, formatKey: keyof AdapterFormats) => string | null;

package/internals/utils/date-utils.js

@@ -4,26 +4,26 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.isWithinRange = exports.isStartOfRange = exports.isRangeValid = exports.isEndOfRange = exports.formatRange = void 0;
-const isRangeValid = (utils, range) => {
-  return utils.isValid(range[0]) && utils.isValid(range[1]) && !utils.isBefore(range[1], range[0]);
+const isRangeValid = (adapter, range) => {
+  return adapter.isValid(range[0]) && adapter.isValid(range[1]) && !adapter.isBefore(range[1], range[0]);
 };
 exports.isRangeValid = isRangeValid;
-const isWithinRange = (utils, day, range) => {
-  return isRangeValid(utils, range) && utils.isWithinRange(day, range);
+const isWithinRange = (adapter, day, range) => {
+  return isRangeValid(adapter, range) && adapter.isWithinRange(day, range);
 };
 exports.isWithinRange = isWithinRange;
-const isStartOfRange = (utils, day, range) => {
-  return isRangeValid(utils, range) && utils.isSameDay(day, range[0]);
+const isStartOfRange = (adapter, day, range) => {
+  return isRangeValid(adapter, range) && adapter.isSameDay(day, range[0]);
 };
 exports.isStartOfRange = isStartOfRange;
-const isEndOfRange = (utils, day, range) => {
-  return isRangeValid(utils, range) && utils.isSameDay(day, range[1]);
+const isEndOfRange = (adapter, day, range) => {
+  return isRangeValid(adapter, range) && adapter.isSameDay(day, range[1]);
 };
 exports.isEndOfRange = isEndOfRange;
-const formatRange = (utils, range, formatKey) => {
-  if (!isRangeValid(utils, range)) {
+const formatRange = (adapter, range, formatKey) => {
+  if (!isRangeValid(adapter, range)) {
     return null;
   }
-  return `${utils.format(range[0], formatKey)} - ${utils.format(range[1], formatKey)}`;
+  return `${adapter.format(range[0], formatKey)} - ${adapter.format(range[1], formatKey)}`;
 };
 exports.formatRange = formatRange;

package/internals/utils/valueManagers.js

@@ -19,35 +19,37 @@ const rangeValueManager = exports.rangeValueManager = {
         referenceDate: referenceDateProp
       } = _ref,
       params = (0, _objectWithoutPropertiesLoose2.default)(_ref, _excluded);
-    const shouldKeepStartDate = params.utils.isValid(value[0]);
-    const shouldKeepEndDate = params.utils.isValid(value[1]);
+    const shouldKeepStartDate = params.adapter.isValid(value[0]);
+    const shouldKeepEndDate = params.adapter.isValid(value[1]);
     if (shouldKeepStartDate && shouldKeepEndDate) {
       return value;
     }
     const referenceDate = referenceDateProp ?? (0, _internals.getDefaultReferenceDate)(params);
-    return [shouldKeepStartDate ? value[0] : referenceDate, shouldKeepEndDate ? value[1] : referenceDate];
+    const startReferenceDate = Array.isArray(referenceDate) ? referenceDate[0] : referenceDate;
+    const endReferenceDate = Array.isArray(referenceDate) ? referenceDate[1] : referenceDate;
+    return [shouldKeepStartDate ? value[0] : startReferenceDate, shouldKeepEndDate ? value[1] : endReferenceDate];
   },
   cleanValue: (utils, value) => value.map(date => (0, _internals.replaceInvalidDateByNull)(utils, date)),
   areValuesEqual: (utils, a, b) => (0, _internals.areDatesEqual)(utils, a[0], b[0]) && (0, _internals.areDatesEqual)(utils, a[1], b[1]),
   isSameError: (a, b) => b !== null && a[1] === b[1] && a[0] === b[0],
   hasError: error => error[0] != null || error[1] != null,
   defaultErrorState: [null, null],
-  getTimezone: (utils, value) => {
-    const timezoneStart = utils.isValid(value[0]) ? utils.getTimezone(value[0]) : null;
-    const timezoneEnd = utils.isValid(value[1]) ? utils.getTimezone(value[1]) : null;
+  getTimezone: (adapter, value) => {
+    const timezoneStart = adapter.isValid(value[0]) ? adapter.getTimezone(value[0]) : null;
+    const timezoneEnd = adapter.isValid(value[1]) ? adapter.getTimezone(value[1]) : null;
     if (timezoneStart != null && timezoneEnd != null && timezoneStart !== timezoneEnd) {
       throw new Error('MUI X: The timezone of the start and the end date should be the same.');
     }
     return timezoneStart ?? timezoneEnd;
   },
-  setTimezone: (utils, timezone, value) => [value[0] == null ? null : utils.setTimezone(value[0], timezone), value[1] == null ? null : utils.setTimezone(value[1], timezone)]
+  setTimezone: (adapter, timezone, value) => [value[0] == null ? null : adapter.setTimezone(value[0], timezone), value[1] == null ? null : adapter.setTimezone(value[1], timezone)]
 };
 const getRangeFieldValueManager = ({
   dateSeparator = '–'
 }) => ({
-  updateReferenceValue: (utils, value, prevReferenceValue) => {
-    const shouldKeepStartDate = utils.isValid(value[0]);
-    const shouldKeepEndDate = utils.isValid(value[1]);
+  updateReferenceValue: (adapter, value, prevReferenceValue) => {
+    const shouldKeepStartDate = adapter.isValid(value[0]);
+    const shouldKeepEndDate = adapter.isValid(value[1]);
     if (!shouldKeepStartDate && !shouldKeepEndDate) {
       return prevReferenceValue;
     }

package/managers/useDateRangeManager.js

@@ -32,16 +32,16 @@ function useDateRangeManager(parameters = {}) {
   }), [enableAccessibleFieldDOMStructure, dateSeparator]);
 }
 function useOpenPickerButtonAriaLabel(value) {
-  const utils = (0, _internals.useUtils)();
+  const adapter = (0, _hooks.usePickerAdapter)();
   const translations = (0, _hooks.usePickerTranslations)();
   return React.useMemo(() => {
-    return translations.openRangePickerDialogue((0, _dateUtils.formatRange)(utils, value, 'fullDate'));
-  }, [value, translations, utils]);
+    return translations.openRangePickerDialogue((0, _dateUtils.formatRange)(adapter, value, 'fullDate'));
+  }, [value, translations, adapter]);
 }
 function useApplyDefaultValuesToDateRangeFieldInternalProps(internalProps) {
-  const utils = (0, _internals.useUtils)();
+  const adapter = (0, _hooks.usePickerAdapter)();
   const validationProps = (0, _internals.useApplyDefaultValuesToDateValidationProps)(internalProps);
   return React.useMemo(() => (0, _extends2.default)({}, internalProps, validationProps, {
-    format: internalProps.format ?? utils.formats.keyboardDate
-  }), [internalProps, validationProps, utils]);
+    format: internalProps.format ?? adapter.formats.keyboardDate
+  }), [internalProps, validationProps, adapter]);
 }

package/managers/useDateTimeRangeManager.js

@@ -32,17 +32,17 @@ function useDateTimeRangeManager(parameters = {}) {
   }), [enableAccessibleFieldDOMStructure, dateSeparator]);
 }
 function useOpenPickerButtonAriaLabel(value) {
-  const utils = (0, _internals.useUtils)();
+  const adapter = (0, _hooks.usePickerAdapter)();
   const translations = (0, _hooks.usePickerTranslations)();
   return React.useMemo(() => {
-    return translations.openRangePickerDialogue((0, _dateUtils.formatRange)(utils, value, 'fullDate'));
-  }, [value, translations, utils]);
+    return translations.openRangePickerDialogue((0, _dateUtils.formatRange)(adapter, value, 'fullDate'));
+  }, [value, translations, adapter]);
 }
 function useApplyDefaultValuesToDateTimeRangeFieldInternalProps(internalProps) {
-  const utils = (0, _internals.useUtils)();
+  const adapter = (0, _hooks.usePickerAdapter)();
   const validationProps = (0, _internals.useApplyDefaultValuesToDateTimeValidationProps)(internalProps);
-  const ampm = React.useMemo(() => internalProps.ampm ?? utils.is12HourCycleInCurrentLocale(), [internalProps.ampm, utils]);
+  const ampm = React.useMemo(() => internalProps.ampm ?? adapter.is12HourCycleInCurrentLocale(), [internalProps.ampm, adapter]);
   return React.useMemo(() => (0, _extends2.default)({}, internalProps, validationProps, {
-    format: internalProps.format ?? (ampm ? utils.formats.keyboardDateTime12h : utils.formats.keyboardDateTime24h)
-  }), [internalProps, validationProps, ampm, utils]);
+    format: internalProps.format ?? (ampm ? adapter.formats.keyboardDateTime12h : adapter.formats.keyboardDateTime24h)
+  }), [internalProps, validationProps, ampm, adapter]);
 }

package/managers/useTimeRangeManager.js

@@ -34,19 +34,19 @@ function useTimeRangeManager(parameters = {}) {
 }
 function createUseOpenPickerButtonAriaLabel(ampm) {
   return function useOpenPickerButtonAriaLabel(value) {
-    const utils = (0, _internals.useUtils)();
+    const adapter = (0, _hooks.usePickerAdapter)();
     const translations = (0, _hooks.usePickerTranslations)();
     return React.useMemo(() => {
-      const formatKey = ampm ?? utils.is12HourCycleInCurrentLocale() ? 'fullTime12h' : 'fullTime24h';
-      return translations.openRangePickerDialogue((0, _dateUtils.formatRange)(utils, value, formatKey));
-    }, [value, translations, utils]);
+      const formatKey = ampm ?? adapter.is12HourCycleInCurrentLocale() ? 'fullTime12h' : 'fullTime24h';
+      return translations.openRangePickerDialogue((0, _dateUtils.formatRange)(adapter, value, formatKey));
+    }, [value, translations, adapter]);
   };
 }
 function useApplyDefaultValuesToTimeRangeFieldInternalProps(internalProps) {
-  const utils = (0, _internals.useUtils)();
+  const adapter = (0, _hooks.usePickerAdapter)();
   const validationProps = (0, _internals.useApplyDefaultValuesToTimeValidationProps)(internalProps);
-  const ampm = React.useMemo(() => internalProps.ampm ?? utils.is12HourCycleInCurrentLocale(), [internalProps.ampm, utils]);
+  const ampm = React.useMemo(() => internalProps.ampm ?? adapter.is12HourCycleInCurrentLocale(), [internalProps.ampm, adapter]);
   return React.useMemo(() => (0, _extends2.default)({}, internalProps, validationProps, {
-    format: internalProps.format ?? (ampm ? utils.formats.fullTime12h : utils.formats.fullTime24h)
-  }), [internalProps, validationProps, ampm, utils]);
+    format: internalProps.format ?? (ampm ? adapter.formats.fullTime12h : adapter.formats.fullTime24h)
+  }), [internalProps, validationProps, ampm, adapter]);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mui/x-date-pickers-pro",
-  "version": "8.5.3",
+  "version": "8.7.0",
   "author": "MUI Team",
   "description": "The Pro plan edition of the MUI X Date and Time Picker components.",
   "main": "./index.js",
@@ -37,9 +37,9 @@
     "clsx": "^2.1.1",
     "prop-types": "^15.8.1",
     "react-transition-group": "^4.4.5",
-    "@mui/x-license": "8.5.3",
-    "@mui/x-internals": "8.5.3",
-    "@mui/x-date-pickers": "8.5.3"
+    "@mui/x-date-pickers": "8.7.0",
+    "@mui/x-internals": "8.7.0",
+    "@mui/x-license": "8.7.0"
   },
   "peerDependencies": {
     "@emotion/react": "^11.9.0",

package/validation/validateDateRange.js

@@ -57,7 +57,7 @@ const validateDateRange = ({
   if (start === null || end === null) {
     return [null, null];
   }
-  if (!(0, _dateUtils.isRangeValid)(adapter.utils, value)) {
+  if (!(0, _dateUtils.isRangeValid)(adapter, value)) {
     return ['invalidRange', 'invalidRange'];
   }
   return [null, null];

package/validation/validateDateTimeRange.js

@@ -53,7 +53,7 @@ const validateDateTimeRange = ({
   if (start === null || end === null) {
     return [null, null];
   }
-  if (!(0, _dateUtils.isRangeValid)(adapter.utils, value)) {
+  if (!(0, _dateUtils.isRangeValid)(adapter, value)) {
     return ['invalidRange', 'invalidRange'];
   }
   return [null, null];

package/validation/validateTimeRange.js

@@ -45,7 +45,7 @@ const validateTimeRange = ({
   if (start === null || end === null) {
     return [null, null];
   }
-  if (!(0, _dateUtils.isRangeValid)(adapter.utils, value)) {
+  if (!(0, _dateUtils.isRangeValid)(adapter, value)) {
     return ['invalidRange', 'invalidRange'];
   }
   return [null, null];