@codemirror/view 6.1.1 → 6.1.2

package/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 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

@@ -3356,10 +3356,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 +3481,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 +3609,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 +3673,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)
@@ -5687,8 +5689,8 @@ class DOMObserver {
         if (this.delayedFlush >= 0) {
             window.clearTimeout(this.delayedFlush);
             this.delayedFlush = -1;
-            this.flush();
         }
+        this.flush();
     }
     processRecords() {
         let records = this.queue;
@@ -6280,7 +6282,7 @@ 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;
         try {
             for (let i = 0;; i++) {

package/dist/index.js

@@ -3350,10 +3350,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 +3475,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 +3603,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 +3667,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)
@@ -5680,8 +5682,8 @@ class DOMObserver {
         if (this.delayedFlush >= 0) {
             window.clearTimeout(this.delayedFlush);
             this.delayedFlush = -1;
-            this.flush();
         }
+        this.flush();
     }
     processRecords() {
         let records = this.queue;
@@ -6273,7 +6275,7 @@ 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;
         try {
             for (let i = 0;; i++) {

package/package.json

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