@bobfrankston/rmfmail 1.1.3 → 1.1.5

package/client/app.bundle.js

@@ -591,6 +591,10 @@ var init_context_menu = __esm({
     document.addEventListener("scroll", closeContextMenu, true);
     document.addEventListener("contextmenu", () => {
     });
+    window.addEventListener("message", (e) => {
+      if (e.data && e.data.type === "iframePointerDown")
+        closeContextMenu();
+    });
   }
 });
 
@@ -1139,8 +1143,8 @@ async function showMessage(accountId, uid, folderId, specialUse, isRetry = false
       const previewText = (msg.preview || cached?.preview || "").trim();
       bodyEl.innerHTML = previewText ? `<div class="mv-preview-placeholder">${escapeHtml(previewText)}</div>` : `<div class="mv-empty">Fetching body from server\u2026</div>`;
       const captureGen = gen;
-      const off = onEvent((ev) => {
-        if (!ev || ev.type !== "bodyAvailable")
+      const off = subscribeStore("*", (ev) => {
+        if (ev.kind !== "bodyAvailable")
           return;
         if (ev.accountId !== accountId || ev.uid !== uid)
           return;
@@ -1984,6 +1988,18 @@ ${csp}
             iframeLeft: rect.left, iframeTop: rect.top
         }, "*");
     });
+    // Iframe pointerdown \u2192 tell the parent to dismiss any open context menu.
+    // The parent's dismissListener listens to its own document's pointerdown,
+    // but iframe events don't bubble across the boundary; without this, a
+    // click in the message body to dismiss the menu would be invisible to
+    // the parent and the menu would stick open.
+    document.addEventListener("pointerdown", function (e) {
+        // The contextmenu handler above ALSO fires pointerdown on right-click;
+        // that one opens a fresh menu, which already closes the previous.
+        // Skip right-click (button 2) to avoid a publish/close race.
+        if (e.button === 2) return;
+        try { window.parent.postMessage({ type: "iframePointerDown" }, "*"); } catch (_) {}
+    }, true);
     // Key forwarding \u2014 Delete, Ctrl+D, arrow keys, etc. need to reach app.ts
     // even when focus is inside the sandboxed iframe. Parent-side
     // contentDocument listeners (see installPreviewControls) work on
@@ -2152,8 +2168,8 @@ var init_message_viewer = __esm({
     ZOOM_MAX = 3;
     ZOOM_STEP = 0.1;
     previewZoom = clampZoom(parseFloat(localStorage.getItem(ZOOM_KEY) || "1"));
-    onEvent((ev) => {
-      if (!ev || ev.type !== "bodyFetchError")
+    subscribeStore("*", (ev) => {
+      if (ev.kind !== "bodyFetchError")
         return;
       recentFetchErrors.set(`${ev.accountId}:${ev.uid}`, {
         error: String(ev.error || "fetch failed"),
@@ -7796,18 +7812,7 @@ onWsEvent((event) => {
     case "bodyCached":
       markBodiesCached(event.items || []);
       break;
-    case "bodyAvailable":
-      if (event.accountId && event.uid) {
-        markBodiesCached([{ accountId: event.accountId, uid: event.uid }]);
-      }
-      break;
-    case "messageRemoved":
-      if (event.accountId && event.uid) {
-        document.dispatchEvent(new CustomEvent("mailx-remove-stale", {
-          detail: { accountId: event.accountId, uid: event.uid }
-        }));
-      }
-      break;
+    // bodyAvailable and messageRemoved migrated to subscribeStore below.
     case "syncStateChanged": {
       if (!statusSync) break;
       const msgs = event.messageActions ?? 0;
@@ -7976,6 +7981,15 @@ onWsEvent((event) => {
     }
   }
 });
+subscribeStore("*", (ev) => {
+  if (ev.kind === "bodyAvailable" && ev.accountId && ev.uid) {
+    markBodiesCached([{ accountId: ev.accountId, uid: ev.uid }]);
+  } else if (ev.kind === "messageRemoved" && ev.accountId && ev.uid) {
+    document.dispatchEvent(new CustomEvent("mailx-remove-stale", {
+      detail: { accountId: ev.accountId, uid: ev.uid }
+    }));
+  }
+});
 async function openComposeFromMailto(m) {
   const accountsP = getAccounts();
   const frame = showComposeOverlay(m.subject ? `Compose: ${m.subject}` : "Compose");