@bobfrankston/rmfmail 1.1.107 → 1.1.108

package/client/app.ts

@@ -8,7 +8,7 @@ import { initMessageList, loadMessages, loadUnifiedInbox, loadSearchResults, rel
 import { seenOf, flaggedOf, draftOf, setSeen, setFlagged } from "@bobfrankston/mailx-types";
 import { initTabs, setActiveView as setActiveTabView, openTab, type ViewTab } from "./components/tabs.js";
 import { showMessage, 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) ──
@@ -1237,12 +1237,12 @@ function quoteBody(msg: any): string {
     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: any): string {
@@ -1250,7 +1250,7 @@ function forwardBody(msg: any): string {
     const from = msg.from.name ? `${msg.from.name} &lt;${msg.from.address}&gt;` : msg.from.address;
     const to = msg.to.map((a: any) => 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>`;
 }
 
 // ── Delete with undo ──
@@ -1950,8 +1950,11 @@ function doSearch(immediate = false): void {
 
     // 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
@@ -2003,7 +2006,7 @@ let reloadDebounceTimer: ReturnType<typeof setTimeout> | null = null;
 
 searchInput?.addEventListener("input", () => {
     clearTimeout(searchTimeout);
-    if (serverSearchTimer) { clearTimeout(serverSearchTimer); serverSearchTimer = null; }
+    if (serverSearchTimer) { clearTimeout(serverSearchTimer); serverSearchTimer = null; cancelServerSearch(); }
     updateSearchHighlight();
     if (searchInput.value.trim() === "") {
         // Cleared — reset immediately, no debounce. Must exit search mode
@@ -2029,6 +2032,7 @@ searchInput?.addEventListener("keydown", (e) => {
     if (e.key === "Escape") {
         searchInput.value = "";
         if (serverSearchTimer) { clearTimeout(serverSearchTimer); serverSearchTimer = null; }
+        cancelServerSearch();
         updateSearchHighlight();
         clearSearchMode();
         // Clear any client-side filters
@@ -4219,6 +4223,14 @@ getSettings().then((s: any) => {
 
 // Save editor choice to server settings
 function saveEditorSetting(editor: string): void {
+    // 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: any) => {
         settings.ui = { ...settings.ui, editor };
         saveSettings(settings);

package/client/compose/compose.bundle.js

@@ -44,6 +44,7 @@ __export(api_client_exports, {
   allowRemoteContent: () => allowRemoteContent,
   autocomplete: () => autocomplete,
   cancelQueuedOutgoing: () => cancelQueuedOutgoing,
+  cancelServerSearch: () => cancelServerSearch,
   closeWordEdit: () => closeWordEdit,
   connectEvents: () => connectEvents,
   connectWebSocket: () => connectWebSocket,
@@ -217,6 +218,9 @@ function getUnifiedInbox(page = 1, pageSize = 50) {
 function searchMessages(query, page = 1, pageSize = 50, scope = "all", accountId = "", folderId = 0, includeTrashSpam = false) {
   return ipc().searchMessages(query, page, pageSize, scope, accountId, folderId, includeTrashSpam);
 }
+function cancelServerSearch() {
+  return ipc().cancelServerSearch?.();
+}
 function getMessage(accountId, uid, allowRemote = false, folderId) {
   return ipc().getMessage(accountId, uid, allowRemote, folderId);
 }