prosemirror-view 1.23.1 → 1.23.2

package/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 1.23.2 (2021-11-19)
+
+### Bug fixes
+
+Avoid some unnecessary node redraws when marks are present in sibling nodes.
+
 ## 1.23.1 (2021-11-15)
 
 ### Bug fixes

package/dist/index.es.js

@@ -1747,7 +1747,7 @@ var ViewTreeUpdater = function ViewTreeUpdater(top, lockedNode) {
   // Tracks whether anything was changed
   this.changed = false;
 
-  this.preMatch = preMatch(top.node.content, top.children);
+  this.preMatch = preMatch(top.node.content, top);
 };
 
 // Destroy and remove the children between the given indices in
@@ -1808,19 +1808,16 @@ ViewTreeUpdater.prototype.syncToMarks = function syncToMarks (marks, inline, vie
 // Try to find a node desc matching the given data. Skip over it and
 // return true when successful.
 ViewTreeUpdater.prototype.findNodeMatch = function findNodeMatch (node, outerDeco, innerDeco, index) {
-  var children = this.top.children, found = -1;
-  if (index >= this.preMatch.index) {
-    for (var i = this.index; i < children.length; i++) {
-      if (this.preMatch.matched.get(children[i]) == index) {
-        if (children[i].matchesNode(node, outerDeco, innerDeco)) { found = i; }
-        break
-      }
-    }
+  var found = -1, targetDesc;
+  if (index >= this.preMatch.index &&
+      (targetDesc = this.preMatch.matches[index - this.preMatch.index]).parent == this.top &&
+      targetDesc.matchesNode(node, outerDeco, innerDeco)) {
+    found = this.top.children.indexOf(targetDesc, this.index);
   } else {
-    for (var i$1 = this.index, e = Math.min(children.length, i$1 + 5); i$1 < e; i$1++) {
-      var child = children[i$1];
+    for (var i = this.index, e = Math.min(this.top.children.length, i + 5); i < e; i++) {
+      var child = this.top.children[i];
       if (child.matchesNode(node, outerDeco, innerDeco) && !this.preMatch.matched.has(child)) {
-        found = i$1;
+        found = i;
         break
       }
     }
@@ -1929,22 +1926,44 @@ ViewTreeUpdater.prototype.addHackNode = function addHackNode (nodeName) {
   }
 };
 
-// : (Fragment, [ViewDesc]) → {index: number, matched: Map<ViewDesc, number>}
+// : (Fragment, [ViewDesc]) → {index: number, matched: Map<ViewDesc, number>, matches: ViewDesc[]}
 // Iterate from the end of the fragment and array of descs to find
 // directly matching ones, in order to avoid overeagerly reusing those
 // for other nodes. Returns the fragment index of the first node that
 // is part of the sequence of matched nodes at the end of the
 // fragment.
-function preMatch(frag, descs) {
-  var fI = frag.childCount, dI = descs.length, matched = new Map;
-  for (; fI > 0 && dI > 0; dI--) {
-    var desc = descs[dI - 1], node = desc.node;
+function preMatch(frag, parentDesc) {
+  var curDesc = parentDesc, descI = curDesc.children.length;
+  var fI = frag.childCount, matched = new Map, matches = [];
+  outer: while (fI > 0) {
+    var desc = (void 0);
+    for (;;) {
+      if (descI) {
+        var next = curDesc.children[descI - 1];
+        if (next instanceof MarkViewDesc) {
+          curDesc = next;
+          descI = next.children.length;
+        } else {
+          desc = next;
+          descI--;
+          break
+        }
+      } else if (curDesc == parentDesc) {
+        break outer
+      } else {
+        // FIXME
+        descI = curDesc.parent.children.indexOf(curDesc);
+        curDesc = curDesc.parent;
+      }
+    }
+    var node = desc.node;
     if (!node) { continue }
     if (node != frag.child(fI - 1)) { break }
     --fI;
     matched.set(desc, fI);
+    matches.push(desc);
   }
-  return {index: fI, matched: matched}
+  return {index: fI, matched: matched, matches: matches.reverse()}
 }
 
 function compareSide(a, b) { return a.type.side - b.type.side }