@bobfrankston/rmfmail 1.2.303 → 1.2.304

package/.commitmsg

@@ -1,47 +1,49 @@
-The phone's star filter was never asked for, and the chip announcing it landed in a 28px column
-
-"it then says no flagged messages. but there are message flagged" (Bob
-2026-09-04, on Android, with the screenshot). There are 260 — 257 in bobma's
-INBOX alone, and the desktop's own SQL finds every one of them.
-
-`WebMailxService.getUnifiedInbox` took two parameters. api-client has always
-called it with four: `(page, pageSize, flaggedOnly, dateBasis)`. `getMessages`
-took seven and is called with nine, `flaggedOnly` at position 8. The extras
-fell off the end and JavaScript said nothing — and neither did TypeScript,
-because an implementation with FEWER parameters satisfies an interface
-declaring more. Both dropped arguments are on `MessageQuery`, documented, and
-honoured by the desktop store.
-
-What was left on the phone was the client's `.flagged-only` CSS rule, which
-hides unflagged rows in the loaded page. That is precisely the arrangement the
-desktop comment has warned about since 2026-06-05: a paginated list whose
-newest 50 messages happen to carry no star shows nothing at all, and every
-starred message deeper in the mailbox is unreachable. The overlay then counted
-the rows it was hiding and reported the truth from where it stood — "A 'flagged
-only' filter is hiding 50 messages" — while the filter that could have found
-the other 260 had never run.
-
-Both parameters are now threaded through, and the `\Flagged` predicate lives in
-one named constant matching desktop's character for character: two backslashes
-in the SQL literal, because `flags_json` is JSON and the flag is stored
-escaped. `dateBasis` was dropped by the same omission on the same line, so the
-phone has been ordering by arrival time while the desktop ordered by the Date:
-header; it now honours what it is handed. That is a visible change to list
-order on the phone, and it is the order the client has been asking for all
-along — say so if you want it left as it was.
-
-Three tests assert the threading, which is where the bug was. They use a spy
-db, since the failure was an argument that never arrived, not SQL that got it
-wrong.
-
-**The chip, separately.** `#ml-filter-chip` said `display: block; width: 100%`
-and never said `grid-column: 1 / -1`. `.message-list` is a five-column grid,
-every other full-width child declares the span, and this one auto-placed into
-column 1 — the 28px avatar track — so "Showing flagged (★) messages only —
-click to show everything" came out one word per line down the left edge of the
-header. `width: 100%` cannot help there; inside a grid it means 100% of a 28px
-track.
-
-Not changed: the ★ button sits in the search row, next to Server and
-Trash/Spam, which is why reaching for search found a list filter. That is a
-placement judgement, not a bug, so it is yours to call.
+Ask at the pointer, not in the host's dialog
+
+"clicking the x is supposed [to] delete the task but seems to do nothing …
+it eventually puts up a message far from where I clicked" (Bob 2026-09-04,
+with both screenshots).
+
+The × handler called the native `confirm()`. In the WebView that is the host's
+own dialog: titled "msger.localhost says", centred in the window rather than
+under the pointer, arriving late enough that the click reads as having done
+nothing — and blocking the WebView event loop the whole time it is up, which is
+the hazard message-viewer.ts already refuses `alert()` for. Compose reached the
+same conclusion in its own window and wrote an in-page modal; the main window
+never got one, so thirteen `confirm()` calls still go to the host.
+
+`confirmAt(x, y, label)` in context-menu.ts asks the question as a two-item
+menu at the pointer. Built on showContextMenu rather than as a new modal, so
+there is one menu, one dismissal path, and one piece of stay-on-screen clamping
+— that clamping in particular was already solved here for narrow Android
+screens, and a second implementation would have had to learn it again.
+
+The label NAMES its target — `Delete "Records. Berkowitz"`, never "OK". By the
+time a confirmation is read the pointer has moved and the row it came from is
+no longer obvious; a named action can be checked, and "OK" cannot. The
+explanation the old dialog text carried ("removes it from Google Tasks — to
+mark done use the checkbox") is now the item's tooltip: worth having, not worth
+a dialog.
+
+Three call sites move: the row ×, the row context menu's Delete, and the batch
+delete behind the Delete key / trash button. The batch one has no click to
+anchor to, so it asks over the first selected row — where the tasks are and
+where the user is looking.
+
+Two supporting changes:
+
+`ContextMenuOptions.onClose` — fires whichever way the menu goes away, so a
+promise-shaped menu can answer "cancelled" instead of hanging forever on a
+dismissal. An item's click calls closeContextMenu() BEFORE item.action(), so
+onClose always runs first; confirmAt defers its cancel by one microtask, and
+since the action is synchronous and completes within the same task, a chosen
+item has always settled the promise by the time that microtask drains.
+
+`.ctx-emphasized` now renders. `MenuItem.emphasized` has been passed since the
+right-drag menu was written ("Move here" as the default action) and no CSS rule
+ever matched it, so it has never once looked different from its neighbours.
+
+The other ten `confirm()` calls — rebuild, factory reset, permanent delete,
+folder move/delete, contact delete, discard draft — are untouched. They are
+the same dialog with the same problems and they should follow, but each is a
+destructive action worth reading before it moves.

package/client/app.bundle.js

@@ -1015,6 +1015,7 @@ var init_edit_menu = __esm({
 var context_menu_exports = {};
 __export(context_menu_exports, {
   closeContextMenu: () => closeContextMenu,
+  confirmAt: () => confirmAt,
   showContextMenu: () => showContextMenu
 });
 function closeSubmenu() {
@@ -1029,6 +1030,11 @@ function closeContextMenu() {
     activeMenu.remove();
     activeMenu = null;
   }
+  if (closeHandler) {
+    const fn = closeHandler;
+    closeHandler = null;
+    fn();
+  }
   if (dismissListener) {
     document.removeEventListener("pointerdown", dismissListener, true);
     dismissListener = null;
@@ -1079,6 +1085,7 @@ function openSubmenu(parentRow, items) {
 }
 function showContextMenu(x, y, items, opts = {}) {
   closeContextMenu();
+  closeHandler = opts.onClose ?? null;
   if (opts.editTarget !== void 0 || opts.editEngine) {
     const edit = editMenuItems({ target: opts.editTarget, engine: opts.editEngine }, { onError: opts.onEditError });
     if (edit.length > 0) {
@@ -1168,7 +1175,29 @@ function showContextMenu(x, y, items, opts = {}) {
     document.addEventListener("keydown", escapeListener, true);
   });
 }
-var activeMenu, dismissListener, escapeListener, activeSubmenu;
+function confirmAt(x, y, confirmLabel, opts = {}) {
+  return new Promise((resolve) => {
+    let settled = false;
+    const done = (v) => {
+      if (!settled) {
+        settled = true;
+        resolve(v);
+      }
+    };
+    showContextMenu(x, y, [
+      { label: confirmLabel, action: () => done(true), emphasized: true, tooltip: opts.tooltip },
+      { label: "Cancel", action: () => done(false) }
+    ], {
+      // An item's click calls closeContextMenu() BEFORE item.action(), so
+      // onClose always runs first. Defer the "cancelled" answer by one
+      // microtask: the action is synchronous and finishes within this
+      // task, so by the time the microtask drains, a chosen item has
+      // already settled the promise and this call is a no-op.
+      onClose: () => queueMicrotask(() => done(false))
+    });
+  });
+}
+var activeMenu, dismissListener, escapeListener, activeSubmenu, closeHandler;
 var init_context_menu = __esm({
   "client/components/context-menu.js"() {
     "use strict";
@@ -1177,6 +1206,7 @@ var init_context_menu = __esm({
     dismissListener = null;
     escapeListener = null;
     activeSubmenu = null;
+    closeHandler = null;
     document.addEventListener("scroll", closeContextMenu, true);
     document.addEventListener("contextmenu", () => {
     });
@@ -6626,7 +6656,10 @@ async function deleteSelectedTasks() {
   const uuids = [...selectedTaskUuids];
   if (uuids.length === 0)
     return;
-  if (!confirm(`Delete ${uuids.length} task${uuids.length === 1 ? "" : "s"}? This removes ${uuids.length === 1 ? "it" : "them"} from Google Tasks \u2014 to mark done, use the checkbox instead.`))
+  const anchorEl = document.querySelector(".cal-side-task.selected") || document.getElementById("cal-side-tasks");
+  const r = anchorEl?.getBoundingClientRect();
+  const label = uuids.length === 1 ? `Delete "${document.querySelector(".cal-side-task.selected .cal-side-task-title")?.textContent || "this task"}"` : `Delete ${uuids.length} tasks`;
+  if (!await confirmAt(r ? r.left + 24 : 80, r ? r.bottom : 80, label, { tooltip: TASK_DELETE_NOTE }))
     return;
   selectedTaskUuids.clear();
   for (const uuid of uuids) {
@@ -6914,7 +6947,7 @@ async function renderTasks(prefetched) {
     row.querySelector(".cal-side-task-delete")?.addEventListener("click", async (e) => {
       e.stopPropagation();
       const title = tasks.find((t) => t.uuid === uuid)?.title || "this task";
-      if (!confirm(`Delete task "${title}"? This removes it from Google Tasks \u2014 to mark done, use the checkbox instead.`))
+      if (!await confirmAt(e.clientX, e.clientY, `Delete "${title}"`, { tooltip: TASK_DELETE_NOTE }))
         return;
       await deleteTask(uuid);
       selectedTaskUuids.delete(uuid);
@@ -6941,9 +6974,9 @@ async function renderTasks(prefetched) {
         { label: "View in Google Tasks", action: () => openInBrowser("https://tasks.google.com/") },
         { label: "", action: () => {
         }, separator: true },
-        { label: "Delete task", action: async () => {
+        { label: "Delete task", tooltip: TASK_DELETE_NOTE, action: async () => {
           const title = tasks.find((t) => t.uuid === uuid)?.title || "this task";
-          if (!confirm(`Delete task "${title}"? This removes it from Google Tasks \u2014 to mark done, use the checkbox instead.`))
+          if (!await confirmAt(e.clientX, e.clientY, `Delete "${title}"`, { tooltip: TASK_DELETE_NOTE }))
             return;
           await deleteTask(uuid);
           renderTasks();
@@ -7296,7 +7329,7 @@ function initCalendarSidebar() {
     }
   }
 }
-var SIDEBAR_PREF, SHOW_RECURRING_PREF, SHOW_DONE_PREF, HORIZON_DAYS_PREF, HORIZON_DEFAULT_DAYS, HOLIDAY_HORIZON_MS, viewYear, viewMonth, viewDay, lastEvents, lastOverdueTasks, calById, calendarList, hiddenCalendars, selectedTaskUuids;
+var SIDEBAR_PREF, SHOW_RECURRING_PREF, SHOW_DONE_PREF, HORIZON_DAYS_PREF, HORIZON_DEFAULT_DAYS, HOLIDAY_HORIZON_MS, viewYear, viewMonth, viewDay, lastEvents, lastOverdueTasks, calById, calendarList, hiddenCalendars, selectedTaskUuids, TASK_DELETE_NOTE;
 var init_calendar_sidebar = __esm({
   "client/components/calendar-sidebar.js"() {
     "use strict";
@@ -7317,6 +7350,7 @@ var init_calendar_sidebar = __esm({
     calendarList = [];
     hiddenCalendars = /* @__PURE__ */ new Set();
     selectedTaskUuids = /* @__PURE__ */ new Set();
+    TASK_DELETE_NOTE = "Removes it from Google Tasks. To mark it done instead, use the checkbox.";
   }
 });