diff options
-rw-r--r-- | src/view/com/pager/Pager.tsx | 16 | ||||
-rw-r--r-- | src/view/com/pager/Pager.web.tsx | 18 | ||||
-rw-r--r-- | src/view/com/pager/PagerWithHeader.tsx | 3 | ||||
-rw-r--r-- | src/view/com/pager/PagerWithHeader.web.tsx | 3 | ||||
-rw-r--r-- | src/view/screens/Home.tsx | 6 | ||||
-rw-r--r-- | 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 834b1c0d0..06ec2e450 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<PagerRef, React.PropsWithChildren<Props>>( function PagerImpl( { children, - tabBarPosition = 'top', initialPage = 0, renderTabBar, onPageScrollStateChanged, @@ -122,11 +120,10 @@ export const Pager = forwardRef<PagerRef, React.PropsWithChildren<Props>>( return ( <View testID={testID} style={s.flex1}> - {tabBarPosition === 'top' && - renderTabBar({ - selectedPage, - onSelect: onTabBarSelect, - })} + {renderTabBar({ + selectedPage, + onSelect: onTabBarSelect, + })} <AnimatedPagerView ref={pagerView} style={s.flex1} @@ -136,11 +133,6 @@ export const Pager = forwardRef<PagerRef, React.PropsWithChildren<Props>>( onPageScroll={onPageScroll}> {children} </AnimatedPagerView> - {tabBarPosition === 'bottom' && - renderTabBar({ - selectedPage, - onSelect: onTabBarSelect, - })} </View> ) }, diff --git a/src/view/com/pager/Pager.web.tsx b/src/view/com/pager/Pager.web.tsx index dde799e42..d7113bb05 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 ( <View style={s.hContentRegion}> - {tabBarPosition === 'top' && - renderTabBar({ - selectedPage, - tabBarAnchor: <View ref={anchorRef} />, - onSelect: onTabBarSelect, - })} + {renderTabBar({ + selectedPage, + tabBarAnchor: <View ref={anchorRef} />, + onSelect: onTabBarSelect, + })} {React.Children.map(children, (child, i) => ( <View style={selectedPage === i ? s.flex1 : s.hidden} key={`page-${i}`}> {child} </View> ))} - {tabBarPosition === 'bottom' && - renderTabBar({ - selectedPage, - onSelect: onTabBarSelect, - })} </View> ) }) diff --git a/src/view/com/pager/PagerWithHeader.tsx b/src/view/com/pager/PagerWithHeader.tsx index 279b607ad..7e9ed24db 100644 --- a/src/view/com/pager/PagerWithHeader.tsx +++ b/src/view/com/pager/PagerWithHeader.tsx @@ -183,8 +183,7 @@ export const PagerWithHeader = React.forwardRef<PagerRef, PagerWithHeaderProps>( 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 0a18a9e7d..4f959d548 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<PagerRef, PagerWithHeaderProps>( 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 7d6a40f02..1da276488 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}> <FeedPage key="1" testID="followingFeedPage" @@ -212,8 +211,7 @@ function HomeScreenReady({ testID="homeScreen" onPageSelected={onPageSelected} onPageScrollStateChanged={onPageScrollStateChanged} - renderTabBar={renderTabBar} - tabBarPosition="top"> + renderTabBar={renderTabBar}> <HomeLoggedOutCTA /> </Pager> ) diff --git a/src/view/screens/Search/Search.tsx b/src/view/screens/Search/Search.tsx index 4703899a2..36e6dcff0 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 ? ( <Pager - tabBarPosition="top" onPageSelected={onPageSelected} renderTabBar={props => ( <CenteredView @@ -380,7 +379,6 @@ export function SearchScreenInner({ return query ? ( <Pager - tabBarPosition="top" onPageSelected={onPageSelected} renderTabBar={props => ( <CenteredView |