Clip scrolled rectangle to element bounding box while traversing DOM for scrolling

marijnh · marijnh · commit 61f4b5c26ae1 · 2025-02-28T12:44:41.000+01:00
diff --git a/src/dom.ts b/src/dom.ts
@@ -193,6 +193,10 @@ export function scrollRectIntoView(dom: HTMLElement, rect: Rect, side: -1 | 1,
         }
       }
       if (top) break
+      if (rect.top < bounding.top || rect.bottom > bounding.bottom ||
+          rect.left < bounding.left || rect.right > bounding.right)
+        rect = {left: Math.max(rect.left, bounding.left), right: Math.min(rect.right, bounding.right),
+                top: Math.max(rect.top, bounding.top), bottom: Math.min(rect.bottom, bounding.bottom)}
       cur = cur.assignedSlot || cur.parentNode
     } else if (cur.nodeType == 11) { // A shadow root
       cur = cur.host

Original file line number	Diff line number	Diff line change
`@@ -193,6 +193,10 @@ export function scrollRectIntoView(dom: HTMLElement, rect: Rect, side: -1 \| 1,`
`193`	`193`	`}`
`194`	`194`	`}`
`195`	`195`	`if (top) break`
	`196`	`+ if (rect.top < bounding.top \|\| rect.bottom > bounding.bottom \|\|`
	`197`	`+ rect.left < bounding.left \|\| rect.right > bounding.right)`
	`198`	`+ rect = {left: Math.max(rect.left, bounding.left), right: Math.min(rect.right, bounding.right),`
	`199`	`+ top: Math.max(rect.top, bounding.top), bottom: Math.min(rect.bottom, bounding.bottom)}`
`196`	`200`	`cur = cur.assignedSlot \|\| cur.parentNode`
`197`	`201`	`} else if (cur.nodeType == 11) { // A shadow root`
`198`	`202`	`cur = cur.host`