Unverified Commit 083f0523 authored by Tim Neutkens's avatar Tim Neutkens Committed by GitHub

Refine scrolling into view in new router (#38682)

parent f05cee2d
...@@ -42,6 +42,17 @@ function createInfinitePromise() { ...@@ -42,6 +42,17 @@ function createInfinitePromise() {
return infinitePromise return infinitePromise
} }
function isInViewport(element: HTMLElement) {
const rect = element.getBoundingClientRect()
return (
rect.top >= 0 &&
rect.left >= 0 &&
rect.bottom <=
(window.innerHeight || document.documentElement.clientHeight) &&
rect.right <= (window.innerWidth || document.documentElement.clientWidth)
)
}
export function InnerLayoutRouter({ export function InnerLayoutRouter({
parallelRouterKey, parallelRouterKey,
url, url,
...@@ -72,7 +83,10 @@ export function InnerLayoutRouter({ ...@@ -72,7 +83,10 @@ export function InnerLayoutRouter({
if (focusRef.focus && focusAndScrollRef.current) { if (focusRef.focus && focusAndScrollRef.current) {
focusRef.focus = false focusRef.focus = false
focusAndScrollRef.current.focus() focusAndScrollRef.current.focus()
focusAndScrollRef.current.scrollIntoView() // Only scroll into viewport when the layout is not visible currently.
if (!isInViewport(focusAndScrollRef.current)) {
focusAndScrollRef.current.scrollIntoView()
}
} }
}, [focusRef]) }, [focusRef])
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment