@bobfrankston/rmfmail 1.2.102 → 1.2.103

package/client/app.js

@@ -2,8 +2,8 @@
  * mailx client entry point.
  * Wires together all UI components and WebSocket connection.
  */
-import { initFolderTree, refreshFolderTree, updateFolderCounts, setFolderSynced, getFolderSynced, setOutboxTotal } from "./components/folder-tree.js";
-import { initMessageList, loadMessages, loadUnifiedInbox, loadSearchResults, reloadCurrentFolder, clearSearchMode, getSelectedMessages, markBodiesCached, getCurrentFocused, releaseFocus, removeMessagesAndReconcile, setRowFlagged, scrollFocusedIntoView, refreshPriorityIndex, revealMessage, selectAllVisible, exitMultiSelect, getDateBasis, setDateBasis } from "./components/message-list.js";
+import { initFolderTree, refreshFolderTree, updateFolderCounts, setFolderSynced, getFolderSynced, setOutboxTotal, highlightFolder } from "./components/folder-tree.js";
+import { initMessageList, loadMessages, loadUnifiedInbox, loadSearchResults, reloadCurrentFolder, clearSearchMode, getSelectedMessages, markBodiesCached, getCurrentFocused, releaseFocus, removeMessagesAndReconcile, setRowFlagged, scrollFocusedIntoView, refreshPriorityIndex, revealMessage, getCurrentView, selectAllVisible, exitMultiSelect, getDateBasis, setDateBasis } from "./components/message-list.js";
 import { seenOf, flaggedOf, draftOf, setSeen, setFlagged } from "@bobfrankston/mailx-types";
 import { initTabs, setActiveView as setActiveTabView, openTab } from "./components/tabs.js";
 import { getCurrentMessage, initViewer, popOutCurrentMessage, popOutToWindow, printCurrentMessage, toggleFullscreenPreview, showPreviewBodyMenu, wrapHtmlBody } from "./components/message-viewer.js";
@@ -2637,21 +2637,42 @@ let lastListReloadAt = 0;
 // BEFORE clearing search mode, then navigate to that message's folder and
 // reselect it. With no selected result (or no folderId) fall back to the old
 // reloadCurrentFolder behavior.
-function closeSearchAndReveal() {
+async function closeSearchAndReveal() {
     const focused = getCurrentFocused();
     clearSearchMode();
     const body = document.getElementById("ml-body");
     if (body)
         body.querySelectorAll(".filter-hidden").forEach(r => r.classList.remove("filter-hidden"));
     if (focused && focused.folderId) {
-        currentAccountId = focused.accountId;
-        currentFolderId = focused.folderId;
-        revealMessage(focused.accountId, focused.folderId, focused.uid);
+        await revealMessage(focused.accountId, focused.folderId, focused.uid);
     }
     else {
         reloadCurrentFolder();
     }
-    setTitle(APP_NAME);
+    // Leaving search must leave search STATE behind too. Before this, the
+    // active tab kept its "Search: …" view (re-running the dead query on any
+    // tab re-activation) and the folder tree kept the pre-search highlight —
+    // so when the reveal landed somewhere unexpected (a Drafts result, a
+    // stale folderId after a server-side rebind), every indicator still
+    // claimed search-on-All-Inboxes and the list looked broken (Bob
+    // 2026-07-04 "cleared the search but it isn't restoring the list").
+    // Sync tab, tree highlight and titles to what the list actually shows.
+    const vw = getCurrentView();
+    if (vw.unified) {
+        highlightFolder(null, -1);
+        setActiveTabView({ kind: "unified" }, "All Inboxes");
+        setTitle(`${APP_NAME} - All Inboxes`);
+        setNarrowFolderTitle("All Inboxes");
+    }
+    else {
+        currentAccountId = vw.accountId;
+        currentFolderId = vw.folderId;
+        currentFolderSpecialUse = vw.specialUse;
+        const name = highlightFolder(vw.accountId, vw.folderId) || "Mail";
+        setActiveTabView({ kind: "folder", accountId: vw.accountId, folderId: vw.folderId, specialUse: vw.specialUse }, name);
+        setTitle(`${APP_NAME} - ${name}`);
+        setNarrowFolderTitle(name);
+    }
 }
 searchInput?.addEventListener("input", () => {
     clearTimeout(searchTimeout);