prosemirror-view 1.20.0 → 1.21.0

package/CHANGELOG.md

@@ -1,3 +1,37 @@
+## 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
+
+The library accidentally allowed node decorations on text nodes. It no longer does.
+
+Fix an issue on Chrome and Safari where coordinates for positions between uneditable nodes and the end of a textblock would return zero-height rectangles.
+
+Fix a bug where vertical `endOfTextblock` queries could inappropriately return true when a small line height is used.
+
 ## 1.20.0 (2021-09-03)
 
 ### New features

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 }
@@ -480,7 +480,8 @@ function coordsAtPos(view, pos, side) {
   }
   if (offset < nodeSize(node)) {
     var after$1 = node.childNodes[offset];
-    var target$1 = after$1.nodeType == 3 ? textRange(after$1, 0, (supportEmptyRange ? 0 : 1))
+    while (after$1.pmViewDesc && after$1.pmViewDesc.ignoreForCoords) { after$1 = after$1.nextSibling; }
+    var target$1 = !after$1 ? null : after$1.nodeType == 3 ? textRange(after$1, 0, (supportEmptyRange ? 0 : 1))
         : after$1.nodeType == 1 ? after$1 : null;
     if (target$1) { return flattenV(singleRect(target$1, -1), true) }
   }
@@ -535,7 +536,9 @@ function endOfTextblockVertical(view, state, dir) {
       else { continue }
       for (var i = 0; i < boxes.length; i++) {
         var box = boxes[i];
-        if (box.bottom > box.top && (dir == "up" ? box.bottom < coords.top + 1 : box.top > coords.bottom - 1))
+        if (box.bottom > box.top + 1 &&
+            (dir == "up" ? coords.top - box.top > (box.bottom - coords.top) * 2
+             : box.bottom - coords.bottom > (coords.bottom - box.top) * 2))
           { return false }
       }
     }
@@ -687,7 +690,7 @@ var ViewDesc = function ViewDesc(parent, children, dom, contentDOM) {
   this.dirty = NOT_DIRTY;
 };
 
-var prototypeAccessors = { beforePosition: { configurable: true },size: { configurable: true },border: { configurable: true },posBefore: { configurable: true },posAtStart: { configurable: true },posAfter: { configurable: true },posAtEnd: { configurable: true },contentLost: { configurable: true },domAtom: { configurable: true } };
+var prototypeAccessors = { size: { configurable: true },border: { configurable: true },posBefore: { configurable: true },posAtStart: { configurable: true },posAfter: { configurable: true },posAtEnd: { configurable: true },contentLost: { configurable: true },domAtom: { configurable: true },ignoreForCoords: { configurable: true } };
 
 // Used to check whether a given description corresponds to a
 // widget/mark/node.
@@ -696,8 +699,6 @@ ViewDesc.prototype.matchesMark = function matchesMark () { return false };
 ViewDesc.prototype.matchesNode = function matchesNode () { return false };
 ViewDesc.prototype.matchesHack = function matchesHack (_nodeName) { return false };
 
-prototypeAccessors.beforePosition.get = function () { return false };
-
 // : () → ?ParseRule
 // When parsing in-editor content (in domchange.js), we allow
 // descriptions to determine the parse rules that should be used to
@@ -846,23 +847,34 @@ ViewDesc.prototype.descAt = function descAt (pos) {
 // : (number, number) → {node: dom.Node, offset: number}
 ViewDesc.prototype.domFromPos = function domFromPos (pos, side) {
   if (!this.contentDOM) { return {node: this.dom, offset: 0} }
-  for (var offset = 0, i = 0, first = true;; i++, first = false) {
-    // Skip removed or always-before children
-    while (i < this.children.length && (this.children[i].beforePosition ||
-                                        this.children[i].dom.parentNode != this.contentDOM))
-      { offset += this.children[i++].size; }
-    var child = i == this.children.length ? null : this.children[i];
-    if (offset == pos && (side == 0 || !child || !child.size || child.border || (side < 0 && first)) ||
-        child && child.domAtom && pos < offset + child.size) { return {
-      node: this.contentDOM,
-      offset: child ? domIndex(child.dom) : this.contentDOM.childNodes.length
-    } }
-    if (!child) { throw new Error("Invalid position " + pos) }
-    var end = offset + child.size;
-    if (!child.domAtom && (side < 0 && !child.border ? end >= pos : end > pos) &&
-        (end > pos || i + 1 >= this.children.length || !this.children[i + 1].beforePosition))
-      { return child.domFromPos(pos - offset - child.border, side) }
-    offset = end;
+  // First find the position in the child array
+  var i = 0, offset = 0;
+  for (var curPos = 0; i < this.children.length; i++) {
+    var child = this.children[i], end = curPos + child.size;
+    if (end > pos || child instanceof TrailingHackViewDesc) { offset = pos - curPos; break }
+    curPos = end;
+  }
+  // If this points into the middle of a child, call through
+  if (offset) { return this.children[i].domFromPos(offset - this.children[i].border, side) }
+  // Go back if there were any zero-length widgets with side >= 0 before this point
+  for (var prev = (void 0); i && !(prev = this.children[i - 1]).size && prev instanceof WidgetViewDesc && prev.widget.type.side >= 0; i--) {}
+  // Scan towards the first useable node
+  if (side <= 0) {
+    var prev$1, enter = true;
+    for (;; i--, enter = false) {
+      prev$1 = i ? this.children[i - 1] : null;
+      if (!prev$1 || prev$1.dom.parentNode == this.contentDOM) { break }
+    }
+    if (prev$1 && side && enter && !prev$1.border && !prev$1.domAtom) { return prev$1.domFromPos(prev$1.size, side) }
+    return {node: this.contentDOM, offset: prev$1 ? domIndex(prev$1.dom) + 1 : 0}
+  } else {
+    var next, enter$1 = true;
+    for (;; i++, enter$1 = false) {
+      next = i < this.children.length ? this.children[i] : null;
+      if (!next || next.dom.parentNode == this.contentDOM) { break }
+    }
+    if (next && enter$1 && !next.border && !next.domAtom) { return next.domFromPos(0, side) }
+    return {node: this.contentDOM, offset: next ? domIndex(next.dom) : this.contentDOM.childNodes.length}
   }
 };
 
@@ -1057,6 +1069,8 @@ ViewDesc.prototype.markParentsDirty = function markParentsDirty () {
 
 prototypeAccessors.domAtom.get = function () { return false };
 
+prototypeAccessors.ignoreForCoords.get = function () { return false };
+
 Object.defineProperties( ViewDesc.prototype, prototypeAccessors );
 
 // Reused array to avoid allocating fresh arrays for things that will
@@ -1090,11 +1104,7 @@ var WidgetViewDesc = /*@__PURE__*/(function (ViewDesc) {
   WidgetViewDesc.prototype = Object.create( ViewDesc && ViewDesc.prototype );
   WidgetViewDesc.prototype.constructor = WidgetViewDesc;
 
-  var prototypeAccessors$1 = { beforePosition: { configurable: true },domAtom: { configurable: true } };
-
-  prototypeAccessors$1.beforePosition.get = function () {
-    return this.widget.type.side < 0
-  };
+  var prototypeAccessors$1 = { domAtom: { configurable: true } };
 
   WidgetViewDesc.prototype.matchesWidget = function matchesWidget (widget) {
     return this.dirty == NOT_DIRTY && widget.type.eq(this.widget.type)
@@ -1520,11 +1530,12 @@ var TrailingHackViewDesc = /*@__PURE__*/(function (ViewDesc) {
   TrailingHackViewDesc.prototype = Object.create( ViewDesc && ViewDesc.prototype );
   TrailingHackViewDesc.prototype.constructor = TrailingHackViewDesc;
 
-  var prototypeAccessors$5 = { domAtom: { configurable: true } };
+  var prototypeAccessors$5 = { domAtom: { configurable: true },ignoreForCoords: { configurable: true } };
 
   TrailingHackViewDesc.prototype.parseRule = function parseRule () { return {ignore: true} };
   TrailingHackViewDesc.prototype.matchesHack = function matchesHack (nodeName) { return this.dirty == NOT_DIRTY && this.dom.nodeName == nodeName };
   prototypeAccessors$5.domAtom.get = function () { return true };
+  prototypeAccessors$5.ignoreForCoords.get = function () { return this.dom.nodeName == "IMG" };
 
   Object.defineProperties( TrailingHackViewDesc.prototype, prototypeAccessors$5 );
 
@@ -1903,6 +1914,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;
   }
@@ -2929,7 +2941,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;
@@ -2939,8 +2951,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 {
@@ -2955,10 +2968,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
@@ -4137,7 +4159,8 @@ NodeType.prototype.valid = function valid (node, span) {
   var ref = node.content.findIndex(span.from);
     var index = ref.index;
     var offset = ref.offset;
-  return offset == span.from && offset + node.child(index).nodeSize == span.to
+    var child;
+  return offset == span.from && !(child = node.child(index)).isText && offset + child.nodeSize == span.to
 };
 
 NodeType.prototype.eq = function eq (other) {
@@ -5162,6 +5185,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]); }
     } }