@bobfrankston/rmfmail 1.2.82 → 1.2.84

package/client/app.bundle.js

@@ -2413,6 +2413,42 @@ function popOutCurrentMessage() {
   }
   spawnDesktopPopout(currentMessage, currentAccountId);
 }
+function popOutToWindow() {
+  if (!currentMessage)
+    return;
+  const p = window.__rmfPopout;
+  if (!p?.base || !p?.token) {
+    console.log("[popout-window] no server info (__rmfPopout missing) \u2192 overlay fallback");
+    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)}`;
+  console.log(`[popout-window] opening ${url}`);
+  let w = null;
+  try {
+    w = window.open(url, `rmfmsg-${a}-${u}`, "width=820,height=900,resizable=yes,scrollbars=yes");
+  } catch (e) {
+    console.log(`[popout-window] window.open THREW: ${e?.message || e} \u2192 overlay fallback`);
+    popOutCurrentMessage();
+    return;
+  }
+  if (!w) {
+    console.log("[popout-window] window.open returned NULL (host blocked it) \u2192 overlay fallback");
+    popOutCurrentMessage();
+    return;
+  }
+  console.log("[popout-window] window.open returned a window object; verifying it stays open\u2026");
+  setTimeout(() => {
+    try {
+      console.log(`[popout-window] +600ms: window.closed=${w.closed}`);
+    } catch (e) {
+      console.log(`[popout-window] +600ms: cannot read .closed (${e?.message || e})`);
+    }
+  }, 600);
+}
 function printCurrentMessage() {
   if (!currentMessage)
     return;
@@ -7888,6 +7924,7 @@ 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")) {
@@ -8143,6 +8180,9 @@ async function openCompose(mode, overrideMsg, overrideAccountId) {
     init.cc = Array.isArray(msg.cc) ? msg.cc : [];
     init.subject = msg.subject || "";
     init.bodyHtml = editAsNewBody(msg);
+    const origFrom = msg.from?.address ? bareAddress(msg.from.address) : "";
+    const ownFrom = origFrom && accounts.some((acc) => bareAddress(acc.email || "") === origFrom) ? origFrom : void 0;
+    init.fromAddress = ownFrom || detectReplyFrom();
   }
   if (msg && (mode === "editAsNew" || mode === "forward") && Array.isArray(msg.attachments) && msg.attachments.length) {
     const msgAccountId = current?.accountId || accountId;