prosemirror-view 1.18.3 → 1.18.7

package/CHANGELOG.md

@@ -1,3 +1,41 @@
+## 1.18.7 (2021-05-20)
+
+### Bug fixes
+
+Fix a bug where clicking on a textblock that had a node-selected parent didn't set a cursor selection.
+
+Fix a bug that caused a workaround for a Chrome Android issue to not work correctly, leading to bad cursor placement after some types of text input.
+
+## 1.18.6 (2021-05-17)
+
+### Bug fixes
+
+Fix a crash in mouse click handling introduced in the previous version.
+
+## 1.18.5 (2021-05-17)
+
+### Bug fixes
+
+Work around a Firefox bug where backspace sometimes deletes the node after the cursor.
+
+Fix a bug that prevented `transformPasted` hooks from being called on content dragged within the editor.
+
+Fixes an issue where clicking near a node or other special selection on Chrome would in some cases do nothing.
+
+## 1.18.4 (2021-04-27)
+
+### Bug fixes
+
+Fix incorrect drag cursor in Chrome on some platforms.
+
+Fix an issue where a race condition could leave a node uneditable when clicked.
+
+Fix scroll handling when the editor is placed through a DOM component slot.
+
+Fix a typo in the Chrome backspace workaround.
+
+Fixes an issue where, when mouseup events weren't being delivered, the editor could leak event handlers.
+
 ## 1.18.3 (2021-04-13)
 
 ### Bug fixes

package/dist/index.es.js

@@ -33,7 +33,7 @@ var domIndex = function(node) {
 };
 
 var parentNode = function(node) {
-  var parent = node.parentNode;
+  var parent = node.assignedSlot || node.parentNode;
   return parent && parent.nodeType == 11 ? parent.host : parent
 };
 
@@ -377,7 +377,10 @@ function posAtCoords(view, coords) {
     if (!elt) { return null }
   }
   // Safari's caretRangeFromPoint returns nonsense when on a draggable element
-  if (result.safari && elt.draggable) { node = offset = null; }
+  if (result.safari) {
+    for (var p = elt; node && p; p = parentNode(p))
+      { if (p.draggable) { node = offset = null; } }
+  }
   elt = targetKludge(elt, coords);
   if (node) {
     if (result.gecko && node.nodeType == 1) {
@@ -965,6 +968,12 @@ ViewDesc.prototype.setSelection = function setSelection (anchor, head, root, for
       brKludge = prev && (prev.nodeName == "BR" || prev.contentEditable == "false");
     }
   }
+  // Firefox can act strangely when the selection is in front of an
+  // uneditable node. See #1163 and https://bugzilla.mozilla.org/show_bug.cgi?id=1709536
+  if (result.gecko && domSel.focusNode && domSel.focusNode != headDOM.node && domSel.focusNode.nodeType == 1) {
+    var after = domSel.focusNode.childNodes[domSel.focusOffset];
+    if (after && after.contentEditable == "false") { force = true; }
+  }
 
   if (!(force || brKludge && result.safari) &&
       isEquivalentPosition(anchorDOM.node, anchorDOM.offset, domSel.anchorNode, domSel.anchorOffset) &&
@@ -1480,26 +1489,26 @@ var TextViewDesc = /*@__PURE__*/(function (NodeViewDesc) {
   return TextViewDesc;
 }(NodeViewDesc));
 
-// A dummy desc used to tag trailing BR or span nodes created to work
+// A dummy desc used to tag trailing BR or IMG nodes created to work
 // around contentEditable terribleness.
-var BRHackViewDesc = /*@__PURE__*/(function (ViewDesc) {
-  function BRHackViewDesc () {
+var TrailingHackViewDesc = /*@__PURE__*/(function (ViewDesc) {
+  function TrailingHackViewDesc () {
     ViewDesc.apply(this, arguments);
   }
 
-  if ( ViewDesc ) BRHackViewDesc.__proto__ = ViewDesc;
-  BRHackViewDesc.prototype = Object.create( ViewDesc && ViewDesc.prototype );
-  BRHackViewDesc.prototype.constructor = BRHackViewDesc;
+  if ( ViewDesc ) TrailingHackViewDesc.__proto__ = ViewDesc;
+  TrailingHackViewDesc.prototype = Object.create( ViewDesc && ViewDesc.prototype );
+  TrailingHackViewDesc.prototype.constructor = TrailingHackViewDesc;
 
   var prototypeAccessors$5 = { domAtom: { configurable: true } };
 
-  BRHackViewDesc.prototype.parseRule = function parseRule () { return {ignore: true} };
-  BRHackViewDesc.prototype.matchesHack = function matchesHack () { return this.dirty == NOT_DIRTY };
+  TrailingHackViewDesc.prototype.parseRule = function parseRule () { return {ignore: true} };
+  TrailingHackViewDesc.prototype.matchesHack = function matchesHack () { return this.dirty == NOT_DIRTY };
   prototypeAccessors$5.domAtom.get = function () { return true };
 
-  Object.defineProperties( BRHackViewDesc.prototype, prototypeAccessors$5 );
+  Object.defineProperties( TrailingHackViewDesc.prototype, prototypeAccessors$5 );
 
-  return BRHackViewDesc;
+  return TrailingHackViewDesc;
 }(ViewDesc));
 
 // A separate subclass is used for customized node views, so that the
@@ -1842,7 +1851,7 @@ ViewTreeUpdater.prototype.addTextblockHacks = function addTextblockHacks () {
       this.index++;
     } else {
       var dom = document.createElement("br");
-      this.top.children.splice(this.index++, 0, new BRHackViewDesc(this.top, nothing, dom, null));
+      this.top.children.splice(this.index++, 0, new TrailingHackViewDesc(this.top, nothing, dom, null));
       this.changed = true;
     }
   }
@@ -2496,7 +2505,7 @@ function parseBetween(view, from_, to_) {
   if (result.chrome && view.lastKeyCode === 8) {
     for (var off = toOffset; off > fromOffset; off--) {
       var node = parent.childNodes[off - 1], desc = node.pmViewDesc;
-      if (node.nodeType == "BR" && !desc) { toOffset = off; break }
+      if (node.nodeName == "BR" && !desc) { toOffset = off; break }
       if (!desc || desc.size) { break }
     }
   }
@@ -2713,7 +2722,7 @@ function readDOMChange(view, from, to, typeOver, addedNodes) {
     // Edge just doesn't move the cursor forward when you start typing
     // in an empty block or between br nodes.
     if (sel$2 && !(result.chrome && result.android && view.composing && sel$2.empty &&
-                 (change.from != change.toB || view.lastAndroidDelete < Date.now() - 100) &&
+                 (change.start != change.endB || view.lastAndroidDelete < Date.now() - 100) &&
                  (sel$2.head == chFrom || sel$2.head == tr.mapping.map(chTo) - 1) ||
                  result.ie && sel$2.empty && sel$2.head == chFrom))
       { tr.setSelection(sel$2); }
@@ -3527,12 +3536,14 @@ handlers.mousedown = function (view, event) {
   var pos = view.posAtCoords(eventCoords(event));
   if (!pos) { return }
 
-  if (type == "singleClick")
-    { view.mouseDown = new MouseDown(view, pos, event, flushed); }
-  else if ((type == "doubleClick" ? handleDoubleClick : handleTripleClick)(view, pos.pos, pos.inside, event))
-    { event.preventDefault(); }
-  else
-    { setSelectionOrigin(view, "pointer"); }
+  if (type == "singleClick") {
+    if (view.mouseDown) { view.mouseDown.done(); }
+    view.mouseDown = new MouseDown(view, pos, event, flushed);
+  } else if ((type == "doubleClick" ? handleDoubleClick : handleTripleClick)(view, pos.pos, pos.inside, event)) {
+    event.preventDefault();
+  } else {
+    setSelectionOrigin(view, "pointer");
+  }
 };
 
 var MouseDown = function MouseDown(view, pos, event, flushed) {
@@ -3562,8 +3573,10 @@ var MouseDown = function MouseDown(view, pos, event, flushed) {
   var targetDesc = target ? view.docView.nearestDesc(target, true) : null;
   this.target = targetDesc ? targetDesc.dom : null;
 
+  var ref = view.state;
+  var selection = ref.selection;
   if (targetNode.type.spec.draggable && targetNode.type.spec.selectable !== false ||
-      view.state.selection instanceof NodeSelection && targetPos == view.state.selection.from)
+      selection instanceof NodeSelection && selection.from <= targetPos && selection.to > targetPos)
     { this.mightDrag = {node: targetNode,
                       pos: targetPos,
                       addAttr: this.target && !this.target.draggable,
@@ -3573,7 +3586,9 @@ var MouseDown = function MouseDown(view, pos, event, flushed) {
     this.view.domObserver.stop();
     if (this.mightDrag.addAttr) { this.target.draggable = true; }
     if (this.mightDrag.setUneditable)
-      { setTimeout(function () { return this$1.target.setAttribute("contentEditable", "false"); }, 20); }
+      { setTimeout(function () {
+        if (this$1.view.mouseDown == this$1) { this$1.target.setAttribute("contentEditable", "false"); }
+      }, 20); }
     this.view.domObserver.start();
   }
 
@@ -3618,7 +3633,8 @@ MouseDown.prototype.up = function up (event) {
              // thus doesn't get a reaction from ProseMirror. This
              // works around that.
              (result.chrome && !(this.view.state.selection instanceof TextSelection) &&
-              (pos.pos == this.view.state.selection.from || pos.pos == this.view.state.selection.to))) {
+              Math.min(Math.abs(pos.pos - this.view.state.selection.from),
+                       Math.abs(pos.pos - this.view.state.selection.to)) <= 2)) {
     updateSelection(this.view, Selection.near(this.view.state.doc.resolve(pos.pos)), "pointer");
     event.preventDefault();
   } else {
@@ -3631,6 +3647,7 @@ MouseDown.prototype.move = function move (event) {
                              Math.abs(this.event.y - event.clientY) > 4))
     { this.allowDefault = true; }
   setSelectionOrigin(this.view, "pointer");
+  if (event.buttons == 0) { this.done(); }
 };
 
 handlers.touchdown = function (view) {
@@ -3840,6 +3857,8 @@ handlers.dragstart = function (view, e) {
   var text = ref.text;
   e.dataTransfer.clearData();
   e.dataTransfer.setData(brokenClipboardAPI ? "Text" : "text/html", dom.innerHTML);
+  // See https://github.com/ProseMirror/prosemirror/issues/1156
+  e.dataTransfer.effectAllowed = "copyMove";
   if (!brokenClipboardAPI) { e.dataTransfer.setData("text/plain", text); }
   view.dragging = new Dragging(slice, !e[dragCopyModifier]);
 };
@@ -3863,9 +3882,13 @@ editHandlers.drop = function (view, e) {
   if (!eventPos) { return }
   var $mouse = view.state.doc.resolve(eventPos.pos);
   if (!$mouse) { return }
-  var slice = dragging && dragging.slice ||
-      parseFromClipboard(view, e.dataTransfer.getData(brokenClipboardAPI ? "Text" : "text/plain"),
-                         brokenClipboardAPI ? null : e.dataTransfer.getData("text/html"), false, $mouse);
+  var slice = dragging && dragging.slice;
+  if (slice) {
+    view.someProp("transformPasted", function (f) { slice = f(slice); });
+  } else {
+    slice = parseFromClipboard(view, e.dataTransfer.getData(brokenClipboardAPI ? "Text" : "text/plain"),
+                               brokenClipboardAPI ? null : e.dataTransfer.getData("text/html"), false, $mouse);
+  }
   var move = dragging && !e[dragCopyModifier];
   if (view.someProp("handleDrop", function (f) { return f(view, e, slice || Slice.empty, move); })) {
     e.preventDefault();