From 66a6f5431b65d47e2fbe416a7348caceea686733 Mon Sep 17 00:00:00 2001 From: Eduardo San Martin Morote Date: Mon, 11 Dec 2023 15:56:24 +0100 Subject: [PATCH] refactor: remove deprecated usage of pageXOffset --- packages/router/src/scrollBehavior.ts | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/packages/router/src/scrollBehavior.ts b/packages/router/src/scrollBehavior.ts index 8c772cb0..7072604a 100644 --- a/packages/router/src/scrollBehavior.ts +++ b/packages/router/src/scrollBehavior.ts @@ -16,7 +16,7 @@ export type ScrollPositionCoordinates = { /** * Internal normalized version of {@link ScrollPositionCoordinates} that always - * has `left` and `top` coordinates. + * has `left` and `top` coordinates. Must be a type to be assignable to HistoryStateValue. * * @internal */ @@ -68,11 +68,10 @@ function getElementPosition( } } -export const computeScrollPosition = () => - ({ - left: window.pageXOffset, - top: window.pageYOffset, - } as _ScrollPositionNormalized) +export const computeScrollPosition = (): _ScrollPositionNormalized => ({ + left: window.scrollX, + top: window.scrollY, +}) export function scrollToPosition(position: ScrollPosition): void { let scrollToOptions: ScrollPositionCoordinates @@ -146,8 +145,8 @@ export function scrollToPosition(position: ScrollPosition): void { window.scrollTo(scrollToOptions) else { window.scrollTo( - scrollToOptions.left != null ? scrollToOptions.left : window.pageXOffset, - scrollToOptions.top != null ? scrollToOptions.top : window.pageYOffset + scrollToOptions.left != null ? scrollToOptions.left : window.scrollX, + scrollToOptions.top != null ? scrollToOptions.top : window.scrollY ) } } -- 2.47.2