From b7056365dd648261933a74b9e739c03a63fe86bf Mon Sep 17 00:00:00 2001 From: dan Date: Mon, 5 Feb 2024 22:40:07 +0000 Subject: [PATCH] Remove dead code for pager (#2651) --- src/view/com/pager/Pager.tsx | 16 ++++------------ src/view/com/pager/Pager.web.tsx | 18 +++++------------- src/view/com/pager/PagerWithHeader.tsx | 3 +-- src/view/com/pager/PagerWithHeader.web.tsx | 3 +-- src/view/screens/Home.tsx | 6 ++---- src/view/screens/Search/Search.tsx | 2 -- 6 files changed, 13 insertions(+), 35 deletions(-) diff --git a/src/view/com/pager/Pager.tsx b/src/view/com/pager/Pager.tsx index 834b1c0d..06ec2e45 100644 --- a/src/view/com/pager/Pager.tsx +++ b/src/view/com/pager/Pager.tsx @@ -22,7 +22,6 @@ export interface RenderTabBarFnProps { export type RenderTabBarFn = (props: RenderTabBarFnProps) => JSX.Element interface Props { - tabBarPosition?: 'top' | 'bottom' initialPage?: number renderTabBar: RenderTabBarFn onPageSelected?: (index: number) => void @@ -36,7 +35,6 @@ export const Pager = forwardRef>( function PagerImpl( { children, - tabBarPosition = 'top', initialPage = 0, renderTabBar, onPageScrollStateChanged, @@ -122,11 +120,10 @@ export const Pager = forwardRef>( return ( - {tabBarPosition === 'top' && - renderTabBar({ - selectedPage, - onSelect: onTabBarSelect, - })} + {renderTabBar({ + selectedPage, + onSelect: onTabBarSelect, + })} >( onPageScroll={onPageScroll}> {children} - {tabBarPosition === 'bottom' && - renderTabBar({ - selectedPage, - onSelect: onTabBarSelect, - })} ) }, diff --git a/src/view/com/pager/Pager.web.tsx b/src/view/com/pager/Pager.web.tsx index dde799e4..d7113bb0 100644 --- a/src/view/com/pager/Pager.web.tsx +++ b/src/view/com/pager/Pager.web.tsx @@ -11,7 +11,6 @@ export interface RenderTabBarFnProps { export type RenderTabBarFn = (props: RenderTabBarFnProps) => JSX.Element interface Props { - tabBarPosition?: 'top' | 'bottom' initialPage?: number renderTabBar: RenderTabBarFn onPageSelected?: (index: number) => void @@ -20,7 +19,6 @@ interface Props { export const Pager = React.forwardRef(function PagerImpl( { children, - tabBarPosition = 'top', initialPage = 0, renderTabBar, onPageSelected, @@ -72,22 +70,16 @@ export const Pager = React.forwardRef(function PagerImpl( return ( - {tabBarPosition === 'top' && - renderTabBar({ - selectedPage, - tabBarAnchor: , - onSelect: onTabBarSelect, - })} + {renderTabBar({ + selectedPage, + tabBarAnchor: , + onSelect: onTabBarSelect, + })} {React.Children.map(children, (child, i) => ( {child} ))} - {tabBarPosition === 'bottom' && - renderTabBar({ - selectedPage, - onSelect: onTabBarSelect, - })} ) }) diff --git a/src/view/com/pager/PagerWithHeader.tsx b/src/view/com/pager/PagerWithHeader.tsx index 279b607a..7e9ed24d 100644 --- a/src/view/com/pager/PagerWithHeader.tsx +++ b/src/view/com/pager/PagerWithHeader.tsx @@ -183,8 +183,7 @@ export const PagerWithHeader = React.forwardRef( initialPage={initialPage} onPageSelected={onPageSelectedInner} onPageSelecting={onPageSelecting} - renderTabBar={renderTabBar} - tabBarPosition="top"> + renderTabBar={renderTabBar}> {toArray(children) .filter(Boolean) .map((child, i) => { diff --git a/src/view/com/pager/PagerWithHeader.web.tsx b/src/view/com/pager/PagerWithHeader.web.tsx index 0a18a9e7..4f959d54 100644 --- a/src/view/com/pager/PagerWithHeader.web.tsx +++ b/src/view/com/pager/PagerWithHeader.web.tsx @@ -76,8 +76,7 @@ export const PagerWithHeader = React.forwardRef( initialPage={initialPage} onPageSelected={onPageSelectedInner} onPageSelecting={onPageSelecting} - renderTabBar={renderTabBar} - tabBarPosition="top"> + renderTabBar={renderTabBar}> {toArray(children) .filter(Boolean) .map((child, i) => { diff --git a/src/view/screens/Home.tsx b/src/view/screens/Home.tsx index 7d6a40f0..1da27648 100644 --- a/src/view/screens/Home.tsx +++ b/src/view/screens/Home.tsx @@ -184,8 +184,7 @@ function HomeScreenReady({ initialPage={clamp(selectedPageIndex, 0, customFeeds.length)} onPageSelected={onPageSelected} onPageScrollStateChanged={onPageScrollStateChanged} - renderTabBar={renderTabBar} - tabBarPosition="top"> + renderTabBar={renderTabBar}> + renderTabBar={renderTabBar}> ) diff --git a/src/view/screens/Search/Search.tsx b/src/view/screens/Search/Search.tsx index 4703899a..36e6dcff 100644 --- a/src/view/screens/Search/Search.tsx +++ b/src/view/screens/Search/Search.tsx @@ -337,7 +337,6 @@ export function SearchScreenInner({ if (hasSession) { return query ? ( ( (