@codemirror/view 6.1.2 → 6.1.3

package/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 6.1.3 (2022-08-03)
+
+### Bug fixes
+
+Fix a bug where a document that contains only non-printing characters would lead to bogus text measurements (and, from those, to crashing).
+
+Make sure differences between estimated and actual block heights don't cause visible scroll glitches.
+
 ## 6.1.2 (2022-07-27)
 
 ### Bug fixes

package/dist/index.cjs

@@ -1473,15 +1473,17 @@ class LineView extends ContentView {
             return null;
         let totalWidth = 0;
         for (let child of this.children) {
-            if (!(child instanceof TextView))
+            if (!(child instanceof TextView) || /[^ -~]/.test(child.text))
                 return null;
             let rects = clientRectsFor(child.dom);
             if (rects.length != 1)
                 return null;
             totalWidth += rects[0].width;
         }
-        return { lineHeight: this.dom.getBoundingClientRect().height,
-            charWidth: totalWidth / this.length };
+        return !totalWidth ? null : {
+            lineHeight: this.dom.getBoundingClientRect().height,
+            charWidth: totalWidth / this.length
+        };
     }
     coordsAt(pos, side) {
         return coordsInChildren(this, pos, side);
@@ -4675,7 +4677,7 @@ function visiblePixelRange(dom, paddingTop) {
                 left = Math.max(left, parentRect.left);
                 right = Math.min(right, parentRect.right);
                 top = Math.max(top, parentRect.top);
-                bottom = Math.min(bottom, parentRect.bottom);
+                bottom = parent == dom.parentNode ? parentRect.bottom : Math.min(bottom, parentRect.bottom);
             }
             parent = style.position == "absolute" || style.position == "fixed" ? elt.offsetParent : elt.parentNode;
         }
@@ -6284,10 +6286,13 @@ class EditorView {
         if (flush)
             this.observer.forceFlush();
         let updated = null;
+        let { scrollHeight, scrollTop, clientHeight } = this.scrollDOM;
+        let refHeight = scrollTop > scrollHeight - clientHeight - 4 ? scrollHeight : scrollTop;
         try {
             for (let i = 0;; i++) {
                 this.updateState = 1 /* Measuring */;
                 let oldViewport = this.viewport;
+                let refBlock = this.viewState.lineBlockAtHeight(refHeight);
                 let changed = this.viewState.measure(this);
                 if (!changed && !this.measureRequests.length && this.viewState.scrollTarget == null)
                     break;
@@ -6339,6 +6344,13 @@ class EditorView {
                     this.viewState.scrollTarget = null;
                     scrolled = true;
                 }
+                else {
+                    let diff = this.viewState.lineBlockAt(refBlock.from).top - refBlock.top;
+                    if (diff > 1 || diff < -1) {
+                        this.scrollDOM.scrollTop += diff;
+                        scrolled = true;
+                    }
+                }
                 if (redrawn)
                     this.docView.updateSelection(true);
                 if (this.viewport.from == oldViewport.from && this.viewport.to == oldViewport.to &&

package/dist/index.js

@@ -1468,15 +1468,17 @@ class LineView extends ContentView {
             return null;
         let totalWidth = 0;
         for (let child of this.children) {
-            if (!(child instanceof TextView))
+            if (!(child instanceof TextView) || /[^ -~]/.test(child.text))
                 return null;
             let rects = clientRectsFor(child.dom);
             if (rects.length != 1)
                 return null;
             totalWidth += rects[0].width;
         }
-        return { lineHeight: this.dom.getBoundingClientRect().height,
-            charWidth: totalWidth / this.length };
+        return !totalWidth ? null : {
+            lineHeight: this.dom.getBoundingClientRect().height,
+            charWidth: totalWidth / this.length
+        };
     }
     coordsAt(pos, side) {
         return coordsInChildren(this, pos, side);
@@ -4668,7 +4670,7 @@ function visiblePixelRange(dom, paddingTop) {
                 left = Math.max(left, parentRect.left);
                 right = Math.min(right, parentRect.right);
                 top = Math.max(top, parentRect.top);
-                bottom = Math.min(bottom, parentRect.bottom);
+                bottom = parent == dom.parentNode ? parentRect.bottom : Math.min(bottom, parentRect.bottom);
             }
             parent = style.position == "absolute" || style.position == "fixed" ? elt.offsetParent : elt.parentNode;
         }
@@ -6277,10 +6279,13 @@ class EditorView {
         if (flush)
             this.observer.forceFlush();
         let updated = null;
+        let { scrollHeight, scrollTop, clientHeight } = this.scrollDOM;
+        let refHeight = scrollTop > scrollHeight - clientHeight - 4 ? scrollHeight : scrollTop;
         try {
             for (let i = 0;; i++) {
                 this.updateState = 1 /* Measuring */;
                 let oldViewport = this.viewport;
+                let refBlock = this.viewState.lineBlockAtHeight(refHeight);
                 let changed = this.viewState.measure(this);
                 if (!changed && !this.measureRequests.length && this.viewState.scrollTarget == null)
                     break;
@@ -6332,6 +6337,13 @@ class EditorView {
                     this.viewState.scrollTarget = null;
                     scrolled = true;
                 }
+                else {
+                    let diff = this.viewState.lineBlockAt(refBlock.from).top - refBlock.top;
+                    if (diff > 1 || diff < -1) {
+                        this.scrollDOM.scrollTop += diff;
+                        scrolled = true;
+                    }
+                }
                 if (redrawn)
                     this.docView.updateSelection(true);
                 if (this.viewport.from == oldViewport.from && this.viewport.to == oldViewport.to &&

package/package.json

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