@mui/x-date-pickers 7.7.0 → 7.7.1
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/AdapterDateFnsJalaliV3/AdapterDateFnsJalaliV3.d.ts +48 -48
- package/AdapterDateFnsJalaliV3/AdapterDateFnsJalaliV3.js +1 -0
- package/AdapterDateFnsV3/AdapterDateFnsV3.d.ts +47 -47
- package/AdapterDateFnsV3/AdapterDateFnsV3.js +1 -0
- package/CHANGELOG.md +82 -0
- package/DatePicker/DatePicker.js +2 -0
- package/DateTimePicker/DateTimePicker.js +2 -0
- package/DesktopDatePicker/DesktopDatePicker.js +2 -0
- package/DesktopDateTimePicker/DesktopDateTimePicker.js +2 -0
- package/DesktopTimePicker/DesktopTimePicker.js +2 -0
- package/MobileDatePicker/MobileDatePicker.js +2 -0
- package/MobileDateTimePicker/MobileDateTimePicker.js +2 -0
- package/MobileTimePicker/MobileTimePicker.js +2 -0
- package/MultiSectionDigitalClock/MultiSectionDigitalClock.js +16 -3
- package/PickersCalendarHeader/PickersCalendarHeader.js +4 -0
- package/PickersCalendarHeader/PickersCalendarHeader.types.d.ts +4 -0
- package/PickersLayout/usePickerLayout.js +0 -5
- package/StaticDatePicker/StaticDatePicker.js +2 -0
- package/StaticDateTimePicker/StaticDateTimePicker.js +2 -0
- package/StaticTimePicker/StaticTimePicker.js +2 -0
- package/TimePicker/TimePicker.js +2 -0
- package/index.js +1 -1
- package/internals/components/PickersArrowSwitcher/PickersArrowSwitcher.js +4 -2
- package/internals/components/PickersArrowSwitcher/PickersArrowSwitcher.types.d.ts +1 -0
- package/internals/hooks/useField/useField.utils.js +2 -1
- package/internals/hooks/usePicker/usePickerValue.js +45 -38
- package/internals/hooks/usePicker/usePickerValue.types.d.ts +3 -1
- package/internals/hooks/usePicker/usePickerViews.js +2 -1
- package/locales/daDK.js +15 -19
- package/modern/AdapterDateFnsJalaliV3/AdapterDateFnsJalaliV3.js +1 -0
- package/modern/AdapterDateFnsV3/AdapterDateFnsV3.js +1 -0
- package/modern/DatePicker/DatePicker.js +2 -0
- package/modern/DateTimePicker/DateTimePicker.js +2 -0
- package/modern/DesktopDatePicker/DesktopDatePicker.js +2 -0
- package/modern/DesktopDateTimePicker/DesktopDateTimePicker.js +2 -0
- package/modern/DesktopTimePicker/DesktopTimePicker.js +2 -0
- package/modern/MobileDatePicker/MobileDatePicker.js +2 -0
- package/modern/MobileDateTimePicker/MobileDateTimePicker.js +2 -0
- package/modern/MobileTimePicker/MobileTimePicker.js +2 -0
- package/modern/MultiSectionDigitalClock/MultiSectionDigitalClock.js +16 -3
- package/modern/PickersCalendarHeader/PickersCalendarHeader.js +4 -0
- package/modern/PickersLayout/usePickerLayout.js +0 -5
- package/modern/StaticDatePicker/StaticDatePicker.js +2 -0
- package/modern/StaticDateTimePicker/StaticDateTimePicker.js +2 -0
- package/modern/StaticTimePicker/StaticTimePicker.js +2 -0
- package/modern/TimePicker/TimePicker.js +2 -0
- package/modern/index.js +1 -1
- package/modern/internals/components/PickersArrowSwitcher/PickersArrowSwitcher.js +4 -2
- package/modern/internals/hooks/useField/useField.utils.js +2 -1
- package/modern/internals/hooks/usePicker/usePickerValue.js +45 -38
- package/modern/internals/hooks/usePicker/usePickerViews.js +2 -1
- package/modern/locales/daDK.js +15 -19
- package/node/AdapterDateFnsJalaliV3/AdapterDateFnsJalaliV3.js +1 -0
- package/node/AdapterDateFnsV3/AdapterDateFnsV3.js +1 -0
- package/node/DatePicker/DatePicker.js +2 -0
- package/node/DateTimePicker/DateTimePicker.js +2 -0
- package/node/DesktopDatePicker/DesktopDatePicker.js +2 -0
- package/node/DesktopDateTimePicker/DesktopDateTimePicker.js +2 -0
- package/node/DesktopTimePicker/DesktopTimePicker.js +2 -0
- package/node/MobileDatePicker/MobileDatePicker.js +2 -0
- package/node/MobileDateTimePicker/MobileDateTimePicker.js +2 -0
- package/node/MobileTimePicker/MobileTimePicker.js +2 -0
- package/node/MultiSectionDigitalClock/MultiSectionDigitalClock.js +16 -3
- package/node/PickersCalendarHeader/PickersCalendarHeader.js +4 -0
- package/node/PickersLayout/usePickerLayout.js +0 -5
- package/node/StaticDatePicker/StaticDatePicker.js +2 -0
- package/node/StaticDateTimePicker/StaticDateTimePicker.js +2 -0
- package/node/StaticTimePicker/StaticTimePicker.js +2 -0
- package/node/TimePicker/TimePicker.js +2 -0
- package/node/index.js +1 -1
- package/node/internals/components/PickersArrowSwitcher/PickersArrowSwitcher.js +4 -2
- package/node/internals/hooks/useField/useField.utils.js +2 -1
- package/node/internals/hooks/usePicker/usePickerValue.js +45 -38
- package/node/internals/hooks/usePicker/usePickerViews.js +2 -1
- package/node/locales/daDK.js +15 -19
- package/package.json +3 -3
|
@@ -119,7 +119,7 @@ export const usePickerValue = ({
|
|
|
119
119
|
const {
|
|
120
120
|
onAccept,
|
|
121
121
|
onChange,
|
|
122
|
-
value:
|
|
122
|
+
value: inValueWithoutRenderTimezone,
|
|
123
123
|
defaultValue: inDefaultValue,
|
|
124
124
|
closeOnSelect = wrapperVariant === 'desktop',
|
|
125
125
|
timezone: timezoneProp
|
|
@@ -129,15 +129,15 @@ export const usePickerValue = ({
|
|
|
129
129
|
} = React.useRef(inDefaultValue);
|
|
130
130
|
const {
|
|
131
131
|
current: isControlled
|
|
132
|
-
} = React.useRef(
|
|
132
|
+
} = React.useRef(inValueWithoutRenderTimezone !== undefined);
|
|
133
133
|
|
|
134
134
|
/* eslint-disable react-hooks/rules-of-hooks, react-hooks/exhaustive-deps */
|
|
135
135
|
if (process.env.NODE_ENV !== 'production') {
|
|
136
136
|
React.useEffect(() => {
|
|
137
|
-
if (isControlled !== (
|
|
137
|
+
if (isControlled !== (inValueWithoutRenderTimezone !== undefined)) {
|
|
138
138
|
console.error([`MUI X: A component is changing the ${isControlled ? '' : 'un'}controlled value of a picker to be ${isControlled ? 'un' : ''}controlled.`, 'Elements should not switch from uncontrolled to controlled (or vice versa).', `Decide between using a controlled or uncontrolled value` + 'for the lifetime of the component.', "The nature of the state is determined during the first render. It's considered controlled if the value is not `undefined`.", 'More info: https://fb.me/react-controlled-components'].join('\n'));
|
|
139
139
|
}
|
|
140
|
-
}, [
|
|
140
|
+
}, [inValueWithoutRenderTimezone]);
|
|
141
141
|
React.useEffect(() => {
|
|
142
142
|
if (!isControlled && defaultValue !== inDefaultValue) {
|
|
143
143
|
console.error([`MUI X: A component is changing the defaultValue of an uncontrolled picker after being initialized. ` + `To suppress this warning opt to use a controlled value.`].join('\n'));
|
|
@@ -152,10 +152,21 @@ export const usePickerValue = ({
|
|
|
152
152
|
isOpen,
|
|
153
153
|
setIsOpen
|
|
154
154
|
} = useOpenState(props);
|
|
155
|
+
const {
|
|
156
|
+
timezone,
|
|
157
|
+
value: inValueWithTimezoneToRender,
|
|
158
|
+
handleValueChange
|
|
159
|
+
} = useValueWithTimezone({
|
|
160
|
+
timezone: timezoneProp,
|
|
161
|
+
value: inValueWithoutRenderTimezone,
|
|
162
|
+
defaultValue,
|
|
163
|
+
onChange,
|
|
164
|
+
valueManager
|
|
165
|
+
});
|
|
155
166
|
const [dateState, setDateState] = React.useState(() => {
|
|
156
167
|
let initialValue;
|
|
157
|
-
if (
|
|
158
|
-
initialValue =
|
|
168
|
+
if (inValueWithTimezoneToRender !== undefined) {
|
|
169
|
+
initialValue = inValueWithTimezoneToRender;
|
|
159
170
|
} else if (defaultValue !== undefined) {
|
|
160
171
|
initialValue = defaultValue;
|
|
161
172
|
} else {
|
|
@@ -165,20 +176,10 @@ export const usePickerValue = ({
|
|
|
165
176
|
draft: initialValue,
|
|
166
177
|
lastPublishedValue: initialValue,
|
|
167
178
|
lastCommittedValue: initialValue,
|
|
168
|
-
lastControlledValue:
|
|
179
|
+
lastControlledValue: inValueWithTimezoneToRender,
|
|
169
180
|
hasBeenModifiedSinceMount: false
|
|
170
181
|
};
|
|
171
182
|
});
|
|
172
|
-
const {
|
|
173
|
-
timezone,
|
|
174
|
-
handleValueChange
|
|
175
|
-
} = useValueWithTimezone({
|
|
176
|
-
timezone: timezoneProp,
|
|
177
|
-
value: inValue,
|
|
178
|
-
defaultValue,
|
|
179
|
-
onChange,
|
|
180
|
-
valueManager
|
|
181
|
-
});
|
|
182
183
|
useValidation(_extends({}, props, {
|
|
183
184
|
value: dateState.draft,
|
|
184
185
|
timezone
|
|
@@ -200,38 +201,44 @@ export const usePickerValue = ({
|
|
|
200
201
|
lastCommittedValue: shouldCommit ? action.value : prev.lastCommittedValue,
|
|
201
202
|
hasBeenModifiedSinceMount: true
|
|
202
203
|
}));
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
204
|
+
let cachedContext = null;
|
|
205
|
+
const getContext = () => {
|
|
206
|
+
if (!cachedContext) {
|
|
207
|
+
const validationError = action.name === 'setValueFromField' ? action.context.validationError : validator({
|
|
208
|
+
adapter,
|
|
208
209
|
value: action.value,
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
210
|
+
props: _extends({}, props, {
|
|
211
|
+
value: action.value,
|
|
212
|
+
timezone
|
|
213
|
+
})
|
|
214
|
+
});
|
|
215
|
+
cachedContext = {
|
|
216
|
+
validationError
|
|
217
|
+
};
|
|
218
|
+
if (action.name === 'setValueFromShortcut') {
|
|
219
|
+
cachedContext.shortcut = action.shortcut;
|
|
220
|
+
}
|
|
217
221
|
}
|
|
218
|
-
|
|
222
|
+
return cachedContext;
|
|
223
|
+
};
|
|
224
|
+
if (shouldPublish) {
|
|
225
|
+
handleValueChange(action.value, getContext());
|
|
219
226
|
}
|
|
220
227
|
if (shouldCommit && onAccept) {
|
|
221
|
-
onAccept(action.value);
|
|
228
|
+
onAccept(action.value, getContext());
|
|
222
229
|
}
|
|
223
230
|
if (shouldClose) {
|
|
224
231
|
setIsOpen(false);
|
|
225
232
|
}
|
|
226
233
|
});
|
|
227
|
-
if (
|
|
228
|
-
const isUpdateComingFromPicker = valueManager.areValuesEqual(utils, dateState.draft,
|
|
234
|
+
if (inValueWithTimezoneToRender !== undefined && (dateState.lastControlledValue === undefined || !valueManager.areValuesEqual(utils, dateState.lastControlledValue, inValueWithTimezoneToRender))) {
|
|
235
|
+
const isUpdateComingFromPicker = valueManager.areValuesEqual(utils, dateState.draft, inValueWithTimezoneToRender);
|
|
229
236
|
setDateState(prev => _extends({}, prev, {
|
|
230
|
-
lastControlledValue:
|
|
237
|
+
lastControlledValue: inValueWithTimezoneToRender
|
|
231
238
|
}, isUpdateComingFromPicker ? {} : {
|
|
232
|
-
lastCommittedValue:
|
|
233
|
-
lastPublishedValue:
|
|
234
|
-
draft:
|
|
239
|
+
lastCommittedValue: inValueWithTimezoneToRender,
|
|
240
|
+
lastPublishedValue: inValueWithTimezoneToRender,
|
|
241
|
+
draft: inValueWithTimezoneToRender,
|
|
235
242
|
hasBeenModifiedSinceMount: true
|
|
236
243
|
}));
|
|
237
244
|
}
|
|
@@ -193,9 +193,11 @@ export interface UsePickerValueBaseProps<TValue, TError> {
|
|
|
193
193
|
/**
|
|
194
194
|
* Callback fired when the value is accepted.
|
|
195
195
|
* @template TValue The value type. Will be either the same type as `value` or `null`. Can be in `[start, end]` format in case of range value.
|
|
196
|
+
* @template TError The validation error type. Will be either `string` or a `null`. Can be in `[start, end]` format in case of range value.
|
|
196
197
|
* @param {TValue} value The value that was just accepted.
|
|
198
|
+
* @param {FieldChangeHandlerContext<TError>} context The context containing the validation result of the current value.
|
|
197
199
|
*/
|
|
198
|
-
onAccept?: (value: TValue) => void;
|
|
200
|
+
onAccept?: (value: TValue, context: PickerChangeHandlerContext<TError>) => void;
|
|
199
201
|
/**
|
|
200
202
|
* Callback fired when the error associated to the current value changes.
|
|
201
203
|
* If the error has a non-null value, then the `TextField` will be rendered in `error` state.
|
|
@@ -39,6 +39,7 @@ export const usePickerViews = ({
|
|
|
39
39
|
onClose
|
|
40
40
|
} = propsFromPickerValue;
|
|
41
41
|
const {
|
|
42
|
+
view: inView,
|
|
42
43
|
views,
|
|
43
44
|
openTo,
|
|
44
45
|
onViewChange,
|
|
@@ -54,7 +55,7 @@ export const usePickerViews = ({
|
|
|
54
55
|
setFocusedView,
|
|
55
56
|
setValueAndGoToNextView
|
|
56
57
|
} = useViews({
|
|
57
|
-
view:
|
|
58
|
+
view: inView,
|
|
58
59
|
views,
|
|
59
60
|
openTo,
|
|
60
61
|
onChange,
|
package/locales/daDK.js
CHANGED
|
@@ -17,11 +17,10 @@ const daDKPickers = {
|
|
|
17
17
|
// DateRange labels
|
|
18
18
|
start: 'Start',
|
|
19
19
|
end: 'Slut',
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
20
|
+
startDate: 'Start dato',
|
|
21
|
+
startTime: 'Start tid',
|
|
22
|
+
endDate: 'Slut date',
|
|
23
|
+
endTime: 'Slut tid',
|
|
25
24
|
// Action bar
|
|
26
25
|
cancelButtonLabel: 'Annuller',
|
|
27
26
|
clearButtonLabel: 'Ryd',
|
|
@@ -47,8 +46,7 @@ const daDKPickers = {
|
|
|
47
46
|
// Open picker labels
|
|
48
47
|
openDatePickerDialogue: (value, utils) => value !== null && utils.isValid(value) ? `Vælg dato, valgte dato er ${utils.format(value, 'fullDate')}` : 'Vælg dato',
|
|
49
48
|
openTimePickerDialogue: (value, utils) => value !== null && utils.isValid(value) ? `Vælg tidspunkt, valgte tidspunkt er ${utils.format(value, 'fullTime')}` : 'Vælg tidspunkt',
|
|
50
|
-
|
|
51
|
-
|
|
49
|
+
fieldClearLabel: 'ryd felt',
|
|
52
50
|
// Table labels
|
|
53
51
|
timeTableLabel: 'vælg tidspunkt',
|
|
54
52
|
dateTableLabel: 'vælg dato',
|
|
@@ -60,19 +58,17 @@ const daDKPickers = {
|
|
|
60
58
|
fieldHoursPlaceholder: () => 'hh',
|
|
61
59
|
fieldMinutesPlaceholder: () => 'mm',
|
|
62
60
|
fieldSecondsPlaceholder: () => 'ss',
|
|
63
|
-
fieldMeridiemPlaceholder: () => 'aa'
|
|
64
|
-
|
|
61
|
+
fieldMeridiemPlaceholder: () => 'aa',
|
|
65
62
|
// View names
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
63
|
+
year: 'år',
|
|
64
|
+
month: 'måned',
|
|
65
|
+
day: 'dag',
|
|
66
|
+
weekDay: 'ugedag',
|
|
67
|
+
hours: 'timer',
|
|
68
|
+
minutes: 'minutter',
|
|
69
|
+
seconds: 'sekunder',
|
|
70
|
+
meridiem: 'middag',
|
|
75
71
|
// Common
|
|
76
|
-
|
|
72
|
+
empty: 'tom'
|
|
77
73
|
};
|
|
78
74
|
export const daDK = getPickersLocalization(daDKPickers);
|
|
@@ -130,6 +130,7 @@ export class AdapterDateFnsJalali extends AdapterDateFnsBase {
|
|
|
130
130
|
longFormatters,
|
|
131
131
|
lib: 'date-fns-jalali'
|
|
132
132
|
});
|
|
133
|
+
// TODO: explicit return types can be removed once there is only one date-fns version supported
|
|
133
134
|
this.parse = (value, format) => {
|
|
134
135
|
if (value === '') {
|
|
135
136
|
return null;
|
|
@@ -90,6 +90,7 @@ export class AdapterDateFns extends AdapterDateFnsBase {
|
|
|
90
90
|
formats,
|
|
91
91
|
longFormatters
|
|
92
92
|
});
|
|
93
|
+
// TODO: explicit return types can be removed once there is only one date-fns version supported
|
|
93
94
|
this.parse = (value, format) => {
|
|
94
95
|
if (value === '') {
|
|
95
96
|
return null;
|
|
@@ -167,7 +167,9 @@ process.env.NODE_ENV !== "production" ? DatePicker.propTypes = {
|
|
|
167
167
|
/**
|
|
168
168
|
* Callback fired when the value is accepted.
|
|
169
169
|
* @template TValue The value type. Will be either the same type as `value` or `null`. Can be in `[start, end]` format in case of range value.
|
|
170
|
+
* @template TError The validation error type. Will be either `string` or a `null`. Can be in `[start, end]` format in case of range value.
|
|
170
171
|
* @param {TValue} value The value that was just accepted.
|
|
172
|
+
* @param {FieldChangeHandlerContext<TError>} context The context containing the validation result of the current value.
|
|
171
173
|
*/
|
|
172
174
|
onAccept: PropTypes.func,
|
|
173
175
|
/**
|
|
@@ -205,7 +205,9 @@ process.env.NODE_ENV !== "production" ? DateTimePicker.propTypes = {
|
|
|
205
205
|
/**
|
|
206
206
|
* Callback fired when the value is accepted.
|
|
207
207
|
* @template TValue The value type. Will be either the same type as `value` or `null`. Can be in `[start, end]` format in case of range value.
|
|
208
|
+
* @template TError The validation error type. Will be either `string` or a `null`. Can be in `[start, end]` format in case of range value.
|
|
208
209
|
* @param {TValue} value The value that was just accepted.
|
|
210
|
+
* @param {FieldChangeHandlerContext<TError>} context The context containing the validation result of the current value.
|
|
209
211
|
*/
|
|
210
212
|
onAccept: PropTypes.func,
|
|
211
213
|
/**
|
|
@@ -182,7 +182,9 @@ DesktopDatePicker.propTypes = {
|
|
|
182
182
|
/**
|
|
183
183
|
* Callback fired when the value is accepted.
|
|
184
184
|
* @template TValue The value type. Will be either the same type as `value` or `null`. Can be in `[start, end]` format in case of range value.
|
|
185
|
+
* @template TError The validation error type. Will be either `string` or a `null`. Can be in `[start, end]` format in case of range value.
|
|
185
186
|
* @param {TValue} value The value that was just accepted.
|
|
187
|
+
* @param {FieldChangeHandlerContext<TError>} context The context containing the validation result of the current value.
|
|
186
188
|
*/
|
|
187
189
|
onAccept: PropTypes.func,
|
|
188
190
|
/**
|
|
@@ -305,7 +305,9 @@ DesktopDateTimePicker.propTypes = {
|
|
|
305
305
|
/**
|
|
306
306
|
* Callback fired when the value is accepted.
|
|
307
307
|
* @template TValue The value type. Will be either the same type as `value` or `null`. Can be in `[start, end]` format in case of range value.
|
|
308
|
+
* @template TError The validation error type. Will be either `string` or a `null`. Can be in `[start, end]` format in case of range value.
|
|
308
309
|
* @param {TValue} value The value that was just accepted.
|
|
310
|
+
* @param {FieldChangeHandlerContext<TError>} context The context containing the validation result of the current value.
|
|
309
311
|
*/
|
|
310
312
|
onAccept: PropTypes.func,
|
|
311
313
|
/**
|
|
@@ -193,7 +193,9 @@ DesktopTimePicker.propTypes = {
|
|
|
193
193
|
/**
|
|
194
194
|
* Callback fired when the value is accepted.
|
|
195
195
|
* @template TValue The value type. Will be either the same type as `value` or `null`. Can be in `[start, end]` format in case of range value.
|
|
196
|
+
* @template TError The validation error type. Will be either `string` or a `null`. Can be in `[start, end]` format in case of range value.
|
|
196
197
|
* @param {TValue} value The value that was just accepted.
|
|
198
|
+
* @param {FieldChangeHandlerContext<TError>} context The context containing the validation result of the current value.
|
|
197
199
|
*/
|
|
198
200
|
onAccept: PropTypes.func,
|
|
199
201
|
/**
|
|
@@ -179,7 +179,9 @@ MobileDatePicker.propTypes = {
|
|
|
179
179
|
/**
|
|
180
180
|
* Callback fired when the value is accepted.
|
|
181
181
|
* @template TValue The value type. Will be either the same type as `value` or `null`. Can be in `[start, end]` format in case of range value.
|
|
182
|
+
* @template TError The validation error type. Will be either `string` or a `null`. Can be in `[start, end]` format in case of range value.
|
|
182
183
|
* @param {TValue} value The value that was just accepted.
|
|
184
|
+
* @param {FieldChangeHandlerContext<TError>} context The context containing the validation result of the current value.
|
|
183
185
|
*/
|
|
184
186
|
onAccept: PropTypes.func,
|
|
185
187
|
/**
|
|
@@ -227,7 +227,9 @@ MobileDateTimePicker.propTypes = {
|
|
|
227
227
|
/**
|
|
228
228
|
* Callback fired when the value is accepted.
|
|
229
229
|
* @template TValue The value type. Will be either the same type as `value` or `null`. Can be in `[start, end]` format in case of range value.
|
|
230
|
+
* @template TError The validation error type. Will be either `string` or a `null`. Can be in `[start, end]` format in case of range value.
|
|
230
231
|
* @param {TValue} value The value that was just accepted.
|
|
232
|
+
* @param {FieldChangeHandlerContext<TError>} context The context containing the validation result of the current value.
|
|
231
233
|
*/
|
|
232
234
|
onAccept: PropTypes.func,
|
|
233
235
|
/**
|
|
@@ -172,7 +172,9 @@ MobileTimePicker.propTypes = {
|
|
|
172
172
|
/**
|
|
173
173
|
* Callback fired when the value is accepted.
|
|
174
174
|
* @template TValue The value type. Will be either the same type as `value` or `null`. Can be in `[start, end]` format in case of range value.
|
|
175
|
+
* @template TError The validation error type. Will be either `string` or a `null`. Can be in `[start, end]` format in case of range value.
|
|
175
176
|
* @param {TValue} value The value that was just accepted.
|
|
177
|
+
* @param {FieldChangeHandlerContext<TError>} context The context containing the validation result of the current value.
|
|
176
178
|
*/
|
|
177
179
|
onAccept: PropTypes.func,
|
|
178
180
|
/**
|
|
@@ -4,6 +4,7 @@ const _excluded = ["ampm", "timeSteps", "autoFocus", "slots", "slotProps", "valu
|
|
|
4
4
|
import * as React from 'react';
|
|
5
5
|
import clsx from 'clsx';
|
|
6
6
|
import PropTypes from 'prop-types';
|
|
7
|
+
import { useRtl } from '@mui/system/RtlProvider';
|
|
7
8
|
import { styled, useThemeProps } from '@mui/material/styles';
|
|
8
9
|
import useEventCallback from '@mui/utils/useEventCallback';
|
|
9
10
|
import composeClasses from '@mui/utils/composeClasses';
|
|
@@ -53,6 +54,7 @@ const MultiSectionDigitalClockRoot = styled(PickerViewRoot, {
|
|
|
53
54
|
*/
|
|
54
55
|
export const MultiSectionDigitalClock = /*#__PURE__*/React.forwardRef(function MultiSectionDigitalClock(inProps, ref) {
|
|
55
56
|
const utils = useUtils();
|
|
57
|
+
const isRtl = useRtl();
|
|
56
58
|
const props = useThemeProps({
|
|
57
59
|
props: inProps,
|
|
58
60
|
name: 'MuiMultiSectionDigitalClock'
|
|
@@ -295,6 +297,17 @@ export const MultiSectionDigitalClock = /*#__PURE__*/React.forwardRef(function M
|
|
|
295
297
|
throw new Error(`Unknown view: ${viewToBuild} found.`);
|
|
296
298
|
}
|
|
297
299
|
}, [now, value, ampm, utils, timeSteps.hours, timeSteps.minutes, timeSteps.seconds, localeText.hoursClockNumberText, localeText.minutesClockNumberText, localeText.secondsClockNumberText, meridiemMode, setValueAndGoToNextView, valueOrReferenceDate, isTimeDisabled, handleMeridiemChange]);
|
|
300
|
+
const viewsToRender = React.useMemo(() => {
|
|
301
|
+
if (!isRtl) {
|
|
302
|
+
return views;
|
|
303
|
+
}
|
|
304
|
+
const digitViews = views.filter(v => v !== 'meridiem');
|
|
305
|
+
const result = digitViews.toReversed();
|
|
306
|
+
if (views.includes('meridiem')) {
|
|
307
|
+
result.push('meridiem');
|
|
308
|
+
}
|
|
309
|
+
return result;
|
|
310
|
+
}, [isRtl, views]);
|
|
298
311
|
const viewTimeOptions = React.useMemo(() => {
|
|
299
312
|
return views.reduce((result, currentView) => {
|
|
300
313
|
return _extends({}, result, {
|
|
@@ -310,9 +323,9 @@ export const MultiSectionDigitalClock = /*#__PURE__*/React.forwardRef(function M
|
|
|
310
323
|
ownerState: ownerState,
|
|
311
324
|
role: "group"
|
|
312
325
|
}, other, {
|
|
313
|
-
children:
|
|
314
|
-
items:
|
|
315
|
-
onChange:
|
|
326
|
+
children: viewsToRender.map(timeView => /*#__PURE__*/_jsx(MultiSectionDigitalClockSection, {
|
|
327
|
+
items: viewTimeOptions[timeView].items,
|
|
328
|
+
onChange: viewTimeOptions[timeView].onChange,
|
|
316
329
|
active: view === timeView,
|
|
317
330
|
autoFocus: autoFocus ?? focusedView === timeView,
|
|
318
331
|
disabled: disabled,
|
|
@@ -243,6 +243,10 @@ process.env.NODE_ENV !== "production" ? PickersCalendarHeader.propTypes = {
|
|
|
243
243
|
* @default `${adapter.formats.month} ${adapter.formats.year}`
|
|
244
244
|
*/
|
|
245
245
|
format: PropTypes.string,
|
|
246
|
+
/**
|
|
247
|
+
* Id of the calendar text element.
|
|
248
|
+
* It is used to establish an `aria-labelledby` relationship with the calendar `grid` element.
|
|
249
|
+
*/
|
|
246
250
|
labelId: PropTypes.string,
|
|
247
251
|
maxDate: PropTypes.object.isRequired,
|
|
248
252
|
minDate: PropTypes.object.isRequired,
|
|
@@ -53,7 +53,6 @@ const usePickerLayout = props => {
|
|
|
53
53
|
const classes = useUtilityClasses(props);
|
|
54
54
|
|
|
55
55
|
// Action bar
|
|
56
|
-
|
|
57
56
|
const ActionBar = slots?.actionBar ?? PickersActionBar;
|
|
58
57
|
const actionBarProps = useSlotProps({
|
|
59
58
|
elementType: ActionBar,
|
|
@@ -73,7 +72,6 @@ const usePickerLayout = props => {
|
|
|
73
72
|
const actionBar = /*#__PURE__*/_jsx(ActionBar, _extends({}, actionBarProps));
|
|
74
73
|
|
|
75
74
|
// Toolbar
|
|
76
|
-
|
|
77
75
|
const Toolbar = slots?.toolbar;
|
|
78
76
|
const toolbarProps = useSlotProps({
|
|
79
77
|
elementType: Toolbar,
|
|
@@ -96,11 +94,9 @@ const usePickerLayout = props => {
|
|
|
96
94
|
const toolbar = toolbarHasView(toolbarProps) && !!Toolbar ? /*#__PURE__*/_jsx(Toolbar, _extends({}, toolbarProps)) : null;
|
|
97
95
|
|
|
98
96
|
// Content
|
|
99
|
-
|
|
100
97
|
const content = children;
|
|
101
98
|
|
|
102
99
|
// Tabs
|
|
103
|
-
|
|
104
100
|
const Tabs = slots?.tabs;
|
|
105
101
|
const tabs = view && Tabs ? /*#__PURE__*/_jsx(Tabs, _extends({
|
|
106
102
|
view: view,
|
|
@@ -109,7 +105,6 @@ const usePickerLayout = props => {
|
|
|
109
105
|
}, slotProps?.tabs)) : null;
|
|
110
106
|
|
|
111
107
|
// Shortcuts
|
|
112
|
-
|
|
113
108
|
const Shortcuts = slots?.shortcuts ?? PickersShortcuts;
|
|
114
109
|
const shortcutsProps = useSlotProps({
|
|
115
110
|
elementType: Shortcuts,
|
|
@@ -133,7 +133,9 @@ StaticDatePicker.propTypes = {
|
|
|
133
133
|
/**
|
|
134
134
|
* Callback fired when the value is accepted.
|
|
135
135
|
* @template TValue The value type. Will be either the same type as `value` or `null`. Can be in `[start, end]` format in case of range value.
|
|
136
|
+
* @template TError The validation error type. Will be either `string` or a `null`. Can be in `[start, end]` format in case of range value.
|
|
136
137
|
* @param {TValue} value The value that was just accepted.
|
|
138
|
+
* @param {FieldChangeHandlerContext<TError>} context The context containing the validation result of the current value.
|
|
137
139
|
*/
|
|
138
140
|
onAccept: PropTypes.func,
|
|
139
141
|
/**
|
|
@@ -181,7 +181,9 @@ StaticDateTimePicker.propTypes = {
|
|
|
181
181
|
/**
|
|
182
182
|
* Callback fired when the value is accepted.
|
|
183
183
|
* @template TValue The value type. Will be either the same type as `value` or `null`. Can be in `[start, end]` format in case of range value.
|
|
184
|
+
* @template TError The validation error type. Will be either `string` or a `null`. Can be in `[start, end]` format in case of range value.
|
|
184
185
|
* @param {TValue} value The value that was just accepted.
|
|
186
|
+
* @param {FieldChangeHandlerContext<TError>} context The context containing the validation result of the current value.
|
|
185
187
|
*/
|
|
186
188
|
onAccept: PropTypes.func,
|
|
187
189
|
/**
|
|
@@ -125,7 +125,9 @@ StaticTimePicker.propTypes = {
|
|
|
125
125
|
/**
|
|
126
126
|
* Callback fired when the value is accepted.
|
|
127
127
|
* @template TValue The value type. Will be either the same type as `value` or `null`. Can be in `[start, end]` format in case of range value.
|
|
128
|
+
* @template TError The validation error type. Will be either `string` or a `null`. Can be in `[start, end]` format in case of range value.
|
|
128
129
|
* @param {TValue} value The value that was just accepted.
|
|
130
|
+
* @param {FieldChangeHandlerContext<TError>} context The context containing the validation result of the current value.
|
|
129
131
|
*/
|
|
130
132
|
onAccept: PropTypes.func,
|
|
131
133
|
/**
|
|
@@ -157,7 +157,9 @@ process.env.NODE_ENV !== "production" ? TimePicker.propTypes = {
|
|
|
157
157
|
/**
|
|
158
158
|
* Callback fired when the value is accepted.
|
|
159
159
|
* @template TValue The value type. Will be either the same type as `value` or `null`. Can be in `[start, end]` format in case of range value.
|
|
160
|
+
* @template TError The validation error type. Will be either `string` or a `null`. Can be in `[start, end]` format in case of range value.
|
|
160
161
|
* @param {TValue} value The value that was just accepted.
|
|
162
|
+
* @param {FieldChangeHandlerContext<TError>} context The context containing the validation result of the current value.
|
|
161
163
|
*/
|
|
162
164
|
onAccept: PropTypes.func,
|
|
163
165
|
/**
|
package/modern/index.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import _extends from "@babel/runtime/helpers/esm/extends";
|
|
2
2
|
import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWithoutPropertiesLoose";
|
|
3
|
-
const _excluded = ["children", "className", "slots", "slotProps", "isNextDisabled", "isNextHidden", "onGoToNext", "nextLabel", "isPreviousDisabled", "isPreviousHidden", "onGoToPrevious", "previousLabel"],
|
|
3
|
+
const _excluded = ["children", "className", "slots", "slotProps", "isNextDisabled", "isNextHidden", "onGoToNext", "nextLabel", "isPreviousDisabled", "isPreviousHidden", "onGoToPrevious", "previousLabel", "labelId"],
|
|
4
4
|
_excluded2 = ["ownerState"],
|
|
5
5
|
_excluded3 = ["ownerState"];
|
|
6
6
|
import * as React from 'react';
|
|
@@ -73,7 +73,8 @@ export const PickersArrowSwitcher = /*#__PURE__*/React.forwardRef(function Picke
|
|
|
73
73
|
isPreviousDisabled,
|
|
74
74
|
isPreviousHidden,
|
|
75
75
|
onGoToPrevious,
|
|
76
|
-
previousLabel
|
|
76
|
+
previousLabel,
|
|
77
|
+
labelId
|
|
77
78
|
} = props,
|
|
78
79
|
other = _objectWithoutPropertiesLoose(props, _excluded);
|
|
79
80
|
const ownerState = props;
|
|
@@ -156,6 +157,7 @@ export const PickersArrowSwitcher = /*#__PURE__*/React.forwardRef(function Picke
|
|
|
156
157
|
})), children ? /*#__PURE__*/_jsx(Typography, {
|
|
157
158
|
variant: "subtitle1",
|
|
158
159
|
component: "span",
|
|
160
|
+
id: labelId,
|
|
159
161
|
children: children
|
|
160
162
|
}) : /*#__PURE__*/_jsx(PickersArrowSwitcherSpacer, {
|
|
161
163
|
className: classes.spacer,
|
|
@@ -103,7 +103,8 @@ export const applyLocalizedDigits = (valueStr, localizedDigits) => {
|
|
|
103
103
|
};
|
|
104
104
|
export const isStringNumber = (valueStr, localizedDigits) => {
|
|
105
105
|
const nonLocalizedValueStr = removeLocalizedDigits(valueStr, localizedDigits);
|
|
106
|
-
|
|
106
|
+
// `Number(' ')` returns `0` even if ' ' is not a valid number.
|
|
107
|
+
return nonLocalizedValueStr !== ' ' && !Number.isNaN(Number(nonLocalizedValueStr));
|
|
107
108
|
};
|
|
108
109
|
|
|
109
110
|
/**
|