@codemirror/view 6.39.0-beta.1 → 6.39.0-beta.3

package/dist/index.cjs

@@ -1750,8 +1750,8 @@ class Tile {
     get posAtEnd() {
         return this.posAtStart + this.length;
     }
-    posBefore(tile) {
-        let pos = this.posAtStart;
+    posBefore(tile, start = this.posAtStart) {
+        let pos = start;
         for (let child of this.children) {
             if (child == tile)
                 return pos;
@@ -3540,199 +3540,6 @@ function groupAt(state$1, pos, bias = 1) {
     }
     return state.EditorSelection.range(from + line.from, to + line.from);
 }
-// Search the DOM for the {node, offset} position closest to the given
-// coordinates. Very inefficient and crude, but can usually be avoided
-// by calling caret(Position|Range)FromPoint instead.
-function getdx(x, rect) {
-    return rect.left > x ? rect.left - x : Math.max(0, x - rect.right);
-}
-function getdy(y, rect) {
-    return rect.top > y ? rect.top - y : Math.max(0, y - rect.bottom);
-}
-function yOverlap(a, b) {
-    return a.top < b.bottom - 1 && a.bottom > b.top + 1;
-}
-function upTop(rect, top) {
-    return top < rect.top ? { top, left: rect.left, right: rect.right, bottom: rect.bottom } : rect;
-}
-function upBot(rect, bottom) {
-    return bottom > rect.bottom ? { top: rect.top, left: rect.left, right: rect.right, bottom } : rect;
-}
-function domPosAtCoords(parent, x, y) {
-    let closest, closestRect, closestX, closestY, closestOverlap = false;
-    let above, below, aboveRect, belowRect;
-    for (let child = parent.firstChild; child; child = child.nextSibling) {
-        let rects = clientRectsFor(child);
-        for (let i = 0; i < rects.length; i++) {
-            let rect = rects[i];
-            if (closestRect && yOverlap(closestRect, rect))
-                rect = upTop(upBot(rect, closestRect.bottom), closestRect.top);
-            let dx = getdx(x, rect), dy = getdy(y, rect);
-            if (dx == 0 && dy == 0)
-                return child.nodeType == 3 ? domPosInText(child, x, y) : domPosAtCoords(child, x, y);
-            if (!closest || closestY > dy || closestY == dy && closestX > dx) {
-                closest = child;
-                closestRect = rect;
-                closestX = dx;
-                closestY = dy;
-                closestOverlap = !dx ? true : x < rect.left ? i > 0 : i < rects.length - 1;
-            }
-            if (dx == 0) {
-                if (y > rect.bottom && (!aboveRect || aboveRect.bottom < rect.bottom)) {
-                    above = child;
-                    aboveRect = rect;
-                }
-                else if (y < rect.top && (!belowRect || belowRect.top > rect.top)) {
-                    below = child;
-                    belowRect = rect;
-                }
-            }
-            else if (aboveRect && yOverlap(aboveRect, rect)) {
-                aboveRect = upBot(aboveRect, rect.bottom);
-            }
-            else if (belowRect && yOverlap(belowRect, rect)) {
-                belowRect = upTop(belowRect, rect.top);
-            }
-        }
-    }
-    if (aboveRect && aboveRect.bottom >= y) {
-        closest = above;
-        closestRect = aboveRect;
-    }
-    else if (belowRect && belowRect.top <= y) {
-        closest = below;
-        closestRect = belowRect;
-    }
-    if (!closest)
-        return { node: parent, offset: 0 };
-    let clipX = Math.max(closestRect.left, Math.min(closestRect.right, x));
-    if (closest.nodeType == 3)
-        return domPosInText(closest, clipX, y);
-    if (closestOverlap && closest.contentEditable != "false")
-        return domPosAtCoords(closest, clipX, y);
-    let offset = Array.prototype.indexOf.call(parent.childNodes, closest) +
-        (x >= (closestRect.left + closestRect.right) / 2 ? 1 : 0);
-    return { node: parent, offset };
-}
-function domPosInText(node, x, y) {
-    let len = node.nodeValue.length;
-    let closestOffset = -1, closestDY = 1e9, generalSide = 0;
-    for (let i = 0; i < len; i++) {
-        let rects = textRange(node, i, i + 1).getClientRects();
-        for (let j = 0; j < rects.length; j++) {
-            let rect = rects[j];
-            if (rect.top == rect.bottom)
-                continue;
-            if (!generalSide)
-                generalSide = x - rect.left;
-            let dy = (rect.top > y ? rect.top - y : y - rect.bottom) - 1;
-            if (rect.left - 1 <= x && rect.right + 1 >= x && dy < closestDY) {
-                let right = x >= (rect.left + rect.right) / 2, after = right;
-                if (browser.chrome || browser.gecko) {
-                    // Check for RTL on browsers that support getting client
-                    // rects for empty ranges.
-                    let rectBefore = textRange(node, i).getBoundingClientRect();
-                    if (Math.abs(rectBefore.left - rect.right) < 0.1)
-                        after = !right;
-                }
-                if (dy <= 0)
-                    return { node, offset: i + (after ? 1 : 0) };
-                closestOffset = i + (after ? 1 : 0);
-                closestDY = dy;
-            }
-        }
-    }
-    return { node, offset: closestOffset > -1 ? closestOffset : generalSide > 0 ? node.nodeValue.length : 0 };
-}
-function posAtCoords(view, coords, precise, bias = -1) {
-    var _a;
-    let content = view.contentDOM.getBoundingClientRect(), docTop = content.top + view.viewState.paddingTop;
-    let block, { docHeight } = view.viewState;
-    let { x, y } = coords, yOffset = y - docTop;
-    if (yOffset < 0)
-        return 0;
-    if (yOffset > docHeight)
-        return view.state.doc.length;
-    // Scan for a text block near the queried y position
-    for (let halfLine = view.viewState.heightOracle.textHeight / 2, bounced = false;;) {
-        block = view.elementAtHeight(yOffset);
-        if (block.type == exports.BlockType.Text)
-            break;
-        for (;;) {
-            // Move the y position out of this block
-            yOffset = bias > 0 ? block.bottom + halfLine : block.top - halfLine;
-            if (yOffset >= 0 && yOffset <= docHeight)
-                break;
-            // If the document consists entirely of replaced widgets, we
-            // won't find a text block, so return 0
-            if (bounced)
-                return precise ? null : 0;
-            bounced = true;
-            bias = -bias;
-        }
-    }
-    y = docTop + yOffset;
-    let lineStart = block.from;
-    // If this is outside of the rendered viewport, we can't determine a position
-    if (lineStart < view.viewport.from)
-        return view.viewport.from == 0 ? 0 : precise ? null : posAtCoordsImprecise(view, content, block, x, y);
-    if (lineStart > view.viewport.to)
-        return view.viewport.to == view.state.doc.length ? view.state.doc.length :
-            precise ? null : posAtCoordsImprecise(view, content, block, x, y);
-    // Prefer ShadowRootOrDocument.elementFromPoint if present, fall back to document if not
-    let doc = view.dom.ownerDocument;
-    let root = view.root.elementFromPoint ? view.root : doc;
-    let element = root.elementFromPoint(x, y);
-    if (element && !view.contentDOM.contains(element))
-        element = null;
-    // If the element is unexpected, clip x at the sides of the content area and try again
-    if (!element) {
-        x = Math.max(content.left + 1, Math.min(content.right - 1, x));
-        element = root.elementFromPoint(x, y);
-        if (element && !view.contentDOM.contains(element))
-            element = null;
-    }
-    // There's visible editor content under the point, so we can try
-    // using caret(Position|Range)FromPoint as a shortcut
-    let node, offset = -1;
-    if (element && !((_a = view.docView.tile.nearest(element)) === null || _a === void 0 ? void 0 : _a.isWidget())) {
-        if (doc.caretPositionFromPoint) {
-            let pos = doc.caretPositionFromPoint(x, y);
-            if (pos)
-                ({ offsetNode: node, offset } = pos);
-        }
-        else if (doc.caretRangeFromPoint) {
-            let range = doc.caretRangeFromPoint(x, y);
-            if (range)
-                ({ startContainer: node, startOffset: offset } = range);
-        }
-        if (node && (!view.contentDOM.contains(node) ||
-            browser.safari && isSuspiciousSafariCaretResult(node, offset, x) ||
-            browser.chrome && isSuspiciousChromeCaretResult(node, offset, x)))
-            node = undefined;
-        // Chrome will return offsets into <input> elements without child
-        // nodes, which will lead to a null deref below, so clip the
-        // offset to the node size.
-        if (node)
-            offset = Math.min(maxOffset(node), offset);
-    }
-    // No luck, do our own (potentially expensive) search
-    if (!node || !view.contentDOM.contains(node)) {
-        let line = view.docView.lineAt(lineStart);
-        if (!line)
-            return yOffset > block.top + block.height / 2 ? block.to : block.from;
-        ({ node, offset } = domPosAtCoords(line.dom, x, y));
-    }
-    let nearest = view.docView.tile.nearest(node);
-    if (!nearest)
-        return null;
-    if (nearest.isWidget()) {
-        let rect = nearest.dom.getBoundingClientRect();
-        return coords.y < rect.top || coords.y <= rect.bottom && coords.x <= (rect.left + rect.right) / 2
-            ? nearest.posAtStart : nearest.posAtEnd;
-    }
-    return view.docView.posFromDOM(node, offset);
-}
 function posAtCoordsImprecise(view, contentRect, block, x, y) {
     let into = Math.round((x - contentRect.left) * view.defaultCharacterWidth);
     if (view.lineWrapping && block.height > view.defaultLineHeight * 1.5) {
@@ -3743,49 +3550,6 @@ function posAtCoordsImprecise(view, contentRect, block, x, y) {
     let content = view.state.sliceDoc(block.from, block.to);
     return block.from + state.findColumn(content, into, view.state.tabSize);
 }
-function isEndOfLineBefore(node, offset, x) {
-    let len, scan = node;
-    if (node.nodeType != 3 || offset != (len = node.nodeValue.length))
-        return false;
-    for (;;) { // Check that there is no content after this node
-        let next = scan.nextSibling;
-        if (next) {
-            if (next.nodeName == "BR")
-                break;
-            return false;
-        }
-        else {
-            let parent = scan.parentNode;
-            if (!parent || parent.nodeName == "DIV")
-                break;
-            scan = parent;
-        }
-    }
-    return textRange(node, len - 1, len).getBoundingClientRect().right > x;
-}
-// In case of a high line height, Safari's caretRangeFromPoint treats
-// the space between lines as belonging to the last character of the
-// line before. This is used to detect such a result so that it can be
-// ignored (issue #401).
-function isSuspiciousSafariCaretResult(node, offset, x) {
-    return isEndOfLineBefore(node, offset, x);
-}
-// Chrome will move positions between lines to the start of the next line
-function isSuspiciousChromeCaretResult(node, offset, x) {
-    if (offset != 0)
-        return isEndOfLineBefore(node, offset, x);
-    for (let cur = node;;) {
-        let parent = cur.parentNode;
-        if (!parent || parent.nodeType != 1 || parent.firstChild != cur)
-            return false;
-        if (parent.classList.contains("cm-line"))
-            break;
-        cur = parent;
-    }
-    let rect = node.nodeType == 1 ? node.getBoundingClientRect()
-        : textRange(node, 0, Math.max(node.nodeValue.length, 1)).getBoundingClientRect();
-    return x - rect.left > 5;
-}
 function blockAt(view, pos, side) {
     let line = view.lineBlockAt(pos);
     if (Array.isArray(line.type)) {
@@ -3875,11 +3639,7 @@ function moveVertically(view, start, forward, distance) {
     for (let extra = 0;; extra += 10) {
         let curY = startY + (dist + extra) * dir;
         let pos = posAtCoords(view, { x: resolvedGoal, y: curY }, false, dir);
-        if (curY < rect.top || curY > rect.bottom || (dir < 0 ? pos < startPos : pos > startPos)) {
-            let charRect = view.docView.coordsForChar(pos);
-            let assoc = !charRect || curY < charRect.top ? -1 : 1;
-            return state.EditorSelection.cursor(pos, assoc, undefined, goal);
-        }
+        return state.EditorSelection.cursor(pos.pos, pos.assoc, undefined, goal);
     }
 }
 function skipAtomicRanges(atoms, pos, bias) {
@@ -3925,6 +3685,121 @@ function skipAtoms(view, oldPos, pos) {
     let newPos = skipAtomicRanges(view.state.facet(atomicRanges).map(f => f(view)), pos.from, oldPos.head > pos.from ? -1 : 1);
     return newPos == pos.from ? pos : state.EditorSelection.cursor(newPos, newPos < pos.from ? 1 : -1);
 }
+class PosAssoc {
+    constructor(pos, assoc) {
+        this.pos = pos;
+        this.assoc = assoc;
+    }
+}
+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.
+    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)
+            break;
+        let halfLine = view.viewState.heightOracle.textHeight / 2;
+        yOffset = scanY > 0 ? block.bottom + halfLine : block.top - halfLine;
+    }
+    // If outside the viewport, return null if precise==true, an
+    // estimate otherwise.
+    if (view.viewport.from >= block.to || view.viewport.to <= block.from) {
+        if (precise)
+            return null;
+        if (block.type == exports.BlockType.Text) {
+            let pos = posAtCoordsImprecise(view, content, block, x, y);
+            return new PosAssoc(pos, pos == block.from ? 1 : -1);
+        }
+    }
+    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);
+}
+// Scan through the rectangles for the content of a tile, finding the
+// one closest to the given coordinates, prefering closeness in Y over
+// closeness in X.
+//
+// If this is a text tile, go character-by-character. For line or mark
+// tiles, check each non-point-widget child, and descend text or mark
+// tiles with a recursive call.
+//
+// For non-wrapped, purely left-to-right text, this could use a binary
+// search. But because this seems to be fast enough, for how often it
+// is called, there's not currently a specialized implementation for
+// that.
+function posAtCoordsInline(view, tile, offset, x, y) {
+    let closest = -1, closestRect = null;
+    let dxClosest = 1e9, dyClosest = 1e9;
+    let rowTop = y, rowBot = y;
+    let checkRects = (rects, index) => {
+        for (let i = 0; i < rects.length; i++) {
+            let rect = rects[i];
+            if (rect.top == rect.bottom)
+                continue;
+            let dx = rect.left > x ? rect.left - x : rect.right < x ? x - rect.right : 0;
+            let dy = rect.top > y ? rect.top - y : rect.bottom < y ? y - rect.bottom : 0;
+            if (rect.top <= rowBot && rect.bottom >= rowTop) {
+                // Rectangle is in the current row
+                rowTop = Math.min(rect.top, rowTop);
+                rowBot = Math.max(rect.bottom, rowBot);
+                dy = 0;
+            }
+            if (closest < 0 || (dy - dyClosest || dx - dxClosest) < 0) {
+                if (closest >= 0 && dyClosest && dxClosest < dx &&
+                    closestRect.top <= rowBot - 2 && closestRect.bottom >= rowTop + 2) {
+                    // Retroactively set dy to 0 if the current match is in this row.
+                    dyClosest = 0;
+                }
+                else {
+                    closest = index;
+                    dxClosest = dx;
+                    dyClosest = dy;
+                    closestRect = rect;
+                }
+            }
+        }
+    };
+    if (tile.isText()) {
+        for (let i = 0; i < tile.length;) {
+            let next = state.findClusterBreak(tile.text, i);
+            checkRects(textRange(tile.dom, i, next).getClientRects(), i);
+            if (!dxClosest && !dyClosest)
+                break;
+            i = next;
+        }
+        let after = (x > (closestRect.left + closestRect.right) / 2) == (dirAt(view, closest + offset) == exports.Direction.LTR);
+        return after ? new PosAssoc(offset + state.findClusterBreak(tile.text, closest), -1) : new PosAssoc(offset + closest, 1);
+    }
+    else {
+        if (!tile.length)
+            return new PosAssoc(offset, 1);
+        for (let i = 0; i < tile.children.length; i++) {
+            let child = tile.children[i];
+            if (child.flags & 48 /* TileFlag.PointWidget */)
+                continue;
+            let rects = (child.dom.nodeType == 1 ? child.dom : textRange(child.dom, 0, child.length)).getClientRects();
+            checkRects(rects, i);
+            if (!dxClosest && !dyClosest)
+                break;
+        }
+        let inner = tile.children[closest], innerOff = tile.posBefore(inner, offset);
+        if (inner.isComposite() || inner.isText())
+            return posAtCoordsInline(view, inner, innerOff, Math.max(closestRect.left, Math.min(closestRect.right, x)), y);
+        let after = (x > (closestRect.left + closestRect.right) / 2) == (dirAt(view, closest + offset) == exports.Direction.LTR);
+        return after ? new PosAssoc(innerOff + inner.length, -1) : new PosAssoc(innerOff, 1);
+    }
+}
+function dirAt(view, pos) {
+    let line = view.state.doc.lineAt(pos), spans = view.bidiSpans(line);
+    return spans[BidiSpan.find(view.bidiSpans(line), pos - line.from, -1, 1)].dir;
+}
 
 const LineBreakPlaceholder = "\uffff";
 class DOMReader {
@@ -3949,7 +3824,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)
+                if ((tile === null || tile === void 0 ? void 0 : tile.breakAfter) && !next)
                     this.lineBreak();
                 break;
             }
@@ -8354,6 +8229,11 @@ class EditorView {
         return this.docView.posFromDOM(node, offset);
     }
     posAtCoords(coords, precise = true) {
+        this.readMeasured();
+        let found = posAtCoords(this, coords, precise);
+        return found && found.pos;
+    }
+    posAndSideAtCoords(coords, precise = true) {
         this.readMeasured();
         return posAtCoords(this, coords, precise);
     }

package/dist/index.d.cts

@@ -1017,6 +1017,28 @@ declare class EditorView {
         y: number;
     }): number | null;
     /**
+    Like [`posAtCoords`](https://codemirror.net/6/docs/ref/#view.EditorView.posAtCoords), but also
+    returns which side of the position the coordinates are closest
+    to. For example, for coordinates on the left side of a
+    left-to-right character, the position before that letter is
+    returned, with `assoc` 1, whereas on the right side, you'd get
+    the position after the character, with `assoc` -1.
+    */
+    posAndSideAtCoords(coords: {
+        x: number;
+        y: number;
+    }, precise: false): {
+        pos: number;
+        assoc: -1 | 1;
+    };
+    posAndSideAtCoords(coords: {
+        x: number;
+        y: number;
+    }): {
+        pos: number;
+        assoc: -1 | 1;
+    } | null;
+    /**
     Get the screen coordinates at the given document position.
     `side` determines whether the coordinates are based on the
     element before (-1) or after (1) the position (if no element is

package/dist/index.d.ts

@@ -1017,6 +1017,28 @@ declare class EditorView {
         y: number;
     }): number | null;
     /**
+    Like [`posAtCoords`](https://codemirror.net/6/docs/ref/#view.EditorView.posAtCoords), but also
+    returns which side of the position the coordinates are closest
+    to. For example, for coordinates on the left side of a
+    left-to-right character, the position before that letter is
+    returned, with `assoc` 1, whereas on the right side, you'd get
+    the position after the character, with `assoc` -1.
+    */
+    posAndSideAtCoords(coords: {
+        x: number;
+        y: number;
+    }, precise: false): {
+        pos: number;
+        assoc: -1 | 1;
+    };
+    posAndSideAtCoords(coords: {
+        x: number;
+        y: number;
+    }): {
+        pos: number;
+        assoc: -1 | 1;
+    } | null;
+    /**
     Get the screen coordinates at the given document position.
     `side` determines whether the coordinates are based on the
     element before (-1) or after (1) the position (if no element is

package/dist/index.js

@@ -1746,8 +1746,8 @@ class Tile {
     get posAtEnd() {
         return this.posAtStart + this.length;
     }
-    posBefore(tile) {
-        let pos = this.posAtStart;
+    posBefore(tile, start = this.posAtStart) {
+        let pos = start;
         for (let child of this.children) {
             if (child == tile)
                 return pos;
@@ -3536,199 +3536,6 @@ function groupAt(state, pos, bias = 1) {
     }
     return EditorSelection.range(from + line.from, to + line.from);
 }
-// Search the DOM for the {node, offset} position closest to the given
-// coordinates. Very inefficient and crude, but can usually be avoided
-// by calling caret(Position|Range)FromPoint instead.
-function getdx(x, rect) {
-    return rect.left > x ? rect.left - x : Math.max(0, x - rect.right);
-}
-function getdy(y, rect) {
-    return rect.top > y ? rect.top - y : Math.max(0, y - rect.bottom);
-}
-function yOverlap(a, b) {
-    return a.top < b.bottom - 1 && a.bottom > b.top + 1;
-}
-function upTop(rect, top) {
-    return top < rect.top ? { top, left: rect.left, right: rect.right, bottom: rect.bottom } : rect;
-}
-function upBot(rect, bottom) {
-    return bottom > rect.bottom ? { top: rect.top, left: rect.left, right: rect.right, bottom } : rect;
-}
-function domPosAtCoords(parent, x, y) {
-    let closest, closestRect, closestX, closestY, closestOverlap = false;
-    let above, below, aboveRect, belowRect;
-    for (let child = parent.firstChild; child; child = child.nextSibling) {
-        let rects = clientRectsFor(child);
-        for (let i = 0; i < rects.length; i++) {
-            let rect = rects[i];
-            if (closestRect && yOverlap(closestRect, rect))
-                rect = upTop(upBot(rect, closestRect.bottom), closestRect.top);
-            let dx = getdx(x, rect), dy = getdy(y, rect);
-            if (dx == 0 && dy == 0)
-                return child.nodeType == 3 ? domPosInText(child, x, y) : domPosAtCoords(child, x, y);
-            if (!closest || closestY > dy || closestY == dy && closestX > dx) {
-                closest = child;
-                closestRect = rect;
-                closestX = dx;
-                closestY = dy;
-                closestOverlap = !dx ? true : x < rect.left ? i > 0 : i < rects.length - 1;
-            }
-            if (dx == 0) {
-                if (y > rect.bottom && (!aboveRect || aboveRect.bottom < rect.bottom)) {
-                    above = child;
-                    aboveRect = rect;
-                }
-                else if (y < rect.top && (!belowRect || belowRect.top > rect.top)) {
-                    below = child;
-                    belowRect = rect;
-                }
-            }
-            else if (aboveRect && yOverlap(aboveRect, rect)) {
-                aboveRect = upBot(aboveRect, rect.bottom);
-            }
-            else if (belowRect && yOverlap(belowRect, rect)) {
-                belowRect = upTop(belowRect, rect.top);
-            }
-        }
-    }
-    if (aboveRect && aboveRect.bottom >= y) {
-        closest = above;
-        closestRect = aboveRect;
-    }
-    else if (belowRect && belowRect.top <= y) {
-        closest = below;
-        closestRect = belowRect;
-    }
-    if (!closest)
-        return { node: parent, offset: 0 };
-    let clipX = Math.max(closestRect.left, Math.min(closestRect.right, x));
-    if (closest.nodeType == 3)
-        return domPosInText(closest, clipX, y);
-    if (closestOverlap && closest.contentEditable != "false")
-        return domPosAtCoords(closest, clipX, y);
-    let offset = Array.prototype.indexOf.call(parent.childNodes, closest) +
-        (x >= (closestRect.left + closestRect.right) / 2 ? 1 : 0);
-    return { node: parent, offset };
-}
-function domPosInText(node, x, y) {
-    let len = node.nodeValue.length;
-    let closestOffset = -1, closestDY = 1e9, generalSide = 0;
-    for (let i = 0; i < len; i++) {
-        let rects = textRange(node, i, i + 1).getClientRects();
-        for (let j = 0; j < rects.length; j++) {
-            let rect = rects[j];
-            if (rect.top == rect.bottom)
-                continue;
-            if (!generalSide)
-                generalSide = x - rect.left;
-            let dy = (rect.top > y ? rect.top - y : y - rect.bottom) - 1;
-            if (rect.left - 1 <= x && rect.right + 1 >= x && dy < closestDY) {
-                let right = x >= (rect.left + rect.right) / 2, after = right;
-                if (browser.chrome || browser.gecko) {
-                    // Check for RTL on browsers that support getting client
-                    // rects for empty ranges.
-                    let rectBefore = textRange(node, i).getBoundingClientRect();
-                    if (Math.abs(rectBefore.left - rect.right) < 0.1)
-                        after = !right;
-                }
-                if (dy <= 0)
-                    return { node, offset: i + (after ? 1 : 0) };
-                closestOffset = i + (after ? 1 : 0);
-                closestDY = dy;
-            }
-        }
-    }
-    return { node, offset: closestOffset > -1 ? closestOffset : generalSide > 0 ? node.nodeValue.length : 0 };
-}
-function posAtCoords(view, coords, precise, bias = -1) {
-    var _a;
-    let content = view.contentDOM.getBoundingClientRect(), docTop = content.top + view.viewState.paddingTop;
-    let block, { docHeight } = view.viewState;
-    let { x, y } = coords, yOffset = y - docTop;
-    if (yOffset < 0)
-        return 0;
-    if (yOffset > docHeight)
-        return view.state.doc.length;
-    // Scan for a text block near the queried y position
-    for (let halfLine = view.viewState.heightOracle.textHeight / 2, bounced = false;;) {
-        block = view.elementAtHeight(yOffset);
-        if (block.type == BlockType.Text)
-            break;
-        for (;;) {
-            // Move the y position out of this block
-            yOffset = bias > 0 ? block.bottom + halfLine : block.top - halfLine;
-            if (yOffset >= 0 && yOffset <= docHeight)
-                break;
-            // If the document consists entirely of replaced widgets, we
-            // won't find a text block, so return 0
-            if (bounced)
-                return precise ? null : 0;
-            bounced = true;
-            bias = -bias;
-        }
-    }
-    y = docTop + yOffset;
-    let lineStart = block.from;
-    // If this is outside of the rendered viewport, we can't determine a position
-    if (lineStart < view.viewport.from)
-        return view.viewport.from == 0 ? 0 : precise ? null : posAtCoordsImprecise(view, content, block, x, y);
-    if (lineStart > view.viewport.to)
-        return view.viewport.to == view.state.doc.length ? view.state.doc.length :
-            precise ? null : posAtCoordsImprecise(view, content, block, x, y);
-    // Prefer ShadowRootOrDocument.elementFromPoint if present, fall back to document if not
-    let doc = view.dom.ownerDocument;
-    let root = view.root.elementFromPoint ? view.root : doc;
-    let element = root.elementFromPoint(x, y);
-    if (element && !view.contentDOM.contains(element))
-        element = null;
-    // If the element is unexpected, clip x at the sides of the content area and try again
-    if (!element) {
-        x = Math.max(content.left + 1, Math.min(content.right - 1, x));
-        element = root.elementFromPoint(x, y);
-        if (element && !view.contentDOM.contains(element))
-            element = null;
-    }
-    // There's visible editor content under the point, so we can try
-    // using caret(Position|Range)FromPoint as a shortcut
-    let node, offset = -1;
-    if (element && !((_a = view.docView.tile.nearest(element)) === null || _a === void 0 ? void 0 : _a.isWidget())) {
-        if (doc.caretPositionFromPoint) {
-            let pos = doc.caretPositionFromPoint(x, y);
-            if (pos)
-                ({ offsetNode: node, offset } = pos);
-        }
-        else if (doc.caretRangeFromPoint) {
-            let range = doc.caretRangeFromPoint(x, y);
-            if (range)
-                ({ startContainer: node, startOffset: offset } = range);
-        }
-        if (node && (!view.contentDOM.contains(node) ||
-            browser.safari && isSuspiciousSafariCaretResult(node, offset, x) ||
-            browser.chrome && isSuspiciousChromeCaretResult(node, offset, x)))
-            node = undefined;
-        // Chrome will return offsets into <input> elements without child
-        // nodes, which will lead to a null deref below, so clip the
-        // offset to the node size.
-        if (node)
-            offset = Math.min(maxOffset(node), offset);
-    }
-    // No luck, do our own (potentially expensive) search
-    if (!node || !view.contentDOM.contains(node)) {
-        let line = view.docView.lineAt(lineStart);
-        if (!line)
-            return yOffset > block.top + block.height / 2 ? block.to : block.from;
-        ({ node, offset } = domPosAtCoords(line.dom, x, y));
-    }
-    let nearest = view.docView.tile.nearest(node);
-    if (!nearest)
-        return null;
-    if (nearest.isWidget()) {
-        let rect = nearest.dom.getBoundingClientRect();
-        return coords.y < rect.top || coords.y <= rect.bottom && coords.x <= (rect.left + rect.right) / 2
-            ? nearest.posAtStart : nearest.posAtEnd;
-    }
-    return view.docView.posFromDOM(node, offset);
-}
 function posAtCoordsImprecise(view, contentRect, block, x, y) {
     let into = Math.round((x - contentRect.left) * view.defaultCharacterWidth);
     if (view.lineWrapping && block.height > view.defaultLineHeight * 1.5) {
@@ -3739,49 +3546,6 @@ function posAtCoordsImprecise(view, contentRect, block, x, y) {
     let content = view.state.sliceDoc(block.from, block.to);
     return block.from + findColumn(content, into, view.state.tabSize);
 }
-function isEndOfLineBefore(node, offset, x) {
-    let len, scan = node;
-    if (node.nodeType != 3 || offset != (len = node.nodeValue.length))
-        return false;
-    for (;;) { // Check that there is no content after this node
-        let next = scan.nextSibling;
-        if (next) {
-            if (next.nodeName == "BR")
-                break;
-            return false;
-        }
-        else {
-            let parent = scan.parentNode;
-            if (!parent || parent.nodeName == "DIV")
-                break;
-            scan = parent;
-        }
-    }
-    return textRange(node, len - 1, len).getBoundingClientRect().right > x;
-}
-// In case of a high line height, Safari's caretRangeFromPoint treats
-// the space between lines as belonging to the last character of the
-// line before. This is used to detect such a result so that it can be
-// ignored (issue #401).
-function isSuspiciousSafariCaretResult(node, offset, x) {
-    return isEndOfLineBefore(node, offset, x);
-}
-// Chrome will move positions between lines to the start of the next line
-function isSuspiciousChromeCaretResult(node, offset, x) {
-    if (offset != 0)
-        return isEndOfLineBefore(node, offset, x);
-    for (let cur = node;;) {
-        let parent = cur.parentNode;
-        if (!parent || parent.nodeType != 1 || parent.firstChild != cur)
-            return false;
-        if (parent.classList.contains("cm-line"))
-            break;
-        cur = parent;
-    }
-    let rect = node.nodeType == 1 ? node.getBoundingClientRect()
-        : textRange(node, 0, Math.max(node.nodeValue.length, 1)).getBoundingClientRect();
-    return x - rect.left > 5;
-}
 function blockAt(view, pos, side) {
     let line = view.lineBlockAt(pos);
     if (Array.isArray(line.type)) {
@@ -3871,11 +3635,7 @@ function moveVertically(view, start, forward, distance) {
     for (let extra = 0;; extra += 10) {
         let curY = startY + (dist + extra) * dir;
         let pos = posAtCoords(view, { x: resolvedGoal, y: curY }, false, dir);
-        if (curY < rect.top || curY > rect.bottom || (dir < 0 ? pos < startPos : pos > startPos)) {
-            let charRect = view.docView.coordsForChar(pos);
-            let assoc = !charRect || curY < charRect.top ? -1 : 1;
-            return EditorSelection.cursor(pos, assoc, undefined, goal);
-        }
+        return EditorSelection.cursor(pos.pos, pos.assoc, undefined, goal);
     }
 }
 function skipAtomicRanges(atoms, pos, bias) {
@@ -3921,6 +3681,121 @@ function skipAtoms(view, oldPos, pos) {
     let newPos = skipAtomicRanges(view.state.facet(atomicRanges).map(f => f(view)), pos.from, oldPos.head > pos.from ? -1 : 1);
     return newPos == pos.from ? pos : EditorSelection.cursor(newPos, newPos < pos.from ? 1 : -1);
 }
+class PosAssoc {
+    constructor(pos, assoc) {
+        this.pos = pos;
+        this.assoc = assoc;
+    }
+}
+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.
+    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)
+            break;
+        let halfLine = view.viewState.heightOracle.textHeight / 2;
+        yOffset = scanY > 0 ? block.bottom + halfLine : block.top - halfLine;
+    }
+    // If outside the viewport, return null if precise==true, an
+    // estimate otherwise.
+    if (view.viewport.from >= block.to || view.viewport.to <= block.from) {
+        if (precise)
+            return null;
+        if (block.type == BlockType.Text) {
+            let pos = posAtCoordsImprecise(view, content, block, x, y);
+            return new PosAssoc(pos, pos == block.from ? 1 : -1);
+        }
+    }
+    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);
+}
+// Scan through the rectangles for the content of a tile, finding the
+// one closest to the given coordinates, prefering closeness in Y over
+// closeness in X.
+//
+// If this is a text tile, go character-by-character. For line or mark
+// tiles, check each non-point-widget child, and descend text or mark
+// tiles with a recursive call.
+//
+// For non-wrapped, purely left-to-right text, this could use a binary
+// search. But because this seems to be fast enough, for how often it
+// is called, there's not currently a specialized implementation for
+// that.
+function posAtCoordsInline(view, tile, offset, x, y) {
+    let closest = -1, closestRect = null;
+    let dxClosest = 1e9, dyClosest = 1e9;
+    let rowTop = y, rowBot = y;
+    let checkRects = (rects, index) => {
+        for (let i = 0; i < rects.length; i++) {
+            let rect = rects[i];
+            if (rect.top == rect.bottom)
+                continue;
+            let dx = rect.left > x ? rect.left - x : rect.right < x ? x - rect.right : 0;
+            let dy = rect.top > y ? rect.top - y : rect.bottom < y ? y - rect.bottom : 0;
+            if (rect.top <= rowBot && rect.bottom >= rowTop) {
+                // Rectangle is in the current row
+                rowTop = Math.min(rect.top, rowTop);
+                rowBot = Math.max(rect.bottom, rowBot);
+                dy = 0;
+            }
+            if (closest < 0 || (dy - dyClosest || dx - dxClosest) < 0) {
+                if (closest >= 0 && dyClosest && dxClosest < dx &&
+                    closestRect.top <= rowBot - 2 && closestRect.bottom >= rowTop + 2) {
+                    // Retroactively set dy to 0 if the current match is in this row.
+                    dyClosest = 0;
+                }
+                else {
+                    closest = index;
+                    dxClosest = dx;
+                    dyClosest = dy;
+                    closestRect = rect;
+                }
+            }
+        }
+    };
+    if (tile.isText()) {
+        for (let i = 0; i < tile.length;) {
+            let next = findClusterBreak(tile.text, i);
+            checkRects(textRange(tile.dom, i, next).getClientRects(), i);
+            if (!dxClosest && !dyClosest)
+                break;
+            i = next;
+        }
+        let after = (x > (closestRect.left + closestRect.right) / 2) == (dirAt(view, closest + offset) == Direction.LTR);
+        return after ? new PosAssoc(offset + findClusterBreak(tile.text, closest), -1) : new PosAssoc(offset + closest, 1);
+    }
+    else {
+        if (!tile.length)
+            return new PosAssoc(offset, 1);
+        for (let i = 0; i < tile.children.length; i++) {
+            let child = tile.children[i];
+            if (child.flags & 48 /* TileFlag.PointWidget */)
+                continue;
+            let rects = (child.dom.nodeType == 1 ? child.dom : textRange(child.dom, 0, child.length)).getClientRects();
+            checkRects(rects, i);
+            if (!dxClosest && !dyClosest)
+                break;
+        }
+        let inner = tile.children[closest], innerOff = tile.posBefore(inner, offset);
+        if (inner.isComposite() || inner.isText())
+            return posAtCoordsInline(view, inner, innerOff, Math.max(closestRect.left, Math.min(closestRect.right, x)), y);
+        let after = (x > (closestRect.left + closestRect.right) / 2) == (dirAt(view, closest + offset) == Direction.LTR);
+        return after ? new PosAssoc(innerOff + inner.length, -1) : new PosAssoc(innerOff, 1);
+    }
+}
+function dirAt(view, pos) {
+    let line = view.state.doc.lineAt(pos), spans = view.bidiSpans(line);
+    return spans[BidiSpan.find(view.bidiSpans(line), pos - line.from, -1, 1)].dir;
+}
 
 const LineBreakPlaceholder = "\uffff";
 class DOMReader {
@@ -3945,7 +3820,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)
+                if ((tile === null || tile === void 0 ? void 0 : tile.breakAfter) && !next)
                     this.lineBreak();
                 break;
             }
@@ -8349,6 +8224,11 @@ class EditorView {
         return this.docView.posFromDOM(node, offset);
     }
     posAtCoords(coords, precise = true) {
+        this.readMeasured();
+        let found = posAtCoords(this, coords, precise);
+        return found && found.pos;
+    }
+    posAndSideAtCoords(coords, precise = true) {
         this.readMeasured();
         return posAtCoords(this, coords, precise);
     }

package/package.json

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