@bobfrankston/rmfmail 1.1.62 → 1.1.65

package/client/compose/compose.bundle.js

@@ -2158,6 +2158,47 @@ function replaceMarker(editor2, marker, replacement) {
     range.insertNode(doc.createTextNode(replacement));
   }
 }
+function cleanupCorrected(editor2, sp) {
+  const body = editor2.getBody?.();
+  const doc = editor2.getDoc?.();
+  if (!body || !doc)
+    return;
+  const markers = body.querySelectorAll(`span[${MARKER_ATTR}]`);
+  if (markers.length === 0)
+    return;
+  let caretMarker = null;
+  const sel = doc.getSelection();
+  if (sel && sel.rangeCount > 0) {
+    let p = sel.focusNode;
+    while (p && p !== body) {
+      if (p.nodeType === Node.ELEMENT_NODE && p.hasAttribute?.(MARKER_ATTR)) {
+        caretMarker = p;
+        break;
+      }
+      p = p.parentNode;
+    }
+  }
+  const stale = [];
+  for (const m of markers) {
+    if (m === caretMarker)
+      continue;
+    const word = m.textContent || "";
+    if (!word || /\s/.test(word) || sp.correct(word))
+      stale.push(m);
+  }
+  if (stale.length === 0)
+    return;
+  editor2.undoManager?.ignore?.(() => {
+    for (const m of stale) {
+      const parent2 = m.parentNode;
+      if (!parent2)
+        continue;
+      while (m.firstChild)
+        parent2.insertBefore(m.firstChild, m);
+      parent2.removeChild(m);
+    }
+  });
+}
 function wireSpellcheck(editor2) {
   if (editor2.__mailxSpellWired)
     return;
@@ -2175,6 +2216,18 @@ function wireSpellcheck(editor2) {
         decorate(editor2, sp);
     }, DECORATE_DEBOUNCE_MS);
   };
+  let cleanupTimer = null;
+  const scheduleCleanup = () => {
+    if (!sp)
+      return;
+    if (cleanupTimer)
+      clearTimeout(cleanupTimer);
+    cleanupTimer = setTimeout(() => {
+      cleanupTimer = null;
+      if (sp)
+        cleanupCorrected(editor2, sp);
+    }, CLEANUP_DEBOUNCE_MS);
+  };
   getSpell().then((loaded) => {
     sp = loaded;
     installDecorationStyle(editor2);
@@ -2184,6 +2237,7 @@ function wireSpellcheck(editor2) {
     console.error("[spellcheck] dict load failed:", err);
   });
   editor2.on("input nodechange setcontent paste keyup", scheduleDecorate);
+  editor2.on("input nodechange setcontent paste keyup", scheduleCleanup);
   const iframeDoc = editor2.getDoc();
   iframeDoc.addEventListener("contextmenu", (ev) => {
     const e = ev;
@@ -2252,7 +2306,7 @@ function wireSpellcheck(editor2) {
     showSuggestionsMenu(document, iframeRect.left + e.clientX, iframeRect.top + e.clientY, items);
   }, true);
 }
-var import_nspell, USER_DICT_KEY, MARKER_ATTR, DECORATE_DEBOUNCE_MS, MIN_WORD_LEN, SKIP_TAGS, spellPromise;
+var import_nspell, USER_DICT_KEY, MARKER_ATTR, DECORATE_DEBOUNCE_MS, CLEANUP_DEBOUNCE_MS, MIN_WORD_LEN, SKIP_TAGS, spellPromise;
 var init_spellcheck = __esm({
   "client/compose/spellcheck.js"() {
     "use strict";
@@ -2261,6 +2315,7 @@ var init_spellcheck = __esm({
     USER_DICT_KEY = "mailx-user-dict";
     MARKER_ATTR = "data-mailx-spellerror";
     DECORATE_DEBOUNCE_MS = 1200;
+    CLEANUP_DEBOUNCE_MS = 300;
     MIN_WORD_LEN = 3;
     SKIP_TAGS = /* @__PURE__ */ new Set(["BLOCKQUOTE", "CODE", "PRE", "A", "SCRIPT", "STYLE", "KBD", "SAMP", "VAR"]);
     spellPromise = null;