@mui/x-date-pickers 7.19.0 → 7.21.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/AdapterDayjs/AdapterDayjs.js +2 -0
- package/CHANGELOG.md +224 -43
- package/DateCalendar/DateCalendar.js +1 -1
- package/DateCalendar/DateCalendar.types.d.ts +1 -1
- package/DateField/DateField.types.d.ts +2 -7
- package/DateField/index.d.ts +1 -1
- package/DatePicker/DatePicker.js +1 -1
- package/DatePicker/DatePicker.types.d.ts +8 -1
- package/DatePicker/index.d.ts +1 -1
- package/DateTimeField/DateTimeField.types.d.ts +2 -7
- package/DateTimeField/index.d.ts +1 -1
- package/DateTimePicker/DateTimePicker.js +1 -1
- package/DateTimePicker/DateTimePicker.types.d.ts +9 -1
- package/DateTimePicker/DateTimePickerTabs.js +1 -1
- package/DateTimePicker/index.d.ts +1 -1
- package/DesktopDatePicker/DesktopDatePicker.js +1 -1
- package/DesktopDateTimePicker/DesktopDateTimePicker.js +1 -1
- package/DigitalClock/DigitalClock.js +33 -0
- package/MobileDatePicker/MobileDatePicker.js +1 -1
- package/MobileDateTimePicker/MobileDateTimePicker.js +1 -1
- package/MultiSectionDigitalClock/MultiSectionDigitalClockSection.js +32 -1
- package/PickersSectionList/PickersSectionList.d.ts +9 -0
- package/PickersSectionList/PickersSectionList.js +30 -9
- package/StaticDatePicker/StaticDatePicker.js +1 -1
- package/StaticDateTimePicker/StaticDateTimePicker.js +1 -1
- package/TimeClock/Clock.js +8 -0
- package/TimeField/TimeField.types.d.ts +2 -7
- package/TimeField/index.d.ts +1 -1
- package/TimePicker/TimePicker.types.d.ts +9 -1
- package/TimePicker/index.d.ts +1 -1
- package/hooks/index.d.ts +2 -0
- package/hooks/index.js +3 -1
- package/hooks/useParsedFormat.d.ts +15 -0
- package/hooks/useParsedFormat.js +43 -0
- package/hooks/usePickersContext.d.ts +4 -0
- package/hooks/usePickersContext.js +15 -0
- package/index.js +1 -1
- package/internals/components/PickersProvider.d.ts +34 -0
- package/internals/components/PickersProvider.js +26 -0
- package/internals/hooks/useDesktopPicker/useDesktopPicker.js +9 -10
- package/internals/hooks/useDesktopPicker/useDesktopPicker.types.d.ts +2 -5
- package/internals/hooks/useField/buildSectionsFromFormat.d.ts +1 -2
- package/internals/hooks/useField/buildSectionsFromFormat.js +4 -5
- package/internals/hooks/useField/useField.js +1 -1
- package/internals/hooks/useField/useField.utils.d.ts +3 -3
- package/internals/hooks/useField/useField.utils.js +13 -13
- package/internals/hooks/useField/useFieldCharacterEditing.js +2 -2
- package/internals/hooks/useField/useFieldState.js +3 -5
- package/internals/hooks/useMobilePicker/useMobilePicker.js +7 -4
- package/internals/hooks/usePicker/usePicker.js +10 -1
- package/internals/hooks/usePicker/usePicker.types.d.ts +2 -1
- package/internals/hooks/usePicker/usePickerOwnerState.d.ts +9 -0
- package/internals/hooks/usePicker/usePickerOwnerState.js +13 -0
- package/internals/hooks/usePicker/usePickerValue.js +7 -2
- package/internals/hooks/usePicker/usePickerValue.types.d.ts +2 -0
- package/internals/index.d.ts +1 -0
- package/internals/index.js +1 -0
- package/internals/utils/utils.d.ts +7 -0
- package/internals/utils/utils.js +11 -0
- package/models/pickers.d.ts +19 -1
- package/modern/AdapterDayjs/AdapterDayjs.js +2 -0
- package/modern/DateCalendar/DateCalendar.js +1 -1
- package/modern/DatePicker/DatePicker.js +1 -1
- package/modern/DateTimePicker/DateTimePicker.js +1 -1
- package/modern/DateTimePicker/DateTimePickerTabs.js +1 -1
- package/modern/DesktopDatePicker/DesktopDatePicker.js +1 -1
- package/modern/DesktopDateTimePicker/DesktopDateTimePicker.js +1 -1
- package/modern/DigitalClock/DigitalClock.js +33 -0
- package/modern/MobileDatePicker/MobileDatePicker.js +1 -1
- package/modern/MobileDateTimePicker/MobileDateTimePicker.js +1 -1
- package/modern/MultiSectionDigitalClock/MultiSectionDigitalClockSection.js +32 -1
- package/modern/PickersSectionList/PickersSectionList.js +30 -9
- package/modern/StaticDatePicker/StaticDatePicker.js +1 -1
- package/modern/StaticDateTimePicker/StaticDateTimePicker.js +1 -1
- package/modern/TimeClock/Clock.js +8 -0
- package/modern/hooks/index.js +3 -1
- package/modern/hooks/useParsedFormat.js +43 -0
- package/modern/hooks/usePickersContext.js +15 -0
- package/modern/index.js +1 -1
- package/modern/internals/components/PickersProvider.js +26 -0
- package/modern/internals/hooks/useDesktopPicker/useDesktopPicker.js +9 -10
- package/modern/internals/hooks/useField/buildSectionsFromFormat.js +4 -5
- package/modern/internals/hooks/useField/useField.js +1 -1
- package/modern/internals/hooks/useField/useField.utils.js +13 -13
- package/modern/internals/hooks/useField/useFieldCharacterEditing.js +2 -2
- package/modern/internals/hooks/useField/useFieldState.js +3 -5
- package/modern/internals/hooks/useMobilePicker/useMobilePicker.js +7 -4
- package/modern/internals/hooks/usePicker/usePicker.js +10 -1
- package/modern/internals/hooks/usePicker/usePickerOwnerState.js +13 -0
- package/modern/internals/hooks/usePicker/usePickerValue.js +7 -2
- package/modern/internals/index.js +1 -0
- package/modern/internals/utils/utils.js +11 -0
- package/node/AdapterDayjs/AdapterDayjs.js +2 -0
- package/node/DateCalendar/DateCalendar.js +1 -1
- package/node/DatePicker/DatePicker.js +1 -1
- package/node/DateTimePicker/DateTimePicker.js +1 -1
- package/node/DateTimePicker/DateTimePickerTabs.js +1 -1
- package/node/DesktopDatePicker/DesktopDatePicker.js +1 -1
- package/node/DesktopDateTimePicker/DesktopDateTimePicker.js +1 -1
- package/node/DigitalClock/DigitalClock.js +33 -0
- package/node/MobileDatePicker/MobileDatePicker.js +1 -1
- package/node/MobileDateTimePicker/MobileDateTimePicker.js +1 -1
- package/node/MultiSectionDigitalClock/MultiSectionDigitalClockSection.js +32 -1
- package/node/PickersSectionList/PickersSectionList.js +30 -9
- package/node/StaticDatePicker/StaticDatePicker.js +1 -1
- package/node/StaticDateTimePicker/StaticDateTimePicker.js +1 -1
- package/node/TimeClock/Clock.js +8 -0
- package/node/hooks/index.js +15 -1
- package/node/hooks/useParsedFormat.js +50 -0
- package/node/hooks/usePickersContext.js +21 -0
- package/node/index.js +1 -1
- package/node/internals/components/PickersProvider.js +34 -0
- package/node/internals/hooks/useDesktopPicker/useDesktopPicker.js +7 -9
- package/node/internals/hooks/useField/buildSectionsFromFormat.js +4 -5
- package/node/internals/hooks/useField/useField.js +1 -1
- package/node/internals/hooks/useField/useField.utils.js +13 -13
- package/node/internals/hooks/useField/useFieldCharacterEditing.js +2 -2
- package/node/internals/hooks/useField/useFieldState.js +3 -5
- package/node/internals/hooks/useMobilePicker/useMobilePicker.js +5 -3
- package/node/internals/hooks/usePicker/usePicker.js +10 -1
- package/node/internals/hooks/usePicker/usePickerOwnerState.js +20 -0
- package/node/internals/hooks/usePicker/usePickerValue.js +7 -1
- package/node/internals/index.js +7 -0
- package/node/internals/utils/utils.js +13 -1
- package/package.json +4 -4
|
@@ -274,7 +274,7 @@ MobileDatePicker.propTypes = {
|
|
|
274
274
|
/**
|
|
275
275
|
* Component displaying when passed `loading` true.
|
|
276
276
|
* @returns {React.ReactNode} The node to render when loading.
|
|
277
|
-
* @default () => <span
|
|
277
|
+
* @default () => <span>...</span>
|
|
278
278
|
*/
|
|
279
279
|
renderLoading: PropTypes.func,
|
|
280
280
|
/**
|
|
@@ -322,7 +322,7 @@ MobileDateTimePicker.propTypes = {
|
|
|
322
322
|
/**
|
|
323
323
|
* Component displaying when passed `loading` true.
|
|
324
324
|
* @returns {React.ReactNode} The node to render when loading.
|
|
325
|
-
* @default () => <span
|
|
325
|
+
* @default () => <span>...</span>
|
|
326
326
|
*/
|
|
327
327
|
renderLoading: PropTypes.func,
|
|
328
328
|
/**
|
|
@@ -10,6 +10,7 @@ import MenuItem from '@mui/material/MenuItem';
|
|
|
10
10
|
import useForkRef from '@mui/utils/useForkRef';
|
|
11
11
|
import { getMultiSectionDigitalClockSectionUtilityClass } from "./multiSectionDigitalClockSectionClasses.js";
|
|
12
12
|
import { DIGITAL_CLOCK_VIEW_HEIGHT, MULTI_SECTION_CLOCK_SECTION_WIDTH } from "../internals/constants/dimensions.js";
|
|
13
|
+
import { getFocusedListItemIndex } from "../internals/utils/utils.js";
|
|
13
14
|
import { jsx as _jsx } from "react/jsx-runtime";
|
|
14
15
|
const useUtilityClasses = ownerState => {
|
|
15
16
|
const {
|
|
@@ -138,12 +139,42 @@ export const MultiSectionDigitalClockSection = /*#__PURE__*/React.forwardRef(fun
|
|
|
138
139
|
containerRef.current.scrollTop = offsetTop - 4;
|
|
139
140
|
});
|
|
140
141
|
const focusedOptionIndex = items.findIndex(item => item.isFocused(item.value));
|
|
142
|
+
const handleKeyDown = event => {
|
|
143
|
+
switch (event.key) {
|
|
144
|
+
case 'PageUp':
|
|
145
|
+
{
|
|
146
|
+
const newIndex = getFocusedListItemIndex(containerRef.current) - 5;
|
|
147
|
+
const children = containerRef.current.children;
|
|
148
|
+
const newFocusedIndex = Math.max(0, newIndex);
|
|
149
|
+
const childToFocus = children[newFocusedIndex];
|
|
150
|
+
if (childToFocus) {
|
|
151
|
+
childToFocus.focus();
|
|
152
|
+
}
|
|
153
|
+
event.preventDefault();
|
|
154
|
+
break;
|
|
155
|
+
}
|
|
156
|
+
case 'PageDown':
|
|
157
|
+
{
|
|
158
|
+
const newIndex = getFocusedListItemIndex(containerRef.current) + 5;
|
|
159
|
+
const children = containerRef.current.children;
|
|
160
|
+
const newFocusedIndex = Math.min(children.length - 1, newIndex);
|
|
161
|
+
const childToFocus = children[newFocusedIndex];
|
|
162
|
+
if (childToFocus) {
|
|
163
|
+
childToFocus.focus();
|
|
164
|
+
}
|
|
165
|
+
event.preventDefault();
|
|
166
|
+
break;
|
|
167
|
+
}
|
|
168
|
+
default:
|
|
169
|
+
}
|
|
170
|
+
};
|
|
141
171
|
return /*#__PURE__*/_jsx(MultiSectionDigitalClockSectionRoot, _extends({
|
|
142
172
|
ref: handleRef,
|
|
143
173
|
className: clsx(classes.root, className),
|
|
144
174
|
ownerState: ownerState,
|
|
145
175
|
autoFocusItem: autoFocus && active,
|
|
146
|
-
role: "listbox"
|
|
176
|
+
role: "listbox",
|
|
177
|
+
onKeyDown: handleKeyDown
|
|
147
178
|
}, other, {
|
|
148
179
|
children: items.map((option, index) => {
|
|
149
180
|
const isItemDisabled = option.isDisabled?.(option.value);
|
|
@@ -49,15 +49,6 @@ const useUtilityClasses = ownerState => {
|
|
|
49
49
|
};
|
|
50
50
|
return composeClasses(slots, getPickersSectionListUtilityClass, classes);
|
|
51
51
|
};
|
|
52
|
-
/**
|
|
53
|
-
* Demos:
|
|
54
|
-
*
|
|
55
|
-
* - [Custom field](https://mui.com/x/react-date-pickers/custom-field/)
|
|
56
|
-
*
|
|
57
|
-
* API:
|
|
58
|
-
*
|
|
59
|
-
* - [PickersSectionList API](https://mui.com/x/api/date-pickers/pickers-section-list/)
|
|
60
|
-
*/
|
|
61
52
|
function PickersSection(props) {
|
|
62
53
|
const {
|
|
63
54
|
slots,
|
|
@@ -105,6 +96,36 @@ function PickersSection(props) {
|
|
|
105
96
|
children: [/*#__PURE__*/_jsx(SectionSeparator, _extends({}, sectionSeparatorBeforeProps)), /*#__PURE__*/_jsx(SectionContent, _extends({}, sectionContentProps)), /*#__PURE__*/_jsx(SectionSeparator, _extends({}, sectionSeparatorAfterProps))]
|
|
106
97
|
}));
|
|
107
98
|
}
|
|
99
|
+
process.env.NODE_ENV !== "production" ? PickersSection.propTypes = {
|
|
100
|
+
// ----------------------------- Warning --------------------------------
|
|
101
|
+
// | These PropTypes are generated from the TypeScript type definitions |
|
|
102
|
+
// | To update them edit the TypeScript types and run "pnpm proptypes" |
|
|
103
|
+
// ----------------------------------------------------------------------
|
|
104
|
+
classes: PropTypes.object.isRequired,
|
|
105
|
+
element: PropTypes.shape({
|
|
106
|
+
after: PropTypes.object.isRequired,
|
|
107
|
+
before: PropTypes.object.isRequired,
|
|
108
|
+
container: PropTypes.object.isRequired,
|
|
109
|
+
content: PropTypes.object.isRequired
|
|
110
|
+
}).isRequired,
|
|
111
|
+
/**
|
|
112
|
+
* The props used for each component slot.
|
|
113
|
+
*/
|
|
114
|
+
slotProps: PropTypes.object,
|
|
115
|
+
/**
|
|
116
|
+
* Overridable component slots.
|
|
117
|
+
*/
|
|
118
|
+
slots: PropTypes.object
|
|
119
|
+
} : void 0;
|
|
120
|
+
/**
|
|
121
|
+
* Demos:
|
|
122
|
+
*
|
|
123
|
+
* - [Custom field](https://mui.com/x/react-date-pickers/custom-field/)
|
|
124
|
+
*
|
|
125
|
+
* API:
|
|
126
|
+
*
|
|
127
|
+
* - [PickersSectionList API](https://mui.com/x/api/date-pickers/pickers-section-list/)
|
|
128
|
+
*/
|
|
108
129
|
const PickersSectionList = /*#__PURE__*/React.forwardRef(function PickersSectionList(inProps, ref) {
|
|
109
130
|
const props = useThemeProps({
|
|
110
131
|
props: inProps,
|
|
@@ -208,7 +208,7 @@ StaticDatePicker.propTypes = {
|
|
|
208
208
|
/**
|
|
209
209
|
* Component displaying when passed `loading` true.
|
|
210
210
|
* @returns {React.ReactNode} The node to render when loading.
|
|
211
|
-
* @default () => <span
|
|
211
|
+
* @default () => <span>...</span>
|
|
212
212
|
*/
|
|
213
213
|
renderLoading: PropTypes.func,
|
|
214
214
|
/**
|
|
@@ -256,7 +256,7 @@ StaticDateTimePicker.propTypes = {
|
|
|
256
256
|
/**
|
|
257
257
|
* Component displaying when passed `loading` true.
|
|
258
258
|
* @returns {React.ReactNode} The node to render when loading.
|
|
259
|
-
* @default () => <span
|
|
259
|
+
* @default () => <span>...</span>
|
|
260
260
|
*/
|
|
261
261
|
renderLoading: PropTypes.func,
|
|
262
262
|
/**
|
|
@@ -274,6 +274,14 @@ export function Clock(inProps) {
|
|
|
274
274
|
handleValueChange(viewValue - keyboardControlStep, 'partial');
|
|
275
275
|
event.preventDefault();
|
|
276
276
|
break;
|
|
277
|
+
case 'PageUp':
|
|
278
|
+
handleValueChange(viewValue + 5, 'partial');
|
|
279
|
+
event.preventDefault();
|
|
280
|
+
break;
|
|
281
|
+
case 'PageDown':
|
|
282
|
+
handleValueChange(viewValue - 5, 'partial');
|
|
283
|
+
event.preventDefault();
|
|
284
|
+
break;
|
|
277
285
|
case 'Enter':
|
|
278
286
|
case ' ':
|
|
279
287
|
handleValueChange(viewValue, 'finish');
|
package/modern/hooks/index.js
CHANGED
|
@@ -1,3 +1,5 @@
|
|
|
1
1
|
export { useClearableField } from "./useClearableField.js";
|
|
2
2
|
export { usePickersTranslations } from "./usePickersTranslations.js";
|
|
3
|
-
export { useSplitFieldProps } from "./useSplitFieldProps.js";
|
|
3
|
+
export { useSplitFieldProps } from "./useSplitFieldProps.js";
|
|
4
|
+
export { useParsedFormat } from "./useParsedFormat.js";
|
|
5
|
+
export { usePickersContext } from "./usePickersContext.js";
|
|
@@ -0,0 +1,43 @@
|
|
|
1
|
+
'use client';
|
|
2
|
+
|
|
3
|
+
import * as React from 'react';
|
|
4
|
+
import { useRtl } from '@mui/system/RtlProvider';
|
|
5
|
+
import { useUtils } from "../internals/hooks/useUtils.js";
|
|
6
|
+
import { buildSectionsFromFormat } from "../internals/hooks/useField/buildSectionsFromFormat.js";
|
|
7
|
+
import { getLocalizedDigits } from "../internals/hooks/useField/useField.utils.js";
|
|
8
|
+
import { usePickersTranslations } from "./usePickersTranslations.js";
|
|
9
|
+
/**
|
|
10
|
+
* Returns the parsed format to be rendered in the field when there is no value or in other parts of the Picker.
|
|
11
|
+
* This format is localized (e.g: `AAAA` for the year with the French locale) and cannot be parsed by your date library.
|
|
12
|
+
* @param {object} The parameters needed to build the placeholder.
|
|
13
|
+
* @param {string} params.format Format of the date to use.
|
|
14
|
+
* @param {'dense' | 'spacious'} params.formatDensity Density of the format (setting `formatDensity` to `"spacious"` will add a space before and after each `/`, `-` and `.` character).
|
|
15
|
+
* @param {boolean} params.shouldRespectLeadingZeros If `true`, the format will respect the leading zeroes, if `false`, the format will always add leading zeroes.
|
|
16
|
+
* @returns
|
|
17
|
+
*/
|
|
18
|
+
export const useParsedFormat = parameters => {
|
|
19
|
+
const {
|
|
20
|
+
format,
|
|
21
|
+
formatDensity = 'dense',
|
|
22
|
+
shouldRespectLeadingZeros = false
|
|
23
|
+
} = parameters;
|
|
24
|
+
const utils = useUtils();
|
|
25
|
+
const isRtl = useRtl();
|
|
26
|
+
const translations = usePickersTranslations();
|
|
27
|
+
const localizedDigits = React.useMemo(() => getLocalizedDigits(utils), [utils]);
|
|
28
|
+
return React.useMemo(() => {
|
|
29
|
+
const sections = buildSectionsFromFormat({
|
|
30
|
+
utils,
|
|
31
|
+
format,
|
|
32
|
+
formatDensity,
|
|
33
|
+
isRtl,
|
|
34
|
+
shouldRespectLeadingZeros,
|
|
35
|
+
localeText: translations,
|
|
36
|
+
localizedDigits,
|
|
37
|
+
date: null,
|
|
38
|
+
// TODO v9: Make sure we still don't reverse in `buildSectionsFromFormat` when using `useParsedFormat`.
|
|
39
|
+
enableAccessibleFieldDOMStructure: false
|
|
40
|
+
});
|
|
41
|
+
return sections.map(section => `${section.startSeparator}${section.placeholder}${section.endSeparator}`).join('');
|
|
42
|
+
}, [utils, isRtl, translations, localizedDigits, format, formatDensity, shouldRespectLeadingZeros]);
|
|
43
|
+
};
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
'use client';
|
|
2
|
+
|
|
3
|
+
import * as React from 'react';
|
|
4
|
+
import { PickersContext } from "../internals/components/PickersProvider.js";
|
|
5
|
+
|
|
6
|
+
/**
|
|
7
|
+
* Returns the context passed by the picker that wraps the current component.
|
|
8
|
+
*/
|
|
9
|
+
export const usePickersContext = () => {
|
|
10
|
+
const value = React.useContext(PickersContext);
|
|
11
|
+
if (value == null) {
|
|
12
|
+
throw new Error(['MUI X: The `usePickersContext` can only be called in fields that are used as a slot of a picker component'].join('\n'));
|
|
13
|
+
}
|
|
14
|
+
return value;
|
|
15
|
+
};
|
package/modern/index.js
CHANGED
|
@@ -0,0 +1,26 @@
|
|
|
1
|
+
import * as React from 'react';
|
|
2
|
+
import { LocalizationProvider } from "../../LocalizationProvider/index.js";
|
|
3
|
+
import { jsx as _jsx } from "react/jsx-runtime";
|
|
4
|
+
export const PickersContext = /*#__PURE__*/React.createContext(null);
|
|
5
|
+
|
|
6
|
+
/**
|
|
7
|
+
* Provides the context for the various parts of a picker component:
|
|
8
|
+
* - contextValue: the context for the picker sub-components.
|
|
9
|
+
* - localizationProvider: the translations passed through the props and through a parent LocalizationProvider.
|
|
10
|
+
*
|
|
11
|
+
* @ignore - do not document.
|
|
12
|
+
*/
|
|
13
|
+
export function PickersProvider(props) {
|
|
14
|
+
const {
|
|
15
|
+
contextValue,
|
|
16
|
+
localeText,
|
|
17
|
+
children
|
|
18
|
+
} = props;
|
|
19
|
+
return /*#__PURE__*/_jsx(PickersContext.Provider, {
|
|
20
|
+
value: contextValue,
|
|
21
|
+
children: /*#__PURE__*/_jsx(LocalizationProvider, {
|
|
22
|
+
localeText: localeText,
|
|
23
|
+
children: children
|
|
24
|
+
})
|
|
25
|
+
});
|
|
26
|
+
}
|
|
@@ -11,15 +11,16 @@ import useForkRef from '@mui/utils/useForkRef';
|
|
|
11
11
|
import useId from '@mui/utils/useId';
|
|
12
12
|
import { PickersPopper } from "../../components/PickersPopper.js";
|
|
13
13
|
import { usePicker } from "../usePicker/index.js";
|
|
14
|
-
import { LocalizationProvider } from "../../../LocalizationProvider/index.js";
|
|
15
14
|
import { PickersLayout } from "../../../PickersLayout/index.js";
|
|
16
|
-
import {
|
|
15
|
+
import { PickersProvider } from "../../components/PickersProvider.js";
|
|
16
|
+
|
|
17
17
|
/**
|
|
18
18
|
* Hook managing all the single-date desktop pickers:
|
|
19
19
|
* - DesktopDatePicker
|
|
20
20
|
* - DesktopDateTimePicker
|
|
21
21
|
* - DesktopTimePicker
|
|
22
22
|
*/
|
|
23
|
+
import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
|
23
24
|
export const useDesktopPicker = _ref => {
|
|
24
25
|
let {
|
|
25
26
|
props,
|
|
@@ -57,7 +58,9 @@ export const useDesktopPicker = _ref => {
|
|
|
57
58
|
layoutProps,
|
|
58
59
|
renderCurrentView,
|
|
59
60
|
shouldRestoreFocus,
|
|
60
|
-
fieldProps: pickerFieldProps
|
|
61
|
+
fieldProps: pickerFieldProps,
|
|
62
|
+
contextValue,
|
|
63
|
+
ownerState
|
|
61
64
|
} = usePicker(_extends({}, pickerParams, {
|
|
62
65
|
props,
|
|
63
66
|
fieldRef,
|
|
@@ -65,11 +68,6 @@ export const useDesktopPicker = _ref => {
|
|
|
65
68
|
additionalViewProps: {},
|
|
66
69
|
wrapperVariant: 'desktop'
|
|
67
70
|
}));
|
|
68
|
-
|
|
69
|
-
// TODO v8: Apply this ownerState to all the slots in this hook.
|
|
70
|
-
const ownerStateV8 = {
|
|
71
|
-
open
|
|
72
|
-
};
|
|
73
71
|
const InputAdornment = slots.inputAdornment ?? MuiInputAdornment;
|
|
74
72
|
const _useSlotProps = useSlotProps({
|
|
75
73
|
elementType: InputAdornment,
|
|
@@ -97,7 +95,7 @@ export const useDesktopPicker = _ref => {
|
|
|
97
95
|
const openPickerIconProps = useSlotProps({
|
|
98
96
|
elementType: OpenPickerIcon,
|
|
99
97
|
externalSlotProps: innerSlotProps?.openPickerIcon,
|
|
100
|
-
ownerState
|
|
98
|
+
ownerState
|
|
101
99
|
});
|
|
102
100
|
const Field = slots.field;
|
|
103
101
|
const fieldProps = useSlotProps({
|
|
@@ -161,7 +159,8 @@ export const useDesktopPicker = _ref => {
|
|
|
161
159
|
}, innerSlotProps?.popper)
|
|
162
160
|
});
|
|
163
161
|
const handleFieldRef = useForkRef(fieldRef, fieldProps.unstableFieldRef);
|
|
164
|
-
const renderPicker = () => /*#__PURE__*/_jsxs(
|
|
162
|
+
const renderPicker = () => /*#__PURE__*/_jsxs(PickersProvider, {
|
|
163
|
+
contextValue: contextValue,
|
|
165
164
|
localeText: localeText,
|
|
166
165
|
children: [/*#__PURE__*/_jsx(Field, _extends({}, fieldProps, {
|
|
167
166
|
slots: slotsForField,
|
|
@@ -38,12 +38,12 @@ const getEscapedPartsFromFormat = ({
|
|
|
38
38
|
}
|
|
39
39
|
return escapedParts;
|
|
40
40
|
};
|
|
41
|
-
const getSectionPlaceholder = (utils,
|
|
41
|
+
const getSectionPlaceholder = (utils, localeText, sectionConfig, sectionFormat) => {
|
|
42
42
|
switch (sectionConfig.type) {
|
|
43
43
|
case 'year':
|
|
44
44
|
{
|
|
45
45
|
return localeText.fieldYearPlaceholder({
|
|
46
|
-
digitAmount: utils.formatByString(utils.date(undefined,
|
|
46
|
+
digitAmount: utils.formatByString(utils.date(undefined, 'default'), sectionFormat).length,
|
|
47
47
|
format: sectionFormat
|
|
48
48
|
});
|
|
49
49
|
}
|
|
@@ -99,7 +99,6 @@ const getSectionPlaceholder = (utils, timezone, localeText, sectionConfig, secti
|
|
|
99
99
|
};
|
|
100
100
|
const createSection = ({
|
|
101
101
|
utils,
|
|
102
|
-
timezone,
|
|
103
102
|
date,
|
|
104
103
|
shouldRespectLeadingZeros,
|
|
105
104
|
localeText,
|
|
@@ -112,7 +111,7 @@ const createSection = ({
|
|
|
112
111
|
throw new Error('MUI X: Should not call `commitToken` with an empty token');
|
|
113
112
|
}
|
|
114
113
|
const sectionConfig = getDateSectionConfigFromFormatToken(utils, token);
|
|
115
|
-
const hasLeadingZerosInFormat = doesSectionFormatHaveLeadingZeros(utils,
|
|
114
|
+
const hasLeadingZerosInFormat = doesSectionFormatHaveLeadingZeros(utils, sectionConfig.contentType, sectionConfig.type, token);
|
|
116
115
|
const hasLeadingZerosInInput = shouldRespectLeadingZeros ? hasLeadingZerosInFormat : sectionConfig.contentType === 'digit';
|
|
117
116
|
const isValidDate = date != null && utils.isValid(date);
|
|
118
117
|
let sectionValue = isValidDate ? utils.formatByString(date, token) : '';
|
|
@@ -134,7 +133,7 @@ const createSection = ({
|
|
|
134
133
|
format: token,
|
|
135
134
|
maxLength,
|
|
136
135
|
value: sectionValue,
|
|
137
|
-
placeholder: getSectionPlaceholder(utils,
|
|
136
|
+
placeholder: getSectionPlaceholder(utils, localeText, sectionConfig, token),
|
|
138
137
|
hasLeadingZerosInFormat,
|
|
139
138
|
hasLeadingZerosInInput,
|
|
140
139
|
startSeparator,
|
|
@@ -75,7 +75,7 @@ export const useField = params => {
|
|
|
75
75
|
// eslint-disable-next-line default-case
|
|
76
76
|
switch (true) {
|
|
77
77
|
// Select all
|
|
78
|
-
case (event.ctrlKey || event.metaKey) && event.
|
|
78
|
+
case (event.ctrlKey || event.metaKey) && String.fromCharCode(event.keyCode) === 'A' && !event.shiftKey && !event.altKey:
|
|
79
79
|
{
|
|
80
80
|
// prevent default to make sure that the next line "select all" while updating
|
|
81
81
|
// the internal state at the same time.
|
|
@@ -31,9 +31,9 @@ const getDeltaFromKeyCode = keyCode => {
|
|
|
31
31
|
return 0;
|
|
32
32
|
}
|
|
33
33
|
};
|
|
34
|
-
export const getDaysInWeekStr = (utils,
|
|
34
|
+
export const getDaysInWeekStr = (utils, format) => {
|
|
35
35
|
const elements = [];
|
|
36
|
-
const now = utils.date(undefined,
|
|
36
|
+
const now = utils.date(undefined, 'default');
|
|
37
37
|
const startDate = utils.startOfWeek(now);
|
|
38
38
|
const endDate = utils.endOfWeek(now);
|
|
39
39
|
let current = startDate;
|
|
@@ -51,7 +51,7 @@ export const getLetterEditingOptions = (utils, timezone, sectionType, format) =>
|
|
|
51
51
|
}
|
|
52
52
|
case 'weekDay':
|
|
53
53
|
{
|
|
54
|
-
return getDaysInWeekStr(utils,
|
|
54
|
+
return getDaysInWeekStr(utils, format);
|
|
55
55
|
}
|
|
56
56
|
case 'meridiem':
|
|
57
57
|
{
|
|
@@ -234,17 +234,17 @@ export const changeSectionValueFormat = (utils, valueStr, currentFormat, newForm
|
|
|
234
234
|
}
|
|
235
235
|
return utils.formatByString(utils.parse(valueStr, currentFormat), newFormat);
|
|
236
236
|
};
|
|
237
|
-
const isFourDigitYearFormat = (utils,
|
|
238
|
-
export const doesSectionFormatHaveLeadingZeros = (utils,
|
|
237
|
+
const isFourDigitYearFormat = (utils, format) => utils.formatByString(utils.date(undefined, 'system'), format).length === 4;
|
|
238
|
+
export const doesSectionFormatHaveLeadingZeros = (utils, contentType, sectionType, format) => {
|
|
239
239
|
if (contentType !== 'digit') {
|
|
240
240
|
return false;
|
|
241
241
|
}
|
|
242
|
-
const now = utils.date(undefined,
|
|
242
|
+
const now = utils.date(undefined, 'default');
|
|
243
243
|
switch (sectionType) {
|
|
244
244
|
// We can't use `changeSectionValueFormat`, because `utils.parse('1', 'YYYY')` returns `1971` instead of `1`.
|
|
245
245
|
case 'year':
|
|
246
246
|
{
|
|
247
|
-
if (isFourDigitYearFormat(utils,
|
|
247
|
+
if (isFourDigitYearFormat(utils, format)) {
|
|
248
248
|
const formatted0001 = utils.formatByString(utils.setYear(now, 1), format);
|
|
249
249
|
return formatted0001 === '0001';
|
|
250
250
|
}
|
|
@@ -350,7 +350,7 @@ export const getSectionsBoundaries = (utils, localizedDigits, timezone) => {
|
|
|
350
350
|
format
|
|
351
351
|
}) => ({
|
|
352
352
|
minimum: 0,
|
|
353
|
-
maximum: isFourDigitYearFormat(utils,
|
|
353
|
+
maximum: isFourDigitYearFormat(utils, format) ? 9999 : 99
|
|
354
354
|
}),
|
|
355
355
|
month: () => ({
|
|
356
356
|
minimum: 1,
|
|
@@ -369,7 +369,7 @@ export const getSectionsBoundaries = (utils, localizedDigits, timezone) => {
|
|
|
369
369
|
contentType
|
|
370
370
|
}) => {
|
|
371
371
|
if (contentType === 'digit') {
|
|
372
|
-
const daysInWeek = getDaysInWeekStr(utils,
|
|
372
|
+
const daysInWeek = getDaysInWeekStr(utils, format).map(Number);
|
|
373
373
|
return {
|
|
374
374
|
minimum: Math.min(...daysInWeek),
|
|
375
375
|
maximum: Math.max(...daysInWeek)
|
|
@@ -435,7 +435,7 @@ export const validateSections = (sections, valueType) => {
|
|
|
435
435
|
}
|
|
436
436
|
}
|
|
437
437
|
};
|
|
438
|
-
const transferDateSectionValue = (utils,
|
|
438
|
+
const transferDateSectionValue = (utils, section, dateToTransferFrom, dateToTransferTo) => {
|
|
439
439
|
switch (section.type) {
|
|
440
440
|
case 'year':
|
|
441
441
|
{
|
|
@@ -447,7 +447,7 @@ const transferDateSectionValue = (utils, timezone, section, dateToTransferFrom,
|
|
|
447
447
|
}
|
|
448
448
|
case 'weekDay':
|
|
449
449
|
{
|
|
450
|
-
const formattedDaysInWeek = getDaysInWeekStr(utils,
|
|
450
|
+
const formattedDaysInWeek = getDaysInWeekStr(utils, section.format);
|
|
451
451
|
const dayInWeekStrOfActiveDate = utils.formatByString(dateToTransferFrom, section.format);
|
|
452
452
|
const dayInWeekOfActiveDate = formattedDaysInWeek.indexOf(dayInWeekStrOfActiveDate);
|
|
453
453
|
const dayInWeekOfNewSectionValue = formattedDaysInWeek.indexOf(section.value);
|
|
@@ -499,11 +499,11 @@ const reliableSectionModificationOrder = {
|
|
|
499
499
|
meridiem: 8,
|
|
500
500
|
empty: 9
|
|
501
501
|
};
|
|
502
|
-
export const mergeDateIntoReferenceDate = (utils,
|
|
502
|
+
export const mergeDateIntoReferenceDate = (utils, dateToTransferFrom, sections, referenceDate, shouldLimitToEditedSections) =>
|
|
503
503
|
// cloning sections before sort to avoid mutating it
|
|
504
504
|
[...sections].sort((a, b) => reliableSectionModificationOrder[a.type] - reliableSectionModificationOrder[b.type]).reduce((mergedDate, section) => {
|
|
505
505
|
if (!shouldLimitToEditedSections || section.modified) {
|
|
506
|
-
return transferDateSectionValue(utils,
|
|
506
|
+
return transferDateSectionValue(utils, section, dateToTransferFrom, mergedDate);
|
|
507
507
|
}
|
|
508
508
|
return mergedDate;
|
|
509
509
|
}, referenceDate);
|
|
@@ -199,7 +199,7 @@ export const useFieldCharacterEditing = ({
|
|
|
199
199
|
// When editing a letter-format month and the user presses a digit,
|
|
200
200
|
// We can support the numeric editing by using the digit-format month and re-formatting the result.
|
|
201
201
|
if (activeSection.type === 'month') {
|
|
202
|
-
const hasLeadingZerosInFormat = doesSectionFormatHaveLeadingZeros(utils,
|
|
202
|
+
const hasLeadingZerosInFormat = doesSectionFormatHaveLeadingZeros(utils, 'digit', 'month', 'MM');
|
|
203
203
|
const response = getNewSectionValue(queryValue, {
|
|
204
204
|
type: activeSection.type,
|
|
205
205
|
format: 'MM',
|
|
@@ -224,7 +224,7 @@ export const useFieldCharacterEditing = ({
|
|
|
224
224
|
if (isQueryResponseWithoutValue(response)) {
|
|
225
225
|
return response;
|
|
226
226
|
}
|
|
227
|
-
const formattedValue = getDaysInWeekStr(utils,
|
|
227
|
+
const formattedValue = getDaysInWeekStr(utils, activeSection.format)[Number(response.sectionValue) - 1];
|
|
228
228
|
return _extends({}, response, {
|
|
229
229
|
sectionValue: formattedValue
|
|
230
230
|
});
|
|
@@ -48,7 +48,6 @@ export const useFieldState = params => {
|
|
|
48
48
|
const sectionsValueBoundaries = React.useMemo(() => getSectionsBoundaries(utils, localizedDigits, timezone), [utils, localizedDigits, timezone]);
|
|
49
49
|
const getSectionsFromValue = React.useCallback((value, fallbackSections = null) => fieldValueManager.getSectionsFromValue(utils, value, fallbackSections, date => buildSectionsFromFormat({
|
|
50
50
|
utils,
|
|
51
|
-
timezone,
|
|
52
51
|
localeText: translations,
|
|
53
52
|
localizedDigits,
|
|
54
53
|
format,
|
|
@@ -57,7 +56,7 @@ export const useFieldState = params => {
|
|
|
57
56
|
shouldRespectLeadingZeros,
|
|
58
57
|
enableAccessibleFieldDOMStructure,
|
|
59
58
|
isRtl
|
|
60
|
-
})), [fieldValueManager, format, translations, localizedDigits, isRtl, shouldRespectLeadingZeros, utils, formatDensity,
|
|
59
|
+
})), [fieldValueManager, format, translations, localizedDigits, isRtl, shouldRespectLeadingZeros, utils, formatDensity, enableAccessibleFieldDOMStructure]);
|
|
61
60
|
const [state, setState] = React.useState(() => {
|
|
62
61
|
const sections = getSectionsFromValue(valueFromTheOutside);
|
|
63
62
|
validateSections(sections, valueType);
|
|
@@ -154,7 +153,6 @@ export const useFieldState = params => {
|
|
|
154
153
|
}
|
|
155
154
|
const sections = buildSectionsFromFormat({
|
|
156
155
|
utils,
|
|
157
|
-
timezone,
|
|
158
156
|
localeText: translations,
|
|
159
157
|
localizedDigits,
|
|
160
158
|
format,
|
|
@@ -164,7 +162,7 @@ export const useFieldState = params => {
|
|
|
164
162
|
enableAccessibleFieldDOMStructure,
|
|
165
163
|
isRtl
|
|
166
164
|
});
|
|
167
|
-
return mergeDateIntoReferenceDate(utils,
|
|
165
|
+
return mergeDateIntoReferenceDate(utils, date, sections, referenceDate, false);
|
|
168
166
|
};
|
|
169
167
|
const newValue = fieldValueManager.parseValueStr(valueStr, state.referenceValue, parseDateStr);
|
|
170
168
|
const newReferenceValue = fieldValueManager.updateReferenceValue(utils, newValue, state.referenceValue);
|
|
@@ -202,7 +200,7 @@ export const useFieldState = params => {
|
|
|
202
200
|
* This makes sure that we don't lose some information of the initial date (like the time on a date field).
|
|
203
201
|
*/
|
|
204
202
|
if (newActiveDate != null && utils.isValid(newActiveDate)) {
|
|
205
|
-
const mergedDate = mergeDateIntoReferenceDate(utils,
|
|
203
|
+
const mergedDate = mergeDateIntoReferenceDate(utils, newActiveDate, newActiveDateSections, activeDateManager.referenceDate, true);
|
|
206
204
|
values = activeDateManager.getNewValuesFromNewActiveDate(mergedDate);
|
|
207
205
|
shouldPublish = true;
|
|
208
206
|
} else {
|
|
@@ -8,15 +8,16 @@ import useId from '@mui/utils/useId';
|
|
|
8
8
|
import { PickersModalDialog } from "../../components/PickersModalDialog.js";
|
|
9
9
|
import { usePicker } from "../usePicker/index.js";
|
|
10
10
|
import { onSpaceOrEnter } from "../../utils/utils.js";
|
|
11
|
-
import { LocalizationProvider } from "../../../LocalizationProvider/index.js";
|
|
12
11
|
import { PickersLayout } from "../../../PickersLayout/index.js";
|
|
13
|
-
import {
|
|
12
|
+
import { PickersProvider } from "../../components/PickersProvider.js";
|
|
13
|
+
|
|
14
14
|
/**
|
|
15
15
|
* Hook managing all the single-date mobile pickers:
|
|
16
16
|
* - MobileDatePicker
|
|
17
17
|
* - MobileDateTimePicker
|
|
18
18
|
* - MobileTimePicker
|
|
19
19
|
*/
|
|
20
|
+
import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
|
20
21
|
export const useMobilePicker = _ref => {
|
|
21
22
|
let {
|
|
22
23
|
props,
|
|
@@ -49,7 +50,8 @@ export const useMobilePicker = _ref => {
|
|
|
49
50
|
actions,
|
|
50
51
|
layoutProps,
|
|
51
52
|
renderCurrentView,
|
|
52
|
-
fieldProps: pickerFieldProps
|
|
53
|
+
fieldProps: pickerFieldProps,
|
|
54
|
+
contextValue
|
|
53
55
|
} = usePicker(_extends({}, pickerParams, {
|
|
54
56
|
props,
|
|
55
57
|
fieldRef,
|
|
@@ -110,7 +112,8 @@ export const useMobilePicker = _ref => {
|
|
|
110
112
|
}, innerSlotProps?.mobilePaper)
|
|
111
113
|
});
|
|
112
114
|
const handleFieldRef = useForkRef(fieldRef, fieldProps.unstableFieldRef);
|
|
113
|
-
const renderPicker = () => /*#__PURE__*/_jsxs(
|
|
115
|
+
const renderPicker = () => /*#__PURE__*/_jsxs(PickersProvider, {
|
|
116
|
+
contextValue: contextValue,
|
|
114
117
|
localeText: localeText,
|
|
115
118
|
children: [/*#__PURE__*/_jsx(Field, _extends({}, fieldProps, {
|
|
116
119
|
slots: slotsForField,
|
|
@@ -2,6 +2,7 @@ import { warnOnce } from '@mui/x-internals/warning';
|
|
|
2
2
|
import { usePickerValue } from "./usePickerValue.js";
|
|
3
3
|
import { usePickerViews } from "./usePickerViews.js";
|
|
4
4
|
import { usePickerLayoutProps } from "./usePickerLayoutProps.js";
|
|
5
|
+
import { usePickerOwnerState } from "./usePickerOwnerState.js";
|
|
5
6
|
export const usePicker = ({
|
|
6
7
|
props,
|
|
7
8
|
valueManager,
|
|
@@ -39,6 +40,10 @@ export const usePicker = ({
|
|
|
39
40
|
propsFromPickerValue: pickerValueResponse.layoutProps,
|
|
40
41
|
propsFromPickerViews: pickerViewsResponse.layoutProps
|
|
41
42
|
});
|
|
43
|
+
const pickerOwnerState = usePickerOwnerState({
|
|
44
|
+
props,
|
|
45
|
+
pickerValueResponse
|
|
46
|
+
});
|
|
42
47
|
return {
|
|
43
48
|
// Picker value
|
|
44
49
|
open: pickerValueResponse.open,
|
|
@@ -49,6 +54,10 @@ export const usePicker = ({
|
|
|
49
54
|
hasUIView: pickerViewsResponse.hasUIView,
|
|
50
55
|
shouldRestoreFocus: pickerViewsResponse.shouldRestoreFocus,
|
|
51
56
|
// Picker layout
|
|
52
|
-
layoutProps: pickerLayoutResponse.layoutProps
|
|
57
|
+
layoutProps: pickerLayoutResponse.layoutProps,
|
|
58
|
+
// Picker context
|
|
59
|
+
contextValue: pickerValueResponse.contextValue,
|
|
60
|
+
// Picker owner state
|
|
61
|
+
ownerState: pickerOwnerState
|
|
53
62
|
};
|
|
54
63
|
};
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
import * as React from 'react';
|
|
2
|
+
export function usePickerOwnerState(parameters) {
|
|
3
|
+
const {
|
|
4
|
+
props,
|
|
5
|
+
pickerValueResponse
|
|
6
|
+
} = parameters;
|
|
7
|
+
return React.useMemo(() => ({
|
|
8
|
+
value: pickerValueResponse.viewProps.value,
|
|
9
|
+
open: pickerValueResponse.open,
|
|
10
|
+
disabled: props.disabled ?? false,
|
|
11
|
+
readOnly: props.readOnly ?? false
|
|
12
|
+
}), [pickerValueResponse.viewProps.value, pickerValueResponse.open, props.disabled, props.readOnly]);
|
|
13
|
+
}
|
|
@@ -5,7 +5,6 @@ import { useOpenState } from "../useOpenState.js";
|
|
|
5
5
|
import { useLocalizationContext, useUtils } from "../useUtils.js";
|
|
6
6
|
import { useValidation } from "../../../validation/index.js";
|
|
7
7
|
import { useValueWithTimezone } from "../useValueWithTimezone.js";
|
|
8
|
-
|
|
9
8
|
/**
|
|
10
9
|
* Decide if the new value should be published
|
|
11
10
|
* The published value will be passed to `onChange` if defined.
|
|
@@ -334,11 +333,17 @@ export const usePickerValue = ({
|
|
|
334
333
|
onSelectShortcut: handleSelectShortcut,
|
|
335
334
|
isValid
|
|
336
335
|
});
|
|
336
|
+
const contextValue = React.useMemo(() => ({
|
|
337
|
+
onOpen: handleOpen,
|
|
338
|
+
onClose: handleClose,
|
|
339
|
+
open: isOpen
|
|
340
|
+
}), [isOpen, handleClose, handleOpen]);
|
|
337
341
|
return {
|
|
338
342
|
open: isOpen,
|
|
339
343
|
fieldProps: fieldResponse,
|
|
340
344
|
viewProps: viewResponse,
|
|
341
345
|
layoutProps: layoutResponse,
|
|
342
|
-
actions
|
|
346
|
+
actions,
|
|
347
|
+
contextValue
|
|
343
348
|
};
|
|
344
349
|
};
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
export { PickersArrowSwitcher } from "./components/PickersArrowSwitcher/PickersArrowSwitcher.js";
|
|
2
|
+
export { PickersProvider } from "./components/PickersProvider.js";
|
|
2
3
|
export { PickersModalDialog } from "./components/PickersModalDialog.js";
|
|
3
4
|
export { PickersPopper } from "./components/PickersPopper.js";
|
|
4
5
|
export { PickersToolbar } from "./components/PickersToolbar.js";
|