prosemirror-view 1.31.8 → 1.32.0

package/CHANGELOG.md

@@ -1,3 +1,15 @@
+## 1.32.0 (2023-09-27)
+
+### Bug fixes
+
+Work around an issue on Chrome where, when clicking above the right side of an uneditable node, the cursor would be put after the node.
+
+Fix a bug that could corrupt the composition when it occurs next to text identical to the composed characters.
+
+### New features
+
+The new `EditorView.updateRoot` method can be used to make the editor update its DOM root when it is moved to a new document or shadow tree.
+
 ## 1.31.8 (2023-09-12)
 
 ### Bug fixes

package/dist/index.cjs

@@ -513,6 +513,8 @@ function _posAtCoords(view, coords) {
       }
     }
 
+    var prev;
+    if (webkit && offset && node.nodeType == 1 && (prev = node.childNodes[offset - 1]).nodeType == 1 && prev.contentEditable == "false" && prev.getBoundingClientRect().top >= coords.top) offset--;
     if (node == view.dom && offset == node.childNodes.length - 1 && node.lastChild.nodeType == 1 && coords.top > node.lastChild.getBoundingClientRect().bottom) pos = view.state.doc.content.size;else if (offset == 0 || node.nodeType != 1 || node.childNodes[offset - 1].nodeName != "BR") pos = posFromCaret(view, node, offset, coords);
   }
 
@@ -2479,6 +2481,7 @@ function findTextInFragment(frag, text, from, to) {
     }
 
     if (pos >= from) {
+      if (pos >= to && str.slice(to - text.length - childStart, to - childStart) == text) return to - text.length;
       var found = childStart < to ? str.lastIndexOf(text, to - childStart - 1) : -1;
       if (found >= 0 && found + text.length + childStart >= from) return childStart + found;
       if (from == to && str.length >= to + text.length - childStart && str.slice(to - childStart, to - childStart + text.length) == text) return to;
@@ -5943,6 +5946,11 @@ var EditorView = function () {
 
       return cached || document;
     }
+  }, {
+    key: "updateRoot",
+    value: function updateRoot() {
+      this._root = null;
+    }
   }, {
     key: "posAtCoords",
     value: function posAtCoords(coords) {

package/dist/index.d.cts

@@ -492,6 +492,11 @@ declare class EditorView {
     */
     get root(): Document | ShadowRoot;
     /**
+    When an existing editor view is moved to a new document or
+    shadow tree, call this to make it recompute its root.
+    */
+    updateRoot(): void;
+    /**
     Given a pair of viewport coordinates, return the document
     position that corresponds to them. May return null if the given
     coordinates aren't inside of the editor. When an object is

package/dist/index.d.ts

@@ -492,6 +492,11 @@ declare class EditorView {
     */
     get root(): Document | ShadowRoot;
     /**
+    When an existing editor view is moved to a new document or
+    shadow tree, call this to make it recompute its root.
+    */
+    updateRoot(): void;
+    /**
     Given a pair of viewport coordinates, return the document
     position that corresponds to them. May return null if the given
     coordinates aren't inside of the editor. When an object is

package/dist/index.js

@@ -426,6 +426,11 @@ function posAtCoords(view, coords) {
                     offset++;
             }
         }
+        let prev;
+        // When clicking above the right side of an uneditable node, Chrome will report a cursor position after that node.
+        if (webkit && offset && node.nodeType == 1 && (prev = node.childNodes[offset - 1]).nodeType == 1 &&
+            prev.contentEditable == "false" && prev.getBoundingClientRect().top >= coords.top)
+            offset--;
         // Suspiciously specific kludge to work around caret*FromPoint
         // never returning a position at the end of the document
         if (node == view.dom && offset == node.childNodes.length - 1 && node.lastChild.nodeType == 1 &&
@@ -2068,6 +2073,8 @@ function findTextInFragment(frag, text, from, to) {
             str += next.text;
         }
         if (pos >= from) {
+            if (pos >= to && str.slice(to - text.length - childStart, to - childStart) == text)
+                return to - text.length;
             let found = childStart < to ? str.lastIndexOf(text, to - childStart - 1) : -1;
             if (found >= 0 && found + text.length + childStart >= from)
                 return childStart + found;
@@ -5354,6 +5361,13 @@ class EditorView {
         return cached || document;
     }
     /**
+    When an existing editor view is moved to a new document or
+    shadow tree, call this to make it recompute its root.
+    */
+    updateRoot() {
+        this._root = null;
+    }
+    /**
     Given a pair of viewport coordinates, return the document
     position that corresponds to them. May return null if the given
     coordinates aren't inside of the editor. When an object is

package/package.json

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

package/src/domcoords.ts

@@ -294,6 +294,11 @@ export function posAtCoords(view: EditorView, coords: {top: number, left: number
           offset++
       }
     }
+    let prev
+    // When clicking above the right side of an uneditable node, Chrome will report a cursor position after that node.
+    if (browser.webkit && offset && node.nodeType == 1 && (prev = node.childNodes[offset - 1]).nodeType == 1 &&
+        (prev as HTMLElement).contentEditable == "false" && (prev as HTMLElement).getBoundingClientRect().top >= coords.top)
+      offset--
     // Suspiciously specific kludge to work around caret*FromPoint
     // never returning a position at the end of the document
     if (node == view.dom && offset == node.childNodes.length - 1 && node.lastChild!.nodeType == 1 &&

package/src/index.ts

@@ -339,6 +339,12 @@ export class EditorView {
     return cached || document
   }
 
+  /// When an existing editor view is moved to a new document or
+  /// shadow tree, call this to make it recompute its root.
+  updateRoot() {
+    this._root = null
+  }
+
   /// Given a pair of viewport coordinates, return the document
   /// position that corresponds to them. May return null if the given
   /// coordinates aren't inside of the editor. When an object is

package/src/viewdesc.ts

@@ -1499,6 +1499,8 @@ function findTextInFragment(frag: Fragment, text: string, from: number, to: numb
       str += next.text
     }
     if (pos >= from) {
+      if (pos >= to && str.slice(to - text.length - childStart, to - childStart) == text)
+        return to - text.length
       let found = childStart < to ? str.lastIndexOf(text, to - childStart - 1) : -1
       if (found >= 0 && found + text.length + childStart >= from)
         return childStart + found