prosemirror-view 1.31.5 → 1.31.6

package/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 1.31.6 (2023-07-14)
+
+### Bug fixes
+
+Fix a bug that caused `posAtCoords` to return incorrect results for coordinates over inline-decorated text.
+
+Don't try to scroll fixed-positioned elements into view by scrolling their parent elements.
+
 ## 1.31.5 (2023-06-19)
 
 ### Bug fixes

package/dist/index.cjs

@@ -238,7 +238,7 @@ function scrollRectIntoView(view, rect, startDOM) {
       }
     }
 
-    if (atTop) break;
+    if (atTop || /^(fixed|sticky)$/.test(getComputedStyle(parent).position)) break;
   }
 }
 
@@ -441,7 +441,7 @@ function posFromCaret(view, node, offset, coords) {
         if (rect.left > coords.left || rect.top > coords.top) outsideBlock = desc.posBefore;else if (rect.right < coords.left || rect.bottom < coords.top) outsideBlock = desc.posAfter;
       }
 
-      if (!desc.contentDOM && outsideBlock < 0) {
+      if (!desc.contentDOM && outsideBlock < 0 && !desc.node.isText) {
         var before = desc.node.isBlock ? coords.top < (rect.top + rect.bottom) / 2 : coords.left < (rect.left + rect.right) / 2;
         return before ? desc.posBefore : desc.posAfter;
       }
@@ -1393,7 +1393,7 @@ var MarkViewDesc = function (_ViewDesc3) {
       return {
         mark: this.mark.type.name,
         attrs: this.mark.attrs,
-        contentElement: this.contentDOM || undefined
+        contentElement: this.contentDOM
       };
     }
   }, {

package/dist/index.js

@@ -182,7 +182,7 @@ function scrollRectIntoView(view, rect, startDOM) {
                 rect = { left: rect.left - dX, top: rect.top - dY, right: rect.right - dX, bottom: rect.bottom - dY };
             }
         }
-        if (atTop)
+        if (atTop || /^(fixed|sticky)$/.test(getComputedStyle(parent).position))
             break;
     }
 }
@@ -356,7 +356,7 @@ function posFromCaret(view, node, offset, coords) {
                 else if (rect.right < coords.left || rect.bottom < coords.top)
                     outsideBlock = desc.posAfter;
             }
-            if (!desc.contentDOM && outsideBlock < 0) {
+            if (!desc.contentDOM && outsideBlock < 0 && !desc.node.isText) {
                 // If we are inside a leaf, return the side of the leaf closer to the coords
                 let before = desc.node.isBlock ? coords.top < (rect.top + rect.bottom) / 2
                     : coords.left < (rect.left + rect.right) / 2;
@@ -1145,7 +1145,7 @@ class MarkViewDesc extends ViewDesc {
     parseRule() {
         if ((this.dirty & NODE_DIRTY) || this.mark.type.spec.reparseInView)
             return null;
-        return { mark: this.mark.type.name, attrs: this.mark.attrs, contentElement: this.contentDOM || undefined };
+        return { mark: this.mark.type.name, attrs: this.mark.attrs, contentElement: this.contentDOM };
     }
     matchesMark(mark) { return this.dirty != NODE_DIRTY && this.mark.eq(mark); }
     markDirty(from, to) {

package/package.json

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

package/src/domcoords.ts

@@ -53,7 +53,7 @@ export function scrollRectIntoView(view: EditorView, rect: Rect, startDOM: Node)
         rect = {left: rect.left - dX, top: rect.top - dY, right: rect.right - dX, bottom: rect.bottom - dY}
       }
     }
-    if (atTop) break
+    if (atTop || /^(fixed|sticky)$/.test(getComputedStyle(parent as HTMLElement).position)) break
   }
 }
 
@@ -227,7 +227,7 @@ function posFromCaret(view: EditorView, node: Node, offset: number, coords: {top
         if (rect.left > coords.left || rect.top > coords.top) outsideBlock = desc.posBefore
         else if (rect.right < coords.left || rect.bottom < coords.top) outsideBlock = desc.posAfter
       }
-      if (!desc.contentDOM && outsideBlock < 0) {
+      if (!desc.contentDOM && outsideBlock < 0 && !desc.node.isText) {
         // If we are inside a leaf, return the side of the leaf closer to the coords
         let before = desc.node.isBlock ? coords.top < (rect.top + rect.bottom) / 2
           : coords.left < (rect.left + rect.right) / 2

package/src/viewdesc.ts

@@ -562,7 +562,7 @@ class CompositionViewDesc extends ViewDesc {
 // some cases they will be split more often than would appear
 // necessary.
 class MarkViewDesc extends ViewDesc {
-  constructor(parent: ViewDesc, readonly mark: Mark, dom: DOMNode, contentDOM: HTMLElement | null) {
+  constructor(parent: ViewDesc, readonly mark: Mark, dom: DOMNode, contentDOM: HTMLElement) {
     super(parent, [], dom, contentDOM)
   }
 
@@ -576,7 +576,7 @@ class MarkViewDesc extends ViewDesc {
 
   parseRule(): ParseRule | null {
     if ((this.dirty & NODE_DIRTY) || this.mark.type.spec.reparseInView) return null
-    return {mark: this.mark.type.name, attrs: this.mark.attrs, contentElement: this.contentDOM || undefined}
+    return {mark: this.mark.type.name, attrs: this.mark.attrs, contentElement: this.contentDOM!}
   }
 
   matchesMark(mark: Mark) { return this.dirty != NODE_DIRTY && this.mark.eq(mark) }