@codemirror/view 6.39.4 → 6.39.6

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## 6.39.6 (2025-12-23)
+
+### Bug fixes
+
+Fix an issue when composing on the boundary of a decoration, where the text after the composition would get garbled.
+
+## 6.39.5 (2025-12-22)
+
+### Bug fixes
+
+Fix an issue where replaced widgets alone on a line weren't reused and didn't get their `updateDOM` method called.
+
+Fix a bug where, when selecting full lines at the end of the document and inserting a character on Chrome, an inappropriate extra newline was inserted.
+
 ## 6.39.4 (2025-12-12)
 
 ### Bug fixes

package/dist/index.cjs

@@ -2573,6 +2573,16 @@ class TileUpdate {
         this.builder = new TileBuilder(this.cache, new DocTile(view, view.contentDOM), state.RangeSet.iter(blockWrappers));
         this.cache.reused.set(old, 2 /* Reused.DOM */);
         this.old = new TilePointer(old);
+        this.reuseWalker = {
+            skip: (tile, from, to) => {
+                this.cache.add(tile);
+                if (tile.isComposite())
+                    return false;
+            },
+            enter: tile => this.cache.add(tile),
+            leave: () => { },
+            break: () => { }
+        };
     }
     run(changes, composition) {
         let compositionContext = composition && this.getCompositionContext(composition.text);
@@ -2594,6 +2604,7 @@ class TileUpdate {
             if (composition && next.fromA <= composition.range.fromA && next.toA >= composition.range.toA) {
                 this.emit(posB, composition.range.fromB);
                 this.builder.addComposition(composition, compositionContext);
+                this.text.skip(composition.range.toB - composition.range.fromB);
                 this.emit(composition.range.toB, next.toB);
             }
             else {
@@ -2747,15 +2758,14 @@ class TileUpdate {
         this.openMarks = openEnd;
     }
     forward(from, to) {
-        this.old.advance(to - from, 1, {
-            skip: (tile, from, to) => {
-                if (tile.isText() || to == tile.length)
-                    this.cache.add(tile);
-            },
-            enter: tile => this.cache.add(tile),
-            leave: () => { },
-            break: () => { }
-        });
+        if (to - from <= 10) {
+            this.old.advance(to - from, 1, this.reuseWalker);
+        }
+        else {
+            this.old.advance(5, -1, this.reuseWalker);
+            this.old.advance(to - from - 10, -1);
+            this.old.advance(5, 1, this.reuseWalker);
+        }
     }
     getCompositionContext(text) {
         let marks = [], line = null;
@@ -3827,10 +3837,11 @@ function dirAt(view, pos) {
 
 const LineBreakPlaceholder = "\uffff";
 class DOMReader {
-    constructor(points, state$1) {
+    constructor(points, view) {
         this.points = points;
+        this.view = view;
         this.text = "";
-        this.lineSeparator = state$1.facet(state.EditorState.lineSeparator);
+        this.lineSeparator = view.state.facet(state.EditorState.lineSeparator);
     }
     append(text) {
         this.text += text;
@@ -3848,7 +3859,7 @@ class DOMReader {
             this.readNode(cur);
             let tile = Tile.get(cur), next = cur.nextSibling;
             if (next == end) {
-                if ((tile === null || tile === void 0 ? void 0 : tile.breakAfter) && !next)
+                if ((tile === null || tile === void 0 ? void 0 : tile.breakAfter) && !next && parent != this.view.contentDOM)
                     this.lineBreak();
                 break;
             }
@@ -3973,7 +3984,7 @@ class DOMChange {
         }
         else if (start > -1 && (this.bounds = domBoundsAround(view.docView.tile, start, end, 0))) {
             let selPoints = iHead || iAnchor ? [] : selectionPoints(view);
-            let reader = new DOMReader(selPoints, view.state);
+            let reader = new DOMReader(selPoints, view);
             reader.readRange(this.bounds.startDOM, this.bounds.endDOM);
             this.text = reader.text;
             this.newSel = selectionFromPoints(selPoints, this.bounds.from);

package/dist/index.js

@@ -2569,6 +2569,16 @@ class TileUpdate {
         this.builder = new TileBuilder(this.cache, new DocTile(view, view.contentDOM), RangeSet.iter(blockWrappers));
         this.cache.reused.set(old, 2 /* Reused.DOM */);
         this.old = new TilePointer(old);
+        this.reuseWalker = {
+            skip: (tile, from, to) => {
+                this.cache.add(tile);
+                if (tile.isComposite())
+                    return false;
+            },
+            enter: tile => this.cache.add(tile),
+            leave: () => { },
+            break: () => { }
+        };
     }
     run(changes, composition) {
         let compositionContext = composition && this.getCompositionContext(composition.text);
@@ -2590,6 +2600,7 @@ class TileUpdate {
             if (composition && next.fromA <= composition.range.fromA && next.toA >= composition.range.toA) {
                 this.emit(posB, composition.range.fromB);
                 this.builder.addComposition(composition, compositionContext);
+                this.text.skip(composition.range.toB - composition.range.fromB);
                 this.emit(composition.range.toB, next.toB);
             }
             else {
@@ -2743,15 +2754,14 @@ class TileUpdate {
         this.openMarks = openEnd;
     }
     forward(from, to) {
-        this.old.advance(to - from, 1, {
-            skip: (tile, from, to) => {
-                if (tile.isText() || to == tile.length)
-                    this.cache.add(tile);
-            },
-            enter: tile => this.cache.add(tile),
-            leave: () => { },
-            break: () => { }
-        });
+        if (to - from <= 10) {
+            this.old.advance(to - from, 1, this.reuseWalker);
+        }
+        else {
+            this.old.advance(5, -1, this.reuseWalker);
+            this.old.advance(to - from - 10, -1);
+            this.old.advance(5, 1, this.reuseWalker);
+        }
     }
     getCompositionContext(text) {
         let marks = [], line = null;
@@ -3823,10 +3833,11 @@ function dirAt(view, pos) {
 
 const LineBreakPlaceholder = "\uffff";
 class DOMReader {
-    constructor(points, state) {
+    constructor(points, view) {
         this.points = points;
+        this.view = view;
         this.text = "";
-        this.lineSeparator = state.facet(EditorState.lineSeparator);
+        this.lineSeparator = view.state.facet(EditorState.lineSeparator);
     }
     append(text) {
         this.text += text;
@@ -3844,7 +3855,7 @@ class DOMReader {
             this.readNode(cur);
             let tile = Tile.get(cur), next = cur.nextSibling;
             if (next == end) {
-                if ((tile === null || tile === void 0 ? void 0 : tile.breakAfter) && !next)
+                if ((tile === null || tile === void 0 ? void 0 : tile.breakAfter) && !next && parent != this.view.contentDOM)
                     this.lineBreak();
                 break;
             }
@@ -3969,7 +3980,7 @@ class DOMChange {
         }
         else if (start > -1 && (this.bounds = domBoundsAround(view.docView.tile, start, end, 0))) {
             let selPoints = iHead || iAnchor ? [] : selectionPoints(view);
-            let reader = new DOMReader(selPoints, view.state);
+            let reader = new DOMReader(selPoints, view);
             reader.readRange(this.bounds.startDOM, this.bounds.endDOM);
             this.text = reader.text;
             this.newSel = selectionFromPoints(selPoints, this.bounds.from);

package/package.json

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