prosemirror-view 1.37.1 → 1.37.2

package/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 1.37.2 (2025-01-22)
+
+### Bug fixes
+
+Fix a bug that caused `EditorView.nodeDOM` to sometimes not return a DOM node when querying a node next to a widget.
+
+Fix an issue where an editor would, when scrolling the selection into view, try to do so even if the selection wasn't in that editor.
+
 ## 1.37.1 (2024-12-11)
 
 ### Bug fixes
@@ -2068,18 +2076,14 @@ Transactions that update the selection because of mouse or touch input now get a
 
 ## 0.16.0 (2016-12-23)
 
-### Bug fixes
-
-Solve problem where setting a node selection would trigger a DOM read, leading to the selection being reset.
-
-## 0.16.0 (2016-12-23)
-
 ### Breaking changes
 
 The `spellcheck`, `label`, and `class` props are now replaced by an [`attributes` prop](https://prosemirror.net/docs/ref/version/0.16.0.html#view.EditorProps.attributes).
 
 ### Bug fixes
 
+Solve problem where setting a node selection would trigger a DOM read, leading to the selection being reset.
+
 Ignoring/aborting an action should no longer lead to the DOM being stuck in an outdated state.
 
 Typing at the end of a textblock which ends in a non-text node now actually works.

package/dist/index.cjs

@@ -810,7 +810,15 @@ var ViewDesc = function () {
         var child = this.children[i],
           end = offset + child.size;
         if (offset == pos && end != offset) {
-          while (!child.border && child.children.length) child = child.children[0];
+          while (!child.border && child.children.length) {
+            for (var _i = 0; _i < child.children.length; _i++) {
+              var inner = child.children[_i];
+              if (inner.size) {
+                child = inner;
+                break;
+              }
+            }
+          }
           return child;
         }
         if (pos < end) return child.descAt(pos - offset - child.border);
@@ -1700,7 +1708,7 @@ function patchAttributes(dom, prev, cur) {
     var prevList = prev["class"] ? prev["class"].split(" ").filter(Boolean) : [];
     var curList = cur["class"] ? cur["class"].split(" ").filter(Boolean) : [];
     for (var i = 0; i < prevList.length; i++) if (curList.indexOf(prevList[i]) == -1) dom.classList.remove(prevList[i]);
-    for (var _i = 0; _i < curList.length; _i++) if (prevList.indexOf(curList[_i]) == -1) dom.classList.add(curList[_i]);
+    for (var _i2 = 0; _i2 < curList.length; _i2++) if (prevList.indexOf(curList[_i2]) == -1) dom.classList.add(curList[_i2]);
     if (dom.classList.length == 0) dom.removeAttribute("class");
   }
   if (prev.style != cur.style) {
@@ -2020,7 +2028,7 @@ function iterDeco(parent, deco, onWidget, onNode) {
     if (widget) {
       if (widgets) {
         widgets.sort(compareSide);
-        for (var _i2 = 0; _i2 < widgets.length; _i2++) onWidget(widgets[_i2], parentIndex, !!restNode);
+        for (var _i3 = 0; _i3 < widgets.length; _i3++) onWidget(widgets[_i3], parentIndex, !!restNode);
       } else {
         onWidget(widget, parentIndex, !!restNode);
       }
@@ -2037,13 +2045,13 @@ function iterDeco(parent, deco, onWidget, onNode) {
     } else {
       break;
     }
-    for (var _i3 = 0; _i3 < active.length; _i3++) if (active[_i3].to <= offset) active.splice(_i3--, 1);
+    for (var _i4 = 0; _i4 < active.length; _i4++) if (active[_i4].to <= offset) active.splice(_i4--, 1);
     while (decoIndex < locals.length && locals[decoIndex].from <= offset && locals[decoIndex].to > offset) active.push(locals[decoIndex++]);
     var end = offset + _child.nodeSize;
     if (_child.isText) {
       var cutAt = end;
       if (decoIndex < locals.length && locals[decoIndex].from < cutAt) cutAt = locals[decoIndex].from;
-      for (var _i4 = 0; _i4 < active.length; _i4++) if (active[_i4].to < cutAt) cutAt = active[_i4].to;
+      for (var _i5 = 0; _i5 < active.length; _i5++) if (active[_i5].to < cutAt) cutAt = active[_i5].to;
       if (cutAt < end) {
         restNode = _child.cut(cutAt - offset);
         _child = _child.cut(0, cutAt - offset);
@@ -3717,10 +3725,10 @@ var DecorationSet = function () {
         var span = this.local[i];
         if (span.from <= end && span.to >= start && (!predicate || predicate(span.spec))) result.push(span.copy(span.from + offset, span.to + offset));
       }
-      for (var _i5 = 0; _i5 < this.children.length; _i5 += 3) {
-        if (this.children[_i5] < end && this.children[_i5 + 1] > start) {
-          var childOff = this.children[_i5] + 1;
-          this.children[_i5 + 2].findInner(start - childOff, end - childOff, result, offset + childOff, predicate);
+      for (var _i6 = 0; _i6 < this.children.length; _i6 += 3) {
+        if (this.children[_i6] < end && this.children[_i6 + 1] > start) {
+          var childOff = this.children[_i6] + 1;
+          this.children[_i6 + 2].findInner(start - childOff, end - childOff, result, offset + childOff, predicate);
         }
       }
     }
@@ -3797,7 +3805,7 @@ var DecorationSet = function () {
           i -= 3;
         }
       }
-      if (local.length) for (var _i6 = 0, _span; _i6 < decorations.length; _i6++) if (_span = decorations[_i6]) {
+      if (local.length) for (var _i7 = 0, _span; _i7 < decorations.length; _i7++) if (_span = decorations[_i7]) {
         for (var _j2 = 0; _j2 < local.length; _j2++) if (local[_j2].eq(_span, offset)) {
           if (local == this.local) local = this.local.slice();
           local.splice(_j2--, 1);
@@ -3818,8 +3826,8 @@ var DecorationSet = function () {
       }
       var start = offset + 1,
         end = start + node.content.size;
-      for (var _i7 = 0; _i7 < this.local.length; _i7++) {
-        var dec = this.local[_i7];
+      for (var _i8 = 0; _i8 < this.local.length; _i8++) {
+        var dec = this.local[_i8];
         if (dec.from < end && dec.to > start && dec.type instanceof InlineType) {
           var from = Math.max(start, dec.from) - start,
             to = Math.min(end, dec.to) - start;
@@ -3838,7 +3846,7 @@ var DecorationSet = function () {
       if (this == other) return true;
       if (!(other instanceof DecorationSet) || this.local.length != other.local.length || this.children.length != other.children.length) return false;
       for (var i = 0; i < this.local.length; i++) if (!this.local[i].eq(other.local[i])) return false;
-      for (var _i8 = 0; _i8 < this.children.length; _i8 += 3) if (this.children[_i8] != other.children[_i8] || this.children[_i8 + 1] != other.children[_i8 + 1] || !this.children[_i8 + 2].eq(other.children[_i8 + 2])) return false;
+      for (var _i9 = 0; _i9 < this.children.length; _i9 += 3) if (this.children[_i9] != other.children[_i9] || this.children[_i9 + 1] != other.children[_i9 + 1] || !this.children[_i9 + 2].eq(other.children[_i9 + 2])) return false;
       return true;
     }
   }, {
@@ -3955,15 +3963,15 @@ function mapChildren(oldChildren, newLocal, mapping, node, offset, oldOffset, op
     var moved = 0;
     mapping.maps[i].forEach(function (oldStart, oldEnd, newStart, newEnd) {
       var dSize = newEnd - newStart - (oldEnd - oldStart);
-      for (var _i12 = 0; _i12 < children.length; _i12 += 3) {
-        var end = children[_i12 + 1];
+      for (var _i13 = 0; _i13 < children.length; _i13 += 3) {
+        var end = children[_i13 + 1];
         if (end < 0 || oldStart > end + _baseOffset - moved) continue;
-        var start = children[_i12] + _baseOffset - moved;
+        var start = children[_i13] + _baseOffset - moved;
         if (oldEnd >= start) {
-          children[_i12 + 1] = oldStart <= start ? -2 : -1;
+          children[_i13 + 1] = oldStart <= start ? -2 : -1;
         } else if (oldStart >= _baseOffset && dSize) {
-          children[_i12] += dSize;
-          children[_i12 + 1] += dSize;
+          children[_i13] += dSize;
+          children[_i13 + 1] += dSize;
         }
       }
       moved += dSize;
@@ -3975,32 +3983,32 @@ function mapChildren(oldChildren, newLocal, mapping, node, offset, oldOffset, op
     _loop4(baseOffset);
   }
   var mustRebuild = false;
-  for (var _i9 = 0; _i9 < children.length; _i9 += 3) if (children[_i9 + 1] < 0) {
-    if (children[_i9 + 1] == -2) {
+  for (var _i10 = 0; _i10 < children.length; _i10 += 3) if (children[_i10 + 1] < 0) {
+    if (children[_i10 + 1] == -2) {
       mustRebuild = true;
-      children[_i9 + 1] = -1;
+      children[_i10 + 1] = -1;
       continue;
     }
-    var from = mapping.map(oldChildren[_i9] + oldOffset),
+    var from = mapping.map(oldChildren[_i10] + oldOffset),
       fromLocal = from - offset;
     if (fromLocal < 0 || fromLocal >= node.content.size) {
       mustRebuild = true;
       continue;
     }
-    var to = mapping.map(oldChildren[_i9 + 1] + oldOffset, -1),
+    var to = mapping.map(oldChildren[_i10 + 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 childNode = node.maybeChild(index);
     if (childNode && childOffset == fromLocal && childOffset + childNode.nodeSize == toLocal) {
-      var mapped = children[_i9 + 2].mapInner(mapping, childNode, from + 1, oldChildren[_i9] + oldOffset + 1, options);
+      var mapped = children[_i10 + 2].mapInner(mapping, childNode, from + 1, oldChildren[_i10] + oldOffset + 1, options);
       if (mapped != empty) {
-        children[_i9] = fromLocal;
-        children[_i9 + 1] = toLocal;
-        children[_i9 + 2] = mapped;
+        children[_i10] = fromLocal;
+        children[_i10 + 1] = toLocal;
+        children[_i10 + 2] = mapped;
       } else {
-        children[_i9 + 1] = -2;
+        children[_i10 + 1] = -2;
         mustRebuild = true;
       }
     } else {
@@ -4011,14 +4019,14 @@ function mapChildren(oldChildren, newLocal, mapping, node, offset, oldOffset, op
     var decorations = mapAndGatherRemainingDecorations(children, oldChildren, newLocal, mapping, offset, oldOffset, options);
     var built = buildTree(decorations, node, 0, options);
     newLocal = built.local;
-    for (var _i10 = 0; _i10 < children.length; _i10 += 3) if (children[_i10 + 1] < 0) {
-      children.splice(_i10, 3);
-      _i10 -= 3;
+    for (var _i11 = 0; _i11 < children.length; _i11 += 3) if (children[_i11 + 1] < 0) {
+      children.splice(_i11, 3);
+      _i11 -= 3;
     }
-    for (var _i11 = 0, j = 0; _i11 < built.children.length; _i11 += 3) {
-      var _from2 = built.children[_i11];
+    for (var _i12 = 0, j = 0; _i12 < built.children.length; _i12 += 3) {
+      var _from2 = built.children[_i12];
       while (j < children.length && children[j] < _from2) j += 3;
-      children.splice(j, 0, built.children[_i11], built.children[_i11 + 1], built.children[_i11 + 2]);
+      children.splice(j, 0, built.children[_i12], built.children[_i12 + 1], built.children[_i12 + 2]);
     }
   }
   return new DecorationSet(newLocal.sort(byPos), children);
@@ -4038,7 +4046,7 @@ function mapAndGatherRemainingDecorations(children, oldChildren, decorations, ma
       var mapped = set.local[i].map(mapping, offset, oldOffset);
       if (mapped) decorations.push(mapped);else if (options.onRemove) options.onRemove(set.local[i].spec);
     }
-    for (var _i13 = 0; _i13 < set.children.length; _i13 += 3) gather(set.children[_i13 + 2], set.children[_i13] + oldOffset + 1);
+    for (var _i14 = 0; _i14 < set.children.length; _i14 += 3) gather(set.children[_i14 + 2], set.children[_i14] + oldOffset + 1);
   }
   for (var i = 0; i < children.length; i += 3) if (children[i + 1] == -1) gather(children[i + 2], oldChildren[i] + oldOffset + 1);
   return decorations;
@@ -4392,8 +4400,8 @@ var DOMObserver = function () {
         var prev = mut.previousSibling,
           next = mut.nextSibling;
         if (ie && ie_version <= 11 && mut.addedNodes.length) {
-          for (var _i14 = 0; _i14 < mut.addedNodes.length; _i14++) {
-            var _mut$addedNodes$_i = mut.addedNodes[_i14],
+          for (var _i15 = 0; _i15 < mut.addedNodes.length; _i15++) {
+            var _mut$addedNodes$_i = mut.addedNodes[_i15],
               previousSibling = _mut$addedNodes$_i.previousSibling,
               nextSibling = _mut$addedNodes$_i.nextSibling;
             if (!previousSibling || Array.prototype.indexOf.call(mut.addedNodes, previousSibling) < 0) prev = previousSibling;
@@ -4717,7 +4725,7 @@ function isMarkChange(cur, prev) {
     mark,
     update;
   for (var i = 0; i < prevMarks.length; i++) added = prevMarks[i].removeFromSet(added);
-  for (var _i15 = 0; _i15 < curMarks.length; _i15++) removed = curMarks[_i15].removeFromSet(removed);
+  for (var _i16 = 0; _i16 < curMarks.length; _i16++) removed = curMarks[_i16].removeFromSet(removed);
   if (added.length == 1 && removed.length == 0) {
     mark = added[0];
     type = "add";
@@ -4734,7 +4742,7 @@ function isMarkChange(cur, prev) {
     return null;
   }
   var updated = [];
-  for (var _i16 = 0; _i16 < prev.childCount; _i16++) updated.push(update(prev.child(_i16)));
+  for (var _i17 = 0; _i17 < prev.childCount; _i17++) updated.push(update(prev.child(_i17)));
   if (prosemirrorModel.Fragment.from(updated).eq(cur)) return {
     mark: mark,
     type: type
@@ -4952,7 +4960,7 @@ var EditorView = function () {
     value: function scrollToSelection() {
       var _this16 = this;
       var startDOM = this.domSelectionRange().focusNode;
-      if (this.someProp("handleScrollToSelection", function (f) {
+      if (!startDOM || !this.dom.contains(startDOM.nodeType == 1 ? startDOM : startDOM.parentNode)) ;else if (this.someProp("handleScrollToSelection", function (f) {
         return f(_this16);
       })) ;else if (this.state.selection instanceof prosemirrorState.NodeSelection) {
         var target = this.docView.domAfterPos(this.state.selection.from);
@@ -4977,13 +4985,13 @@ var EditorView = function () {
           var plugin = this.directPlugins[i];
           if (plugin.spec.view) this.pluginViews.push(plugin.spec.view(this));
         }
-        for (var _i17 = 0; _i17 < this.state.plugins.length; _i17++) {
-          var _plugin = this.state.plugins[_i17];
+        for (var _i18 = 0; _i18 < this.state.plugins.length; _i18++) {
+          var _plugin = this.state.plugins[_i18];
           if (_plugin.spec.view) this.pluginViews.push(_plugin.spec.view(this));
         }
       } else {
-        for (var _i18 = 0; _i18 < this.pluginViews.length; _i18++) {
-          var pluginView = this.pluginViews[_i18];
+        for (var _i19 = 0; _i19 < this.pluginViews.length; _i19++) {
+          var pluginView = this.pluginViews[_i19];
           if (pluginView.update) pluginView.update(this, prevState);
         }
       }
@@ -5013,8 +5021,8 @@ var EditorView = function () {
         if (_prop != null && (value = f ? f(_prop) : _prop)) return value;
       }
       var plugins = this.state.plugins;
-      if (plugins) for (var _i19 = 0; _i19 < plugins.length; _i19++) {
-        var _prop2 = plugins[_i19].props[propName];
+      if (plugins) for (var _i20 = 0; _i20 < plugins.length; _i20++) {
+        var _prop2 = plugins[_i20].props[propName];
         if (_prop2 != null && (value = f ? f(_prop2) : _prop2)) return value;
       }
     }

package/dist/index.js

@@ -885,8 +885,15 @@ class ViewDesc {
         for (let i = 0, offset = 0; i < this.children.length; i++) {
             let child = this.children[i], end = offset + child.size;
             if (offset == pos && end != offset) {
-                while (!child.border && child.children.length)
-                    child = child.children[0];
+                while (!child.border && child.children.length) {
+                    for (let i = 0; i < child.children.length; i++) {
+                        let inner = child.children[i];
+                        if (inner.size) {
+                            child = inner;
+                            break;
+                        }
+                    }
+                }
                 return child;
             }
             if (pos < end)
@@ -5432,7 +5439,8 @@ class EditorView {
     */
     scrollToSelection() {
         let startDOM = this.domSelectionRange().focusNode;
-        if (this.someProp("handleScrollToSelection", f => f(this))) ;
+        if (!startDOM || !this.dom.contains(startDOM.nodeType == 1 ? startDOM : startDOM.parentNode)) ;
+        else if (this.someProp("handleScrollToSelection", f => f(this))) ;
         else if (this.state.selection instanceof NodeSelection) {
             let target = this.docView.domAfterPos(this.state.selection.from);
             if (target.nodeType == 1)

package/package.json

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

package/src/index.ts

@@ -235,8 +235,10 @@ export class EditorView {
 
   /// @internal
   scrollToSelection() {
-    let startDOM = this.domSelectionRange().focusNode!
-    if (this.someProp("handleScrollToSelection", f => f(this))) {
+    let startDOM = this.domSelectionRange().focusNode
+    if (!startDOM || !this.dom.contains(startDOM.nodeType == 1 ? startDOM : startDOM.parentNode)) {
+      // Ignore selections outside the editor
+    } else if (this.someProp("handleScrollToSelection", f => f(this))) {
       // Handled
     } else if (this.state.selection instanceof NodeSelection) {
       let target = this.docView.domAfterPos(this.state.selection.from)

package/src/viewdesc.ts

@@ -289,7 +289,12 @@ export class ViewDesc {
     for (let i = 0, offset = 0; i < this.children.length; i++) {
       let child = this.children[i], end = offset + child.size
       if (offset == pos && end != offset) {
-        while (!child.border && child.children.length) child = child.children[0]
+        while (!child.border && child.children.length) {
+          for (let i = 0; i < child.children.length; i++) {
+            let inner = child.children[i]
+            if (inner.size) { child = inner; break }
+          }
+        }
         return child
       }
       if (pos < end) return child.descAt(pos - offset - child.border)