@bobfrankston/rmfmail 1.0.678 → 1.0.679

package/client/compose/compose.bundle.js

@@ -1729,52 +1729,120 @@ function addToUserDict(word, sp) {
   }
   sp.add(word);
 }
-function wordAtPoint(doc, x, y) {
-  const anyDoc = doc;
-  let caretNode = null;
-  let caretOffset = 0;
-  if (typeof anyDoc.caretRangeFromPoint === "function") {
-    const r = anyDoc.caretRangeFromPoint(x, y);
-    if (!r)
-      return null;
-    caretNode = r.startContainer;
-    caretOffset = r.startOffset;
-  } else if (typeof anyDoc.caretPositionFromPoint === "function") {
-    const p = anyDoc.caretPositionFromPoint(x, y);
-    if (!p)
-      return null;
-    caretNode = p.offsetNode;
-    caretOffset = p.offset;
-  } else {
-    return null;
+function decorate(editor2, sp) {
+  const body = editor2.getBody?.();
+  const doc = editor2.getDoc?.();
+  if (!body || !doc)
+    return;
+  const sel = doc.getSelection();
+  if (sel && sel.rangeCount > 0) {
+    const focus = sel.focusNode;
+    let p = focus;
+    while (p && p !== body) {
+      if (p.nodeType === Node.ELEMENT_NODE && p.hasAttribute?.(MARKER_ATTR)) {
+        return;
+      }
+      p = p.parentNode;
+    }
   }
-  if (!caretNode || caretNode.nodeType !== Node.TEXT_NODE)
-    return null;
-  const text = caretNode.data;
-  const isWordChar = (ch) => /[\p{L}\p{N}'’\-]/u.test(ch);
-  let start = caretOffset;
-  let end = caretOffset;
-  while (start > 0 && isWordChar(text[start - 1]))
-    start--;
-  while (end < text.length && isWordChar(text[end]))
-    end++;
-  if (start === end)
-    return null;
-  let word = text.slice(start, end);
-  while (word.length && /^['’\-]/.test(word)) {
-    word = word.slice(1);
-    start++;
+  const bookmark = editor2.selection?.getBookmark?.(2);
+  try {
+    editor2.undoManager?.ignore?.(() => {
+      const old = body.querySelectorAll(`span[${MARKER_ATTR}]`);
+      for (const m of old) {
+        const parent2 = m.parentNode;
+        if (!parent2)
+          continue;
+        while (m.firstChild)
+          parent2.insertBefore(m.firstChild, m);
+        parent2.removeChild(m);
+      }
+      body.normalize();
+      const walker = doc.createTreeWalker(body, NodeFilter.SHOW_TEXT, {
+        acceptNode(node) {
+          let p = node.parentNode;
+          while (p && p !== body) {
+            if (p.nodeType === Node.ELEMENT_NODE && SKIP_TAGS.has(p.tagName)) {
+              return NodeFilter.FILTER_REJECT;
+            }
+            p = p.parentNode;
+          }
+          return NodeFilter.FILTER_ACCEPT;
+        }
+      });
+      const hits = [];
+      let n = walker.nextNode();
+      const WORD_RE = /[\p{L}][\p{L}'’\-]*/gu;
+      while (n) {
+        const tn = n;
+        const text = tn.data;
+        let m;
+        WORD_RE.lastIndex = 0;
+        while ((m = WORD_RE.exec(text)) !== null) {
+          const word = m[0];
+          if (word.length < MIN_WORD_LEN)
+            continue;
+          if (sp.correct(word))
+            continue;
+          hits.push({ node: tn, start: m.index, end: m.index + word.length });
+        }
+        n = walker.nextNode();
+      }
+      hits.reverse();
+      for (const h of hits) {
+        const range = doc.createRange();
+        range.setStart(h.node, h.start);
+        range.setEnd(h.node, h.end);
+        const span = doc.createElement("span");
+        span.setAttribute(MARKER_ATTR, "1");
+        try {
+          range.surroundContents(span);
+        } catch {
+        }
+      }
+    });
+  } finally {
+    if (bookmark)
+      try {
+        editor2.selection?.moveToBookmark?.(bookmark);
+      } catch {
+      }
   }
-  while (word.length && /['’\-]$/.test(word)) {
-    word = word.slice(0, -1);
-    end--;
+}
+function installDecorationStyle(editor2) {
+  const doc = editor2.getDoc?.();
+  if (!doc)
+    return;
+  if (doc.getElementById("mailx-spell-style"))
+    return;
+  const style = doc.createElement("style");
+  style.id = "mailx-spell-style";
+  style.textContent = `
+        span[${MARKER_ATTR}] {
+            text-decoration: underline wavy #d33;
+            text-decoration-skip-ink: none;
+            text-underline-offset: 2px;
+            /* No background \u2014 keeps the styling subtle, like a native
+             * spell underline, not a Find-highlight. */
+            background: transparent;
+        }
+    `;
+  doc.head.appendChild(style);
+}
+function installSerializerFilter(editor2) {
+  if (editor2.__mailxSpellSerializerWired)
+    return;
+  editor2.__mailxSpellSerializerWired = true;
+  try {
+    editor2.serializer.addAttributeFilter(MARKER_ATTR, (nodes) => {
+      for (const node of nodes) {
+        if (typeof node.unwrap === "function")
+          node.unwrap();
+      }
+    });
+  } catch (e) {
+    console.warn("[spellcheck] serializer filter setup failed:", e);
   }
-  if (!word)
-    return null;
-  const range = doc.createRange();
-  range.setStart(caretNode, start);
-  range.setEnd(caretNode, end);
-  return { word, range };
 }
 function showSuggestionsMenu(parentDoc, x, y, items) {
   parentDoc.getElementById("mailx-spell-menu")?.remove();
@@ -1791,11 +1859,11 @@ function showSuggestionsMenu(parentDoc, x, y, items) {
         box-shadow: 0 4px 16px rgba(0,0,0,0.18);
         padding: 4px 0;
         font: 13px system-ui, sans-serif;
-        min-width: 160px;
+        min-width: 180px;
         max-width: 320px;
     `;
   for (const it of items) {
-    if (it.label === "---") {
+    if (it.separator) {
       const sep = parentDoc.createElement("div");
       sep.style.cssText = "border-top:1px solid var(--color-border,#ddd); margin: 4px 0;";
       menu.appendChild(sep);
@@ -1845,7 +1913,10 @@ function showSuggestionsMenu(parentDoc, x, y, items) {
     parentDoc.addEventListener("keydown", dismiss2, true);
   }, 0);
 }
-function replaceRange(doc, range, replacement) {
+function replaceMarker(editor2, marker, replacement) {
+  const doc = editor2.getDoc();
+  const range = doc.createRange();
+  range.selectNode(marker);
   const sel = doc.getSelection();
   if (!sel)
     return;
@@ -1865,62 +1936,92 @@ function wireSpellcheck(editor2) {
   if (editor2.__mailxSpellWired)
     return;
   editor2.__mailxSpellWired = true;
-  const iframeDoc = editor2.getDoc?.() || null;
-  if (!iframeDoc)
-    return;
+  let sp = null;
+  let decorateTimer = null;
+  const scheduleDecorate = () => {
+    if (!sp)
+      return;
+    if (decorateTimer)
+      clearTimeout(decorateTimer);
+    decorateTimer = setTimeout(() => {
+      decorateTimer = null;
+      if (sp)
+        decorate(editor2, sp);
+    }, DECORATE_DEBOUNCE_MS);
+  };
+  getSpell().then((loaded) => {
+    sp = loaded;
+    installDecorationStyle(editor2);
+    installSerializerFilter(editor2);
+    decorate(editor2, loaded);
+  }).catch((err) => {
+    console.error("[spellcheck] dict load failed:", err);
+  });
+  editor2.on("input nodechange setcontent paste keyup", scheduleDecorate);
+  const iframeDoc = editor2.getDoc();
   iframeDoc.addEventListener("contextmenu", (ev) => {
     const e = ev;
-    const iframeEl = editor2.iframeElement;
-    if (!iframeEl)
+    const target = e.target;
+    if (!target)
       return;
-    const found = wordAtPoint(iframeDoc, e.clientX, e.clientY);
-    if (!found)
+    const marker = target.closest?.(`span[${MARKER_ATTR}]`);
+    if (!marker)
       return;
-    getSpell().then((sp) => {
-      if (sp.correct(found.word))
-        return;
-      const sugs = sp.suggest(found.word).slice(0, 7);
-      const iframeRect = iframeEl.getBoundingClientRect();
-      const menuX = iframeRect.left + e.clientX;
-      const menuY = iframeRect.top + e.clientY;
-      const items = [];
-      if (sugs.length === 0) {
-        items.push({ label: "(no suggestions)", action: () => {
-        } });
-      } else {
-        for (const s of sugs) {
-          items.push({
-            label: s,
-            emphasized: true,
-            action: () => replaceRange(iframeDoc, found.range, s)
-          });
-        }
-      }
-      items.push({ label: "---", action: () => {
-      } });
-      items.push({
-        label: `Add "${found.word}" to dictionary`,
-        action: () => addToUserDict(found.word, sp)
-      });
-      items.push({
-        label: "Ignore (this session)",
-        action: () => sp.add(found.word)
-      });
-      showSuggestionsMenu(document, menuX, menuY, items);
-    }).catch((err) => {
-      console.error("[spellcheck] dict load failed:", err);
+    const word = marker.textContent || "";
+    if (!word || !sp)
       return;
-    });
     e.preventDefault();
     e.stopPropagation();
+    const sugs = sp.suggest(word).slice(0, 7);
+    const iframeEl = editor2.iframeElement;
+    const iframeRect = iframeEl ? iframeEl.getBoundingClientRect() : { left: 0, top: 0 };
+    const items = [];
+    if (sugs.length === 0) {
+      items.push({ label: "(no suggestions)", action: () => {
+      } });
+    } else {
+      for (const s of sugs) {
+        items.push({
+          label: s,
+          emphasized: true,
+          action: () => {
+            replaceMarker(editor2, marker, s);
+            scheduleDecorate();
+          }
+        });
+      }
+    }
+    items.push({ label: "", action: () => {
+    }, separator: true });
+    items.push({
+      label: `Add "${word}" to dictionary`,
+      action: () => {
+        if (sp)
+          addToUserDict(word, sp);
+        scheduleDecorate();
+      }
+    });
+    items.push({
+      label: "Ignore (this session)",
+      action: () => {
+        if (sp)
+          sp.add(word);
+        scheduleDecorate();
+      }
+    });
+    showSuggestionsMenu(document, iframeRect.left + e.clientX, iframeRect.top + e.clientY, items);
   }, true);
 }
-var import_nspell, USER_DICT_KEY, spellPromise;
+var import_nspell, USER_DICT_KEY, MARKER_ATTR, DECORATE_DEBOUNCE_MS, MIN_WORD_LEN, SKIP_TAGS, spellPromise;
 var init_spellcheck = __esm({
   "client/compose/spellcheck.js"() {
     "use strict";
     import_nspell = __toESM(require_lib(), 1);
     USER_DICT_KEY = "mailx-user-dict";
+    MARKER_ATTR = "data-mailx-spellerror";
+    DECORATE_DEBOUNCE_MS = 500;
+    MIN_WORD_LEN = 3;
+    SKIP_TAGS = /* @__PURE__ */ new Set(["BLOCKQUOTE", "CODE", "PRE", "A", "SCRIPT", "STYLE", "KBD", "SAMP", "VAR"]);
     spellPromise = null;
   }
 });