prosemirror-view 1.23.7 → 1.23.10

package/CHANGELOG.md

@@ -1,3 +1,21 @@
+## 1.23.10 (2022-03-22)
+
+### Bug fixes
+
+Fix a crash in `DecorationSet.map` that could occur with some kinds of lift transformations.
+
+## 1.23.9 (2022-03-11)
+
+### Bug fixes
+
+Make sure screen readers don't read the `<img>` nodes added as kludge for cursor behavior.
+
+## 1.23.8 (2022-03-10)
+
+### Bug fixes
+
+Fix an issue where the editor needlessly interrupted composition with IME systems that keep the cursor at the start of the composition, such as some Pinyin input methods.
+
 ## 1.23.7 (2022-02-25)
 
 ### Bug fixes

package/dist/index.es.js

@@ -1924,7 +1924,10 @@ ViewTreeUpdater.prototype.addHackNode = function addHackNode (nodeName) {
     this.index++;
   } else {
     var dom = document.createElement(nodeName);
-    if (nodeName == "IMG") { dom.className = "ProseMirror-separator"; }
+    if (nodeName == "IMG") {
+      dom.className = "ProseMirror-separator";
+      dom.alt = "";
+    }
     if (nodeName == "BR") { dom.className = "ProseMirror-trailingBreak"; }
     this.top.children.splice(this.index++, 0, new TrailingHackViewDesc(this.top, nothing, dom, null));
     this.changed = true;
@@ -2082,10 +2085,13 @@ function findTextInFragment(frag, text, from, to) {
       if (!next.isText) { break }
       str += next.text;
     }
-    if (pos >= from && childStart < to) {
-      var found = str.lastIndexOf(text, to - childStart - 1);
+    if (pos >= from) {
+      var found = childStart < to ? str.lastIndexOf(text, to - childStart - 1) : -1;
       if (found >= 0 && found + text.length + childStart >= from)
         { return childStart + found }
+      if (from == to && str.length >= (to + text.length) - childStart &&
+          str.slice(to - childStart, to - childStart + text.length) == text)
+        { return to }
     }
   }
   return -1
@@ -2682,6 +2688,7 @@ function readDOMChange(view, from, to, typeOver, addedNodes) {
 
   var sel = view.state.selection;
   var parse = parseBetween(view, from, to);
+
   // Chrome sometimes leaves the cursor before the inserted text when
   // composing after a cursor wrapper. This moves it forward.
   if (result.chrome && view.cursorWrapper && parse.sel && parse.sel.anchor == view.cursorWrapper.deco.from) {
@@ -2727,9 +2734,11 @@ function readDOMChange(view, from, to, typeOver, addedNodes) {
   if (view.state.selection.from < view.state.selection.to &&
       change.start == change.endB &&
       view.state.selection instanceof TextSelection) {
-    if (change.start > view.state.selection.from && change.start <= view.state.selection.from + 2) {
+    if (change.start > view.state.selection.from && change.start <= view.state.selection.from + 2 &&
+        view.state.selection.from >= parse.from) {
       change.start = view.state.selection.from;
-    } else if (change.endA < view.state.selection.to && change.endA >= view.state.selection.to - 2) {
+    } else if (change.endA < view.state.selection.to && change.endA >= view.state.selection.to - 2 &&
+               view.state.selection.to <= parse.to) {
       change.endB += (view.state.selection.to - change.endA);
       change.endA = view.state.selection.to;
     }
@@ -4668,9 +4677,10 @@ function mapChildren(oldChildren, newLocal, mapping, node, offset, oldOffset, op
   var shift = function (oldStart, oldEnd, newStart, newEnd) {
     for (var i = 0; i < children.length; i += 3) {
       var end = children[i + 1], dSize = (void 0);
-      if (end == -1 || oldStart > end + oldOffset) { continue }
-      if (oldEnd >= children[i] + oldOffset) {
-        children[i + 1] = -1;
+      if (end < 0 || oldStart > end + oldOffset) { continue }
+      var start = children[i] + oldOffset;
+      if (oldEnd >= start) {
+        children[i + 1] = oldStart <= start ? -2 : -1;
       } else if (newStart >= offset && (dSize = (newEnd - newStart) - (oldEnd - oldStart))) {
         children[i] += dSize;
         children[i + 1] += dSize;
@@ -4682,7 +4692,12 @@ function mapChildren(oldChildren, newLocal, mapping, node, offset, oldOffset, op
   // Find the child nodes that still correspond to a single node,
   // recursively call mapInner on them and update their positions.
   var mustRebuild = false;
-  for (var i$1 = 0; i$1 < children.length; i$1 += 3) { if (children[i$1 + 1] == -1) { // Touched nodes
+  for (var i$1 = 0; i$1 < children.length; i$1 += 3) { if (children[i$1 + 1] < 0) { // Touched nodes
+    if (children[i$1 + 1] == -2) {
+      mustRebuild = true;
+      children[i$1 + 1] = -1;
+      continue
+    }
     var from = mapping.map(oldChildren[i$1] + oldOffset), fromLocal = from - offset;
     if (fromLocal < 0 || fromLocal >= node.content.size) {
       mustRebuild = true;
@@ -5278,6 +5293,7 @@ function updateCursorWrapper(view) {
     var dom = document.createElement("img");
     dom.className = "ProseMirror-separator";
     dom.setAttribute("mark-placeholder", "true");
+    dom.setAttribute("alt", "");
     view.cursorWrapper = {dom: dom, deco: Decoration.widget(view.state.selection.head, dom, {raw: true, marks: view.markCursor})};
   } else {
     view.cursorWrapper = null;