Remove dead code for pager (#2651)

This commit is contained in:
dan 2024-02-05 22:40:07 +00:00 committed by GitHub
parent f0e046a44b
commit b7056365dd
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 13 additions and 35 deletions

View file

@ -22,7 +22,6 @@ export interface RenderTabBarFnProps {
export type RenderTabBarFn = (props: RenderTabBarFnProps) => JSX.Element export type RenderTabBarFn = (props: RenderTabBarFnProps) => JSX.Element
interface Props { interface Props {
tabBarPosition?: 'top' | 'bottom'
initialPage?: number initialPage?: number
renderTabBar: RenderTabBarFn renderTabBar: RenderTabBarFn
onPageSelected?: (index: number) => void onPageSelected?: (index: number) => void
@ -36,7 +35,6 @@ export const Pager = forwardRef<PagerRef, React.PropsWithChildren<Props>>(
function PagerImpl( function PagerImpl(
{ {
children, children,
tabBarPosition = 'top',
initialPage = 0, initialPage = 0,
renderTabBar, renderTabBar,
onPageScrollStateChanged, onPageScrollStateChanged,
@ -122,11 +120,10 @@ export const Pager = forwardRef<PagerRef, React.PropsWithChildren<Props>>(
return ( return (
<View testID={testID} style={s.flex1}> <View testID={testID} style={s.flex1}>
{tabBarPosition === 'top' && {renderTabBar({
renderTabBar({ selectedPage,
selectedPage, onSelect: onTabBarSelect,
onSelect: onTabBarSelect, })}
})}
<AnimatedPagerView <AnimatedPagerView
ref={pagerView} ref={pagerView}
style={s.flex1} style={s.flex1}
@ -136,11 +133,6 @@ export const Pager = forwardRef<PagerRef, React.PropsWithChildren<Props>>(
onPageScroll={onPageScroll}> onPageScroll={onPageScroll}>
{children} {children}
</AnimatedPagerView> </AnimatedPagerView>
{tabBarPosition === 'bottom' &&
renderTabBar({
selectedPage,
onSelect: onTabBarSelect,
})}
</View> </View>
) )
}, },

View file

@ -11,7 +11,6 @@ export interface RenderTabBarFnProps {
export type RenderTabBarFn = (props: RenderTabBarFnProps) => JSX.Element export type RenderTabBarFn = (props: RenderTabBarFnProps) => JSX.Element
interface Props { interface Props {
tabBarPosition?: 'top' | 'bottom'
initialPage?: number initialPage?: number
renderTabBar: RenderTabBarFn renderTabBar: RenderTabBarFn
onPageSelected?: (index: number) => void onPageSelected?: (index: number) => void
@ -20,7 +19,6 @@ interface Props {
export const Pager = React.forwardRef(function PagerImpl( export const Pager = React.forwardRef(function PagerImpl(
{ {
children, children,
tabBarPosition = 'top',
initialPage = 0, initialPage = 0,
renderTabBar, renderTabBar,
onPageSelected, onPageSelected,
@ -72,22 +70,16 @@ export const Pager = React.forwardRef(function PagerImpl(
return ( return (
<View style={s.hContentRegion}> <View style={s.hContentRegion}>
{tabBarPosition === 'top' && {renderTabBar({
renderTabBar({ selectedPage,
selectedPage, tabBarAnchor: <View ref={anchorRef} />,
tabBarAnchor: <View ref={anchorRef} />, onSelect: onTabBarSelect,
onSelect: onTabBarSelect, })}
})}
{React.Children.map(children, (child, i) => ( {React.Children.map(children, (child, i) => (
<View style={selectedPage === i ? s.flex1 : s.hidden} key={`page-${i}`}> <View style={selectedPage === i ? s.flex1 : s.hidden} key={`page-${i}`}>
{child} {child}
</View> </View>
))} ))}
{tabBarPosition === 'bottom' &&
renderTabBar({
selectedPage,
onSelect: onTabBarSelect,
})}
</View> </View>
) )
}) })

View file

@ -183,8 +183,7 @@ export const PagerWithHeader = React.forwardRef<PagerRef, PagerWithHeaderProps>(
initialPage={initialPage} initialPage={initialPage}
onPageSelected={onPageSelectedInner} onPageSelected={onPageSelectedInner}
onPageSelecting={onPageSelecting} onPageSelecting={onPageSelecting}
renderTabBar={renderTabBar} renderTabBar={renderTabBar}>
tabBarPosition="top">
{toArray(children) {toArray(children)
.filter(Boolean) .filter(Boolean)
.map((child, i) => { .map((child, i) => {

View file

@ -76,8 +76,7 @@ export const PagerWithHeader = React.forwardRef<PagerRef, PagerWithHeaderProps>(
initialPage={initialPage} initialPage={initialPage}
onPageSelected={onPageSelectedInner} onPageSelected={onPageSelectedInner}
onPageSelecting={onPageSelecting} onPageSelecting={onPageSelecting}
renderTabBar={renderTabBar} renderTabBar={renderTabBar}>
tabBarPosition="top">
{toArray(children) {toArray(children)
.filter(Boolean) .filter(Boolean)
.map((child, i) => { .map((child, i) => {

View file

@ -184,8 +184,7 @@ function HomeScreenReady({
initialPage={clamp(selectedPageIndex, 0, customFeeds.length)} initialPage={clamp(selectedPageIndex, 0, customFeeds.length)}
onPageSelected={onPageSelected} onPageSelected={onPageSelected}
onPageScrollStateChanged={onPageScrollStateChanged} onPageScrollStateChanged={onPageScrollStateChanged}
renderTabBar={renderTabBar} renderTabBar={renderTabBar}>
tabBarPosition="top">
<FeedPage <FeedPage
key="1" key="1"
testID="followingFeedPage" testID="followingFeedPage"
@ -212,8 +211,7 @@ function HomeScreenReady({
testID="homeScreen" testID="homeScreen"
onPageSelected={onPageSelected} onPageSelected={onPageSelected}
onPageScrollStateChanged={onPageScrollStateChanged} onPageScrollStateChanged={onPageScrollStateChanged}
renderTabBar={renderTabBar} renderTabBar={renderTabBar}>
tabBarPosition="top">
<HomeLoggedOutCTA /> <HomeLoggedOutCTA />
</Pager> </Pager>
) )

View file

@ -337,7 +337,6 @@ export function SearchScreenInner({
if (hasSession) { if (hasSession) {
return query ? ( return query ? (
<Pager <Pager
tabBarPosition="top"
onPageSelected={onPageSelected} onPageSelected={onPageSelected}
renderTabBar={props => ( renderTabBar={props => (
<CenteredView <CenteredView
@ -380,7 +379,6 @@ export function SearchScreenInner({
return query ? ( return query ? (
<Pager <Pager
tabBarPosition="top"
onPageSelected={onPageSelected} onPageSelected={onPageSelected}
renderTabBar={props => ( renderTabBar={props => (
<CenteredView <CenteredView