@bobfrankston/rmfmail 1.1.149 → 1.1.151

package/client/compose/compose.bundle.js

@@ -1947,6 +1947,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 +2037,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;