prosemirror-view 1.37.0 → 1.37.1

package/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 1.37.1 (2024-12-11)
+
+### Bug fixes
+
+Fix an issue where `display: content` elements could break `posAtCoords`.
+
+Work around an issue with Chrome reporting the selection incorrectly during composition.
+
 ## 1.37.0 (2024-11-23)
 
 ### Bug fixes

package/dist/index.cjs

@@ -389,10 +389,10 @@ function posFromCaret(view, node, offset, coords) {
   var outsideBlock = -1;
   for (var cur = node, sawBlock = false;;) {
     if (cur == view.dom) break;
-    var desc = view.docView.nearestDesc(cur, true);
+    var desc = view.docView.nearestDesc(cur, true),
+      rect = void 0;
     if (!desc) return null;
-    if (desc.dom.nodeType == 1 && (desc.node.isBlock && desc.parent || !desc.contentDOM)) {
-      var rect = desc.dom.getBoundingClientRect();
+    if (desc.dom.nodeType == 1 && (desc.node.isBlock && desc.parent || !desc.contentDOM) && ((rect = desc.dom.getBoundingClientRect()).width || rect.height)) {
       if (desc.node.isBlock && desc.parent) {
         if (!sawBlock && rect.left > coords.left || rect.top > coords.top) outsideBlock = desc.posBefore;else if (!sawBlock && rect.right < coords.left || rect.bottom < coords.top) outsideBlock = desc.posAfter;
         sawBlock = true;
@@ -2874,7 +2874,7 @@ var InputState = _createClass(function InputState() {
   this.lastIOSEnterFallbackTimeout = -1;
   this.lastFocus = 0;
   this.lastTouch = 0;
-  this.lastAndroidDelete = 0;
+  this.lastChromeDelete = 0;
   this.composing = false;
   this.compositionNode = null;
   this.composingTimeout = -1;
@@ -4661,7 +4661,7 @@ function readDOMChange(view, from, to, typeOver, addedNodes) {
     if (android && chrome) view.domObserver.suppressSelectionUpdates();
     return;
   }
-  if (chrome && android && change.endB == change.start) view.input.lastAndroidDelete = Date.now();
+  if (chrome && change.endB == change.start) view.input.lastChromeDelete = Date.now();
   if (android && !inlineChange && $from.start() != $to.start() && $to.parentOffset == 0 && $from.depth == $to.depth && parse.sel && parse.sel.anchor == parse.sel.head && parse.sel.head == change.endA) {
     change.endB -= 2;
     $to = parse.doc.resolveNoCache(change.endB - parse.from);
@@ -4698,7 +4698,7 @@ function readDOMChange(view, from, to, typeOver, addedNodes) {
   if (!tr) tr = view.state.tr.replace(chFrom, chTo, parse.doc.slice(change.start - parse.from, change.endB - parse.from));
   if (parse.sel) {
     var _sel3 = resolveSelection(view, tr.doc, parse.sel);
-    if (_sel3 && !(chrome && android && view.composing && _sel3.empty && (change.start != change.endB || view.input.lastAndroidDelete < Date.now() - 100) && (_sel3.head == chFrom || _sel3.head == tr.mapping.map(chTo) - 1) || ie && _sel3.empty && _sel3.head == chFrom)) tr.setSelection(_sel3);
+    if (_sel3 && !(chrome && view.composing && _sel3.empty && (change.start != change.endB || view.input.lastChromeDelete < Date.now() - 100) && (_sel3.head == chFrom || _sel3.head == tr.mapping.map(chTo) - 1) || ie && _sel3.empty && _sel3.head == chFrom)) tr.setSelection(_sel3);
   }
   if (storedMarks) tr.ensureMarks(storedMarks);
   if (compositionID) tr.setMeta("composition", compositionID);

package/dist/index.js

@@ -396,11 +396,12 @@ function posFromCaret(view, node, offset, coords) {
     for (let cur = node, sawBlock = false;;) {
         if (cur == view.dom)
             break;
-        let desc = view.docView.nearestDesc(cur, true);
+        let desc = view.docView.nearestDesc(cur, true), rect;
         if (!desc)
             return null;
-        if (desc.dom.nodeType == 1 && (desc.node.isBlock && desc.parent || !desc.contentDOM)) {
-            let rect = desc.dom.getBoundingClientRect();
+        if (desc.dom.nodeType == 1 && (desc.node.isBlock && desc.parent || !desc.contentDOM) &&
+            // Ignore elements with zero-size bounding rectangles
+            ((rect = desc.dom.getBoundingClientRect()).width || rect.height)) {
             if (desc.node.isBlock && desc.parent) {
                 // Only apply the horizontal test to the innermost block. Vertical for any parent.
                 if (!sawBlock && rect.left > coords.left || rect.top > coords.top)
@@ -3042,7 +3043,7 @@ class InputState {
         this.lastIOSEnterFallbackTimeout = -1;
         this.lastFocus = 0;
         this.lastTouch = 0;
-        this.lastAndroidDelete = 0;
+        this.lastChromeDelete = 0;
         this.composing = false;
         this.compositionNode = null;
         this.composingTimeout = -1;
@@ -5020,11 +5021,11 @@ function readDOMChange(view, from, to, typeOver, addedNodes) {
             view.domObserver.suppressSelectionUpdates(); // #820
         return;
     }
-    // Chrome Android will occasionally, during composition, delete the
+    // Chrome will occasionally, during composition, delete the
     // entire composition and then immediately insert it again. This is
     // used to detect that situation.
-    if (chrome && android && change.endB == change.start)
-        view.input.lastAndroidDelete = Date.now();
+    if (chrome && change.endB == change.start)
+        view.input.lastChromeDelete = Date.now();
     // This tries to detect Android virtual keyboard
     // enter-and-pick-suggestion action. That sometimes (see issue
     // #1059) first fires a DOM mutation, before moving the selection to
@@ -5075,13 +5076,13 @@ function readDOMChange(view, from, to, typeOver, addedNodes) {
         tr = view.state.tr.replace(chFrom, chTo, parse.doc.slice(change.start - parse.from, change.endB - parse.from));
     if (parse.sel) {
         let sel = resolveSelection(view, tr.doc, parse.sel);
-        // Chrome Android will sometimes, during composition, report the
+        // Chrome will sometimes, during composition, report the
         // selection in the wrong place. If it looks like that is
         // happening, don't update the selection.
         // Edge just doesn't move the cursor forward when you start typing
         // in an empty block or between br nodes.
-        if (sel && !(chrome && android && view.composing && sel.empty &&
-            (change.start != change.endB || view.input.lastAndroidDelete < Date.now() - 100) &&
+        if (sel && !(chrome && view.composing && sel.empty &&
+            (change.start != change.endB || view.input.lastChromeDelete < Date.now() - 100) &&
             (sel.head == chFrom || sel.head == tr.mapping.map(chTo) - 1) ||
             ie && sel.empty && sel.head == chFrom))
             tr.setSelection(sel);

package/package.json

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

package/src/domchange.ts

@@ -196,11 +196,11 @@ export function readDOMChange(view: EditorView, from: number, to: number, typeOv
     return
   }
 
-  // Chrome Android will occasionally, during composition, delete the
+  // Chrome will occasionally, during composition, delete the
   // entire composition and then immediately insert it again. This is
   // used to detect that situation.
-  if (browser.chrome && browser.android && change.endB == change.start)
-    view.input.lastAndroidDelete = Date.now()
+  if (browser.chrome && change.endB == change.start)
+    view.input.lastChromeDelete = Date.now()
 
   // This tries to detect Android virtual keyboard
   // enter-and-pick-suggestion action. That sometimes (see issue
@@ -252,13 +252,13 @@ export function readDOMChange(view: EditorView, from: number, to: number, typeOv
     tr = view.state.tr.replace(chFrom, chTo, parse.doc.slice(change.start - parse.from, change.endB - parse.from))
   if (parse.sel) {
     let sel = resolveSelection(view, tr.doc, parse.sel)
-    // Chrome Android will sometimes, during composition, report the
+    // Chrome will sometimes, during composition, report the
     // selection in the wrong place. If it looks like that is
     // happening, don't update the selection.
     // Edge just doesn't move the cursor forward when you start typing
     // in an empty block or between br nodes.
-    if (sel && !(browser.chrome && browser.android && view.composing && sel.empty &&
-                 (change.start != change.endB || view.input.lastAndroidDelete < Date.now() - 100) &&
+    if (sel && !(browser.chrome && view.composing && sel.empty &&
+                 (change.start != change.endB || view.input.lastChromeDelete < Date.now() - 100) &&
                  (sel.head == chFrom || sel.head == tr.mapping.map(chTo) - 1) ||
                  browser.ie && sel.empty && sel.head == chFrom))
       tr.setSelection(sel)

package/src/domcoords.ts

@@ -225,10 +225,11 @@ function posFromCaret(view: EditorView, node: Node, offset: number, coords: {top
   let outsideBlock = -1
   for (let cur = node, sawBlock = false;;) {
     if (cur == view.dom) break
-    let desc = view.docView.nearestDesc(cur, true)
+    let desc = view.docView.nearestDesc(cur, true), rect
     if (!desc) return null
-    if (desc.dom.nodeType == 1 && (desc.node.isBlock && desc.parent || !desc.contentDOM)) {
-      let rect = (desc.dom as HTMLElement).getBoundingClientRect()
+    if (desc.dom.nodeType == 1 && (desc.node.isBlock && desc.parent || !desc.contentDOM) &&
+        // Ignore elements with zero-size bounding rectangles
+        ((rect = (desc.dom as HTMLElement).getBoundingClientRect()).width || rect.height)) {
       if (desc.node.isBlock && desc.parent) {
         // Only apply the horizontal test to the innermost block. Vertical for any parent.
         if (!sawBlock && rect.left > coords.left || rect.top > coords.top) outsideBlock = desc.posBefore

package/src/input.ts

@@ -28,7 +28,7 @@ export class InputState {
   lastIOSEnterFallbackTimeout = -1
   lastFocus = 0
   lastTouch = 0
-  lastAndroidDelete = 0
+  lastChromeDelete = 0
   composing = false
   compositionNode: Text | null = null
   composingTimeout = -1