@remit/ui 0.0.193 → 0.0.194

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 CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@remit/ui",
3
- "version": "0.0.193",
3
+ "version": "0.0.194",
4
4
  "type": "module",
5
5
  "files": [
6
6
  "src"
@@ -35,6 +35,7 @@ const draft: EventDraft = {
35
35
  title: "Lunch with Jane",
36
36
  date: "2026-06-12",
37
37
  startTime: "13:00",
38
+ endDate: "2026-06-12",
38
39
  endTime: "14:00",
39
40
  allDay: false,
40
41
  calendarId: "c1",
@@ -50,6 +50,7 @@ const draft: EventDraft = {
50
50
  title: "Lunch with Jane",
51
51
  date: "2026-06-12",
52
52
  startTime: "13:00",
53
+ endDate: "2026-06-12",
53
54
  endTime: "14:00",
54
55
  allDay: false,
55
56
  calendarId: "work",
@@ -545,6 +545,7 @@ function EmptyRun({
545
545
  onClick={() =>
546
546
  onPickSlot({
547
547
  date: from,
548
+ endDate: from,
548
549
  startTime: "10:00",
549
550
  endTime: "11:00",
550
551
  allDay: false,
@@ -762,6 +763,7 @@ function DayBlock({
762
763
  onPick={() =>
763
764
  onPickSlot({
764
765
  date: stretch.date,
766
+ endDate: stretch.date,
765
767
  startTime: formatMinute(stretch.startMinute),
766
768
  endTime: formatMinute(
767
769
  Math.min(stretch.startMinute + 60, stretch.endMinute),
@@ -896,6 +898,7 @@ function ClearDayLine({
896
898
  onClick={() =>
897
899
  onPickSlot({
898
900
  date: day.date,
901
+ endDate: day.date,
899
902
  startTime: "10:00",
900
903
  endTime: "11:00",
901
904
  allDay: false,
@@ -11,7 +11,13 @@ import type { CalendarSlotPick } from "./calendar-types.js";
11
11
  const THURSDAY = "2026-06-11";
12
12
 
13
13
  function slot(startTime: string, endTime: string): CalendarSlotPick {
14
- return { date: THURSDAY, startTime, endTime, allDay: false };
14
+ return {
15
+ date: THURSDAY,
16
+ endDate: THURSDAY,
17
+ startTime,
18
+ endTime,
19
+ allDay: false,
20
+ };
15
21
  }
16
22
 
17
23
  const thursday: CalendarSlotPick[] = [
@@ -19,7 +19,13 @@ type Story = StoryObj<typeof CalendarSlotOffers>;
19
19
  const THURSDAY = "2026-06-11";
20
20
 
21
21
  function slot(startTime: string, endTime: string): CalendarSlotPick {
22
- return { date: THURSDAY, startTime, endTime, allDay: false };
22
+ return {
23
+ date: THURSDAY,
24
+ endDate: THURSDAY,
25
+ startTime,
26
+ endTime,
27
+ allDay: false,
28
+ };
23
29
  }
24
30
 
25
31
  const thursday: CalendarSlotPick[] = [
@@ -118,6 +118,7 @@ export interface CalendarDay {
118
118
  export interface CalendarSlotPick {
119
119
  /** `YYYY-MM-DD`. */
120
120
  date: string;
121
+ endDate: string;
121
122
  /** `HH:MM`, empty when the pick landed in the all-day band. */
122
123
  startTime: string;
123
124
  endTime: string;
@@ -299,6 +300,7 @@ export interface EventDraft {
299
300
  date: string;
300
301
  /** `HH:MM`, empty when the entry is all day. */
301
302
  startTime: string;
303
+ endDate: string;
302
304
  endTime: string;
303
305
  allDay: boolean;
304
306
  calendarId: string;
@@ -27,6 +27,7 @@ const draft: EventDraft = {
27
27
  title: "Coffee",
28
28
  date: "2026-06-12",
29
29
  startTime: "13:00",
30
+ endDate: "2026-06-12",
30
31
  endTime: "14:00",
31
32
  allDay: false,
32
33
  calendarId: "c1",
@@ -134,6 +135,28 @@ describe("EventEditor", () => {
134
135
  assert.equal(field(dom, "End time")?.value, "01:00");
135
136
  });
136
137
 
138
+ it("lets a night that ends on the next day save", () => {
139
+ const dom = parse({
140
+ draft: {
141
+ ...draft,
142
+ startTime: "23:00",
143
+ endDate: "2026-06-13",
144
+ endTime: "01:00",
145
+ },
146
+ });
147
+ assert.equal(alertText(dom), "");
148
+ assert.equal(saveControl(dom)?.disabled, false);
149
+ assert.equal(field(dom, "End date")?.value, "2026-06-13");
150
+ });
151
+
152
+ it("refuses an all-day entry whose last day is before its first", () => {
153
+ const dom = parse({
154
+ draft: { ...draft, allDay: true, endDate: "2026-06-11" },
155
+ });
156
+ assert.match(alertText(dom), /Ends before it starts/);
157
+ assert.equal(saveControl(dom)?.disabled, true);
158
+ });
159
+
137
160
  it("lets a normal range save", () => {
138
161
  const dom = parse({});
139
162
  assert.equal(alertText(dom), "");
@@ -44,6 +44,7 @@ const seed: EventDraft = {
44
44
  title: "",
45
45
  date: "2026-06-12",
46
46
  startTime: "13:00",
47
+ endDate: "2026-06-12",
47
48
  endTime: "14:00",
48
49
  allDay: false,
49
50
  calendarId: "c1",
@@ -53,7 +54,7 @@ const seed: EventDraft = {
53
54
  repeat: "",
54
55
  };
55
56
 
56
- /** 23:00 to 01:00, which one date cannot hold. */
57
+ /** 23:00 to 01:00 on the same day, which runs backwards. */
57
58
  const backwards: EventDraft = {
58
59
  ...seed,
59
60
  title: "Release window",
@@ -61,6 +62,22 @@ const backwards: EventDraft = {
61
62
  endTime: "01:00",
62
63
  };
63
64
 
65
+ /** 23:00 to 01:00 the next morning: one night, not a backwards hour. */
66
+ const overnight: EventDraft = {
67
+ ...backwards,
68
+ endDate: "2026-06-13",
69
+ };
70
+
71
+ /** Three whole days, Friday through Sunday. */
72
+ const weekend: EventDraft = {
73
+ ...seed,
74
+ title: "Offsite",
75
+ startTime: "",
76
+ endTime: "",
77
+ allDay: true,
78
+ endDate: "2026-06-14",
79
+ };
80
+
64
81
  function Live({
65
82
  startExpanded,
66
83
  seed: initial = seed,
@@ -97,14 +114,24 @@ export const Folded: Story = { render: () => <Live startExpanded={false} /> };
97
114
  export const Unfolded: Story = { render: () => <Live startExpanded /> };
98
115
 
99
116
  /**
100
- * An end before the start is one date read backwards, not a night that runs
101
- * over. The form keeps what was typed, names the problem under the fields and
102
- * holds the save until it is fixed.
117
+ * An end before the start reads the span backwards. The form keeps what was
118
+ * typed, names the problem under the fields and holds the save until it is
119
+ * fixed.
103
120
  */
104
121
  export const EndBeforeStart: Story = {
105
122
  render: () => <Live startExpanded={false} seed={backwards} />,
106
123
  };
107
124
 
125
+ /** A night that runs past midnight ends on the next day, and saves. */
126
+ export const RunsPastMidnight: Story = {
127
+ render: () => <Live startExpanded={false} seed={overnight} />,
128
+ };
129
+
130
+ /** An all-day event reads from its first day to its last. */
131
+ export const AllDaySpan: Story = {
132
+ render: () => <Live startExpanded={false} seed={weekend} />,
133
+ };
134
+
108
135
  /**
109
136
  * Guests are opt-in. A store with nowhere to put them leaves the field out, so
110
137
  * the default form has none: a box that takes names and drops them is worse
@@ -1,5 +1,6 @@
1
1
  import { ChevronDown, ChevronRight, Repeat } from "lucide-react";
2
2
  import { type ReactNode, useId } from "react";
3
+ import { addDays, daysFrom } from "../lib/agenda-time.js";
3
4
  import { calendarColorClasses } from "../lib/calendar-color.js";
4
5
  import { cn } from "../lib/cn.js";
5
6
  import { NO_REPEAT, repeatChoices } from "../lib/recurrence.js";
@@ -72,20 +73,52 @@ export function EventTitleField({
72
73
  }
73
74
 
74
75
  /**
75
- * A draft carries one date, so an end before the start is not a night that runs
76
- * over — it is a span the calendar reads backwards. The form says so and refuses
77
- * to save it rather than swapping the two fields behind whoever typed them.
76
+ * An end before the start is a span the calendar reads backwards, not a night
77
+ * that runs over — a night that runs over ends on the next day, and says so.
78
+ * The form names the problem and refuses to save it rather than swapping the
79
+ * fields behind whoever typed them.
78
80
  */
79
81
  export function endsBeforeStart(draft: EventDraft): boolean {
80
- if (draft.allDay) return false;
82
+ if (draft.date === "" || draft.endDate === "") return false;
83
+ if (draft.allDay) return draft.endDate < draft.date;
81
84
  if (draft.startTime === "" || draft.endTime === "") return false;
82
- return draft.endTime < draft.startTime;
85
+ return (
86
+ `${draft.endDate}T${draft.endTime}` < `${draft.date}T${draft.startTime}`
87
+ );
88
+ }
89
+
90
+ export function withStartDate(draft: EventDraft, date: string): EventDraft {
91
+ if (date === "") return { ...draft, date };
92
+ if (draft.endDate === "") return { ...draft, date, endDate: date };
93
+ if (draft.date === "") return { ...draft, date };
94
+ return {
95
+ ...draft,
96
+ date,
97
+ endDate: addDays(date, daysFrom(draft.date, draft.endDate)),
98
+ };
99
+ }
100
+
101
+ export function withAllDay(draft: EventDraft, allDay: boolean): EventDraft {
102
+ const overnight =
103
+ draft.date !== "" &&
104
+ draft.endDate === addDays(draft.date, 1) &&
105
+ draft.startTime !== "" &&
106
+ draft.endTime !== "" &&
107
+ draft.endTime < draft.startTime;
108
+ if (allDay && overnight) return { ...draft, allDay, endDate: draft.date };
109
+ return { ...draft, allDay };
83
110
  }
84
111
 
85
112
  export function EventWhenField({ draft, onChange, touch }: EventFieldProps) {
86
113
  const fieldHeight = touch ? "min-h-11" : "";
87
114
  const backwards = endsBeforeStart(draft);
88
115
  const messageId = useId();
116
+ const invalid = {
117
+ "aria-invalid": backwards,
118
+ "aria-describedby": backwards ? messageId : undefined,
119
+ };
120
+ const dateClass = cn("w-40", fieldHeight, backwards && "border-danger/60");
121
+ const timeClass = cn("w-28", fieldHeight, backwards && "border-danger/60");
89
122
  return (
90
123
  <div className="flex flex-col gap-1.5">
91
124
  <div className="flex flex-wrap items-center gap-2">
@@ -93,57 +126,51 @@ export function EventWhenField({ draft, onChange, touch }: EventFieldProps) {
93
126
  type="date"
94
127
  value={draft.date}
95
128
  aria-label="Date"
129
+ {...invalid}
130
+ onChange={(e) => onChange(withStartDate(draft, e.target.value))}
131
+ className={dateClass}
132
+ />
133
+ {!draft.allDay && (
134
+ <Input
135
+ type="time"
136
+ value={draft.startTime}
137
+ aria-label="Start time"
138
+ {...invalid}
139
+ onChange={(e) =>
140
+ setField({ draft, onChange }, "startTime", e.target.value)
141
+ }
142
+ className={timeClass}
143
+ />
144
+ )}
145
+ <span className="text-sm text-fg-subtle">to</span>
146
+ <Input
147
+ type="date"
148
+ value={draft.endDate}
149
+ aria-label="End date"
150
+ min={draft.date === "" ? undefined : draft.date}
151
+ {...invalid}
96
152
  onChange={(e) =>
97
- setField({ draft, onChange }, "date", e.target.value)
153
+ setField({ draft, onChange }, "endDate", e.target.value)
98
154
  }
99
- className={cn("w-40", fieldHeight)}
155
+ className={dateClass}
100
156
  />
101
- {draft.allDay ? (
102
- <span className="text-sm text-fg-muted">All day</span>
103
- ) : (
104
- <>
105
- <Input
106
- type="time"
107
- value={draft.startTime}
108
- aria-label="Start time"
109
- max={draft.endTime === "" ? undefined : draft.endTime}
110
- aria-invalid={backwards}
111
- aria-describedby={backwards ? messageId : undefined}
112
- onChange={(e) =>
113
- setField({ draft, onChange }, "startTime", e.target.value)
114
- }
115
- className={cn(
116
- "w-28",
117
- fieldHeight,
118
- backwards && "border-danger/60",
119
- )}
120
- />
121
- <span className="text-sm text-fg-subtle">to</span>
122
- <Input
123
- type="time"
124
- value={draft.endTime}
125
- aria-label="End time"
126
- min={draft.startTime === "" ? undefined : draft.startTime}
127
- aria-invalid={backwards}
128
- aria-describedby={backwards ? messageId : undefined}
129
- onChange={(e) =>
130
- setField({ draft, onChange }, "endTime", e.target.value)
131
- }
132
- className={cn(
133
- "w-28",
134
- fieldHeight,
135
- backwards && "border-danger/60",
136
- )}
137
- />
138
- </>
157
+ {!draft.allDay && (
158
+ <Input
159
+ type="time"
160
+ value={draft.endTime}
161
+ aria-label="End time"
162
+ {...invalid}
163
+ onChange={(e) =>
164
+ setField({ draft, onChange }, "endTime", e.target.value)
165
+ }
166
+ className={timeClass}
167
+ />
139
168
  )}
140
169
  <label className="flex items-center gap-2 text-sm text-fg-muted">
141
170
  <input
142
171
  type="checkbox"
143
172
  checked={draft.allDay}
144
- onChange={(e) =>
145
- setField({ draft, onChange }, "allDay", e.target.checked)
146
- }
173
+ onChange={(e) => onChange(withAllDay(draft, e.target.checked))}
147
174
  className="size-4 accent-current"
148
175
  />
149
176
  All day
@@ -151,8 +178,9 @@ export function EventWhenField({ draft, onChange, touch }: EventFieldProps) {
151
178
  </div>
152
179
  {backwards && (
153
180
  <p id={messageId} className="text-xs text-danger" role="alert">
154
- Ends before it starts. Move the end past {draft.startTime}, or start
155
- earlier.
181
+ {draft.allDay
182
+ ? `Ends before it starts. Move the end to ${draft.date} or later.`
183
+ : `Ends before it starts. Move the end past ${draft.date} ${draft.startTime}, or start earlier.`}
156
184
  </p>
157
185
  )}
158
186
  </div>
@@ -231,7 +231,13 @@ const thursdayProposals: CalendarProposal[] = [
231
231
  const THURSDAY = "2026-06-11";
232
232
 
233
233
  function slot(startTime: string, endTime: string): CalendarSlotPick {
234
- return { date: THURSDAY, startTime, endTime, allDay: false };
234
+ return {
235
+ date: THURSDAY,
236
+ endDate: THURSDAY,
237
+ startTime,
238
+ endTime,
239
+ allDay: false,
240
+ };
235
241
  }
236
242
 
237
243
  const thursdaySlots: CalendarSlotPick[] = [
package/src/index.ts CHANGED
@@ -347,6 +347,8 @@ export {
347
347
  EventTitleField,
348
348
  EventWhenField,
349
349
  endsBeforeStart,
350
+ withAllDay,
351
+ withStartDate,
350
352
  } from "./components/event-editor.js";
351
353
  export {
352
354
  EventEditorPane,
@@ -941,6 +943,7 @@ export {
941
943
  DAY_END_MINUTE,
942
944
  DAY_START_MINUTE,
943
945
  datesBetween,
946
+ daysFrom,
944
947
  FREE_MINUTES,
945
948
  type FreeStretch,
946
949
  formatMinute,
@@ -953,6 +956,7 @@ export {
953
956
  groupOverlapping,
954
957
  isClearDay,
955
958
  isEmptyDay,
959
+ lastDayOf,
956
960
  mergeBusySpans,
957
961
  minuteOfDay,
958
962
  monthLabel,
@@ -46,6 +46,21 @@ export function addDays(date: string, days: number): string {
46
46
  return cursor.toISOString().slice(0, 10);
47
47
  }
48
48
 
49
+ export function daysFrom(from: string, to: string): number {
50
+ return Math.round(
51
+ (Date.parse(`${to}T00:00:00Z`) - Date.parse(`${from}T00:00:00Z`)) /
52
+ 86_400_000,
53
+ );
54
+ }
55
+
56
+ export function lastDayOf(event: CalendarEventData): string {
57
+ const start = event.start.slice(0, 10);
58
+ const end = event.end.slice(0, 10);
59
+ if (!event.allDay) return end;
60
+ const last = addDays(end, -1);
61
+ return last < start ? start : last;
62
+ }
63
+
49
64
  export function datesBetween(from: string, to: string): string[] {
50
65
  const dates: string[] = [];
51
66
  for (let cursor = from; cursor <= to; cursor = addDays(cursor, 1))
@@ -10,6 +10,7 @@ describe("pointPick", () => {
10
10
  it("drafts an hour from the point that was clicked", () => {
11
11
  assert.deepEqual(pointPick("2026-06-10T14:30:00+02:00", false), {
12
12
  date: "2026-06-10",
13
+ endDate: "2026-06-10",
13
14
  startTime: "14:30",
14
15
  endTime: "15:30",
15
16
  allDay: false,
@@ -30,6 +31,7 @@ describe("pointPick", () => {
30
31
  it("carries an all-day point with no clock at all", () => {
31
32
  assert.deepEqual(pointPick("2026-06-10", true), {
32
33
  date: "2026-06-10",
34
+ endDate: "2026-06-10",
33
35
  startTime: "",
34
36
  endTime: "",
35
37
  allDay: true,
@@ -37,10 +39,9 @@ describe("pointPick", () => {
37
39
  });
38
40
 
39
41
  it("rolls a draft that runs past midnight round the clock", () => {
40
- assert.equal(
41
- pointPick("2026-06-10T23:30:00+02:00", false).endTime,
42
- "00:30",
43
- );
42
+ const pick = pointPick("2026-06-10T23:30:00+02:00", false);
43
+ assert.equal(pick.endTime, "00:30");
44
+ assert.equal(pick.endDate, "2026-06-11");
44
45
  });
45
46
  });
46
47
 
@@ -54,6 +55,7 @@ describe("rangePick", () => {
54
55
  ),
55
56
  {
56
57
  date: "2026-06-10",
58
+ endDate: "2026-06-10",
57
59
  startTime: "09:00",
58
60
  endTime: "11:30",
59
61
  allDay: false,
@@ -61,9 +63,27 @@ describe("rangePick", () => {
61
63
  );
62
64
  });
63
65
 
64
- it("drops the clock off an all-day range", () => {
66
+ it("keeps a dragged range that runs past midnight on its own end day", () => {
67
+ assert.deepEqual(
68
+ rangePick(
69
+ "2026-06-10T22:00:00+02:00",
70
+ "2026-06-11T01:00:00+02:00",
71
+ false,
72
+ ),
73
+ {
74
+ date: "2026-06-10",
75
+ endDate: "2026-06-11",
76
+ startTime: "22:00",
77
+ endTime: "01:00",
78
+ allDay: false,
79
+ },
80
+ );
81
+ });
82
+
83
+ it("drops the clock off an all-day range and keeps its last day", () => {
65
84
  assert.deepEqual(rangePick("2026-06-10", "2026-06-13", true), {
66
85
  date: "2026-06-10",
86
+ endDate: "2026-06-12",
67
87
  startTime: "",
68
88
  endTime: "",
69
89
  allDay: true,
@@ -1,4 +1,5 @@
1
1
  import type { CalendarSlotPick } from "../components/calendar-types.js";
2
+ import { addDays } from "./agenda-time.js";
2
3
  import { addMinutesToClock } from "./event-phrase.js";
3
4
 
4
5
  /** How long a new event is when nobody said — the hour every other path starts from. */
@@ -18,9 +19,14 @@ export function rangePick(
18
19
  endStr: string,
19
20
  allDay: boolean,
20
21
  ): CalendarSlotPick {
21
- if (allDay) return allDayPick(startStr);
22
+ if (allDay) {
23
+ const date = startStr.slice(0, 10);
24
+ const last = addDays(endStr.slice(0, 10), -1);
25
+ return { ...allDayPick(startStr), endDate: last < date ? date : last };
26
+ }
22
27
  return {
23
28
  date: startStr.slice(0, 10),
29
+ endDate: endStr.slice(0, 10),
24
30
  startTime: startStr.slice(11, 16),
25
31
  endTime: endStr.slice(11, 16),
26
32
  allDay: false,
@@ -31,10 +37,13 @@ export function rangePick(
31
37
  export function pointPick(dateStr: string, allDay: boolean): CalendarSlotPick {
32
38
  if (allDay) return allDayPick(dateStr);
33
39
  const startTime = dateStr.slice(11, 16);
40
+ const endTime = addMinutesToClock(startTime, DRAFT_MINUTES);
41
+ const date = dateStr.slice(0, 10);
34
42
  return {
35
- date: dateStr.slice(0, 10),
43
+ date,
44
+ endDate: endTime < startTime ? addDays(date, 1) : date,
36
45
  startTime,
37
- endTime: addMinutesToClock(startTime, DRAFT_MINUTES),
46
+ endTime,
38
47
  allDay: false,
39
48
  };
40
49
  }
@@ -42,6 +51,7 @@ export function pointPick(dateStr: string, allDay: boolean): CalendarSlotPick {
42
51
  function allDayPick(dateStr: string): CalendarSlotPick {
43
52
  return {
44
53
  date: dateStr.slice(0, 10),
54
+ endDate: dateStr.slice(0, 10),
45
55
  startTime: "",
46
56
  endTime: "",
47
57
  allDay: true,