prosemirror-view 1.18.3 → 1.18.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prosemirror-view",
-  "version": "1.18.3",
+  "version": "1.18.7",
   "description": "ProseMirror's view component",
   "main": "dist/index.js",
   "module": "dist/index.es.js",

package/src/dom.js

@@ -8,7 +8,7 @@ export const domIndex = function(node) {
 }
 
 export const parentNode = function(node) {
-  let parent = node.parentNode
+  let parent = node.assignedSlot || node.parentNode
   return parent && parent.nodeType == 11 ? parent.host : parent
 }
 

package/src/domchange.js

@@ -25,7 +25,7 @@ function parseBetween(view, from_, to_) {
   if (browser.chrome && view.lastKeyCode === 8) {
     for (let off = toOffset; off > fromOffset; off--) {
       let 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
     }
   }
@@ -242,7 +242,7 @@ export 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 && !(browser.chrome && browser.android && view.composing && sel.empty &&
-                 (change.from != change.toB || view.lastAndroidDelete < Date.now() - 100) &&
+                 (change.start != change.endB || view.lastAndroidDelete < Date.now() - 100) &&
                  (sel.head == chFrom || sel.head == tr.mapping.map(chTo) - 1) ||
                  browser.ie && sel.empty && sel.head == chFrom))
       tr.setSelection(sel)

package/src/domcoords.js

@@ -250,7 +250,10 @@ export function posAtCoords(view, coords) {
     if (!elt) return null
   }
   // Safari's caretRangeFromPoint returns nonsense when on a draggable element
-  if (browser.safari && elt.draggable) node = offset = null
+  if (browser.safari) {
+    for (let p = elt; node && p; p = parentNode(p))
+      if (p.draggable) node = offset = null
+  }
   elt = targetKludge(elt, coords)
   if (node) {
     if (browser.gecko && node.nodeType == 1) {

package/src/input.js

@@ -266,12 +266,14 @@ handlers.mousedown = (view, event) => {
   let pos = view.posAtCoords(eventCoords(event))
   if (!pos) return
 
-  if (type == "singleClick")
+  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))
+  } else if ((type == "doubleClick" ? handleDoubleClick : handleTripleClick)(view, pos.pos, pos.inside, event)) {
     event.preventDefault()
-  else
+  } else {
     setSelectionOrigin(view, "pointer")
+  }
 }
 
 class MouseDown {
@@ -300,8 +302,9 @@ class MouseDown {
     const targetDesc = target ? view.docView.nearestDesc(target, true) : null
     this.target = targetDesc ? targetDesc.dom : null
 
+    let {selection} = view.state
     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,
@@ -311,7 +314,9 @@ class MouseDown {
       this.view.domObserver.stop()
       if (this.mightDrag.addAttr) this.target.draggable = true
       if (this.mightDrag.setUneditable)
-        setTimeout(() => this.target.setAttribute("contentEditable", "false"), 20)
+        setTimeout(() => {
+          if (this.view.mouseDown == this) this.target.setAttribute("contentEditable", "false")
+        }, 20)
       this.view.domObserver.start()
     }
 
@@ -356,7 +361,8 @@ class MouseDown {
                // thus doesn't get a reaction from ProseMirror. This
                // works around that.
                (browser.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 {
@@ -369,6 +375,7 @@ class MouseDown {
                                Math.abs(this.event.y - event.clientY) > 4))
       this.allowDefault = true
     setSelectionOrigin(this.view, "pointer")
+    if (event.buttons == 0) this.done()
   }
 }
 
@@ -576,6 +583,8 @@ handlers.dragstart = (view, e) => {
   let slice = view.state.selection.content(), {dom, text} = serializeForClipboard(view, slice)
   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])
 }
@@ -599,9 +608,13 @@ editHandlers.drop = (view, e) => {
   if (!eventPos) return
   let $mouse = view.state.doc.resolve(eventPos.pos)
   if (!$mouse) return
-  let slice = dragging && dragging.slice ||
-      parseFromClipboard(view, e.dataTransfer.getData(brokenClipboardAPI ? "Text" : "text/plain"),
-                         brokenClipboardAPI ? null : e.dataTransfer.getData("text/html"), false, $mouse)
+  let slice = dragging && dragging.slice
+  if (slice) {
+    view.someProp("transformPasted", f => { slice = f(slice) })
+  } else {
+    slice = parseFromClipboard(view, e.dataTransfer.getData(brokenClipboardAPI ? "Text" : "text/plain"),
+                               brokenClipboardAPI ? null : e.dataTransfer.getData("text/html"), false, $mouse)
+  }
   let move = dragging && !e[dragCopyModifier]
   if (view.someProp("handleDrop", f => f(view, e, slice || Slice.empty, move))) {
     e.preventDefault()

package/src/viewdesc.js

@@ -382,6 +382,12 @@ class ViewDesc {
         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 (browser.gecko && domSel.focusNode && domSel.focusNode != headDOM.node && domSel.focusNode.nodeType == 1) {
+      let after = domSel.focusNode.childNodes[domSel.focusOffset]
+      if (after && after.contentEditable == "false") force = true
+    }
 
     if (!(force || brKludge && browser.safari) &&
         isEquivalentPosition(anchorDOM.node, anchorDOM.offset, domSel.anchorNode, domSel.anchorOffset) &&
@@ -841,9 +847,9 @@ class TextViewDesc extends NodeViewDesc {
   get domAtom() { return false }
 }
 
-// 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.
-class BRHackViewDesc extends ViewDesc {
+class TrailingHackViewDesc extends ViewDesc {
   parseRule() { return {ignore: true} }
   matchesHack() { return this.dirty == NOT_DIRTY }
   get domAtom() { return true }
@@ -1186,7 +1192,7 @@ class ViewTreeUpdater {
         this.index++
       } else {
         let 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
       }
     }