prosemirror-view 1.23.0 → 1.23.4

package/package.json

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

package/src/clipboard.js

@@ -73,7 +73,8 @@ export function parseFromClipboard(view, text, html, plainText, $context) {
       preserveWhitespace: !!(asText || sliceData),
       context: $context,
       ruleFromNode(dom) {
-        if (dom.nodeName == "BR" && !dom.nextSibling) return {ignore: true}
+        if (dom.nodeName == "BR" && !dom.nextSibling &&
+            dom.parentNode && !inlineParents.test(dom.parentNode.nodeName)) return {ignore: true}
       }
     })
   }
@@ -95,6 +96,8 @@ export function parseFromClipboard(view, text, html, plainText, $context) {
   return slice
 }
 
+const inlineParents = /^(a|abbr|acronym|b|cite|code|del|em|i|ins|kbd|label|output|q|ruby|s|samp|span|strong|sub|sup|time|u|tt|var)$/i
+
 // Takes a slice parsed with parseSlice, which means there hasn't been
 // any content-expression checking done on the top nodes, tries to
 // find a parent node in the current context that might fit the nodes,

package/src/input.js

@@ -100,9 +100,14 @@ export function dispatchEvent(view, event) {
 editHandlers.keydown = (view, event) => {
   view.shiftKey = event.keyCode == 16 || event.shiftKey
   if (inOrNearComposition(view, event)) return
-  if (event.keyCode != 229) view.domObserver.forceFlush()
   view.lastKeyCode = event.keyCode
   view.lastKeyCodeTime = Date.now()
+  // Suppress enter key events on Chrome Android, because those tend
+  // to be part of a confused sequence of composition events fired,
+  // and handling them eagerly tends to corrupt the input.
+  if (browser.android && browser.chrome && event.keyCode == 13) return
+  if (event.keyCode != 229) view.domObserver.forceFlush()
+
   // On iOS, if we preventDefault enter key presses, the virtual
   // keyboard gets confused. So the hack here is to set a flag that
   // makes the DOM change code recognize that what just happens should
@@ -477,6 +482,7 @@ function timestampFromCustomEvent() {
 }
 
 export function endComposition(view, forceUpdate) {
+  if (browser.android && view.domObserver.flushingSoon >= 0) return
   view.domObserver.forceFlush()
   clearComposition(view)
   if (forceUpdate || view.docView.dirty) {
@@ -564,6 +570,11 @@ function doPaste(view, text, html, e) {
 }
 
 editHandlers.paste = (view, e) => {
+  // Handling paste from JavaScript during composition is very poorly
+  // handled by browsers, so as a dodgy but preferable kludge, we just
+  // let the browser do its native thing there, except on Android,
+  // where the editor is almost always composing.
+  if (view.composing && !browser.android) return
   let data = brokenClipboardAPI ? null : e.clipboardData
   if (data && doPaste(view, data.getData("text/plain"), data.getData("text/html"), e)) e.preventDefault()
   else capturePaste(view, e)
@@ -696,6 +707,7 @@ handlers.beforeinput = (view, event) => {
   // Very specific hack to deal with backspace sometimes failing on
   // Chrome Android when after an uneditable node.
   if (browser.chrome && browser.android && event.inputType == "deleteContentBackward") {
+    view.domObserver.flushSoon()
     let {domChangeCount} = view
     setTimeout(() => {
       if (view.domChangeCount != domChangeCount) return // Event already had some effect

package/src/selection.js

@@ -43,9 +43,13 @@ export function selectionToDOM(view, force) {
   if (!editorOwnsSelection(view)) return
 
   if (!force && view.mouseDown && view.mouseDown.allowDefault) {
-    view.mouseDown.delayedSelectionSync = true
-    view.domObserver.setCurSelection()
-    return
+    let domSel = view.root.getSelection(), curSel = view.domObserver.currentSelection
+    if (domSel.anchorNode && isEquivalentPosition(domSel.anchorNode, domSel.anchorOffset,
+                                                  curSel.anchorNode, curSel.anchorOffset)) {
+      view.mouseDown.delayedSelectionSync = true
+      view.domObserver.setCurSelection()
+      return
+    }
   }
 
   view.domObserver.disconnectSelection()

package/src/viewdesc.js

@@ -1091,7 +1091,7 @@ class ViewTreeUpdater {
     // Tracks whether anything was changed
     this.changed = false
 
-    this.preMatch = preMatch(top.node.content, top.children)
+    this.preMatch = preMatch(top.node.content, top)
   }
 
   // Destroy and remove the children between the given indices in
@@ -1152,17 +1152,14 @@ class ViewTreeUpdater {
   // Try to find a node desc matching the given data. Skip over it and
   // return true when successful.
   findNodeMatch(node, outerDeco, innerDeco, index) {
-    let children = this.top.children, found = -1
-    if (index >= this.preMatch.index) {
-      for (let i = this.index; i < children.length; i++) {
-        if (this.preMatch.matched.get(children[i]) == index) {
-          if (children[i].matchesNode(node, outerDeco, innerDeco)) found = i
-          break
-        }
-      }
+    let found = -1, targetDesc
+    if (index >= this.preMatch.index &&
+        (targetDesc = this.preMatch.matches[index - this.preMatch.index]).parent == this.top &&
+        targetDesc.matchesNode(node, outerDeco, innerDeco)) {
+      found = this.top.children.indexOf(targetDesc, this.index)
     } else {
-      for (let i = this.index, e = Math.min(children.length, i + 1); i < e; i++) {
-        let child = children[i]
+      for (let i = this.index, e = Math.min(this.top.children.length, i + 5); i < e; i++) {
+        let child = this.top.children[i]
         if (child.matchesNode(node, outerDeco, innerDeco) && !this.preMatch.matched.has(child)) {
           found = i
           break
@@ -1274,22 +1271,44 @@ class ViewTreeUpdater {
   }
 }
 
-// : (Fragment, [ViewDesc]) → {index: number, matched: Map<ViewDesc, number>}
+// : (Fragment, [ViewDesc]) → {index: number, matched: Map<ViewDesc, number>, matches: ViewDesc[]}
 // Iterate from the end of the fragment and array of descs to find
 // directly matching ones, in order to avoid overeagerly reusing those
 // for other nodes. Returns the fragment index of the first node that
 // is part of the sequence of matched nodes at the end of the
 // fragment.
-function preMatch(frag, descs) {
-  let fI = frag.childCount, dI = descs.length, matched = new Map
-  for (; fI > 0 && dI > 0; dI--) {
-    let desc = descs[dI - 1], node = desc.node
+function preMatch(frag, parentDesc) {
+  let curDesc = parentDesc, descI = curDesc.children.length
+  let fI = frag.childCount, matched = new Map, matches = []
+  outer: while (fI > 0) {
+    let desc
+    for (;;) {
+      if (descI) {
+        let next = curDesc.children[descI - 1]
+        if (next instanceof MarkViewDesc) {
+          curDesc = next
+          descI = next.children.length
+        } else {
+          desc = next
+          descI--
+          break
+        }
+      } else if (curDesc == parentDesc) {
+        break outer
+      } else {
+        // FIXME
+        descI = curDesc.parent.children.indexOf(curDesc)
+        curDesc = curDesc.parent
+      }
+    }
+    let node = desc.node
     if (!node) continue
     if (node != frag.child(fI - 1)) break
     --fI
     matched.set(desc, fI)
+    matches.push(desc)
   }
-  return {index: fI, matched}
+  return {index: fI, matched, matches: matches.reverse()}
 }
 
 function compareSide(a, b) { return a.type.side - b.type.side }
@@ -1403,8 +1422,8 @@ function findTextInFragment(frag, text, from, to) {
       if (!next.isText) break
       str += next.text
     }
-    if (pos >= from) {
-      let found = str.lastIndexOf(text, to - childStart)
+    if (pos >= from && childStart < to) {
+      let found = str.lastIndexOf(text, to - childStart - 1)
       if (found >= 0 && found + text.length + childStart >= from)
         return childStart + found
     }