@codemirror/view 6.15.0 → 6.15.2

package/CHANGELOG.md

@@ -1,3 +1,15 @@
+## 6.15.2 (2023-07-18)
+
+### Bug fixes
+
+Fix the check that made sure compositions are dropped when the selection is moved.
+
+## 6.15.1 (2023-07-18)
+
+### Bug fixes
+
+Fix a regression that could cause the composition content to be drawn incorrectly.
+
 ## 6.15.0 (2023-07-17)
 
 ### Bug fixes

package/dist/index.cjs

@@ -2502,7 +2502,7 @@ class DocView extends ContentView {
         this.view = view;
         this.decorations = [];
         this.dynamicDecorationMap = [];
-        this.hasComposition = false;
+        this.hasComposition = null;
         this.markedForComposition = new Set;
         // Track a minimum width for the editor. When measuring sizes in
         // measureVisibleLineHeights, this is updated to point at the width
@@ -2542,9 +2542,13 @@ class DocView extends ContentView {
             }
         }
         let composition = this.view.inputState.composing < 0 ? null : findCompositionRange(this.view, update.changes);
-        if (this.hasComposition)
+        if (this.hasComposition) {
             this.markedForComposition.clear();
-        this.hasComposition = !!composition;
+            let { from, to } = this.hasComposition;
+            changedRanges = new ChangedRange(from, to, update.changes.mapPos(from, -1), update.changes.mapPos(to, 1))
+                .addToSet(changedRanges.slice());
+        }
+        this.hasComposition = composition ? { from: composition.range.fromB, to: composition.range.toB } : null;
         // When the DOM nodes around the selection are moved to another
         // parent, Chrome sometimes reports a different selection through
         // getSelection than the one that it actually shows to the user.
@@ -2613,9 +2617,16 @@ class DocView extends ContentView {
                 openStart = before.openStart;
                 openEnd = after.openEnd;
                 let compLine = this.compositionView(composition);
-                compLine.merge(compLine.length, compLine.length, after.content[0], false, after.openStart, 0);
-                compLine.merge(0, 0, before.content[before.content.length - 1], true, 0, before.openEnd);
-                content = before.content.slice(0, before.content.length - 1).concat(compLine).concat(after.content.slice(1));
+                if (after.content.length) {
+                    compLine.breakAfter = after.content[0].breakAfter;
+                    if (compLine.merge(compLine.length, compLine.length, after.content[0], false, after.openStart, 0))
+                        after.content.shift();
+                }
+                if (before.content.length) {
+                    if (compLine.merge(0, 0, before.content[before.content.length - 1], true, 0, before.openEnd))
+                        before.content.pop();
+                }
+                content = before.content.concat(compLine).concat(after.content);
             }
             else {
                 ({ content, breakAtStart, openStart, openEnd } =
@@ -2642,9 +2653,11 @@ class DocView extends ContentView {
             cView.flags |= 8 /* Composition */;
             this.markedForComposition.add(cView);
             let prev = ContentView.get(dom);
-            if (prev)
-                prev.dom = null;
-            cView.setDOM(dom);
+            if (prev != cView) {
+                if (prev)
+                    prev.dom = null;
+                cView.setDOM(dom);
+            }
         };
         let pos = this.childPos(composition.range.fromB, 1);
         let cView = this.children[pos.i];
@@ -3006,7 +3019,8 @@ function findCompositionRange(view, changes) {
         else
             return null;
     }
-    if (view.state.doc.sliceString(fromB, toB) != text)
+    let { main } = view.state.selection;
+    if (view.state.doc.sliceString(fromB, toB) != text || fromB > main.head || toB < main.head)
         return null;
     let marks = [];
     let range = new ChangedRange(fromA, toA, fromB, toB);

package/dist/index.js

@@ -2496,7 +2496,7 @@ class DocView extends ContentView {
         this.view = view;
         this.decorations = [];
         this.dynamicDecorationMap = [];
-        this.hasComposition = false;
+        this.hasComposition = null;
         this.markedForComposition = new Set;
         // Track a minimum width for the editor. When measuring sizes in
         // measureVisibleLineHeights, this is updated to point at the width
@@ -2536,9 +2536,13 @@ class DocView extends ContentView {
             }
         }
         let composition = this.view.inputState.composing < 0 ? null : findCompositionRange(this.view, update.changes);
-        if (this.hasComposition)
+        if (this.hasComposition) {
             this.markedForComposition.clear();
-        this.hasComposition = !!composition;
+            let { from, to } = this.hasComposition;
+            changedRanges = new ChangedRange(from, to, update.changes.mapPos(from, -1), update.changes.mapPos(to, 1))
+                .addToSet(changedRanges.slice());
+        }
+        this.hasComposition = composition ? { from: composition.range.fromB, to: composition.range.toB } : null;
         // When the DOM nodes around the selection are moved to another
         // parent, Chrome sometimes reports a different selection through
         // getSelection than the one that it actually shows to the user.
@@ -2607,9 +2611,16 @@ class DocView extends ContentView {
                 openStart = before.openStart;
                 openEnd = after.openEnd;
                 let compLine = this.compositionView(composition);
-                compLine.merge(compLine.length, compLine.length, after.content[0], false, after.openStart, 0);
-                compLine.merge(0, 0, before.content[before.content.length - 1], true, 0, before.openEnd);
-                content = before.content.slice(0, before.content.length - 1).concat(compLine).concat(after.content.slice(1));
+                if (after.content.length) {
+                    compLine.breakAfter = after.content[0].breakAfter;
+                    if (compLine.merge(compLine.length, compLine.length, after.content[0], false, after.openStart, 0))
+                        after.content.shift();
+                }
+                if (before.content.length) {
+                    if (compLine.merge(0, 0, before.content[before.content.length - 1], true, 0, before.openEnd))
+                        before.content.pop();
+                }
+                content = before.content.concat(compLine).concat(after.content);
             }
             else {
                 ({ content, breakAtStart, openStart, openEnd } =
@@ -2636,9 +2647,11 @@ class DocView extends ContentView {
             cView.flags |= 8 /* Composition */;
             this.markedForComposition.add(cView);
             let prev = ContentView.get(dom);
-            if (prev)
-                prev.dom = null;
-            cView.setDOM(dom);
+            if (prev != cView) {
+                if (prev)
+                    prev.dom = null;
+                cView.setDOM(dom);
+            }
         };
         let pos = this.childPos(composition.range.fromB, 1);
         let cView = this.children[pos.i];
@@ -3000,7 +3013,8 @@ function findCompositionRange(view, changes) {
         else
             return null;
     }
-    if (view.state.doc.sliceString(fromB, toB) != text)
+    let { main } = view.state.selection;
+    if (view.state.doc.sliceString(fromB, toB) != text || fromB > main.head || toB < main.head)
         return null;
     let marks = [];
     let range = new ChangedRange(fromA, toA, fromB, toB);

package/package.json

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