xiaoxue_admin
/
Folo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor(mobile): Simplify EntryListSelector and ViewPagerList component structure 

Move TimelineSelectorHeader to wrap ViewPagerList and remove redundant wrapping in EntryListSelector

Signed-off-by: Innei <tukon479@gmail.com>
This commit is contained in:
Innei 2025-02-19 18:48:44 +08:00
parent 277e27cadc
commit b412798958
No known key found for this signature in database
GPG Key ID: 0F62D33977F021F7
2 changed files with 27 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
apps/mobile/src/modules/entry-list/EntryListSelector.tsx
View File

@ -2,7 +2,6 @@ import { FeedViewType } from "@follow/constants"
import { EntryListContentGrid } from "@/src/modules/entry-list/EntryListContentGrid"
import { TimelineSelectorHeader } from "../screen/TimelineSelectorHeader"
import { EntryListContentArticle } from "./EntryListContentArticle"
import { EntryListContentSocial } from "./EntryListContentSocial"
@ -30,9 +29,5 @@ export function EntryListSelector({
}
}
return (
<TimelineSelectorHeader>
<ContentComponent entryIds={entryIds} />
</TimelineSelectorHeader>
)
return <ContentComponent entryIds={entryIds} />
}

49
apps/mobile/src/modules/entry-list/index.tsx
View File

@ -19,6 +19,7 @@ import {
} from "@/src/store/entry/hooks"
import { useListEntryIds } from "@/src/store/list/hooks"
import { TimelineSelectorHeader } from "../screen/TimelineSelectorHeader"
import { EntryListSelector } from "./EntryListSelector"
import { usePagerView } from "./usePagerView"
@ -73,29 +74,31 @@ function ViewPagerList({ viewId }: { viewId: FeedViewType }) {
return (
<View style={styles.container}>
<AnimatedPagerView
testID="pager-view"
ref={pagerRef}
style={styles.PagerView}
initialPage={page}
layoutDirection="ltr"
overdrag
onPageScroll={rest.onPageScroll}
onPageSelected={rest.onPageSelected}
onPageScrollStateChanged={rest.onPageScrollStateChanged}
pageMargin={10}
orientation="horizontal"
>
{useMemo(
() =>
views.map((view) => (
<View testID="pager-view-content" key={view.view}>
<ViewEntryList viewId={view.view} />
</View>
)),
[],
)}
</AnimatedPagerView>
<TimelineSelectorHeader>
<AnimatedPagerView
testID="pager-view"
ref={pagerRef}
style={styles.PagerView}
initialPage={page}
layoutDirection="ltr"
overdrag
onPageScroll={rest.onPageScroll}
onPageSelected={rest.onPageSelected}
onPageScrollStateChanged={rest.onPageScrollStateChanged}
pageMargin={10}
orientation="horizontal"
>
{useMemo(
() =>
views.map((view) => (
<View testID="pager-view-content" key={view.view}>
<ViewEntryList viewId={view.view} />
</View>
)),
[],
)}
</AnimatedPagerView>
</TimelineSelectorHeader>
</View>
)
}