@bobfrankston/rmfmail 1.0.523 → 1.0.525

package/client/app.js

@@ -863,6 +863,22 @@ function forwardBody(msg) {
 let lastDeleted = null;
 let lastMoved = null;
 let undoTimeout = null;
+/** Route a "delete the selection" action (Delete key, Ctrl+D, top trash
+ *  button) to whichever pane has a selection. Tasks take priority — if
+ *  any task rows are selected, delete those; otherwise fall through to
+ *  messages. The previous behavior was to always delete messages, which
+ *  surprised users who'd just selected a few tasks and hit Delete. */
+async function deleteSelection() {
+    try {
+        const sidebar = await import("./components/calendar-sidebar.js");
+        if (sidebar.getSelectedTaskUuids().length > 0) {
+            await sidebar.deleteSelectedTasks();
+            return;
+        }
+    }
+    catch { /* sidebar module not loaded yet — fall through to messages */ }
+    await deleteSelectedMessages();
+}
 async function deleteSelectedMessages() {
     const selected = getSelectedMessages();
     // Fall back to single message from viewer if nothing selected in list
@@ -973,11 +989,12 @@ document.addEventListener("mailx-moved", (e) => {
         clearTimeout(undoTimeout);
     undoTimeout = setTimeout(() => { lastMoved = null; }, 60000);
 });
-document.getElementById("btn-delete")?.addEventListener("click", deleteSelectedMessages);
+document.getElementById("btn-delete")?.addEventListener("click", deleteSelection);
 // Same handlers also bound to the top-toolbar icons so delete/spam work
 // regardless of whether a message is open in the viewer. Useful for quick
-// triage from a list-only view.
-document.getElementById("btn-tb-delete")?.addEventListener("click", deleteSelectedMessages);
+// triage from a list-only view. Top trash button uses deleteSelection so
+// it follows the user's task selection when present (otherwise messages).
+document.getElementById("btn-tb-delete")?.addEventListener("click", deleteSelection);
 document.getElementById("btn-tb-spam")?.addEventListener("click", spamSelectedMessages);
 // ── Flag toggle ──
 document.getElementById("btn-flag")?.addEventListener("click", async () => {
@@ -1347,7 +1364,7 @@ document.addEventListener("mailx-compose", ((e) => {
         openCompose(e.detail.mode);
     }
 }));
-document.addEventListener("mailx-delete", () => deleteSelectedMessages());
+document.addEventListener("mailx-delete", () => deleteSelection());
 // Share / mailto intents (Android-side: MainActivity routes share-sheet
 // invocations and mailto: links here. Desktop has no equivalent today —
 // MSIX / Windows share-target requires packaging changes we deferred).
@@ -2234,7 +2251,7 @@ document.addEventListener("keydown", (e) => {
         if (tag === "INPUT" || tag === "TEXTAREA" || tag === "SELECT" || editable)
             return;
         e.preventDefault();
-        deleteSelectedMessages();
+        deleteSelection();
     }
     // Ctrl+Z = Undo the most recent delete or move
     if (e.ctrlKey && e.key === "z") {