@bobfrankston/rmfmail 1.1.107 → 1.1.109

package/client/app.js

@@ -7,7 +7,7 @@ import { initMessageList, loadMessages, loadUnifiedInbox, loadSearchResults, rel
 import { seenOf, flaggedOf, draftOf, setSeen, setFlagged } from "@bobfrankston/mailx-types";
 import { initTabs, setActiveView as setActiveTabView, openTab } from "./components/tabs.js";
 import { getCurrentMessage, initViewer, popOutCurrentMessage, toggleFullscreenPreview, showPreviewBodyMenu, wrapHtmlBody } 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 } from "./lib/api-client.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 } from "./lib/api-client.js";
 import * as messageState from "./lib/message-state.js";
 // ── New message badge (favicon + title) ──
 /** The user-visible app name. Single point of change for the rename;
@@ -1282,19 +1282,19 @@ function quoteBody(msg) {
     const date = new Date(msg.date).toLocaleString();
     const from = msg.from.name ? `${msg.from.name} <${msg.from.address}>` : msg.from.address;
     const body = sanitizeQuotedBody(msg);
-    // Lead with a real empty paragraph (not bare <br><br>) so every editor
-    // has a proper block for the caret to land in and for the user's reply
-    // to flow into. Bare <br>s aren't a block container — TinyMCE's caret
-    // fell through to the quote and typing landed unpredictably (Bob
-    // 2026-05-21). `<p><br></p>` is the standard "empty editable paragraph".
-    return `<p><br></p><div class="reply"><p>On ${date}, ${from} wrote:</p><blockquote>${body}</blockquote></div>`;
+    // Lead with an empty paragraph so every editor has a real block for the
+    // caret to land in and the user's reply to flow into — bare <br>s aren't
+    // a block container, so TinyMCE's caret fell through to the quote (Bob
+    // 2026-05-21). The blank-line spacing lives in <br>s AFTER the </p>, not
+    // inside it.
+    return `<p></p><br><br><div class="reply"><p>On ${date}, ${from} wrote:</p><blockquote>${body}</blockquote></div>`;
 }
 function forwardBody(msg) {
     const date = new Date(msg.date).toLocaleString();
     const from = msg.from.name ? `${msg.from.name} &lt;${msg.from.address}&gt;` : msg.from.address;
     const to = msg.to.map((a) => a.name ? `${a.name} &lt;${a.address}&gt;` : a.address).join(", ");
     const body = sanitizeQuotedBody(msg);
-    return `<p><br></p><div class="reply"><p>---------- Forwarded message ----------<br>From: ${from}<br>Date: ${date}<br>Subject: ${msg.subject}<br>To: ${to}</p>${body}</div>`;
+    return `<p></p><br><br><div class="reply"><p>---------- Forwarded message ----------<br>From: ${from}<br>Date: ${date}<br>Subject: ${msg.subject}<br>To: ${to}</p>${body}</div>`;
 }
 let lastDeleted = null;
 let lastMoved = null;
@@ -2042,11 +2042,14 @@ function doSearch(immediate = false) {
     const serverOn = !!serverCheck?.checked;
     // Any re-run aborts a pending server pass — it'll be rescheduled below
     // if still wanted. This is the "editing the search aborts + restarts"
-    // behavior: each keystroke cancels the prior server search.
+    // behavior: each keystroke cancels the prior server search. clearTimeout
+    // kills a not-yet-fired pass; cancelServerSearch() aborts one that's
+    // already mid-sweep on the daemon (generation bump → loop bails).
     if (serverSearchTimer) {
         clearTimeout(serverSearchTimer);
         serverSearchTimer = null;
     }
+    cancelServerSearch();
     // "This folder" scope: instant client-side filter of the visible rows.
     // Only when the server checkbox is OFF — with it on we want the real
     // local+server search, not a row filter.
@@ -2093,6 +2096,7 @@ searchInput?.addEventListener("input", () => {
     if (serverSearchTimer) {
         clearTimeout(serverSearchTimer);
         serverSearchTimer = null;
+        cancelServerSearch();
     }
     updateSearchHighlight();
     if (searchInput.value.trim() === "") {
@@ -2124,6 +2128,7 @@ searchInput?.addEventListener("keydown", (e) => {
             clearTimeout(serverSearchTimer);
             serverSearchTimer = null;
         }
+        cancelServerSearch();
         updateSearchHighlight();
         clearSearchMode();
         // Clear any client-side filters
@@ -4525,6 +4530,17 @@ getSettings().then((s) => {
 }).catch(() => { });
 // Save editor choice to server settings
 function saveEditorSetting(editor) {
+    // Update the localStorage cache SYNCHRONOUSLY. compose.ts reads
+    // `mailx-editor-type` from localStorage at module-load to pick the
+    // editor — its async getSettings() refresh only runs when a compose
+    // window opens, and reads localStorage FIRST. Without this write the
+    // cache stays stale and the next compose keeps the old editor until a
+    // full app restart (Bob 2026-05-21: "changed to quill but got tinymce
+    // until I restarted"). With it, the very next compose-open is correct.
+    try {
+        localStorage.setItem("mailx-editor-type", editor);
+    }
+    catch { /* private mode */ }
     getSettings().then((settings) => {
         settings.ui = { ...settings.ui, editor };
         saveSettings(settings);