@bobfrankston/rmfmail 1.2.81 → 1.2.82

package/client/app.bundle.js

@@ -2413,22 +2413,6 @@ function popOutCurrentMessage() {
   }
   spawnDesktopPopout(currentMessage, currentAccountId);
 }
-function popOutToWindow() {
-  if (!currentMessage)
-    return;
-  const p = window.__rmfPopout;
-  if (!p?.base || !p?.token) {
-    popOutCurrentMessage();
-    return;
-  }
-  const a = currentAccountId;
-  const u = currentMessage.uid;
-  const f = currentMessage.folderId;
-  const url = `${p.base}/v?a=${encodeURIComponent(a)}&u=${u}&f=${f ?? ""}&t=${encodeURIComponent(p.token)}`;
-  const w = window.open(url, `rmfmsg-${a}-${u}`, "width=820,height=900,resizable=yes,scrollbars=yes");
-  if (!w)
-    popOutCurrentMessage();
-}
 function printCurrentMessage() {
   if (!currentMessage)
     return;
@@ -2551,22 +2535,26 @@ function spawnDesktopPopout(msg, accountId) {
     wrapper.style.right = `${20 + existing * 28}px`;
   }
   const toolbar = document.createElement("div");
-  toolbar.style.cssText = "display:flex;gap:6px;padding:6px 12px;border-bottom:1px solid var(--color-border, #ddd);flex-shrink:0;";
-  const mkPopoutBtn = (label, title, onClick) => {
+  toolbar.className = "mv-toolbar";
+  toolbar.style.cssText = "display:flex;gap:4px;padding:6px 12px;border-bottom:1px solid var(--color-border, #ddd);flex-shrink:0;";
+  const mkPopoutBtn = (glyph, title, onClick) => {
     const b = document.createElement("button");
-    b.textContent = label;
+    b.className = "tb-btn";
+    b.textContent = glyph;
     b.title = title;
-    b.style.cssText = "padding:4px 10px;font-size:13px;cursor:pointer;border:1px solid var(--color-border, #ccc);border-radius:4px;background:var(--color-bg, #fff);color:var(--color-text, #000);";
+    b.style.cssText = "padding:4px 9px;font-size:15px;cursor:pointer;border:1px solid var(--color-border, #ccc);border-radius:4px;background:var(--color-bg, #fff);color:var(--color-text, #000);";
     b.addEventListener("click", onClick);
     return b;
   };
   const firePopoutAction = (action) => {
     document.dispatchEvent(new CustomEvent("mailx-popout-action", { detail: { action, msg, accountId } }));
   };
-  toolbar.appendChild(mkPopoutBtn("Reply", "Reply", () => firePopoutAction("reply")));
-  toolbar.appendChild(mkPopoutBtn("Reply All", "Reply to all", () => firePopoutAction("replyAll")));
-  toolbar.appendChild(mkPopoutBtn("Forward", "Forward", () => firePopoutAction("forward")));
-  toolbar.appendChild(mkPopoutBtn("Delete", "Delete this message", () => {
+  toolbar.appendChild(mkPopoutBtn("\u21A9", "Reply (Ctrl+R)", () => firePopoutAction("reply")));
+  toolbar.appendChild(mkPopoutBtn("\u21A9\u21A9", "Reply All (Ctrl+Shift+R)", () => firePopoutAction("replyAll")));
+  toolbar.appendChild(mkPopoutBtn("\u2192", "Forward", () => firePopoutAction("forward")));
+  toolbar.appendChild(mkPopoutBtn("\u29C9", "Edit as new message", () => firePopoutAction("editAsNew")));
+  toolbar.appendChild(mkPopoutBtn("\u2605", "Flag", () => firePopoutAction("flag")));
+  toolbar.appendChild(mkPopoutBtn("\u{1F5D1}", "Delete", () => {
     firePopoutAction("delete");
     wrapper.remove();
   }));
@@ -7900,7 +7888,6 @@ var backToList = (e) => {
 document.getElementById("btn-back")?.addEventListener("click", backToList);
 document.getElementById("btn-back")?.addEventListener("touchend", backToList);
 document.getElementById("mv-popout")?.addEventListener("click", () => popOutCurrentMessage());
-document.getElementById("mv-popout-window")?.addEventListener("click", () => popOutToWindow());
 document.getElementById("btn-print")?.addEventListener("click", () => printCurrentMessage());
 document.getElementById("folder-tree")?.addEventListener("click", (e) => {
   if (window.innerWidth <= 768 && e.target.closest(".ft-folder")) {
@@ -11572,10 +11559,15 @@ ${detail}`;
 document.addEventListener("mailx-popout-action", ((e) => {
   const { action, msg, accountId } = e.detail || {};
   if (!msg) return;
-  if (action === "reply" || action === "replyAll" || action === "forward") {
+  if (action === "reply" || action === "replyAll" || action === "forward" || action === "editAsNew") {
     openCompose(action, msg, accountId);
   } else if (action === "delete") {
     deleteMessage(accountId, msg.uid).catch((err) => console.error(`[popout] delete failed: ${err?.message || err}`));
+  } else if (action === "flag") {
+    const wasFlagged = flaggedOf(msg);
+    setFlagged(msg, !wasFlagged);
+    updateFlags(accountId, msg.uid, msg.flags, msg.folderId).catch((err) => console.error(`[popout] flag failed: ${err?.message || err}`));
+    setRowFlagged(accountId, msg.uid, !wasFlagged);
   }
 }));
 document.addEventListener("mailx-popout-message", (async (e) => {