prosemirror-view 1.18.4 → 1.18.8

package/CHANGELOG.md

@@ -1,3 +1,39 @@
+## 1.18.8 (2021-06-23)
+
+### Bug fixes
+
+Work around a Safari bug where it draws the cursor at the start of the line when it is after an uneditable node at the end of the line.
+
+Fix an issue where the DOM could get out of sync when editing decorated text.
+
+Work around an issue where Firefox draws the cursor on the wrong line when after a newline.
+
+Fix a bug where double-clicking with the left mouse button and then pressing another mouse button was treated as a triple click.
+
+## 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

package/dist/index.es.js

@@ -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) {
@@ -691,7 +694,7 @@ var prototypeAccessors = { beforePosition: { configurable: true },size: { config
 ViewDesc.prototype.matchesWidget = function matchesWidget () { return false };
 ViewDesc.prototype.matchesMark = function matchesMark () { return false };
 ViewDesc.prototype.matchesNode = function matchesNode () { return false };
-ViewDesc.prototype.matchesHack = function matchesHack () { return false };
+ViewDesc.prototype.matchesHack = function matchesHack (_nodeName) { return false };
 
 prototypeAccessors.beforePosition.get = function () { return false };
 
@@ -957,14 +960,28 @@ ViewDesc.prototype.setSelection = function setSelection (anchor, head, root, for
     if (node.nodeType == 3) {
       brKludge = offset$1 && node.nodeValue[offset$1 - 1] == "\n";
       // Issue #1128
-      if (brKludge && offset$1 == node.nodeValue.length &&
-          node.nextSibling && node.nextSibling.nodeName == "BR")
-        { anchorDOM = headDOM = {node: node.parentNode, offset: domIndex(node) + 1}; }
+      if (brKludge && offset$1 == node.nodeValue.length) {
+        for (var scan = node, after = (void 0); scan; scan = scan.parentNode) {
+          if (after = scan.nextSibling) {
+            if (after.nodeName == "BR")
+              { anchorDOM = headDOM = {node: after.parentNode, offset: domIndex(after) + 1}; }
+            break
+          }
+          var desc = scan.pmViewDesc;
+          if (desc && desc.node && desc.node.isBlock) { break }
+        }
+      }
     } else {
       var prev = node.childNodes[offset$1 - 1];
       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$1 = domSel.focusNode.childNodes[domSel.focusOffset];
+    if (after$1 && after$1.contentEditable == "false") { force = true; }
+  }
 
   if (!(force || brKludge && result.safari) &&
       isEquivalentPosition(anchorDOM.node, anchorDOM.offset, domSel.anchorNode, domSel.anchorOffset) &&
@@ -1473,6 +1490,12 @@ var TextViewDesc = /*@__PURE__*/(function (NodeViewDesc) {
     return new TextViewDesc(this.parent, node, this.outerDeco, this.innerDeco, dom, dom, view)
   };
 
+  TextViewDesc.prototype.markDirty = function markDirty (from, to) {
+    NodeViewDesc.prototype.markDirty.call(this, from, to);
+    if (this.dom != this.nodeDOM && (from == 0 || to == this.nodeDOM.nodeValue.length))
+      { this.dirty = NODE_DIRTY; }
+  };
+
   prototypeAccessors$4.domAtom.get = function () { return false };
 
   Object.defineProperties( TextViewDesc.prototype, prototypeAccessors$4 );
@@ -1480,26 +1503,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 (nodeName) { return this.dirty == NOT_DIRTY && this.dom.nodeName == nodeName };
   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
@@ -1838,13 +1861,20 @@ ViewTreeUpdater.prototype.addTextblockHacks = function addTextblockHacks () {
   if (!lastChild || // Empty textblock
       !(lastChild instanceof TextViewDesc) ||
       /\n$/.test(lastChild.node.text)) {
-    if (this.index < this.top.children.length && this.top.children[this.index].matchesHack()) {
-      this.index++;
-    } else {
-      var dom = document.createElement("br");
-      this.top.children.splice(this.index++, 0, new BRHackViewDesc(this.top, nothing, dom, null));
-      this.changed = true;
-    }
+    // Avoid a bug in Safari's cursor drawing (#1165)
+    if (result.safari && lastChild && lastChild.dom.contentEditable == "false")
+      { this.addHackNode("IMG"); }
+    this.addHackNode("BR");
+  }
+};
+
+ViewTreeUpdater.prototype.addHackNode = function addHackNode (nodeName) {
+  if (this.index < this.top.children.length && this.top.children[this.index].matchesHack(nodeName)) {
+    this.index++;
+  } else {
+    var dom = document.createElement(nodeName);
+    this.top.children.splice(this.index++, 0, new TrailingHackViewDesc(this.top, nothing, dom, null));
+    this.changed = true;
   }
 };
 
@@ -2713,7 +2743,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); }
@@ -3355,7 +3385,7 @@ function dispatchEvent(view, event) {
 editHandlers.keydown = function (view, event) {
   view.shiftKey = event.keyCode == 16 || event.shiftKey;
   if (inOrNearComposition(view, event)) { return }
-  view.domObserver.forceFlush();
+  if (event.keyCode != 229) { view.domObserver.forceFlush(); }
   view.lastKeyCode = event.keyCode;
   view.lastKeyCodeTime = Date.now();
   // On iOS, if we preventDefault enter key presses, the virtual
@@ -3481,10 +3511,11 @@ function handleDoubleClick(view, pos, inside, event) {
 function handleTripleClick(view, pos, inside, event) {
   return runHandlerOnContext(view, "handleTripleClickOn", pos, inside, event) ||
     view.someProp("handleTripleClick", function (f) { return f(view, pos, event); }) ||
-    defaultTripleClick(view, inside)
+    defaultTripleClick(view, inside, event)
 }
 
-function defaultTripleClick(view, inside) {
+function defaultTripleClick(view, inside, event) {
+  if (event.button != 0) { return false }
   var doc = view.state.doc;
   if (inside == -1) {
     if (doc.inlineContent) {
@@ -3546,7 +3577,7 @@ var MouseDown = function MouseDown(view, pos, event, flushed) {
   this.event = event;
   this.flushed = flushed;
   this.selectNode = event[selectNodeModifier];
-  this.allowDefault = event.shiftKey;
+  this.allowDefault = event.shiftKey || event.button != 0;
 
   var targetNode, targetPos;
   if (pos.inside > -1) {
@@ -3564,8 +3595,11 @@ var MouseDown = function MouseDown(view, pos, event, flushed) {
   var targetDesc = target ? view.docView.nearestDesc(target, true) : null;
   this.target = targetDesc ? targetDesc.dom : null;
 
-  if (targetNode.type.spec.draggable && targetNode.type.spec.selectable !== false ||
-      view.state.selection instanceof NodeSelection && targetPos == view.state.selection.from)
+  var ref = view.state;
+  var selection = ref.selection;
+  if (event.button == 0 &&
+      targetNode.type.spec.draggable && targetNode.type.spec.selectable !== false ||
+      selection instanceof NodeSelection && selection.from <= targetPos && selection.to > targetPos)
     { this.mightDrag = {node: targetNode,
                       pos: targetPos,
                       addAttr: this.target && !this.target.draggable,
@@ -3622,7 +3656,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 {
@@ -3870,9 +3905,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();