@bobfrankston/rmfmail 1.1.150 → 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();
@@ -1947,6 +1964,13 @@ function decorate(editor2, sp) {
   const doc = editor2.getDoc?.();
   if (!body || !doc)
     return;
+  let savedFocusNode = null;
+  let savedFocusOffset = 0;
+  const _preSel = doc.getSelection();
+  if (_preSel && _preSel.rangeCount > 0) {
+    savedFocusNode = _preSel.focusNode;
+    savedFocusOffset = _preSel.focusOffset;
+  }
   const savedAbs = caretAbsOffsetFromBody(body);
   const scroller = doc.scrollingElement || doc.documentElement;
   const savedScrollTop = scroller?.scrollTop ?? 0;
@@ -2030,7 +2054,23 @@ function decorate(editor2, sp) {
       }
     });
   } finally {
-    if (savedAbs != null)
+    let restored = false;
+    if (savedFocusNode && body.contains(savedFocusNode)) {
+      try {
+        const range = doc.createRange();
+        const maxOffset = savedFocusNode.nodeType === Node.TEXT_NODE ? savedFocusNode.data.length : savedFocusNode.childNodes.length;
+        range.setStart(savedFocusNode, Math.min(savedFocusOffset, maxOffset));
+        range.collapse(true);
+        const sel = doc.getSelection();
+        if (sel) {
+          sel.removeAllRanges();
+          sel.addRange(range);
+          restored = true;
+        }
+      } catch {
+      }
+    }
+    if (!restored && savedAbs != null)
       restoreCaretFromAbsOffset(body, savedAbs);
     if (scroller && scroller.scrollTop !== savedScrollTop)
       scroller.scrollTop = savedScrollTop;