@codemirror/view 6.15.1 → 6.15.3

package/CHANGELOG.md

@@ -1,3 +1,15 @@
+## 6.15.3 (2023-07-18)
+
+### Bug fixes
+
+Fix another crash regression for compositions before line breaks.
+
+## 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

package/dist/index.cjs

@@ -2617,14 +2617,17 @@ class DocView extends ContentView {
                 openStart = before.openStart;
                 openEnd = after.openEnd;
                 let compLine = this.compositionView(composition);
-                if (after.content.length) {
+                if (after.breakAtStart) {
+                    compLine.breakAfter = 1;
+                }
+                else if (after.content.length &&
+                    compLine.merge(compLine.length, compLine.length, after.content[0], false, after.openStart, 0)) {
                     compLine.breakAfter = after.content[0].breakAfter;
-                    if (compLine.merge(compLine.length, compLine.length, after.content[0], false, after.openStart, 0))
-                        after.content.shift();
+                    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();
+                if (before.content.length &&
+                    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);
             }
@@ -2993,8 +2996,7 @@ function findCompositionNode(view) {
             }
         }
     }
-    let { main } = view.state.selection;
-    return from > main.head || to < main.head ? null : { from, to, node: textNode };
+    return { from, to, node: textNode };
 }
 function findCompositionRange(view, changes) {
     let found = findCompositionNode(view);
@@ -3020,7 +3022,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

@@ -2611,14 +2611,17 @@ class DocView extends ContentView {
                 openStart = before.openStart;
                 openEnd = after.openEnd;
                 let compLine = this.compositionView(composition);
-                if (after.content.length) {
+                if (after.breakAtStart) {
+                    compLine.breakAfter = 1;
+                }
+                else if (after.content.length &&
+                    compLine.merge(compLine.length, compLine.length, after.content[0], false, after.openStart, 0)) {
                     compLine.breakAfter = after.content[0].breakAfter;
-                    if (compLine.merge(compLine.length, compLine.length, after.content[0], false, after.openStart, 0))
-                        after.content.shift();
+                    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();
+                if (before.content.length &&
+                    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);
             }
@@ -2987,8 +2990,7 @@ function findCompositionNode(view) {
             }
         }
     }
-    let { main } = view.state.selection;
-    return from > main.head || to < main.head ? null : { from, to, node: textNode };
+    return { from, to, node: textNode };
 }
 function findCompositionRange(view, changes) {
     let found = findCompositionNode(view);
@@ -3014,7 +3016,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.1",
+  "version": "6.15.3",
   "description": "DOM view component for the CodeMirror code editor",
   "scripts": {
     "test": "cm-runtests",