@codemirror/view 6.39.3 → 6.39.5

package/CHANGELOG.md

@@ -1,3 +1,23 @@
+## 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
+
+Fix a bug where paste events handlers on Chrome could fail to run when pasting on a blank line.
+
+Fix a regression causing the native cursor to get stuck before block widgets with side>0.
+
+Fix a crash in content DOM building after a block widget.
+
+Fix a bug in `posAtCoords` that would in some circumstances make it return positions on the wrong side of a block widget.
+
 ## 6.39.3 (2025-12-11)
 
 ### Bug fixes

package/dist/index.cjs

@@ -1991,7 +1991,7 @@ class LineTile extends CompositeTile {
             if (this.dom.contains(tile.dom)) {
                 if (tile.isText())
                     return new DOMPos(tile.dom, Math.min(tile.dom.nodeValue.length, offset));
-                return tile.domPosFor(offset, side);
+                return tile.domPosFor(offset, tile.flags & 16 /* TileFlag.Before */ ? 1 : tile.flags & 32 /* TileFlag.After */ ? -1 : side);
             }
             let parent = found.tile.parent, saw = false;
             for (let ch of parent.children) {
@@ -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);
@@ -2623,12 +2633,14 @@ class TileUpdate {
                             this.builder.addBlockWidget(widget);
                         }
                         else {
+                            this.builder.ensureLine(null);
                             this.builder.addInlineWidget(widget, activeMarks, openMarks);
                             openMarks = activeMarks.length;
                         }
                     }
                 }
                 else if (tile.isText()) {
+                    this.builder.ensureLine(null);
                     if (!from && to == tile.length) {
                         this.builder.addText(tile.text, activeMarks, openMarks, this.cache.reuse(tile));
                     }
@@ -2647,6 +2659,7 @@ class TileUpdate {
                     this.cache.add(tile);
                 }
                 else if (tile instanceof MarkTile) {
+                    this.builder.ensureLine(null);
                     this.builder.addMark(tile, activeMarks, openMarks);
                     this.cache.reused.set(tile, 1 /* Reused.Full */);
                     openMarks = activeMarks.length;
@@ -2744,15 +2757,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;
@@ -3074,7 +3086,7 @@ class DocView {
         let { anchorNode, anchorOffset } = view.observer.selectionRange;
         if (!sel || !cursor.empty || !cursor.assoc || !sel.modify)
             return;
-        let line = this.lineAt(cursor.head);
+        let line = this.lineAt(cursor.head, cursor.assoc);
         if (!line)
             return;
         let lineStart = line.posAtStart;
@@ -3153,7 +3165,7 @@ class DocView {
         let after, afterOff = -1, afterBad = false;
         this.tile.blockTiles((tile, off) => {
             if (tile.isWidget()) {
-                if ((tile.flags & 32 /* TileFlag.After */) && before)
+                if ((tile.flags & 32 /* TileFlag.After */) && off >= pos)
                     return true;
                 if (tile.flags & 16 /* TileFlag.Before */)
                     beforeBad = true;
@@ -3191,8 +3203,8 @@ class DocView {
         }
         return tile.coordsIn(offset, side);
     }
-    lineAt(pos) {
-        let { tile } = this.tile.resolveBlock(pos, 1);
+    lineAt(pos, side) {
+        let { tile } = this.tile.resolveBlock(pos, side);
         return tile.isLine() ? tile : null;
     }
     coordsForChar(pos) {
@@ -3738,7 +3750,10 @@ function posAtCoords(view, coords, precise, scanY) {
     if (block.type != exports.BlockType.Text)
         return yOffset < (block.top + block.bottom) / 2 ? new PosAssoc(block.from, 1) : new PosAssoc(block.to, -1);
     // Here we know we're in a line, so run the logic for inline layout
-    return posAtCoordsInline(view, view.docView.lineAt(block.from), block.from, x, y);
+    let line = view.docView.lineAt(block.from, 2);
+    if (!line || line.length != block.length)
+        line = view.docView.lineAt(block.from, -2);
+    return posAtCoordsInline(view, line, block.from, x, y);
 }
 // Scan through the rectangles for the content of a tile, finding the
 // one closest to the given coordinates, prefering closeness in Y over
@@ -3821,10 +3836,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;
@@ -3842,7 +3858,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;
             }
@@ -3967,7 +3983,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);
@@ -4657,7 +4673,8 @@ function eventBelongsToEditor(view, event) {
     if (event.defaultPrevented)
         return false;
     for (let node = event.target, tile; node != view.contentDOM; node = node.parentNode)
-        if (!node || node.nodeType == 11 || ((tile = Tile.get(node)) && tile.isWidget() && tile.widget.ignoreEvent(event)))
+        if (!node || node.nodeType == 11 ||
+            ((tile = Tile.get(node)) && tile.isWidget() && !tile.isHidden && tile.widget.ignoreEvent(event)))
             return false;
     return true;
 }
@@ -4776,42 +4793,13 @@ function rangeForClick(view, pos, bias, type) {
         return groupAt(view.state, pos, bias);
     }
     else { // Triple click
-        let visual = view.docView.lineAt(pos), line = view.state.doc.lineAt(visual ? visual.posAtEnd : pos);
+        let visual = view.docView.lineAt(pos, bias), line = view.state.doc.lineAt(visual ? visual.posAtEnd : pos);
         let from = visual ? visual.posAtStart : line.from, to = visual ? visual.posAtEnd : line.to;
         if (to < view.state.doc.length && to == line.to)
             to++;
         return state.EditorSelection.range(from, to);
     }
 }
-let inside = (x, y, rect) => y >= rect.top && y <= rect.bottom && x >= rect.left && x <= rect.right;
-// Try to determine, for the given coordinates, associated with the
-// given position, whether they are related to the element before or
-// the element after the position.
-function findPositionSide(view, pos, x, y) {
-    let line = view.docView.lineAt(pos);
-    if (!line)
-        return 1;
-    let off = pos - line.posAtStart;
-    // Line boundaries point into the line
-    if (off == 0)
-        return 1;
-    if (off == line.length)
-        return -1;
-    // Positions on top of an element point at that element
-    let before = line.coordsIn(off, -1);
-    if (before && inside(x, y, before))
-        return -1;
-    let after = line.coordsIn(off, 1);
-    if (after && inside(x, y, after))
-        return 1;
-    // This is probably a line wrap point. Pick before if the point is
-    // above its bottom.
-    return before && before.bottom >= y ? -1 : 1;
-}
-function queryPos(view, event) {
-    let pos = view.posAtCoords({ x: event.clientX, y: event.clientY }, false);
-    return { pos, bias: findPositionSide(view, pos, event.clientX, event.clientY) };
-}
 const BadMouseDetail = browser.ie && browser.ie_version <= 11;
 let lastMouseDown = null, lastMouseDownCount = 0, lastMouseDownTime = 0;
 function getClickType(event) {
@@ -4824,7 +4812,7 @@ function getClickType(event) {
         Math.abs(last.clientY - event.clientY) < 2) ? (lastMouseDownCount + 1) % 3 : 1;
 }
 function basicMouseSelection(view, event) {
-    let start = queryPos(view, event), type = getClickType(event);
+    let start = view.posAndSideAtCoords({ x: event.clientX, y: event.clientY }, false), type = getClickType(event);
     let startSel = view.state.selection;
     return {
         update(update) {
@@ -4834,10 +4822,10 @@ function basicMouseSelection(view, event) {
             }
         },
         get(event, extend, multiple) {
-            let cur = queryPos(view, event), removed;
-            let range = rangeForClick(view, cur.pos, cur.bias, type);
+            let cur = view.posAndSideAtCoords({ x: event.clientX, y: event.clientY }, false), removed;
+            let range = rangeForClick(view, cur.pos, cur.assoc, type);
             if (start.pos != cur.pos && !extend) {
-                let startRange = rangeForClick(view, start.pos, start.bias, type);
+                let startRange = rangeForClick(view, start.pos, start.assoc, type);
                 let from = Math.min(startRange.from, range.from), to = Math.max(startRange.to, range.to);
                 range = from < range.from ? state.EditorSelection.range(from, to) : state.EditorSelection.range(to, from);
             }

package/dist/index.js

@@ -1987,7 +1987,7 @@ class LineTile extends CompositeTile {
             if (this.dom.contains(tile.dom)) {
                 if (tile.isText())
                     return new DOMPos(tile.dom, Math.min(tile.dom.nodeValue.length, offset));
-                return tile.domPosFor(offset, side);
+                return tile.domPosFor(offset, tile.flags & 16 /* TileFlag.Before */ ? 1 : tile.flags & 32 /* TileFlag.After */ ? -1 : side);
             }
             let parent = found.tile.parent, saw = false;
             for (let ch of parent.children) {
@@ -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);
@@ -2619,12 +2629,14 @@ class TileUpdate {
                             this.builder.addBlockWidget(widget);
                         }
                         else {
+                            this.builder.ensureLine(null);
                             this.builder.addInlineWidget(widget, activeMarks, openMarks);
                             openMarks = activeMarks.length;
                         }
                     }
                 }
                 else if (tile.isText()) {
+                    this.builder.ensureLine(null);
                     if (!from && to == tile.length) {
                         this.builder.addText(tile.text, activeMarks, openMarks, this.cache.reuse(tile));
                     }
@@ -2643,6 +2655,7 @@ class TileUpdate {
                     this.cache.add(tile);
                 }
                 else if (tile instanceof MarkTile) {
+                    this.builder.ensureLine(null);
                     this.builder.addMark(tile, activeMarks, openMarks);
                     this.cache.reused.set(tile, 1 /* Reused.Full */);
                     openMarks = activeMarks.length;
@@ -2740,15 +2753,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;
@@ -3070,7 +3082,7 @@ class DocView {
         let { anchorNode, anchorOffset } = view.observer.selectionRange;
         if (!sel || !cursor.empty || !cursor.assoc || !sel.modify)
             return;
-        let line = this.lineAt(cursor.head);
+        let line = this.lineAt(cursor.head, cursor.assoc);
         if (!line)
             return;
         let lineStart = line.posAtStart;
@@ -3149,7 +3161,7 @@ class DocView {
         let after, afterOff = -1, afterBad = false;
         this.tile.blockTiles((tile, off) => {
             if (tile.isWidget()) {
-                if ((tile.flags & 32 /* TileFlag.After */) && before)
+                if ((tile.flags & 32 /* TileFlag.After */) && off >= pos)
                     return true;
                 if (tile.flags & 16 /* TileFlag.Before */)
                     beforeBad = true;
@@ -3187,8 +3199,8 @@ class DocView {
         }
         return tile.coordsIn(offset, side);
     }
-    lineAt(pos) {
-        let { tile } = this.tile.resolveBlock(pos, 1);
+    lineAt(pos, side) {
+        let { tile } = this.tile.resolveBlock(pos, side);
         return tile.isLine() ? tile : null;
     }
     coordsForChar(pos) {
@@ -3734,7 +3746,10 @@ function posAtCoords(view, coords, precise, scanY) {
     if (block.type != BlockType.Text)
         return yOffset < (block.top + block.bottom) / 2 ? new PosAssoc(block.from, 1) : new PosAssoc(block.to, -1);
     // Here we know we're in a line, so run the logic for inline layout
-    return posAtCoordsInline(view, view.docView.lineAt(block.from), block.from, x, y);
+    let line = view.docView.lineAt(block.from, 2);
+    if (!line || line.length != block.length)
+        line = view.docView.lineAt(block.from, -2);
+    return posAtCoordsInline(view, line, block.from, x, y);
 }
 // Scan through the rectangles for the content of a tile, finding the
 // one closest to the given coordinates, prefering closeness in Y over
@@ -3817,10 +3832,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;
@@ -3838,7 +3854,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;
             }
@@ -3963,7 +3979,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);
@@ -4653,7 +4669,8 @@ function eventBelongsToEditor(view, event) {
     if (event.defaultPrevented)
         return false;
     for (let node = event.target, tile; node != view.contentDOM; node = node.parentNode)
-        if (!node || node.nodeType == 11 || ((tile = Tile.get(node)) && tile.isWidget() && tile.widget.ignoreEvent(event)))
+        if (!node || node.nodeType == 11 ||
+            ((tile = Tile.get(node)) && tile.isWidget() && !tile.isHidden && tile.widget.ignoreEvent(event)))
             return false;
     return true;
 }
@@ -4772,42 +4789,13 @@ function rangeForClick(view, pos, bias, type) {
         return groupAt(view.state, pos, bias);
     }
     else { // Triple click
-        let visual = view.docView.lineAt(pos), line = view.state.doc.lineAt(visual ? visual.posAtEnd : pos);
+        let visual = view.docView.lineAt(pos, bias), line = view.state.doc.lineAt(visual ? visual.posAtEnd : pos);
         let from = visual ? visual.posAtStart : line.from, to = visual ? visual.posAtEnd : line.to;
         if (to < view.state.doc.length && to == line.to)
             to++;
         return EditorSelection.range(from, to);
     }
 }
-let inside = (x, y, rect) => y >= rect.top && y <= rect.bottom && x >= rect.left && x <= rect.right;
-// Try to determine, for the given coordinates, associated with the
-// given position, whether they are related to the element before or
-// the element after the position.
-function findPositionSide(view, pos, x, y) {
-    let line = view.docView.lineAt(pos);
-    if (!line)
-        return 1;
-    let off = pos - line.posAtStart;
-    // Line boundaries point into the line
-    if (off == 0)
-        return 1;
-    if (off == line.length)
-        return -1;
-    // Positions on top of an element point at that element
-    let before = line.coordsIn(off, -1);
-    if (before && inside(x, y, before))
-        return -1;
-    let after = line.coordsIn(off, 1);
-    if (after && inside(x, y, after))
-        return 1;
-    // This is probably a line wrap point. Pick before if the point is
-    // above its bottom.
-    return before && before.bottom >= y ? -1 : 1;
-}
-function queryPos(view, event) {
-    let pos = view.posAtCoords({ x: event.clientX, y: event.clientY }, false);
-    return { pos, bias: findPositionSide(view, pos, event.clientX, event.clientY) };
-}
 const BadMouseDetail = browser.ie && browser.ie_version <= 11;
 let lastMouseDown = null, lastMouseDownCount = 0, lastMouseDownTime = 0;
 function getClickType(event) {
@@ -4820,7 +4808,7 @@ function getClickType(event) {
         Math.abs(last.clientY - event.clientY) < 2) ? (lastMouseDownCount + 1) % 3 : 1;
 }
 function basicMouseSelection(view, event) {
-    let start = queryPos(view, event), type = getClickType(event);
+    let start = view.posAndSideAtCoords({ x: event.clientX, y: event.clientY }, false), type = getClickType(event);
     let startSel = view.state.selection;
     return {
         update(update) {
@@ -4830,10 +4818,10 @@ function basicMouseSelection(view, event) {
             }
         },
         get(event, extend, multiple) {
-            let cur = queryPos(view, event), removed;
-            let range = rangeForClick(view, cur.pos, cur.bias, type);
+            let cur = view.posAndSideAtCoords({ x: event.clientX, y: event.clientY }, false), removed;
+            let range = rangeForClick(view, cur.pos, cur.assoc, type);
             if (start.pos != cur.pos && !extend) {
-                let startRange = rangeForClick(view, start.pos, start.bias, type);
+                let startRange = rangeForClick(view, start.pos, start.assoc, type);
                 let from = Math.min(startRange.from, range.from), to = Math.max(startRange.to, range.to);
                 range = from < range.from ? EditorSelection.range(from, to) : EditorSelection.range(to, from);
             }

package/package.json

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