prosemirror-view 1.23.10 → 1.23.13

package/CHANGELOG.md

@@ -1,3 +1,21 @@
+## 1.23.13 (2022-04-26)
+
+### Bug fixes
+
+Work around a hidden cursor issue in Chrome when a textblock ends in an uneditable node wrapped in a mark.
+
+## 1.23.12 (2022-04-08)
+
+### Bug fixes
+
+Fix an issue where enter on Chrome Android could, in textblock nodes rendered with an inner content element, delete the text after the cursor.
+
+## 1.23.11 (2022-03-31)
+
+### Bug fixes
+
+Fix an issue where a node view with a separate content wrapper node could sometimes lose its content on Chrome when backspacing out content due to unexpected DOM element recreation.
+
 ## 1.23.10 (2022-03-22)
 
 ### Bug fixes

package/dist/index.es.js

@@ -1296,8 +1296,23 @@ var NodeViewDesc = /*@__PURE__*/(function (ViewDesc) {
     // whether this is a problem
     var 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 = function () { return this$1.contentDOM ? Fragment.empty : this$1.node.content; }; }
+    if (!this.contentDOM) {
+      rule.getContent = function () { return this$1.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 (var i = this.children.length - 1; i >= 0; i--) {
+        var child = this.children[i];
+        if (this.dom.contains(child.dom.parentNode)) {
+          rule.contentElement = child.dom.parentNode;
+          break
+        }
+      }
+      if (!rule.contentElement) { rule.getContent = function () { return Fragment.empty; }; }
+    }
     return rule
   };
 
@@ -1906,21 +1921,24 @@ ViewTreeUpdater.prototype.placeWidget = function placeWidget (widget, view, pos)
 // Make sure a textblock looks and behaves correctly in
 // contentEditable.
 ViewTreeUpdater.prototype.addTextblockHacks = function addTextblockHacks () {
-  var lastChild = this.top.children[this.index - 1];
-  while (lastChild instanceof MarkViewDesc) { lastChild = lastChild.children[lastChild.children.length - 1]; }
+  var 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 ((result.safari || result.chrome) && lastChild && lastChild.dom.contentEditable == "false")
-      { this.addHackNode("IMG"); }
-    this.addHackNode("BR");
+      { this.addHackNode("IMG", parent); }
+    this.addHackNode("BR", this.top);
   }
 };
 
-ViewTreeUpdater.prototype.addHackNode = function addHackNode (nodeName) {
-  if (this.index < this.top.children.length && this.top.children[this.index].matchesHack(nodeName)) {
+ViewTreeUpdater.prototype.addHackNode = function addHackNode (nodeName, parent) {
+  if (parent == this.top && this.index < parent.children.length && parent.children[this.index].matchesHack(nodeName)) {
     this.index++;
   } else {
     var dom = document.createElement(nodeName);
@@ -1929,7 +1947,9 @@ ViewTreeUpdater.prototype.addHackNode = function addHackNode (nodeName) {
       dom.alt = "";
     }
     if (nodeName == "BR") { dom.className = "ProseMirror-trailingBreak"; }
-    this.top.children.splice(this.index++, 0, new TrailingHackViewDesc(this.top, nothing, dom, null));
+    var 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;
   }
 };
@@ -2710,15 +2730,17 @@ function readDOMChange(view, from, to, typeOver, addedNodes) {
   view.lastKeyCode = null;
 
   var change = findDiff(compare.content, parse.doc.content, parse.from, preferredPos, preferredSide);
+  if ((result.ios && view.lastIOSEnter > Date.now() - 225 || result.android) &&
+      addedNodes.some(function (n) { return n.nodeName == "DIV" || n.nodeName == "P"; }) &&
+      (!change || change.endA >= change.endB) &&
+      view.someProp("handleKeyDown", function (f) { return 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 ((result.ios && view.lastIOSEnter > Date.now() - 225 || result.android) &&
-               addedNodes.some(function (n) { return n.nodeName == "DIV" || n.nodeName == "P"; }) &&
-               view.someProp("handleKeyDown", function (f) { return f(view, keyEvent(13, "Enter")); })) {
-      view.lastIOSEnter = 0;
-      return
     } else {
       if (parse.sel) {
         var sel$1 = resolveSelection(view, view.state.doc, parse.sel);
@@ -3338,7 +3360,7 @@ DOMObserver.prototype.flush = function flush () {
   }
 
   var sel = this.view.root.getSelection();
-  var newSel = !this.suppressingSelectionUpdates && !this.currentSelection.eq(sel) && hasSelection(this.view) && !this.ignoreSelectionChange(sel);
+  var newSel = !this.suppressingSelectionUpdates && !this.currentSelection.eq(sel) && hasFocusAndSelection(this.view) && !this.ignoreSelectionChange(sel);
 
   var from = -1, to = -1, typeOver = false, added = [];
   if (this.view.editable) {
@@ -4931,7 +4953,7 @@ var prototypeAccessors$2 = { props: { configurable: true },root: { configurable:
 
 // 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
@@ -5508,7 +5530,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