@bobfrankston/rmfmail 1.2.256 → 1.2.257

package/client/lib/rmf-tiny.js

@@ -997,7 +997,7 @@ export async function createTinyMceEditor(container, opts = {}) {
 function openSourceDialog(editor) {
     const SENTINEL = ""; // private-use area — never in real mail text
     let offset = -1;
-    let savedRng = null;
+    let bookmark = null;
     try {
         // The sentinel must be INSERTED, never SUBSTITUTED. selection.setContent()
         // replaces whatever is selected — and right-clicking an image selects the
@@ -1008,14 +1008,17 @@ function openSourceDialog(editor) {
         // range START first (that's the caret the source view should land on), then
         // restore the user's original selection once the sentinel is out again.
         const sel = editor.selection;
+        // Bookmark type 2 = non-intrusive path+offset (no marker nodes). A saved
+        // Range object is NOT good enough: setContent re-parses the block, so the
+        // saved range's container node is detached by the time we restore and the
+        // selection came back as the whole paragraph. The path is resolved at
+        // restore time, against a DOM the sentinel strip has put back as it was.
+        bookmark = sel.getBookmark(2, true);
         const rng = sel.getRng();
-        if (rng) {
-            savedRng = rng.cloneRange(); // live range — tracks the insert/strip
-            if (!rng.collapsed) {
-                const collapsed = rng.cloneRange();
-                collapsed.collapse(true);
-                sel.setRng(collapsed);
-            }
+        if (rng && !rng.collapsed) {
+            const collapsed = rng.cloneRange();
+            collapsed.collapse(true);
+            sel.setRng(collapsed);
         }
         // Insert the sentinel at the caret without polluting undo history.
         const insert = () => editor.selection.setContent(SENTINEL);
@@ -1043,11 +1046,11 @@ function openSourceDialog(editor) {
         catch { /* sentinel cleanup is best-effort */ }
         // Put the selection back where the user left it (the selected image
         // stays selected, so closing the dialog leaves the quickbar up).
-        if (savedRng) {
+        if (bookmark) {
             try {
-                editor.selection.setRng(savedRng);
+                editor.selection.moveToBookmark(bookmark);
             }
-            catch { /* range invalidated by the strip — caret stays put */ }
+            catch { /* path no longer resolves — caret stays where the sentinel was */ }
         }
     }
     catch { /* fall through to a plain source view at offset 0 */ }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bobfrankston/rmfmail",
-  "version": "1.2.256",
+  "version": "1.2.257",
   "description": "Local-first email client with IMAP sync and standalone native app",
   "type": "module",
   "main": "bin/mailx.js",
@@ -41,7 +41,7 @@
     "@bobfrankston/msger": "^0.1.425",
     "@bobfrankston/node-tcp-transport": "^0.1.10",
     "@bobfrankston/oauthsupport": "^1.0.34",
-    "@bobfrankston/rmf-tiny": "^0.1.47",
+    "@bobfrankston/rmf-tiny": "^0.1.48",
     "@bobfrankston/smtp-direct": "^0.1.9",
     "@bobfrankston/tcp-transport": "^0.1.8",
     "@capacitor/android": "^8.3.0",
@@ -121,7 +121,7 @@
       "@bobfrankston/msger": "^0.1.425",
       "@bobfrankston/node-tcp-transport": "^0.1.10",
       "@bobfrankston/oauthsupport": "^1.0.34",
-      "@bobfrankston/rmf-tiny": "^0.1.47",
+      "@bobfrankston/rmf-tiny": "^0.1.48",
       "@bobfrankston/smtp-direct": "^0.1.9",
       "@bobfrankston/tcp-transport": "^0.1.8",
       "@capacitor/android": "^8.3.0",