prosemirror-view 1.23.10 → 1.23.13

package/package.json

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

package/src/domchange.js

@@ -115,15 +115,17 @@ export function readDOMChange(view, from, to, typeOver, addedNodes) {
   view.lastKeyCode = null
 
   let change = findDiff(compare.content, parse.doc.content, parse.from, preferredPos, preferredSide)
+  if ((browser.ios && view.lastIOSEnter > Date.now() - 225 || browser.android) &&
+      addedNodes.some(n => n.nodeName == "DIV" || n.nodeName == "P") &&
+      (!change || change.endA >= change.endB) &&
+      view.someProp("handleKeyDown", f => f(view, keyEvent(13, "Enter")))) {
+    view.lastIOSEnter = 0
+    return
+  }
   if (!change) {
     if (typeOver && sel instanceof TextSelection && !sel.empty && sel.$head.sameParent(sel.$anchor) &&
         !view.composing && !(parse.sel && parse.sel.anchor != parse.sel.head)) {
       change = {start: sel.from, endA: sel.to, endB: sel.to}
-    } else if ((browser.ios && view.lastIOSEnter > Date.now() - 225 || browser.android) &&
-               addedNodes.some(n => n.nodeName == "DIV" || n.nodeName == "P") &&
-               view.someProp("handleKeyDown", f => f(view, keyEvent(13, "Enter")))) {
-      view.lastIOSEnter = 0
-      return
     } else {
       if (parse.sel) {
         let sel = resolveSelection(view, view.state.doc, parse.sel)

package/src/domobserver.js

@@ -1,6 +1,6 @@
 import browser from "./browser"
 import {domIndex, isEquivalentPosition} from "./dom"
-import {hasFocusAndSelection, hasSelection, selectionToDOM} from "./selection"
+import {hasFocusAndSelection, selectionToDOM} from "./selection"
 
 const observeOptions = {
   childList: true,
@@ -145,7 +145,7 @@ export class DOMObserver {
     }
 
     let sel = this.view.root.getSelection()
-    let newSel = !this.suppressingSelectionUpdates && !this.currentSelection.eq(sel) && hasSelection(this.view) && !this.ignoreSelectionChange(sel)
+    let newSel = !this.suppressingSelectionUpdates && !this.currentSelection.eq(sel) && hasFocusAndSelection(this.view) && !this.ignoreSelectionChange(sel)
 
     let from = -1, to = -1, typeOver = false, added = []
     if (this.view.editable) {

package/src/index.js

@@ -75,7 +75,7 @@ export class EditorView {
 
   // composing:: boolean
   // Holds `true` when a
-  // [composition](https://developer.mozilla.org/en-US/docs/Mozilla/IME_handling_guide)
+  // [composition](https://w3c.github.io/uievents/#events-compositionevents)
   // is active.
 
   // :: DirectEditorProps
@@ -643,7 +643,7 @@ function checkStateComponent(plugin) {
 
 // DirectEditorProps:: interface extends EditorProps
 //
-// The props object given directly to the editor view supports two
+// The props object given directly to the editor view supports some
 // fields that can't be used in plugins:
 //
 //   state:: EditorState

package/src/viewdesc.js

@@ -672,8 +672,23 @@ class NodeViewDesc extends ViewDesc {
     // whether this is a problem
     let rule = {node: this.node.type.name, attrs: this.node.attrs}
     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
+    if (!this.contentDOM) {
+      rule.getContent = () => this.node.content
+    } else if (!this.contentLost) {
+      rule.contentElement = this.contentDOM
+    } else {
+      // Chrome likes to randomly recreate parent nodes when
+      // backspacing things. When that happens, this tries to find the
+      // new parent.
+      for (let i = this.children.length - 1; i >= 0; i--) {
+        let child = this.children[i]
+        if (this.dom.contains(child.dom.parentNode)) {
+          rule.contentElement = child.dom.parentNode
+          break
+        }
+      }
+      if (!rule.contentElement) rule.getContent = () => Fragment.empty
+    }
     return rule
   }
 
@@ -1249,21 +1264,24 @@ class ViewTreeUpdater {
   // Make sure a textblock looks and behaves correctly in
   // contentEditable.
   addTextblockHacks() {
-    let lastChild = this.top.children[this.index - 1]
-    while (lastChild instanceof MarkViewDesc) lastChild = lastChild.children[lastChild.children.length - 1]
+    let lastChild = this.top.children[this.index - 1], parent = this.top
+    while (lastChild instanceof MarkViewDesc) {
+      parent = lastChild
+      lastChild = parent.children[parent.children.length - 1]
+    }
 
     if (!lastChild || // Empty textblock
         !(lastChild instanceof TextViewDesc) ||
         /\n$/.test(lastChild.node.text)) {
       // Avoid bugs in Safari's cursor drawing (#1165) and Chrome's mouse selection (#1152)
       if ((browser.safari || browser.chrome) && lastChild && lastChild.dom.contentEditable == "false")
-        this.addHackNode("IMG")
-      this.addHackNode("BR")
+        this.addHackNode("IMG", parent)
+      this.addHackNode("BR", this.top)
     }
   }
 
-  addHackNode(nodeName) {
-    if (this.index < this.top.children.length && this.top.children[this.index].matchesHack(nodeName)) {
+  addHackNode(nodeName, parent) {
+    if (parent == this.top && this.index < parent.children.length && parent.children[this.index].matchesHack(nodeName)) {
       this.index++
     } else {
       let dom = document.createElement(nodeName)
@@ -1272,7 +1290,9 @@ class ViewTreeUpdater {
         dom.alt = ""
       }
       if (nodeName == "BR") dom.className = "ProseMirror-trailingBreak"
-      this.top.children.splice(this.index++, 0, new TrailingHackViewDesc(this.top, nothing, dom, null))
+      let hack = new TrailingHackViewDesc(this.top, nothing, dom, null)
+      if (parent != this.top) parent.children.push(hack)
+      else parent.children.splice(this.index++, 0, hack)
       this.changed = true
     }
   }