@bobfrankston/rmfmail 1.1.137 → 1.1.139

package/client/compose/compose.bundle.js

@@ -701,7 +701,13 @@ async function createTinyMceEditor(container2, opts = {}) {
       // everything else so genuine HTML formatting (bold / italic /
       // tables / inline color) still comes through verbatim.
       content_style: [
-        "body { font-family: system-ui, sans-serif; font-size: 14px; }",
+        // High-contrast caret: a 1-2 px slate-coloured I-beam vanishes
+        // against white especially on hi-DPI displays. caret-color
+        // recolours the native insertion bar; caret-shape:block (CSS
+        // UI L4, Chromium 125+) widens it into a solid block. The
+        // block falls back to the default bar where unsupported, so
+        // the color alone still buys most of the visibility win.
+        "body { font-family: system-ui, sans-serif; font-size: 14px; caret-color: #d32f2f; caret-shape: block; }",
         "blockquote { border-left: 3px solid #c0c8d0; margin: 0 0 0 4px; padding: 2px 0 2px 10px; color: #555; }",
         "div.reply { margin-top: 0.5em; }",
         "div.reply > p:first-child { color: #666; font-size: 0.95em; margin: 0 0 4px 0; }",
@@ -3723,13 +3729,23 @@ function setupAutocomplete(input) {
     const { start, end } = tokenSpanAtCaret(val, caret);
     return val.substring(start, end).trim();
   }
-  function replaceCaretToken(replacement) {
+  function replaceCaretToken(replacement, contact) {
     const val = input.value;
     const caret = input.selectionStart ?? val.length;
     const { start, end } = tokenSpanAtCaret(val, caret);
     let before = val.substring(0, start);
-    const after = val.substring(end);
+    let after = val.substring(end);
     before = before.replace(/[ \t,]+$/, "");
+    if (contact) {
+      const haystack = `${contact.name} ${contact.email}`.toLowerCase();
+      const stripStranded = (s) => splitRecipients(s).map((p) => p.trim()).filter((p) => p.length > 0 && (p.includes("@") || !haystack.includes(p.toLowerCase()))).join(", ");
+      if (before) before = stripStranded(before);
+      const afterCore = after.replace(/^[\s,]+/, "").replace(/[\s,]+$/, "");
+      if (afterCore) {
+        const cleanedAfter = stripStranded(afterCore);
+        after = cleanedAfter ? ", " + cleanedAfter : "";
+      }
+    }
     const lead = before.length ? ", " : "";
     const isLast = after.trim() === "";
     const insert = lead + replacement + (isLast ? ", " : "");
@@ -3812,7 +3828,7 @@ function setupAutocomplete(input) {
               e.preventDefault();
               if (e.button !== 0) return;
               const display = formatRecipient(r.name, r.email);
-              replaceCaretToken(display);
+              replaceCaretToken(display, { name: r.name, email: r.email });
             });
             item.addEventListener("contextmenu", (e) => {
               e.preventDefault();