@bobfrankston/rmfmail 1.1.160 → 1.1.162

package/client/app.bundle.js

@@ -1474,7 +1474,8 @@ async function showMessage(accountId, uid, folderId, specialUse, isRetry = false
         references: cm.references || [],
         accounts: [],
         draftUid: cm.uid,
-        draftFolderId: cm.folderId
+        draftFolderId: cm.folderId,
+        draftId: cm.mailxDraftId || ""
       };
       sessionStorage.setItem("composeInit", JSON.stringify(init));
       document.dispatchEvent(new CustomEvent("mailx-compose", { detail: { mode: "draft" } }));
@@ -3429,9 +3430,10 @@ var init_message_list = __esm({
           subject.prepend(threadPill);
         }
         if (msg.preview) {
+          const cleaned = msg.preview.replace(/data:image\/[a-z0-9.+-]+;base64,[A-Za-z0-9+/=\s]+/gi, "[image]").replace(/[A-Za-z0-9+/=]{200,}/g, "[image]");
           const preview = document.createElement("span");
           preview.className = "ml-preview";
-          preview.textContent = ` \u2014 ${msg.preview}`;
+          preview.textContent = ` \u2014 ${cleaned}`;
           subject.appendChild(preview);
         }
         const date = document.createElement("span");
@@ -9178,6 +9180,7 @@ viewBtn?.addEventListener("click", (e) => {
   if (restartDd) restartDd.hidden = true;
   restoreToolbarDropdown("view-dropdown", "view-menu");
   if (viewDropdown) viewDropdown.hidden = !viewDropdown.hidden;
+  refreshToolbarOverlayShield();
 });
 document.addEventListener("pointerdown", (e) => {
   const target = e.target;
@@ -9189,7 +9192,35 @@ document.addEventListener("pointerdown", (e) => {
   if (settingsDropdown && !settingsDropdown.hidden && !target.closest("#settings-menu") && !target.closest("#settings-dropdown")) {
     settingsDropdown.hidden = true;
   }
+  refreshToolbarOverlayShield();
 }, true);
+function refreshToolbarOverlayShield() {
+  const dropdownOpen = ["settings-dropdown", "view-dropdown", "restart-dropdown"].some((id) => {
+    const el = document.getElementById(id);
+    return el && !el.hidden;
+  });
+  const hasOverlay = !!document.querySelector(".compose-overlay, .popout-overlay");
+  let shield = document.getElementById("tb-overlay-shield");
+  if (dropdownOpen && hasOverlay) {
+    if (!shield) {
+      shield = document.createElement("div");
+      shield.id = "tb-overlay-shield";
+      shield.style.cssText = "position:fixed;inset:0;z-index:1999;background:transparent;";
+      shield.addEventListener("pointerdown", (ev) => {
+        ev.preventDefault();
+        ev.stopPropagation();
+        for (const id of ["settings-dropdown", "view-dropdown", "restart-dropdown"]) {
+          const dd = document.getElementById(id);
+          if (dd) dd.hidden = true;
+        }
+        shield?.remove();
+      });
+      document.body.appendChild(shield);
+    }
+  } else if (shield) {
+    shield.remove();
+  }
+}
 document.addEventListener("keydown", (e) => {
   if (e.key !== "Escape") return;
   let closed = false;
@@ -9210,7 +9241,10 @@ document.addEventListener("keydown", (e) => {
     themeSub.hidden = true;
     closed = true;
   }
-  if (closed) e.preventDefault();
+  if (closed) {
+    e.preventDefault();
+    refreshToolbarOverlayShield();
+  }
 });
 var savedTwoLine = localStorage.getItem("mailx-two-line") === "true";
 var savedPreview = localStorage.getItem("mailx-preview") !== "false";
@@ -10082,6 +10116,7 @@ settingsBtn?.addEventListener("click", (e) => {
   if (restartDd) restartDd.hidden = true;
   restoreToolbarDropdown("settings-dropdown", "settings-menu");
   if (settingsDropdown) settingsDropdown.hidden = !settingsDropdown.hidden;
+  refreshToolbarOverlayShield();
 });
 getSettings().then((s) => {
   const ed = s.ui?.editor || "quill";
@@ -10410,7 +10445,8 @@ document.addEventListener("mailx-popout-message", (async (e) => {
       references: msg.references || [],
       accounts: accts.map((a) => ({ id: a.id, name: a.name, email: a.email, signature: a.signature, sig: a.sig })),
       draftUid: msg.uid,
-      draftFolderId: msg.folderId
+      draftFolderId: msg.folderId,
+      draftId: msg.mailxDraftId || ""
     };
     sessionStorage.setItem("composeInit", JSON.stringify(init));
     showComposeOverlay(msg.subject ? `Edit: ${msg.subject}` : "Edit draft");