Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions .changeset/date-picker-visible-range.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"@skeletonlabs/skeleton-react": patch
"@skeletonlabs/skeleton-svelte": patch
---

bugfix: `DatePicker.TableCell` now passes `visibleRange` to zag, so days in the second month of a multi-month view are no longer disabled
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,15 @@ export default function TableCell(props: DatePickerTableCellProps) {
const datePicker = use(DatePickerRootContext);
const viewProps = use(DatePickerViewContext);

const [tableCellProps, componentProps] = splitTableCellProps(
props as unknown as TableCellProps,
// `splitTableCellProps` drops `visibleRange`, which days outside the first visible month need
const { visibleRange, ...others } = props;
const [splitCellProps, componentProps] = splitTableCellProps(
others as unknown as TableCellProps,
) as unknown as [
Union<TableCellProps, DayTableCellProps>,
Omit<DatePickerTableCellProps, keyof Union<TableCellProps, DayTableCellProps>>,
];
const tableCellProps = { ...splitCellProps, visibleRange };
const { element, children, ...rest } = componentProps;

function getTableCellProps(tableCellProps: TableCellProps) {
Expand Down
10 changes: 10 additions & 0 deletions packages/skeleton-react/test/components/date-picker.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,16 @@ describe("DatePicker", () => {
await render(<DatePicker />);
await expect.element(page.getByTestId("table-cell")).toBeInTheDocument();
});

it("uses the visibleRange prop", async () => {
await render(<DatePicker />);
const tableCell = page.getByTestId("table-cell-visible-range");
await expect.element(tableCell).not.toHaveAttribute("aria-disabled");
await expect.element(tableCell).not.toHaveAttribute("visibleRange");
await expect
.element(page.getByTestId("table-cell-trigger-visible-range"))
.not.toHaveAttribute("data-disabled");
});
});

describe("TableCellTrigger", () => {
Expand Down
10 changes: 10 additions & 0 deletions packages/skeleton-react/test/components/date-picker.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,16 @@ export default function Test() {
>
<DatePicker.TableCellTrigger data-testid="table-cell-trigger" />
</DatePicker.TableCell>
<DatePicker.TableCell
value={parseDate("1970-02-15")}
visibleRange={{
start: parseDate("1970-02-01"),
end: parseDate("1970-02-28"),
}}
data-testid="table-cell-visible-range"
>
<DatePicker.TableCellTrigger data-testid="table-cell-trigger-visible-range" />
</DatePicker.TableCell>
</DatePicker.TableRow>
</DatePicker.TableBody>
</DatePicker.Table>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,17 @@
const datePicker = DatePickerRootContext.consume();
const viewProps = DatePickerViewContext.consume();

const [tableCellProps, componentProps] = $derived(
splitTableCellProps(props as unknown as TableCellProps) as unknown as [
const [tableCellProps, componentProps] = $derived.by(() => {
// `splitTableCellProps` drops `visibleRange`, which days outside the first visible month need
const { visibleRange, ...others } = props;
const [splitCellProps, componentProps] = splitTableCellProps(
others as unknown as TableCellProps,
) as unknown as [
Union<TableCellProps, DayTableCellProps>,
Omit<DatePickerTableCellProps, keyof Union<TableCellProps, DayTableCellProps>>,
],
);
];
return [{ ...splitCellProps, visibleRange }, componentProps] as const;
});
const { element, children, ...rest } = $derived(componentProps);

const refinedTableCellProps = $derived.by(() => {
Expand Down
12 changes: 12 additions & 0 deletions packages/skeleton-svelte/test/components/date-picker.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,18 @@
>
<DatePicker.TableCellTrigger data-testid="table-cell-trigger" />
</DatePicker.TableCell>
<DatePicker.TableCell
value={parseDate("1970-02-15")}
visibleRange={{
start: parseDate("1970-02-01"),
end: parseDate("1970-02-28"),
}}
data-testid="table-cell-visible-range"
>
<DatePicker.TableCellTrigger
data-testid="table-cell-trigger-visible-range"
/>
</DatePicker.TableCell>
</DatePicker.TableRow>
</DatePicker.TableBody>
</DatePicker.Table>
Expand Down
10 changes: 10 additions & 0 deletions packages/skeleton-svelte/test/components/date-picker.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,16 @@ describe("DatePicker", () => {
await render(DatePicker);
await expect.element(page.getByTestId("table-cell")).toBeInTheDocument();
});

it("uses the visibleRange prop", async () => {
await render(DatePicker);
const tableCell = page.getByTestId("table-cell-visible-range");
await expect.element(tableCell).not.toHaveAttribute("aria-disabled");
await expect.element(tableCell).not.toHaveAttribute("visibleRange");
await expect
.element(page.getByTestId("table-cell-trigger-visible-range"))
.not.toHaveAttribute("data-disabled");
});
});

describe("TableCellTrigger", () => {
Expand Down
Loading