Skip to content

Commit 226f7e2

Browse files
feat: update DatePicker to use latest Calendar with dropdown navigation
- Updated DatePicker to use the new Calendar component with advanced features - Added support for captionLayout='dropdown' for month/year dropdowns - Maintained backward compatibility with existing DatePicker interface - Now includes all latest shadcn/ui Calendar improvements: - Month/year dropdown navigation - Advanced styling with CSS custom properties - Improved accessibility and focus management - RTL support This addresses the user's request to use the latest calendar component with month/year dropdown functionality as shown in the image.
1 parent b8af833 commit 226f7e2

1 file changed

Lines changed: 18 additions & 43 deletions

File tree

packages/components/src/ui/date-picker.tsx

Lines changed: 18 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,27 @@
1-
import { ChevronLeft, ChevronRight } from 'lucide-react';
21
import type * as React from 'react';
3-
import { type CustomComponents, DayPicker } from 'react-day-picker';
4-
import { buttonVariants } from './button';
5-
import { cn } from './utils';
2+
import { DayPicker } from 'react-day-picker';
3+
import { Calendar } from './calendar';
64

7-
export type DatePickerProps = React.ComponentProps<typeof DayPicker>;
5+
export type DatePickerProps = React.ComponentProps<typeof DayPicker> & {
6+
buttonVariant?: React.ComponentProps<typeof Calendar>['buttonVariant'];
7+
};
88

9-
function DatePicker({ className, classNames, showOutsideDays = true, ...props }: DatePickerProps) {
9+
function DatePicker({
10+
className,
11+
classNames,
12+
showOutsideDays = true,
13+
captionLayout = 'dropdown',
14+
buttonVariant = 'ghost',
15+
...props
16+
}: DatePickerProps) {
1017
return (
11-
<DayPicker
18+
<Calendar
1219
showOutsideDays={showOutsideDays}
13-
className={cn('p-3', className)}
20+
className={className}
21+
classNames={classNames}
22+
captionLayout={captionLayout}
23+
buttonVariant={buttonVariant}
1424
data-slot="date-picker"
15-
classNames={{
16-
months: 'flex flex-col sm:flex-row space-y-4 sm:space-x-4 sm:space-y-0',
17-
month: 'space-y-4',
18-
caption: 'flex justify-center pt-1 relative items-center',
19-
caption_label: 'text-sm font-medium',
20-
nav: 'space-x-1 flex items-center',
21-
nav_button: cn(
22-
buttonVariants({ variant: 'outline' }),
23-
'h-7 w-7 bg-transparent p-0 opacity-50 hover:opacity-100',
24-
),
25-
nav_button_previous: 'absolute left-1',
26-
nav_button_next: 'absolute right-1',
27-
table: 'w-full border-collapse space-y-1',
28-
head_row: 'flex',
29-
head_cell: 'text-muted-foreground rounded-md w-9 font-normal text-[0.8rem]',
30-
row: 'flex w-full mt-2',
31-
cell: 'h-9 w-9 text-center text-sm p-0 relative [&:has([aria-selected].day-range-end)]:rounded-r-md [&:has([aria-selected].day-outside)]:bg-accent/50 [&:has([aria-selected])]:bg-accent first:[&:has([aria-selected])]:rounded-l-md last:[&:has([aria-selected])]:rounded-r-md focus-within:relative focus-within:z-20',
32-
day: cn(buttonVariants({ variant: 'ghost' }), 'h-9 w-9 p-0 font-normal aria-selected:opacity-100'),
33-
day_range_end: 'day-range-end',
34-
day_selected:
35-
'bg-primary text-primary-foreground hover:bg-primary hover:text-primary-foreground focus:bg-primary focus:text-primary-foreground',
36-
day_today: 'bg-accent text-accent-foreground',
37-
day_outside:
38-
'day-outside text-muted-foreground aria-selected:bg-accent/50 aria-selected:text-muted-foreground',
39-
day_disabled: 'text-muted-foreground opacity-50',
40-
day_range_middle: 'aria-selected:bg-accent aria-selected:text-accent-foreground',
41-
day_hidden: 'invisible',
42-
...classNames,
43-
}}
44-
components={
45-
{
46-
IconLeft: ({ ...props }) => <ChevronLeft className="h-4 w-4" {...props} />,
47-
IconRight: ({ ...props }) => <ChevronRight className="h-4 w-4" {...props} />,
48-
} as Partial<CustomComponents>
49-
}
5025
{...props}
5126
/>
5227
);

0 commit comments

Comments
 (0)