prosemirror-view 1.23.9 → 1.23.12

package/CHANGELOG.md

@@ -1,3 +1,21 @@
+## 1.23.12 (2022-04-08)
+
+### Bug fixes
+
+Fix an issue where enter on Chrome Android could, in textblock nodes rendered with an inner content element, delete the text after the cursor.
+
+## 1.23.11 (2022-03-31)
+
+### Bug fixes
+
+Fix an issue where a node view with a separate content wrapper node could sometimes lose its content on Chrome when backspacing out content due to unexpected DOM element recreation.
+
+## 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

package/dist/index.es.js

@@ -1296,8 +1296,23 @@ var NodeViewDesc = /*@__PURE__*/(function (ViewDesc) {
     // whether this is a problem
     var rule = {node: this.node.type.name, attrs: this.node.attrs};
     if (this.node.type.whitespace == "pre") { rule.preserveWhitespace = "full"; }
-    if (this.contentDOM && !this.contentLost) { rule.contentElement = this.contentDOM; }
-    else { rule.getContent = function () { return this$1.contentDOM ? Fragment.empty : this$1.node.content; }; }
+    if (!this.contentDOM) {
+      rule.getContent = function () { return this$1.node.content; };
+    } else if (!this.contentLost) {
+      rule.contentElement = this.contentDOM;
+    } else {
+      // Chrome likes to randomly recreate parent nodes when
+      // backspacing things. When that happens, this tries to find the
+      // new parent.
+      for (var i = this.children.length - 1; i >= 0; i--) {
+        var child = this.children[i];
+        if (this.dom.contains(child.dom.parentNode)) {
+          rule.contentElement = child.dom.parentNode;
+          break
+        }
+      }
+      if (!rule.contentElement) { rule.getContent = function () { return Fragment.empty; }; }
+    }
     return rule
   };
 
@@ -2710,15 +2725,17 @@ function readDOMChange(view, from, to, typeOver, addedNodes) {
   view.lastKeyCode = null;
 
   var change = findDiff(compare.content, parse.doc.content, parse.from, preferredPos, preferredSide);
+  if ((result.ios && view.lastIOSEnter > Date.now() - 225 || result.android) &&
+      addedNodes.some(function (n) { return n.nodeName == "DIV" || n.nodeName == "P"; }) &&
+      (!change || change.endA >= change.endB) &&
+      view.someProp("handleKeyDown", function (f) { return f(view, keyEvent(13, "Enter")); })) {
+    view.lastIOSEnter = 0;
+    return
+  }
   if (!change) {
     if (typeOver && sel instanceof TextSelection && !sel.empty && sel.$head.sameParent(sel.$anchor) &&
         !view.composing && !(parse.sel && parse.sel.anchor != parse.sel.head)) {
       change = {start: sel.from, endA: sel.to, endB: sel.to};
-    } else if ((result.ios && view.lastIOSEnter > Date.now() - 225 || result.android) &&
-               addedNodes.some(function (n) { return n.nodeName == "DIV" || n.nodeName == "P"; }) &&
-               view.someProp("handleKeyDown", function (f) { return f(view, keyEvent(13, "Enter")); })) {
-      view.lastIOSEnter = 0;
-      return
     } else {
       if (parse.sel) {
         var sel$1 = resolveSelection(view, view.state.doc, parse.sel);
@@ -4677,9 +4694,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;
@@ -4691,7 +4709,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;