@bobfrankston/rmfmail 1.2.167 → 1.2.169

package/client/app.ts

@@ -5356,6 +5356,12 @@ getSettings().then((s: any) => {
         const px = Number(s.ui?.composeFontSize);
         fontEl.value = String(Number.isFinite(px) && px >= 8 && px <= 32 ? px : 15);
     }
+    const gcEl = document.getElementById("opt-grammar-check") as HTMLInputElement | null;
+    if (gcEl) {
+        const on = s.ui?.grammarCheck !== false;   // default ON
+        gcEl.checked = on;
+        try { localStorage.setItem("mailx-grammar-check", on ? "1" : "0"); } catch { /* */ }
+    }
 }).catch(() => {});
 
 document.getElementById("opt-compose-window")?.addEventListener("change", (e) => {
@@ -5367,6 +5373,18 @@ document.getElementById("opt-compose-window")?.addEventListener("change", (e) =>
     }).catch(() => {});
 });
 
+// Harper grammar squiggles in compose — same dual persistence as the
+// compose-window toggle: localStorage for the in-window compose iframe
+// (same origin), settings.ui for the popout's boot snapshot.
+document.getElementById("opt-grammar-check")?.addEventListener("change", (e) => {
+    const on = (e.target as HTMLInputElement).checked;
+    try { localStorage.setItem("mailx-grammar-check", on ? "1" : "0"); } catch { /* */ }
+    getSettings().then((settings: any) => {
+        settings.ui = { ...settings.ui, grammarCheck: on };
+        saveSettings(settings);
+    }).catch(() => {});
+});
+
 // Unified compose editing font size (px). Same sync-cache-then-persist shape
 // as saveEditorSetting: compose.ts reads `mailx-compose-font-size` from
 // localStorage at module load, so the very next compose-open is correct.

package/client/compose/compose.bundle.js

@@ -1069,6 +1069,7 @@ __export(api_client_exports, {
   getUnifiedInbox: () => getUnifiedInbox,
   getUserDict: () => getUserDict,
   getVersion: () => getVersion,
+  grammarLint: () => grammarLint,
   hasBccHistoryTo: () => hasBccHistoryTo,
   hasCcHistoryTo: () => hasCcHistoryTo,
   installConsoleCapture: () => installConsoleCapture,
@@ -1629,6 +1630,12 @@ async function openAttachment(accountId, uid, attachmentId, folderId, filename)
 async function getMessageSource(accountId, uid, folderId) {
   return ipc().getMessageSource(accountId, uid, folderId);
 }
+async function grammarLint(blocks) {
+  const fn = ipc().grammarLint;
+  if (!fn)
+    throw new Error("no grammarLint bridge");
+  return fn(blocks);
+}
 async function registerMailto() {
   const fn = ipc().registerMailto;
   if (!fn)
@@ -2914,6 +2921,277 @@ var init_spellcheck = __esm({
   }
 });
 
+// client/compose/harper-lint.js
+var harper_lint_exports = {};
+__export(harper_lint_exports, {
+  initHarperLint: () => initHarperLint
+});
+function initHarperLint(ed) {
+  let disposed = false;
+  let timer = null;
+  let placed = [];
+  let paintQueued = false;
+  let bridgeDead = false;
+  const target = () => {
+    try {
+      const nat = ed.nativeEditor;
+      if (nat?.getBody) {
+        const b = nat.getBody();
+        return b ? { root: b, doc: b.ownerDocument } : null;
+      }
+      return ed.root ? { root: ed.root, doc: ed.root.ownerDocument } : null;
+    } catch {
+      return null;
+    }
+  };
+  const overlayHost = (doc, root) => root === doc.body ? doc.documentElement : doc.body;
+  const clearOverlay = (doc) => {
+    doc.getElementById(OVERLAY_ID2)?.remove();
+    doc.getElementById(POPUP_ID)?.remove();
+  };
+  const collectBlocks = (root) => {
+    const kids = Array.from(root.children).filter((c) => c instanceof HTMLElement);
+    const blocks = (kids.length ? kids : [root]).filter((b) => b.tagName !== "BLOCKQUOTE" && !b.closest("blockquote") && !b.querySelector("blockquote"));
+    return blocks;
+  };
+  const blockText = (block, doc) => {
+    const walker = doc.createTreeWalker(block, NodeFilter.SHOW_TEXT);
+    const nodes = [];
+    let text = "";
+    for (let n = walker.nextNode(); n; n = walker.nextNode()) {
+      nodes.push({ node: n, from: text.length });
+      text += n.data;
+    }
+    return { text, nodes };
+  };
+  const spanToRange = (doc, nodes, start, end) => {
+    let a = null;
+    let b = null;
+    for (const e of nodes) {
+      const len = e.node.data.length;
+      if (!a && start >= e.from && start <= e.from + len)
+        a = { node: e.node, off: start - e.from };
+      if (end >= e.from && end <= e.from + len)
+        b = { node: e.node, off: end - e.from };
+    }
+    if (!a || !b)
+      return null;
+    try {
+      const r = doc.createRange();
+      r.setStart(a.node, a.off);
+      r.setEnd(b.node, b.off);
+      return r;
+    } catch {
+      return null;
+    }
+  };
+  const paint = () => {
+    if (disposed)
+      return;
+    const t = target();
+    if (!t)
+      return;
+    clearOverlay(t.doc);
+    if (placed.length === 0)
+      return;
+    const host = overlayHost(t.doc, t.root);
+    const ov = t.doc.createElement("div");
+    ov.id = OVERLAY_ID2;
+    ov.style.cssText = "position:absolute;left:0;top:0;width:0;height:0;overflow:visible;pointer-events:none;z-index:5;";
+    const win = t.doc.defaultView || window;
+    for (const p of placed) {
+      let rects = [];
+      try {
+        rects = p.range.getClientRects();
+      } catch {
+        continue;
+      }
+      for (const r of Array.from(rects)) {
+        if (r.width < 2)
+          continue;
+        const u = t.doc.createElement("div");
+        u.style.cssText = `position:absolute;left:${r.left + win.scrollX}px;top:${r.bottom + win.scrollY - 2}px;width:${r.width}px;height:0;border-bottom:2px dotted rgba(66,133,244,0.9);pointer-events:none;`;
+        ov.appendChild(u);
+      }
+    }
+    host.appendChild(ov);
+  };
+  const queuePaint = () => {
+    if (paintQueued || disposed)
+      return;
+    paintQueued = true;
+    requestAnimationFrame(() => {
+      paintQueued = false;
+      paint();
+    });
+  };
+  const lint = async () => {
+    if (disposed || bridgeDead)
+      return;
+    const t = target();
+    if (!t)
+      return;
+    const blocks = collectBlocks(t.root);
+    const texts = blocks.map((b) => blockText(b, t.doc));
+    let res;
+    try {
+      res = await grammarLint(texts.map((x) => x.text));
+    } catch {
+      bridgeDead = true;
+      clearOverlayAll();
+      return;
+    }
+    if (disposed)
+      return;
+    const next = [];
+    (res?.blocks || []).forEach((lints, i) => {
+      const tx = texts[i];
+      if (!tx)
+        return;
+      for (const l of lints || []) {
+        if (SKIP_KINDS.has(l.kind))
+          continue;
+        const range = spanToRange(t.doc, tx.nodes, l.start, l.end);
+        if (range)
+          next.push({ lint: l, range });
+      }
+    });
+    placed = next;
+    queuePaint();
+  };
+  const clearOverlayAll = () => {
+    const t = target();
+    if (t)
+      clearOverlay(t.doc);
+    placed = [];
+  };
+  const schedule = () => {
+    if (timer)
+      clearTimeout(timer);
+    timer = setTimeout(() => {
+      void lint();
+    }, DEBOUNCE_MS);
+  };
+  const applyFix = (p, replacement, doc) => {
+    try {
+      const nat = ed.nativeEditor;
+      if (nat?.selection?.setRng && nat?.insertContent) {
+        nat.selection.setRng(p.range);
+        const esc = replacement.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
+        nat.insertContent(esc);
+      } else {
+        const sel = (doc.defaultView || window).getSelection();
+        if (!sel)
+          return;
+        sel.removeAllRanges();
+        sel.addRange(p.range);
+        doc.execCommand("insertText", false, replacement);
+      }
+    } catch {
+    }
+    doc.getElementById(POPUP_ID)?.remove();
+    schedule();
+  };
+  const showPopup = (p, x, y, doc) => {
+    doc.getElementById(POPUP_ID)?.remove();
+    const pop = doc.createElement("div");
+    pop.id = POPUP_ID;
+    pop.style.cssText = `position:absolute;left:${x}px;top:${y + 6}px;z-index:2100;background:#fff;color:#1a1a1a;border:1px solid #bbb;border-radius:6px;box-shadow:0 4px 16px rgba(0,0,0,0.25);padding:6px 0;min-width:180px;max-width:340px;font:13px system-ui,sans-serif;`;
+    const msg = doc.createElement("div");
+    msg.style.cssText = "padding:4px 12px 6px;color:#555;border-bottom:1px solid #eee;";
+    msg.textContent = p.lint.message;
+    pop.appendChild(msg);
+    for (const s of p.lint.suggestions.slice(0, 5)) {
+      const item = doc.createElement("div");
+      item.style.cssText = "padding:6px 12px;cursor:pointer;font-weight:600;";
+      item.textContent = s;
+      item.addEventListener("mouseenter", () => {
+        item.style.background = "#eef3ff";
+      });
+      item.addEventListener("mouseleave", () => {
+        item.style.background = "";
+      });
+      item.addEventListener("mousedown", (e) => {
+        e.preventDefault();
+        e.stopPropagation();
+        applyFix(p, s, doc);
+      });
+      pop.appendChild(item);
+    }
+    if (p.lint.suggestions.length === 0) {
+      const none = doc.createElement("div");
+      none.style.cssText = "padding:6px 12px;color:#888;";
+      none.textContent = "(no suggestion \u2014 reword manually)";
+      pop.appendChild(none);
+    }
+    overlayHost(doc, target()?.root || doc.body).appendChild(pop);
+    const dismiss2 = () => {
+      pop.remove();
+      doc.removeEventListener("mousedown", dismiss2, true);
+    };
+    setTimeout(() => doc.addEventListener("mousedown", dismiss2, true), 0);
+  };
+  const onClick = (e) => {
+    if (disposed || placed.length === 0)
+      return;
+    const t = target();
+    if (!t)
+      return;
+    for (const p of placed) {
+      let rects = [];
+      try {
+        rects = Array.from(p.range.getClientRects());
+      } catch {
+        continue;
+      }
+      for (const r of rects) {
+        if (e.clientX >= r.left - 2 && e.clientX <= r.right + 2 && e.clientY >= r.top - 2 && e.clientY <= r.bottom + 4) {
+          const win = t.doc.defaultView || window;
+          showPopup(p, r.left + win.scrollX, r.bottom + win.scrollY, t.doc);
+          return;
+        }
+      }
+    }
+  };
+  const t0 = target();
+  ed.onContentChange(schedule);
+  if (t0) {
+    t0.doc.addEventListener("click", onClick);
+    t0.doc.addEventListener("scroll", queuePaint, true);
+    (t0.doc.defaultView || window).addEventListener("resize", queuePaint);
+  }
+  try {
+    ed.getScrollContainer()?.addEventListener("scroll", queuePaint);
+  } catch {
+  }
+  setTimeout(() => {
+    void lint();
+  }, 1500);
+  return () => {
+    disposed = true;
+    if (timer)
+      clearTimeout(timer);
+    clearOverlayAll();
+    const t = target();
+    if (t) {
+      t.doc.removeEventListener("click", onClick);
+      t.doc.removeEventListener("scroll", queuePaint, true);
+      (t.doc.defaultView || window).removeEventListener("resize", queuePaint);
+    }
+  };
+}
+var DEBOUNCE_MS, OVERLAY_ID2, POPUP_ID, SKIP_KINDS;
+var init_harper_lint = __esm({
+  "client/compose/harper-lint.js"() {
+    "use strict";
+    init_api_client();
+    DEBOUNCE_MS = 700;
+    OVERLAY_ID2 = "harper-overlay";
+    POPUP_ID = "harper-popup";
+    SKIP_KINDS = /* @__PURE__ */ new Set(["Spelling"]);
+  }
+});
+
 // client/compose/ghost-text.js
 var ghost_text_exports = {};
 __export(ghost_text_exports, {
@@ -4114,6 +4392,20 @@ async function tryEditor(type) {
       if (native.initialized) attach();
       else native.on("init", attach);
     }
+    try {
+      const bootGrammar = window.__rmfBootSettings?.ui?.grammarCheck;
+      let grammarOn = bootGrammar !== void 0 ? bootGrammar !== false : localStorage.getItem("mailx-grammar-check") !== "0";
+      if (grammarOn && ed) {
+        const attachHarper = () => {
+          Promise.resolve().then(() => (init_harper_lint(), harper_lint_exports)).then((m) => m.initHarperLint(ed)).catch(() => {
+          });
+        };
+        const native = ed.nativeEditor;
+        if (type === "tinymce" && native && !native.initialized) native.on("init", attachHarper);
+        else attachHarper();
+      }
+    } catch {
+    }
     return ed;
   } catch (e) {
     logClientEvent("compose-editor-create-failed", { type, error: String(e?.message || e) });