prosemirror-view 1.20.1 → 1.22.0

package/CHANGELOG.md

@@ -1,3 +1,37 @@
+## 1.22.0 (2021-11-08)
+
+### Bug fixes
+
+Fix an issue where some types of node decoration changes could cause an unnecessary cascade of node redraws.
+
+### New features
+
+Widget decorations now accept a `destroy` option, which will be called when the widget is removed from the view.
+
+## 1.21.0 (2021-10-29)
+
+### Bug fixes
+
+Fix issue where recent Mobile Safari versions weren't treated as Mac platforms.
+
+### New features
+
+Multiple `style` properties provided through the `attributes` prop are now merged. Adjust mac detection for recent changes to navigator.platform on iOS
+
+## 1.20.3 (2021-10-13)
+
+### Bug fixes
+
+Stop removing leading/trailing whitespace from pasted plain text.
+
+Fix an issue that could cause invalid content to be produced when pasting HTML with isolating nodes in it.
+
+## 1.20.2 (2021-10-07)
+
+### Bug fixes
+
+Fix a crash when pasting whitespace-only content as text.
+
 ## 1.20.1 (2021-09-09)
 
 ### Bug fixes

package/dist/index.es.js

@@ -9,7 +9,6 @@ if (typeof navigator != "undefined" && typeof document != "undefined") {
   var ie_upto10 = /MSIE \d/.test(navigator.userAgent);
   var ie_11up = /Trident\/(?:[7-9]|\d{2,})\..*rv:(\d+)/.exec(navigator.userAgent);
 
-  result.mac = /Mac/.test(navigator.platform);
   var 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);
@@ -20,6 +19,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];
@@ -357,19 +357,19 @@ function elementFromPoint(element, coords, box) {
 function posAtCoords(view, coords) {
   var assign, assign$1;
 
-  var root = view.root, node, offset;
-  if (root.caretPositionFromPoint) {
+  var doc = view.dom.ownerDocument, node, offset;
+  if (doc.caretPositionFromPoint) {
     try { // Firefox throws for this call in hard-to-predict circumstances (#994)
-      var pos$1 = root.caretPositionFromPoint(coords.left, coords.top);
+      var pos$1 = doc.caretPositionFromPoint(coords.left, coords.top);
       if (pos$1) { ((assign = pos$1, node = assign.offsetNode, offset = assign.offset)); }
     } catch (_) {}
   }
-  if (!node && root.caretRangeFromPoint) {
-    var range = root.caretRangeFromPoint(coords.left, coords.top);
+  if (!node && doc.caretRangeFromPoint) {
+    var range = doc.caretRangeFromPoint(coords.left, coords.top);
     if (range) { ((assign$1 = range, node = assign$1.startContainer, offset = assign$1.startOffset)); }
   }
 
-  var elt = root.elementFromPoint(coords.left, coords.top + 1), pos;
+  var elt = (view.root.elementFromPoint ? view.root : doc).elementFromPoint(coords.left, coords.top + 1), pos;
   if (!elt || !view.dom.contains(elt.nodeType != 1 ? elt.parentNode : elt)) {
     var box = view.dom.getBoundingClientRect();
     if (!inRect(coords, box)) { return null }
@@ -1121,6 +1121,11 @@ var WidgetViewDesc = /*@__PURE__*/(function (ViewDesc) {
     return mutation.type != "selection" || this.widget.spec.ignoreSelection
   };
 
+  WidgetViewDesc.prototype.destroy = function destroy () {
+    this.widget.type.destroy(this.dom);
+    ViewDesc.prototype.destroy.call(this);
+  };
+
   prototypeAccessors$1.domAtom.get = function () { return true };
 
   Object.defineProperties( WidgetViewDesc.prototype, prototypeAccessors$1 );
@@ -1696,6 +1701,8 @@ function patchAttributes(dom, prev, cur) {
       { dom.classList.remove(prevList[i]); } }
     for (var i$1 = 0; i$1 < curList.length; i$1++) { if (prevList.indexOf(curList[i$1]) == -1)
       { dom.classList.add(curList[i$1]); } }
+    if (dom.classList.length == 0)
+      { dom.removeAttribute("class"); }
   }
   if (prev.style != cur.style) {
     if (prev.style) {
@@ -1803,10 +1810,12 @@ ViewTreeUpdater.prototype.syncToMarks = function syncToMarks (marks, inline, vie
 ViewTreeUpdater.prototype.findNodeMatch = function findNodeMatch (node, outerDeco, innerDeco, index) {
   var children = this.top.children, found = -1;
   if (index >= this.preMatch.index) {
-    for (var i = this.index; i < children.length; i++) { if (children[i].matchesNode(node, outerDeco, innerDeco)) {
-      found = i;
-      break
-    } }
+    for (var 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 (var i$1 = this.index, e = Math.min(children.length, i$1 + 1); i$1 < e; i$1++) {
       var child = children[i$1];
@@ -1914,6 +1923,7 @@ ViewTreeUpdater.prototype.addHackNode = function addHackNode (nodeName) {
   } else {
     var dom = document.createElement(nodeName);
     if (nodeName == "IMG") { dom.className = "ProseMirror-separator"; }
+    if (nodeName == "BR") { dom.className = "ProseMirror-trailingBreak"; }
     this.top.children.splice(this.index++, 0, new TrailingHackViewDesc(this.top, nothing, dom, null));
     this.changed = true;
   }
@@ -2940,7 +2950,7 @@ function parseFromClipboard(view, text, html, plainText, $context) {
   var asText = text && (plainText || inCode || !html);
   if (asText) {
     view.someProp("transformPastedText", function (f) { text = f(text, inCode || plainText); });
-    if (inCode) { return new Slice(Fragment.from(view.state.schema.text(text.replace(/\r\n?/g, "\n"))), 0, 0) }
+    if (inCode) { return text ? new Slice(Fragment.from(view.state.schema.text(text.replace(/\r\n?/g, "\n"))), 0, 0) : Slice.empty }
     var parsed = view.someProp("clipboardTextParser", function (f) { return f(text, $context, plainText); });
     if (parsed) {
       slice = parsed;
@@ -2950,8 +2960,9 @@ function parseFromClipboard(view, text, html, plainText, $context) {
       var schema = ref.schema;
       var serializer = DOMSerializer.fromSchema(schema);
       dom = document.createElement("div");
-      text.trim().split(/(?:\r\n?|\n)+/).forEach(function (block) {
-        dom.appendChild(document.createElement("p")).appendChild(serializer.serializeNode(schema.text(block, marks)));
+      text.split(/(?:\r\n?|\n)+/).forEach(function (block) {
+        var p = dom.appendChild(document.createElement("p"));
+        if (block) { p.appendChild(serializer.serializeNode(schema.text(block, marks))); }
       });
     }
   } else {
@@ -2966,10 +2977,19 @@ function parseFromClipboard(view, text, html, plainText, $context) {
     var parser = view.someProp("clipboardParser") || view.someProp("domParser") || DOMParser.fromSchema(view.state.schema);
     slice = parser.parseSlice(dom, {preserveWhitespace: !!(asText || sliceData), context: $context});
   }
-  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); }
+  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), true);
+    if (slice.openStart || slice.openEnd) {
+      var openStart = 0, openEnd = 0;
+      for (var node = slice.content.firstChild; openStart < slice.openStart && !node.type.spec.isolating;
+           openStart++, node = node.firstChild) {}
+      for (var node$1 = slice.content.lastChild; openEnd < slice.openEnd && !node$1.type.spec.isolating;
+           openEnd++, node$1 = node$1.lastChild) {}
+      slice = closeSlice(slice, openStart, openEnd);
+    }
+  }
 
   view.someProp("transformPasted", function (f) { slice = f(slice); });
   return slice
@@ -4110,6 +4130,10 @@ WidgetType.prototype.eq = function eq (other) {
       this.toDOM == other.toDOM && compareObjs(this.spec, other.spec)))
 };
 
+WidgetType.prototype.destroy = function destroy (node) {
+  if (this.spec.destroy) { this.spec.destroy(node); }
+};
+
 var InlineType = function InlineType(attrs, spec) {
   this.spec = spec || noSpec;
   this.attrs = attrs;
@@ -4237,6 +4261,10 @@ Decoration.prototype.map = function map (mapping, offset, oldOffset) {
 //   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
 Decoration.widget = function widget (pos, toDOM, spec) {
   return new Decoration(pos, pos, new WidgetType(toDOM, spec))
 };
@@ -5174,6 +5202,9 @@ function computeDocDeco(view) {
     if (value) { for (var 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]); }
     } }
@@ -5409,7 +5440,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.
 //