@ponti-studios/ui 1.4.0 → 1.5.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +1 -1
- package/src/components/forms/calendar.tsx +1 -1
- package/src/components/forms/date-field.stories.tsx +164 -0
- package/src/components/forms/date-field.tsx +174 -0
- package/src/components/forms/date-picker.tsx +6 -2
- package/src/components/forms/date-utils.ts +32 -0
- package/src/components/forms/index.ts +3 -0
package/package.json
CHANGED
|
@@ -17,7 +17,7 @@ function Calendar({ className, classNames, showOutsideDays = true, ...props }: C
|
|
|
17
17
|
month: "flex flex-col gap-4",
|
|
18
18
|
month_caption: "relative flex h-8 items-center justify-center",
|
|
19
19
|
caption_label: "text-sm font-medium",
|
|
20
|
-
nav: "absolute inset-x-4 top-4 flex items-center justify-between",
|
|
20
|
+
nav: "absolute inset-x-4 top-4 z-10 flex items-center justify-between",
|
|
21
21
|
button_previous:
|
|
22
22
|
"inline-flex size-8 p-2 items-center justify-center rounded-full border bg-background text-foreground disabled:pointer-events-none disabled:opacity-50 aria-disabled:pointer-events-none aria-disabled:opacity-50",
|
|
23
23
|
button_next:
|
|
@@ -0,0 +1,164 @@
|
|
|
1
|
+
import type { Meta, StoryObj } from "@storybook/react-vite";
|
|
2
|
+
import { expect, screen, userEvent, within } from "storybook/test";
|
|
3
|
+
|
|
4
|
+
import { DateField } from "./date-field";
|
|
5
|
+
|
|
6
|
+
const meta = {
|
|
7
|
+
title: "Forms/DateField",
|
|
8
|
+
component: DateField,
|
|
9
|
+
tags: ["autodocs"],
|
|
10
|
+
} satisfies Meta<typeof DateField>;
|
|
11
|
+
|
|
12
|
+
export default meta;
|
|
13
|
+
type Story = StoryObj<typeof meta>;
|
|
14
|
+
|
|
15
|
+
function hiddenValue(canvasElement: HTMLElement, name: string): string | null {
|
|
16
|
+
const input = canvasElement.querySelector(`input[name="${name}"]`) as HTMLInputElement | null;
|
|
17
|
+
return input?.value ?? null;
|
|
18
|
+
}
|
|
19
|
+
|
|
20
|
+
async function nextMonth(dialog: HTMLElement) {
|
|
21
|
+
await userEvent.click(within(dialog).getByRole("button", { name: "Go to the Next Month" }));
|
|
22
|
+
}
|
|
23
|
+
|
|
24
|
+
// The trigger button's accessible name comes from its <label> (htmlFor), so
|
|
25
|
+
// stories query the button by label and assert the visible date text separately.
|
|
26
|
+
export const WithStringDefaultValue: Story = {
|
|
27
|
+
args: {
|
|
28
|
+
name: "startDate",
|
|
29
|
+
defaultValue: "2020-01-15",
|
|
30
|
+
label: "Start date",
|
|
31
|
+
},
|
|
32
|
+
play: async ({ canvasElement }) => {
|
|
33
|
+
const canvas = within(canvasElement);
|
|
34
|
+
|
|
35
|
+
// The hidden input carries the local "YYYY-MM-DD" value, and the trigger
|
|
36
|
+
// shows the formatted date.
|
|
37
|
+
await expect(hiddenValue(canvasElement, "startDate")).toBe("2020-01-15");
|
|
38
|
+
const trigger = canvas.getByRole("button", { name: "Start date" });
|
|
39
|
+
await expect(trigger).toHaveTextContent("Jan 15, 2020");
|
|
40
|
+
|
|
41
|
+
// The calendar opens on the selected month, not the current one.
|
|
42
|
+
await userEvent.click(trigger);
|
|
43
|
+
const dialog = await screen.findByRole("dialog");
|
|
44
|
+
await expect(within(dialog).getByText("January 2020")).toBeInTheDocument();
|
|
45
|
+
|
|
46
|
+
// Real click on the Next chevron navigates the month.
|
|
47
|
+
await nextMonth(dialog);
|
|
48
|
+
await expect(within(dialog).getByText("February 2020")).toBeInTheDocument();
|
|
49
|
+
|
|
50
|
+
// Picking a day updates the trigger and the hidden input.
|
|
51
|
+
await userEvent.click(within(dialog).getByText("15"));
|
|
52
|
+
await expect(canvas.getByRole("button", { name: "Start date" })).toHaveTextContent(
|
|
53
|
+
"Feb 15, 2020",
|
|
54
|
+
);
|
|
55
|
+
await expect(hiddenValue(canvasElement, "startDate")).toBe("2020-02-15");
|
|
56
|
+
},
|
|
57
|
+
};
|
|
58
|
+
|
|
59
|
+
export const WithDateDefaultValue: Story = {
|
|
60
|
+
args: {
|
|
61
|
+
name: "endDate",
|
|
62
|
+
defaultValue: new Date(2020, 0, 15),
|
|
63
|
+
label: "End date",
|
|
64
|
+
},
|
|
65
|
+
play: async ({ canvasElement }) => {
|
|
66
|
+
const canvas = within(canvasElement);
|
|
67
|
+
|
|
68
|
+
await expect(hiddenValue(canvasElement, "endDate")).toBe("2020-01-15");
|
|
69
|
+
await expect(canvas.getByRole("button", { name: "End date" })).toHaveTextContent(
|
|
70
|
+
"Jan 15, 2020",
|
|
71
|
+
);
|
|
72
|
+
},
|
|
73
|
+
};
|
|
74
|
+
|
|
75
|
+
export const Empty: Story = {
|
|
76
|
+
args: {
|
|
77
|
+
name: "startDate",
|
|
78
|
+
label: "Start date",
|
|
79
|
+
},
|
|
80
|
+
play: async ({ canvasElement }) => {
|
|
81
|
+
const canvas = within(canvasElement);
|
|
82
|
+
|
|
83
|
+
await expect(hiddenValue(canvasElement, "startDate")).toBe("");
|
|
84
|
+
await expect(canvas.getByRole("button", { name: "Start date" })).toHaveTextContent(
|
|
85
|
+
"Pick a date",
|
|
86
|
+
);
|
|
87
|
+
},
|
|
88
|
+
};
|
|
89
|
+
|
|
90
|
+
export const Disabled: Story = {
|
|
91
|
+
args: {
|
|
92
|
+
name: "startDate",
|
|
93
|
+
defaultValue: "2020-01-15",
|
|
94
|
+
label: "Start date",
|
|
95
|
+
disabled: true,
|
|
96
|
+
},
|
|
97
|
+
play: async ({ canvasElement }) => {
|
|
98
|
+
const canvas = within(canvasElement);
|
|
99
|
+
|
|
100
|
+
await expect(canvas.getByRole("button", { name: "Start date" })).toBeDisabled();
|
|
101
|
+
await expect(hiddenValue(canvasElement, "startDate")).toBe("2020-01-15");
|
|
102
|
+
},
|
|
103
|
+
};
|
|
104
|
+
|
|
105
|
+
export const WithRangeDefaultValue: Story = {
|
|
106
|
+
args: {
|
|
107
|
+
mode: "range",
|
|
108
|
+
startName: "startDate",
|
|
109
|
+
endName: "endDate",
|
|
110
|
+
defaultValue: { from: "2020-01-15", to: "2020-06-30" },
|
|
111
|
+
label: "Active period",
|
|
112
|
+
},
|
|
113
|
+
play: async ({ canvasElement }) => {
|
|
114
|
+
const canvas = within(canvasElement);
|
|
115
|
+
|
|
116
|
+
// Both hidden inputs carry local date strings; the trigger shows the range.
|
|
117
|
+
await expect(hiddenValue(canvasElement, "startDate")).toBe("2020-01-15");
|
|
118
|
+
await expect(hiddenValue(canvasElement, "endDate")).toBe("2020-06-30");
|
|
119
|
+
const trigger = canvas.getByRole("button", { name: "Active period" });
|
|
120
|
+
await expect(trigger).toHaveTextContent("Jan 15, 2020");
|
|
121
|
+
await expect(trigger).toHaveTextContent("Jun 30, 2020");
|
|
122
|
+
|
|
123
|
+
// The range calendar opens on the start month.
|
|
124
|
+
await userEvent.click(trigger);
|
|
125
|
+
const dialog = await screen.findByRole("dialog");
|
|
126
|
+
await expect(within(dialog).getByText("January 2020")).toBeInTheDocument();
|
|
127
|
+
|
|
128
|
+
// Real-click the Next chevron, then pick a new from date.
|
|
129
|
+
await nextMonth(dialog);
|
|
130
|
+
await expect(within(dialog).getByText("February 2020")).toBeInTheDocument();
|
|
131
|
+
await userEvent.click(within(dialog).getByText("20"));
|
|
132
|
+
await expect(canvas.getByRole("button", { name: "Active period" })).toHaveTextContent(
|
|
133
|
+
"From Feb 20, 2020",
|
|
134
|
+
);
|
|
135
|
+
await expect(hiddenValue(canvasElement, "startDate")).toBe("2020-02-20");
|
|
136
|
+
await expect(hiddenValue(canvasElement, "endDate")).toBe("");
|
|
137
|
+
|
|
138
|
+
// Picking an end date fills the second hidden input.
|
|
139
|
+
await userEvent.click(within(dialog).getByText("25"));
|
|
140
|
+
await expect(canvas.getByRole("button", { name: "Active period" })).toHaveTextContent(
|
|
141
|
+
"Feb 20, 2020 – Feb 25, 2020",
|
|
142
|
+
);
|
|
143
|
+
await expect(hiddenValue(canvasElement, "startDate")).toBe("2020-02-20");
|
|
144
|
+
await expect(hiddenValue(canvasElement, "endDate")).toBe("2020-02-25");
|
|
145
|
+
},
|
|
146
|
+
};
|
|
147
|
+
|
|
148
|
+
export const EmptyRange: Story = {
|
|
149
|
+
args: {
|
|
150
|
+
mode: "range",
|
|
151
|
+
startName: "startDate",
|
|
152
|
+
endName: "endDate",
|
|
153
|
+
label: "Active period",
|
|
154
|
+
},
|
|
155
|
+
play: async ({ canvasElement }) => {
|
|
156
|
+
const canvas = within(canvasElement);
|
|
157
|
+
|
|
158
|
+
await expect(hiddenValue(canvasElement, "startDate")).toBe("");
|
|
159
|
+
await expect(hiddenValue(canvasElement, "endDate")).toBe("");
|
|
160
|
+
await expect(canvas.getByRole("button", { name: "Active period" })).toHaveTextContent(
|
|
161
|
+
"Pick a date range",
|
|
162
|
+
);
|
|
163
|
+
},
|
|
164
|
+
};
|
|
@@ -0,0 +1,174 @@
|
|
|
1
|
+
import { format } from "date-fns";
|
|
2
|
+
import { CalendarIcon } from "lucide-react";
|
|
3
|
+
import { useId, useState } from "react";
|
|
4
|
+
|
|
5
|
+
import { Popover, PopoverContent, PopoverTrigger } from "../overlays/popover";
|
|
6
|
+
import { Button } from "../primitives/button";
|
|
7
|
+
import { Calendar } from "./calendar";
|
|
8
|
+
import { formatDateInput, parseDateInput } from "./date-utils";
|
|
9
|
+
import { DatePicker, type DatePickerProps } from "./date-picker";
|
|
10
|
+
|
|
11
|
+
export interface DateRangeValue {
|
|
12
|
+
from?: Date | string | null;
|
|
13
|
+
to?: Date | string | null;
|
|
14
|
+
}
|
|
15
|
+
|
|
16
|
+
interface DateFieldCommonProps {
|
|
17
|
+
id?: string;
|
|
18
|
+
label?: string;
|
|
19
|
+
showLabel?: boolean;
|
|
20
|
+
placeholder?: string;
|
|
21
|
+
dateFormat?: string;
|
|
22
|
+
disabled?: boolean;
|
|
23
|
+
containerClassName?: string;
|
|
24
|
+
popoverAlign?: DatePickerProps["popoverAlign"];
|
|
25
|
+
variant?: DatePickerProps["variant"];
|
|
26
|
+
}
|
|
27
|
+
|
|
28
|
+
export interface SingleDateFieldProps extends DateFieldCommonProps {
|
|
29
|
+
mode?: "single";
|
|
30
|
+
name: string;
|
|
31
|
+
defaultValue?: Date | string | null;
|
|
32
|
+
}
|
|
33
|
+
|
|
34
|
+
export interface RangeDateFieldProps extends DateFieldCommonProps {
|
|
35
|
+
mode: "range";
|
|
36
|
+
startName: string;
|
|
37
|
+
endName: string;
|
|
38
|
+
defaultValue?: DateRangeValue;
|
|
39
|
+
}
|
|
40
|
+
|
|
41
|
+
export type DateFieldProps = SingleDateFieldProps | RangeDateFieldProps;
|
|
42
|
+
|
|
43
|
+
const TRIGGER_CLASSES =
|
|
44
|
+
"border-border bg-background text-foreground placeholder:text-muted-foreground min-h-10 max-h-10 w-full justify-start rounded-l-none rounded-r-xl border-l-0 text-left font-normal";
|
|
45
|
+
|
|
46
|
+
function SingleDateField({
|
|
47
|
+
name,
|
|
48
|
+
defaultValue,
|
|
49
|
+
id,
|
|
50
|
+
label,
|
|
51
|
+
showLabel,
|
|
52
|
+
placeholder,
|
|
53
|
+
dateFormat,
|
|
54
|
+
disabled,
|
|
55
|
+
containerClassName,
|
|
56
|
+
popoverAlign,
|
|
57
|
+
variant,
|
|
58
|
+
}: SingleDateFieldProps) {
|
|
59
|
+
const generatedId = useId();
|
|
60
|
+
const inputId = id ?? generatedId;
|
|
61
|
+
const [value, setValue] = useState<Date | undefined>(() => parseDateInput(defaultValue));
|
|
62
|
+
|
|
63
|
+
return (
|
|
64
|
+
<div>
|
|
65
|
+
<DatePicker
|
|
66
|
+
id={inputId}
|
|
67
|
+
label={label}
|
|
68
|
+
showLabel={showLabel}
|
|
69
|
+
placeholder={placeholder}
|
|
70
|
+
dateFormat={dateFormat}
|
|
71
|
+
disabled={disabled}
|
|
72
|
+
containerClassName={containerClassName}
|
|
73
|
+
popoverAlign={popoverAlign}
|
|
74
|
+
variant={variant}
|
|
75
|
+
value={value}
|
|
76
|
+
onSelect={setValue}
|
|
77
|
+
/>
|
|
78
|
+
<input type="hidden" name={name} value={value ? formatDateInput(value) : ""} />
|
|
79
|
+
</div>
|
|
80
|
+
);
|
|
81
|
+
}
|
|
82
|
+
|
|
83
|
+
function RangeDateField({
|
|
84
|
+
startName,
|
|
85
|
+
endName,
|
|
86
|
+
defaultValue,
|
|
87
|
+
id,
|
|
88
|
+
label,
|
|
89
|
+
showLabel = true,
|
|
90
|
+
placeholder = "Pick a date range",
|
|
91
|
+
dateFormat = "MMM d, yyyy",
|
|
92
|
+
disabled = false,
|
|
93
|
+
containerClassName = "flex-1 min-w-0",
|
|
94
|
+
popoverAlign = "start",
|
|
95
|
+
variant = "outline",
|
|
96
|
+
}: RangeDateFieldProps) {
|
|
97
|
+
const generatedId = useId();
|
|
98
|
+
const inputId = id ?? generatedId;
|
|
99
|
+
const [range, setRange] = useState<{ from?: Date; to?: Date }>(() => ({
|
|
100
|
+
from: parseDateInput(defaultValue?.from),
|
|
101
|
+
to: parseDateInput(defaultValue?.to),
|
|
102
|
+
}));
|
|
103
|
+
|
|
104
|
+
const fromLabel = range.from ? format(range.from, dateFormat) : null;
|
|
105
|
+
const toLabel = range.to ? format(range.to, dateFormat) : null;
|
|
106
|
+
const triggerLabel = fromLabel
|
|
107
|
+
? toLabel
|
|
108
|
+
? `${fromLabel} – ${toLabel}`
|
|
109
|
+
: `From ${fromLabel}`
|
|
110
|
+
: toLabel
|
|
111
|
+
? `Until ${toLabel}`
|
|
112
|
+
: placeholder;
|
|
113
|
+
|
|
114
|
+
return (
|
|
115
|
+
<div className={containerClassName}>
|
|
116
|
+
{showLabel && label ? (
|
|
117
|
+
<label htmlFor={inputId} className="text-foreground mb-2 block text-sm font-medium">
|
|
118
|
+
{label}
|
|
119
|
+
</label>
|
|
120
|
+
) : null}
|
|
121
|
+
<Popover>
|
|
122
|
+
<div className="flex w-full items-center">
|
|
123
|
+
<div className="border-border bg-background text-foreground flex size-10 shrink-0 items-center justify-center rounded-l-xl border">
|
|
124
|
+
<CalendarIcon className="size-4" aria-hidden />
|
|
125
|
+
</div>
|
|
126
|
+
<PopoverTrigger asChild>
|
|
127
|
+
<Button id={inputId} variant={variant} disabled={disabled} className={TRIGGER_CLASSES}>
|
|
128
|
+
{triggerLabel}
|
|
129
|
+
</Button>
|
|
130
|
+
</PopoverTrigger>
|
|
131
|
+
</div>
|
|
132
|
+
<PopoverContent
|
|
133
|
+
className="bg-popover w-auto p-0"
|
|
134
|
+
align={popoverAlign}
|
|
135
|
+
aria-label={label ?? "Choose a date range"}
|
|
136
|
+
>
|
|
137
|
+
<Calendar
|
|
138
|
+
mode="range"
|
|
139
|
+
selected={range.from ? { from: range.from, to: range.to } : undefined}
|
|
140
|
+
defaultMonth={range.from ?? range.to}
|
|
141
|
+
resetOnSelect
|
|
142
|
+
onSelect={(next) => setRange({ from: next?.from, to: next?.to })}
|
|
143
|
+
/>
|
|
144
|
+
</PopoverContent>
|
|
145
|
+
</Popover>
|
|
146
|
+
<input type="hidden" name={startName} value={range.from ? formatDateInput(range.from) : ""} />
|
|
147
|
+
<input type="hidden" name={endName} value={range.to ? formatDateInput(range.to) : ""} />
|
|
148
|
+
</div>
|
|
149
|
+
);
|
|
150
|
+
}
|
|
151
|
+
|
|
152
|
+
/**
|
|
153
|
+
* DateField — calendar picker backed by hidden inputs that submit "YYYY-MM-DD"
|
|
154
|
+
* local date strings, so forms never receive UTC-shifted dates. Supports both
|
|
155
|
+
* a single date (`name`) and a range (`startName` + `endName`).
|
|
156
|
+
*
|
|
157
|
+
* @example
|
|
158
|
+
* <DateField name="startDate" defaultValue="2020-01-15" label="Start date" />
|
|
159
|
+
* <DateField
|
|
160
|
+
* mode="range"
|
|
161
|
+
* startName="startDate"
|
|
162
|
+
* endName="endDate"
|
|
163
|
+
* defaultValue={{ from: "2020-01-15", to: "2020-06-30" }}
|
|
164
|
+
* label="Active period"
|
|
165
|
+
* />
|
|
166
|
+
*/
|
|
167
|
+
function DateField(props: DateFieldProps) {
|
|
168
|
+
if (props.mode === "range") {
|
|
169
|
+
return <RangeDateField {...props} />;
|
|
170
|
+
}
|
|
171
|
+
return <SingleDateField {...props} />;
|
|
172
|
+
}
|
|
173
|
+
|
|
174
|
+
export { DateField };
|
|
@@ -55,8 +55,12 @@ export function DatePicker({
|
|
|
55
55
|
</Button>
|
|
56
56
|
</PopoverTrigger>
|
|
57
57
|
</div>
|
|
58
|
-
<PopoverContent
|
|
59
|
-
|
|
58
|
+
<PopoverContent
|
|
59
|
+
className="bg-popover w-auto p-0"
|
|
60
|
+
align={popoverAlign}
|
|
61
|
+
aria-label={label ?? "Choose a date"}
|
|
62
|
+
>
|
|
63
|
+
<Calendar mode="single" selected={value} defaultMonth={value} onSelect={onSelect} />
|
|
60
64
|
</PopoverContent>
|
|
61
65
|
</Popover>
|
|
62
66
|
</div>
|
|
@@ -0,0 +1,32 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Parse a date-only string ("YYYY-MM-DD") as a local calendar day instead of
|
|
3
|
+
* UTC midnight, so negative-UTC-offset timezones don't render the previous day.
|
|
4
|
+
* Accepts a `Date` (returned as-is when valid) and returns `undefined` for
|
|
5
|
+
* null/undefined/invalid input.
|
|
6
|
+
*/
|
|
7
|
+
export function parseDateInput(value: Date | string | null | undefined): Date | undefined {
|
|
8
|
+
if (!value) return undefined;
|
|
9
|
+
if (value instanceof Date) return Number.isNaN(value.getTime()) ? undefined : value;
|
|
10
|
+
const [year, month, day] = value.split("-").map(Number);
|
|
11
|
+
if (!year || !month || !day) return undefined;
|
|
12
|
+
const date = new Date(year, month - 1, day);
|
|
13
|
+
return Number.isNaN(date.getTime()) ? undefined : date;
|
|
14
|
+
}
|
|
15
|
+
|
|
16
|
+
/**
|
|
17
|
+
* Serialize a date to its "YYYY-MM-DD" form using local components, so the
|
|
18
|
+
* value round-trips without a UTC shift. Returns "" for invalid input.
|
|
19
|
+
*/
|
|
20
|
+
export function formatDateInput(value: Date | string | null | undefined): string {
|
|
21
|
+
const date = parseDateInput(value);
|
|
22
|
+
if (!date) return "";
|
|
23
|
+
const year = date.getFullYear();
|
|
24
|
+
const month = String(date.getMonth() + 1).padStart(2, "0");
|
|
25
|
+
const day = String(date.getDate()).padStart(2, "0");
|
|
26
|
+
return `${year}-${month}-${day}`;
|
|
27
|
+
}
|
|
28
|
+
|
|
29
|
+
/** Today's date as a "YYYY-MM-DD" local string. */
|
|
30
|
+
export function todayDateInput(): string {
|
|
31
|
+
return formatDateInput(new Date());
|
|
32
|
+
}
|
|
@@ -2,6 +2,9 @@ export { FilterSelect } from "../filters/filter-select";
|
|
|
2
2
|
export type { FilterSelectOption, FilterSelectProps } from "../filters/filter-select";
|
|
3
3
|
export { Calendar } from "./calendar";
|
|
4
4
|
export type { CalendarProps } from "./calendar";
|
|
5
|
+
export { DateField } from "./date-field";
|
|
6
|
+
export type { DateFieldProps } from "./date-field";
|
|
7
|
+
export { formatDateInput, parseDateInput, todayDateInput } from "./date-utils";
|
|
5
8
|
export { DateMonthSelect, getCurrentMonthYear } from "./date-month-select";
|
|
6
9
|
export type { DateMonthSelectProps } from "./date-month-select";
|
|
7
10
|
export { DatePicker } from "./date-picker";
|