@bobfrankston/rmfmail 1.2.242 → 1.2.244

package/client/app.js

@@ -6,7 +6,7 @@ import { initFolderTree, refreshFolderTree, updateFolderCounts, setFolderSynced,
 import { initMessageList, loadMessages, loadUnifiedInbox, loadSearchResults, reloadCurrentFolder, clearSearchMode, getSelectedMessages, markBodiesCached, getCurrentFocused, releaseFocus, removeMessagesAndReconcile, setRowFlagged, scrollFocusedIntoView, refreshPriorityIndex, revealMessage, getCurrentView, selectAllVisible, exitMultiSelect, getDateBasis, setDateBasis } from "./components/message-list.js";
 import { seenOf, flaggedOf, draftOf, setSeen, setFlagged } from "@bobfrankston/mailx-types";
 import { initTabs, setActiveView as setActiveTabView, openTab } from "./components/tabs.js";
-import { getCurrentMessage, initViewer, popOutCurrentMessage, popOutToWindow, printCurrentMessage, toggleFullscreenPreview, showPreviewBodyMenu, wrapHtmlBody } from "./components/message-viewer.js";
+import { getCurrentMessage, initViewer, popOutCurrentMessage, popOutToWindow, printCurrentMessage, toggleFullscreenPreview, showPreviewBodyMenu } from "./components/message-viewer.js";
 import { connectWebSocket, onWsEvent, triggerSync, syncAccount, reauthenticate, getAccounts, getFolders, deleteMessage, deleteMessages, undeleteMessage, restartServer, getSyncPending, getVersion, getSettings, saveSettings, getAutocompleteSettings, saveAutocompleteSettings, repairAccounts, updateFlags, markAsSpamMessages, logClientEvent, sendMessage as apiSendMessage, subscribeStore, cancelServerSearch, installConsoleCapture, getAttachment } from "./lib/api-client.js";
 import * as messageState from "./lib/message-state.js";
 import { editMenuItems } from "./components/edit-menu.js";
@@ -2602,7 +2602,12 @@ document.addEventListener("mailx-compose", ((e) => {
         showComposeOverlay();
     }
     else {
-        openCompose(e.detail.mode);
+        // `message`/`accountId` let a DETACHED surface compose for ITS own
+        // message rather than whatever the main list has selected — openCompose
+        // has taken those since the pop-out was written, but this listener
+        // dropped them, so a pop-out could never have had working Reply
+        // buttons even once it grew some.
+        openCompose(e.detail.mode, e.detail.message, e.detail.accountId);
     }
 }));
 document.addEventListener("mailx-delete", () => deleteSelection());
@@ -6506,61 +6511,21 @@ document.addEventListener("mailx-popout-message", (async (e) => {
         showComposeOverlay(msg.subject ? `Edit: ${msg.subject}` : "Edit draft");
         return;
     }
-    const wrapper = document.createElement("div");
-    wrapper.className = "popout-overlay";
-    wrapper.style.cssText = "position:fixed;top:5vh;right:5vw;width:min(900px,60vw);height:min(800px,80vh);z-index:1500;background:var(--color-bg);border:1px solid var(--color-border);border-radius:6px;box-shadow:0 8px 32px rgba(0,0,0,0.3);display:flex;flex-direction:column;resize:both;overflow:hidden;";
-    const header = document.createElement("div");
-    header.style.cssText = "display:flex;align-items:center;gap:8px;padding:8px 12px;background:var(--color-bg-surface);border-bottom:1px solid var(--color-border);font-weight:600;cursor:move;";
-    const title = document.createElement("span");
-    title.textContent = subject || "(no subject)";
-    title.style.cssText = "flex:1;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;";
-    const closeBtn = document.createElement("button");
-    closeBtn.textContent = "×";
-    closeBtn.style.cssText = "background:none;border:none;font-size:1.4rem;cursor:pointer;padding:0 8px;";
-    closeBtn.addEventListener("click", () => wrapper.remove());
-    header.appendChild(title);
-    header.appendChild(closeBtn);
-    const meta = document.createElement("div");
-    meta.style.cssText = "padding:8px 12px;border-bottom:1px solid var(--color-border);font-size:0.9rem;color:var(--color-text-muted);";
-    meta.innerHTML = `<div><b>From:</b> ${escapeHtmlBasic(msg.from?.name || "")} &lt;${escapeHtmlBasic(msg.from?.address || "")}&gt;</div>
-                      <div><b>To:</b> ${(msg.to || []).map((a) => escapeHtmlBasic(`${a.name || ""} <${a.address}>`)).join(", ")}</div>
-                      ${msg.cc?.length ? `<div><b>Cc:</b> ${msg.cc.map((a) => escapeHtmlBasic(`${a.name || ""} <${a.address}>`)).join(", ")}</div>` : ""}
-                      <div><b>Date:</b> ${new Date(msg.date).toLocaleString()}</div>`;
-    const body = document.createElement("iframe");
-    body.style.cssText = "flex:1;border:none;width:100%;background:#fff;";
-    body.sandbox.add("allow-same-origin");
-    wrapper.appendChild(header);
-    wrapper.appendChild(meta);
-    wrapper.appendChild(body);
-    document.body.appendChild(wrapper);
-    // Use the same wrapHtmlBody styling as the inline preview pane so the
-    // popout's typography matches the preview's typography. Earlier the
-    // popout fed bodyHtml DIRECTLY into srcdoc with no CSS wrapping, so
-    // the browser used its default font (Times serif) while the preview
-    // pane used system-ui sans-serif (Bob 2026-05-12: "double clicking on
-    // the summary shows in a different font than in preview").
-    body.srcdoc = msg.bodyHtml
-        ? wrapHtmlBody(msg.bodyHtml, !!msg.remoteAllowed)
-        : `<!DOCTYPE html><html><head><style>body{font-family:system-ui,sans-serif;font-size:17.5px;line-height:1.5;color:#1a1a2e;padding:1rem;margin:0;}pre{white-space:pre-wrap;word-break:break-word;font-family:inherit;font-size:inherit;margin:0;}</style></head><body><pre>${escapeHtmlBasic(msg.bodyText || "(no body)")}</pre></body></html>`;
-    // Drag-to-move.
-    let dragX = 0, dragY = 0, dragging = false;
-    header.addEventListener("mousedown", (de) => {
-        if (de.target.tagName === "BUTTON")
-            return;
-        dragging = true;
-        const rect = wrapper.getBoundingClientRect();
-        dragX = de.clientX - rect.left;
-        dragY = de.clientY - rect.top;
-        de.preventDefault();
-    });
-    document.addEventListener("mousemove", (de) => {
-        if (!dragging)
-            return;
-        wrapper.style.left = `${de.clientX - dragX}px`;
-        wrapper.style.top = `${de.clientY - dragY}px`;
-        wrapper.style.right = "auto";
-    });
-    document.addEventListener("mouseup", () => { dragging = false; });
+    // ONE read-only popout, not three. This handler used to build its own
+    // `.popout-overlay` — header, meta block, body iframe — with NO action
+    // buttons at all, which is what a double-click on a message opened:
+    // "I wanted to pop this out for editing but I don't see any controls.
+    // It's just a view without even the reply etc." (Bob 2026-08-09). The
+    // other two popout surfaces (the ⧉ overlay in message-viewer.ts and the
+    // native msger window in popout-server.ts) have had a Reply/Reply-All/
+    // Forward/Edit-as-new/Flag/Delete toolbar since 2026-05-16; this copy
+    // never got one, and the handler's own comment noted it was "missing
+    // every action button" while working around it for drafts only.
+    //
+    // Deleting the copy is the fix: double-click now opens the SAME overlay
+    // the toolbar button does, so there is one surface to keep working.
+    const { spawnDesktopPopout } = await import("./components/message-viewer.js");
+    spawnDesktopPopout(msg, accountId);
 }));
 function escapeHtmlBasic(s) {
     return (s || "").replace(/[&<>"']/g, c => ({ "&": "&amp;", "<": "&lt;", ">": "&gt;", "\"": "&quot;", "'": "&#39;" }[c]));