@bobfrankston/rmfmail 1.1.151 → 1.1.152

package/client/lib/rmf-tiny.js

@@ -249,41 +249,74 @@ export async function createTinyMceEditor(container, opts = {}) {
                 // Ctrl+- for its built-in page zoom, so we have to call
                 // preventDefault in the capture phase to win the race.
                 // Bound below in the "init" handler once the iframe doc exists.
-                // Typing right after a link must not extend the link. When a
-                // printable character is about to be inserted with the caret
+                // Typing right after a link must not extend the link. When
+                // any text insertion is about to happen with the caret
                 // collapsed at the very end of an <a>, hop the caret to just
                 // after the <a> first — otherwise contenteditable keeps
                 // appending into the link and the whole sentence turns into
                 // link text (Bob 2026-05-18: "I typed a URL but it then
-                // included everything else I typed in the URL text"). Covers
-                // autolink, pasted URLs, and hand-made links alike.
-                ed.on("keypress", (e) => {
-                    if (e.ctrlKey || e.altKey || e.metaKey)
+                // included everything else I typed in the URL text"; Bob
+                // 2026-05-25 reconfirmed). Covers autolink, pasted URLs,
+                // hand-made links, IME composition, and clipboard paste.
+                //
+                // Uses `beforeinput` (modern, fires for ALL text insertion
+                // kinds — keypress is deprecated and silently skips IME /
+                // paste / autocomplete on Chromium). Done as a raw DOM
+                // listener so it runs BEFORE TinyMCE's own beforeinput
+                // handling, which is what reaches into the <a> and extends
+                // it. Re-bound on every `init` (the iframe doc is recreated
+                // on setContent, fullscreen, etc.).
+                const installLinkEscape = () => {
+                    const doc = ed.getDoc();
+                    if (!doc || doc.__rmfLinkEscapeInstalled)
                         return;
-                    const sel = ed.selection;
-                    const rng = sel.getRng();
-                    if (!rng || !rng.collapsed)
-                        return;
-                    const a = ed.dom.getParent(sel.getNode(), "a");
-                    if (!a)
-                        return;
-                    // Range from the caret to just after the <a>: no text in
-                    // it ⇒ the caret sits at the link's trailing edge.
-                    let tail;
-                    try {
-                        tail = rng.cloneRange();
-                        tail.setEndAfter(a);
-                    }
-                    catch {
-                        return;
-                    }
-                    if (tail.toString().length > 0)
-                        return;
-                    const after = ed.getDoc().createRange();
-                    after.setStartAfter(a);
-                    after.collapse(true);
-                    sel.setRng(after);
-                });
+                    doc.__rmfLinkEscapeInstalled = true;
+                    doc.addEventListener("beforeinput", (e) => {
+                        // Only intercept text-insertion kinds. Deletes,
+                        // formatting, history nav don't extend links.
+                        const kind = e.inputType || "";
+                        const isInsert = kind === "insertText"
+                            || kind === "insertCompositionText"
+                            || kind === "insertFromPaste"
+                            || kind === "insertFromDrop"
+                            || kind === "insertFromComposition";
+                        if (!isInsert)
+                            return;
+                        const sel = doc.getSelection();
+                        if (!sel || sel.rangeCount === 0)
+                            return;
+                        const rng = sel.getRangeAt(0);
+                        if (!rng.collapsed)
+                            return;
+                        const node = rng.startContainer;
+                        const a = (node.nodeType === Node.ELEMENT_NODE ? node : node.parentNode);
+                        if (!a)
+                            return;
+                        const link = a.closest?.("a");
+                        if (!link)
+                            return;
+                        // Range from caret to end-of-link: empty ⇒ caret is
+                        // at the link's trailing edge. Anything else means
+                        // mid-link edit, which we want to leave alone.
+                        let tail;
+                        try {
+                            tail = rng.cloneRange();
+                            tail.setEndAfter(link);
+                        }
+                        catch {
+                            return;
+                        }
+                        if (tail.toString().length > 0)
+                            return;
+                        const after = doc.createRange();
+                        after.setStartAfter(link);
+                        after.collapse(true);
+                        sel.removeAllRanges();
+                        sel.addRange(after);
+                    }, true);
+                };
+                ed.on("init", installLinkEscape);
+                ed.on("SetContent", installLinkEscape);
                 ed.on("init", () => {
                     // Engage WebView2's native spellcheck. TinyMCE's own
                     // `browser_spellcheck: true` is a no-op — its code path

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bobfrankston/rmfmail",
-  "version": "1.1.151",
+  "version": "1.1.152",
   "description": "Local-first email client with IMAP sync and standalone native app",
   "type": "module",
   "main": "bin/mailx.js",
@@ -45,7 +45,7 @@
     "@bobfrankston/msger": "^0.1.383",
     "@bobfrankston/node-tcp-transport": "^0.1.8",
     "@bobfrankston/oauthsupport": "^1.0.27",
-    "@bobfrankston/rmf-tiny": "^0.1.23",
+    "@bobfrankston/rmf-tiny": "^0.1.24",
     "@bobfrankston/smtp-direct": "^0.1.8",
     "@bobfrankston/tcp-transport": "^0.1.6",
     "@capacitor/android": "^8.3.0",
@@ -125,7 +125,7 @@
       "@bobfrankston/msger": "^0.1.383",
       "@bobfrankston/node-tcp-transport": "^0.1.8",
       "@bobfrankston/oauthsupport": "^1.0.27",
-      "@bobfrankston/rmf-tiny": "^0.1.23",
+      "@bobfrankston/rmf-tiny": "^0.1.24",
       "@bobfrankston/smtp-direct": "^0.1.8",
       "@bobfrankston/tcp-transport": "^0.1.6",
       "@capacitor/android": "^8.3.0",