@codemirror/view 6.39.0 → 6.39.2

package/CHANGELOG.md

@@ -1,3 +1,15 @@
+## 6.39.2 (2025-12-09)
+
+### Bug fixes
+
+Fix an issue where `moveVertially` was sometimes unable to escape lines with thick borders or padding.
+
+## 6.39.1 (2025-12-09)
+
+### Bug fixes
+
+Restore a workaround for a Chrome selection bug that had regressed in the previous release.
+
 ## 6.39.0 (2025-12-08)
 
 ### Bug fixes

package/dist/index.cjs

@@ -1729,7 +1729,7 @@ class Tile {
     isText() { return false; }
     isBlock() { return false; }
     get domAttrs() { return null; }
-    sync() {
+    sync(track) {
         this.flags |= 2 /* TileFlag.Synced */;
         if (this.flags & 4 /* TileFlag.AttrsDirty */) {
             this.flags &= ~4 /* TileFlag.AttrsDirty */;
@@ -1801,16 +1801,19 @@ class CompositeTile extends Tile {
         this.children.push(child);
         child.parent = this;
     }
-    sync() {
+    sync(track) {
         if (this.flags & 2 /* TileFlag.Synced */)
             return;
-        super.sync();
+        super.sync(track);
         let parent = this.dom, prev = null, next;
+        let tracking = (track === null || track === void 0 ? void 0 : track.node) == parent ? track : null;
         let length = 0;
         for (let child of this.children) {
-            child.sync();
+            child.sync(track);
             length += child.length + child.breakAfter;
             next = prev ? prev.nextSibling : parent.firstChild;
+            if (tracking && next != child.dom)
+                tracking.written = true;
             if (child.dom.parentNode == parent) {
                 while (next && next != child.dom)
                     next = rm$1(next);
@@ -1821,6 +1824,8 @@ class CompositeTile extends Tile {
             prev = child.dom;
         }
         next = prev ? prev.nextSibling : parent.firstChild;
+        if (tracking && next)
+            tracking.written = true;
         while (next)
             next = rm$1(next);
         this.length = length;
@@ -2029,12 +2034,15 @@ class TextTile extends Tile {
         super(dom, text.length);
         this.text = text;
     }
-    sync() {
+    sync(track) {
         if (this.flags & 2 /* TileFlag.Synced */)
             return;
-        super.sync();
-        if (this.dom.nodeValue != this.text)
+        super.sync(track);
+        if (this.dom.nodeValue != this.text) {
+            if (track && track.node == this.dom)
+                track.written = true;
             this.dom.nodeValue = this.text;
+        }
     }
     isText() { return true; }
     toString() { return JSON.stringify(this.text); }
@@ -2939,8 +2947,8 @@ class DocView {
             // selection from the one it displays (issue #218). This tries
             // to detect that situation.
             let track = browser.chrome || browser.ios ? { node: observer.selectionRange.focusNode, written: false } : undefined;
-            this.tile.sync();
-            if (track && (track.written || observer.selectionRange.focusNode != track.node))
+            this.tile.sync(track);
+            if (track && (track.written || observer.selectionRange.focusNode != track.node || !this.tile.dom.contains(track.node)))
                 this.forceSelection = true;
             this.tile.dom.style.height = "";
         });
@@ -3699,15 +3707,22 @@ function posAtCoords(view, coords, precise, scanY) {
     let content = view.contentDOM.getBoundingClientRect(), docTop = content.top + view.viewState.paddingTop;
     let { x, y } = coords, yOffset = y - docTop, block;
     // First find the block at the given Y position, if any. If scanY is
-    // given (used for vertical cursor motion), try to skip widgets.
+    // given (used for vertical cursor motion), try to skip widgets and
+    // line padding.
     for (;;) {
         if (yOffset < 0)
             return new PosAssoc(0, 1);
         if (yOffset > view.viewState.docHeight)
             return new PosAssoc(view.state.doc.length, -1);
         block = view.elementAtHeight(yOffset);
-        if (scanY == null || block.type == exports.BlockType.Text)
+        if (scanY == null)
             break;
+        if (block.type == exports.BlockType.Text) {
+            // Check whether we aren't landing the top/bottom padding of the line
+            let rect = view.docView.coordsAt(scanY < 0 ? block.from : block.to, scanY);
+            if (rect && (scanY < 0 ? rect.top <= yOffset + docTop : rect.bottom >= yOffset + docTop))
+                break;
+        }
         let halfLine = view.viewState.heightOracle.textHeight / 2;
         yOffset = scanY > 0 ? block.bottom + halfLine : block.top - halfLine;
     }

package/dist/index.js

@@ -1725,7 +1725,7 @@ class Tile {
     isText() { return false; }
     isBlock() { return false; }
     get domAttrs() { return null; }
-    sync() {
+    sync(track) {
         this.flags |= 2 /* TileFlag.Synced */;
         if (this.flags & 4 /* TileFlag.AttrsDirty */) {
             this.flags &= ~4 /* TileFlag.AttrsDirty */;
@@ -1797,16 +1797,19 @@ class CompositeTile extends Tile {
         this.children.push(child);
         child.parent = this;
     }
-    sync() {
+    sync(track) {
         if (this.flags & 2 /* TileFlag.Synced */)
             return;
-        super.sync();
+        super.sync(track);
         let parent = this.dom, prev = null, next;
+        let tracking = (track === null || track === void 0 ? void 0 : track.node) == parent ? track : null;
         let length = 0;
         for (let child of this.children) {
-            child.sync();
+            child.sync(track);
             length += child.length + child.breakAfter;
             next = prev ? prev.nextSibling : parent.firstChild;
+            if (tracking && next != child.dom)
+                tracking.written = true;
             if (child.dom.parentNode == parent) {
                 while (next && next != child.dom)
                     next = rm$1(next);
@@ -1817,6 +1820,8 @@ class CompositeTile extends Tile {
             prev = child.dom;
         }
         next = prev ? prev.nextSibling : parent.firstChild;
+        if (tracking && next)
+            tracking.written = true;
         while (next)
             next = rm$1(next);
         this.length = length;
@@ -2025,12 +2030,15 @@ class TextTile extends Tile {
         super(dom, text.length);
         this.text = text;
     }
-    sync() {
+    sync(track) {
         if (this.flags & 2 /* TileFlag.Synced */)
             return;
-        super.sync();
-        if (this.dom.nodeValue != this.text)
+        super.sync(track);
+        if (this.dom.nodeValue != this.text) {
+            if (track && track.node == this.dom)
+                track.written = true;
             this.dom.nodeValue = this.text;
+        }
     }
     isText() { return true; }
     toString() { return JSON.stringify(this.text); }
@@ -2935,8 +2943,8 @@ class DocView {
             // selection from the one it displays (issue #218). This tries
             // to detect that situation.
             let track = browser.chrome || browser.ios ? { node: observer.selectionRange.focusNode, written: false } : undefined;
-            this.tile.sync();
-            if (track && (track.written || observer.selectionRange.focusNode != track.node))
+            this.tile.sync(track);
+            if (track && (track.written || observer.selectionRange.focusNode != track.node || !this.tile.dom.contains(track.node)))
                 this.forceSelection = true;
             this.tile.dom.style.height = "";
         });
@@ -3695,15 +3703,22 @@ function posAtCoords(view, coords, precise, scanY) {
     let content = view.contentDOM.getBoundingClientRect(), docTop = content.top + view.viewState.paddingTop;
     let { x, y } = coords, yOffset = y - docTop, block;
     // First find the block at the given Y position, if any. If scanY is
-    // given (used for vertical cursor motion), try to skip widgets.
+    // given (used for vertical cursor motion), try to skip widgets and
+    // line padding.
     for (;;) {
         if (yOffset < 0)
             return new PosAssoc(0, 1);
         if (yOffset > view.viewState.docHeight)
             return new PosAssoc(view.state.doc.length, -1);
         block = view.elementAtHeight(yOffset);
-        if (scanY == null || block.type == BlockType.Text)
+        if (scanY == null)
             break;
+        if (block.type == BlockType.Text) {
+            // Check whether we aren't landing the top/bottom padding of the line
+            let rect = view.docView.coordsAt(scanY < 0 ? block.from : block.to, scanY);
+            if (rect && (scanY < 0 ? rect.top <= yOffset + docTop : rect.bottom >= yOffset + docTop))
+                break;
+        }
         let halfLine = view.viewState.heightOracle.textHeight / 2;
         yOffset = scanY > 0 ? block.bottom + halfLine : block.top - halfLine;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codemirror/view",
-  "version": "6.39.0",
+  "version": "6.39.2",
   "description": "DOM view component for the CodeMirror code editor",
   "scripts": {
     "test": "cm-runtests",