@bobfrankston/rmfmail 1.1.248 → 1.1.250

package/client/app.bundle.js

@@ -26,6 +26,7 @@ __export(api_client_exports, {
   connectEvents: () => connectEvents,
   connectWebSocket: () => connectWebSocket,
   consumePendingMailto: () => consumePendingMailto,
+  copyMessages: () => copyMessages,
   createCalendarEvent: () => createCalendarEvent,
   createFolder: () => createFolder,
   createTask: () => createTask,
@@ -345,6 +346,9 @@ function moveMessages(accountId, uids, targetFolderId, targetAccountId) {
 function markAsSpamMessages(accountId, uids) {
   return ipc().markAsSpamMessages?.(accountId, uids);
 }
+function copyMessages(accountId, uids, folderIds, targetFolderId) {
+  return ipc().copyMessages?.(accountId, uids, folderIds, targetFolderId);
+}
 function undeleteMessage(accountId, uid, folderId) {
   return ipc().undeleteMessage?.(accountId, uid, folderId);
 }
@@ -652,7 +656,9 @@ function showContextMenu(x, y, items) {
       continue;
     }
     const el = document.createElement("div");
-    el.className = "ctx-item" + (item.disabled ? " ctx-disabled" : "");
+    el.className = "ctx-item" + (item.disabled ? " ctx-disabled" : "") + (item.emphasized ? " ctx-emphasized" : "");
+    if (item.emphasized)
+      el.style.fontWeight = "600";
     el.textContent = item.label;
     if (item.tooltip)
       el.title = item.tooltip;
@@ -740,25 +746,32 @@ function getMessages2() {
   return messages;
 }
 function removeMessages(uids, currentlyFocused) {
-  const removeSet = new Set(uids.map((u) => `${u.accountId}:${u.uid}`));
-  const focusedKey = currentlyFocused ? `${currentlyFocused.accountId}:${currentlyFocused.uid}` : null;
-  const focusedWasRemoved = focusedKey !== null && removeSet.has(focusedKey);
+  const fullSet = /* @__PURE__ */ new Set();
+  const looseSet = /* @__PURE__ */ new Set();
+  for (const u of uids) {
+    if (u.folderId != null)
+      fullSet.add(`${u.accountId}:${u.folderId}:${u.uid}`);
+    else
+      looseSet.add(`${u.accountId}:${u.uid}`);
+  }
+  const isRemoved = (m) => m.folderId != null && fullSet.has(`${m.accountId}:${m.folderId}:${m.uid}`) || looseSet.has(`${m.accountId}:${m.uid}`);
+  const focusedWasRemoved = currentlyFocused !== null && isRemoved(currentlyFocused);
   let nextSurvivor = null;
   if (focusedWasRemoved) {
     let lastRemovedIdx = -1;
     for (let i = 0; i < messages.length; i++) {
-      if (removeSet.has(`${messages[i].accountId}:${messages[i].uid}`))
+      if (isRemoved(messages[i]))
         lastRemovedIdx = i;
     }
     for (let i = lastRemovedIdx + 1; i < messages.length; i++) {
-      if (!removeSet.has(`${messages[i].accountId}:${messages[i].uid}`)) {
+      if (!isRemoved(messages[i])) {
         nextSurvivor = messages[i];
         break;
       }
     }
     if (!nextSurvivor) {
       for (let i = lastRemovedIdx - 1; i >= 0; i--) {
-        if (!removeSet.has(`${messages[i].accountId}:${messages[i].uid}`)) {
+        if (!isRemoved(messages[i])) {
           nextSurvivor = messages[i];
           break;
         }
@@ -767,11 +780,11 @@ function removeMessages(uids, currentlyFocused) {
   }
   const removedIds = /* @__PURE__ */ new Set();
   for (const m of messages) {
-    if (removeSet.has(`${m.accountId}:${m.uid}`) && m.messageId) {
+    if (isRemoved(m) && m.messageId) {
       removedIds.add(m.messageId);
     }
   }
-  messages = messages.filter((m) => !removeSet.has(`${m.accountId}:${m.uid}`));
+  messages = messages.filter((m) => !isRemoved(m));
   if (removedIds.size > 0) {
     for (const m of messages) {
       if (m.messageId && removedIds.has(m.messageId) && typeof m.dupeCount === "number") {
@@ -3155,18 +3168,18 @@ function updateSortIndicators() {
   });
 }
 function removeMessagesAndReconcile(uids) {
-  const focusedIdent = focusedRow ? { accountId: focusedRow.accountId, uid: focusedRow.msg.uid } : null;
+  const focusedIdent = focusedRow ? { accountId: focusedRow.accountId, uid: focusedRow.msg.uid, folderId: focusedRow.msg.folderId } : null;
   const outcome = removeMessages(uids, focusedIdent);
   listCache.clear();
   const body = document.getElementById("ml-body");
   if (body) {
-    const stateUids = new Set(getMessages2().map((m) => `${m.accountId}:${m.uid}`));
+    const stateUids = new Set(getMessages2().map((m) => `${m.accountId}:${m.folderId}:${m.uid}`));
     for (const row of Array.from(body.querySelectorAll(".ml-row"))) {
       const el = row;
-      const key = `${el.dataset.accountId}:${el.dataset.uid}`;
+      const key = `${el.dataset.accountId}:${el.dataset.folderId}:${el.dataset.uid}`;
       if (!stateUids.has(key)) {
-        const dead = rowByKey.get(key);
-        if (dead)
+        const dead = rowByKey.get(rowKey(el.dataset.accountId || "", Number(el.dataset.uid)));
+        if (dead && dead.el === el)
           dead.detach();
         else
           el.remove();
@@ -8106,6 +8119,128 @@ async function performUndo() {
 document.addEventListener("mailx-moved", (e) => {
   pushUndo({ kind: "move", at: Date.now(), payload: e.detail });
 });
+(() => {
+  const SLOP = 6;
+  let cand = null;
+  let active = false;
+  let ghost = null;
+  let suppressContext = false;
+  const style = document.createElement("style");
+  style.textContent = "body.rmf-rdrag, body.rmf-rdrag * { cursor: grabbing !important; }.rmf-rdrag-ghost { position: fixed; z-index: 100000; pointer-events: none; background: var(--color-accent, #1a6dd4); color: #fff; padding: 2px 9px; border-radius: 4px; font: 12px system-ui; box-shadow: 0 2px 8px rgba(0,0,0,.3); }.ft-folder.rmf-rdrag-over { outline: 2px solid var(--color-accent, #1a6dd4); outline-offset: -2px; border-radius: 4px; }";
+  document.head.appendChild(style);
+  const folderAt = (x, y) => document.elementFromPoint(x, y)?.closest?.(".ft-folder") || null;
+  const clearOver = () => document.querySelectorAll(".ft-folder.rmf-rdrag-over").forEach((el) => el.classList.remove("rmf-rdrag-over"));
+  const cleanup = () => {
+    active = false;
+    cand = null;
+    document.body.classList.remove("rmf-rdrag");
+    ghost?.remove();
+    ghost = null;
+    clearOver();
+  };
+  document.addEventListener("mousedown", (e) => {
+    if (e.button !== 2) return;
+    const row = e.target?.closest?.(".ml-row");
+    if (!row) return;
+    const pressed = {
+      accountId: row.dataset.accountId || "",
+      uid: Number(row.dataset.uid),
+      folderId: Number(row.dataset.folderId)
+    };
+    if (!pressed.uid) return;
+    let msgs = getSelectedMessages();
+    if (!msgs.some((m) => m.accountId === pressed.accountId && m.uid === pressed.uid)) msgs = [pressed];
+    cand = { msgs, x: e.clientX, y: e.clientY };
+    active = false;
+  }, true);
+  document.addEventListener("mousemove", (e) => {
+    if (!cand) return;
+    if (!active) {
+      if (Math.abs(e.clientX - cand.x) < SLOP && Math.abs(e.clientY - cand.y) < SLOP) return;
+      active = true;
+      document.body.classList.add("rmf-rdrag");
+      ghost = document.createElement("div");
+      ghost.className = "rmf-rdrag-ghost";
+      ghost.textContent = cand.msgs.length === 1 ? "1 message" : `${cand.msgs.length} messages`;
+      document.body.appendChild(ghost);
+    }
+    if (ghost) {
+      ghost.style.left = `${e.clientX + 14}px`;
+      ghost.style.top = `${e.clientY + 8}px`;
+    }
+    clearOver();
+    folderAt(e.clientX, e.clientY)?.classList.add("rmf-rdrag-over");
+  }, true);
+  document.addEventListener("mouseup", (e) => {
+    if (!cand) return;
+    const wasActive = active;
+    const msgs = cand.msgs;
+    const folder = wasActive ? folderAt(e.clientX, e.clientY) : null;
+    const mx = e.clientX, my = e.clientY;
+    cleanup();
+    if (!wasActive) return;
+    suppressContext = true;
+    if (!folder) return;
+    e.preventDefault();
+    e.stopPropagation();
+    const targetAccount = folder.dataset.accountId || "";
+    const targetFolderId = Number(folder.dataset.folderId);
+    const targetName = folder.querySelector(".ft-folder-name")?.textContent?.trim() || "folder";
+    void showRightDragMenu(mx, my, msgs, targetAccount, targetFolderId, targetName);
+  }, true);
+  document.addEventListener("contextmenu", (e) => {
+    if (suppressContext) {
+      e.preventDefault();
+      e.stopPropagation();
+      suppressContext = false;
+    }
+  }, true);
+  async function showRightDragMenu(x, y, msgs, targetAccount, targetFolderId, targetName) {
+    const { showContextMenu: showContextMenu2 } = await Promise.resolve().then(() => (init_context_menu(), context_menu_exports));
+    const n = msgs.length;
+    const label = n === 1 ? "message" : `${n} messages`;
+    showContextMenu2(x, y, [
+      { label: `Move ${label} here`, emphasized: true, action: () => void runRightDragOp(msgs, targetAccount, targetFolderId, targetName, "move") },
+      { label: `Copy ${label} here`, action: () => void runRightDragOp(msgs, targetAccount, targetFolderId, targetName, "copy") }
+    ]);
+  }
+  async function runRightDragOp(msgs, targetAccount, targetFolderId, targetName, op) {
+    const status = document.getElementById("status-sync");
+    const api = await Promise.resolve().then(() => (init_api_client(), api_client_exports));
+    const byAccount = /* @__PURE__ */ new Map();
+    for (const m of msgs) {
+      const g = byAccount.get(m.accountId) || { uids: [], folderIds: [] };
+      g.uids.push(m.uid);
+      g.folderIds.push(m.folderId);
+      byAccount.set(m.accountId, g);
+    }
+    if (op === "move") {
+      removeMessagesAndReconcile(msgs);
+      document.dispatchEvent(new CustomEvent("mailx-moved", {
+        detail: { messages: msgs.map((m) => ({ accountId: m.accountId, uid: m.uid, sourceFolderId: m.folderId })) }
+      }));
+      for (const [src, g] of byAccount) {
+        const targetAcct = src === targetAccount ? void 0 : targetAccount;
+        api.moveMessages(src, g.uids, targetFolderId, targetAcct)?.catch?.((err) => {
+          if (status) status.textContent = `Move failed: ${err?.message || err}`;
+        });
+      }
+      if (status) status.textContent = `Moved ${msgs.length} to ${targetName} \u2014 Ctrl+Z to undo`;
+    } else {
+      let skippedXacct = false;
+      for (const [src, g] of byAccount) {
+        if (src !== targetAccount) {
+          skippedXacct = true;
+          continue;
+        }
+        api.copyMessages(src, g.uids, g.folderIds, targetFolderId)?.catch?.((err) => {
+          if (status) status.textContent = `Copy failed: ${err?.message || err}`;
+        });
+      }
+      if (status) status.textContent = skippedXacct ? `Copy across accounts isn't supported yet` : `Copying ${msgs.length} to ${targetName}\u2026`;
+    }
+  }
+})();
 document.getElementById("btn-delete")?.addEventListener("click", deleteSelection);
 document.getElementById("btn-tb-delete")?.addEventListener("click", deleteSelection);
 document.getElementById("btn-tb-spam")?.addEventListener("click", spamSelectedMessages);