prosemirror-view 1.42.6 → 1.42.7

package/CHANGELOG.md

@@ -1,3 +1,19 @@
+## 1.42.7 (2026-10-22)
+
+### Bug fixes
+
+Fix an issue where some kinds of changes inside inline nodes with content were inappropriately treated as backspace events.
+
+Fix some selection issues in a shadow root on Safari by working around the relevant browser bugs.
+
+Improve cursor motion across non-text in blocks that don't have the same text direction as the editor as a whole.
+
+Fix an issue where decoration sets with lots of node decorations inside a single parent would require quadratic time to update.
+
+Fix a regression in `posAtDOM` (and DOM selection reading) when the position is outside the nearest node's content DOM, but not directly in its outer element.
+
+Avoid a selection read in DOM flushing when the editor doesn't have focus.
+
 ## 1.42.6 (2026-09-25)
 
 ### Bug fixes

package/dist/index.cjs

@@ -754,6 +754,7 @@ var ViewDesc = function () {
   }, {
     key: "localPosFromDOM",
     value: function localPosFromDOM(dom, offset, bias) {
+      var _this = this;
       if (this.contentDOM && contains(this.contentDOM, dom)) {
         if (bias < 0) {
           var domBefore, desc;
@@ -781,7 +782,14 @@ var ViewDesc = function () {
       if (dom == this.dom && this.contentDOM) {
         atEnd = offset > domIndex(this.contentDOM);
       } else if (this.contentDOM && this.contentDOM != this.dom && this.dom.contains(this.contentDOM)) {
-        atEnd = !!(dom.compareDocumentPosition(this.contentDOM) & 4);
+        var rel = dom.compareDocumentPosition(this.contentDOM);
+        if (rel & 16) {
+          atEnd = offset > Array.from(dom.childNodes).findIndex(function (n) {
+            return n.contains(_this.contentDOM);
+          });
+        } else {
+          atEnd = !(rel & 4);
+        }
       } else if (this.dom.firstChild) {
         if (offset == 0) for (var search = dom;; search = search.parentNode) {
           if (search == this.dom) {
@@ -1102,7 +1110,7 @@ var WidgetViewDesc = function (_ViewDesc) {
   _inherits(WidgetViewDesc, _ViewDesc);
   var _super = _createSuper(WidgetViewDesc);
   function WidgetViewDesc(parent, widget, view, pos) {
-    var _this;
+    var _this2;
     _classCallCheck(this, WidgetViewDesc);
     var self,
       dom = widget.type.toDOM;
@@ -1116,11 +1124,11 @@ var WidgetViewDesc = function (_ViewDesc) {
       if (!elt.hasAttribute("contenteditable")) elt.contentEditable = "false";
       elt.classList.add("ProseMirror-widget");
     }
-    _this = _super.call(this, parent, [], dom, null);
-    _this.widget = widget;
-    _this.widget = widget;
-    self = _assertThisInitialized(_this);
-    return _this;
+    _this2 = _super.call(this, parent, [], dom, null);
+    _this2.widget = widget;
+    _this2.widget = widget;
+    self = _assertThisInitialized(_this2);
+    return _this2;
   }
   _createClass(WidgetViewDesc, [{
     key: "matchesWidget",
@@ -1173,12 +1181,12 @@ var CompositionViewDesc = function (_ViewDesc2) {
   _inherits(CompositionViewDesc, _ViewDesc2);
   var _super2 = _createSuper(CompositionViewDesc);
   function CompositionViewDesc(parent, dom, textDOM, text) {
-    var _this2;
+    var _this3;
     _classCallCheck(this, CompositionViewDesc);
-    _this2 = _super2.call(this, parent, [], dom, null);
-    _this2.textDOM = textDOM;
-    _this2.text = text;
-    return _this2;
+    _this3 = _super2.call(this, parent, [], dom, null);
+    _this3.textDOM = textDOM;
+    _this3.text = text;
+    return _this3;
   }
   _createClass(CompositionViewDesc, [{
     key: "size",
@@ -1211,12 +1219,12 @@ var MarkViewDesc = function (_ViewDesc3) {
   _inherits(MarkViewDesc, _ViewDesc3);
   var _super3 = _createSuper(MarkViewDesc);
   function MarkViewDesc(parent, mark, dom, contentDOM, spec) {
-    var _this3;
+    var _this4;
     _classCallCheck(this, MarkViewDesc);
-    _this3 = _super3.call(this, parent, [], dom, contentDOM);
-    _this3.mark = mark;
-    _this3.spec = spec;
-    return _this3;
+    _this4 = _super3.call(this, parent, [], dom, contentDOM);
+    _this4.mark = mark;
+    _this4.spec = spec;
+    return _this4;
   }
   _createClass(MarkViewDesc, [{
     key: "parseRule",
@@ -1282,19 +1290,19 @@ var NodeViewDesc = function (_ViewDesc4) {
   _inherits(NodeViewDesc, _ViewDesc4);
   var _super4 = _createSuper(NodeViewDesc);
   function NodeViewDesc(parent, node, outerDeco, innerDeco, dom, contentDOM, nodeDOM) {
-    var _this4;
+    var _this5;
     _classCallCheck(this, NodeViewDesc);
-    _this4 = _super4.call(this, parent, [], dom, contentDOM);
-    _this4.node = node;
-    _this4.outerDeco = outerDeco;
-    _this4.innerDeco = innerDeco;
-    _this4.nodeDOM = nodeDOM;
-    return _this4;
+    _this5 = _super4.call(this, parent, [], dom, contentDOM);
+    _this5.node = node;
+    _this5.outerDeco = outerDeco;
+    _this5.innerDeco = innerDeco;
+    _this5.nodeDOM = nodeDOM;
+    return _this5;
   }
   _createClass(NodeViewDesc, [{
     key: "parseRule",
     value: function parseRule(addedNodes) {
-      var _this5 = this;
+      var _this6 = this;
       if (this.node.type.spec.reparseInView) return null;
       var rule = {
         node: this.node.type.name,
@@ -1303,7 +1311,7 @@ var NodeViewDesc = function (_ViewDesc4) {
       if (this.node.type.whitespace == "pre") rule.preserveWhitespace = "full";
       if (!this.contentDOM) {
         rule.getContent = function () {
-          return _this5.node.content;
+          return _this6.node.content;
         };
       } else if (!this.contentLost) {
         rule.contentElement = this.contentDOM;
@@ -1317,7 +1325,7 @@ var NodeViewDesc = function (_ViewDesc4) {
         }
         if (!rule.contentElement) {
           var found = addedNodes && addedNodes.find(function (n) {
-            return isElt(n) && addedNodes.indexOf(n.parentNode) < 0 && _this5.dom.contains(n);
+            return isElt(n) && addedNodes.indexOf(n.parentNode) < 0 && _this6.dom.contains(n);
           });
           if (found) rule.contentElement = found;else rule.getContent = function () {
             return prosemirrorModel.Fragment.empty;
@@ -1344,7 +1352,7 @@ var NodeViewDesc = function (_ViewDesc4) {
   }, {
     key: "updateChildren",
     value: function updateChildren(view, pos) {
-      var _this6 = this;
+      var _this7 = this;
       var inline = this.node.inlineContent,
         off = pos;
       var composition = view.composing ? this.localCompositionInfo(view, pos) : null;
@@ -1354,7 +1362,7 @@ var NodeViewDesc = function (_ViewDesc4) {
       var addBuffers = this.node.inlineContent,
         atBufferPos = addBuffers && this.node.isBlock;
       iterDeco(this.node, this.innerDeco, function (widget, i, insideNode) {
-        if (widget.spec.marks) updater.syncToMarks(widget.spec.marks, inline, view, i);else if (widget.type.side >= 0 && !insideNode) updater.syncToMarks(i == _this6.node.childCount ? prosemirrorModel.Mark.none : _this6.node.child(i).marks, inline, view, i);
+        if (widget.spec.marks) updater.syncToMarks(widget.spec.marks, inline, view, i);else if (widget.type.side >= 0 && !insideNode) updater.syncToMarks(i == _this7.node.childCount ? prosemirrorModel.Mark.none : _this7.node.child(i).marks, inline, view, i);
         updater.placeWidget(widget, view, off);
       }, function (child, outerDeco, innerDeco, i) {
         updater.syncToMarks(child.marks, inline, view, i);
@@ -1620,11 +1628,11 @@ var CustomNodeViewDesc = function (_NodeViewDesc2) {
   _inherits(CustomNodeViewDesc, _NodeViewDesc2);
   var _super7 = _createSuper(CustomNodeViewDesc);
   function CustomNodeViewDesc(parent, node, outerDeco, innerDeco, dom, contentDOM, nodeDOM, spec) {
-    var _this7;
+    var _this8;
     _classCallCheck(this, CustomNodeViewDesc);
-    _this7 = _super7.call(this, parent, node, outerDeco, innerDeco, dom, contentDOM, nodeDOM);
-    _this7.spec = spec;
-    return _this7;
+    _this8 = _super7.call(this, parent, node, outerDeco, innerDeco, dom, contentDOM, nodeDOM);
+    _this8.spec = spec;
+    return _this8;
   }
   _createClass(CustomNodeViewDesc, [{
     key: "update",
@@ -2391,7 +2399,7 @@ function selectHorizontally(view, dir, mods) {
       var next = moveSelectionBlock(view.state, dir);
       if (next && next instanceof prosemirrorState.NodeSelection) return apply(view, next);
       return false;
-    } else if (!(mac && mods.indexOf("m") > -1)) {
+    } else if (!mac || mods.indexOf("m") < 0) {
       var _$head = sel.$head,
         _node = _$head.textOffset ? null : dir < 0 ? _$head.nodeBefore : _$head.nodeAfter,
         desc;
@@ -2542,15 +2550,13 @@ function setSelFocus(view, node, offset) {
       offset = before.nodeValue.length;
     }
   }
-  var sel = view.domSelection();
+  var sel = view.domSelection(),
+    range = view.domSelectionRange();
   if (!sel) return;
-  if (selectionCollapsed(sel)) {
-    var range = document.createRange();
-    range.setEnd(node, offset);
-    range.setStart(node, offset);
-    sel.removeAllRanges();
-    sel.addRange(range);
+  if (selectionCollapsed(range)) {
+    sel.collapse(node, offset);
   } else if (sel.extend) {
+    sel.collapse(range.anchorNode, range.anchorOffset);
     sel.extend(node, offset);
   }
   view.domObserver.setCurSelection();
@@ -2574,7 +2580,12 @@ function findDirection(view, pos) {
       if (_mid > coords.top && _mid < coords.bottom && Math.abs(after.left - coords.left) > 1) return after.left > coords.left ? "ltr" : "rtl";
     }
   }
-  var computed = getComputedStyle(view.dom).direction;
+  var block = view.dom;
+  for (var d = $pos.depth; d > 0; d--) if ($pos.node(d).isBlock) {
+    block = view.nodeDOM($pos.before(d)) || block;
+    break;
+  }
+  var computed = getComputedStyle(block).direction;
   return computed == "rtl" ? "rtl" : "ltr";
 }
 function selectVertically(view, dir, mods) {
@@ -3245,16 +3256,16 @@ var LeftMouseDown = function (_MouseDown) {
   _inherits(LeftMouseDown, _MouseDown);
   var _super8 = _createSuper(LeftMouseDown);
   function LeftMouseDown(view, pos, event, flushed) {
-    var _this8;
+    var _this9;
     _classCallCheck(this, LeftMouseDown);
-    _this8 = _super8.call(this, view);
-    _this8.pos = pos;
-    _this8.event = event;
-    _this8.flushed = flushed;
-    _this8.delayedSelectionSync = false;
-    _this8.startDoc = view.state.doc;
-    _this8.selectNode = !!event[selectNodeModifier];
-    _this8.allowDefault = event.shiftKey;
+    _this9 = _super8.call(this, view);
+    _this9.pos = pos;
+    _this9.event = event;
+    _this9.flushed = flushed;
+    _this9.delayedSelectionSync = false;
+    _this9.startDoc = view.state.doc;
+    _this9.selectNode = !!event[selectNodeModifier];
+    _this9.allowDefault = event.shiftKey;
     var targetNode, targetPos;
     if (pos.inside > -1) {
       targetNode = view.state.doc.nodeAt(pos.inside);
@@ -3266,29 +3277,29 @@ var LeftMouseDown = function (_MouseDown) {
     }
     var target = flushed ? null : event.target;
     var targetDesc = target ? view.docView.nearestDesc(target, true) : null;
-    _this8.target = targetDesc && isElt(targetDesc.nodeDOM) ? targetDesc.nodeDOM : null;
+    _this9.target = targetDesc && isElt(targetDesc.nodeDOM) ? targetDesc.nodeDOM : null;
     var selection = view.state.selection;
-    if (event.button == 0 && (targetNode.type.spec.draggable && targetNode.type.spec.selectable !== false || selection instanceof prosemirrorState.NodeSelection && selection.from <= targetPos && selection.to > targetPos)) _this8.mightDrag = {
+    if (event.button == 0 && (targetNode.type.spec.draggable && targetNode.type.spec.selectable !== false || selection instanceof prosemirrorState.NodeSelection && selection.from <= targetPos && selection.to > targetPos)) _this9.mightDrag = {
       node: targetNode,
       pos: targetPos,
-      addAttr: !!(_this8.target && !_this8.target.draggable),
-      setUneditable: !!(_this8.target && gecko && !_this8.target.hasAttribute("contentEditable"))
+      addAttr: !!(_this9.target && !_this9.target.draggable),
+      setUneditable: !!(_this9.target && gecko && !_this9.target.hasAttribute("contentEditable"))
     };
-    if (_this8.target && _this8.mightDrag && (_this8.mightDrag.addAttr || _this8.mightDrag.setUneditable)) {
-      _this8.view.domObserver.stop();
-      if (_this8.mightDrag.addAttr) _this8.target.draggable = true;
-      if (_this8.mightDrag.setUneditable) setTimeout(function () {
-        if (_this8.view.input.mouseDown == _assertThisInitialized(_this8)) _this8.target.setAttribute("contentEditable", "false");
+    if (_this9.target && _this9.mightDrag && (_this9.mightDrag.addAttr || _this9.mightDrag.setUneditable)) {
+      _this9.view.domObserver.stop();
+      if (_this9.mightDrag.addAttr) _this9.target.draggable = true;
+      if (_this9.mightDrag.setUneditable) setTimeout(function () {
+        if (_this9.view.input.mouseDown == _assertThisInitialized(_this9)) _this9.target.setAttribute("contentEditable", "false");
       }, 20);
-      _this8.view.domObserver.start();
+      _this9.view.domObserver.start();
     }
     setSelectionOrigin(view, "pointer");
-    return _this8;
+    return _this9;
   }
   _createClass(LeftMouseDown, [{
     key: "done",
     value: function done() {
-      var _this9 = this;
+      var _this10 = this;
       _get(_getPrototypeOf(LeftMouseDown.prototype), "done", this).call(this);
       if (this.mightDrag && this.target) {
         this.view.domObserver.stop();
@@ -3297,7 +3308,7 @@ var LeftMouseDown = function (_MouseDown) {
         this.view.domObserver.start();
       }
       if (this.delayedSelectionSync) setTimeout(function () {
-        if (!_this9.view.isDestroyed) selectionToDOM(_this9.view);
+        if (!_this10.view.isDestroyed) selectionToDOM(_this10.view);
       });
     }
   }, {
@@ -3345,12 +3356,12 @@ var TripleClickDrag = function (_MouseDown2) {
   _inherits(TripleClickDrag, _MouseDown2);
   var _super9 = _createSuper(TripleClickDrag);
   function TripleClickDrag(view, startSelection) {
-    var _this10;
+    var _this11;
     _classCallCheck(this, TripleClickDrag);
-    _this10 = _super9.call(this, view);
-    _this10.startSelection = startSelection;
-    _this10.startDoc = view.state.doc;
-    return _this10;
+    _this11 = _super9.call(this, view);
+    _this11.startSelection = startSelection;
+    _this11.startDoc = view.state.doc;
+    return _this11;
   }
   _createClass(TripleClickDrag, [{
     key: "move",
@@ -3720,6 +3731,27 @@ function compareObjs(a, b) {
   for (var _p in b) if (!(_p in a)) return false;
   return true;
 }
+var FragmentCursor = function () {
+  function FragmentCursor(frag) {
+    _classCallCheck(this, FragmentCursor);
+    this.frag = frag;
+    this.index = 0;
+    this.off = 0;
+  }
+  _createClass(FragmentCursor, [{
+    key: "nodeAt",
+    value: function nodeAt(off) {
+      while (this.off <= off && this.index < this.frag.childCount) {
+        var next = this.frag.child(this.index);
+        if (this.off == off) return next;
+        this.off += next.nodeSize;
+        this.index++;
+      }
+      return null;
+    }
+  }]);
+  return FragmentCursor;
+}();
 var WidgetType = function () {
   function WidgetType(toDOM, spec) {
     _classCallCheck(this, WidgetType);
@@ -3804,12 +3836,9 @@ var NodeType = function () {
     }
   }, {
     key: "valid",
-    value: function valid(node, span) {
-      var _node$content$findInd = node.content.findIndex(span.from),
-        index = _node$content$findInd.index,
-        offset = _node$content$findInd.offset,
-        child;
-      return offset == span.from && !(child = node.child(index)).isText && offset + child.nodeSize == span.to;
+    value: function valid(node, span, cursor) {
+      var found = cursor.nodeAt(span.from);
+      return !!found && !found.isText && span.from + found.nodeSize == span.to;
     }
   }, {
     key: "eq",
@@ -3917,9 +3946,12 @@ var DecorationSet = function () {
     key: "mapInner",
     value: function mapInner(mapping, node, offset, oldOffset, options) {
       var newLocal;
-      for (var i = 0; i < this.local.length; i++) {
-        var mapped = this.local[i].map(mapping, offset, oldOffset);
-        if (mapped && mapped.type.valid(node, mapped)) (newLocal || (newLocal = [])).push(mapped);else if (options.onRemove) options.onRemove(this.local[i].spec);
+      if (this.local.length) {
+        var cur = new FragmentCursor(node.content);
+        for (var i = 0; i < this.local.length; i++) {
+          var mapped = this.local[i].map(mapping, offset, oldOffset);
+          if (mapped && mapped.type.valid(node, mapped, cur)) (newLocal || (newLocal = [])).push(mapped);else if (options.onRemove) options.onRemove(this.local[i].spec);
+        }
       }
       if (this.children.length) return mapChildren(this.children, newLocal || [], mapping, node, offset, oldOffset, options);else return newLocal ? new DecorationSet(newLocal.sort(byPos), none) : empty;
     }
@@ -3933,20 +3965,23 @@ var DecorationSet = function () {
   }, {
     key: "addInner",
     value: function addInner(doc, decorations, offset) {
-      var _this11 = this;
+      var _this12 = this;
       var children,
         childIndex = 0;
       doc.forEach(function (childNode, childOffset) {
         var baseOffset = childOffset + offset,
           found;
         if (!(found = takeSpansForNode(decorations, childNode, baseOffset))) return;
-        if (!children) children = _this11.children.slice();
+        if (!children) children = _this12.children.slice();
         while (childIndex < children.length && children[childIndex] < childOffset) childIndex += 3;
         if (children[childIndex] == childOffset) children[childIndex + 2] = children[childIndex + 2].addInner(childNode, found, baseOffset + 1);else children.splice(childIndex, 0, childOffset, childOffset + childNode.nodeSize, buildTree(found, childNode, baseOffset + 1, noSpec));
         childIndex += 3;
       });
       var local = moveSpans(childIndex ? withoutNulls(decorations) : decorations, -offset);
-      for (var i = 0; i < local.length; i++) if (!local[i].type.valid(doc, local[i])) local.splice(i--, 1);
+      if (local.length) {
+        var cur = new FragmentCursor(doc.content);
+        for (var i = 0; i < local.length; i++) if (!local[i].type.valid(doc, local[i], cur)) local.splice(i--, 1);
+      }
       return new DecorationSet(local.length ? this.local.concat(local).sort(byPos) : this.local, children || this.children);
     }
   }, {
@@ -4172,9 +4207,9 @@ function mapChildren(oldChildren, newLocal, mapping, node, offset, oldOffset, op
     }
     var to = mapping.map(oldChildren[_i11 + 1] + oldOffset, -1),
       toLocal = to - offset;
-    var _node$content$findInd2 = node.content.findIndex(fromLocal),
-      index = _node$content$findInd2.index,
-      childOffset = _node$content$findInd2.offset;
+    var _node$content$findInd = node.content.findIndex(fromLocal),
+      index = _node$content$findInd.index,
+      childOffset = _node$content$findInd.offset;
     var childNode = node.maybeChild(index);
     if (childNode && childOffset == fromLocal && childOffset + childNode.nodeSize == toLocal) {
       var mapped = children[_i11 + 2].mapInner(mapping, childNode, from + 1, oldChildren[_i11] + oldOffset + 1, options);
@@ -4255,9 +4290,12 @@ function buildTree(spans, node, offset, options) {
     }
   });
   var locals = moveSpans(hasNulls ? withoutNulls(spans) : spans, -offset).sort(byPos);
-  for (var i = 0; i < locals.length; i++) if (!locals[i].type.valid(node, locals[i])) {
-    if (options.onRemove) options.onRemove(locals[i].spec);
-    locals.splice(i--, 1);
+  if (locals.length) {
+    var cur = new FragmentCursor(node.content);
+    for (var i = 0; i < locals.length; i++) if (!locals[i].type.valid(node, locals[i], cur)) {
+      if (options.onRemove) options.onRemove(locals[i].spec);
+      locals.splice(i--, 1);
+    }
   }
   return locals.length || children.length ? new DecorationSet(locals, children) : empty;
 }
@@ -4342,7 +4380,7 @@ var SelectionState = function () {
 }();
 var DOMObserver = function () {
   function DOMObserver(view, handleDOMChange) {
-    var _this12 = this;
+    var _this13 = this;
     _classCallCheck(this, DOMObserver);
     this.view = view;
     this.handleDOMChange = handleDOMChange;
@@ -4354,28 +4392,28 @@ var DOMObserver = function () {
     this.suppressingSelectionUpdates = false;
     this.lastChangedTextNode = null;
     this.observer = window.MutationObserver && new window.MutationObserver(function (mutations) {
-      for (var i = 0; i < mutations.length; i++) _this12.queue.push(mutations[i]);
+      for (var i = 0; i < mutations.length; i++) _this13.queue.push(mutations[i]);
       if (ie && ie_version <= 11 && mutations.some(function (m) {
         return m.type == "childList" && m.removedNodes.length || m.type == "characterData" && m.oldValue.length > m.target.nodeValue.length;
       })) {
-        _this12.flushSoon();
+        _this13.flushSoon();
       } else if (safari && view.composing && mutations.some(function (m) {
         return m.type == "childList" && m.target.nodeName == "TR";
       })) {
         view.input.badSafariComposition = true;
-        _this12.flushSoon();
+        _this13.flushSoon();
       } else {
-        _this12.flush();
+        _this13.flush();
       }
     });
     if (useCharData) {
       this.onCharData = function (e) {
-        _this12.queue.push({
+        _this13.queue.push({
           target: e.target,
           type: "characterData",
           oldValue: e.prevValue
         });
-        _this12.flushSoon();
+        _this13.flushSoon();
       };
     }
     this.onSelectionChange = this.onSelectionChange.bind(this);
@@ -4383,10 +4421,10 @@ var DOMObserver = function () {
   _createClass(DOMObserver, [{
     key: "flushSoon",
     value: function flushSoon() {
-      var _this13 = this;
+      var _this14 = this;
       if (this.flushingSoon < 0) this.flushingSoon = window.setTimeout(function () {
-        _this13.flushingSoon = -1;
-        _this13.flush();
+        _this14.flushingSoon = -1;
+        _this14.flush();
       }, 20);
     }
   }, {
@@ -4411,13 +4449,13 @@ var DOMObserver = function () {
   }, {
     key: "stop",
     value: function stop() {
-      var _this14 = this;
+      var _this15 = this;
       if (this.observer) {
         var take = this.observer.takeRecords();
         if (take.length) {
           for (var i = 0; i < take.length; i++) this.queue.push(take[i]);
           window.setTimeout(function () {
-            return _this14.flush();
+            return _this15.flush();
           }, 20);
         }
         this.observer.disconnect();
@@ -4438,10 +4476,10 @@ var DOMObserver = function () {
   }, {
     key: "suppressSelectionUpdates",
     value: function suppressSelectionUpdates() {
-      var _this15 = this;
+      var _this16 = this;
       this.suppressingSelectionUpdates = true;
       setTimeout(function () {
-        return _this15.suppressingSelectionUpdates = false;
+        return _this16.suppressingSelectionUpdates = false;
       }, 50);
     }
   }, {
@@ -4506,8 +4544,12 @@ var DOMObserver = function () {
       if (!view.docView || this.flushingSoon > -1) return;
       var mutations = this.pendingRecords();
       if (mutations.length) this.queue = [];
-      var sel = view.domSelectionRange();
-      var newSel = !this.suppressingSelectionUpdates && !this.currentSelection.eq(sel) && hasFocusAndSelection(view) && !this.ignoreSelectionChange(sel);
+      var selRange,
+        newSel = false;
+      if (!this.suppressingSelectionUpdates && hasFocusAndSelection(view)) {
+        selRange = view.domSelectionRange();
+        newSel = !this.currentSelection.eq(selRange) && !this.ignoreSelectionChange(selRange);
+      }
       var from = -1,
         to = -1,
         typeOver = false,
@@ -4575,10 +4617,10 @@ var DOMObserver = function () {
         }
       }
       var readSel = null;
-      if (from < 0 && newSel && view.input.lastFocus > Date.now() - 200 && Math.max(view.input.lastTouch, view.input.lastClick.time) < Date.now() - 300 && selectionCollapsed(sel) && (readSel = selectionFromDOM(view)) && readSel.eq(prosemirrorState.Selection.near(view.state.doc.resolve(0), 1))) {
+      if (from < 0 && newSel && view.input.lastFocus > Date.now() - 200 && Math.max(view.input.lastTouch, view.input.lastClick.time) < Date.now() - 300 && selectionCollapsed(selRange) && (readSel = selectionFromDOM(view)) && readSel.eq(prosemirrorState.Selection.near(view.state.doc.resolve(0), 1))) {
         view.input.lastFocus = 0;
         selectionToDOM(view);
-        this.currentSelection.set(sel);
+        this.currentSelection.set(selRange);
         view.scrollToSelection();
       } else if (from > -1 || newSel) {
         if (from > -1) {
@@ -4590,8 +4632,8 @@ var DOMObserver = function () {
           fixUpBadSafariComposition(view, added);
         }
         this.handleDOMChange(from, to, typeOver, added);
-        if (view.docView && view.docView.dirty) view.updateState(view.state);else if (!this.currentSelection.eq(sel)) selectionToDOM(view);
-        this.currentSelection.set(sel);
+        if (view.docView && view.docView.dirty) view.updateState(view.state);else if (selRange && !this.currentSelection.eq(selRange)) selectionToDOM(view);
+        if (selRange) this.currentSelection.set(selRange);
       }
     }
   }, {
@@ -4911,7 +4953,7 @@ function readDOMChange(view, from, to, typeOver, addedNodes) {
     view.input.lastIOSEnter = 0;
     return;
   }
-  if (view.state.selection.anchor > change.start && looksLikeBackspace(doc, change.start, change.endA, $from, $to) && view.someProp("handleKeyDown", function (f) {
+  if (view.state.selection.anchor > change.start && (inlineChange ? change.endA > change.start && change.endB == change.start : looksLikeBlockJoin(doc, change.start, change.endA, $from, $to)) && view.someProp("handleKeyDown", function (f) {
     return f(view, keyEvent(8, "Backspace"));
   })) {
     if (android && chrome) view.domObserver.suppressSelectionUpdates();
@@ -5006,10 +5048,10 @@ function isMarkChange(cur, prev) {
     type: type
   };
 }
-function looksLikeBackspace(old, start, end, $newStart, $newEnd) {
+function looksLikeBlockJoin(old, start, end, $newStart, $newEnd) {
   if (end - start <= $newEnd.pos - $newStart.pos || skipClosingAndOpening($newStart, true, false) < $newEnd.pos) return false;
   var $start = old.resolve(start);
-  if (!$newStart.parent.isTextblock) {
+  if (!$newStart.parent.inlineContent) {
     var after = $start.nodeAfter;
     return after != null && end == start + after.nodeSize;
   }
@@ -5076,7 +5118,7 @@ var __parseFromClipboard = parseFromClipboard;
 var __endComposition = endComposition;
 var EditorView = function () {
   function EditorView(place, props) {
-    var _this16 = this;
+    var _this17 = this;
     _classCallCheck(this, EditorView);
     this._root = null;
     this.focused = false;
@@ -5104,7 +5146,7 @@ var EditorView = function () {
     this.nodeViews = buildNodeViews(this);
     this.docView = docViewDesc(this.state.doc, computeDocDeco(this), viewDecorations(this), this.dom, this);
     this.domObserver = new DOMObserver(this, function (from, to, typeOver, added) {
-      return readDOMChange(_this16, from, to, typeOver, added);
+      return readDOMChange(_this17, from, to, typeOver, added);
     });
     this.domObserver.start();
     initInput(this);
@@ -5218,10 +5260,10 @@ var EditorView = function () {
   }, {
     key: "scrollToSelection",
     value: function scrollToSelection() {
-      var _this17 = this;
+      var _this18 = this;
       var startDOM = this.domSelectionRange().focusNode;
       if (!startDOM || !contains(this.dom, startDOM)) ;else if (this.someProp("handleScrollToSelection", function (f) {
-        return f(_this17);
+        return f(_this18);
       })) ;else if (this.state.selection instanceof prosemirrorState.NodeSelection) {
         var target = this.docView.domAfterPos(this.state.selection.from);
         if (isElt(target)) scrollRectIntoView(this, target.getBoundingClientRect(), startDOM);
@@ -5312,7 +5354,7 @@ var EditorView = function () {
   }, {
     key: "root",
     get: function get() {
-      var _this18 = this;
+      var _this19 = this;
       var cached = this._root;
       if (cached == null) {
         var _loop5 = function _loop5(search) {
@@ -5321,7 +5363,7 @@ var EditorView = function () {
                 return search.ownerDocument.getSelection();
               };
               return {
-                v: _this18._root = search
+                v: _this19._root = search
               };
             }
           },

package/dist/index.js

@@ -850,7 +850,13 @@ class ViewDesc {
             atEnd = offset > domIndex(this.contentDOM);
         }
         else if (this.contentDOM && this.contentDOM != this.dom && this.dom.contains(this.contentDOM)) {
-            atEnd = !!(dom.compareDocumentPosition(this.contentDOM) & 4);
+            let rel = dom.compareDocumentPosition(this.contentDOM);
+            if (rel & 16) { // this.contentDOM is inside dom
+                atEnd = offset > Array.from(dom.childNodes).findIndex(n => n.contains(this.contentDOM));
+            }
+            else { // Check if after or before
+                atEnd = !(rel & 4);
+            }
         }
         else if (this.dom.firstChild) {
             if (offset == 0)
@@ -2483,7 +2489,7 @@ function selectHorizontally(view, dir, mods) {
                 return apply(view, next);
             return false;
         }
-        else if (!(mac && mods.indexOf("m") > -1)) {
+        else if (!mac || mods.indexOf("m") < 0) {
             let $head = sel.$head, node = $head.textOffset ? null : dir < 0 ? $head.nodeBefore : $head.nodeAfter, desc;
             if (!node || node.isText)
                 return false;
@@ -2672,17 +2678,14 @@ function setSelFocus(view, node, offset) {
             offset = before.nodeValue.length;
         }
     }
-    let sel = view.domSelection();
+    let sel = view.domSelection(), range = view.domSelectionRange();
     if (!sel)
         return;
-    if (selectionCollapsed(sel)) {
-        let range = document.createRange();
-        range.setEnd(node, offset);
-        range.setStart(node, offset);
-        sel.removeAllRanges();
-        sel.addRange(range);
+    if (selectionCollapsed(range)) {
+        sel.collapse(node, offset);
     }
     else if (sel.extend) {
+        sel.collapse(range.anchorNode, range.anchorOffset);
         sel.extend(node, offset);
     }
     view.domObserver.setCurSelection();
@@ -2710,7 +2713,13 @@ function findDirection(view, pos) {
                 return after.left > coords.left ? "ltr" : "rtl";
         }
     }
-    let computed = getComputedStyle(view.dom).direction;
+    let block = view.dom;
+    for (let d = $pos.depth; d > 0; d--)
+        if ($pos.node(d).isBlock) {
+            block = view.nodeDOM($pos.before(d)) || block;
+            break;
+        }
+    let computed = getComputedStyle(block).direction;
     return computed == "rtl" ? "rtl" : "ltr";
 }
 // Check whether vertical selection motion would involve node
@@ -3983,6 +3992,23 @@ function compareObjs(a, b) {
             return false;
     return true;
 }
+class FragmentCursor {
+    constructor(frag) {
+        this.frag = frag;
+        this.index = 0;
+        this.off = 0;
+    }
+    nodeAt(off) {
+        while (this.off <= off && this.index < this.frag.childCount) {
+            let next = this.frag.child(this.index);
+            if (this.off == off)
+                return next;
+            this.off += next.nodeSize;
+            this.index++;
+        }
+        return null;
+    }
+}
 class WidgetType {
     constructor(toDOM, spec) {
         this.toDOM = toDOM;
@@ -4038,9 +4064,9 @@ class NodeType {
             return null;
         return new Decoration(from.pos - offset, to.pos - offset, this);
     }
-    valid(node, span) {
-        let { index, offset } = node.content.findIndex(span.from), child;
-        return offset == span.from && !(child = node.child(index)).isText && offset + child.nodeSize == span.to;
+    valid(node, span, cursor) {
+        let found = cursor.nodeAt(span.from);
+        return !!found && !found.isText && span.from + found.nodeSize == span.to;
     }
     eq(other) {
         return this == other ||
@@ -4197,12 +4223,15 @@ class DecorationSet {
     */
     mapInner(mapping, node, offset, oldOffset, options) {
         let newLocal;
-        for (let i = 0; i < this.local.length; i++) {
-            let mapped = this.local[i].map(mapping, offset, oldOffset);
-            if (mapped && mapped.type.valid(node, mapped))
-                (newLocal || (newLocal = [])).push(mapped);
-            else if (options.onRemove)
-                options.onRemove(this.local[i].spec);
+        if (this.local.length) {
+            let cur = new FragmentCursor(node.content);
+            for (let i = 0; i < this.local.length; i++) {
+                let mapped = this.local[i].map(mapping, offset, oldOffset);
+                if (mapped && mapped.type.valid(node, mapped, cur))
+                    (newLocal || (newLocal = [])).push(mapped);
+                else if (options.onRemove)
+                    options.onRemove(this.local[i].spec);
+            }
         }
         if (this.children.length)
             return mapChildren(this.children, newLocal || [], mapping, node, offset, oldOffset, options);
@@ -4239,9 +4268,12 @@ class DecorationSet {
             childIndex += 3;
         });
         let local = moveSpans(childIndex ? withoutNulls(decorations) : decorations, -offset);
-        for (let i = 0; i < local.length; i++)
-            if (!local[i].type.valid(doc, local[i]))
-                local.splice(i--, 1);
+        if (local.length) {
+            let cur = new FragmentCursor(doc.content);
+            for (let i = 0; i < local.length; i++)
+                if (!local[i].type.valid(doc, local[i], cur))
+                    local.splice(i--, 1);
+        }
         return new DecorationSet(local.length ? this.local.concat(local).sort(byPos) : this.local, children || this.children);
     }
     /**
@@ -4584,12 +4616,15 @@ function buildTree(spans, node, offset, options) {
         }
     });
     let locals = moveSpans(hasNulls ? withoutNulls(spans) : spans, -offset).sort(byPos);
-    for (let i = 0; i < locals.length; i++)
-        if (!locals[i].type.valid(node, locals[i])) {
-            if (options.onRemove)
-                options.onRemove(locals[i].spec);
-            locals.splice(i--, 1);
-        }
+    if (locals.length) {
+        let cur = new FragmentCursor(node.content);
+        for (let i = 0; i < locals.length; i++)
+            if (!locals[i].type.valid(node, locals[i], cur)) {
+                if (options.onRemove)
+                    options.onRemove(locals[i].spec);
+                locals.splice(i--, 1);
+            }
+    }
     return locals.length || children.length ? new DecorationSet(locals, children) : empty;
 }
 // Used to sort decorations so that ones with a low start position
@@ -4822,8 +4857,11 @@ class DOMObserver {
         let mutations = this.pendingRecords();
         if (mutations.length)
             this.queue = [];
-        let sel = view.domSelectionRange();
-        let newSel = !this.suppressingSelectionUpdates && !this.currentSelection.eq(sel) && hasFocusAndSelection(view) && !this.ignoreSelectionChange(sel);
+        let selRange, newSel = false;
+        if (!this.suppressingSelectionUpdates && hasFocusAndSelection(view)) {
+            selRange = view.domSelectionRange();
+            newSel = !this.currentSelection.eq(selRange) && !this.ignoreSelectionChange(selRange);
+        }
         let from = -1, to = -1, typeOver = false, added = [];
         if (view.editable) {
             for (let i = 0; i < mutations.length; i++) {
@@ -4878,11 +4916,11 @@ class DOMObserver {
         // the state
         if (from < 0 && newSel && view.input.lastFocus > Date.now() - 200 &&
             Math.max(view.input.lastTouch, view.input.lastClick.time) < Date.now() - 300 &&
-            selectionCollapsed(sel) && (readSel = selectionFromDOM(view)) &&
+            selectionCollapsed(selRange) && (readSel = selectionFromDOM(view)) &&
             readSel.eq(Selection.near(view.state.doc.resolve(0), 1))) {
             view.input.lastFocus = 0;
             selectionToDOM(view);
-            this.currentSelection.set(sel);
+            this.currentSelection.set(selRange);
             view.scrollToSelection();
         }
         else if (from > -1 || newSel) {
@@ -4897,9 +4935,10 @@ class DOMObserver {
             this.handleDOMChange(from, to, typeOver, added);
             if (view.docView && view.docView.dirty)
                 view.updateState(view.state);
-            else if (!this.currentSelection.eq(sel))
+            else if (selRange && !this.currentSelection.eq(selRange))
                 selectionToDOM(view);
-            this.currentSelection.set(sel);
+            if (selRange)
+                this.currentSelection.set(selRange);
         }
     }
     registerMutation(mut, added) {
@@ -5231,7 +5270,8 @@ function readDOMChange(view, from, to, typeOver, addedNodes) {
     }
     // Same for backspace
     if (view.state.selection.anchor > change.start &&
-        looksLikeBackspace(doc, change.start, change.endA, $from, $to) &&
+        (inlineChange ? change.endA > change.start && change.endB == change.start
+            : looksLikeBlockJoin(doc, change.start, change.endA, $from, $to)) &&
         view.someProp("handleKeyDown", f => f(view, keyEvent(8, "Backspace")))) {
         if (android && chrome)
             view.domObserver.suppressSelectionUpdates(); // #820
@@ -5352,7 +5392,7 @@ function isMarkChange(cur, prev) {
     if (Fragment.from(updated).eq(cur))
         return { mark, type };
 }
-function looksLikeBackspace(old, start, end, $newStart, $newEnd) {
+function looksLikeBlockJoin(old, start, end, $newStart, $newEnd) {
     if ( // The content must have shrunk
     end - start <= $newEnd.pos - $newStart.pos ||
         // newEnd must point directly at or after the end of the block that newStart points into
@@ -5360,7 +5400,7 @@ function looksLikeBackspace(old, start, end, $newStart, $newEnd) {
         return false;
     let $start = old.resolve(start);
     // Handle the case where, rather than joining blocks, the change just removed an entire block
-    if (!$newStart.parent.isTextblock) {
+    if (!$newStart.parent.inlineContent) {
         let after = $start.nodeAfter;
         return after != null && end == start + after.nodeSize;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prosemirror-view",
-  "version": "1.42.6",
+  "version": "1.42.7",
   "description": "ProseMirror's view component",
   "type": "module",
   "main": "dist/index.cjs",

package/src/capturekeys.ts

@@ -30,7 +30,7 @@ function selectHorizontally(view: EditorView, dir: number, mods: string) {
       let next = moveSelectionBlock(view.state, dir)
       if (next && (next instanceof NodeSelection)) return apply(view, next)
       return false
-    } else if (!(browser.mac && mods.indexOf("m") > -1)) {
+    } else if (!browser.mac || mods.indexOf("m") < 0) {
       let $head = sel.$head, node = $head.textOffset ? null : dir < 0 ? $head.nodeBefore : $head.nodeAfter, desc
       if (!node || node.isText) return false
       let nodePos = dir < 0 ? $head.pos - node.nodeSize : $head.pos
@@ -198,15 +198,12 @@ function setSelFocus(view: EditorView, node: Node, offset: number) {
     }
   }
 
-  let sel = view.domSelection()
+  let sel = view.domSelection(), range = view.domSelectionRange()
   if (!sel) return
-  if (selectionCollapsed(sel)) {
-    let range = document.createRange()
-    range.setEnd(node, offset)
-    range.setStart(node, offset)
-    sel.removeAllRanges()
-    sel.addRange(range)
+  if (selectionCollapsed(range)) {
+    sel.collapse(node, offset)
   } else if (sel.extend) {
+    sel.collapse(range.anchorNode, range.anchorOffset)
     sel.extend(node, offset)
   }
   view.domObserver.setCurSelection()
@@ -234,7 +231,12 @@ function findDirection(view: EditorView, pos: number): "rtl" | "ltr" {
         return after.left > coords.left ? "ltr" : "rtl"
     }
   }
-  let computed = getComputedStyle(view.dom).direction
+  let block: Element = view.dom
+  for (let d = $pos.depth; d > 0; d--) if ($pos.node(d).isBlock) {
+    block = view.nodeDOM($pos.before(d)) as Element || block
+    break
+  }
+  let computed = getComputedStyle(block).direction
   return computed == "rtl" ? "rtl" : "ltr"
 }
 

package/src/decoration.ts

@@ -1,4 +1,4 @@
-import {Node, Mark} from "prosemirror-model"
+import {Node, Mark, Fragment} from "prosemirror-model"
 import {Mappable, Mapping} from "prosemirror-transform"
 import {EditorView} from "./index"
 import {DOMNode} from "./dom"
@@ -10,10 +10,25 @@ function compareObjs(a: {[prop: string]: any}, b: {[prop: string]: any}) {
   return true
 }
 
+class FragmentCursor {
+  index = 0
+  off = 0
+  constructor(readonly frag: Fragment) {}
+  nodeAt(off: number) {
+    while (this.off <= off && this.index < this.frag.childCount) {
+      let next = this.frag.child(this.index)
+      if (this.off == off) return next
+      this.off += next.nodeSize
+      this.index++
+    }
+    return null
+  }
+}
+
 export interface DecorationType {
   spec: any
   map(mapping: Mappable, span: Decoration, offset: number, oldOffset: number): Decoration | null
-  valid(node: Node, span: Decoration): boolean
+  valid(node: Node, span: Decoration, cur: FragmentCursor): boolean
   eq(other: DecorationType): boolean
   destroy(dom: DOMNode): void
 }
@@ -88,9 +103,9 @@ export class NodeType implements DecorationType {
     return new Decoration(from.pos - offset, to.pos - offset, this)
   }
 
-  valid(node: Node, span: Decoration): boolean {
-    let {index, offset} = node.content.findIndex(span.from), child
-    return offset == span.from && !(child = node.child(index)).isText && offset + child.nodeSize == span.to
+  valid(node: Node, span: Decoration, cursor: FragmentCursor): boolean {
+    let found = cursor.nodeAt(span.from)
+    return !!found && !found.isText && span.from + found.nodeSize == span.to
   }
 
   eq(other: DecorationType): boolean {
@@ -346,10 +361,13 @@ export class DecorationSet implements DecorationSource {
     onRemove?: (decorationSpec: any) => void
   }) {
     let newLocal: Decoration[] | undefined
-    for (let i = 0; i < this.local.length; i++) {
-      let mapped = this.local[i].map(mapping, offset, oldOffset)
-      if (mapped && mapped.type.valid(node, mapped)) (newLocal || (newLocal = [])).push(mapped)
-      else if (options.onRemove) options.onRemove(this.local[i].spec)
+    if (this.local.length) {
+      let cur = new FragmentCursor(node.content)
+      for (let i = 0; i < this.local.length; i++) {
+        let mapped = this.local[i].map(mapping, offset, oldOffset)
+        if (mapped && mapped.type.valid(node, mapped, cur)) (newLocal || (newLocal = [])).push(mapped)
+        else if (options.onRemove) options.onRemove(this.local[i].spec)
+      }
     }
 
     if (this.children.length)
@@ -384,7 +402,10 @@ export class DecorationSet implements DecorationSource {
     })
 
     let local = moveSpans(childIndex ? withoutNulls(decorations) : decorations, -offset)
-    for (let i = 0; i < local.length; i++) if (!local[i].type.valid(doc, local[i])) local.splice(i--, 1)
+    if (local.length) {
+      let cur = new FragmentCursor(doc.content)
+      for (let i = 0; i < local.length; i++) if (!local[i].type.valid(doc, local[i], cur)) local.splice(i--, 1)
+    }
 
     return new DecorationSet(local.length ? this.local.concat(local).sort(byPos) : this.local,
                              children || this.children)
@@ -727,9 +748,12 @@ function buildTree(
     }
   })
   let locals = moveSpans(hasNulls ? withoutNulls(spans) : spans, -offset).sort(byPos)
-  for (let i = 0; i < locals.length; i++) if (!locals[i].type.valid(node, locals[i])) {
-    if (options.onRemove) options.onRemove(locals[i].spec)
-    locals.splice(i--, 1)
+  if (locals.length) {
+    let cur = new FragmentCursor(node.content)
+    for (let i = 0; i < locals.length; i++) if (!locals[i].type.valid(node, locals[i], cur)) {
+      if (options.onRemove) options.onRemove(locals[i].spec)
+      locals.splice(i--, 1)
+    }
   }
   return locals.length || children.length ? new DecorationSet(locals, children) : empty
 }

package/src/domchange.ts

@@ -187,7 +187,8 @@ export function readDOMChange(view: EditorView, from: number, to: number, typeOv
   }
   // Same for backspace
   if (view.state.selection.anchor > change.start &&
-      looksLikeBackspace(doc, change.start, change.endA, $from, $to) &&
+      (inlineChange ? change.endA > change.start && change.endB == change.start
+        : looksLikeBlockJoin(doc, change.start, change.endA, $from, $to)) &&
       view.someProp("handleKeyDown", f => f(view, keyEvent(8, "Backspace")))) {
     if (browser.android && browser.chrome) view.domObserver.suppressSelectionUpdates() // #820
     return
@@ -303,7 +304,7 @@ function isMarkChange(cur: Fragment, prev: Fragment) {
   if (Fragment.from(updated).eq(cur)) return {mark, type}
 }
 
-function looksLikeBackspace(old: Node, start: number, end: number, $newStart: ResolvedPos, $newEnd: ResolvedPos) {
+function looksLikeBlockJoin(old: Node, start: number, end: number, $newStart: ResolvedPos, $newEnd: ResolvedPos) {
   if (// The content must have shrunk
       end - start <= $newEnd.pos - $newStart.pos ||
       // newEnd must point directly at or after the end of the block that newStart points into
@@ -313,7 +314,7 @@ function looksLikeBackspace(old: Node, start: number, end: number, $newStart: Re
   let $start = old.resolve(start)
 
   // Handle the case where, rather than joining blocks, the change just removed an entire block
-  if (!$newStart.parent.isTextblock) {
+  if (!$newStart.parent.inlineContent) {
     let after = $start.nodeAfter
     return after != null && end == start + after.nodeSize
   }

package/src/domobserver.ts

@@ -177,8 +177,11 @@ export class DOMObserver {
     let mutations = this.pendingRecords()
     if (mutations.length) this.queue = []
 
-    let sel = view.domSelectionRange()
-    let newSel = !this.suppressingSelectionUpdates && !this.currentSelection.eq(sel) && hasFocusAndSelection(view) && !this.ignoreSelectionChange(sel)
+    let selRange: DOMSelectionRange | undefined, newSel = false
+    if (!this.suppressingSelectionUpdates && hasFocusAndSelection(view)) {
+      selRange = view.domSelectionRange()
+      newSel = !this.currentSelection.eq(selRange) && !this.ignoreSelectionChange(selRange)
+    }
 
     let from = -1, to = -1, typeOver = false, added: Node[] = []
     if (view.editable) {
@@ -230,11 +233,11 @@ export class DOMObserver {
     // the state
     if (from < 0 && newSel && view.input.lastFocus > Date.now() - 200 &&
         Math.max(view.input.lastTouch, view.input.lastClick.time) < Date.now() - 300 &&
-        selectionCollapsed(sel) && (readSel = selectionFromDOM(view)) &&
+        selectionCollapsed(selRange!) && (readSel = selectionFromDOM(view)) &&
         readSel.eq(Selection.near(view.state.doc.resolve(0), 1))) {
       view.input.lastFocus = 0
       selectionToDOM(view)
-      this.currentSelection.set(sel)
+      this.currentSelection.set(selRange!)
       view.scrollToSelection()
     } else if (from > -1 || newSel) {
       if (from > -1) {
@@ -247,8 +250,8 @@ export class DOMObserver {
       }
       this.handleDOMChange(from, to, typeOver, added)
       if (view.docView && view.docView.dirty) view.updateState(view.state)
-      else if (!this.currentSelection.eq(sel)) selectionToDOM(view)
-      this.currentSelection.set(sel)
+      else if (selRange && !this.currentSelection.eq(selRange)) selectionToDOM(view)
+      if (selRange) this.currentSelection.set(selRange)
     }
   }
 

package/src/viewdesc.ts

@@ -248,7 +248,12 @@ export class ViewDesc {
     if (dom == this.dom && this.contentDOM) {
       atEnd = offset > domIndex(this.contentDOM)
     } else if (this.contentDOM && this.contentDOM != this.dom && this.dom.contains(this.contentDOM)) {
-      atEnd = !!(dom.compareDocumentPosition(this.contentDOM) & 4)
+      let rel = dom.compareDocumentPosition(this.contentDOM)
+      if (rel & 16) { // this.contentDOM is inside dom
+        atEnd = offset > Array.from(dom.childNodes).findIndex(n => n.contains(this.contentDOM))
+      } else { // Check if after or before
+        atEnd = !(rel & 4)
+      }
     } else if (this.dom.firstChild) {
       if (offset == 0) for (let search = dom;; search = search.parentNode!) {
         if (search == this.dom) { atEnd = false; break }