@bobfrankston/rmfmail 1.2.286 → 1.2.288

package/client/compose/compose.bundle.js

@@ -2686,7 +2686,15 @@ async function createTinyMceEditor(container2, opts = {}) {
       // window; TinyMCE's fullscreen plugin re-positions the container in
       // ways that produce a blank body, so it's not in the plugin list.
       menu: {
-        view: { title: "View", items: "rmfsource | visualaid visualchars visualblocks | preview | zoomIn zoomOut zoomReset" }
+        view: { title: "View", items: "rmfsource | visualaid visualchars visualblocks | preview | zoomIn zoomOut zoomReset" },
+        // Insert menu — TinyMCE's default list minus the items whose
+        // plugins we don't load (media, pagebreak, anchor, accordion),
+        // plus the two quoting items. Listed in full because naming a
+        // menu REPLACES its item list; the defaults do not carry over.
+        insert: {
+          title: "Insert",
+          items: "image link inserttable | rmfblockquote rmfquotepaste | rmfcode codesample charmap emoticons | hr nonbreaking insertdatetime"
+        }
       },
       // Disable the "Get all features" upsell badge that TinyMCE 6+
       // injects automatically when no premium plugins are listed.
@@ -3107,6 +3115,18 @@ async function createTinyMceEditor(container2, opts = {}) {
           text: "Code block\u2026",
           onAction: openCodeDialog
         });
+        ed.ui.registry.addMenuItem("rmfblockquote", {
+          icon: "quote",
+          text: "Blockquote",
+          onAction: () => ed.execCommand("mceBlockQuote")
+        });
+        ed.ui.registry.addMenuItem("rmfquotepaste", {
+          icon: "quote",
+          text: "Quoted text (paste)\u2026",
+          onAction: () => {
+            void pasteAsQuote(ed);
+          }
+        });
         ed.ui.registry.addMenuItem("rmfsource", {
           icon: "sourcecode",
           text: "HTML source\u2026",
@@ -3345,6 +3365,48 @@ async function createTinyMceEditor(container2, opts = {}) {
     nativeEditor: editor2
   };
 }
+async function pasteAsQuote(ed) {
+  const notify = (text, type) => {
+    try {
+      ed.notificationManager.open({ text, type, timeout: 4e3 });
+    } catch {
+    }
+  };
+  const escape = (s) => s.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
+  const fragment = (html2) => {
+    const marked = html2.match(/<!--\s*StartFragment\s*-->([\s\S]*?)<!--\s*EndFragment\s*-->/i);
+    const inner = marked ? marked[1] : html2.replace(/[\s\S]*<body[^>]*>|<\/body>[\s\S]*/gi, "");
+    return inner.trim();
+  };
+  let html = "";
+  try {
+    const clip = navigator.clipboard;
+    if (clip?.read) {
+      const items = await clip.read();
+      for (const item of items) {
+        if (!item.types.includes("text/html"))
+          continue;
+        html = fragment(await (await item.getType("text/html")).text());
+        break;
+      }
+    }
+    if (!html) {
+      const text = await navigator.clipboard?.readText?.() || "";
+      if (text.trim()) {
+        html = text.trim().split(/\n\s*\n/).map((para) => `<p>${escape(para).replace(/\n/g, "<br>")}</p>`).join("");
+      }
+    }
+  } catch (e) {
+    notify(`Could not read the clipboard: ${e?.message || e}`, "error");
+    return;
+  }
+  if (!html) {
+    notify("There is nothing on the clipboard to quote.", "warning");
+    return;
+  }
+  ed.insertContent(`<blockquote>${html}</blockquote>`);
+  ed.undoManager.add();
+}
 function openSourceDialog(editor2) {
   const SENTINEL = "\uE000";
   let offset = -1;
@@ -3710,7 +3772,13 @@ var init_spellcheck = __esm({
 // client/compose/harper-lint.js
 var harper_lint_exports = {};
 __export(harper_lint_exports, {
-  initHarperLint: () => initHarperLint
+  blockText: () => blockText,
+  caretOffset: () => caretOffset,
+  collectBlocks: () => collectBlocks,
+  initHarperLint: () => initHarperLint,
+  lineBox: () => lineBox,
+  sentenceStart: () => sentenceStart,
+  spanToRange: () => spanToRange
 });
 function initHarperLint(ed) {
   let disposed = false;
@@ -3735,42 +3803,6 @@ function initHarperLint(ed) {
     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;
@@ -3834,9 +3866,13 @@ function initHarperLint(ed) {
       const tx = texts[i];
       if (!tx)
         return;
+      const caret = caretOffset(t.doc, tx.nodes);
+      const writingFrom = caret < 0 ? -1 : sentenceStart(tx.text, caret);
       for (const l of lints || []) {
         if (SKIP_KINDS.has(l.kind))
           continue;
+        if (writingFrom >= 0 && l.end > writingFrom && l.start <= caret)
+          continue;
         const range = spanToRange(t.doc, tx.nodes, l.start, l.end);
         if (range)
           next.push({ lint: l, range });
@@ -3966,7 +4002,7 @@ function initHarperLint(ed) {
     }
   };
 }
-var DEBOUNCE_MS, OVERLAY_ID2, POPUP_ID, SKIP_KINDS;
+var DEBOUNCE_MS, OVERLAY_ID2, POPUP_ID, SKIP_KINDS, collectBlocks, LINE_BREAKING, blockText, lineBox, caretOffset, sentenceStart, spanToRange;
 var init_harper_lint = __esm({
   "client/compose/harper-lint.js"() {
     "use strict";
@@ -3975,6 +4011,100 @@ var init_harper_lint = __esm({
     OVERLAY_ID2 = "harper-overlay";
     POPUP_ID = "harper-popup";
     SKIP_KINDS = /* @__PURE__ */ new Set(["Spelling"]);
+    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;
+    };
+    LINE_BREAKING = /* @__PURE__ */ new Set([
+      "BR",
+      "P",
+      "DIV",
+      "LI",
+      "UL",
+      "OL",
+      "TR",
+      "TD",
+      "TH",
+      "TABLE",
+      "PRE",
+      "HR",
+      "BLOCKQUOTE",
+      "H1",
+      "H2",
+      "H3",
+      "H4",
+      "H5",
+      "H6",
+      "SECTION",
+      "ARTICLE",
+      "FIGURE"
+    ]);
+    blockText = (block, doc) => {
+      const walker = doc.createTreeWalker(block, NodeFilter.SHOW_TEXT | NodeFilter.SHOW_ELEMENT);
+      const nodes = [];
+      let text = "";
+      let pendingBreak = false;
+      for (let n = walker.nextNode(); n; n = walker.nextNode()) {
+        if (n.nodeType === Node.ELEMENT_NODE) {
+          if (LINE_BREAKING.has(n.tagName))
+            pendingBreak = true;
+          continue;
+        }
+        const data = n.data;
+        if (!data)
+          continue;
+        if (pendingBreak && text)
+          text += "\n";
+        pendingBreak = false;
+        nodes.push({ node: n, from: text.length });
+        text += data;
+      }
+      return { text, nodes };
+    };
+    lineBox = (node) => {
+      for (let e = node; e; e = e.parentNode)
+        if (e.nodeType === Node.ELEMENT_NODE && LINE_BREAKING.has(e.tagName))
+          return e;
+      return null;
+    };
+    caretOffset = (doc, nodes) => {
+      const sel = doc.getSelection?.();
+      if (!sel || !sel.focusNode)
+        return -1;
+      for (const e of nodes)
+        if (e.node === sel.focusNode)
+          return e.from + sel.focusOffset;
+      return -1;
+    };
+    sentenceStart = (text, caret) => {
+      const before = text.slice(0, caret);
+      const m = before.match(/[.!?…\n][^.!?…\n]*$/);
+      return m ? caret - (m[0].length - 1) : 0;
+    };
+    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;
+      if (lineBox(a.node) !== lineBox(b.node))
+        return null;
+      try {
+        const r = doc.createRange();
+        r.setStart(a.node, a.off);
+        r.setEnd(b.node, b.off);
+        return r;
+      } catch {
+        return null;
+      }
+    };
   }
 });