@bobfrankston/rmfmail 1.1.243 → 1.1.244

package/client/compose/compose.bundle.js

@@ -948,8 +948,8 @@ var require_lib = __commonJS({
     "use strict";
     var buffer = require_is_buffer();
     var affix = require_affix();
-    module.exports = NSpell3;
-    var proto = NSpell3.prototype;
+    module.exports = NSpell2;
+    var proto = NSpell2.prototype;
     proto.correct = require_correct();
     proto.suggest = require_suggest();
     proto.spell = require_spell();
@@ -958,11 +958,11 @@ var require_lib = __commonJS({
     proto.wordCharacters = require_word_characters();
     proto.dictionary = require_dictionary2();
     proto.personal = require_personal();
-    function NSpell3(aff, dic) {
+    function NSpell2(aff, dic) {
       var index = -1;
       var dictionaries;
-      if (!(this instanceof NSpell3)) {
-        return new NSpell3(aff, dic);
+      if (!(this instanceof NSpell2)) {
+        return new NSpell2(aff, dic);
       }
       if (typeof aff === "string" || buffer(aff)) {
         if (typeof dic === "string" || buffer(dic)) {
@@ -2329,438 +2329,12 @@ var spellcheck_exports = {};
 __export(spellcheck_exports, {
   wireSpellcheck: () => wireSpellcheck
 });
-async function getSpell2() {
-  if (spellPromise2)
-    return spellPromise2;
-  spellPromise2 = (async () => {
-    const [affRes, dicRes] = await Promise.all([
-      fetch("../lib/dict/en.aff"),
-      fetch("../lib/dict/en.dic")
-    ]);
-    if (!affRes.ok || !dicRes.ok) {
-      throw new Error(`spellcheck: dict fetch failed (aff=${affRes.status} dic=${dicRes.status})`);
-    }
-    const [aff, dic] = await Promise.all([affRes.text(), dicRes.text()]);
-    const sp = new import_nspell2.default({ aff, dic });
-    try {
-      const raw = localStorage.getItem(USER_DICT_KEY2);
-      if (raw)
-        for (const w of JSON.parse(raw))
-          sp.add(w);
-    } catch {
-    }
-    getUserDict().then((cloud) => {
-      const cloudArr = Array.isArray(cloud) ? cloud : [];
-      for (const w of cloudArr)
-        sp.add(w);
-      let local = [];
-      try {
-        const raw = localStorage.getItem(USER_DICT_KEY2);
-        local = raw ? JSON.parse(raw) : [];
-      } catch {
-        local = [];
-      }
-      const cloudSet = new Set(cloudArr);
-      const localOnly = local.filter((w) => !cloudSet.has(w));
-      if (localOnly.length > 0) {
-        addUserDictWords(localOnly).catch((e) => console.error("[spell] reconcile:", e));
-      }
-      try {
-        const merged = [.../* @__PURE__ */ new Set([...local, ...cloudArr])];
-        localStorage.setItem(USER_DICT_KEY2, JSON.stringify(merged));
-      } catch {
-      }
-    }).catch(() => {
-    });
-    return sp;
-  })();
-  return spellPromise2;
-}
-function addToUserDict2(word, sp) {
-  try {
-    const raw = localStorage.getItem(USER_DICT_KEY2);
-    const arr = raw ? JSON.parse(raw) : [];
-    if (!arr.includes(word)) {
-      arr.push(word);
-      localStorage.setItem(USER_DICT_KEY2, JSON.stringify(arr));
-    }
-  } catch {
-  }
-  sp.add(word);
-  addUserDictWord(word).catch((e) => console.error("[spell] addUserDictWord:", e));
-}
-function decorate(editor2, sp) {
-  const body = editor2.getBody?.();
-  const doc = editor2.getDoc?.();
-  if (!body || !doc)
-    return;
-  const _activeSel = doc.getSelection();
-  if (_activeSel && _activeSel.rangeCount > 0 && !_activeSel.isCollapsed)
-    return;
-  let savedFocusNode = null;
-  let savedFocusOffset = 0;
-  const _preSel = doc.getSelection();
-  if (_preSel && _preSel.rangeCount > 0) {
-    savedFocusNode = _preSel.focusNode;
-    savedFocusOffset = _preSel.focusOffset;
-  }
-  const savedAbs = caretAbsOffsetFromBody(body);
-  const scroller = doc.scrollingElement || doc.documentElement;
-  const savedScrollTop = scroller?.scrollTop ?? 0;
-  const savedBodyScrollTop = body.scrollTop;
-  try {
-    editor2.undoManager?.ignore?.(() => {
-      const old = body.querySelectorAll(`span[${MARKER_ATTR2}]`);
-      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_TAGS2.has(p.tagName)) {
-              return NodeFilter.FILTER_REJECT;
-            }
-            p = p.parentNode;
-          }
-          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;
-      const EMAIL_RE = /[^\s@<>()]+@[^\s@<>()]+\.[^\s@<>()]+/g;
-      while (n) {
-        const tn = n;
-        const text = tn.data;
-        const emailRanges = [];
-        EMAIL_RE.lastIndex = 0;
-        let em;
-        while ((em = EMAIL_RE.exec(text)) !== null) {
-          emailRanges.push([em.index, em.index + em[0].length]);
-        }
-        let m;
-        WORD_RE.lastIndex = 0;
-        while ((m = WORD_RE.exec(text)) !== null) {
-          const word = m[0];
-          if (word.length < MIN_WORD_LEN2)
-            continue;
-          const wStart = m.index, wEnd = m.index + word.length;
-          if (emailRanges.some(([s, e]) => wStart < e && wEnd > s))
-            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 });
-        }
-        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_ATTR2, "1");
-        try {
-          range.surroundContents(span);
-        } catch {
-        }
-      }
-    });
-  } finally {
-    let restored = false;
-    if (savedFocusNode && body.contains(savedFocusNode)) {
-      try {
-        const range = doc.createRange();
-        const maxOffset = savedFocusNode.nodeType === Node.TEXT_NODE ? savedFocusNode.data.length : savedFocusNode.childNodes.length;
-        range.setStart(savedFocusNode, Math.min(savedFocusOffset, maxOffset));
-        range.collapse(true);
-        const sel = doc.getSelection();
-        if (sel) {
-          sel.removeAllRanges();
-          sel.addRange(range);
-          restored = true;
-        }
-      } catch {
-      }
-    }
-    if (!restored && savedAbs != null)
-      restoreCaretFromAbsOffset(body, savedAbs);
-    if (scroller && scroller.scrollTop !== savedScrollTop)
-      scroller.scrollTop = savedScrollTop;
-    if (body.scrollTop !== savedBodyScrollTop)
-      body.scrollTop = savedBodyScrollTop;
-  }
-}
-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) {
-  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_ATTR2}] {
-            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_ATTR2, (nodes) => {
-      for (const node of nodes) {
-        if (typeof node.unwrap === "function")
-          node.unwrap();
-      }
-    });
-  } catch (e) {
-    console.warn("[spellcheck] serializer filter setup failed:", e);
-  }
-}
-function showSuggestionsMenu2(parentDoc, x, y, items) {
-  parentDoc.getElementById("mailx-spell-menu")?.remove();
-  const menu = parentDoc.createElement("div");
-  menu.id = "mailx-spell-menu";
-  menu.style.cssText = `
-        position: fixed;
-        left: ${x}px; top: ${y}px;
-        z-index: 10000;
-        background: var(--color-bg, #fff);
-        color: var(--color-text, #222);
-        border: 1px solid var(--color-border, #ccc);
-        border-radius: 6px;
-        box-shadow: 0 4px 16px rgba(0,0,0,0.18);
-        padding: 4px 0;
-        font: 13px system-ui, sans-serif;
-        min-width: 180px;
-        max-width: 320px;
-    `;
-  for (const it of items) {
-    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);
-      continue;
-    }
-    const btn = parentDoc.createElement("button");
-    btn.type = "button";
-    btn.textContent = it.label;
-    btn.style.cssText = `
-            display: block; width: 100%; text-align: left;
-            padding: 5px 12px; border: none; background: none;
-            color: inherit; cursor: pointer; font: inherit;
-            ${it.emphasized ? "font-weight: 600;" : ""}
-        `;
-    btn.addEventListener("mouseenter", () => {
-      btn.style.background = "var(--color-bg-hover, #eef)";
-    });
-    btn.addEventListener("mouseleave", () => {
-      btn.style.background = "none";
-    });
-    btn.addEventListener("click", () => {
-      try {
-        it.action();
-      } finally {
-        menu.remove();
-      }
-    });
-    menu.appendChild(btn);
-  }
-  parentDoc.body.appendChild(menu);
-  const r = menu.getBoundingClientRect();
-  if (r.right > window.innerWidth)
-    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();
-    for (const d of docs) {
-      d.removeEventListener("mousedown", dismiss2, true);
-      d.removeEventListener("keydown", dismiss2, true);
-    }
-  };
-  setTimeout(() => {
-    for (const d of docs) {
-      d.addEventListener("mousedown", dismiss2, true);
-      d.addEventListener("keydown", dismiss2, true);
-    }
-  }, 0);
-}
-function replaceMarker(editor2, marker, replacement) {
-  try {
-    editor2.focus();
-    editor2.selection.select(marker);
-    editor2.insertContent(editor2.dom.encode(replacement));
-  } catch {
-    const doc = editor2.getDoc();
-    const range = doc.createRange();
-    range.selectNode(marker);
-    range.deleteContents();
-    range.insertNode(doc.createTextNode(replacement));
-  }
-}
-function cleanupCorrected(editor2, sp) {
-  const body = editor2.getBody?.();
-  const doc = editor2.getDoc?.();
-  if (!body || !doc)
-    return;
-  const activeSel = doc.getSelection();
-  if (activeSel && activeSel.rangeCount > 0 && !activeSel.isCollapsed)
-    return;
-  const markers = body.querySelectorAll(`span[${MARKER_ATTR2}]`);
-  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_ATTR2)) {
-        caretMarker = p;
-        break;
-      }
-      p = p.parentNode;
-    }
-  }
-  const stale = [];
-  for (const m of markers) {
-    const word = m.textContent || "";
-    const isStale = !word || /\s/.test(word) || sp.correct(word);
-    if (!isStale && m === caretMarker)
-      continue;
-    if (isStale)
-      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;
   editor2.__mailxSpellWired = true;
-  const killNativeSpellcheck = () => {
+  let sp = null;
+  const killNative = () => {
     try {
       const body = editor2.getBody?.();
       if (body && body.getAttribute("spellcheck") !== "false") {
@@ -2769,129 +2343,182 @@ function wireSpellcheck(editor2) {
     } catch {
     }
   };
-  killNativeSpellcheck();
+  killNative();
   try {
     const body = editor2.getBody?.();
     if (body)
-      new MutationObserver(killNativeSpellcheck).observe(body, { attributes: true, attributeFilter: ["spellcheck"] });
+      new MutationObserver(killNative).observe(body, { attributes: true, attributeFilter: ["spellcheck"] });
   } catch {
   }
-  let sp = null;
-  let decorateTimer = null;
-  const scheduleDecorate = () => {
+  const ensureOverlay = () => {
+    const body = editor2.getBody?.();
+    const doc = editor2.getDoc?.();
+    if (!body || !doc)
+      return null;
+    let ov = doc.getElementById(OVERLAY_ID);
+    if (!ov || ov.parentNode !== body) {
+      ov?.remove();
+      ov = doc.createElement("div");
+      ov.id = OVERLAY_ID;
+      ov.setAttribute("contenteditable", "false");
+      ov.setAttribute("data-mce-bogus", "all");
+      ov.style.cssText = "position:absolute;top:0;left:0;pointer-events:none;user-select:none;";
+      body.appendChild(ov);
+    }
+    return ov;
+  };
+  const scan = () => {
     if (!sp)
       return;
-    if (decorateTimer)
-      clearTimeout(decorateTimer);
-    decorateTimer = setTimeout(() => {
-      decorateTimer = null;
-      if (sp)
-        decorate(editor2, sp);
-    }, DECORATE_DEBOUNCE_MS);
+    const body = editor2.getBody?.();
+    const doc = editor2.getDoc?.();
+    const ov = ensureOverlay();
+    if (!body || !doc || !ov)
+      return;
+    const walker = doc.createTreeWalker(body, NodeFilter.SHOW_TEXT, {
+      acceptNode(node) {
+        let p = node.parentNode;
+        while (p && p !== body) {
+          if (p.nodeType === Node.ELEMENT_NODE) {
+            const el = p;
+            if (el.id === OVERLAY_ID)
+              return NodeFilter.FILTER_REJECT;
+            if (SKIP_TAGS.has(el.tagName))
+              return NodeFilter.FILTER_REJECT;
+          }
+          p = p.parentNode;
+        }
+        return NodeFilter.FILTER_ACCEPT;
+      }
+    });
+    const bodyRect = body.getBoundingClientRect();
+    const sx = body.scrollLeft;
+    const sy = body.scrollTop;
+    const frag = doc.createDocumentFragment();
+    const wordRe = /[\p{L}][\p{L}'’-]*/gu;
+    for (let n = walker.nextNode(); n; n = walker.nextNode()) {
+      const text = n.data;
+      if (!text || text.length < MIN_WORD_LEN)
+        continue;
+      wordRe.lastIndex = 0;
+      let m;
+      while (m = wordRe.exec(text)) {
+        const w = m[0];
+        if (w.length < MIN_WORD_LEN)
+          continue;
+        if (sp.correct(w))
+          continue;
+        const r = doc.createRange();
+        r.setStart(n, m.index);
+        r.setEnd(n, m.index + w.length);
+        const rects = r.getClientRects();
+        for (let i = 0; i < rects.length; i++) {
+          const rect = rects[i];
+          if (rect.width < 1)
+            continue;
+          const sq = doc.createElement("div");
+          sq.style.cssText = `position:absolute;left:${(rect.left - bodyRect.left + sx).toFixed(1)}px;top:${(rect.bottom - bodyRect.top + sy - 3).toFixed(1)}px;width:${rect.width.toFixed(1)}px;height:3px;background:${WAVE} repeat-x left bottom;`;
+          frag.appendChild(sq);
+        }
+      }
+    }
+    ov.textContent = "";
+    ov.appendChild(frag);
   };
-  let cleanupTimer = null;
-  const scheduleCleanup = () => {
+  let scanTimer = null;
+  const scheduleScan = () => {
     if (!sp)
       return;
-    if (cleanupTimer)
-      clearTimeout(cleanupTimer);
-    cleanupTimer = setTimeout(() => {
-      cleanupTimer = null;
-      if (sp)
-        cleanupCorrected(editor2, sp);
-    }, CLEANUP_DEBOUNCE_MS);
+    if (scanTimer)
+      clearTimeout(scanTimer);
+    scanTimer = setTimeout(() => {
+      scanTimer = null;
+      scan();
+    }, SCAN_DEBOUNCE_MS);
   };
-  getSpell2().then((loaded) => {
+  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);
-  editor2.on("input nodechange setcontent paste keyup", scheduleCleanup);
+    scan();
+  }).catch((e) => console.error("[spellcheck] dict load failed:", e));
+  editor2.on("input keyup paste SetContent Undo Redo", scheduleScan);
+  editor2.on("ResizeEditor", scheduleScan);
+  try {
+    editor2.getDoc()?.addEventListener("scroll", scheduleScan, { passive: true });
+  } catch {
+  }
+  const apply = (node, start, end, replacement) => {
+    try {
+      const doc = editor2.getDoc();
+      const range = doc.createRange();
+      range.setStart(node, start);
+      range.setEnd(node, end);
+      editor2.focus();
+      editor2.selection.setRng(range);
+      editor2.insertContent(editor2.dom.encode(replacement));
+    } catch {
+      try {
+        const doc = editor2.getDoc();
+        const range = doc.createRange();
+        range.setStart(node, start);
+        range.setEnd(node, end);
+        range.deleteContents();
+        range.insertNode(doc.createTextNode(replacement));
+      } catch {
+      }
+    }
+    scheduleScan();
+  };
   const iframeDoc = editor2.getDoc();
   iframeDoc.addEventListener("contextmenu", (ev) => {
     const e = ev;
-    const target = e.target;
-    if (!target)
+    const body = editor2.getBody?.();
+    if (!body || !sp)
       return;
-    const marker = target.closest?.(`span[${MARKER_ATTR2}]`);
-    if (!marker)
+    const hit = getWordAtPoint(body, e.clientX, e.clientY);
+    if (!hit)
       return;
-    const word = marker.textContent || "";
-    if (!word || !sp)
+    if (sp.correct(hit.word))
       return;
     e.preventDefault();
     e.stopPropagation();
-    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 = [];
-    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();
-          }
-        });
-      }
-    }
+    const sugs = buildSuggestionList(hit.word, sp);
+    const items = sugs.length === 0 ? [{ label: "(no suggestions)", action: () => {
+    } }] : sugs.map((s) => ({
+      label: s,
+      emphasized: true,
+      action: () => apply(hit.node, hit.start, hit.end, s)
+    }));
     items.push({ label: "", action: () => {
     }, separator: true });
     items.push({
-      label: `Add "${word}" to dictionary`,
+      label: `Add "${hit.word}" to dictionary`,
       action: () => {
         if (sp)
-          addToUserDict2(word, sp);
-        scheduleDecorate();
+          addToUserDict(hit.word, sp);
+        scheduleScan();
       }
     });
     items.push({
       label: "Ignore (this session)",
       action: () => {
         if (sp)
-          sp.add(word);
-        scheduleDecorate();
+          sp.add(hit.word);
+        scheduleScan();
       }
     });
-    showSuggestionsMenu2(document, iframeRect.left + e.clientX, iframeRect.top + e.clientY, items);
+    const iframeEl = editor2.iframeElement;
+    const rect = iframeEl ? iframeEl.getBoundingClientRect() : { left: 0, top: 0 };
+    showSuggestionsMenu(document, rect.left + e.clientX, rect.top + e.clientY, items, [iframeDoc]);
   }, true);
 }
-var import_nspell2, USER_DICT_KEY2, MARKER_ATTR2, DECORATE_DEBOUNCE_MS, CLEANUP_DEBOUNCE_MS, MIN_WORD_LEN2, SKIP_TAGS2, spellPromise2;
+var SCAN_DEBOUNCE_MS, WAVE, OVERLAY_ID;
 var init_spellcheck = __esm({
   "client/compose/spellcheck.js"() {
     "use strict";
-    import_nspell2 = __toESM(require_lib(), 1);
-    init_api_client();
-    USER_DICT_KEY2 = "mailx-user-dict";
-    MARKER_ATTR2 = "data-mailx-spellerror";
-    DECORATE_DEBOUNCE_MS = 1200;
-    CLEANUP_DEBOUNCE_MS = 300;
-    MIN_WORD_LEN2 = 3;
-    SKIP_TAGS2 = /* @__PURE__ */ new Set(["BLOCKQUOTE", "CODE", "PRE", "A", "SCRIPT", "STYLE", "KBD", "SAMP", "VAR"]);
-    spellPromise2 = null;
+    init_spellcheck_core();
+    SCAN_DEBOUNCE_MS = 600;
+    WAVE = `url("data:image/svg+xml,${encodeURIComponent('<svg xmlns="http://www.w3.org/2000/svg" width="6" height="3"><path d="M0 2 Q1.5 0 3 2 T6 2" stroke="#d33" fill="none" stroke-width="1"/></svg>')}")`;
+    OVERLAY_ID = "mailx-spell-overlay";
   }
 });