Skip to content

feat: add theme option for today in datepicker #1627

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat: add theme option for today in datepicker #1627

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions packages/ui/src/components/Datepicker/Views/Days.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import {
getWeekDays,
isDateEqual,
isDateInRange,
isDateToday,
Views,
} from "../helpers";

Expand All @@ -23,6 +24,7 @@ export interface DatepickerViewsDaysTheme {
base: string;
selected: string;
disabled: string;
today: string;
};
};
}
Expand Down Expand Up @@ -62,6 +64,7 @@ export function DatepickerViewsDays() {
const isSelected = selectedDate && isDateEqual(selectedDate, currentDate);
const isDisabled =
!isDateInRange(currentDate, minDate, maxDate) || (filterDate && !filterDate(currentDate, Views.Days));
const isToday = isDateToday(currentDate);

return (
<button
Expand All @@ -70,6 +73,7 @@ export function DatepickerViewsDays() {
type="button"
className={twMerge(
theme.items.item.base,
isToday && theme.items.item.today,
isSelected && theme.items.item.selected,
isDisabled && theme.items.item.disabled,
)}
Expand Down
5 changes: 5 additions & 0 deletions packages/ui/src/components/Datepicker/helpers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,11 @@ export function isDateEqual(date: Date, selectedDate: Date): boolean {
return date.getTime() === selectedDate.getTime();
}

export function isDateToday(date: Date): boolean {
const today = new Date();
return isDateEqual(date, today);
}

export function isMonthEqual(date: Date, selectedDate: Date): boolean {
return date.getMonth() === selectedDate.getMonth();
}
Expand Down
1 change: 1 addition & 0 deletions packages/ui/src/components/Datepicker/theme.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ export const datePickerTheme = createTheme<DatepickerTheme>({
base: "block flex-1 cursor-pointer rounded-lg border-0 text-center text-sm font-semibold leading-9 text-gray-900 hover:bg-gray-100 dark:text-white dark:hover:bg-gray-600",
selected: "bg-primary-700 text-white hover:bg-primary-600",
disabled: "text-gray-500",
today: "",
},
},
},
Expand Down
Loading