prosemirror-view 1.33.0 → 1.33.2

package/CHANGELOG.md

@@ -1,3 +1,23 @@
+## 1.33.2 (2024-03-21)
+
+### Bug fixes
+
+Improve Android backspace detection when the native effect is to delete an entire block element.
+
+Fix a bug where reconfiguring node views caused the editor to lose focus.
+
+Fix an issue where some commands didn't properly scroll the cursor into view on Mobile Safari.
+
+Fix a bug where starting a composition with stored marks or after a noninclusive mark, with an IME that keeps the cursor at the start of the composed text (like many Chinese IMEs) disrupted composition on Chrome.
+
+Fix a memory leak where a (single) destroyed editor could be kept alive through a reused `Range` object.
+
+## 1.33.1 (2024-02-15)
+
+### Bug fixes
+
+Fix a type error in the published type declarations in 1.33.0.
+
 ## 1.33.0 (2024-02-15)
 
 ### New features

package/dist/index.cjs

@@ -38,6 +38,9 @@ var textRange = function textRange(node, from, to) {
   range.setStart(node, from || 0);
   return range;
 };
+var clearReusedRange = function clearReusedRange() {
+  reusedRange = null;
+};
 var isEquivalentPosition = function isEquivalentPosition(node, off, targetNode, targetOff) {
   return targetNode && (scanFor(node, off, targetNode, targetOff, -1) || scanFor(node, off, targetNode, targetOff, 1));
 };
@@ -62,6 +65,36 @@ function scanFor(node, off, targetNode, targetOff, dir) {
 function nodeSize(node) {
   return node.nodeType == 3 ? node.nodeValue.length : node.childNodes.length;
 }
+function textNodeBefore$1(node, offset) {
+  for (;;) {
+    if (node.nodeType == 3 && offset) return node;
+    if (node.nodeType == 1 && offset > 0) {
+      if (node.contentEditable != "false") return null;
+      node = node.childNodes[offset - 1];
+      offset = nodeSize(node);
+    } else if (node.parentNode && !hasBlockDesc(node)) {
+      offset = domIndex(node);
+      node = node.parentNode;
+    } else {
+      return null;
+    }
+  }
+}
+function textNodeAfter$1(node, offset) {
+  for (;;) {
+    if (node.nodeType == 3 && offset < node.nodeValue.length) return node;
+    if (node.nodeType == 1 && offset < node.childNodes.length) {
+      if (node.contentEditable != "false") return null;
+      node = node.childNodes[offset];
+      offset = 0;
+    } else if (node.parentNode && !hasBlockDesc(node)) {
+      offset = domIndex(node) + 1;
+      node = node.parentNode;
+    } else {
+      return null;
+    }
+  }
+}
 function isOnEdge(node, offset, parent) {
   for (var atStart = offset == 0, atEnd = offset == nodeSize(node); atStart || atEnd;) {
     if (node == parent) return true;
@@ -131,6 +164,13 @@ var android = /Android \d/.test(agent);
 var webkit = !!doc && "webkitFontSmoothing" in doc.documentElement.style;
 var webkit_version = webkit ? +(/\bAppleWebKit\/(\d+)/.exec(navigator.userAgent) || [0, 0])[1] : 0;
 function windowRect(doc) {
+  var vp = doc.defaultView && doc.defaultView.visualViewport;
+  if (vp) return {
+    left: 0,
+    right: vp.width,
+    top: 0,
+    bottom: vp.height
+  };
   return {
     left: 0,
     right: doc.documentElement.clientWidth,
@@ -1269,7 +1309,13 @@ var NodeViewDesc = function (_ViewDesc4) {
         to = _view$state$selection.to;
       if (!(view.state.selection instanceof prosemirrorState.TextSelection) || from < pos || to > pos + this.node.content.size) return null;
       var sel = view.domSelectionRange();
-      var textNode = nearbyTextNode(sel.focusNode, sel.focusOffset);
+      var textBefore = textNodeBefore$1(sel.focusNode, sel.focusOffset);
+      var textAfter = textNodeAfter$1(sel.focusNode, sel.focusOffset);
+      var textNode = textBefore || textAfter;
+      if (textBefore && textAfter && textBefore != textAfter) {
+        var descAfter = textAfter.pmViewDesc;
+        if (!descAfter || descAfter instanceof TextViewDesc && descAfter.node.text != textAfter.nodeValue) textNode = textAfter;
+      }
       if (!textNode || !this.dom.contains(textNode.parentNode)) return null;
       if (this.node.inlineContent) {
         var text = textNode.nodeValue;
@@ -1998,21 +2044,6 @@ function iosHacks(dom) {
     dom.style.cssText = oldCSS;
   }
 }
-function nearbyTextNode(node, offset) {
-  for (;;) {
-    if (node.nodeType == 3) return node;
-    if (node.nodeType == 1 && offset > 0) {
-      if (node.childNodes.length > offset && node.childNodes[offset].nodeType == 3) return node.childNodes[offset];
-      node = node.childNodes[offset - 1];
-      offset = nodeSize(node);
-    } else if (node.nodeType == 1 && offset < node.childNodes.length) {
-      node = node.childNodes[offset];
-      offset = 0;
-    } else {
-      return null;
-    }
-  }
-}
 function findTextInFragment(frag, text, from, to) {
   for (var i = 0, pos = 0; i < frag.childCount && pos <= to;) {
     var child = frag.child(i++),
@@ -4474,13 +4505,6 @@ function readDOMChange(view, from, to, typeOver, addedNodes) {
       return;
     }
   }
-  if (chrome && view.cursorWrapper && parse.sel && parse.sel.anchor == view.cursorWrapper.deco.from && parse.sel.head == parse.sel.anchor) {
-    var size = change.endB - change.start;
-    parse.sel = {
-      anchor: parse.sel.anchor + size,
-      head: parse.sel.anchor + size
-    };
-  }
   view.input.domChangeCount++;
   if (view.state.selection.from < view.state.selection.to && change.start == change.endB && view.state.selection instanceof prosemirrorState.TextSelection) {
     if (change.start > view.state.selection.from && change.start <= view.state.selection.from + 2 && view.state.selection.from >= parse.from) {
@@ -4508,7 +4532,7 @@ function readDOMChange(view, from, to, typeOver, addedNodes) {
     view.input.lastIOSEnter = 0;
     return;
   }
-  if (view.state.selection.anchor > change.start && looksLikeJoin(doc, change.start, change.endA, $from, $to) && view.someProp("handleKeyDown", function (f) {
+  if (view.state.selection.anchor > change.start && looksLikeBackspace(doc, change.start, change.endA, $from, $to) && view.someProp("handleKeyDown", function (f) {
     return f(view, keyEvent(8, "Backspace"));
   })) {
     if (android && chrome) view.domObserver.suppressSelectionUpdates();
@@ -4593,9 +4617,13 @@ function isMarkChange(cur, prev) {
     type: type
   };
 }
-function looksLikeJoin(old, start, end, $newStart, $newEnd) {
-  if (!$newStart.parent.isTextblock || end - start <= $newEnd.pos - $newStart.pos || skipClosingAndOpening($newStart, true, false) < $newEnd.pos) return false;
+function looksLikeBackspace(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) {
+    var after = $start.nodeAfter;
+    return after != null && end == start + after.nodeSize;
+  }
   if ($start.parentOffset < $start.parent.content.size || !$start.parent.isTextblock) return false;
   var $next = old.resolve(skipClosingAndOpening($start, true, true));
   if (!$next.parent.isTextblock || $next.pos > end || skipClosingAndOpening($next, true, false) < end) return false;
@@ -4771,7 +4799,7 @@ var EditorView = function () {
         if (updateDoc) {
           var chromeKludge = chrome ? this.trackWrites = this.domSelectionRange().focusNode : null;
           if (redraw || !this.docView.update(state.doc, outerDeco, innerDeco, this)) {
-            this.docView.updateOuterDeco([]);
+            this.docView.updateOuterDeco(outerDeco);
             this.docView.destroy();
             this.docView = docViewDesc(state.doc, outerDeco, innerDeco, this.dom, this);
           }
@@ -4978,6 +5006,7 @@ var EditorView = function () {
       }
       this.docView.destroy();
       this.docView = null;
+      clearReusedRange();
     }
   }, {
     key: "isDestroyed",

package/dist/index.d.cts

@@ -210,11 +210,21 @@ declare class DecorationSet implements DecorationSource {
     */
     remove(decorations: Decoration[]): DecorationSet;
     private removeInner;
+    forChild(offset: number, node: Node): DecorationSet | DecorationGroup;
     /**
     The empty set of decorations.
     */
     static empty: DecorationSet;
 }
+declare class DecorationGroup implements DecorationSource {
+    readonly members: readonly DecorationSet[];
+    constructor(members: readonly DecorationSet[]);
+    map(mapping: Mapping, doc: Node): DecorationSource;
+    forChild(offset: number, child: Node): DecorationSource | DecorationSet;
+    eq(other: DecorationGroup): boolean;
+    locals(node: Node): readonly any[];
+    static from(members: readonly DecorationSource[]): DecorationSource;
+}
 
 declare global {
     interface Node {

package/dist/index.d.ts

@@ -210,11 +210,21 @@ declare class DecorationSet implements DecorationSource {
     */
     remove(decorations: Decoration[]): DecorationSet;
     private removeInner;
+    forChild(offset: number, node: Node): DecorationSet | DecorationGroup;
     /**
     The empty set of decorations.
     */
     static empty: DecorationSet;
 }
+declare class DecorationGroup implements DecorationSource {
+    readonly members: readonly DecorationSet[];
+    constructor(members: readonly DecorationSet[]);
+    map(mapping: Mapping, doc: Node): DecorationSource;
+    forChild(offset: number, child: Node): DecorationSource | DecorationSet;
+    eq(other: DecorationGroup): boolean;
+    locals(node: Node): readonly any[];
+    static from(members: readonly DecorationSource[]): DecorationSource;
+}
 
 declare global {
     interface Node {

package/dist/index.js

@@ -23,6 +23,9 @@ const textRange = function (node, from, to) {
     range.setStart(node, from || 0);
     return range;
 };
+const clearReusedRange = function () {
+    reusedRange = null;
+};
 // Scans forward and backward through DOM positions equivalent to the
 // given one to see if the two are in the same place (i.e. after a
 // text node vs at the end of that text node)
@@ -57,6 +60,44 @@ function scanFor(node, off, targetNode, targetOff, dir) {
 function nodeSize(node) {
     return node.nodeType == 3 ? node.nodeValue.length : node.childNodes.length;
 }
+function textNodeBefore$1(node, offset) {
+    for (;;) {
+        if (node.nodeType == 3 && offset)
+            return node;
+        if (node.nodeType == 1 && offset > 0) {
+            if (node.contentEditable != "false")
+                return null;
+            node = node.childNodes[offset - 1];
+            offset = nodeSize(node);
+        }
+        else if (node.parentNode && !hasBlockDesc(node)) {
+            offset = domIndex(node);
+            node = node.parentNode;
+        }
+        else {
+            return null;
+        }
+    }
+}
+function textNodeAfter$1(node, offset) {
+    for (;;) {
+        if (node.nodeType == 3 && offset < node.nodeValue.length)
+            return node;
+        if (node.nodeType == 1 && offset < node.childNodes.length) {
+            if (node.contentEditable != "false")
+                return null;
+            node = node.childNodes[offset];
+            offset = 0;
+        }
+        else if (node.parentNode && !hasBlockDesc(node)) {
+            offset = domIndex(node) + 1;
+            node = node.parentNode;
+        }
+        else {
+            return null;
+        }
+    }
+}
 function isOnEdge(node, offset, parent) {
     for (let atStart = offset == 0, atEnd = offset == nodeSize(node); atStart || atEnd;) {
         if (node == parent)
@@ -133,6 +174,12 @@ const webkit = !!doc && "webkitFontSmoothing" in doc.documentElement.style;
 const webkit_version = webkit ? +(/\bAppleWebKit\/(\d+)/.exec(navigator.userAgent) || [0, 0])[1] : 0;
 
 function windowRect(doc) {
+    let vp = doc.defaultView && doc.defaultView.visualViewport;
+    if (vp)
+        return {
+            left: 0, right: vp.width,
+            top: 0, bottom: vp.height
+        };
     return { left: 0, right: doc.documentElement.clientWidth,
         top: 0, bottom: doc.documentElement.clientHeight };
 }
@@ -1331,7 +1378,14 @@ class NodeViewDesc extends ViewDesc {
         if (!(view.state.selection instanceof TextSelection) || from < pos || to > pos + this.node.content.size)
             return null;
         let sel = view.domSelectionRange();
-        let textNode = nearbyTextNode(sel.focusNode, sel.focusOffset);
+        let textBefore = textNodeBefore$1(sel.focusNode, sel.focusOffset);
+        let textAfter = textNodeAfter$1(sel.focusNode, sel.focusOffset);
+        let textNode = textBefore || textAfter;
+        if (textBefore && textAfter && textBefore != textAfter) {
+            let descAfter = textAfter.pmViewDesc;
+            if (!descAfter || descAfter instanceof TextViewDesc && descAfter.node.text != textAfter.nodeValue)
+                textNode = textAfter;
+        }
         if (!textNode || !this.dom.contains(textNode.parentNode))
             return null;
         if (this.node.inlineContent) {
@@ -2042,25 +2096,6 @@ function iosHacks(dom) {
         dom.style.cssText = oldCSS;
     }
 }
-function nearbyTextNode(node, offset) {
-    for (;;) {
-        if (node.nodeType == 3)
-            return node;
-        if (node.nodeType == 1 && offset > 0) {
-            if (node.childNodes.length > offset && node.childNodes[offset].nodeType == 3)
-                return node.childNodes[offset];
-            node = node.childNodes[offset - 1];
-            offset = nodeSize(node);
-        }
-        else if (node.nodeType == 1 && offset < node.childNodes.length) {
-            node = node.childNodes[offset];
-            offset = 0;
-        }
-        else {
-            return null;
-        }
-    }
-}
 // Find a piece of text in an inline fragment, overlapping from-to
 function findTextInFragment(frag, text, from, to) {
     for (let i = 0, pos = 0; i < frag.childCount && pos <= to;) {
@@ -4022,9 +4057,6 @@ class DecorationSet {
             return this;
         return local.length || children.length ? new DecorationSet(local, children) : empty;
     }
-    /**
-    @internal
-    */
     forChild(offset, node) {
         if (this == empty)
             return this;
@@ -4825,13 +4857,6 @@ function readDOMChange(view, from, to, typeOver, addedNodes) {
             return;
         }
     }
-    // Chrome sometimes leaves the cursor before the inserted text when
-    // composing after a cursor wrapper. This moves it forward.
-    if (chrome && view.cursorWrapper && parse.sel && parse.sel.anchor == view.cursorWrapper.deco.from &&
-        parse.sel.head == parse.sel.anchor) {
-        let size = change.endB - change.start;
-        parse.sel = { anchor: parse.sel.anchor + size, head: parse.sel.anchor + size };
-    }
     view.input.domChangeCount++;
     // Handle the case where overwriting a selection by typing matches
     // the start or end of the selected content, creating a change
@@ -4877,7 +4902,7 @@ function readDOMChange(view, from, to, typeOver, addedNodes) {
     }
     // Same for backspace
     if (view.state.selection.anchor > change.start &&
-        looksLikeJoin(doc, change.start, change.endA, $from, $to) &&
+        looksLikeBackspace(doc, change.start, change.endA, $from, $to) &&
         view.someProp("handleKeyDown", f => f(view, keyEvent(8, "Backspace")))) {
         if (android && chrome)
             view.domObserver.suppressSelectionUpdates(); // #820
@@ -4989,14 +5014,18 @@ function isMarkChange(cur, prev) {
     if (Fragment.from(updated).eq(cur))
         return { mark, type };
 }
-function looksLikeJoin(old, start, end, $newStart, $newEnd) {
-    if (!$newStart.parent.isTextblock ||
-        // The content must have shrunk
-        end - start <= $newEnd.pos - $newStart.pos ||
+function looksLikeBackspace(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
         skipClosingAndOpening($newStart, true, false) < $newEnd.pos)
         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) {
+        let after = $start.nodeAfter;
+        return after != null && end == start + after.nodeSize;
+    }
     // Start must be at the end of a block
     if ($start.parentOffset < $start.parent.content.size || !$start.parent.isTextblock)
         return false;
@@ -5248,7 +5277,7 @@ class EditorView {
                 // did write to the node.
                 let chromeKludge = chrome ? (this.trackWrites = this.domSelectionRange().focusNode) : null;
                 if (redraw || !this.docView.update(state.doc, outerDeco, innerDeco, this)) {
-                    this.docView.updateOuterDeco([]);
+                    this.docView.updateOuterDeco(outerDeco);
                     this.docView.destroy();
                     this.docView = docViewDesc(state.doc, outerDeco, innerDeco, this.dom, this);
                 }
@@ -5525,6 +5554,7 @@ class EditorView {
         }
         this.docView.destroy();
         this.docView = null;
+        clearReusedRange();
     }
     /**
     This is true when the view has been

package/package.json

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