prosemirror-view 1.23.12 → 1.23.13

package/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 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

package/dist/index.es.js

@@ -1921,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);
@@ -1944,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;
   }
 };
@@ -3355,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) {
@@ -4948,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
@@ -5525,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