@codemirror/view 6.13.0 → 6.13.2

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## 6.13.2 (2023-06-13)
+
+### Bug fixes
+
+Fix an issue in scroll position stabilization for changes above the visible, where Chrome already does this natively and we ended up compensating twice.
+
+## 6.13.1 (2023-06-12)
+
+### Bug fixes
+
+Fix a bug where the cursor would in some circumstances be drawn on the wrong side of an inline widget.
+
+Fix an issue where `scrollPastEnd` could cause the scroll position of editors that weren't in view to be changed unnecessarily.
+
 ## 6.13.0 (2023-06-05)
 
 ### Bug fixes

package/dist/index.cjs

@@ -897,7 +897,7 @@ class WidgetView extends ContentView {
             if (pos > 0 ? i == 0 : i == rects.length - 1 || rect.top < rect.bottom)
                 break;
         }
-        return this.length ? rect : flattenRect(rect, !fromBack);
+        return flattenRect(rect, !fromBack);
     }
     get isEditable() { return false; }
     get isWidget() { return true; }
@@ -6837,15 +6837,16 @@ class EditorView {
         if (flush)
             this.observer.forceFlush();
         let updated = null;
-        let sDOM = this.scrollDOM, { scrollAnchorPos, scrollAnchorHeight } = this.viewState;
+        let sDOM = this.scrollDOM, { scrollTop } = sDOM;
+        let { scrollAnchorPos, scrollAnchorHeight } = this.viewState;
         this.viewState.scrollAnchorHeight = -1;
-        if (scrollAnchorHeight < 0 || sDOM.scrollTop != this.viewState.scrollTop) {
-            if (sDOM.scrollTop > sDOM.scrollHeight - sDOM.clientHeight - 4) {
+        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(sDOM.scrollTop);
+                let block = this.viewState.lineBlockAtHeight(scrollTop);
                 scrollAnchorPos = block.from;
                 scrollAnchorHeight = block.top;
             }
@@ -6911,7 +6912,7 @@ class EditorView {
                             this.viewState.lineBlockAt(scrollAnchorPos).top;
                         let diff = newAnchorHeight - scrollAnchorHeight;
                         if (diff > 1 || diff < -1) {
-                            sDOM.scrollTop += diff;
+                            sDOM.scrollTop = scrollTop + diff;
                             scrolled = true;
                         }
                     }
@@ -8407,7 +8408,7 @@ const plugin = ViewPlugin.fromClass(class {
     update(update) {
         let { view } = update;
         let height = view.viewState.editorHeight - view.defaultLineHeight - view.documentPadding.top - 0.5;
-        if (height != this.height) {
+        if (height >= 0 && height != this.height) {
             this.height = height;
             this.attrs = { style: `padding-bottom: ${height}px` };
         }

package/dist/index.js

@@ -893,7 +893,7 @@ class WidgetView extends ContentView {
             if (pos > 0 ? i == 0 : i == rects.length - 1 || rect.top < rect.bottom)
                 break;
         }
-        return this.length ? rect : flattenRect(rect, !fromBack);
+        return flattenRect(rect, !fromBack);
     }
     get isEditable() { return false; }
     get isWidget() { return true; }
@@ -6830,15 +6830,16 @@ class EditorView {
         if (flush)
             this.observer.forceFlush();
         let updated = null;
-        let sDOM = this.scrollDOM, { scrollAnchorPos, scrollAnchorHeight } = this.viewState;
+        let sDOM = this.scrollDOM, { scrollTop } = sDOM;
+        let { scrollAnchorPos, scrollAnchorHeight } = this.viewState;
         this.viewState.scrollAnchorHeight = -1;
-        if (scrollAnchorHeight < 0 || sDOM.scrollTop != this.viewState.scrollTop) {
-            if (sDOM.scrollTop > sDOM.scrollHeight - sDOM.clientHeight - 4) {
+        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(sDOM.scrollTop);
+                let block = this.viewState.lineBlockAtHeight(scrollTop);
                 scrollAnchorPos = block.from;
                 scrollAnchorHeight = block.top;
             }
@@ -6904,7 +6905,7 @@ class EditorView {
                             this.viewState.lineBlockAt(scrollAnchorPos).top;
                         let diff = newAnchorHeight - scrollAnchorHeight;
                         if (diff > 1 || diff < -1) {
-                            sDOM.scrollTop += diff;
+                            sDOM.scrollTop = scrollTop + diff;
                             scrolled = true;
                         }
                     }
@@ -8400,7 +8401,7 @@ const plugin = /*@__PURE__*/ViewPlugin.fromClass(class {
     update(update) {
         let { view } = update;
         let height = view.viewState.editorHeight - view.defaultLineHeight - view.documentPadding.top - 0.5;
-        if (height != this.height) {
+        if (height >= 0 && height != this.height) {
             this.height = height;
             this.attrs = { style: `padding-bottom: ${height}px` };
         }

package/package.json

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