@bobfrankston/rmfmail 1.2.126 → 1.2.128

package/client/app.bundle.js

@@ -46,6 +46,7 @@ __export(api_client_exports, {
   deleteTask: () => deleteTask,
   drainStoreSync: () => drainStoreSync,
   emptyFolder: () => emptyFolder,
+  fetchImageAsDataUri: () => fetchImageAsDataUri,
   flagSenderOrDomain: () => flagSenderOrDomain,
   formatJsonc: () => formatJsonc,
   getAccounts: () => getAccounts,
@@ -648,6 +649,10 @@ function closeComposePopout(id) {
   const fn = ipc().closeComposePopout;
   return fn ? fn(id) : Promise.resolve({ ok: false });
 }
+function fetchImageAsDataUri(url) {
+  const fn = ipc().fetchImageAsDataUri;
+  return fn ? fn(url) : Promise.resolve({ error: "no bridge" });
+}
 async function popoutMainWindow(accountId, folderId, name) {
   const fn = ipc().popoutMainWindow;
   if (!fn)
@@ -8380,7 +8385,9 @@ async function openCompose(mode, overrideMsg, overrideAccountId) {
   const msg = current?.message;
   const titlePrefix = mode === "reply" ? "Reply" : mode === "replyAll" ? "Reply All" : mode === "forward" ? "Forward" : 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;
+  const preferWindow = window.innerWidth > 768 && window.innerHeight > 600 && localStorage.getItem("mailx-compose-in-window") !== "0";
+  let frame = preferWindow ? null : showComposeOverlay(composeTitle);
   const accounts = await accountsP;
   const accountId = mode === "new" ? currentAccountId3 || current?.accountId || accounts[0]?.id || "" : current?.accountId || currentAccountId3 || accounts[0]?.id || "";
   const rePrefix = /^(re|fwd?):\s*/i;
@@ -8514,6 +8521,17 @@ async function openCompose(mode, overrideMsg, overrideAccountId) {
     }
     if (loaded.length) init.attachments = loaded;
   }
+  if (preferWindow && !frame) {
+    try {
+      const { popoutCompose: popoutCompose2 } = await Promise.resolve().then(() => (init_api_client(), api_client_exports));
+      const r = await popoutCompose2(init);
+      if (r?.ok) return;
+      console.error("[compose] separate-window open failed \u2014 overlay fallback:", r?.reason);
+    } catch (e) {
+      console.error("[compose] separate-window open threw \u2014 overlay fallback:", e?.message || e);
+    }
+    frame = showComposeOverlay(composeTitle);
+  }
   const initJson = JSON.stringify(init);
   try {
     sessionStorage.setItem("composeInit", initJson);
@@ -11695,6 +11713,15 @@ getSettings().then((s) => {
   if (optEditorQuill) optEditorQuill.checked = ed === "quill";
   if (optEditorTiptap) 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);
@@ -11702,6 +11729,18 @@ getSettings().then((s) => {
   }
 }).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(() => {
+  });
+});
 document.getElementById("opt-compose-font-size")?.addEventListener("change", (e) => {
   const el = e.target;
   const px = Number(el.value);