From e09b3185bb51616e4e2c414d76a61eebfaf93e67 Mon Sep 17 00:00:00 2001 From: Dan Abramov Date: Thu, 21 Dec 2023 02:46:30 +0000 Subject: [PATCH] Fix some issues with restoration --- src/Navigation.tsx | 5 ++++- src/view/com/pager/Pager.web.tsx | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/Navigation.tsx b/src/Navigation.tsx index c1b28f9ac8..27e9beadd0 100644 --- a/src/Navigation.tsx +++ b/src/Navigation.tsx @@ -521,7 +521,10 @@ function RoutesContainer({children}: React.PropsWithChildren<{}>) { // TODO: Clean up? navigationRef.current?.addListener('__unsafe_action__', e => { if (webFocusedScreen) { - webScrollPositions.set(webFocusedScreen, window.scrollY) + webScrollPositions.set( + webFocusedScreen, + Math.round(window.scrollY), + ) } }) } diff --git a/src/view/com/pager/Pager.web.tsx b/src/view/com/pager/Pager.web.tsx index f0de811f3b..ed9b285b68 100644 --- a/src/view/com/pager/Pager.web.tsx +++ b/src/view/com/pager/Pager.web.tsx @@ -36,7 +36,7 @@ export const Pager = React.forwardRef(function PagerImpl( const onTabBarSelect = React.useCallback( (index: number) => { - const scrollY = window.scrollY + const scrollY = Math.round(window.scrollY) scrollYs.current[selectedPage] = scrollY setSelectedPage(index) onPageSelected?.(index)