Skip to content

Native iCloud apps for Windows and Linux, built in Rust. Notes, Reminders, Calendar, Contacts, Drive and Photos, offline and in sync with your iPhone.

Reminders: Tab tucks a reminder under the one above and Shift-Tab brings it out, at once; Return goes on to a new reminder — as on a Mac

Yashwanth Kamireddi39f9dcd8c844
diff --git a/.uiverify/reminders-keys.mjs b/.uiverify/reminders-keys.mjs
new file mode 100644
index 0000000..8a607ce
--- /dev/null
+++ b/.uiverify/reminders-keys.mjs
@@ -0,0 +1,36 @@
+// Reminders' keys, as on a Mac: Tab tucks a reminder under the one above, at once;
+// Shift-Tab brings it back out; Return goes on to a new reminder.
+import { engine } from "./engine.mjs";
+import { SERVICES, installStub, openScreen } from "./stub.mjs";
+const b = await engine.launch();
+const ctx = await b.newContext({ viewport: { width: 1200, height: 800 } });
+await ctx.addInitScript(installStub, { screen: "library", services: SERVICES, twoFactor: null, remindersFixture: true });
+const page = await ctx.newPage();
+await page.goto("http://localhost:4173", { waitUntil: "networkidle" });
+await openScreen(page, "Reminders");
+await page.locator(".rx-list", { hasText: "Daily" }).click();
+await page.waitForTimeout(300);
+let failures = 0;
+const ok = (p, m) => { console.log(`${p ? "PASS" : "FAIL"} ${m}`); if (!p) failures++; };
+const row = () => page.locator(".rx-row", { has: page.getByLabel("Rename Pick up the parcel") });
+
+await page.getByLabel("Rename Pick up the parcel").focus();
+await page.keyboard.press("Tab");
+await page.waitForTimeout(150);
+ok(await row().evaluate((el) => el.classList.contains("is-subtask")), "Tab tucks a reminder under the one above, at once");
+let sent = await page.evaluate(() => window.__edits?.at(-1));
+ok(typeof sent?.parentGuid === "string", `and asks Apple to ${JSON.stringify(sent)}`);
+
+await page.getByLabel("Rename Pick up the parcel").focus();
+await page.keyboard.press("Shift+Tab");
+await page.waitForTimeout(150);
+ok(!(await row().evaluate((el) => el.classList.contains("is-subtask"))), "Shift-Tab brings it back out");
+sent = await page.evaluate(() => window.__edits?.at(-1));
+ok(sent && sent.parentGuid === null, `and asks Apple to ${JSON.stringify(sent)}`);
+
+await page.getByLabel("Rename Pick up the parcel").focus();
+await page.keyboard.press("Enter");
+await page.waitForTimeout(150);
+ok(await page.evaluate(() => document.activeElement?.closest(".rx-add") !== null), "Return goes on to a new reminder");
+await b.close();
+process.exitCode = failures ? 1 : 0;
diff --git a/.uiverify/stub.mjs b/.uiverify/stub.mjs
index a603c1b..73f6952 100644
--- a/.uiverify/stub.mjs
+++ b/.uiverify/stub.mjs
@@ -162,7 +162,13 @@ export function installStub({ screen, services, twoFactor, calendarFixture, note
case "reminder_delete": return null;
case "reminder_set_done": return null;
case "reminder_set_repeat": return null;
- case "reminder_edit": (window.__edits ??= []).push(args.edit); return null;
+ case "reminder_edit": {
+ (window.__edits ??= []).push(args.edit);
+ // Kept, as Apple keeps it, so the read after a write shows the write.
+ const r = reminderItems.find((x) => x.guid === args.guid);
+ if (r) for (const [k, v] of Object.entries(args.edit)) if (k !== "listGuid") r[k] = v;
+ return null;
+ }
case "reminder_list_colour": {
(window.__listColours ??= []).push([args.listGuid, args.colour]);
const hex = { purple: "#C077DB", red: "#FF3B30", blue: "#007AFF" }[args.colour];
diff --git a/check.sh b/check.sh
index 92b0deb..f6dbe7c 100755
--- a/check.sh
+++ b/check.sh
@@ -59,6 +59,7 @@ step "drive delete" node .uiverify/drive-delete.mjs
step "notes folders" node .uiverify/notes-folders.mjs
step "list info" node .uiverify/reminders-list-info.mjs
step "reminder date" node .uiverify/reminders-date.mjs
+step "reminder keys" node .uiverify/reminders-keys.mjs
step "contacts order" node .uiverify/contacts-order.mjs
step "calendar alerts" node .uiverify/calendar-alerts.mjs
step "calendar repeat" node .uiverify/calendar-repeat.mjs
diff --git a/src/screens/RemindersView.tsx b/src/screens/RemindersView.tsx
index 11fa3d1..de144a1 100644
--- a/src/screens/RemindersView.tsx
+++ b/src/screens/RemindersView.tsx
@@ -409,13 +409,19 @@ export function RemindersView() {
.reverse()
.find((x) => !x.parentGuid);
if (!above) return Promise.resolve(null);
- return write(r, () =>
- api.reminderEdit(r.guid, r.listGuid, { parentGuid: above.guid })
+ return write(
+ r,
+ () => api.reminderEdit(r.guid, r.listGuid, { parentGuid: above.guid }),
+ patch(r.guid, { parentGuid: above.guid }),
);
};
const outdent = (r: Reminder) =>
- write(r, () => api.reminderEdit(r.guid, r.listGuid, { parentGuid: null }));
+ write(
+ r,
+ () => api.reminderEdit(r.guid, r.listGuid, { parentGuid: null }),
+ patch(r.guid, { parentGuid: null }),
+ );
const moveToList = (r: Reminder, listGuid: string) =>
listGuid === r.listGuid
@@ -1102,10 +1108,20 @@ export function RemindersView() {
disabled={busy.has(reminder.guid)}
onBlur={(e) => void rename(reminder, e.target.value)}
onKeyDown={(e) => {
- if (e.key === "Enter") e.currentTarget.blur();
- if (e.key === "Escape") {
+ // As in Reminders on a Mac: Return finishes it and starts the next,
+ // Tab tucks it under the one above, Shift-Tab brings it back out.
+ if (e.key === "Enter") {
+ e.preventDefault();
+ e.currentTarget.blur();
+ window.setTimeout(() => document.querySelector<HTMLInputElement>(".rx-add input")?.focus(), 0);
+ } else if (e.key === "Escape") {
e.currentTarget.value = reminder.title;
e.currentTarget.blur();
+ } else if (e.key === "Tab" && inList) {
+ e.preventDefault();
+ const typed = e.currentTarget.value;
+ void rename(reminder, typed);
+ void (e.shiftKey ? (reminder.parentGuid ? outdent(reminder) : null) : (reminder.parentGuid ? null : indent(reminder)));
}
}}
/>