prosemirror-view 1.23.2 → 1.23.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prosemirror-view",
-  "version": "1.23.2",
+  "version": "1.23.6",
   "description": "ProseMirror's view component",
   "main": "dist/index.js",
   "module": "dist/index.es.js",
@@ -18,7 +18,7 @@
     "url": "git://github.com/prosemirror/prosemirror-view.git"
   },
   "dependencies": {
-    "prosemirror-model": "^1.14.3",
+    "prosemirror-model": "^1.16.0",
     "prosemirror-state": "^1.0.0",
     "prosemirror-transform": "^1.1.0"
   },

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/domchange.js

@@ -39,7 +39,7 @@ function parseBetween(view, from_, to_) {
     topOpen: true,
     from: fromOffset,
     to: toOffset,
-    preserveWhitespace: $from.parent.type.spec.code ? "full" : true,
+    preserveWhitespace: $from.parent.type.whitespace == "pre" ? "full" : true,
     editableContent: true,
     findPositions: find,
     ruleFromNode,

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

@@ -42,10 +42,17 @@ export function selectionToDOM(view, force) {
 
   if (!editorOwnsSelection(view)) return
 
-  if (!force && view.mouseDown && view.mouseDown.allowDefault) {
-    view.mouseDown.delayedSelectionSync = true
-    view.domObserver.setCurSelection()
-    return
+  // The delayed drag selection causes issues with Cell Selections
+  // in Safari. And the drag selection delay is to workarond issues
+  // which only present in Chrome.
+  if (!force && view.mouseDown && view.mouseDown.allowDefault && browser.chrome) {
+    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

@@ -462,7 +462,8 @@ class ViewDesc {
           else child.markDirty(from - startInside, to - startInside)
           return
         } else {
-          child.dirty = child.dom == child.contentDOM && child.dom.parentNode == this.contentDOM ? CONTENT_DIRTY : NODE_DIRTY
+          child.dirty = child.dom == child.contentDOM && child.dom.parentNode == this.contentDOM && !child.children.length
+            ? CONTENT_DIRTY : NODE_DIRTY
         }
       }
       offset = end
@@ -577,7 +578,10 @@ class MarkViewDesc extends ViewDesc {
     return new MarkViewDesc(parent, mark, spec.dom, spec.contentDOM || spec.dom)
   }
 
-  parseRule() { return {mark: this.mark.type.name, attrs: this.mark.attrs, contentElement: this.contentDOM} }
+  parseRule() {
+    if ((this.dirty & NODE_DIRTY) || this.mark.type.spec.reparseInView) return null
+    return {mark: this.mark.type.name, attrs: this.mark.attrs, contentElement: this.contentDOM}
+  }
 
   matchesMark(mark) { return this.dirty != NODE_DIRTY && this.mark.eq(mark) }
 
@@ -667,7 +671,7 @@ class NodeViewDesc extends ViewDesc {
     // attrs in the dom, that won't be picked up. Not entirely sure
     // whether this is a problem
     let rule = {node: this.node.type.name, attrs: this.node.attrs}
-    if (this.node.type.spec.code) rule.preserveWhitespace = "full"
+    if (this.node.type.whitespace == "pre") rule.preserveWhitespace = "full"
     if (this.contentDOM && !this.contentLost) rule.contentElement = this.contentDOM
     else rule.getContent = () => this.contentDOM ? Fragment.empty : this.node.content
     return rule
@@ -1422,8 +1426,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
     }