Implemented Date Range Input. #2328
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,64 @@ | ||
| import React, { useState, ComponentProps } from 'react'; | ||
| import { CalendarIcon } from '@radix-ui/react-icons'; | ||
| import { formatDate } from '@/common/utils/format-date'; | ||
| import { DateRange } from 'react-day-picker'; | ||
| import dayjs from 'dayjs'; | ||
| import { ctw } from '@/common/utils/ctw/ctw'; | ||
| import { Button } from '../../atoms/Button/Button'; | ||
| import { Calendar } from '../../organisms/Calendar/Calendar'; | ||
| import { Popover, PopoverContent, PopoverTrigger } from '@ballerine/ui'; | ||
|
|
||
| type TDateRangePickerProps = { | ||
| onChange: ComponentProps<typeof Calendar>['onSelect']; | ||
| value: ComponentProps<typeof Calendar>['value']; | ||
| className: ComponentProps<'div'>['className']; | ||
| }; | ||
|
|
||
| export function DateRangePicker({ onChange, value, className }: TDateRangePickerProps) { | ||
| const currentDate = new Date(); | ||
| const [date, setDate] = useState<DateRange | undefined>({ | ||
| from: new Date(currentDate.getFullYear(), currentDate.getMonth(), currentDate.getDate()), | ||
| to: dayjs(new Date(currentDate.getFullYear(), currentDate.getMonth(), currentDate.getDate(), 1)) | ||
| .add(1, 'month') | ||
| .toDate(), | ||
| }); | ||
|
|
||
| const handleDateChange = (selection: DateRange | undefined) => { | ||
| setDate(selection); | ||
| onChange(selection); | ||
| }; | ||
|
|
||
| return ( | ||
| <div className={ctw('grid gap-2', className)}> | ||
| <Popover> | ||
| <PopoverTrigger asChild> | ||
| <Button | ||
| id="date" | ||
| variant={'outline'} | ||
| className={ctw('w-[300px] justify-start text-left font-normal', { | ||
| 'text-muted-foreground': !date, | ||
| })} | ||
| > | ||
| <CalendarIcon className="mr-2 h-4 w-4" /> | ||
| {date?.from && date?.to && ( | ||
| <> | ||
| {formatDate(date.from, 'LLL dd, y')} - {formatDate(date.to, 'LLL dd, y')} | ||
| </> | ||
| )} | ||
| {date?.from && !date?.to && formatDate(date.from, 'LLL dd, y')} | ||
| {!date?.from && !date?.to && <span>Pick a date</span>} | ||
| </Button> | ||
| </PopoverTrigger> | ||
| <PopoverContent className="w-auto p-0" align="start"> | ||
| <Calendar | ||
| initialFocus | ||
| mode="range" | ||
| selected={date} | ||
| onSelect={handleDateChange} | ||
| numberOfMonths={2} | ||
| /> | ||
| </PopoverContent> | ||
| </Popover> | ||
| </div> | ||
| ); | ||
| } | ||
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,64 @@ | ||
| import * as React from 'react'; | ||
| import { ChevronLeftIcon, ChevronRightIcon } from '@radix-ui/react-icons'; | ||
| import { ctw } from '@/common/utils/ctw/ctw'; | ||
| import { DayPicker } from 'react-day-picker'; | ||
| import { buttonVariants } from '../../atoms/Button/Button'; | ||
|
|
||
| export type CalendarProps = React.ComponentProps<typeof DayPicker>; | ||
| export function Calendar({ | ||
| className, | ||
| classNames, | ||
| showOutsideDays = true, | ||
| ...props | ||
| }: CalendarProps) { | ||
| return ( | ||
| <DayPicker | ||
| showOutsideDays={showOutsideDays} | ||
| className={ctw('p-3', className)} | ||
| classNames={{ | ||
| months: 'flex flex-col sm:flex-row space-y-4 sm:space-x-4 sm:space-y-0', | ||
| month: 'space-y-4', | ||
| caption: 'flex justify-center pt-1 relative items-center', | ||
| caption_label: 'text-sm font-medium', | ||
| nav: 'space-x-1 flex items-center', | ||
| nav_button: ctw( | ||
| buttonVariants({ variant: 'outline' }), | ||
| 'h-7 w-7 bg-transparent p-0 opacity-50 hover:opacity-100', | ||
| ), | ||
| nav_button_previous: 'absolute left-1', | ||
| nav_button_next: 'absolute right-1', | ||
| table: 'w-full border-collapse space-y-1', | ||
| head_row: 'flex', | ||
| head_cell: 'text-muted-foreground rounded-md w-8 font-normal text-[0.8rem]', | ||
| row: 'flex w-full mt-2', | ||
| cell: ctw( | ||
| 'relative p-0 text-center text-sm focus-within:relative focus-within:z-20 [&:has([aria-selected])]:bg-accent [&:has([aria-selected].day-outside)]:bg-accent/50 [&:has([aria-selected].day-range-end)]:rounded-r-md', | ||
| props.mode === 'range' | ||
| ? '[&:has(>.day-range-end)]:rounded-r-md [&:has(>.day-range-start)]:rounded-l-md first:[&:has([aria-selected])]:rounded-l-md last:[&:has([aria-selected])]:rounded-r-md' | ||
| : '[&:has([aria-selected])]:rounded-md', | ||
| ), | ||
| day: ctw( | ||
| buttonVariants({ variant: 'ghost' }), | ||
| 'h-8 w-8 p-0 font-normal aria-selected:opacity-100', | ||
| ), | ||
| day_range_start: 'day-range-start', | ||
| day_range_end: 'day-range-end', | ||
| day_selected: | ||
| 'bg-primary text-primary-foreground hover:bg-primary hover:text-primary-foreground focus:bg-primary focus:text-primary-foreground', | ||
| day_today: 'bg-accent text-accent-foreground', | ||
| day_outside: | ||
| 'day-outside text-muted-foreground opacity-50 aria-selected:bg-accent/50 aria-selected:text-muted-foreground aria-selected:opacity-30', | ||
| day_disabled: 'text-muted-foreground opacity-50', | ||
| day_range_middle: 'aria-selected:bg-accent aria-selected:text-accent-foreground', | ||
| day_hidden: 'invisible', | ||
| ...classNames, | ||
| }} | ||
| components={{ | ||
| IconLeft: ({ ...props }) => <ChevronLeftIcon className="h-4 w-4" />, | ||
| IconRight: ({ ...props }) => <ChevronRightIcon className="h-4 w-4" />, | ||
| }} | ||
| {...props} | ||
| /> | ||
| ); | ||
| } | ||
| Calendar.displayName = 'Calendar'; |
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,24 @@ | ||||||||||||
| import { ComponentProps } from 'react'; | ||||||||||||
| import { DateRangePicker } from '@/common/components/molecules/DateRangePicker/DateRangePicker'; | ||||||||||||
| import { useZodSearchParams } from '@/common/hooks/useZodSearchParams/useZodSearchParams'; | ||||||||||||
| import { HomeSearchSchema } from '@/pages/Home/home-search-schema'; | ||||||||||||
|
|
||||||||||||
| export const useHomeLogic = () => { | ||||||||||||
| const [searchParams, setSearchParams] = useZodSearchParams(HomeSearchSchema); | ||||||||||||
|
|
||||||||||||
| const handleDateRangeChange: ComponentProps<typeof DateRangePicker>['onChange'] = (range: { | ||||||||||||
| start: { toISOString: () => string }; | ||||||||||||
| end: { toISOString: () => string }; | ||||||||||||
| }) => { | ||||||||||||
|
There was a problem hiding this comment. ComponentProps['onChange'] gives you the type for
Suggested change
|
||||||||||||
| const from = range?.start?.toISOString() || ''; | ||||||||||||
| const to = range?.end?.toISOString() || ''; | ||||||||||||
|
|
||||||||||||
| setSearchParams({ from, to }); | ||||||||||||
| }; | ||||||||||||
|
|
||||||||||||
| return { | ||||||||||||
| from: searchParams.from || '', | ||||||||||||
| to: searchParams.to || '', | ||||||||||||
| handleDateRangeChange, | ||||||||||||
| }; | ||||||||||||
| }; | ||||||||||||
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
File renamed without changes.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I was expecting these lines to be removed and for the component to receive onChange and value as props. 🙂