forked from binary-com/deriv-app
-
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.
DTRA-1279/ Kate/ Feat: add Date picker (#62)
* feat: add second action sheet * feat: add date range formatting and refactored existing code * feat: add range selection filtration * refactor: chip and time filter * fix: empty posituions after filtration * refactor: do clean up * chore: rename variables
- Loading branch information
1 parent
13254e6
commit 4abfa7d
Showing
13 changed files
with
209 additions
and
92 deletions.
There are no files selected for viewing
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
15 changes: 15 additions & 0 deletions
15
packages/trader/src/AppV2/Components/DatePicker/date-picker.scss
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 |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| .date-picker__action-sheet { | ||
| padding: 0; | ||
|
|
||
| .react-calendar__month-view__days { | ||
| font-size: var(--core-fontSize-100); | ||
| } | ||
| //TODO: temporary CSS | ||
| .react-calendar__tile--now:after { | ||
| display: none; | ||
| } | ||
| } | ||
|
|
||
| .quill-date-picker__wrapper--fixed-width { | ||
| margin: auto; | ||
| } |
53 changes: 53 additions & 0 deletions
53
packages/trader/src/AppV2/Components/DatePicker/date-picker.tsx
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 |
|---|---|---|
| @@ -0,0 +1,53 @@ | ||
| import React from 'react'; | ||
| import { ActionSheet, DatePicker } from '@deriv-com/quill-ui'; | ||
| import { toMoment } from '@deriv/shared'; | ||
| import { Localize } from '@deriv/translations'; | ||
|
|
||
| type TDateRangePicker = { | ||
| isOpen?: boolean; | ||
| onClose: () => void; | ||
| setSelectedDateRangeString: React.Dispatch<React.SetStateAction<string | undefined>>; | ||
| handleDateChange: (values: { to?: moment.Moment; from?: moment.Moment; is_batch?: boolean }) => void; | ||
| }; | ||
| const DateRangePicker = ({ isOpen, onClose, setSelectedDateRangeString, handleDateChange }: TDateRangePicker) => { | ||
| const [chosenRangeString, setChosenRangeString] = React.useState<string>(); | ||
| const [chosenRange, setChosenRange] = React.useState<(string | null | Date)[] | null | Date>([]); | ||
|
|
||
| const onApply = () => { | ||
| setSelectedDateRangeString(chosenRangeString); | ||
| if (Array.isArray(chosenRange) && chosenRange.length) | ||
| handleDateChange({ from: toMoment(chosenRange[0]), to: toMoment(chosenRange[1]) }); | ||
| onClose(); | ||
| }; | ||
|
|
||
| return ( | ||
| <ActionSheet.Root isOpen={isOpen} onClose={onClose} position='left'> | ||
| <ActionSheet.Portal> | ||
| <ActionSheet.Header title={<Localize i18n_default_text='Choose a date range' />} /> | ||
| <ActionSheet.Content> | ||
| <DatePicker | ||
| selectRange | ||
| onFormattedDate={value => setChosenRangeString(value)} | ||
| className='date-picker__action-sheet' | ||
| onChange={value => setChosenRange(value)} | ||
| optionsConfig={{ | ||
| day: '2-digit', | ||
| month: 'short', | ||
| year: 'numeric', | ||
| }} | ||
| /> | ||
| </ActionSheet.Content> | ||
| <ActionSheet.Footer | ||
| primaryAction={{ | ||
| content: 'Apply', | ||
| onAction: onApply, | ||
| }} | ||
| alignment='vertical' | ||
| isPrimaryButtonDisabled={!chosenRangeString} | ||
| /> | ||
| </ActionSheet.Portal> | ||
| </ActionSheet.Root> | ||
| ); | ||
| }; | ||
|
|
||
| export default DateRangePicker; |
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 |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| import DatePicker from './date-picker'; | ||
| import './date-picker.scss'; | ||
|
|
||
| export default DatePicker; |
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
25 changes: 25 additions & 0 deletions
25
packages/trader/src/AppV2/Components/Filter/custom-time-filter-button.tsx
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 |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| import React from 'react'; | ||
| import { Text } from '@deriv-com/quill-ui'; | ||
| import { LabelPairedChevronRightSmBoldIcon } from '@deriv/quill-icons'; | ||
| import { Localize } from '@deriv/translations'; | ||
|
|
||
| type TCustomDateFilterButton = { | ||
| setShowDatePicker: React.Dispatch<React.SetStateAction<boolean>>; | ||
| selectedRangeDateString?: string; | ||
| }; | ||
|
|
||
| const CustomDateFilterButton = ({ setShowDatePicker, selectedRangeDateString }: TCustomDateFilterButton) => ( | ||
| <button className='custom-time-filter__wrapper' onClick={() => setShowDatePicker(true)}> | ||
| <Text size='md' className='custom-time-filter__label'> | ||
| <Localize i18n_default_text='Custom' /> | ||
| </Text> | ||
| {selectedRangeDateString && ( | ||
| <Text size='sm' color='quill-typography__color--subtle'> | ||
| {selectedRangeDateString} | ||
| </Text> | ||
| )} | ||
| <LabelPairedChevronRightSmBoldIcon className='custom-time-filter__icon' /> | ||
| </button> | ||
| ); | ||
|
|
||
| export default CustomDateFilterButton; |
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.