prosemirror-view 1.23.4 → 1.23.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prosemirror-view",
-  "version": "1.23.4",
+  "version": "1.23.7",
   "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/dom.js

@@ -39,7 +39,8 @@ function scanFor(node, off, targetNode, targetOff, dir) {
     if (node == targetNode && off == targetOff) return true
     if (off == (dir < 0 ? 0 : nodeSize(node))) {
       let parent = node.parentNode
-      if (parent.nodeType != 1 || hasBlockDesc(node) || atomElements.test(node.nodeName) || node.contentEditable == "false")
+      if (!parent || parent.nodeType != 1 || hasBlockDesc(node) || atomElements.test(node.nodeName) ||
+          node.contentEditable == "false")
         return false
       off = domIndex(node) + (dir < 0 ? 0 : 1)
       node = parent

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

@@ -174,7 +174,7 @@ export class DOMObserver {
         checkCSS(this.view)
       }
       this.handleDOMChange(from, to, typeOver, added)
-      if (this.view.docView.dirty) this.view.updateState(this.view.state)
+      if (this.view.docView && this.view.docView.dirty) this.view.updateState(this.view.state)
       else if (!this.currentSelection.eq(sel)) selectionToDOM(this.view)
       this.currentSelection.set(sel)
     }

package/src/index.js

@@ -602,7 +602,10 @@ function checkStateComponent(plugin) {
 //   The DOM serializer to use when putting content onto the
 //   clipboard. If not given, the result of
 //   [`DOMSerializer.fromSchema`](#model.DOMSerializer^fromSchema)
-//   will be used.
+//   will be used. This object will only have its
+//   [`serializeFragment`](#model.DOMSerializer.serializeFragment)
+//   method called, and you may provide an alternative object type
+//   implementing a compatible method.
 //
 //   clipboardTextSerializer:: ?(Slice) → string
 //   A function that will be called to get the text for the current

package/src/input.js

@@ -485,7 +485,7 @@ export function endComposition(view, forceUpdate) {
   if (browser.android && view.domObserver.flushingSoon >= 0) return
   view.domObserver.forceFlush()
   clearComposition(view)
-  if (forceUpdate || view.docView.dirty) {
+  if (forceUpdate || view.docView && view.docView.dirty) {
     let sel = selectionFromDOM(view)
     if (sel && !sel.eq(view.state.selection)) view.dispatch(view.state.tr.setSelection(sel))
     else view.updateState(view.state)

package/src/selection.js

@@ -42,7 +42,10 @@ export function selectionToDOM(view, force) {
 
   if (!editorOwnsSelection(view)) return
 
-  if (!force && view.mouseDown && view.mouseDown.allowDefault) {
+  // 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)) {

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