@bobfrankston/rmfmail 1.2.259 → 1.2.261

package/client/app.js

@@ -6,7 +6,7 @@ import { initFolderTree, refreshFolderTree, updateFolderCounts, setFolderSynced,
 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 } from "./components/message-viewer.js";
+import { getCurrentMessage, initViewer, popOutCurrentMessage, popOutToWindow, printCurrentMessage, toggleFullscreenPreview, showPreviewBodyMenu, setSearchHighlightTerms, parseHighlightTerms } from "./components/message-viewer.js";
 import { connectWebSocket, onWsEvent, triggerSync, syncAccount, reauthenticate, getAccounts, getFolders, deleteMessage, deleteMessages, undeleteMessage, restartServer, getSyncPending, getVersion, getSettings, saveSettings, getAutocompleteSettings, saveAutocompleteSettings, repairAccounts, updateFlags, markAsSpamMessages, logClientEvent, sendMessage as apiSendMessage, subscribeStore, cancelServerSearch, installConsoleCapture, getAttachment } from "./lib/api-client.js";
 import * as messageState from "./lib/message-state.js";
 import { editMenuItems } from "./components/edit-menu.js";
@@ -2772,6 +2772,12 @@ function renderSearchHighlight(settled) {
 }
 function updateSearchHighlight() {
     renderSearchHighlight(false);
+    // The message-body marks track the same box. Doing it HERE rather than at
+    // each caller means every path that touches the search input — typing,
+    // clearing, folder switch, tab restore — keeps the viewer in step; there
+    // is no way to add a fourth path that forgets. setSearchHighlightTerms
+    // no-ops when the terms are unchanged, so this is free per keystroke.
+    setSearchHighlightTerms(parseHighlightTerms(searchInput?.value || ""));
     if (searchRegexSettleTimer)
         clearTimeout(searchRegexSettleTimer);
     searchRegexSettleTimer = setTimeout(() => renderSearchHighlight(true), SEARCH_REGEX_SETTLE_MS);
@@ -2794,6 +2800,10 @@ const SERVER_SEARCH_DALLY_MS = 700;
 let serverSearchTimer = null;
 function doSearch(immediate = false) {
     const query = searchInput.value.trim();
+    // Terms to mark in the open message. Set on EVERY doSearch — including the
+    // empty-query exit below, which clears them (Bob 2026-08-15: "search should
+    // highlight the matched text when I view a message").
+    setSearchHighlightTerms(parseHighlightTerms(query));
     if (query.length === 0) {
         // Leaving search — ABORT any in-flight server sweep. A "Server" search is
         // a 90-folder IMAP run on the daemon; if it's still going when you clear