@codemirror/view 6.28.5 → 6.28.6

package/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 6.28.6 (2024-07-19)
+
+### Bug fixes
+
+Fix an issue where the editor got confused about the position of inserted text when using Chrome's `EditContext` and canceling transactions for typed text.
+
 ## 6.28.5 (2024-07-17)
 
 ### Bug fixes

package/dist/index.cjs

@@ -7126,8 +7126,10 @@ class EditContextManager {
             applyDOMChangeInner(view, change, state.EditorSelection.single(this.toEditorPos(e.selectionStart), this.toEditorPos(e.selectionEnd)));
             // If the transaction didn't flush our change, revert it so
             // that the context is in sync with the editor state again.
-            if (this.pendingContextChange)
+            if (this.pendingContextChange) {
                 this.revertPending(view.state);
+                this.setSelection(view.state);
+            }
         };
         this.handlers.characterboundsupdate = e => {
             let rects = [], prev = null;
@@ -7209,13 +7211,14 @@ class EditContextManager {
         return !abort;
     }
     update(update) {
+        let reverted = this.pendingContextChange;
         if (!this.applyEdits(update) || !this.rangeIsValid(update.state)) {
             this.pendingContextChange = null;
             this.resetRange(update.state);
             this.editContext.updateText(0, this.editContext.text.length, update.state.doc.sliceString(this.from, this.to));
             this.setSelection(update.state);
         }
-        else if (update.docChanged || update.selectionSet) {
+        else if (update.docChanged || update.selectionSet || reverted) {
             this.setSelection(update.state);
         }
         if (update.geometryChanged || update.docChanged || update.selectionSet)
@@ -7229,7 +7232,7 @@ class EditContextManager {
     revertPending(state) {
         let pending = this.pendingContextChange;
         this.pendingContextChange = null;
-        this.editContext.updateText(this.toContextPos(pending.from), this.toContextPos(pending.to + pending.insert.length), state.doc.sliceString(pending.from, pending.to));
+        this.editContext.updateText(this.toContextPos(pending.from), this.toContextPos(pending.from + pending.insert.length), state.doc.sliceString(pending.from, pending.to));
     }
     setSelection(state) {
         let { main } = state.selection;

package/dist/index.js

@@ -7121,8 +7121,10 @@ class EditContextManager {
             applyDOMChangeInner(view, change, EditorSelection.single(this.toEditorPos(e.selectionStart), this.toEditorPos(e.selectionEnd)));
             // If the transaction didn't flush our change, revert it so
             // that the context is in sync with the editor state again.
-            if (this.pendingContextChange)
+            if (this.pendingContextChange) {
                 this.revertPending(view.state);
+                this.setSelection(view.state);
+            }
         };
         this.handlers.characterboundsupdate = e => {
             let rects = [], prev = null;
@@ -7204,13 +7206,14 @@ class EditContextManager {
         return !abort;
     }
     update(update) {
+        let reverted = this.pendingContextChange;
         if (!this.applyEdits(update) || !this.rangeIsValid(update.state)) {
             this.pendingContextChange = null;
             this.resetRange(update.state);
             this.editContext.updateText(0, this.editContext.text.length, update.state.doc.sliceString(this.from, this.to));
             this.setSelection(update.state);
         }
-        else if (update.docChanged || update.selectionSet) {
+        else if (update.docChanged || update.selectionSet || reverted) {
             this.setSelection(update.state);
         }
         if (update.geometryChanged || update.docChanged || update.selectionSet)
@@ -7224,7 +7227,7 @@ class EditContextManager {
     revertPending(state) {
         let pending = this.pendingContextChange;
         this.pendingContextChange = null;
-        this.editContext.updateText(this.toContextPos(pending.from), this.toContextPos(pending.to + pending.insert.length), state.doc.sliceString(pending.from, pending.to));
+        this.editContext.updateText(this.toContextPos(pending.from), this.toContextPos(pending.from + pending.insert.length), state.doc.sliceString(pending.from, pending.to));
     }
     setSelection(state) {
         let { main } = state.selection;

package/package.json

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