prosemirror-view 1.23.5 → 1.23.8

package/dist/index.js

@@ -68,7 +68,8 @@ function scanFor(node, off, targetNode, targetOff, dir) {
     if (node == targetNode && off == targetOff) { return true }
     if (off == (dir < 0 ? 0 : nodeSize(node))) {
       var parent = node.parentNode;
-      if (parent.nodeType != 1 || hasBlockDesc(node) || atomElements.test(node.nodeName) || node.contentEditable == "false")
+      if (!parent || parent.nodeType != 1 || hasBlockDesc(node) || atomElements.test(node.nodeName) ||
+          node.contentEditable == "false")
         { return false }
       off = domIndex(node) + (dir < 0 ? 0 : 1);
       node = parent;
@@ -1055,7 +1056,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 +1195,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) };
 
@@ -2081,10 +2086,13 @@ function findTextInFragment(frag, text, from, to) {
       if (!next.isText) { break }
       str += next.text;
     }
-    if (pos >= from && childStart < to) {
-      var found = str.lastIndexOf(text, to - childStart - 1);
+    if (pos >= from) {
+      var found = childStart < to ? str.lastIndexOf(text, to - childStart - 1) : -1;
       if (found >= 0 && found + text.length + childStart >= from)
         { return childStart + found }
+      if (from == to && str.length >= (to + text.length) - childStart &&
+          str.slice(to - childStart, to - childStart + text.length) == text)
+        { return to }
     }
   }
   return -1
@@ -2152,7 +2160,10 @@ function selectionToDOM(view, force) {
 
   if (!editorOwnsSelection(view)) { return }
 
-  if (!force && view.mouseDown && view.mouseDown.allowDefault) {
+  // 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)) {
@@ -2678,6 +2689,7 @@ function readDOMChange(view, from, to, typeOver, addedNodes) {
 
   var sel = view.state.selection;
   var parse = parseBetween(view, from, to);
+
   // Chrome sometimes leaves the cursor before the inserted text when
   // composing after a cursor wrapper. This moves it forward.
   if (result.chrome && view.cursorWrapper && parse.sel && parse.sel.anchor == view.cursorWrapper.deco.from) {
@@ -2723,9 +2735,11 @@ function readDOMChange(view, from, to, typeOver, addedNodes) {
   if (view.state.selection.from < view.state.selection.to &&
       change.start == change.endB &&
       view.state.selection instanceof prosemirrorState.TextSelection) {
-    if (change.start > view.state.selection.from && change.start <= view.state.selection.from + 2) {
+    if (change.start > view.state.selection.from && change.start <= view.state.selection.from + 2 &&
+        view.state.selection.from >= parse.from) {
       change.start = view.state.selection.from;
-    } else if (change.endA < view.state.selection.to && change.endA >= view.state.selection.to - 2) {
+    } else if (change.endA < view.state.selection.to && change.endA >= view.state.selection.to - 2 &&
+               view.state.selection.to <= parse.to) {
       change.endB += (view.state.selection.to - change.endA);
       change.endA = view.state.selection.to;
     }
@@ -3355,7 +3369,7 @@ DOMObserver.prototype.flush = function flush () {
       checkCSS(this.view);
     }
     this.handleDOMChange(from, to, typeOver, added);
-    if (this.view.docView.dirty) { this.view.updateState(this.view.state); }
+    if (this.view.docView && this.view.docView.dirty) { this.view.updateState(this.view.state); }
     else if (!this.currentSelection.eq(sel)) { selectionToDOM(this.view); }
     this.currentSelection.set(sel);
   }
@@ -3906,7 +3920,7 @@ function endComposition(view, forceUpdate) {
   if (result.android && view.domObserver.flushingSoon >= 0) { return }
   view.domObserver.forceFlush();
   clearComposition(view);
-  if (forceUpdate || view.docView.dirty) {
+  if (forceUpdate || view.docView && view.docView.dirty) {
     var sel = selectionFromDOM(view);
     if (sel && !sel.eq(view.state.selection)) { view.dispatch(view.state.tr.setSelection(sel)); }
     else { view.updateState(view.state); }
@@ -5448,7 +5462,10 @@ function checkStateComponent(plugin) {
 //   The DOM serializer to use when putting content onto the
 //   clipboard. If not given, the result of
 //   [`DOMSerializer.fromSchema`](#model.DOMSerializer^fromSchema)
-//   will be used.
+//   will be used. This object will only have its
+//   [`serializeFragment`](#model.DOMSerializer.serializeFragment)
+//   method called, and you may provide an alternative object type
+//   implementing a compatible method.
 //
 //   clipboardTextSerializer:: ?(Slice) → string
 //   A function that will be called to get the text for the current