@codemirror/view 6.39.1 → 6.39.3

package/CHANGELOG.md

@@ -1,3 +1,15 @@
+## 6.39.3 (2025-12-11)
+
+### Bug fixes
+
+Fix a bug that could corrupt the rendered document in some situations involving adjacent mark decorations of the same type.
+
+## 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

package/dist/index.cjs

@@ -2649,6 +2649,7 @@ class TileUpdate {
                 else if (tile instanceof MarkTile) {
                     this.builder.addMark(tile, activeMarks, openMarks);
                     this.cache.reused.set(tile, 1 /* Reused.Full */);
+                    openMarks = activeMarks.length;
                 }
                 else {
                     return false;
@@ -2661,10 +2662,8 @@ class TileUpdate {
                 }
                 else {
                     this.cache.add(tile);
-                    if (tile instanceof MarkTile) {
+                    if (tile instanceof MarkTile)
                         activeMarks.unshift(tile.mark);
-                        openMarks++;
-                    }
                 }
                 this.openWidget = false;
             },
@@ -3707,15 +3706,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

@@ -2645,6 +2645,7 @@ class TileUpdate {
                 else if (tile instanceof MarkTile) {
                     this.builder.addMark(tile, activeMarks, openMarks);
                     this.cache.reused.set(tile, 1 /* Reused.Full */);
+                    openMarks = activeMarks.length;
                 }
                 else {
                     return false;
@@ -2657,10 +2658,8 @@ class TileUpdate {
                 }
                 else {
                     this.cache.add(tile);
-                    if (tile instanceof MarkTile) {
+                    if (tile instanceof MarkTile)
                         activeMarks.unshift(tile.mark);
-                        openMarks++;
-                    }
                 }
                 this.openWidget = false;
             },
@@ -3703,15 +3702,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.1",
+  "version": "6.39.3",
   "description": "DOM view component for the CodeMirror code editor",
   "scripts": {
     "test": "cm-runtests",