Skip to content

Commit 2e74146

Browse files
authored
feat: show calandar dropdown (#982)
1 parent 2b69f9d commit 2e74146

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

src/components/data-table/data-table-date-filter.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ export function DataTableDateFilter<TData>({
195195
<PopoverContent className="w-auto p-0" align="start">
196196
{multiple ? (
197197
<Calendar
198-
initialFocus
198+
captionLayout="dropdown"
199199
mode="range"
200200
selected={
201201
getIsDateRange(selectedDates)
@@ -206,7 +206,7 @@ export function DataTableDateFilter<TData>({
206206
/>
207207
) : (
208208
<Calendar
209-
initialFocus
209+
captionLayout="dropdown"
210210
mode="single"
211211
selected={
212212
!getIsDateRange(selectedDates) ? selectedDates[0] : undefined

src/components/data-table/data-table-filter-list.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -778,7 +778,7 @@ function onFilterInputRender<TData>({
778778
<Calendar
779779
aria-label={`Select ${columnMeta?.label} date range`}
780780
mode="range"
781-
initialFocus
781+
captionLayout="dropdown"
782782
selected={
783783
dateValue.length === 2
784784
? {
@@ -805,7 +805,7 @@ function onFilterInputRender<TData>({
805805
<Calendar
806806
aria-label={`Select ${columnMeta?.label} date`}
807807
mode="single"
808-
initialFocus
808+
captionLayout="dropdown"
809809
selected={
810810
dateValue[0] ? new Date(Number(dateValue[0])) : undefined
811811
}

src/components/data-table/data-table-filter-menu.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -567,8 +567,8 @@ function FilterValueSelector<TData>({
567567
case "dateRange":
568568
return (
569569
<Calendar
570-
initialFocus
571570
mode="single"
571+
captionLayout="dropdown"
572572
selected={value ? new Date(value) : undefined}
573573
onSelect={(date) => onSelect(date?.getTime().toString() ?? "")}
574574
/>
@@ -838,7 +838,7 @@ function onFilterInputRender<TData>({
838838
{filter.operator === "isBetween" ? (
839839
<Calendar
840840
mode="range"
841-
initialFocus
841+
captionLayout="dropdown"
842842
selected={
843843
dateValue.length === 2
844844
? {
@@ -864,7 +864,7 @@ function onFilterInputRender<TData>({
864864
) : (
865865
<Calendar
866866
mode="single"
867-
initialFocus
867+
captionLayout="dropdown"
868868
selected={
869869
dateValue[0] ? new Date(Number(dateValue[0])) : undefined
870870
}

0 commit comments

Comments
 (0)