@codemirror/view 6.13.2 → 6.14.1

package/CHANGELOG.md

@@ -1,3 +1,29 @@
+## 6.14.1 (2023-07-06)
+
+### Bug fixes
+
+Fix an issue where scrolling up through line-wrapped text would sometimes cause the scroll position to pop down.
+
+Fix an issue where clicking wouldn't focus the editor on Firefox when it was in an iframe and already the active element of the frame.
+
+Fix a bug that could cause compositions to be disrupted because their surrounding DOM was repurposed for some other piece of content.
+
+Fix a bug where adding content to the editor could inappropriately move the scroll position.
+
+Extend detection of Enter presses on Android to `beforeInput` events with an `"insertLineBreak"` type.
+
+## 6.14.0 (2023-06-23)
+
+### Bug fixes
+
+When dragging text inside the editor, look at the state of Ctrl (or Alt on macOS) at the time of the drop, not the start of drag, to determine whether to move or copy the text.
+
+Fix an issue where having a bunch of padding on lines could cause vertical cursor motion and `posAtCoords` to jump over lines.
+
+### New features
+
+Block widget decorations can now be given an `inlineOrder` option to make them appear in the same ordering as surrounding inline widgets.
+
 ## 6.13.2 (2023-06-13)
 
 ### Bug fixes

package/dist/index.cjs

@@ -320,6 +320,9 @@ function atElementStart(doc, selection) {
         }
     }
 }
+function isScrolledToBottom(elt) {
+    return elt.scrollTop > Math.max(1, elt.scrollHeight - elt.clientHeight - 4);
+}
 
 class DOMPos {
     constructor(node, offset, precise = true) {
@@ -362,7 +365,7 @@ class ContentView {
             let prev = null, next;
             for (let child of this.children) {
                 if (child.dirty) {
-                    if (!child.dom && (next = prev ? prev.nextSibling : parent.firstChild)) {
+                    if (!child.dom && (next = prev ? prev.nextSibling : parent.firstChild) && next != view.docView.compositionNode) {
                         let contentView = ContentView.get(next);
                         if (!contentView || !contentView.parent && contentView.canReuseDOM(child))
                             child.reuseDOM(next);
@@ -1327,7 +1330,9 @@ class Decoration extends state.RangeValue {
     */
     static widget(spec) {
         let side = Math.max(-10000, Math.min(10000, spec.side || 0)), block = !!spec.block;
-        side += block ? (side > 0 ? 300000000 /* BlockAfter */ : -400000000 /* BlockBefore */) : (side > 0 ? 100000000 /* InlineAfter */ : -100000000 /* InlineBefore */);
+        side += (block && !spec.inlineOrder)
+            ? (side > 0 ? 300000000 /* BlockAfter */ : -400000000 /* BlockBefore */)
+            : (side > 0 ? 100000000 /* InlineAfter */ : -100000000 /* InlineBefore */);
         return new PointDecoration(spec, side, side, block, spec.widget || null, false);
     }
     /**
@@ -2599,6 +2604,7 @@ class DocView extends ContentView {
         super();
         this.view = view;
         this.compositionDeco = Decoration.none;
+        this.compositionNode = null;
         this.decorations = [];
         this.dynamicDecorationMap = [];
         // Track a minimum width for the editor. When measuring sizes in
@@ -2638,10 +2644,8 @@ class DocView extends ContentView {
                 this.minWidthTo = update.changes.mapPos(this.minWidthTo, 1);
             }
         }
-        if (this.view.inputState.composing < 0)
-            this.compositionDeco = Decoration.none;
-        else if (update.transactions.length || this.dirty)
-            this.compositionDeco = computeCompositionDeco(this.view, update.changes);
+        ({ deco: this.compositionDeco, node: this.compositionNode } =
+            this.view.inputState.composing < 0 ? noComp : computeCompositionDeco(this.view, update.changes));
         // When the DOM nodes around the selection are moved to another
         // parent, Chrome sometimes reports a different selection through
         // getSelection than the one that it actually shows to the user.
@@ -3029,10 +3033,11 @@ function compositionSurroundingNode(view) {
         return { from, to: from + cView.length, node: cView.dom, text: textNode };
     }
 }
+const noComp = { deco: Decoration.none, node: null };
 function computeCompositionDeco(view, changes) {
     let surrounding = compositionSurroundingNode(view);
     if (!surrounding)
-        return Decoration.none;
+        return noComp;
     let { from, to, node, text: textNode } = surrounding;
     let newFrom = changes.mapPos(from, 1), newTo = Math.max(newFrom, changes.mapPos(to, -1));
     let { state } = view, reader = new DOMReader([], state);
@@ -3042,25 +3047,26 @@ function computeCompositionDeco(view, changes) {
         reader.readRange(node.firstChild, null);
     let { text } = reader;
     if (text.indexOf(LineBreakPlaceholder) > -1)
-        return Decoration.none; // Don't try to preserve multi-line compositions
+        return noComp; // Don't try to preserve multi-line compositions
     if (newTo - newFrom < text.length) {
         if (state.doc.sliceString(newFrom, Math.min(state.doc.length, newFrom + text.length)) == text)
             newTo = newFrom + text.length;
         else if (state.doc.sliceString(Math.max(0, newTo - text.length), newTo) == text)
             newFrom = newTo - text.length;
         else
-            return Decoration.none;
+            return noComp;
     }
     else if (state.doc.sliceString(newFrom, newTo) != text) {
-        return Decoration.none;
+        return noComp;
     }
     let topView = ContentView.get(node);
     if (topView instanceof CompositionView)
         topView = topView.widget.topView;
     else if (topView)
         topView.parent = null;
-    return Decoration.set(Decoration.replace({ widget: new CompositionWidget(node, textNode, topView), inclusive: true })
+    let deco = Decoration.set(Decoration.replace({ widget: new CompositionWidget(node, textNode, topView), inclusive: true })
         .range(newFrom, newTo));
+    return { deco, node };
 }
 class CompositionWidget extends WidgetType {
     constructor(top, text, topView) {
@@ -3272,7 +3278,7 @@ function posAtCoords(view, coords, precise, bias = -1) {
     if (yOffset > docHeight)
         return view.state.doc.length;
     // Scan for a text block near the queried y position
-    for (let halfLine = view.defaultLineHeight / 2, bounced = false;;) {
+    for (let halfLine = view.viewState.heightOracle.textHeight / 2, bounced = false;;) {
         block = view.elementAtHeight(yOffset);
         if (block.type == exports.BlockType.Text)
             break;
@@ -3352,7 +3358,8 @@ function posAtCoords(view, coords, precise, bias = -1) {
 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) {
-        let line = Math.floor((y - block.top) / view.defaultLineHeight);
+        let textHeight = view.viewState.heightOracle.textHeight;
+        let line = Math.floor((y - block.top - (view.defaultLineHeight - textHeight) * 0.5) / textHeight);
         into += line * view.viewState.heightOracle.lineLength;
     }
     let content = view.state.sliceDoc(block.from, block.to);
@@ -3463,7 +3470,7 @@ function moveVertically(view, start, forward, distance) {
         startY = (dir < 0 ? line.top : line.bottom) + docTop;
     }
     let resolvedGoal = rect.left + goal;
-    let dist = distance !== null && distance !== void 0 ? distance : (view.defaultLineHeight >> 1);
+    let dist = distance !== null && distance !== void 0 ? distance : (view.viewState.heightOracle.textHeight >> 1);
     for (let extra = 0;; extra += 10) {
         let curY = startY + (dist + extra) * dir;
         let pos = posAtCoords(view, { x: resolvedGoal, y: curY }, false, dir);
@@ -3722,6 +3729,7 @@ class InputState {
 const PendingKeys = [
     { key: "Backspace", keyCode: 8, inputType: "deleteContentBackward" },
     { key: "Enter", keyCode: 13, inputType: "insertParagraph" },
+    { key: "Enter", keyCode: 13, inputType: "insertLineBreak" },
     { key: "Delete", keyCode: 46, inputType: "deleteContentForward" }
 ];
 const EmacsyPendingKeys = "dthko";
@@ -3746,7 +3754,6 @@ class MouseSelection {
         doc.addEventListener("mouseup", this.up = this.up.bind(this));
         this.extend = startEvent.shiftKey;
         this.multiple = view.state.facet(state.EditorState.allowMultipleSelections) && addsSelectionRange(view, startEvent);
-        this.dragMove = dragMovesSelection(view, startEvent);
         this.dragging = isInPrimarySelection(view, startEvent) && getClickType(startEvent) == 1 ? null : false;
     }
     start(event) {
@@ -3967,7 +3974,7 @@ handlers.mousedown = (view, event) => {
     if (!style && event.button == 0)
         style = basicMouseSelection(view, event);
     if (style) {
-        let mustFocus = view.root.activeElement != view.contentDOM;
+        let mustFocus = !view.hasFocus;
         view.inputState.startMouseSelection(new MouseSelection(view, event, style, mustFocus));
         if (mustFocus)
             view.observer.ignore(() => focusPreventScroll(view.contentDOM));
@@ -4084,7 +4091,7 @@ function dropText(view, event, text, direct) {
     let dropPos = view.posAtCoords({ x: event.clientX, y: event.clientY }, false);
     event.preventDefault();
     let { mouseSelection } = view.inputState;
-    let del = direct && mouseSelection && mouseSelection.dragging && mouseSelection.dragMove ?
+    let del = direct && mouseSelection && mouseSelection.dragging && dragMovesSelection(view, event) ?
         { from: mouseSelection.dragging.from, to: mouseSelection.dragging.to } : null;
     let ins = { from: dropPos, insert: text };
     let changes = view.state.changes(del ? [del, ins] : ins);
@@ -5164,7 +5171,7 @@ class ViewState {
         let contentChanges = update.changedRanges;
         let heightChanges = ChangedRange.extendWithRanges(contentChanges, heightRelevantDecoChanges(prevDeco, this.stateDeco, update ? update.changes : state.ChangeSet.empty(this.state.doc.length)));
         let prevHeight = this.heightMap.height;
-        let scrollAnchor = this.scrolledToBottom ? null : this.lineBlockAtHeight(this.scrollTop);
+        let scrollAnchor = this.scrolledToBottom ? null : this.scrollAnchorAt(this.scrollTop);
         this.heightMap = this.heightMap.applyChanges(this.stateDeco, update.startState.doc, this.heightOracle.setDoc(this.state.doc), heightChanges);
         if (this.heightMap.height != prevHeight)
             update.flags |= 2 /* Height */;
@@ -5224,7 +5231,7 @@ class ViewState {
             this.scrollAnchorHeight = -1;
             this.scrollTop = view.scrollDOM.scrollTop;
         }
-        this.scrolledToBottom = this.scrollTop > view.scrollDOM.scrollHeight - view.scrollDOM.clientHeight - 4;
+        this.scrolledToBottom = isScrolledToBottom(view.scrollDOM);
         // Pixel viewport
         let pixelViewport = (this.printing ? fullPixelRange : visiblePixelRange)(dom, this.paddingTop);
         let dTop = pixelViewport.top - this.pixelViewport.top, dBottom = pixelViewport.bottom - this.pixelViewport.bottom;
@@ -5467,6 +5474,10 @@ class ViewState {
     lineBlockAtHeight(height) {
         return scaleBlock(this.heightMap.lineAt(this.scaler.fromDOM(height), QueryType.ByHeight, this.heightOracle, 0, 0), this.scaler);
     }
+    scrollAnchorAt(scrollTop) {
+        let block = this.lineBlockAtHeight(scrollTop + 8);
+        return block.from >= this.viewport.from || this.viewportLines[0].top - scrollTop > 200 ? block : this.viewportLines[0];
+    }
     elementAtHeight(height) {
         return scaleBlock(this.heightMap.blockAt(this.scaler.fromDOM(height), this.heightOracle, 0, 0), this.scaler);
     }
@@ -6839,22 +6850,23 @@ class EditorView {
         let updated = null;
         let sDOM = this.scrollDOM, { scrollTop } = sDOM;
         let { scrollAnchorPos, scrollAnchorHeight } = this.viewState;
+        if (scrollTop != this.viewState.scrollTop)
+            scrollAnchorHeight = -1;
         this.viewState.scrollAnchorHeight = -1;
-        if (scrollAnchorHeight < 0 || scrollTop != this.viewState.scrollTop) {
-            if (scrollTop > sDOM.scrollHeight - sDOM.clientHeight - 4) {
-                scrollAnchorPos = -1;
-                scrollAnchorHeight = this.viewState.heightMap.height;
-            }
-            else {
-                let block = this.viewState.lineBlockAtHeight(scrollTop);
-                scrollAnchorPos = block.from;
-                scrollAnchorHeight = block.top;
-            }
-        }
         try {
             for (let i = 0;; i++) {
+                if (scrollAnchorHeight < 0) {
+                    if (isScrolledToBottom(sDOM)) {
+                        scrollAnchorPos = -1;
+                        scrollAnchorHeight = this.viewState.heightMap.height;
+                    }
+                    else {
+                        let block = this.viewState.scrollAnchorAt(scrollTop);
+                        scrollAnchorPos = block.from;
+                        scrollAnchorHeight = block.top;
+                    }
+                }
                 this.updateState = 1 /* Measuring */;
-                let oldViewport = this.viewport;
                 let changed = this.viewState.measure(this);
                 if (!changed && !this.measureRequests.length && this.viewState.scrollTarget == null)
                     break;
@@ -6877,7 +6889,7 @@ class EditorView {
                         return BadMeasure;
                     }
                 });
-                let update = ViewUpdate.create(this, this.state, []), redrawn = false, scrolled = false;
+                let update = ViewUpdate.create(this, this.state, []), redrawn = false;
                 update.flags |= changed;
                 if (!updated)
                     updated = update;
@@ -6901,28 +6913,28 @@ class EditorView {
                             logException(this.state, e);
                         }
                     }
-                if (this.viewState.editorHeight) {
-                    if (this.viewState.scrollTarget) {
-                        this.docView.scrollIntoView(this.viewState.scrollTarget);
-                        this.viewState.scrollTarget = null;
-                        scrolled = true;
-                    }
-                    else if (scrollAnchorHeight > -1) {
-                        let newAnchorHeight = scrollAnchorPos < 0 ? this.viewState.heightMap.height :
-                            this.viewState.lineBlockAt(scrollAnchorPos).top;
-                        let diff = newAnchorHeight - scrollAnchorHeight;
-                        if (diff > 1 || diff < -1) {
-                            sDOM.scrollTop = scrollTop + diff;
-                            scrolled = true;
-                        }
-                    }
-                }
                 if (redrawn)
                     this.docView.updateSelection(true);
-                if (this.viewport.from == oldViewport.from && this.viewport.to == oldViewport.to &&
-                    !scrolled && this.measureRequests.length == 0)
+                if (!update.viewportChanged && this.measureRequests.length == 0) {
+                    if (this.viewState.editorHeight) {
+                        if (this.viewState.scrollTarget) {
+                            this.docView.scrollIntoView(this.viewState.scrollTarget);
+                            this.viewState.scrollTarget = null;
+                            continue;
+                        }
+                        else {
+                            let newAnchorHeight = scrollAnchorPos < 0 ? this.viewState.heightMap.height :
+                                this.viewState.lineBlockAt(scrollAnchorPos).top;
+                            let diff = newAnchorHeight - scrollAnchorHeight;
+                            if (diff > 1 || diff < -1) {
+                                scrollTop = sDOM.scrollTop = scrollTop + diff;
+                                scrollAnchorHeight = -1;
+                                continue;
+                            }
+                        }
+                    }
                     break;
-                scrollAnchorHeight = -1;
+                }
             }
         }
         finally {

package/dist/index.d.cts

@@ -72,13 +72,18 @@ interface WidgetDecorationSpec {
     values will determine their ordering—those with a lower value
     come first. Defaults to 0. May not be more than 10000 or less
     than -10000.
-    
-    Block widgets are always drawn before inline widgets when side
-    is non-positive, and after them when side is positive,
-    regardless of the value of `side`.
     */
     side?: number;
     /**
+    By default, to avoid unintended mixing of block and inline
+    widgets, block widgets with a positive `side` are always drawn
+    after all inline widgets at that position, and those with a
+    non-positive side before inline widgets. Setting this option to
+    `true` for a block widget will turn this off and cause it to be
+    rendered between the inline widgets, ordered by `side`.
+    */
+    inlineOrder?: boolean;
+    /**
     Determines whether this is a block widgets, which will be drawn
     between lines, or an inline widget (the default) which is drawn
     between the surrounding text.

package/dist/index.d.ts

@@ -72,13 +72,18 @@ interface WidgetDecorationSpec {
     values will determine their ordering—those with a lower value
     come first. Defaults to 0. May not be more than 10000 or less
     than -10000.
-    
-    Block widgets are always drawn before inline widgets when side
-    is non-positive, and after them when side is positive,
-    regardless of the value of `side`.
     */
     side?: number;
     /**
+    By default, to avoid unintended mixing of block and inline
+    widgets, block widgets with a positive `side` are always drawn
+    after all inline widgets at that position, and those with a
+    non-positive side before inline widgets. Setting this option to
+    `true` for a block widget will turn this off and cause it to be
+    rendered between the inline widgets, ordered by `side`.
+    */
+    inlineOrder?: boolean;
+    /**
     Determines whether this is a block widgets, which will be drawn
     between lines, or an inline widget (the default) which is drawn
     between the surrounding text.

package/dist/index.js

@@ -316,6 +316,9 @@ function atElementStart(doc, selection) {
         }
     }
 }
+function isScrolledToBottom(elt) {
+    return elt.scrollTop > Math.max(1, elt.scrollHeight - elt.clientHeight - 4);
+}
 
 class DOMPos {
     constructor(node, offset, precise = true) {
@@ -358,7 +361,7 @@ class ContentView {
             let prev = null, next;
             for (let child of this.children) {
                 if (child.dirty) {
-                    if (!child.dom && (next = prev ? prev.nextSibling : parent.firstChild)) {
+                    if (!child.dom && (next = prev ? prev.nextSibling : parent.firstChild) && next != view.docView.compositionNode) {
                         let contentView = ContentView.get(next);
                         if (!contentView || !contentView.parent && contentView.canReuseDOM(child))
                             child.reuseDOM(next);
@@ -1322,7 +1325,9 @@ class Decoration extends RangeValue {
     */
     static widget(spec) {
         let side = Math.max(-10000, Math.min(10000, spec.side || 0)), block = !!spec.block;
-        side += block ? (side > 0 ? 300000000 /* BlockAfter */ : -400000000 /* BlockBefore */) : (side > 0 ? 100000000 /* InlineAfter */ : -100000000 /* InlineBefore */);
+        side += (block && !spec.inlineOrder)
+            ? (side > 0 ? 300000000 /* BlockAfter */ : -400000000 /* BlockBefore */)
+            : (side > 0 ? 100000000 /* InlineAfter */ : -100000000 /* InlineBefore */);
         return new PointDecoration(spec, side, side, block, spec.widget || null, false);
     }
     /**
@@ -2593,6 +2598,7 @@ class DocView extends ContentView {
         super();
         this.view = view;
         this.compositionDeco = Decoration.none;
+        this.compositionNode = null;
         this.decorations = [];
         this.dynamicDecorationMap = [];
         // Track a minimum width for the editor. When measuring sizes in
@@ -2632,10 +2638,8 @@ class DocView extends ContentView {
                 this.minWidthTo = update.changes.mapPos(this.minWidthTo, 1);
             }
         }
-        if (this.view.inputState.composing < 0)
-            this.compositionDeco = Decoration.none;
-        else if (update.transactions.length || this.dirty)
-            this.compositionDeco = computeCompositionDeco(this.view, update.changes);
+        ({ deco: this.compositionDeco, node: this.compositionNode } =
+            this.view.inputState.composing < 0 ? noComp : computeCompositionDeco(this.view, update.changes));
         // When the DOM nodes around the selection are moved to another
         // parent, Chrome sometimes reports a different selection through
         // getSelection than the one that it actually shows to the user.
@@ -3023,10 +3027,11 @@ function compositionSurroundingNode(view) {
         return { from, to: from + cView.length, node: cView.dom, text: textNode };
     }
 }
+const noComp = { deco: Decoration.none, node: null };
 function computeCompositionDeco(view, changes) {
     let surrounding = compositionSurroundingNode(view);
     if (!surrounding)
-        return Decoration.none;
+        return noComp;
     let { from, to, node, text: textNode } = surrounding;
     let newFrom = changes.mapPos(from, 1), newTo = Math.max(newFrom, changes.mapPos(to, -1));
     let { state } = view, reader = new DOMReader([], state);
@@ -3036,25 +3041,26 @@ function computeCompositionDeco(view, changes) {
         reader.readRange(node.firstChild, null);
     let { text } = reader;
     if (text.indexOf(LineBreakPlaceholder) > -1)
-        return Decoration.none; // Don't try to preserve multi-line compositions
+        return noComp; // Don't try to preserve multi-line compositions
     if (newTo - newFrom < text.length) {
         if (state.doc.sliceString(newFrom, Math.min(state.doc.length, newFrom + text.length)) == text)
             newTo = newFrom + text.length;
         else if (state.doc.sliceString(Math.max(0, newTo - text.length), newTo) == text)
             newFrom = newTo - text.length;
         else
-            return Decoration.none;
+            return noComp;
     }
     else if (state.doc.sliceString(newFrom, newTo) != text) {
-        return Decoration.none;
+        return noComp;
     }
     let topView = ContentView.get(node);
     if (topView instanceof CompositionView)
         topView = topView.widget.topView;
     else if (topView)
         topView.parent = null;
-    return Decoration.set(Decoration.replace({ widget: new CompositionWidget(node, textNode, topView), inclusive: true })
+    let deco = Decoration.set(Decoration.replace({ widget: new CompositionWidget(node, textNode, topView), inclusive: true })
         .range(newFrom, newTo));
+    return { deco, node };
 }
 class CompositionWidget extends WidgetType {
     constructor(top, text, topView) {
@@ -3266,7 +3272,7 @@ function posAtCoords(view, coords, precise, bias = -1) {
     if (yOffset > docHeight)
         return view.state.doc.length;
     // Scan for a text block near the queried y position
-    for (let halfLine = view.defaultLineHeight / 2, bounced = false;;) {
+    for (let halfLine = view.viewState.heightOracle.textHeight / 2, bounced = false;;) {
         block = view.elementAtHeight(yOffset);
         if (block.type == BlockType.Text)
             break;
@@ -3346,7 +3352,8 @@ function posAtCoords(view, coords, precise, bias = -1) {
 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) {
-        let line = Math.floor((y - block.top) / view.defaultLineHeight);
+        let textHeight = view.viewState.heightOracle.textHeight;
+        let line = Math.floor((y - block.top - (view.defaultLineHeight - textHeight) * 0.5) / textHeight);
         into += line * view.viewState.heightOracle.lineLength;
     }
     let content = view.state.sliceDoc(block.from, block.to);
@@ -3457,7 +3464,7 @@ function moveVertically(view, start, forward, distance) {
         startY = (dir < 0 ? line.top : line.bottom) + docTop;
     }
     let resolvedGoal = rect.left + goal;
-    let dist = distance !== null && distance !== void 0 ? distance : (view.defaultLineHeight >> 1);
+    let dist = distance !== null && distance !== void 0 ? distance : (view.viewState.heightOracle.textHeight >> 1);
     for (let extra = 0;; extra += 10) {
         let curY = startY + (dist + extra) * dir;
         let pos = posAtCoords(view, { x: resolvedGoal, y: curY }, false, dir);
@@ -3716,6 +3723,7 @@ class InputState {
 const PendingKeys = [
     { key: "Backspace", keyCode: 8, inputType: "deleteContentBackward" },
     { key: "Enter", keyCode: 13, inputType: "insertParagraph" },
+    { key: "Enter", keyCode: 13, inputType: "insertLineBreak" },
     { key: "Delete", keyCode: 46, inputType: "deleteContentForward" }
 ];
 const EmacsyPendingKeys = "dthko";
@@ -3740,7 +3748,6 @@ class MouseSelection {
         doc.addEventListener("mouseup", this.up = this.up.bind(this));
         this.extend = startEvent.shiftKey;
         this.multiple = view.state.facet(EditorState.allowMultipleSelections) && addsSelectionRange(view, startEvent);
-        this.dragMove = dragMovesSelection(view, startEvent);
         this.dragging = isInPrimarySelection(view, startEvent) && getClickType(startEvent) == 1 ? null : false;
     }
     start(event) {
@@ -3961,7 +3968,7 @@ handlers.mousedown = (view, event) => {
     if (!style && event.button == 0)
         style = basicMouseSelection(view, event);
     if (style) {
-        let mustFocus = view.root.activeElement != view.contentDOM;
+        let mustFocus = !view.hasFocus;
         view.inputState.startMouseSelection(new MouseSelection(view, event, style, mustFocus));
         if (mustFocus)
             view.observer.ignore(() => focusPreventScroll(view.contentDOM));
@@ -4078,7 +4085,7 @@ function dropText(view, event, text, direct) {
     let dropPos = view.posAtCoords({ x: event.clientX, y: event.clientY }, false);
     event.preventDefault();
     let { mouseSelection } = view.inputState;
-    let del = direct && mouseSelection && mouseSelection.dragging && mouseSelection.dragMove ?
+    let del = direct && mouseSelection && mouseSelection.dragging && dragMovesSelection(view, event) ?
         { from: mouseSelection.dragging.from, to: mouseSelection.dragging.to } : null;
     let ins = { from: dropPos, insert: text };
     let changes = view.state.changes(del ? [del, ins] : ins);
@@ -5157,7 +5164,7 @@ class ViewState {
         let contentChanges = update.changedRanges;
         let heightChanges = ChangedRange.extendWithRanges(contentChanges, heightRelevantDecoChanges(prevDeco, this.stateDeco, update ? update.changes : ChangeSet.empty(this.state.doc.length)));
         let prevHeight = this.heightMap.height;
-        let scrollAnchor = this.scrolledToBottom ? null : this.lineBlockAtHeight(this.scrollTop);
+        let scrollAnchor = this.scrolledToBottom ? null : this.scrollAnchorAt(this.scrollTop);
         this.heightMap = this.heightMap.applyChanges(this.stateDeco, update.startState.doc, this.heightOracle.setDoc(this.state.doc), heightChanges);
         if (this.heightMap.height != prevHeight)
             update.flags |= 2 /* Height */;
@@ -5217,7 +5224,7 @@ class ViewState {
             this.scrollAnchorHeight = -1;
             this.scrollTop = view.scrollDOM.scrollTop;
         }
-        this.scrolledToBottom = this.scrollTop > view.scrollDOM.scrollHeight - view.scrollDOM.clientHeight - 4;
+        this.scrolledToBottom = isScrolledToBottom(view.scrollDOM);
         // Pixel viewport
         let pixelViewport = (this.printing ? fullPixelRange : visiblePixelRange)(dom, this.paddingTop);
         let dTop = pixelViewport.top - this.pixelViewport.top, dBottom = pixelViewport.bottom - this.pixelViewport.bottom;
@@ -5460,6 +5467,10 @@ class ViewState {
     lineBlockAtHeight(height) {
         return scaleBlock(this.heightMap.lineAt(this.scaler.fromDOM(height), QueryType.ByHeight, this.heightOracle, 0, 0), this.scaler);
     }
+    scrollAnchorAt(scrollTop) {
+        let block = this.lineBlockAtHeight(scrollTop + 8);
+        return block.from >= this.viewport.from || this.viewportLines[0].top - scrollTop > 200 ? block : this.viewportLines[0];
+    }
     elementAtHeight(height) {
         return scaleBlock(this.heightMap.blockAt(this.scaler.fromDOM(height), this.heightOracle, 0, 0), this.scaler);
     }
@@ -6832,22 +6843,23 @@ class EditorView {
         let updated = null;
         let sDOM = this.scrollDOM, { scrollTop } = sDOM;
         let { scrollAnchorPos, scrollAnchorHeight } = this.viewState;
+        if (scrollTop != this.viewState.scrollTop)
+            scrollAnchorHeight = -1;
         this.viewState.scrollAnchorHeight = -1;
-        if (scrollAnchorHeight < 0 || scrollTop != this.viewState.scrollTop) {
-            if (scrollTop > sDOM.scrollHeight - sDOM.clientHeight - 4) {
-                scrollAnchorPos = -1;
-                scrollAnchorHeight = this.viewState.heightMap.height;
-            }
-            else {
-                let block = this.viewState.lineBlockAtHeight(scrollTop);
-                scrollAnchorPos = block.from;
-                scrollAnchorHeight = block.top;
-            }
-        }
         try {
             for (let i = 0;; i++) {
+                if (scrollAnchorHeight < 0) {
+                    if (isScrolledToBottom(sDOM)) {
+                        scrollAnchorPos = -1;
+                        scrollAnchorHeight = this.viewState.heightMap.height;
+                    }
+                    else {
+                        let block = this.viewState.scrollAnchorAt(scrollTop);
+                        scrollAnchorPos = block.from;
+                        scrollAnchorHeight = block.top;
+                    }
+                }
                 this.updateState = 1 /* Measuring */;
-                let oldViewport = this.viewport;
                 let changed = this.viewState.measure(this);
                 if (!changed && !this.measureRequests.length && this.viewState.scrollTarget == null)
                     break;
@@ -6870,7 +6882,7 @@ class EditorView {
                         return BadMeasure;
                     }
                 });
-                let update = ViewUpdate.create(this, this.state, []), redrawn = false, scrolled = false;
+                let update = ViewUpdate.create(this, this.state, []), redrawn = false;
                 update.flags |= changed;
                 if (!updated)
                     updated = update;
@@ -6894,28 +6906,28 @@ class EditorView {
                             logException(this.state, e);
                         }
                     }
-                if (this.viewState.editorHeight) {
-                    if (this.viewState.scrollTarget) {
-                        this.docView.scrollIntoView(this.viewState.scrollTarget);
-                        this.viewState.scrollTarget = null;
-                        scrolled = true;
-                    }
-                    else if (scrollAnchorHeight > -1) {
-                        let newAnchorHeight = scrollAnchorPos < 0 ? this.viewState.heightMap.height :
-                            this.viewState.lineBlockAt(scrollAnchorPos).top;
-                        let diff = newAnchorHeight - scrollAnchorHeight;
-                        if (diff > 1 || diff < -1) {
-                            sDOM.scrollTop = scrollTop + diff;
-                            scrolled = true;
-                        }
-                    }
-                }
                 if (redrawn)
                     this.docView.updateSelection(true);
-                if (this.viewport.from == oldViewport.from && this.viewport.to == oldViewport.to &&
-                    !scrolled && this.measureRequests.length == 0)
+                if (!update.viewportChanged && this.measureRequests.length == 0) {
+                    if (this.viewState.editorHeight) {
+                        if (this.viewState.scrollTarget) {
+                            this.docView.scrollIntoView(this.viewState.scrollTarget);
+                            this.viewState.scrollTarget = null;
+                            continue;
+                        }
+                        else {
+                            let newAnchorHeight = scrollAnchorPos < 0 ? this.viewState.heightMap.height :
+                                this.viewState.lineBlockAt(scrollAnchorPos).top;
+                            let diff = newAnchorHeight - scrollAnchorHeight;
+                            if (diff > 1 || diff < -1) {
+                                scrollTop = sDOM.scrollTop = scrollTop + diff;
+                                scrollAnchorHeight = -1;
+                                continue;
+                            }
+                        }
+                    }
                     break;
-                scrollAnchorHeight = -1;
+                }
             }
         }
         finally {

package/package.json

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