@bobfrankston/rmfmail 1.1.2 → 1.1.4

package/client/app.bundle.js

@@ -91,6 +91,7 @@ __export(api_client_exports, {
   setPrioritySender: () => setPrioritySender,
   setupAccount: () => setupAccount,
   showReminderPopup: () => showReminderPopup,
+  subscribeStore: () => subscribeStore,
   syncAccount: () => syncAccount,
   triggerSync: () => triggerSync,
   undeleteMessage: () => undeleteMessage,
@@ -384,8 +385,46 @@ function onEvent(handler) {
       eventHandlers.splice(i, 1);
   };
 }
+function subscribeStore(topic, handler) {
+  let set = storeSubs.get(topic);
+  if (!set) {
+    set = /* @__PURE__ */ new Set();
+    storeSubs.set(topic, set);
+  }
+  set.add(handler);
+  return () => {
+    const s = storeSubs.get(topic);
+    if (s) {
+      s.delete(handler);
+      if (s.size === 0)
+        storeSubs.delete(topic);
+    }
+  };
+}
+function deliverStore(event) {
+  const exact = storeSubs.get(event.topic);
+  if (exact)
+    for (const h of exact) {
+      try {
+        h(event);
+      } catch (e) {
+        console.error("[store-bus]", e);
+      }
+    }
+  const wild = storeSubs.get("*");
+  if (wild)
+    for (const h of wild) {
+      try {
+        h(event);
+      } catch (e) {
+        console.error("[store-bus]", e);
+      }
+    }
+}
 function connectEvents() {
   ipc().onEvent((event) => {
+    if (event && event._event === "store")
+      deliverStore(event);
     for (const h of eventHandlers)
       h(event);
   });
@@ -459,13 +498,14 @@ async function getAttachment(accountId, uid, attachmentId, folderId) {
 async function getDeviceAccounts() {
   return ipc().getDeviceAccounts?.() ?? [];
 }
-var cachedRelayBridge, messageListAbort, eventHandlers, connectWebSocket, onWsEvent;
+var cachedRelayBridge, messageListAbort, eventHandlers, storeSubs, connectWebSocket, onWsEvent;
 var init_api_client = __esm({
   "client/lib/api-client.js"() {
     "use strict";
     cachedRelayBridge = null;
     messageListAbort = null;
     eventHandlers = [];
+    storeSubs = /* @__PURE__ */ new Map();
     connectWebSocket = connectEvents;
     onWsEvent = onEvent;
   }
@@ -551,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();
+    });
   }
 });
 
@@ -641,8 +685,25 @@ var messages, listeners;
 var init_message_state = __esm({
   "client/lib/message-state.js"() {
     "use strict";
+    init_api_client();
     messages = [];
     listeners = [];
+    subscribeStore("*", (event) => {
+      if (event.kind !== "flagsChanged")
+        return;
+      const accountId = event.accountId;
+      const uid = event.uid;
+      const flags = event.flags;
+      if (!accountId || typeof uid !== "number" || !Array.isArray(flags))
+        return;
+      const msg = messages.find((m) => m.uid === uid && m.accountId === accountId);
+      if (!msg)
+        return;
+      const before = JSON.stringify(msg.flags);
+      msg.flags = flags;
+      if (before !== JSON.stringify(flags))
+        notify();
+    });
   }
 });
 
@@ -1082,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;
@@ -1927,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
@@ -2095,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"),
@@ -7739,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;
@@ -7919,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");