@bobfrankston/rmfmail 1.2.302 → 1.2.304

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.";
   }
 });