prosemirror-view 1.18.4 → 1.18.8

package/package.json

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

package/src/domchange.js

@@ -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

@@ -100,7 +100,7 @@ export function dispatchEvent(view, event) {
 editHandlers.keydown = (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
@@ -220,10 +220,11 @@ function handleDoubleClick(view, pos, inside, event) {
 function handleTripleClick(view, pos, inside, event) {
   return runHandlerOnContext(view, "handleTripleClickOn", pos, inside, event) ||
     view.someProp("handleTripleClick", f => 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
   let doc = view.state.doc
   if (inside == -1) {
     if (doc.inlineContent) {
@@ -284,7 +285,7 @@ class MouseDown {
     this.event = event
     this.flushed = flushed
     this.selectNode = event[selectNodeModifier]
-    this.allowDefault = event.shiftKey
+    this.allowDefault = event.shiftKey || event.button != 0
 
     let targetNode, targetPos
     if (pos.inside > -1) {
@@ -302,8 +303,10 @@ class MouseDown {
     const 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)
+    let {selection} = view.state
+    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,
@@ -360,7 +363,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 {
@@ -606,9 +610,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

@@ -113,7 +113,7 @@ class ViewDesc {
   matchesWidget() { return false }
   matchesMark() { return false }
   matchesNode() { return false }
-  matchesHack() { return false }
+  matchesHack(_nodeName) { return false }
 
   get beforePosition() { return false }
 
@@ -374,14 +374,28 @@ class ViewDesc {
       if (node.nodeType == 3) {
         brKludge = offset && node.nodeValue[offset - 1] == "\n"
         // Issue #1128
-        if (brKludge && offset == node.nodeValue.length &&
-            node.nextSibling && node.nextSibling.nodeName == "BR")
-          anchorDOM = headDOM = {node: node.parentNode, offset: domIndex(node) + 1}
+        if (brKludge && offset == node.nodeValue.length) {
+          for (let scan = node, after; scan; scan = scan.parentNode) {
+            if (after = scan.nextSibling) {
+              if (after.nodeName == "BR")
+                anchorDOM = headDOM = {node: after.parentNode, offset: domIndex(after) + 1}
+              break
+            }
+            let desc = scan.pmViewDesc
+            if (desc && desc.node && desc.node.isBlock) break
+          }
+        }
       } else {
         let prev = node.childNodes[offset - 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 (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) &&
@@ -838,14 +852,20 @@ class TextViewDesc extends NodeViewDesc {
     return new TextViewDesc(this.parent, node, this.outerDeco, this.innerDeco, dom, dom, view)
   }
 
+  markDirty(from, to) {
+    super.markDirty(from, to)
+    if (this.dom != this.nodeDOM && (from == 0 || to == this.nodeDOM.nodeValue.length))
+      this.dirty = NODE_DIRTY
+  }
+
   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 }
+  matchesHack(nodeName) { return this.dirty == NOT_DIRTY && this.dom.nodeName == nodeName }
   get domAtom() { return true }
 }
 
@@ -1182,13 +1202,20 @@ class ViewTreeUpdater {
     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 {
-        let 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 (browser.safari && lastChild && lastChild.dom.contentEditable == "false")
+        this.addHackNode("IMG")
+      this.addHackNode("BR")
+    }
+  }
+
+  addHackNode(nodeName) {
+    if (this.index < this.top.children.length && this.top.children[this.index].matchesHack(nodeName)) {
+      this.index++
+    } else {
+      let dom = document.createElement(nodeName)
+      this.top.children.splice(this.index++, 0, new TrailingHackViewDesc(this.top, nothing, dom, null))
+      this.changed = true
     }
   }
 }