@bobfrankston/rmfmail 1.2.184 → 1.2.185

package/client/compose/compose.bundle.js

@@ -2080,7 +2080,9 @@ async function createTinyMceEditor(container2, opts = {}) {
       plugins: "lists advlist link table code codesample image searchreplace autolink wordcount emoticons charmap insertdatetime quickbars nonbreaking directionality help",
       toolbar: [
         "undo redo | bold italic underline strikethrough | forecolor backcolor",
-        "bullist numlist outdent indent | link table image code rmfcode | emoticons charmap | help"
+        // blockquote on the main bar (was quickbar-only) — Bob
+        // 2026-07-28: pasted/inserted text needs a one-click quote.
+        "blockquote bullist numlist outdent indent | link table image code rmfcode | emoticons charmap | help"
       ].join(" | "),
       // Include "tools" so wordcount and searchreplace are reachable.
       menubar: "file edit view insert format tools",
@@ -2411,9 +2413,9 @@ async function createTinyMceEditor(container2, opts = {}) {
             onSubmit: (api) => {
               const data = api.getData();
               const lang = data.language || "text";
-              const esc = (s) => String(s).replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
+              const esc2 = (s) => String(s).replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
               const borderStyle = data.border ? ` style="${Object.entries(BORDER_STYLES).map(([k, v]) => `${k}:${v}`).join(";")}"` : "";
-              const html = `<pre class="language-${lang}"${borderStyle}><code>${esc(data.code || "")}</code></pre>`;
+              const html = `<pre class="language-${lang}"${borderStyle}><code>${esc2(data.code || "")}</code></pre>`;
               if (preEl && preEl.parentNode) {
                 ed.dom.setOuterHTML(preEl, html);
               } else {
@@ -3100,8 +3102,8 @@ function initHarperLint(ed) {
       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);
+        const esc2 = replacement.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
+        nat.insertContent(esc2);
       } else {
         const sel = (doc.defaultView || window).getSelection();
         if (!sel)
@@ -3369,6 +3371,7 @@ Switch editors via **Settings \u2192 Editor \u2192 Quill | tiptap**.
 | Undo / Redo | Ctrl+Z / Ctrl+Y | (no toolbar button) |
 | Spell-check | (browser native \u2014 red underlines) | right-click word |
 | Paste plain text | Ctrl+Shift+V | (browser native) |
+| Paste markdown as formatting | (automatic) | Pasted plain text that looks like markdown (headings, \`- \` lists, \`> \` quotes, \\*\\*bold\\*\\*, code fences, pipe tables) converts to real formatting \u2014 blockquotes, lists, tables \u2014 instead of flat text. Ordinary prose is never touched; rich (HTML) clipboards keep their own markup. |
 
 ## Quill-only
 
@@ -3440,6 +3443,152 @@ toolbar \u2014 sending still works.
   }
 });
 
+// client/compose/paste-markdown.js
+function looksLikeMarkdown(text) {
+  if (!text || text.length > 2e5)
+    return false;
+  const lines = text.split(/\r?\n/);
+  const fences = text.match(/^\s*```/gm);
+  if (fences && fences.length >= 2)
+    return true;
+  for (let i = 1; i < lines.length; i++) {
+    if (/^\s*\|/.test(lines[i - 1]) && /^\s*\|[\s\-:|]+\|?\s*$/.test(lines[i]) && lines[i].includes("-"))
+      return true;
+  }
+  let signals = 0;
+  if (lines.some((l) => /^#{1,6}\s+\S/.test(l)))
+    signals++;
+  if (lines.filter((l) => /^\s*[-*+]\s+\S/.test(l)).length >= 2)
+    signals++;
+  if (lines.filter((l) => /^\s*\d+[.)]\s+\S/.test(l)).length >= 2)
+    signals++;
+  if (/\*\*[^*\n]+\*\*/.test(text))
+    signals++;
+  if (/\[[^\]\n]+\]\([^)\s]+\)/.test(text))
+    signals++;
+  if (lines.filter((l) => /^>\s?/.test(l)).length >= 2)
+    signals++;
+  return signals >= 2;
+}
+function esc(s) {
+  return s.replace(/[&<>"']/g, (c) => ({ "&": "&amp;", "<": "&lt;", ">": "&gt;", '"': "&quot;", "'": "&#39;" })[c]);
+}
+function inlineMd(s) {
+  const codeSpans = [];
+  const TOK = "\0";
+  let t = esc(s).replace(/`([^`]+)`/g, (_m, code) => {
+    codeSpans.push(`<code style="font-family:Consolas,monospace;background:#f4f4f4;padding:1px 4px;border-radius:3px;">${code}</code>`);
+    return TOK + (codeSpans.length - 1) + TOK;
+  });
+  t = t.replace(/\*\*([^*\n]+)\*\*/g, "<b>$1</b>").replace(/(?<![\w*])\*([^*\n]+)\*(?![\w*])/g, "<i>$1</i>").replace(/\[([^\]\n]+)\]\(([^)\s]+)\)/g, (_m, txt, url) => /^(https?|mailto):/i.test(url) ? `<a href="${url}">${txt}</a>` : `${txt} (${url})`).replace(/(?<!["'=>[\w])(https?:\/\/[^\s<>"')\]]+)/g, '<a href="$1">$1</a>');
+  return t.replace(/(\d+)/g, (_m, i) => codeSpans[Number(i)] ?? "");
+}
+var BLOCKQUOTE_STYLE = "margin:4px 0 4px 0;padding:2px 0 2px 12px;border-left:3px solid #b8b8b8;";
+var PRE_STYLE = "font-family:Consolas,monospace;font-size:0.95em;background:#f4f4f4;padding:8px 10px;border-radius:4px;overflow-x:auto;";
+function markdownToEmailHtml(md) {
+  const lines = md.split(/\r?\n/);
+  const out = [];
+  let i = 0;
+  while (i < lines.length) {
+    const line = lines[i];
+    if (/^\s*```/.test(line)) {
+      const buf = [];
+      i++;
+      while (i < lines.length && !/^\s*```/.test(lines[i])) {
+        buf.push(lines[i]);
+        i++;
+      }
+      i++;
+      out.push(`<pre style="${PRE_STYLE}">${esc(buf.join("\n"))}</pre>`);
+      continue;
+    }
+    const h = /^(#{1,6})\s+(.*)$/.exec(line);
+    if (h) {
+      const level = Math.min(6, Math.max(3, h[1].length + 2));
+      out.push(`<h${level} style="margin:10px 0 4px 0;">${inlineMd(h[2])}</h${level}>`);
+      i++;
+      continue;
+    }
+    if (/^>\s?/.test(line)) {
+      const buf = [];
+      while (i < lines.length && /^>\s?/.test(lines[i])) {
+        buf.push(lines[i].replace(/^>\s?/, ""));
+        i++;
+      }
+      out.push(`<blockquote style="${BLOCKQUOTE_STYLE}">${markdownToEmailHtml(buf.join("\n"))}</blockquote>`);
+      continue;
+    }
+    if (/^\s*\|/.test(line) && i + 1 < lines.length && /^\s*\|[\s\-:|]+\|?\s*$/.test(lines[i + 1])) {
+      const rows = [];
+      while (i < lines.length && /^\s*\|/.test(lines[i])) {
+        rows.push(lines[i].trim().replace(/^\||\|$/g, "").split("|").map((c) => c.trim()));
+        i++;
+      }
+      const head = rows[0];
+      const data = rows.slice(2);
+      const cellStyle = "border:1px solid #ccc;padding:4px 10px;text-align:left;";
+      out.push(`<table style="border-collapse:collapse;margin:6px 0;"><thead><tr>${head.map((c) => `<th style="${cellStyle}">${inlineMd(c)}</th>`).join("")}</tr></thead><tbody>${data.map((r) => `<tr>${r.map((c) => `<td style="${cellStyle}">${inlineMd(c)}</td>`).join("")}</tr>`).join("")}</tbody></table>`);
+      continue;
+    }
+    if (/^\s*[-*+]\s+\S/.test(line)) {
+      const items = [];
+      while (i < lines.length && /^\s*[-*+]\s+/.test(lines[i])) {
+        items.push(lines[i].replace(/^\s*[-*+]\s+/, ""));
+        i++;
+      }
+      out.push(`<ul style="margin:4px 0 4px 24px;padding:0;">${items.map((it) => `<li>${inlineMd(it)}</li>`).join("")}</ul>`);
+      continue;
+    }
+    if (/^\s*\d+[.)]\s+\S/.test(line)) {
+      const items = [];
+      while (i < lines.length && /^\s*\d+[.)]\s+/.test(lines[i])) {
+        items.push(lines[i].replace(/^\s*\d+[.)]\s+/, ""));
+        i++;
+      }
+      out.push(`<ol style="margin:4px 0 4px 24px;padding:0;">${items.map((it) => `<li>${inlineMd(it)}</li>`).join("")}</ol>`);
+      continue;
+    }
+    if (/^\s*(---+|\*\*\*+|___+)\s*$/.test(line)) {
+      out.push(`<hr style="border:none;border-top:1px solid #ccc;margin:8px 0;">`);
+      i++;
+      continue;
+    }
+    if (/^\s*$/.test(line)) {
+      i++;
+      continue;
+    }
+    {
+      const buf = [];
+      while (i < lines.length && !/^\s*$/.test(lines[i]) && !/^\s*```|^#{1,6}\s+\S|^>\s?|^\s*[-*+]\s+\S|^\s*\d+[.)]\s+\S/.test(lines[i]) && !(/^\s*\|/.test(lines[i]) && i + 1 < lines.length && /^\s*\|[\s\-:|]+\|?\s*$/.test(lines[i + 1]))) {
+        buf.push(lines[i]);
+        i++;
+      }
+      out.push(`<p style="margin:4px 0;">${buf.map(inlineMd).join("<br>")}</p>`);
+    }
+  }
+  return out.join("\n");
+}
+function wireMarkdownPaste(target, insertHtml) {
+  target.addEventListener("paste", (e) => {
+    try {
+      const cb = e.clipboardData;
+      if (!cb)
+        return;
+      if (cb.getData("text/html"))
+        return;
+      if (Array.from(cb.items).some((it) => it.kind === "file"))
+        return;
+      const plain = cb.getData("text/plain");
+      if (!plain || !looksLikeMarkdown(plain))
+        return;
+      e.preventDefault();
+      e.stopImmediatePropagation();
+      insertHtml(markdownToEmailHtml(plain));
+    } catch {
+    }
+  }, true);
+}
+
 // client/compose/editor.js
 function looksLikeUrl(s) {
   const t = s.trim();
@@ -3882,6 +4031,14 @@ function createQuillEditor(container2) {
         q.insertText(range.index, plain.trim(), { link: url });
         q.setSelection(range.index + plain.trim().length, 0);
       }
+      return;
+    }
+    if (plain && looksLikeMarkdown(plain)) {
+      consume();
+      const range = q.getSelection(true) || { index: q.getLength(), length: 0 };
+      if (range.length > 0)
+        q.deleteText(range.index, range.length);
+      q.clipboard.dangerouslyPasteHTML(range.index, markdownToEmailHtml(plain));
     }
   }, true);
   q.on("text-change", (delta, _old, source) => {
@@ -4157,6 +4314,14 @@ async function createTinyMceEditor2(container2, opts = {}) {
   const m = await Promise.resolve().then(() => (init_rmf_tiny(), rmf_tiny_exports));
   const cssPx = parseFloat(getComputedStyle(document.documentElement).getPropertyValue("--compose-font-size"));
   const ed = await m.createTinyMceEditor(container2, { cdnUrl, apiKey, onFiles: opts.onFiles, fontSizePx: Number.isFinite(cssPx) ? cssPx : void 0 });
+  try {
+    const native = ed.nativeEditor;
+    const body = native?.getBody?.();
+    if (native && body) {
+      wireMarkdownPaste(body, (html) => native.insertContent(html));
+    }
+  } catch {
+  }
   return ed;
 }
 
@@ -6032,8 +6197,8 @@ function showEditorHelpModal(md) {
   });
 }
 function renderMarkdownLite(md) {
-  const esc = (s) => s.replace(/[&<>"']/g, (c) => ({ "&": "&amp;", "<": "&lt;", ">": "&gt;", '"': "&quot;", "'": "&#39;" })[c]);
-  const inline = (s) => esc(s).replace(/`([^`]+)`/g, '<code style="background:var(--color-bg-surface,#f3f3f3);padding:1px 4px;border-radius:3px;">$1</code>').replace(/\*\*([^*]+)\*\*/g, "<strong>$1</strong>").replace(/(?<![*\w])\*([^*\n]+)\*(?!\w)/g, "<em>$1</em>").replace(/\[([^\]]+)\]\(([^)]+)\)/g, '<a href="$2" target="_blank" rel="noopener">$1</a>');
+  const esc2 = (s) => s.replace(/[&<>"']/g, (c) => ({ "&": "&amp;", "<": "&lt;", ">": "&gt;", '"': "&quot;", "'": "&#39;" })[c]);
+  const inline = (s) => esc2(s).replace(/`([^`]+)`/g, '<code style="background:var(--color-bg-surface,#f3f3f3);padding:1px 4px;border-radius:3px;">$1</code>').replace(/\*\*([^*]+)\*\*/g, "<strong>$1</strong>").replace(/(?<![*\w])\*([^*\n]+)\*(?!\w)/g, "<em>$1</em>").replace(/\[([^\]]+)\]\(([^)]+)\)/g, '<a href="$2" target="_blank" rel="noopener">$1</a>');
   const lines = md.split(/\r?\n/);
   const out = [];
   let i = 0;