prosemirror-view 1.22.0 → 1.23.3

package/dist/index.js

@@ -1751,7 +1751,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
@@ -1812,19 +1812,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 + 1); 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
       }
     }
@@ -1933,22 +1930,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 }
@@ -2979,7 +2998,14 @@ function parseFromClipboard(view, text, html, plainText, $context) {
   var sliceData = contextNode && /^(\d+) (\d+) (.*)/.exec(contextNode.getAttribute("data-pm-slice"));
   if (!slice) {
     var parser = view.someProp("clipboardParser") || view.someProp("domParser") || prosemirrorModel.DOMParser.fromSchema(view.state.schema);
-    slice = parser.parseSlice(dom, {preserveWhitespace: !!(asText || sliceData), context: $context});
+    slice = parser.parseSlice(dom, {
+      preserveWhitespace: !!(asText || sliceData),
+      context: $context,
+      ruleFromNode: function ruleFromNode(dom) {
+        if (dom.nodeName == "BR" && !dom.nextSibling &&
+            dom.parentNode && !inlineParents.test(dom.parentNode.nodeName)) { return {ignore: true} }
+      }
+    });
   }
   if (sliceData) {
     slice = addContext(closeSlice(slice, +sliceData[1], +sliceData[2]), sliceData[3]);
@@ -2999,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,
@@ -4265,7 +4293,7 @@ Decoration.prototype.map = function map (mapping, offset, oldOffset) {
 //   key are interchangeable—if widgets differ in, for example,
 //   the behavior of some event handler, they should get
 //   different keys.
-//    
+//
 //   destroy:: ?(node: dom.Node)
 //   Called when the widget decoration is removed as a result of
 //   mapping
@@ -4864,7 +4892,7 @@ var EditorView = function EditorView(place, props) {
   this.updatePluginViews();
 };
 
-var prototypeAccessors$2 = { props: { configurable: true },root: { configurable: true } };
+var prototypeAccessors$2 = { props: { configurable: true },root: { configurable: true },isDestroyed: { configurable: true } };
 
 // composing:: boolean
 // Holds `true` when a
@@ -5174,6 +5202,14 @@ EditorView.prototype.destroy = function destroy () {
   this.docView = null;
 };
 
+// :: boolean
+// This is true when the view has been
+// [destroyed](#view.EditorView.destroy) (and thus should not be
+// used anymore).
+prototypeAccessors$2.isDestroyed.get = function () {
+  return this.docView == null
+};
+
 // Used for testing.
 EditorView.prototype.dispatchEvent = function dispatchEvent$1 (event) {
   return dispatchEvent(this, event)