prosemirror-view 1.20.2 → 1.23.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prosemirror-view",
-  "version": "1.20.2",
+  "version": "1.23.0",
   "description": "ProseMirror's view component",
   "main": "dist/index.js",
   "module": "dist/index.es.js",
@@ -24,7 +24,7 @@
   },
   "devDependencies": {
     "ist": "^1.0.0",
-    "mocha": "^3.0.2",
+    "mocha": "^9.1.2",
     "moduleserve": "^0.7.0",
     "prosemirror-test-builder": "^1.0.0",
     "rollup": "^2.26.3",

package/src/browser.js

@@ -6,7 +6,6 @@ if (typeof navigator != "undefined" && typeof document != "undefined") {
   const ie_upto10 = /MSIE \d/.test(navigator.userAgent)
   const ie_11up = /Trident\/(?:[7-9]|\d{2,})\..*rv:(\d+)/.exec(navigator.userAgent)
 
-  result.mac = /Mac/.test(navigator.platform)
   let ie = result.ie = !!(ie_upto10 || ie_11up || ie_edge)
   result.ie_version = ie_upto10 ? document.documentMode || 6 : ie_11up ? +ie_11up[1] : ie_edge ? +ie_edge[1] : null
   result.gecko = !ie && /gecko\/(\d+)/i.test(navigator.userAgent)
@@ -17,6 +16,7 @@ if (typeof navigator != "undefined" && typeof document != "undefined") {
   // Is true for both iOS and iPadOS for convenience
   result.safari = !ie && /Apple Computer/.test(navigator.vendor)
   result.ios = result.safari && (/Mobile\/\w+/.test(navigator.userAgent) || navigator.maxTouchPoints > 2)
+  result.mac = result.ios || /Mac/.test(navigator.platform)
   result.android = /Android \d/.test(navigator.userAgent)
   result.webkit = "webkitFontSmoothing" in document.documentElement.style
   result.webkit_version = result.webkit && +(/\bAppleWebKit\/(\d+)/.exec(navigator.userAgent) || [0, 0])[1]

package/src/clipboard.js

@@ -54,7 +54,7 @@ export function parseFromClipboard(view, text, html, plainText, $context) {
       let marks = $context.marks()
       let {schema} = view.state, serializer = DOMSerializer.fromSchema(schema)
       dom = document.createElement("div")
-      text.trim().split(/(?:\r\n?|\n)+/).forEach(block => {
+      text.split(/(?:\r\n?|\n)+/).forEach(block => {
         let p = dom.appendChild(document.createElement("p"))
         if (block) p.appendChild(serializer.serializeNode(schema.text(block, marks)))
       })
@@ -69,12 +69,27 @@ export function parseFromClipboard(view, text, html, plainText, $context) {
   let sliceData = contextNode && /^(\d+) (\d+) (.*)/.exec(contextNode.getAttribute("data-pm-slice"))
   if (!slice) {
     let parser = view.someProp("clipboardParser") || view.someProp("domParser") || DOMParser.fromSchema(view.state.schema)
-    slice = parser.parseSlice(dom, {preserveWhitespace: !!(asText || sliceData), context: $context})
+    slice = parser.parseSlice(dom, {
+      preserveWhitespace: !!(asText || sliceData),
+      context: $context,
+      ruleFromNode(dom) {
+        if (dom.nodeName == "BR" && !dom.nextSibling) return {ignore: true}
+      }
+    })
   }
-  if (sliceData)
+  if (sliceData) {
     slice = addContext(closeSlice(slice, +sliceData[1], +sliceData[2]), sliceData[3])
-  else // HTML wasn't created by ProseMirror. Make sure top-level siblings are coherent
-    slice = Slice.maxOpen(normalizeSiblings(slice.content, $context), false)
+  } else { // HTML wasn't created by ProseMirror. Make sure top-level siblings are coherent
+    slice = Slice.maxOpen(normalizeSiblings(slice.content, $context), true)
+    if (slice.openStart || slice.openEnd) {
+      let openStart = 0, openEnd = 0
+      for (let node = slice.content.firstChild; openStart < slice.openStart && !node.type.spec.isolating;
+           openStart++, node = node.firstChild) {}
+      for (let node = slice.content.lastChild; openEnd < slice.openEnd && !node.type.spec.isolating;
+           openEnd++, node = node.lastChild) {}
+      slice = closeSlice(slice, openStart, openEnd)
+    }
+  }
 
   view.someProp("transformPasted", f => { slice = f(slice) })
   return slice

package/src/decoration.js

@@ -25,6 +25,10 @@ class WidgetType {
        (this.spec.key && this.spec.key == other.spec.key ||
         this.toDOM == other.toDOM && compareObjs(this.spec, other.spec)))
   }
+
+  destroy(node) {
+    if (this.spec.destroy) this.spec.destroy(node)
+  }
 }
 
 class InlineType {
@@ -152,6 +156,10 @@ export class Decoration {
   //     key are interchangeable—if widgets differ in, for example,
   //     the behavior of some event handler, they should get
   //     different keys.
+  //
+  //     destroy:: ?(node: dom.Node)
+  //     Called when the widget decoration is removed as a result of
+  //     mapping
   static widget(pos, toDOM, spec) {
     return new Decoration(pos, pos, new WidgetType(toDOM, spec))
   }

package/src/index.js

@@ -373,6 +373,14 @@ export class EditorView {
     this.docView = null
   }
 
+  // :: boolean
+  // This is true when the view has been
+  // [destroyed](#view.EditorView.destroy) (and thus should not be
+  // used anymore).
+  get isDestroyed() {
+    return this.docView == null
+  }
+
   // Used for testing.
   dispatchEvent(event) {
     return dispatchEvent(this, event)
@@ -404,6 +412,9 @@ function computeDocDeco(view) {
     if (value) for (let attr in value) {
       if (attr == "class")
         attrs.class += " " + value[attr]
+      if (attr == "style") {
+        attrs.style = (attrs.style ? attrs.style + ";" : "") + value[attr]
+      }
       else if (!attrs[attr] && attr != "contenteditable" && attr != "nodeName")
         attrs[attr] = String(value[attr])
     }
@@ -639,7 +650,7 @@ function checkStateComponent(plugin) {
 //   view](#state.PluginSpec.view) and
 //   [props](#state.PluginSpec.props). Passing plugins with a state
 //   component (a [state field](#state.PluginSpec.state) field or a
-//   [transaction)[#state.PluginSpec.filterTransaction] filter or
+//   [transaction](#state.PluginSpec.filterTransaction) filter or
 //   appender) will result in an error, since such plugins must be
 //   present in the state to work.
 //

package/src/viewdesc.js

@@ -526,6 +526,11 @@ class WidgetViewDesc extends ViewDesc {
     return mutation.type != "selection" || this.widget.spec.ignoreSelection
   }
 
+  destroy() {
+    this.widget.type.destroy(this.dom)
+    super.destroy()
+  }
+
   get domAtom() { return true }
 }
 
@@ -1038,6 +1043,8 @@ function patchAttributes(dom, prev, cur) {
       dom.classList.remove(prevList[i])
     for (let i = 0; i < curList.length; i++) if (prevList.indexOf(curList[i]) == -1)
       dom.classList.add(curList[i])
+    if (dom.classList.length == 0)
+      dom.removeAttribute("class")
   }
   if (prev.style != cur.style) {
     if (prev.style) {
@@ -1147,9 +1154,11 @@ class ViewTreeUpdater {
   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 (children[i].matchesNode(node, outerDeco, innerDeco)) {
-        found = i
-        break
+      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
+        }
       }
     } else {
       for (let i = this.index, e = Math.min(children.length, i + 1); i < e; i++) {