prosemirror-view 1.18.6 → 1.18.7

package/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 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

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) {
@@ -2719,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); }
@@ -3570,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,