@bobfrankston/rmfmail 1.1.151 → 1.1.152

package/client/compose/compose.bundle.js

@@ -777,30 +777,47 @@ async function createTinyMceEditor(container2, opts = {}) {
             applyZoom();
           }
         });
-        ed.on("keypress", (e) => {
-          if (e.ctrlKey || e.altKey || e.metaKey)
+        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;
-          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) => {
+            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;
+            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", () => {
           try {
             const body = ed.getBody();