prosemirror-view 1.23.1 → 1.23.5

package/CHANGELOG.md

@@ -1,3 +1,31 @@
+## 1.23.5 (2021-12-27)
+
+### Bug fixes
+
+Use the `whitespace` node prop where appropriate.
+
+## 1.23.4 (2021-12-22)
+
+### Bug fixes
+
+Improve the way the editor handles the mess of events produced when pressing Enter before a word that was just typed on Chrome + GBoard.
+
+Fix an issue where compositions right before another instance of the composed text could cause the editor to crash.
+
+Fix an issue where, if decorations changed during a pointer drag selection, the selection anchor might move around inappropriately.
+
+## 1.23.3 (2021-11-26)
+
+### Bug fixes
+
+The clipboard parser will no longer drop trailing `<br>` nodes that appear in an inline parent element.
+
+## 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

@@ -1290,7 +1290,7 @@ var NodeViewDesc = /*@__PURE__*/(function (ViewDesc) {
     // attrs in the dom, that won't be picked up. Not entirely sure
     // whether this is a problem
     var rule = {node: this.node.type.name, attrs: this.node.attrs};
-    if (this.node.type.spec.code) { rule.preserveWhitespace = "full"; }
+    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; }; }
     return rule
@@ -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 }
@@ -2058,8 +2077,8 @@ function findTextInFragment(frag, text, from, to) {
       if (!next.isText) { break }
       str += next.text;
     }
-    if (pos >= from) {
-      var found = str.lastIndexOf(text, to - childStart);
+    if (pos >= from && childStart < to) {
+      var found = str.lastIndexOf(text, to - childStart - 1);
       if (found >= 0 && found + text.length + childStart >= from)
         { return childStart + found }
     }
@@ -2130,9 +2149,13 @@ function selectionToDOM(view, force) {
   if (!editorOwnsSelection(view)) { return }
 
   if (!force && view.mouseDown && view.mouseDown.allowDefault) {
-    view.mouseDown.delayedSelectionSync = true;
-    view.domObserver.setCurSelection();
-    return
+    var domSel = view.root.getSelection(), curSel = view.domObserver.currentSelection;
+    if (domSel.anchorNode && isEquivalentPosition(domSel.anchorNode, domSel.anchorOffset,
+                                                  curSel.anchorNode, curSel.anchorOffset)) {
+      view.mouseDown.delayedSelectionSync = true;
+      view.domObserver.setCurSelection();
+      return
+    }
   }
 
   view.domObserver.disconnectSelection();
@@ -2597,7 +2620,7 @@ function parseBetween(view, from_, to_) {
     topOpen: true,
     from: fromOffset,
     to: toOffset,
-    preserveWhitespace: $from.parent.type.spec.code ? "full" : true,
+    preserveWhitespace: $from.parent.type.whitespace == "pre" ? "full" : true,
     editableContent: true,
     findPositions: find,
     ruleFromNode: ruleFromNode,
@@ -2979,7 +3002,8 @@ function parseFromClipboard(view, text, html, plainText, $context) {
       preserveWhitespace: !!(asText || sliceData),
       context: $context,
       ruleFromNode: function ruleFromNode(dom) {
-        if (dom.nodeName == "BR" && !dom.nextSibling) { return {ignore: true} }
+        if (dom.nodeName == "BR" && !dom.nextSibling &&
+            dom.parentNode && !inlineParents.test(dom.parentNode.nodeName)) { return {ignore: true} }
       }
     });
   }
@@ -3001,6 +3025,8 @@ function parseFromClipboard(view, text, html, plainText, $context) {
   return slice
 }
 
+var inlineParents = /^(a|abbr|acronym|b|cite|code|del|em|i|ins|kbd|label|output|q|ruby|s|samp|span|strong|sub|sup|time|u|tt|var)$/i;
+
 // Takes a slice parsed with parseSlice, which means there hasn't been
 // any content-expression checking done on the top nodes, tries to
 // find a parent node in the current context that might fit the nodes,
@@ -3481,9 +3507,14 @@ function dispatchEvent(view, event) {
 editHandlers.keydown = function (view, event) {
   view.shiftKey = event.keyCode == 16 || event.shiftKey;
   if (inOrNearComposition(view, event)) { return }
-  if (event.keyCode != 229) { view.domObserver.forceFlush(); }
   view.lastKeyCode = event.keyCode;
   view.lastKeyCodeTime = Date.now();
+  // Suppress enter key events on Chrome Android, because those tend
+  // to be part of a confused sequence of composition events fired,
+  // and handling them eagerly tends to corrupt the input.
+  if (result.android && result.chrome && event.keyCode == 13) { return }
+  if (event.keyCode != 229) { view.domObserver.forceFlush(); }
+
   // On iOS, if we preventDefault enter key presses, the virtual
   // keyboard gets confused. So the hack here is to set a flag that
   // makes the DOM change code recognize that what just happens should
@@ -3868,6 +3899,7 @@ function timestampFromCustomEvent() {
 }
 
 function endComposition(view, forceUpdate) {
+  if (result.android && view.domObserver.flushingSoon >= 0) { return }
   view.domObserver.forceFlush();
   clearComposition(view);
   if (forceUpdate || view.docView.dirty) {
@@ -3958,6 +3990,11 @@ function doPaste(view, text, html, e) {
 }
 
 editHandlers.paste = function (view, e) {
+  // Handling paste from JavaScript during composition is very poorly
+  // handled by browsers, so as a dodgy but preferable kludge, we just
+  // let the browser do its native thing there, except on Android,
+  // where the editor is almost always composing.
+  if (view.composing && !result.android) { return }
   var data = brokenClipboardAPI ? null : e.clipboardData;
   if (data && doPaste(view, data.getData("text/plain"), data.getData("text/html"), e)) { e.preventDefault(); }
   else { capturePaste(view, e); }
@@ -4089,6 +4126,7 @@ handlers.beforeinput = function (view, event) {
   // Very specific hack to deal with backspace sometimes failing on
   // Chrome Android when after an uneditable node.
   if (result.chrome && result.android && event.inputType == "deleteContentBackward") {
+    view.domObserver.flushSoon();
     var domChangeCount = view.domChangeCount;
     setTimeout(function () {
       if (view.domChangeCount != domChangeCount) { return } // Event already had some effect