@bobfrankston/rmfmail 1.1.5 → 1.1.7

package/client/app.js

@@ -2701,10 +2701,10 @@ onWsEvent((event) => {
         }
     }
 });
-// Store-bus consumers (post-refactor). bodyAvailable / messageRemoved
-// previously fanned out via the legacy onEvent({type:...}) channel; the
-// reconciler now publishes directly on storeBus and the wildcard catches
-// both folder:<id> and message:<uuid> topic forms.
+// Store-bus consumers (post-refactor). The list's mailx-remove-stale
+// listener handles row-removal + focus-advance atomically; we just
+// translate bus events into that one signal so there's a single
+// owner of "row is no longer here."
 subscribeStore("*", (ev) => {
     if (ev.kind === "bodyAvailable" && ev.accountId && ev.uid) {
         // Flip the row's "not-downloaded" dot. Viewer subscribes separately
@@ -2712,8 +2712,17 @@ subscribeStore("*", (ev) => {
         markBodiesCached([{ accountId: ev.accountId, uid: ev.uid }]);
     }
     else if (ev.kind === "messageRemoved" && ev.accountId && ev.uid) {
-        // Server-side EXPUNGE (or another device deleted) — yank the row
-        // out of the list if it's still rendered.
+        // Server-side EXPUNGE (or another device deleted).
+        document.dispatchEvent(new CustomEvent("mailx-remove-stale", {
+            detail: { accountId: ev.accountId, uid: ev.uid },
+        }));
+    }
+    else if (ev.kind === "messageMoved" && ev.accountId && ev.uid) {
+        // Moved to a different folder — from the current folder's view
+        // it's the same as removal. The list's remove-stale handler
+        // figures out whether it was actually in the current view; if not,
+        // it's a no-op. Local optimistic delete also flows here when the
+        // user hits Del on another device — same handler, same advance.
         document.dispatchEvent(new CustomEvent("mailx-remove-stale", {
             detail: { accountId: ev.accountId, uid: ev.uid },
         }));