@codemirror/view 0.19.37 → 0.19.38

package/CHANGELOG.md

@@ -1,3 +1,13 @@
+## 0.19.38 (2022-01-05)
+
+### Bug fixes
+
+Fix a bug that caused line decorations with a `class` property to suppress all other line decorations for that line.
+
+Fix a bug that caused scroll effects to be corrupted when further updates came in before they were applied.
+
+Fix an issue where, depending on which way a floating point rounding error fell, `posAtCoords` (and thus vertical cursor motion) for positions outside of the vertical range of the document might or might not return the start/end of the document.
+
 ## 0.19.37 (2021-12-22)
 
 ### Bug fixes

package/dist/index.cjs

@@ -1311,7 +1311,7 @@ class LineView extends ContentView {
         if (attrs)
             this.attrs = combineAttrs(attrs, this.attrs || {});
         if (cls)
-            this.attrs = combineAttrs(attrs, { class: cls });
+            this.attrs = combineAttrs({ class: cls }, this.attrs || {});
     }
     domAtPos(pos) {
         return inlineDOMAtPos(this.dom, this.children, pos);
@@ -3005,7 +3005,11 @@ function posAtCoords(view, { x, y }, precise, bias = -1) {
     var _a;
     let content = view.contentDOM.getBoundingClientRect(), docTop = content.top + view.viewState.paddingTop;
     let block, { docHeight } = view.viewState;
-    let yOffset = Math.max(0, Math.min(y - docTop, docHeight));
+    let 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.defaultLineHeight / 2, bounced = false;;) {
         block = view.elementAtHeight(yOffset);
@@ -5860,7 +5864,7 @@ class EditorView {
         if (state$1.facet(state.EditorState.phrases) != this.state.facet(state.EditorState.phrases))
             return this.setState(state$1);
         update = new ViewUpdate(this, state$1, transactions);
-        let scrollTarget = null;
+        let scrollTarget = this.viewState.scrollTarget;
         try {
             this.updateState = 2 /* Updating */;
             for (let tr of transactions) {

package/dist/index.js

@@ -1307,7 +1307,7 @@ class LineView extends ContentView {
         if (attrs)
             this.attrs = combineAttrs(attrs, this.attrs || {});
         if (cls)
-            this.attrs = combineAttrs(attrs, { class: cls });
+            this.attrs = combineAttrs({ class: cls }, this.attrs || {});
     }
     domAtPos(pos) {
         return inlineDOMAtPos(this.dom, this.children, pos);
@@ -3000,7 +3000,11 @@ function posAtCoords(view, { x, y }, precise, bias = -1) {
     var _a;
     let content = view.contentDOM.getBoundingClientRect(), docTop = content.top + view.viewState.paddingTop;
     let block, { docHeight } = view.viewState;
-    let yOffset = Math.max(0, Math.min(y - docTop, docHeight));
+    let 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.defaultLineHeight / 2, bounced = false;;) {
         block = view.elementAtHeight(yOffset);
@@ -5854,7 +5858,7 @@ class EditorView {
         if (state.facet(EditorState.phrases) != this.state.facet(EditorState.phrases))
             return this.setState(state);
         update = new ViewUpdate(this, state, transactions);
-        let scrollTarget = null;
+        let scrollTarget = this.viewState.scrollTarget;
         try {
             this.updateState = 2 /* Updating */;
             for (let tr of transactions) {

package/package.json

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