prosemirror-view 1.23.2 → 1.23.6

package/dist/index.js

@@ -1055,7 +1055,8 @@ ViewDesc.prototype.markDirty = function markDirty (from, to) {
         else { child.markDirty(from - startInside, to - startInside); }
         return
       } else {
-        child.dirty = child.dom == child.contentDOM && child.dom.parentNode == this.contentDOM ? CONTENT_DIRTY : NODE_DIRTY;
+        child.dirty = child.dom == child.contentDOM && child.dom.parentNode == this.contentDOM && !child.children.length
+          ? CONTENT_DIRTY : NODE_DIRTY;
       }
     }
     offset = end;
@@ -1193,7 +1194,10 @@ var MarkViewDesc = /*@__PURE__*/(function (ViewDesc) {
     return new MarkViewDesc(parent, mark, spec.dom, spec.contentDOM || spec.dom)
   };
 
-  MarkViewDesc.prototype.parseRule = function parseRule () { return {mark: this.mark.type.name, attrs: this.mark.attrs, contentElement: this.contentDOM} };
+  MarkViewDesc.prototype.parseRule = function parseRule () {
+    if ((this.dirty & NODE_DIRTY) || this.mark.type.spec.reparseInView) { return null }
+    return {mark: this.mark.type.name, attrs: this.mark.attrs, contentElement: this.contentDOM}
+  };
 
   MarkViewDesc.prototype.matchesMark = function matchesMark (mark) { return this.dirty != NODE_DIRTY && this.mark.eq(mark) };
 
@@ -1294,7 +1298,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 ? prosemirrorModel.Fragment.empty : this$1.node.content; }; }
     return rule
@@ -2081,8 +2085,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 }
     }
@@ -2152,10 +2156,17 @@ function selectionToDOM(view, force) {
 
   if (!editorOwnsSelection(view)) { return }
 
-  if (!force && view.mouseDown && view.mouseDown.allowDefault) {
-    view.mouseDown.delayedSelectionSync = true;
-    view.domObserver.setCurSelection();
-    return
+  // The delayed drag selection causes issues with Cell Selections
+  // in Safari. And the drag selection delay is to workarond issues
+  // which only present in Chrome.
+  if (!force && view.mouseDown && view.mouseDown.allowDefault && result.chrome) {
+    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();
@@ -2620,7 +2631,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,
@@ -3002,7 +3013,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} }
       }
     });
   }
@@ -3024,6 +3036,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,
@@ -3504,9 +3518,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
@@ -3891,6 +3910,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) {
@@ -3981,6 +4001,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); }
@@ -4112,6 +4137,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