@codemirror/view 6.1.1 → 6.1.4

package/CHANGELOG.md

@@ -1,3 +1,25 @@
+## 6.1.4 (2022-08-04)
+
+### Bug fixes
+
+Make selection-restoration on focus more reliable.
+
+## 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
+
+Fix an issue where double tapping enter to confirm IME input and insert a newline on iOS would sometimes insert two newlines.
+
+Fix an issue on iOS where a composition could get aborted if the editor scrolled on backspace.
+
 ## 6.1.1 (2022-07-25)
 
 ### 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);
@@ -3356,10 +3358,10 @@ class InputState {
                     event.preventDefault();
                 else
                     handler(view, event);
-            });
+            }, handlerOptions[type]);
             this.registeredEvents.push(type);
         }
-        if (browser.chrome && browser.chrome_version >= 102) {
+        if (browser.chrome && browser.chrome_version == 102) { // FIXME remove at some point
             // On Chrome 102, viewport updates somehow stop wheel-based
             // scrolling. Turning off pointer events during the scroll seems
             // to avoid the issue.
@@ -3481,7 +3483,7 @@ class InputState {
         // compositionend and keydown events are sometimes emitted in the
         // wrong order. The key event should still be ignored, even when
         // it happens after the compositionend event.
-        if (browser.safari && Date.now() - this.compositionEndedAt < 100) {
+        if (browser.safari && !browser.ios && Date.now() - this.compositionEndedAt < 100) {
             this.compositionEndedAt = 0;
             return true;
         }
@@ -3609,6 +3611,7 @@ function eventBelongsToEditor(view, event) {
     return true;
 }
 const handlers = Object.create(null);
+const handlerOptions = Object.create(null);
 // This is very crude, but unfortunately both these browsers _pretend_
 // that they have a clipboard API—all the objects and methods are
 // there, they just don't work, and they are hard to test.
@@ -3672,6 +3675,7 @@ handlers.touchstart = (view, e) => {
 handlers.touchmove = view => {
     view.inputState.setSelectionOrigin("select.pointer");
 };
+handlerOptions.touchstart = handlerOptions.touchmove = { passive: true };
 handlers.mousedown = (view, event) => {
     view.observer.flush();
     if (view.inputState.lastTouchTime > Date.now() - 2000 && getClickType(event) == 1)
@@ -4673,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;
         }
@@ -5575,10 +5579,11 @@ class DOMObserver {
         // Detect the situation where the browser has, on focus, moved the
         // selection to the start of the content element. Reset it to the
         // position from the editor state.
-        if (local && !this.selectionChanged && this.selectionRange.focusNode &&
+        if (local && !this.selectionChanged &&
             view.inputState.lastFocusTime > Date.now() - 200 &&
             view.inputState.lastTouchTime < Date.now() - 300 &&
             atElementStart(this.dom, range)) {
+            this.view.inputState.lastFocusTime = 0;
             view.docView.updateSelection();
             return false;
         }
@@ -5687,8 +5692,8 @@ class DOMObserver {
         if (this.delayedFlush >= 0) {
             window.clearTimeout(this.delayedFlush);
             this.delayedFlush = -1;
-            this.flush();
         }
+        this.flush();
     }
     processRecords() {
         let records = this.queue;
@@ -5726,7 +5731,6 @@ class DOMObserver {
         let newSel = this.selectionChanged && hasSelection(this.dom, this.selectionRange);
         if (from < 0 && !newSel)
             return;
-        this.view.inputState.lastFocusTime = 0;
         this.selectionChanged = false;
         let startState = this.view.state;
         let handled = this.onChange(from, to, typeOver);
@@ -6280,12 +6284,15 @@ class EditorView {
             cancelAnimationFrame(this.measureScheduled);
         this.measureScheduled = 0; // Prevent requestMeasure calls from scheduling another animation frame
         if (flush)
-            this.observer.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;
@@ -6337,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);
@@ -3350,10 +3352,10 @@ class InputState {
                     event.preventDefault();
                 else
                     handler(view, event);
-            });
+            }, handlerOptions[type]);
             this.registeredEvents.push(type);
         }
-        if (browser.chrome && browser.chrome_version >= 102) {
+        if (browser.chrome && browser.chrome_version == 102) { // FIXME remove at some point
             // On Chrome 102, viewport updates somehow stop wheel-based
             // scrolling. Turning off pointer events during the scroll seems
             // to avoid the issue.
@@ -3475,7 +3477,7 @@ class InputState {
         // compositionend and keydown events are sometimes emitted in the
         // wrong order. The key event should still be ignored, even when
         // it happens after the compositionend event.
-        if (browser.safari && Date.now() - this.compositionEndedAt < 100) {
+        if (browser.safari && !browser.ios && Date.now() - this.compositionEndedAt < 100) {
             this.compositionEndedAt = 0;
             return true;
         }
@@ -3603,6 +3605,7 @@ function eventBelongsToEditor(view, event) {
     return true;
 }
 const handlers = /*@__PURE__*/Object.create(null);
+const handlerOptions = /*@__PURE__*/Object.create(null);
 // This is very crude, but unfortunately both these browsers _pretend_
 // that they have a clipboard API—all the objects and methods are
 // there, they just don't work, and they are hard to test.
@@ -3666,6 +3669,7 @@ handlers.touchstart = (view, e) => {
 handlers.touchmove = view => {
     view.inputState.setSelectionOrigin("select.pointer");
 };
+handlerOptions.touchstart = handlerOptions.touchmove = { passive: true };
 handlers.mousedown = (view, event) => {
     view.observer.flush();
     if (view.inputState.lastTouchTime > Date.now() - 2000 && getClickType(event) == 1)
@@ -4666,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;
         }
@@ -5568,10 +5572,11 @@ class DOMObserver {
         // Detect the situation where the browser has, on focus, moved the
         // selection to the start of the content element. Reset it to the
         // position from the editor state.
-        if (local && !this.selectionChanged && this.selectionRange.focusNode &&
+        if (local && !this.selectionChanged &&
             view.inputState.lastFocusTime > Date.now() - 200 &&
             view.inputState.lastTouchTime < Date.now() - 300 &&
             atElementStart(this.dom, range)) {
+            this.view.inputState.lastFocusTime = 0;
             view.docView.updateSelection();
             return false;
         }
@@ -5680,8 +5685,8 @@ class DOMObserver {
         if (this.delayedFlush >= 0) {
             window.clearTimeout(this.delayedFlush);
             this.delayedFlush = -1;
-            this.flush();
         }
+        this.flush();
     }
     processRecords() {
         let records = this.queue;
@@ -5719,7 +5724,6 @@ class DOMObserver {
         let newSel = this.selectionChanged && hasSelection(this.dom, this.selectionRange);
         if (from < 0 && !newSel)
             return;
-        this.view.inputState.lastFocusTime = 0;
         this.selectionChanged = false;
         let startState = this.view.state;
         let handled = this.onChange(from, to, typeOver);
@@ -6273,12 +6277,15 @@ class EditorView {
             cancelAnimationFrame(this.measureScheduled);
         this.measureScheduled = 0; // Prevent requestMeasure calls from scheduling another animation frame
         if (flush)
-            this.observer.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;
@@ -6330,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.1",
+  "version": "6.1.4",
   "description": "DOM view component for the CodeMirror code editor",
   "scripts": {
     "test": "cm-runtests",