-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[pickers] Introduce a new concept of
manager (mui#15339)
Signed-off-by: Flavien DELANGLE <[email protected]> Co-authored-by: Lukas Tyla <[email protected]>
- Loading branch information
1 parent
e5471d4
commit 20e037b
Showing
29 changed files
with
905 additions
and
263 deletions.
There are no files selected for viewing
39 changes: 18 additions & 21 deletions
39
packages/x-date-pickers-pro/src/SingleInputDateRangeField/useSingleInputDateRangeField.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,40 +1,37 @@ | ||
| 'use client'; | ||
| import * as React from 'react'; | ||
| import { useField, useDefaultizedDateField, PickerRangeValue } from '@mui/x-date-pickers/internals'; | ||
| import { | ||
| useField, | ||
| useFieldInternalPropsWithDefaults, | ||
| PickerRangeValue, | ||
| } from '@mui/x-date-pickers/internals'; | ||
| import { useSplitFieldProps } from '@mui/x-date-pickers/hooks'; | ||
| import { UseSingleInputDateRangeFieldProps } from './SingleInputDateRangeField.types'; | ||
| import { rangeValueManager, getRangeFieldValueManager } from '../internals/utils/valueManagers'; | ||
| import { validateDateRange } from '../validation'; | ||
| import { useDateRangeManager } from '../managers'; | ||
|
|
||
| export const useSingleInputDateRangeField = < | ||
| TEnableAccessibleFieldDOMStructure extends boolean, | ||
| TAllProps extends UseSingleInputDateRangeFieldProps<TEnableAccessibleFieldDOMStructure>, | ||
| >( | ||
| inProps: TAllProps, | ||
| props: TAllProps, | ||
| ) => { | ||
| const props = useDefaultizedDateField< | ||
| UseSingleInputDateRangeFieldProps<TEnableAccessibleFieldDOMStructure>, | ||
| TAllProps | ||
| >(inProps); | ||
|
|
||
| const manager = useDateRangeManager(props); | ||
| const { forwardedProps, internalProps } = useSplitFieldProps(props, 'date'); | ||
|
|
||
| const fieldValueManager = React.useMemo( | ||
| () => getRangeFieldValueManager({ dateSeparator: internalProps.dateSeparator }), | ||
| [internalProps.dateSeparator], | ||
| ); | ||
| const internalPropsWithDefaults = useFieldInternalPropsWithDefaults({ | ||
| manager, | ||
| internalProps, | ||
| }); | ||
|
|
||
| return useField< | ||
| PickerRangeValue, | ||
| TEnableAccessibleFieldDOMStructure, | ||
| typeof forwardedProps, | ||
| typeof internalProps | ||
| typeof internalPropsWithDefaults | ||
| >({ | ||
| forwardedProps, | ||
| internalProps, | ||
| valueManager: rangeValueManager, | ||
| fieldValueManager, | ||
| validator: validateDateRange, | ||
| valueType: 'date', | ||
| internalProps: internalPropsWithDefaults, | ||
| valueManager: manager.internal_valueManager, | ||
| fieldValueManager: manager.internal_fieldValueManager, | ||
| validator: manager.validator, | ||
| valueType: manager.valueType, | ||
| }); | ||
| }; |
35 changes: 14 additions & 21 deletions
35
.../x-date-pickers-pro/src/SingleInputDateTimeRangeField/useSingleInputDateTimeRangeField.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,44 +1,37 @@ | ||
| 'use client'; | ||
| import * as React from 'react'; | ||
| import { | ||
| useField, | ||
| useDefaultizedDateTimeField, | ||
| useFieldInternalPropsWithDefaults, | ||
| PickerRangeValue, | ||
| } from '@mui/x-date-pickers/internals'; | ||
| import { useSplitFieldProps } from '@mui/x-date-pickers/hooks'; | ||
| import { UseSingleInputDateTimeRangeFieldProps } from './SingleInputDateTimeRangeField.types'; | ||
| import { rangeValueManager, getRangeFieldValueManager } from '../internals/utils/valueManagers'; | ||
| import { validateDateTimeRange } from '../validation'; | ||
| import { useDateTimeRangeManager } from '../managers'; | ||
|
|
||
| export const useSingleInputDateTimeRangeField = < | ||
| TEnableAccessibleFieldDOMStructure extends boolean, | ||
| TAllProps extends UseSingleInputDateTimeRangeFieldProps<TEnableAccessibleFieldDOMStructure>, | ||
| >( | ||
| inProps: TAllProps, | ||
| props: TAllProps, | ||
| ) => { | ||
| const props = useDefaultizedDateTimeField< | ||
| UseSingleInputDateTimeRangeFieldProps<TEnableAccessibleFieldDOMStructure>, | ||
| TAllProps | ||
| >(inProps); | ||
|
|
||
| const manager = useDateTimeRangeManager(props); | ||
| const { forwardedProps, internalProps } = useSplitFieldProps(props, 'date-time'); | ||
|
|
||
| const fieldValueManager = React.useMemo( | ||
| () => getRangeFieldValueManager({ dateSeparator: internalProps.dateSeparator }), | ||
| [internalProps.dateSeparator], | ||
| ); | ||
| const internalPropsWithDefaults = useFieldInternalPropsWithDefaults({ | ||
| manager, | ||
| internalProps, | ||
| }); | ||
|
|
||
| return useField< | ||
| PickerRangeValue, | ||
| TEnableAccessibleFieldDOMStructure, | ||
| typeof forwardedProps, | ||
| typeof internalProps | ||
| typeof internalPropsWithDefaults | ||
| >({ | ||
| forwardedProps, | ||
| internalProps, | ||
| valueManager: rangeValueManager, | ||
| fieldValueManager, | ||
| validator: validateDateTimeRange, | ||
| valueType: 'date-time', | ||
| internalProps: internalPropsWithDefaults, | ||
| valueManager: manager.internal_valueManager, | ||
| fieldValueManager: manager.internal_fieldValueManager, | ||
| validator: manager.validator, | ||
| valueType: manager.valueType, | ||
| }); | ||
| }; |
39 changes: 18 additions & 21 deletions
39
packages/x-date-pickers-pro/src/SingleInputTimeRangeField/useSingleInputTimeRangeField.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,40 +1,37 @@ | ||
| 'use client'; | ||
| import * as React from 'react'; | ||
| import { useField, useDefaultizedTimeField, PickerRangeValue } from '@mui/x-date-pickers/internals'; | ||
| import { | ||
| useField, | ||
| useFieldInternalPropsWithDefaults, | ||
| PickerRangeValue, | ||
| } from '@mui/x-date-pickers/internals'; | ||
| import { useSplitFieldProps } from '@mui/x-date-pickers/hooks'; | ||
| import { UseSingleInputTimeRangeFieldProps } from './SingleInputTimeRangeField.types'; | ||
| import { rangeValueManager, getRangeFieldValueManager } from '../internals/utils/valueManagers'; | ||
| import { validateTimeRange } from '../validation'; | ||
| import { useTimeRangeManager } from '../managers'; | ||
|
|
||
| export const useSingleInputTimeRangeField = < | ||
| TEnableAccessibleFieldDOMStructure extends boolean, | ||
| TAllProps extends UseSingleInputTimeRangeFieldProps<TEnableAccessibleFieldDOMStructure>, | ||
| >( | ||
| inProps: TAllProps, | ||
| props: TAllProps, | ||
| ) => { | ||
| const props = useDefaultizedTimeField< | ||
| UseSingleInputTimeRangeFieldProps<TEnableAccessibleFieldDOMStructure>, | ||
| TAllProps | ||
| >(inProps); | ||
|
|
||
| const manager = useTimeRangeManager(props); | ||
| const { forwardedProps, internalProps } = useSplitFieldProps(props, 'time'); | ||
|
|
||
| const fieldValueManager = React.useMemo( | ||
| () => getRangeFieldValueManager({ dateSeparator: internalProps.dateSeparator }), | ||
| [internalProps.dateSeparator], | ||
| ); | ||
| const internalPropsWithDefaults = useFieldInternalPropsWithDefaults({ | ||
| manager, | ||
| internalProps, | ||
| }); | ||
|
|
||
| return useField< | ||
| PickerRangeValue, | ||
| TEnableAccessibleFieldDOMStructure, | ||
| typeof forwardedProps, | ||
| typeof internalProps | ||
| typeof internalPropsWithDefaults | ||
| >({ | ||
| forwardedProps, | ||
| internalProps, | ||
| valueManager: rangeValueManager, | ||
| fieldValueManager, | ||
| validator: validateTimeRange, | ||
| valueType: 'time', | ||
| internalProps: internalPropsWithDefaults, | ||
| valueManager: manager.internal_valueManager, | ||
| fieldValueManager: manager.internal_fieldValueManager, | ||
| validator: manager.validator, | ||
| valueType: manager.valueType, | ||
| }); | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.