@bobfrankston/rmfmail 1.0.681 → 1.0.686

package/client/compose/compose.bundle.js

@@ -85,6 +85,7 @@ __export(api_client_exports, {
   logClientEvent: () => logClientEvent,
   markAsSpamMessages: () => markAsSpamMessages,
   markFolderRead: () => markFolderRead,
+  moveFolderToTrash: () => moveFolderToTrash,
   moveMessage: () => moveMessage,
   moveMessages: () => moveMessages,
   onEvent: () => onEvent,
@@ -357,6 +358,9 @@ function renameFolder(accountId, folderId, newName) {
 function deleteFolder(accountId, folderId) {
   return ipc().deleteFolder?.(accountId, folderId);
 }
+function moveFolderToTrash(accountId, folderId) {
+  return ipc().moveFolderToTrash?.(accountId, folderId);
+}
 function emptyFolder(accountId, folderId) {
   return ipc().emptyFolder?.(accountId, folderId);
 }
@@ -617,7 +621,23 @@ async function createTinyMceEditor(container2, opts = {}) {
           return;
         args.content = args.content.replace(/(^|[\s(\[])((?:https?|ftp):\/\/[^\s<>"']+[^\s<>"'.,;:!?)\]])/gi, (_m, lead, url) => `${lead}<a href="${url}">${url}</a>`);
       },
-      content_style: "body { font-family: system-ui, sans-serif; font-size: 14px; }",
+      // Body font + quoted-reply styling. Without explicit rules for
+      // <blockquote> and div.reply the editor iframe renders the
+      // quoted block with no visual distinction from the user's own
+      // text — pasted reply quotes vanish into a wall of unformatted
+      // paragraphs (Bob 2026-05-12: "the body losing all formatting").
+      // The styles below match Thunderbird/Outlook conventions: a
+      // muted left-bar + indent on blockquotes, slight color shift on
+      // the "On … wrote:" attribution, untouched typography for
+      // everything else so genuine HTML formatting (bold / italic /
+      // tables / inline color) still comes through verbatim.
+      content_style: [
+        "body { font-family: system-ui, sans-serif; font-size: 14px; }",
+        "blockquote { border-left: 3px solid #c0c8d0; margin: 0 0 0 4px; padding: 2px 0 2px 10px; color: #555; }",
+        "div.reply { margin-top: 0.5em; }",
+        "div.reply > p:first-child { color: #666; font-size: 0.95em; margin: 0 0 4px 0; }",
+        "pre, code { font-family: ui-monospace, Consolas, Menlo, monospace; }"
+      ].join(" "),
       init_instance_callback: (ed) => resolve(ed),
       setup: (ed) => {
         if (opts.initialHtml)
@@ -714,10 +734,14 @@ async function createTinyMceEditor(container2, opts = {}) {
     focus() {
       editor2.focus();
     },
-    setCursor(_pos) {
+    setCursor(pos) {
       try {
         editor2.selection.select(editor2.getBody(), true);
-        editor2.selection.collapse(false);
+        editor2.selection.collapse(
+          pos === 0
+          /* true = start */
+        );
+        editor2.focus();
       } catch {
       }
     },
@@ -1766,7 +1790,7 @@ function decorate(editor2, sp) {
       p = p.parentNode;
     }
   }
-  const bookmark = editor2.selection?.getBookmark?.(2);
+  const savedAbs = caretAbsOffsetFromBody(body);
   try {
     editor2.undoManager?.ignore?.(() => {
       const old = body.querySelectorAll(`span[${MARKER_ATTR}]`);
@@ -1791,6 +1815,16 @@ function decorate(editor2, sp) {
           return NodeFilter.FILTER_ACCEPT;
         }
       });
+      let caretNode = null;
+      let caretOffset = 0;
+      const liveSel = doc.getSelection();
+      if (liveSel && liveSel.rangeCount > 0) {
+        const f = liveSel.focusNode;
+        if (f && f.nodeType === Node.TEXT_NODE) {
+          caretNode = f;
+          caretOffset = liveSel.focusOffset;
+        }
+      }
       const hits = [];
       let n = walker.nextNode();
       const WORD_RE = /[\p{L}][\p{L}'’\-]*/gu;
@@ -1803,6 +1837,9 @@ function decorate(editor2, sp) {
           const word = m[0];
           if (word.length < MIN_WORD_LEN)
             continue;
+          if (caretNode === tn && caretOffset >= m.index && caretOffset <= m.index + word.length) {
+            continue;
+          }
           if (sp.correct(word))
             continue;
           hits.push({ node: tn, start: m.index, end: m.index + word.length });
@@ -1823,11 +1860,72 @@ function decorate(editor2, sp) {
       }
     });
   } finally {
-    if (bookmark)
-      try {
-        editor2.selection?.moveToBookmark?.(bookmark);
-      } catch {
-      }
+    if (savedAbs != null)
+      restoreCaretFromAbsOffset(body, savedAbs);
+  }
+}
+function caretAbsOffsetFromBody(body) {
+  const doc = body.ownerDocument;
+  const sel = doc.getSelection();
+  if (!sel || sel.rangeCount === 0)
+    return null;
+  const focusNode = sel.focusNode;
+  const focusOffset = sel.focusOffset;
+  if (!focusNode)
+    return null;
+  if (focusNode.nodeType !== Node.TEXT_NODE) {
+    let abs2 = 0;
+    const walker2 = doc.createTreeWalker(body, NodeFilter.SHOW_TEXT);
+    let n2 = walker2.nextNode();
+    while (n2) {
+      if (focusNode.contains(n2))
+        break;
+      const cmp = focusNode.compareDocumentPosition(n2);
+      if (cmp & Node.DOCUMENT_POSITION_PRECEDING)
+        abs2 += n2.data.length;
+      n2 = walker2.nextNode();
+    }
+    return abs2;
+  }
+  let abs = 0;
+  const walker = doc.createTreeWalker(body, NodeFilter.SHOW_TEXT);
+  let n = walker.nextNode();
+  while (n) {
+    if (n === focusNode)
+      return abs + focusOffset;
+    abs += n.data.length;
+    n = walker.nextNode();
+  }
+  return null;
+}
+function restoreCaretFromAbsOffset(body, abs) {
+  const doc = body.ownerDocument;
+  const sel = doc.getSelection();
+  if (!sel)
+    return;
+  const walker = doc.createTreeWalker(body, NodeFilter.SHOW_TEXT);
+  let acc = 0;
+  let n = walker.nextNode();
+  while (n) {
+    const len = n.data.length;
+    if (acc + len >= abs) {
+      const range = doc.createRange();
+      range.setStart(n, Math.max(0, abs - acc));
+      range.collapse(true);
+      sel.removeAllRanges();
+      sel.addRange(range);
+      return;
+    }
+    acc += len;
+    n = walker.nextNode();
+  }
+  const last = walker.previousNode();
+  if (last) {
+    const range = doc.createRange();
+    range.setStart(last, last.data.length);
+    range.collapse(true);
+    sel.removeAllRanges();
+    sel.addRange(range);
   }
 }
 function installDecorationStyle(editor2) {
@@ -1920,18 +2018,37 @@ function showSuggestionsMenu(parentDoc, x, y, items) {
     menu.style.left = `${Math.max(8, window.innerWidth - r.width - 8)}px`;
   if (r.bottom > window.innerHeight)
     menu.style.top = `${Math.max(8, window.innerHeight - r.height - 8)}px`;
+  const docs = [parentDoc];
+  try {
+    const composeWin = parentDoc.defaultView;
+    if (composeWin?.frameElement && composeWin.parent?.document && composeWin.parent.document !== parentDoc) {
+      docs.push(composeWin.parent.document);
+    }
+  } catch {
+  }
+  try {
+    const editorIframe = parentDoc.querySelector("iframe.tox-edit-area__iframe") || parentDoc.querySelector("iframe");
+    const editorDoc = editorIframe?.contentDocument;
+    if (editorDoc && editorDoc !== parentDoc)
+      docs.push(editorDoc);
+  } catch {
+  }
   const dismiss2 = (e) => {
     if (e.type === "keydown" && e.key !== "Escape")
       return;
     if (e.type === "mousedown" && menu.contains(e.target))
       return;
     menu.remove();
-    parentDoc.removeEventListener("mousedown", dismiss2, true);
-    parentDoc.removeEventListener("keydown", dismiss2, true);
+    for (const d of docs) {
+      d.removeEventListener("mousedown", dismiss2, true);
+      d.removeEventListener("keydown", dismiss2, true);
+    }
   };
   setTimeout(() => {
-    parentDoc.addEventListener("mousedown", dismiss2, true);
-    parentDoc.addEventListener("keydown", dismiss2, true);
+    for (const d of docs) {
+      d.addEventListener("mousedown", dismiss2, true);
+      d.addEventListener("keydown", dismiss2, true);
+    }
   }, 0);
 }
 function replaceMarker(editor2, marker, replacement) {
@@ -1993,7 +2110,21 @@ function wireSpellcheck(editor2) {
       return;
     e.preventDefault();
     e.stopPropagation();
-    const sugs = sp.suggest(word).slice(0, 7);
+    const transposed = [];
+    for (let i = 0; i < word.length - 1; i++) {
+      const swapped = word.slice(0, i) + word[i + 1] + word[i] + word.slice(i + 2);
+      if (swapped !== word && sp.correct(swapped) && !transposed.includes(swapped)) {
+        transposed.push(swapped);
+      }
+    }
+    const nspellSugs = sp.suggest(word);
+    const sugs = [];
+    for (const s of [...transposed, ...nspellSugs]) {
+      if (!sugs.includes(s))
+        sugs.push(s);
+      if (sugs.length >= 7)
+        break;
+    }
     const iframeEl = editor2.iframeElement;
     const iframeRect = iframeEl ? iframeEl.getBoundingClientRect() : { left: 0, top: 0 };
     const items = [];
@@ -2040,7 +2171,7 @@ var init_spellcheck = __esm({
     import_nspell = __toESM(require_lib(), 1);
     USER_DICT_KEY = "mailx-user-dict";
     MARKER_ATTR = "data-mailx-spellerror";
-    DECORATE_DEBOUNCE_MS = 500;
+    DECORATE_DEBOUNCE_MS = 1200;
     MIN_WORD_LEN = 3;
     SKIP_TAGS = /* @__PURE__ */ new Set(["BLOCKQUOTE", "CODE", "PRE", "A", "SCRIPT", "STYLE", "KBD", "SAMP", "VAR"]);
     spellPromise = null;
@@ -2922,6 +3053,8 @@ function showContextMenu(x, y, items) {
     const el = document.createElement("div");
     el.className = "ctx-item" + (item.disabled ? " ctx-disabled" : "");
     el.textContent = item.label;
+    if (item.tooltip)
+      el.title = item.tooltip;
     if (!item.disabled) {
       el.addEventListener("click", () => {
         closeContextMenu();