From 79eadf5141b2ce90f3e699ab6fd4906281a39e03 Mon Sep 17 00:00:00 2001 From: Dan Abramov Date: Thu, 21 Dec 2023 17:19:55 +0000 Subject: [PATCH] Remove bad idea --- src/view/com/pager/Pager.web.tsx | 22 +++++++----------- src/view/com/pager/PagerWithHeader.web.tsx | 27 ++-------------------- 2 files changed, 10 insertions(+), 39 deletions(-) diff --git a/src/view/com/pager/Pager.web.tsx b/src/view/com/pager/Pager.web.tsx index ed9b285b68..fdb969038f 100644 --- a/src/view/com/pager/Pager.web.tsx +++ b/src/view/com/pager/Pager.web.tsx @@ -20,7 +20,6 @@ export const Pager = React.forwardRef(function PagerImpl( children, tabBarPosition = 'top', initialPage = 0, - headerOnlyHeight = 0, renderTabBar, onPageSelected, onPageSelecting, @@ -41,20 +40,15 @@ export const Pager = React.forwardRef(function PagerImpl( setSelectedPage(index) onPageSelected?.(index) onPageSelecting?.(index) - if (scrollY >= headerOnlyHeight) { - window.scrollTo( - 0, - Math.max(headerOnlyHeight, scrollYs.current[index] ?? 0), - ) - } + // if (scrollY >= headerOnlyHeight) { + window.scrollTo( + 0, + scrollYs.current[index] ?? 0, + // Math.max(headerOnlyHeight, scrollYs.current[index] ?? 0), + ) + // } }, - [ - selectedPage, - setSelectedPage, - onPageSelected, - onPageSelecting, - headerOnlyHeight, - ], + [selectedPage, setSelectedPage, onPageSelected, onPageSelecting], ) return ( diff --git a/src/view/com/pager/PagerWithHeader.web.tsx b/src/view/com/pager/PagerWithHeader.web.tsx index 4b63aabe26..cfdedb2a28 100644 --- a/src/view/com/pager/PagerWithHeader.web.tsx +++ b/src/view/com/pager/PagerWithHeader.web.tsx @@ -39,17 +39,6 @@ export const PagerWithHeader = React.forwardRef( ref, ) { const [currentPage, setCurrentPage] = React.useState(0) - const [headerOnlyHeight, setHeaderOnlyHeight] = React.useState(0) - - const onHeaderOnlyLayout = React.useCallback( - (evt: LayoutChangeEvent) => { - const height = evt.nativeEvent.layout.height - if (height > 0) { - setHeaderOnlyHeight(Math.round(height)) - } - }, - [setHeaderOnlyHeight], - ) const renderTabBar = React.useCallback( (props: RenderTabBarFnProps) => { @@ -59,20 +48,12 @@ export const PagerWithHeader = React.forwardRef( renderHeader={renderHeader} currentPage={currentPage} onCurrentPageSelected={onCurrentPageSelected} - onHeaderOnlyLayout={onHeaderOnlyLayout} onSelect={props.onSelect} testID={testID} /> ) }, - [ - items, - renderHeader, - currentPage, - onCurrentPageSelected, - onHeaderOnlyLayout, - testID, - ], + [items, renderHeader, currentPage, onCurrentPageSelected, testID], ) const onPageSelectedInner = React.useCallback( @@ -95,7 +76,6 @@ export const PagerWithHeader = React.forwardRef( onPageSelected={onPageSelectedInner} onPageSelecting={onPageSelecting} renderTabBar={renderTabBar} - headerOnlyHeight={headerOnlyHeight} tabBarPosition="top"> {toArray(children) .filter(Boolean) @@ -117,7 +97,6 @@ let PagerTabBar = ({ testID, renderHeader, onCurrentPageSelected, - onHeaderOnlyLayout, onSelect, }: { currentPage: number @@ -131,9 +110,7 @@ let PagerTabBar = ({ const {isMobile} = useWebMediaQueries() return ( <> - + {renderHeader?.()}