@bobfrankston/rmfmail 1.2.126 → 1.2.128

package/client/app.js

@@ -1040,7 +1040,15 @@ async function openCompose(mode, overrideMsg, overrideAccountId) {
                 mode === "editAsNew" ? "Edit as new" :
                     "Compose";
     const titleSubject = mode === "new" ? "" : (msg?.subject || "");
-    const frame = showComposeOverlay(titleSubject ? `${titlePrefix}: ${titleSubject}` : titlePrefix);
+    const composeTitle = titleSubject ? `${titlePrefix}: ${titleSubject}` : titlePrefix;
+    // Default: compose/reply/forward open in their OWN OS window — an
+    // overlay covering the message list/preview is the thing Bob wants gone
+    // (2026-07-12 "the default on a reply should just be a separate window
+    // outside the frame"). Overlay remains: small screens, Android (no
+    // popout host), Settings toggle off, or daemon spawn failure.
+    const preferWindow = window.innerWidth > 768 && window.innerHeight > 600
+        && localStorage.getItem("mailx-compose-in-window") !== "0";
+    let frame = preferWindow ? null : showComposeOverlay(composeTitle);
     // Now finish initialisation off the critical path — editor bootstrap
     // inside the iframe runs concurrently with this await.
     const accounts = await accountsP;
@@ -1253,6 +1261,19 @@ async function openCompose(mode, overrideMsg, overrideAccountId) {
     // payload so the iframe can populate even when storage doesn't bridge.
     // sessionStorage remains as the fast-path for iframes that finish
     // loading before postMessage fires.
+    if (preferWindow && !frame) {
+        try {
+            const { popoutCompose } = await import("./lib/api-client.js");
+            const r = await popoutCompose(init);
+            if (r?.ok)
+                return;
+            console.error("[compose] separate-window open failed — overlay fallback:", r?.reason);
+        }
+        catch (e) {
+            console.error("[compose] separate-window open threw — overlay fallback:", e?.message || e);
+        }
+        frame = showComposeOverlay(composeTitle);
+    }
     const initJson = JSON.stringify(init);
     try {
         sessionStorage.setItem("composeInit", initJson);
@@ -5627,12 +5648,32 @@ getSettings().then((s) => {
         optEditorTiptap.checked = ed === "tiptap";
     if (optEditorTinymce)
         optEditorTinymce.checked = ed === "tinymce";
+    const cwEl = document.getElementById("opt-compose-window");
+    if (cwEl) {
+        const inWindow = s.ui?.composeInWindow !== false;
+        cwEl.checked = inWindow;
+        try {
+            localStorage.setItem("mailx-compose-in-window", inWindow ? "1" : "0");
+        }
+        catch { /* */ }
+    }
     const fontEl = document.getElementById("opt-compose-font-size");
     if (fontEl) {
         const px = Number(s.ui?.composeFontSize);
         fontEl.value = String(Number.isFinite(px) && px >= 8 && px <= 32 ? px : 15);
     }
 }).catch(() => { });
+document.getElementById("opt-compose-window")?.addEventListener("change", (e) => {
+    const on = e.target.checked;
+    try {
+        localStorage.setItem("mailx-compose-in-window", on ? "1" : "0");
+    }
+    catch { /* */ }
+    getSettings().then((settings) => {
+        settings.ui = { ...settings.ui, composeInWindow: on };
+        saveSettings(settings);
+    }).catch(() => { });
+});
 // Unified compose editing font size (px). Same sync-cache-then-persist shape
 // as saveEditorSetting: compose.ts reads `mailx-compose-font-size` from
 // localStorage at module load, so the very next compose-open is correct.