Native iCloud apps for Windows and Linux, built in Rust. Notes, Reminders, Calendar, Contacts, Drive and Photos, offline and in sync with your iPhone.
Rust apple-notesapple-reminderscloudkitcrdtdesktop-appicloudicloud-calendaricloud-driveicloud-notesicloud-photosiphonelinuxlinux-desktoplocal-firstoffline-firstprivacyrusttauritauri-appwindows
Calendar: a new all-day event is drawn in the all-day row
Yashwanth Kamireddi0a3ce007627f
diff --git a/.uiverify/calendar-undo.mjs b/.uiverify/calendar-undo.mjsindex 64f2198..24cf47b 100644--- a/.uiverify/calendar-undo.mjs+++ b/.uiverify/calendar-undo.mjs@@ -50,6 +50,12 @@ const made = page.getByRole("dialog", { name: "New event" });await made.waitFor({ timeout: 2000 }).catch(() => {});ok(await made.isVisible(), "a double-click on the all-day row starts a new event");ok(await made.getByRole("checkbox", { name: "all-day" }).isChecked().catch(() => false), "and it is all-day");+// Drawn in the row while it is named, under its name as typed.+await made.getByLabel("Title").fill("Team day");+const draftBar = page.locator(".cx-allday .cx-bar-event.is-draft");+ok(await draftBar.count() === 1 && (await draftBar.textContent()) === "Team day", `it is drawn in the all-day row as it is named [${await draftBar.count()}]`);+const drawnAt = await draftBar.boundingBox();+ok(drawnAt && Math.abs(drawnAt.x - (box.x + colWidth * other)) < 6, "on the day it was made");await page.keyboard.press("Escape");await made.waitFor({ state: "detached" });diff --git a/src/screens/calendar/CalendarView.tsx b/src/screens/calendar/CalendarView.tsxindex 9d96b94..33214cf 100644--- a/src/screens/calendar/CalendarView.tsx+++ b/src/screens/calendar/CalendarView.tsx@@ -1205,12 +1205,13 @@ export function CalendarView() {}, [setView]);const canWrite = useCallback((guid: string) => byGuid.get(guid)?.writable ?? false, [byGuid]);const gridDays = useMemo(() => (view === "week" ? week : [selected]), [view, week, selected]);- const pendingFrom = draft && !draft.guid && !draft.allDay ? draft.startsAt : null;- const pendingTo = draft && !draft.guid && !draft.allDay ? draft.endsAt : null;- const pendingTitle = draft && !draft.guid && !draft.allDay ? draft.title : "";+ const pendingFrom = draft && !draft.guid ? draft.startsAt : null;+ const pendingTo = draft && !draft.guid ? draft.endsAt : null;+ const pendingTitle = draft && !draft.guid ? draft.title : "";+ const pendingAllDay = Boolean(draft && !draft.guid && draft.allDay);const pending = useMemo(- () => (pendingFrom === null || pendingTo === null ? null : { startsAt: pendingFrom, endsAt: pendingTo, title: pendingTitle }),- [pendingFrom, pendingTo, pendingTitle]+ () => (pendingFrom === null || pendingTo === null ? null : { startsAt: pendingFrom, endsAt: pendingTo, title: pendingTitle, allDay: pendingAllDay }),+ [pendingFrom, pendingTo, pendingTitle, pendingAllDay]);/** "New event": the next whole hour on the selected day, for an hour — Apple's default. */@@ -2355,8 +2356,9 @@ const TimeGrid = memo(function TimeGrid({onCreate: (startsAt: number, endsAt: number, allDay: boolean, at: Anchor) => void;onMove: (e: CalendarEvent, startsAt: number, endsAt: number) => void;onPickDay: (d: Date) => void;- /** A new event being named in the popover, held on the grid where it was made. */- pending?: { startsAt: number; endsAt: number; title: string } | null;+ /** A new event being named in the popover, held on the grid where it was made — in the+ * all-day row when it is all-day. */+ pending?: { startsAt: number; endsAt: number; title: string; allDay: boolean } | null;onMenu: (e: CalendarEvent, at: { x: number; y: number }) => void;picked: string | null;weekNumbers: boolean;@@ -2369,12 +2371,22 @@ const TimeGrid = memo(function TimeGrid({const daysKey = days.map((d) => dayKey(d)).join();// A bar that runs past the last day shown carries on to the right — in Day, past the one// day, not only past the week the layout counts from.+ // A new all-day event being named takes its place among them, so it is seen where it is+ // being made rather than nowhere until it is saved.+ const draftFrom = pending?.allDay ? pending.startsAt : null;+ const draftTo = pending?.allDay ? pending.endsAt : null;const spans = useMemo(- () => weekSpans(events, days[0])+ () => weekSpans(+ draftFrom === null || draftTo === null ? events : [...events, {+ guid: PENDING, calendarGuid: "", title: "", location: null, startsAt: draftFrom, endsAt: draftTo,+ allDay: true, timezone: null, url: null, notes: null, etag: null,+ }],+ days[0],+ ).filter((s) => s.from < days.length).map((s) => (s.to >= days.length ? { ...s, to: days.length - 1, continuesRight: true } : s)),// eslint-disable-next-line react-hooks/exhaustive-deps- [events, daysKey]+ [events, daysKey, draftFrom, draftTo]);const eventLanes = Math.max(0, ...spans.map((s) => s.lane + 1));// A reminder for a day has no time: it sits in the all-day row under the day's bars, as in@@ -2606,8 +2618,8 @@ const TimeGrid = memo(function TimeGrid({// Each day's events and timed reminders, laid out together so neither is drawn over the other.// Worked out once for what is shown, not again for every move of a drag or key typed in the// popover; the title of the event being named changes nothing here.- const pendingFrom = pending?.startsAt ?? null;- const pendingTo = pending?.endsAt ?? null;+ const pendingFrom = pending && !pending.allDay ? pending.startsAt : null;+ const pendingTo = pending && !pending.allDay ? pending.endsAt : null;const layouts = useMemo(() => days.map((d) => {const pending = pendingFrom === null || pendingTo === null ? null : { startsAt: pendingFrom, endsAt: pendingTo };const due = stackReminders(reminders.filter((r) => r.dueAt !== null && !r.allDay && sameDay(dateOf(r.dueAt), d)));@@ -2672,6 +2684,21 @@ const TimeGrid = memo(function TimeGrid({}}>{spans.map((s) => {+ if (s.event.guid === PENDING) {+ return (+ <span+ key={PENDING}+ className="cx-bar-event is-draft"+ style={{+ left: `calc(${(s.from / days.length) * 100}% + 2px)`,+ width: `calc(${((s.to - s.from + 1) / days.length) * 100}% - 4px)`,+ top: `${4 + s.lane * LANE}px`,+ }}+ >+ {pending?.title.trim() || "New Event"}+ </span>+ );+ }const carried = drag?.kind === "days" && drag.event.guid === s.event.guid ? drag : null;const from = s.from + (carried && carried.edge !== "end" ? carried.dx : 0);const to = Math.min(s.to + (carried && carried.edge !== "start" ? carried.dx : 0), days.length - 1);diff --git a/src/styles/calendar.css b/src/styles/calendar.cssindex b1fadfb..69d729f 100644--- a/src/styles/calendar.css+++ b/src/styles/calendar.css@@ -445,6 +445,7 @@.cx-bar-grip { position: absolute; top: 0; bottom: 0; width: 6px; cursor: ew-resize; }.cx-bar-grip.is-start { left: 0; }.cx-bar-grip.is-end { right: 0; }+.cx-bar-event.is-draft { --cal: var(--sys-blue); display: flex; align-items: center; pointer-events: none; }.cx-block.is-draft {--cal: var(--sys-blue);left: 0;