Skip to content

Commit 443789f

Browse files
fix: resolve styling and compatibility issues
- Added react-day-picker styles import to main.css to fix calendar styling - Simplified DatePicker component to use new Calendar component - Fixed TypeScript types for DatePicker props - Resolved weekday header spacing and visual layout issues - Maintained backward compatibility while using latest component architecture
1 parent d09205e commit 443789f

2 files changed

Lines changed: 10 additions & 50 deletions

File tree

apps/docs/src/main.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
@import 'tailwindcss';
2+
@import 'react-day-picker/src/style.css';
23
@source "../../../packages/components";
34

45
:root {
@@ -76,4 +77,3 @@ body {
7677
color: hsl(var(--foreground));
7778
font-feature-settings: "rlig" 1, "calt" 1;
7879
}
79-
Lines changed: 9 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,15 @@
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';
4+
import { Button } from './button';
65

7-
export type DatePickerProps = React.ComponentProps<typeof DayPicker>;
6+
export type DatePickerProps = React.ComponentProps<typeof DayPicker> & {
7+
buttonVariant?: React.ComponentProps<typeof Button>["variant"];
8+
};
89

9-
function DatePicker({ className, classNames, showOutsideDays = true, ...props }: DatePickerProps) {
10-
return (
11-
<DayPicker
12-
showOutsideDays={showOutsideDays}
13-
className={cn('p-3', className)}
14-
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-
}
50-
{...props}
51-
/>
52-
);
10+
function DatePicker(props: DatePickerProps) {
11+
return <Calendar data-slot="date-picker" {...props} />;
5312
}
5413

5514
export { DatePicker };
15+

0 commit comments

Comments
 (0)