@bobfrankston/rmfmail 1.2.183 → 1.2.185

package/client/app.bundle.js

@@ -1599,6 +1599,19 @@ function clearViewer() {
     headerEl.hidden = true;
   if (attEl)
     attEl.hidden = true;
+  setTimeout(() => {
+    try {
+      const stillPlaceholder = !!document.querySelector("#mv-body .mv-empty");
+      if (!stillPlaceholder)
+        return;
+      const sel = document.querySelectorAll(".ml-row.selected");
+      if (sel.length === 0)
+        return;
+      const uids = Array.from(sel).slice(0, 5).map((r) => `${r.dataset.accountId}/${r.dataset.uid}`);
+      window.mailxapi?.logClientEvent?.("[fate-share] viewer empty but rows still highlighted", { rows: uids });
+    } catch {
+    }
+  }, 1e3);
 }
 function confirmDeleteAttachments(msg, accountId, uid, ids, question) {
   const backdrop = document.createElement("div");
@@ -3113,8 +3126,23 @@ var init_message_viewer = __esm({
         return;
       if (!currentMessage)
         return;
+      const evUuid = ev.msgUuid || ev.uuid;
+      if (evUuid && currentMessage.uuid) {
+        if (ev.accountId === currentAccountId && evUuid === currentMessage.uuid) {
+          try {
+            window.mailxapi?.logClientEvent?.("[fate-share] viewed message removed (uuid) \u2014 clearing viewer", { uuid: evUuid });
+          } catch {
+          }
+          clearViewer();
+        }
+        return;
+      }
       const folderMatches = ev.folderId == null || currentMessage.folderId == null || ev.folderId === currentMessage.folderId;
       if (ev.accountId === currentAccountId && ev.uid === currentMessage.uid && folderMatches) {
+        try {
+          window.mailxapi?.logClientEvent?.("[fate-share] viewed message removed (uid) \u2014 clearing viewer", { uid: ev.uid, folderId: ev.folderId ?? null });
+        } catch {
+        }
         clearViewer();
       }
     });
@@ -3503,10 +3531,17 @@ function focusRow(row, opts = {}) {
   if (opts.scroll !== false) {
     row.el.scrollIntoView({ block: "nearest" });
   }
-  showMessage(row.accountId, row.msg.uid, row.msg.folderId, currentSpecialUse || void 0, false, row.msg);
-  onMessageSelect(row.accountId, row.msg.uid, row.msg.folderId);
-  document.dispatchEvent(new CustomEvent("mailx-focus-changed", { detail: row.msg }));
   rememberPosition();
+  try {
+    showMessage(row.accountId, row.msg.uid, row.msg.folderId, currentSpecialUse || void 0, false, row.msg);
+    onMessageSelect(row.accountId, row.msg.uid, row.msg.folderId);
+    document.dispatchEvent(new CustomEvent("mailx-focus-changed", { detail: row.msg }));
+  } catch (e) {
+    try {
+      logClientEvent("[fate-share] focusRow viewer drive threw", { uid: row.msg?.uid, accountId: row.accountId, err: e?.message || String(e), stack: e?.stack || null });
+    } catch {
+    }
+  }
 }
 function getCurrentFocused() {
   return focusedRow ? focusedRow.msg : null;
@@ -4216,8 +4251,13 @@ async function loadMessages(accountId, folderId, page = 1, specialUse = "", auto
     setMessages(result.items);
     withScrollAnchor(body, () => renderMessages(body, accountId, result.items, { background: !autoSelect }));
     if (autoSelect && focusedRow) {
-      const stillThere = result.items.some((m) => m.accountId === focusedRow.accountId && m.uid === focusedRow.msg.uid);
+      const fUuid = focusedRow.msg?.uuid;
+      const stillThere = result.items.some((m) => fUuid && m.uuid ? m.uuid === fUuid : m.accountId === focusedRow.accountId && m.uid === focusedRow.msg.uid);
       if (!stillThere) {
+        try {
+          logClientEvent("[fate-share] focused row gone after foreground load \u2014 clearing viewer", { uid: focusedRow.msg?.uid, uuid: fUuid || null, accountId: focusedRow.accountId });
+        } catch {
+        }
         clearViewer();
         focusedRow = null;
       }
@@ -4313,8 +4353,13 @@ function renderMessages(body, accountId, items, opts = {}) {
   if (focusedRow && !opts.background) {
     const fAcct = focusedRow.accountId;
     const fUid = focusedRow.msg?.uid;
-    const stillThere = items.some((m) => (m.accountId || accountId) === fAcct && m.uid === fUid);
+    const fUuid = focusedRow.msg?.uuid;
+    const stillThere = items.some((m) => fUuid && m.uuid ? m.uuid === fUuid : (m.accountId || accountId) === fAcct && m.uid === fUid);
     if (!stillThere) {
+      try {
+        logClientEvent("[fate-share] focused row gone after foreground render \u2014 clearing viewer", { uid: fUid, uuid: fUuid || null, accountId: fAcct });
+      } catch {
+      }
       clearViewer();
       focusedRow = null;
     }
@@ -4339,6 +4384,12 @@ function restoreSelection(body, savedUuid) {
   const uid = Number(row.dataset.uid);
   if (accountId && Number.isFinite(uid)) {
     const switching = focusedRow?.msg?.uuid !== savedUuid;
+    if (switching) {
+      try {
+        logClientEvent("[fate-share] restoreSelection switching viewer", { toUuid: savedUuid, toUid: uid, fromUuid: focusedRow?.msg?.uuid || null });
+      } catch {
+      }
+    }
     focusByIdentity(accountId, uid, { scroll: switching });
   }
 }