@mui/x-date-pickers-pro 8.5.3 → 8.7.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +210 -0
- package/DateRangeCalendar/DateRangeCalendar.js +39 -38
- package/DateRangeCalendar/DateRangeCalendar.types.d.ts +1 -1
- package/DateRangeCalendar/useDragRange.d.ts +2 -2
- package/DateRangeCalendar/useDragRange.js +17 -17
- package/DateRangePicker/DateRangePicker.js +1 -1
- package/DateRangePicker/DateRangePickerToolbar.js +4 -4
- package/DateRangePickerDay/DateRangePickerDay.js +5 -4
- package/DateRangePickerDay2/DateRangePickerDay2.js +5 -4
- package/DateTimeRangePicker/DateTimeRangePicker.js +2 -2
- package/DateTimeRangePicker/DateTimeRangePickerTimeWrapper.js +11 -8
- package/DateTimeRangePicker/DateTimeRangePickerToolbar.js +3 -3
- package/DateTimeRangePicker/shared.js +3 -2
- package/DesktopDateRangePicker/DesktopDateRangePicker.js +5 -5
- package/DesktopDateTimeRangePicker/DesktopDateTimeRangePicker.js +15 -9
- package/DesktopTimeRangePicker/DesktopTimeRangePicker.js +5 -4
- package/MobileDateRangePicker/MobileDateRangePicker.js +6 -6
- package/MobileDateTimeRangePicker/MobileDateTimeRangePicker.js +7 -6
- package/MobileTimeRangePicker/MobileTimeRangePicker.js +7 -6
- package/MultiInputDateRangeField/MultiInputDateRangeField.js +1 -1
- package/MultiInputDateTimeRangeField/MultiInputDateTimeRangeField.js +2 -2
- package/MultiInputTimeRangeField/MultiInputTimeRangeField.js +2 -2
- package/PickersRangeCalendarHeader/PickersRangeCalendarHeader.js +4 -4
- package/SingleInputDateRangeField/SingleInputDateRangeField.js +1 -1
- package/SingleInputDateTimeRangeField/SingleInputDateTimeRangeField.js +2 -2
- package/SingleInputTimeRangeField/SingleInputTimeRangeField.js +2 -2
- package/StaticDateRangePicker/StaticDateRangePicker.js +1 -1
- package/TimeRangePicker/TimeRangePicker.js +2 -2
- package/TimeRangePicker/TimeRangePickerTimeWrapper.js +11 -8
- package/TimeRangePicker/TimeRangePickerToolbar.js +7 -7
- package/TimeRangePicker/shared.js +3 -2
- package/esm/DateRangeCalendar/DateRangeCalendar.js +41 -40
- package/esm/DateRangeCalendar/DateRangeCalendar.types.d.ts +1 -1
- package/esm/DateRangeCalendar/useDragRange.d.ts +2 -2
- package/esm/DateRangeCalendar/useDragRange.js +17 -17
- package/esm/DateRangePicker/DateRangePicker.js +1 -1
- package/esm/DateRangePicker/DateRangePickerToolbar.js +6 -6
- package/esm/DateRangePickerDay/DateRangePickerDay.js +6 -5
- package/esm/DateRangePickerDay2/DateRangePickerDay2.js +6 -5
- package/esm/DateTimeRangePicker/DateTimeRangePicker.js +2 -2
- package/esm/DateTimeRangePicker/DateTimeRangePickerTimeWrapper.js +10 -7
- package/esm/DateTimeRangePicker/DateTimeRangePickerToolbar.js +5 -5
- package/esm/DateTimeRangePicker/shared.js +4 -3
- package/esm/DesktopDateRangePicker/DesktopDateRangePicker.js +5 -5
- package/esm/DesktopDateTimeRangePicker/DesktopDateTimeRangePicker.js +13 -7
- package/esm/DesktopTimeRangePicker/DesktopTimeRangePicker.js +6 -5
- package/esm/MobileDateRangePicker/MobileDateRangePicker.js +6 -6
- package/esm/MobileDateTimeRangePicker/MobileDateTimeRangePicker.js +6 -5
- package/esm/MobileTimeRangePicker/MobileTimeRangePicker.js +7 -6
- package/esm/MultiInputDateRangeField/MultiInputDateRangeField.js +1 -1
- package/esm/MultiInputDateTimeRangeField/MultiInputDateTimeRangeField.js +2 -2
- package/esm/MultiInputTimeRangeField/MultiInputTimeRangeField.js +2 -2
- package/esm/PickersRangeCalendarHeader/PickersRangeCalendarHeader.js +6 -6
- package/esm/SingleInputDateRangeField/SingleInputDateRangeField.js +1 -1
- package/esm/SingleInputDateTimeRangeField/SingleInputDateTimeRangeField.js +2 -2
- package/esm/SingleInputTimeRangeField/SingleInputTimeRangeField.js +2 -2
- package/esm/StaticDateRangePicker/StaticDateRangePicker.js +1 -1
- package/esm/TimeRangePicker/TimeRangePicker.js +2 -2
- package/esm/TimeRangePicker/TimeRangePickerTimeWrapper.js +10 -7
- package/esm/TimeRangePicker/TimeRangePickerToolbar.js +9 -9
- package/esm/TimeRangePicker/shared.js +4 -3
- package/esm/hooks/useMultiInputRangeField/useMultiInputRangeFieldSelectedSections.js +2 -0
- package/esm/hooks/useMultiInputRangeField/useTextFieldProps.js +2 -0
- package/esm/index.js +2 -1
- package/esm/internals/hooks/useDesktopRangePicker/useDesktopRangePicker.js +1 -1
- package/esm/internals/hooks/useMobileRangePicker/useMobileRangePicker.js +1 -1
- package/esm/internals/utils/date-range-manager.d.ts +4 -3
- package/esm/internals/utils/date-range-manager.js +14 -8
- package/esm/internals/utils/date-utils.d.ts +5 -5
- package/esm/internals/utils/date-utils.js +11 -11
- package/esm/internals/utils/valueManagers.js +12 -10
- package/esm/managers/useDateRangeManager.js +8 -8
- package/esm/managers/useDateTimeRangeManager.js +9 -9
- package/esm/managers/useTimeRangeManager.js +10 -10
- package/esm/validation/validateDateRange.js +1 -1
- package/esm/validation/validateDateTimeRange.js +1 -1
- package/esm/validation/validateTimeRange.js +1 -1
- package/hooks/useMultiInputRangeField/useMultiInputRangeFieldSelectedSections.js +1 -0
- package/hooks/useMultiInputRangeField/useTextFieldProps.js +1 -0
- package/index.js +1 -1
- package/internals/hooks/useDesktopRangePicker/useDesktopRangePicker.js +1 -1
- package/internals/hooks/useMobileRangePicker/useMobileRangePicker.js +1 -1
- package/internals/utils/date-range-manager.d.ts +4 -3
- package/internals/utils/date-range-manager.js +15 -8
- package/internals/utils/date-utils.d.ts +5 -5
- package/internals/utils/date-utils.js +11 -11
- package/internals/utils/valueManagers.js +12 -10
- package/managers/useDateRangeManager.js +6 -6
- package/managers/useDateTimeRangeManager.js +7 -7
- package/managers/useTimeRangeManager.js +8 -8
- package/package.json +4 -4
- package/validation/validateDateRange.js +1 -1
- package/validation/validateDateTimeRange.js +1 -1
- package/validation/validateTimeRange.js +1 -1
|
@@ -53,7 +53,7 @@ process.env.NODE_ENV !== "production" ? TimeRangePicker.propTypes = {
|
|
|
53
53
|
// ----------------------------------------------------------------------
|
|
54
54
|
/**
|
|
55
55
|
* 12h/24h view for hour selection clock.
|
|
56
|
-
* @default
|
|
56
|
+
* @default adapter.is12HourCycleInCurrentLocale()
|
|
57
57
|
*/
|
|
58
58
|
ampm: PropTypes.bool,
|
|
59
59
|
/**
|
|
@@ -243,7 +243,7 @@ process.env.NODE_ENV !== "production" ? TimeRangePicker.propTypes = {
|
|
|
243
243
|
* The date used to generate the new value when both `value` and `defaultValue` are empty.
|
|
244
244
|
* @default The closest valid date-time using the validation props, except callbacks like `shouldDisable<...>`.
|
|
245
245
|
*/
|
|
246
|
-
referenceDate: PropTypes.object,
|
|
246
|
+
referenceDate: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.object), PropTypes.object]),
|
|
247
247
|
/**
|
|
248
248
|
* The currently selected sections.
|
|
249
249
|
* This prop accepts four formats:
|
|
@@ -1,22 +1,23 @@
|
|
|
1
1
|
import _extends from "@babel/runtime/helpers/esm/extends";
|
|
2
2
|
import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWithoutPropertiesLoose";
|
|
3
|
-
const _excluded = ["viewRenderer", "value", "onChange", "defaultValue", "onViewChange", "views", "className"];
|
|
4
|
-
import {
|
|
3
|
+
const _excluded = ["viewRenderer", "value", "onChange", "defaultValue", "onViewChange", "views", "className", "referenceDate"];
|
|
4
|
+
import { usePickerAdapter } from '@mui/x-date-pickers/hooks';
|
|
5
5
|
import { isRangeValid } from "../internals/utils/date-utils.js";
|
|
6
|
-
import { calculateRangeChange } from "../internals/utils/date-range-manager.js";
|
|
6
|
+
import { calculateRangeChange, resolveReferenceDate } from "../internals/utils/date-range-manager.js";
|
|
7
7
|
import { usePickerRangePositionContext } from "../hooks/index.js";
|
|
8
8
|
/**
|
|
9
9
|
* @ignore - internal component.
|
|
10
10
|
*/
|
|
11
11
|
function TimeRangePickerTimeWrapper(props) {
|
|
12
|
-
const
|
|
12
|
+
const adapter = usePickerAdapter();
|
|
13
13
|
const {
|
|
14
14
|
viewRenderer,
|
|
15
15
|
value,
|
|
16
16
|
onChange,
|
|
17
17
|
defaultValue,
|
|
18
18
|
onViewChange,
|
|
19
|
-
views
|
|
19
|
+
views,
|
|
20
|
+
referenceDate: referenceDateProp
|
|
20
21
|
} = props,
|
|
21
22
|
other = _objectWithoutPropertiesLoose(props, _excluded);
|
|
22
23
|
const {
|
|
@@ -27,6 +28,7 @@ function TimeRangePickerTimeWrapper(props) {
|
|
|
27
28
|
}
|
|
28
29
|
const currentValue = (rangePosition === 'start' ? value?.[0] : value?.[1]) ?? null;
|
|
29
30
|
const currentDefaultValue = (rangePosition === 'start' ? defaultValue?.[0] : defaultValue?.[1]) ?? null;
|
|
31
|
+
const referenceDate = resolveReferenceDate(referenceDateProp, rangePosition);
|
|
30
32
|
const handleOnChange = (newDate, selectionState, selectedView) => {
|
|
31
33
|
if (!onChange || !value) {
|
|
32
34
|
return;
|
|
@@ -35,14 +37,15 @@ function TimeRangePickerTimeWrapper(props) {
|
|
|
35
37
|
newRange
|
|
36
38
|
} = calculateRangeChange({
|
|
37
39
|
newDate,
|
|
38
|
-
|
|
40
|
+
adapter,
|
|
39
41
|
range: value,
|
|
40
42
|
rangePosition
|
|
41
43
|
});
|
|
42
|
-
const isFullRangeSelected = rangePosition === 'end' && isRangeValid(
|
|
44
|
+
const isFullRangeSelected = rangePosition === 'end' && isRangeValid(adapter, newRange);
|
|
43
45
|
onChange(newRange, isFullRangeSelected ? 'finish' : 'partial', selectedView);
|
|
44
46
|
};
|
|
45
47
|
return viewRenderer(_extends({}, other, {
|
|
48
|
+
referenceDate,
|
|
46
49
|
views,
|
|
47
50
|
onViewChange,
|
|
48
51
|
value: currentValue,
|
|
@@ -8,8 +8,8 @@ import PropTypes from 'prop-types';
|
|
|
8
8
|
import clsx from 'clsx';
|
|
9
9
|
import { styled, useThemeProps } from '@mui/material/styles';
|
|
10
10
|
import composeClasses from '@mui/utils/composeClasses';
|
|
11
|
-
import { PickersToolbar, PickersToolbarButton,
|
|
12
|
-
import { usePickerContext, usePickerTranslations } from '@mui/x-date-pickers/hooks';
|
|
11
|
+
import { PickersToolbar, PickersToolbarButton, PickersToolbarText, getMeridiem, formatMeridiem, pickersToolbarClasses, pickersToolbarTextClasses, MULTI_SECTION_CLOCK_SECTION_WIDTH, useToolbarOwnerState } from '@mui/x-date-pickers/internals';
|
|
12
|
+
import { usePickerAdapter, usePickerContext, usePickerTranslations } from '@mui/x-date-pickers/hooks';
|
|
13
13
|
import { getTimeRangePickerToolbarUtilityClass } from "./timeRangePickerToolbarClasses.js";
|
|
14
14
|
import { usePickerRangePositionContext } from "../hooks/index.js";
|
|
15
15
|
import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
|
@@ -92,13 +92,13 @@ function TimeRangePickerToolbarTimeElement(props) {
|
|
|
92
92
|
separatorClasses,
|
|
93
93
|
toolbarPlaceholder
|
|
94
94
|
} = props;
|
|
95
|
-
const
|
|
95
|
+
const adapter = usePickerAdapter();
|
|
96
96
|
const {
|
|
97
97
|
variant,
|
|
98
98
|
views
|
|
99
99
|
} = usePickerContext();
|
|
100
|
-
const formatHours = time => ampm ?
|
|
101
|
-
const meridiemMode = getMeridiem(value,
|
|
100
|
+
const formatHours = time => ampm ? adapter.format(time, 'hours12h') : adapter.format(time, 'hours24h');
|
|
101
|
+
const meridiemMode = getMeridiem(value, adapter);
|
|
102
102
|
const sectionWidth = variant === 'desktop' ? MULTI_SECTION_CLOCK_SECTION_WIDTH : '100%';
|
|
103
103
|
return /*#__PURE__*/_jsxs(TimeRangePickerToolbarTimeContainer, {
|
|
104
104
|
children: [views.includes('hours') && /*#__PURE__*/_jsxs(React.Fragment, {
|
|
@@ -107,7 +107,7 @@ function TimeRangePickerToolbarTimeElement(props) {
|
|
|
107
107
|
width: sectionWidth,
|
|
108
108
|
onClick: () => onViewChange('hours'),
|
|
109
109
|
selected: view === 'hours',
|
|
110
|
-
value:
|
|
110
|
+
value: adapter.isValid(value) ? formatHours(value) : toolbarPlaceholder
|
|
111
111
|
}), /*#__PURE__*/_jsx(TimeRangePickerToolbarSeparator, {
|
|
112
112
|
variant: "h5",
|
|
113
113
|
value: ":",
|
|
@@ -117,7 +117,7 @@ function TimeRangePickerToolbarTimeElement(props) {
|
|
|
117
117
|
width: sectionWidth,
|
|
118
118
|
onClick: () => onViewChange('minutes'),
|
|
119
119
|
selected: view === 'minutes' || !views.includes('minutes') && view === 'hours',
|
|
120
|
-
value:
|
|
120
|
+
value: adapter.isValid(value) ? adapter.format(value, 'minutes') : toolbarPlaceholder,
|
|
121
121
|
disabled: !views.includes('minutes')
|
|
122
122
|
})]
|
|
123
123
|
}), views.includes('seconds') && /*#__PURE__*/_jsxs(React.Fragment, {
|
|
@@ -130,13 +130,13 @@ function TimeRangePickerToolbarTimeElement(props) {
|
|
|
130
130
|
width: sectionWidth,
|
|
131
131
|
onClick: () => onViewChange('seconds'),
|
|
132
132
|
selected: view === 'seconds',
|
|
133
|
-
value: value ?
|
|
133
|
+
value: value ? adapter.format(value, 'seconds') : toolbarPlaceholder
|
|
134
134
|
})]
|
|
135
135
|
}), ampm && /*#__PURE__*/_jsx(PickersToolbarButton, {
|
|
136
136
|
variant: "h5",
|
|
137
137
|
onClick: () => onViewChange('meridiem'),
|
|
138
138
|
selected: view === 'meridiem',
|
|
139
|
-
value: value && meridiemMode ? formatMeridiem(
|
|
139
|
+
value: value && meridiemMode ? formatMeridiem(adapter, meridiemMode) : toolbarPlaceholder,
|
|
140
140
|
width: sectionWidth
|
|
141
141
|
})]
|
|
142
142
|
});
|
|
@@ -1,17 +1,18 @@
|
|
|
1
1
|
import _extends from "@babel/runtime/helpers/esm/extends";
|
|
2
2
|
import * as React from 'react';
|
|
3
3
|
import { useThemeProps } from '@mui/material/styles';
|
|
4
|
-
import {
|
|
4
|
+
import { applyDefaultViewProps, resolveTimeViewsResponse, useApplyDefaultValuesToTimeValidationProps } from '@mui/x-date-pickers/internals';
|
|
5
|
+
import { usePickerAdapter } from '@mui/x-date-pickers/hooks';
|
|
5
6
|
import { TimeRangePickerToolbar } from "./TimeRangePickerToolbar.js";
|
|
6
7
|
import { TimeRangePickerTabs } from "./TimeRangePickerTabs.js";
|
|
7
8
|
export function useTimeRangePickerDefaultizedProps(props, name) {
|
|
8
|
-
const
|
|
9
|
+
const adapter = usePickerAdapter();
|
|
9
10
|
const themeProps = useThemeProps({
|
|
10
11
|
props,
|
|
11
12
|
name
|
|
12
13
|
});
|
|
13
14
|
const validationProps = useApplyDefaultValuesToTimeValidationProps(themeProps);
|
|
14
|
-
const ampm = themeProps.ampm ??
|
|
15
|
+
const ampm = themeProps.ampm ?? adapter.is12HourCycleInCurrentLocale();
|
|
15
16
|
const {
|
|
16
17
|
openTo,
|
|
17
18
|
views: defaultViews
|
package/esm/index.js
CHANGED
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* @mui/x-date-pickers-pro v8.
|
|
2
|
+
* @mui/x-date-pickers-pro v8.7.0
|
|
3
3
|
*
|
|
4
4
|
* @license MUI X Commercial
|
|
5
5
|
* This source code is licensed under the commercial license found in the
|
|
6
6
|
* LICENSE file in the root directory of this source tree.
|
|
7
7
|
*/
|
|
8
|
+
// eslint-disable-next-line no-restricted-imports
|
|
8
9
|
export * from '@mui/x-date-pickers';
|
|
9
10
|
export * from "./DateRangePickerDay/index.js";
|
|
10
11
|
export * from "./DateRangePickerDay2/index.js";
|
|
@@ -19,7 +19,7 @@ export const useDesktopRangePicker = _ref => {
|
|
|
19
19
|
steps
|
|
20
20
|
} = _ref,
|
|
21
21
|
pickerParams = _objectWithoutPropertiesLoose(_ref, _excluded);
|
|
22
|
-
useLicenseVerifier('x-date-pickers-pro', "
|
|
22
|
+
useLicenseVerifier('x-date-pickers-pro', "MTc1MTU4MDAwMDAwMA==");
|
|
23
23
|
const {
|
|
24
24
|
slots,
|
|
25
25
|
slotProps,
|
|
@@ -21,7 +21,7 @@ export const useMobileRangePicker = _ref => {
|
|
|
21
21
|
steps
|
|
22
22
|
} = _ref,
|
|
23
23
|
pickerParams = _objectWithoutPropertiesLoose(_ref, _excluded);
|
|
24
|
-
useLicenseVerifier('x-date-pickers-pro', "
|
|
24
|
+
useLicenseVerifier('x-date-pickers-pro', "MTc1MTU4MDAwMDAwMA==");
|
|
25
25
|
const {
|
|
26
26
|
slots,
|
|
27
27
|
slotProps: innerSlotProps,
|
|
@@ -2,7 +2,7 @@ import { MuiPickersAdapter, PickerValidDate } from '@mui/x-date-pickers/models';
|
|
|
2
2
|
import { PickerRangeValue } from '@mui/x-date-pickers/internals';
|
|
3
3
|
import { RangePosition } from "../../models/index.js";
|
|
4
4
|
interface CalculateRangeChangeOptions {
|
|
5
|
-
|
|
5
|
+
adapter: MuiPickersAdapter;
|
|
6
6
|
range: PickerRangeValue;
|
|
7
7
|
newDate: PickerValidDate | null;
|
|
8
8
|
rangePosition: RangePosition;
|
|
@@ -13,14 +13,15 @@ interface CalculateRangeChangeOptions {
|
|
|
13
13
|
*/
|
|
14
14
|
allowRangeFlip?: boolean;
|
|
15
15
|
shouldMergeDateAndTime?: boolean;
|
|
16
|
-
referenceDate?: PickerValidDate;
|
|
16
|
+
referenceDate?: PickerValidDate | [PickerValidDate, PickerValidDate];
|
|
17
17
|
}
|
|
18
18
|
interface CalculateRangeChangeResponse {
|
|
19
19
|
nextSelection: RangePosition;
|
|
20
20
|
newRange: PickerRangeValue;
|
|
21
21
|
}
|
|
22
|
+
export declare function resolveReferenceDate(referenceDate: PickerValidDate | [PickerValidDate, PickerValidDate] | undefined, rangePosition: RangePosition): PickerValidDate | undefined;
|
|
22
23
|
export declare function calculateRangeChange({
|
|
23
|
-
|
|
24
|
+
adapter,
|
|
24
25
|
range,
|
|
25
26
|
newDate: selectedDate,
|
|
26
27
|
rangePosition,
|
|
@@ -1,6 +1,12 @@
|
|
|
1
1
|
import { mergeDateAndTime } from '@mui/x-date-pickers/internals';
|
|
2
|
+
export function resolveReferenceDate(referenceDate, rangePosition) {
|
|
3
|
+
if (Array.isArray(referenceDate)) {
|
|
4
|
+
return rangePosition === 'start' ? referenceDate[0] : referenceDate[1];
|
|
5
|
+
}
|
|
6
|
+
return referenceDate;
|
|
7
|
+
}
|
|
2
8
|
export function calculateRangeChange({
|
|
3
|
-
|
|
9
|
+
adapter,
|
|
4
10
|
range,
|
|
5
11
|
newDate: selectedDate,
|
|
6
12
|
rangePosition,
|
|
@@ -8,18 +14,18 @@ export function calculateRangeChange({
|
|
|
8
14
|
shouldMergeDateAndTime = false,
|
|
9
15
|
referenceDate
|
|
10
16
|
}) {
|
|
11
|
-
const start = !
|
|
12
|
-
const end = !
|
|
17
|
+
const start = !adapter.isValid(range[0]) ? null : range[0];
|
|
18
|
+
const end = !adapter.isValid(range[1]) ? null : range[1];
|
|
13
19
|
if (shouldMergeDateAndTime && selectedDate) {
|
|
14
20
|
// If there is a date already selected, then we want to keep its time
|
|
15
21
|
if (start && rangePosition === 'start') {
|
|
16
|
-
selectedDate = mergeDateAndTime(
|
|
22
|
+
selectedDate = mergeDateAndTime(adapter, selectedDate, start);
|
|
17
23
|
}
|
|
18
24
|
if (end && rangePosition === 'end') {
|
|
19
|
-
selectedDate = mergeDateAndTime(
|
|
25
|
+
selectedDate = mergeDateAndTime(adapter, selectedDate, end);
|
|
20
26
|
}
|
|
21
27
|
}
|
|
22
|
-
const newSelectedDate = referenceDate && selectedDate && shouldMergeDateAndTime ? mergeDateAndTime(
|
|
28
|
+
const newSelectedDate = referenceDate && selectedDate && shouldMergeDateAndTime ? mergeDateAndTime(adapter, selectedDate, resolveReferenceDate(referenceDate, rangePosition)) : selectedDate;
|
|
23
29
|
if (rangePosition === 'start') {
|
|
24
30
|
const truthyResult = allowRangeFlip ? {
|
|
25
31
|
nextSelection: 'start',
|
|
@@ -28,7 +34,7 @@ export function calculateRangeChange({
|
|
|
28
34
|
nextSelection: 'end',
|
|
29
35
|
newRange: [newSelectedDate, null]
|
|
30
36
|
};
|
|
31
|
-
return Boolean(end) &&
|
|
37
|
+
return Boolean(end) && adapter.isAfter(newSelectedDate, end) ? truthyResult : {
|
|
32
38
|
nextSelection: 'end',
|
|
33
39
|
newRange: [newSelectedDate, end]
|
|
34
40
|
};
|
|
@@ -40,7 +46,7 @@ export function calculateRangeChange({
|
|
|
40
46
|
nextSelection: 'end',
|
|
41
47
|
newRange: [newSelectedDate, null]
|
|
42
48
|
};
|
|
43
|
-
return Boolean(start) &&
|
|
49
|
+
return Boolean(start) && adapter.isBeforeDay(newSelectedDate, start) ? truthyResult : {
|
|
44
50
|
nextSelection: 'start',
|
|
45
51
|
newRange: [start, newSelectedDate]
|
|
46
52
|
};
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { AdapterFormats, MuiPickersAdapter, PickerValidDate } from '@mui/x-date-pickers/models';
|
|
2
2
|
import { PickerNonNullableRangeValue, PickerRangeValue } from '@mui/x-date-pickers/internals';
|
|
3
|
-
export declare const isRangeValid: (
|
|
4
|
-
export declare const isWithinRange: (
|
|
5
|
-
export declare const isStartOfRange: (
|
|
6
|
-
export declare const isEndOfRange: (
|
|
7
|
-
export declare const formatRange: (
|
|
3
|
+
export declare const isRangeValid: (adapter: MuiPickersAdapter, range: PickerRangeValue) => range is PickerNonNullableRangeValue;
|
|
4
|
+
export declare const isWithinRange: (adapter: MuiPickersAdapter, day: PickerValidDate, range: PickerRangeValue) => boolean;
|
|
5
|
+
export declare const isStartOfRange: (adapter: MuiPickersAdapter, day: PickerValidDate, range: PickerRangeValue) => boolean;
|
|
6
|
+
export declare const isEndOfRange: (adapter: MuiPickersAdapter, day: PickerValidDate, range: PickerRangeValue) => boolean;
|
|
7
|
+
export declare const formatRange: (adapter: MuiPickersAdapter, range: PickerRangeValue, formatKey: keyof AdapterFormats) => string | null;
|
|
@@ -1,18 +1,18 @@
|
|
|
1
|
-
export const isRangeValid = (
|
|
2
|
-
return
|
|
1
|
+
export const isRangeValid = (adapter, range) => {
|
|
2
|
+
return adapter.isValid(range[0]) && adapter.isValid(range[1]) && !adapter.isBefore(range[1], range[0]);
|
|
3
3
|
};
|
|
4
|
-
export const isWithinRange = (
|
|
5
|
-
return isRangeValid(
|
|
4
|
+
export const isWithinRange = (adapter, day, range) => {
|
|
5
|
+
return isRangeValid(adapter, range) && adapter.isWithinRange(day, range);
|
|
6
6
|
};
|
|
7
|
-
export const isStartOfRange = (
|
|
8
|
-
return isRangeValid(
|
|
7
|
+
export const isStartOfRange = (adapter, day, range) => {
|
|
8
|
+
return isRangeValid(adapter, range) && adapter.isSameDay(day, range[0]);
|
|
9
9
|
};
|
|
10
|
-
export const isEndOfRange = (
|
|
11
|
-
return isRangeValid(
|
|
10
|
+
export const isEndOfRange = (adapter, day, range) => {
|
|
11
|
+
return isRangeValid(adapter, range) && adapter.isSameDay(day, range[1]);
|
|
12
12
|
};
|
|
13
|
-
export const formatRange = (
|
|
14
|
-
if (!isRangeValid(
|
|
13
|
+
export const formatRange = (adapter, range, formatKey) => {
|
|
14
|
+
if (!isRangeValid(adapter, range)) {
|
|
15
15
|
return null;
|
|
16
16
|
}
|
|
17
|
-
return `${
|
|
17
|
+
return `${adapter.format(range[0], formatKey)} - ${adapter.format(range[1], formatKey)}`;
|
|
18
18
|
};
|
|
@@ -12,35 +12,37 @@ export const rangeValueManager = {
|
|
|
12
12
|
referenceDate: referenceDateProp
|
|
13
13
|
} = _ref,
|
|
14
14
|
params = _objectWithoutPropertiesLoose(_ref, _excluded);
|
|
15
|
-
const shouldKeepStartDate = params.
|
|
16
|
-
const shouldKeepEndDate = params.
|
|
15
|
+
const shouldKeepStartDate = params.adapter.isValid(value[0]);
|
|
16
|
+
const shouldKeepEndDate = params.adapter.isValid(value[1]);
|
|
17
17
|
if (shouldKeepStartDate && shouldKeepEndDate) {
|
|
18
18
|
return value;
|
|
19
19
|
}
|
|
20
20
|
const referenceDate = referenceDateProp ?? getDefaultReferenceDate(params);
|
|
21
|
-
|
|
21
|
+
const startReferenceDate = Array.isArray(referenceDate) ? referenceDate[0] : referenceDate;
|
|
22
|
+
const endReferenceDate = Array.isArray(referenceDate) ? referenceDate[1] : referenceDate;
|
|
23
|
+
return [shouldKeepStartDate ? value[0] : startReferenceDate, shouldKeepEndDate ? value[1] : endReferenceDate];
|
|
22
24
|
},
|
|
23
25
|
cleanValue: (utils, value) => value.map(date => replaceInvalidDateByNull(utils, date)),
|
|
24
26
|
areValuesEqual: (utils, a, b) => areDatesEqual(utils, a[0], b[0]) && areDatesEqual(utils, a[1], b[1]),
|
|
25
27
|
isSameError: (a, b) => b !== null && a[1] === b[1] && a[0] === b[0],
|
|
26
28
|
hasError: error => error[0] != null || error[1] != null,
|
|
27
29
|
defaultErrorState: [null, null],
|
|
28
|
-
getTimezone: (
|
|
29
|
-
const timezoneStart =
|
|
30
|
-
const timezoneEnd =
|
|
30
|
+
getTimezone: (adapter, value) => {
|
|
31
|
+
const timezoneStart = adapter.isValid(value[0]) ? adapter.getTimezone(value[0]) : null;
|
|
32
|
+
const timezoneEnd = adapter.isValid(value[1]) ? adapter.getTimezone(value[1]) : null;
|
|
31
33
|
if (timezoneStart != null && timezoneEnd != null && timezoneStart !== timezoneEnd) {
|
|
32
34
|
throw new Error('MUI X: The timezone of the start and the end date should be the same.');
|
|
33
35
|
}
|
|
34
36
|
return timezoneStart ?? timezoneEnd;
|
|
35
37
|
},
|
|
36
|
-
setTimezone: (
|
|
38
|
+
setTimezone: (adapter, timezone, value) => [value[0] == null ? null : adapter.setTimezone(value[0], timezone), value[1] == null ? null : adapter.setTimezone(value[1], timezone)]
|
|
37
39
|
};
|
|
38
40
|
export const getRangeFieldValueManager = ({
|
|
39
41
|
dateSeparator = '–'
|
|
40
42
|
}) => ({
|
|
41
|
-
updateReferenceValue: (
|
|
42
|
-
const shouldKeepStartDate =
|
|
43
|
-
const shouldKeepEndDate =
|
|
43
|
+
updateReferenceValue: (adapter, value, prevReferenceValue) => {
|
|
44
|
+
const shouldKeepStartDate = adapter.isValid(value[0]);
|
|
45
|
+
const shouldKeepEndDate = adapter.isValid(value[1]);
|
|
44
46
|
if (!shouldKeepStartDate && !shouldKeepEndDate) {
|
|
45
47
|
return prevReferenceValue;
|
|
46
48
|
}
|
|
@@ -2,8 +2,8 @@
|
|
|
2
2
|
|
|
3
3
|
import _extends from "@babel/runtime/helpers/esm/extends";
|
|
4
4
|
import * as React from 'react';
|
|
5
|
-
import { usePickerTranslations } from '@mui/x-date-pickers/hooks';
|
|
6
|
-
import { useApplyDefaultValuesToDateValidationProps
|
|
5
|
+
import { usePickerAdapter, usePickerTranslations } from '@mui/x-date-pickers/hooks';
|
|
6
|
+
import { useApplyDefaultValuesToDateValidationProps } from '@mui/x-date-pickers/internals';
|
|
7
7
|
import { getRangeFieldValueManager, rangeValueManager } from "../internals/utils/valueManagers.js";
|
|
8
8
|
import { validateDateRange } from "../validation/index.js";
|
|
9
9
|
import { formatRange } from "../internals/utils/date-utils.js";
|
|
@@ -25,16 +25,16 @@ export function useDateRangeManager(parameters = {}) {
|
|
|
25
25
|
}), [enableAccessibleFieldDOMStructure, dateSeparator]);
|
|
26
26
|
}
|
|
27
27
|
function useOpenPickerButtonAriaLabel(value) {
|
|
28
|
-
const
|
|
28
|
+
const adapter = usePickerAdapter();
|
|
29
29
|
const translations = usePickerTranslations();
|
|
30
30
|
return React.useMemo(() => {
|
|
31
|
-
return translations.openRangePickerDialogue(formatRange(
|
|
32
|
-
}, [value, translations,
|
|
31
|
+
return translations.openRangePickerDialogue(formatRange(adapter, value, 'fullDate'));
|
|
32
|
+
}, [value, translations, adapter]);
|
|
33
33
|
}
|
|
34
34
|
function useApplyDefaultValuesToDateRangeFieldInternalProps(internalProps) {
|
|
35
|
-
const
|
|
35
|
+
const adapter = usePickerAdapter();
|
|
36
36
|
const validationProps = useApplyDefaultValuesToDateValidationProps(internalProps);
|
|
37
37
|
return React.useMemo(() => _extends({}, internalProps, validationProps, {
|
|
38
|
-
format: internalProps.format ??
|
|
39
|
-
}), [internalProps, validationProps,
|
|
38
|
+
format: internalProps.format ?? adapter.formats.keyboardDate
|
|
39
|
+
}), [internalProps, validationProps, adapter]);
|
|
40
40
|
}
|
|
@@ -2,8 +2,8 @@
|
|
|
2
2
|
|
|
3
3
|
import _extends from "@babel/runtime/helpers/esm/extends";
|
|
4
4
|
import * as React from 'react';
|
|
5
|
-
import { usePickerTranslations } from '@mui/x-date-pickers/hooks';
|
|
6
|
-
import { useApplyDefaultValuesToDateTimeValidationProps
|
|
5
|
+
import { usePickerAdapter, usePickerTranslations } from '@mui/x-date-pickers/hooks';
|
|
6
|
+
import { useApplyDefaultValuesToDateTimeValidationProps } from '@mui/x-date-pickers/internals';
|
|
7
7
|
import { getRangeFieldValueManager, rangeValueManager } from "../internals/utils/valueManagers.js";
|
|
8
8
|
import { validateDateTimeRange } from "../validation/index.js";
|
|
9
9
|
import { formatRange } from "../internals/utils/date-utils.js";
|
|
@@ -25,17 +25,17 @@ export function useDateTimeRangeManager(parameters = {}) {
|
|
|
25
25
|
}), [enableAccessibleFieldDOMStructure, dateSeparator]);
|
|
26
26
|
}
|
|
27
27
|
function useOpenPickerButtonAriaLabel(value) {
|
|
28
|
-
const
|
|
28
|
+
const adapter = usePickerAdapter();
|
|
29
29
|
const translations = usePickerTranslations();
|
|
30
30
|
return React.useMemo(() => {
|
|
31
|
-
return translations.openRangePickerDialogue(formatRange(
|
|
32
|
-
}, [value, translations,
|
|
31
|
+
return translations.openRangePickerDialogue(formatRange(adapter, value, 'fullDate'));
|
|
32
|
+
}, [value, translations, adapter]);
|
|
33
33
|
}
|
|
34
34
|
function useApplyDefaultValuesToDateTimeRangeFieldInternalProps(internalProps) {
|
|
35
|
-
const
|
|
35
|
+
const adapter = usePickerAdapter();
|
|
36
36
|
const validationProps = useApplyDefaultValuesToDateTimeValidationProps(internalProps);
|
|
37
|
-
const ampm = React.useMemo(() => internalProps.ampm ??
|
|
37
|
+
const ampm = React.useMemo(() => internalProps.ampm ?? adapter.is12HourCycleInCurrentLocale(), [internalProps.ampm, adapter]);
|
|
38
38
|
return React.useMemo(() => _extends({}, internalProps, validationProps, {
|
|
39
|
-
format: internalProps.format ?? (ampm ?
|
|
40
|
-
}), [internalProps, validationProps, ampm,
|
|
39
|
+
format: internalProps.format ?? (ampm ? adapter.formats.keyboardDateTime12h : adapter.formats.keyboardDateTime24h)
|
|
40
|
+
}), [internalProps, validationProps, ampm, adapter]);
|
|
41
41
|
}
|
|
@@ -2,8 +2,8 @@
|
|
|
2
2
|
|
|
3
3
|
import _extends from "@babel/runtime/helpers/esm/extends";
|
|
4
4
|
import * as React from 'react';
|
|
5
|
-
import { usePickerTranslations } from '@mui/x-date-pickers/hooks';
|
|
6
|
-
import { useApplyDefaultValuesToTimeValidationProps
|
|
5
|
+
import { usePickerAdapter, usePickerTranslations } from '@mui/x-date-pickers/hooks';
|
|
6
|
+
import { useApplyDefaultValuesToTimeValidationProps } from '@mui/x-date-pickers/internals';
|
|
7
7
|
import { getRangeFieldValueManager, rangeValueManager } from "../internals/utils/valueManagers.js";
|
|
8
8
|
import { validateTimeRange } from "../validation/index.js";
|
|
9
9
|
import { formatRange } from "../internals/utils/date-utils.js";
|
|
@@ -27,19 +27,19 @@ export function useTimeRangeManager(parameters = {}) {
|
|
|
27
27
|
}
|
|
28
28
|
function createUseOpenPickerButtonAriaLabel(ampm) {
|
|
29
29
|
return function useOpenPickerButtonAriaLabel(value) {
|
|
30
|
-
const
|
|
30
|
+
const adapter = usePickerAdapter();
|
|
31
31
|
const translations = usePickerTranslations();
|
|
32
32
|
return React.useMemo(() => {
|
|
33
|
-
const formatKey = ampm ??
|
|
34
|
-
return translations.openRangePickerDialogue(formatRange(
|
|
35
|
-
}, [value, translations,
|
|
33
|
+
const formatKey = ampm ?? adapter.is12HourCycleInCurrentLocale() ? 'fullTime12h' : 'fullTime24h';
|
|
34
|
+
return translations.openRangePickerDialogue(formatRange(adapter, value, formatKey));
|
|
35
|
+
}, [value, translations, adapter]);
|
|
36
36
|
};
|
|
37
37
|
}
|
|
38
38
|
function useApplyDefaultValuesToTimeRangeFieldInternalProps(internalProps) {
|
|
39
|
-
const
|
|
39
|
+
const adapter = usePickerAdapter();
|
|
40
40
|
const validationProps = useApplyDefaultValuesToTimeValidationProps(internalProps);
|
|
41
|
-
const ampm = React.useMemo(() => internalProps.ampm ??
|
|
41
|
+
const ampm = React.useMemo(() => internalProps.ampm ?? adapter.is12HourCycleInCurrentLocale(), [internalProps.ampm, adapter]);
|
|
42
42
|
return React.useMemo(() => _extends({}, internalProps, validationProps, {
|
|
43
|
-
format: internalProps.format ?? (ampm ?
|
|
44
|
-
}), [internalProps, validationProps, ampm,
|
|
43
|
+
format: internalProps.format ?? (ampm ? adapter.formats.fullTime12h : adapter.formats.fullTime24h)
|
|
44
|
+
}), [internalProps, validationProps, ampm, adapter]);
|
|
45
45
|
}
|
|
@@ -51,7 +51,7 @@ export const validateDateRange = ({
|
|
|
51
51
|
if (start === null || end === null) {
|
|
52
52
|
return [null, null];
|
|
53
53
|
}
|
|
54
|
-
if (!isRangeValid(adapter
|
|
54
|
+
if (!isRangeValid(adapter, value)) {
|
|
55
55
|
return ['invalidRange', 'invalidRange'];
|
|
56
56
|
}
|
|
57
57
|
return [null, null];
|
|
@@ -47,7 +47,7 @@ export const validateDateTimeRange = ({
|
|
|
47
47
|
if (start === null || end === null) {
|
|
48
48
|
return [null, null];
|
|
49
49
|
}
|
|
50
|
-
if (!isRangeValid(adapter
|
|
50
|
+
if (!isRangeValid(adapter, value)) {
|
|
51
51
|
return ['invalidRange', 'invalidRange'];
|
|
52
52
|
}
|
|
53
53
|
return [null, null];
|
|
@@ -40,7 +40,7 @@ export const validateTimeRange = ({
|
|
|
40
40
|
if (start === null || end === null) {
|
|
41
41
|
return [null, null];
|
|
42
42
|
}
|
|
43
|
-
if (!isRangeValid(adapter
|
|
43
|
+
if (!isRangeValid(adapter, value)) {
|
|
44
44
|
return ['invalidRange', 'invalidRange'];
|
|
45
45
|
}
|
|
46
46
|
return [null, null];
|
package/index.js
CHANGED
|
@@ -27,7 +27,7 @@ const useDesktopRangePicker = _ref => {
|
|
|
27
27
|
steps
|
|
28
28
|
} = _ref,
|
|
29
29
|
pickerParams = (0, _objectWithoutPropertiesLoose2.default)(_ref, _excluded);
|
|
30
|
-
(0, _xLicense.useLicenseVerifier)('x-date-pickers-pro', "
|
|
30
|
+
(0, _xLicense.useLicenseVerifier)('x-date-pickers-pro', "MTc1MTU4MDAwMDAwMA==");
|
|
31
31
|
const {
|
|
32
32
|
slots,
|
|
33
33
|
slotProps,
|
|
@@ -29,7 +29,7 @@ const useMobileRangePicker = _ref => {
|
|
|
29
29
|
steps
|
|
30
30
|
} = _ref,
|
|
31
31
|
pickerParams = (0, _objectWithoutPropertiesLoose2.default)(_ref, _excluded);
|
|
32
|
-
(0, _xLicense.useLicenseVerifier)('x-date-pickers-pro', "
|
|
32
|
+
(0, _xLicense.useLicenseVerifier)('x-date-pickers-pro', "MTc1MTU4MDAwMDAwMA==");
|
|
33
33
|
const {
|
|
34
34
|
slots,
|
|
35
35
|
slotProps: innerSlotProps,
|
|
@@ -2,7 +2,7 @@ import { MuiPickersAdapter, PickerValidDate } from '@mui/x-date-pickers/models';
|
|
|
2
2
|
import { PickerRangeValue } from '@mui/x-date-pickers/internals';
|
|
3
3
|
import { RangePosition } from "../../models/index.js";
|
|
4
4
|
interface CalculateRangeChangeOptions {
|
|
5
|
-
|
|
5
|
+
adapter: MuiPickersAdapter;
|
|
6
6
|
range: PickerRangeValue;
|
|
7
7
|
newDate: PickerValidDate | null;
|
|
8
8
|
rangePosition: RangePosition;
|
|
@@ -13,14 +13,15 @@ interface CalculateRangeChangeOptions {
|
|
|
13
13
|
*/
|
|
14
14
|
allowRangeFlip?: boolean;
|
|
15
15
|
shouldMergeDateAndTime?: boolean;
|
|
16
|
-
referenceDate?: PickerValidDate;
|
|
16
|
+
referenceDate?: PickerValidDate | [PickerValidDate, PickerValidDate];
|
|
17
17
|
}
|
|
18
18
|
interface CalculateRangeChangeResponse {
|
|
19
19
|
nextSelection: RangePosition;
|
|
20
20
|
newRange: PickerRangeValue;
|
|
21
21
|
}
|
|
22
|
+
export declare function resolveReferenceDate(referenceDate: PickerValidDate | [PickerValidDate, PickerValidDate] | undefined, rangePosition: RangePosition): PickerValidDate | undefined;
|
|
22
23
|
export declare function calculateRangeChange({
|
|
23
|
-
|
|
24
|
+
adapter,
|
|
24
25
|
range,
|
|
25
26
|
newDate: selectedDate,
|
|
26
27
|
rangePosition,
|