feat(mobile): optimize feed search result list

This commit is contained in:
DIYgod
2025-04-23 19:26:33 +08:00
parent adaa52f85d
commit 4027d0e6eb
12 changed files with 130 additions and 179 deletions
@@ -49,7 +49,7 @@ interface RelativeDateTimeProps extends TextProps {
export const RelativeDateTime = ({
date,
displayAbsoluteTimeAfterDay = 29,
displayAbsoluteTimeAfterDay = Infinity,
dateFormatTemplate,
postfixText,
...props
@@ -267,6 +267,7 @@ const TarBarItem: FC<{
onLayout(event, index)
}}
tab={tab}
className="py-1"
>
<TabItemInner tab={tab} isSelected={isSelected} />
</TabItem>
+1 -1
View File
@@ -9,5 +9,5 @@ export default function Content() {
const { searchFocusedAtom } = useSearchPageContext()
const isFocused = useAtomValue(searchFocusedAtom)
return <View className="pt-4">{isFocused ? <SearchContent /> : <DiscoverContent />}</View>
return <View>{isFocused ? <SearchContent /> : <DiscoverContent />}</View>
}
@@ -1,6 +0,0 @@
import type { PrimitiveAtom } from "jotai"
import { createContext } from "react"
export const DiscoverContext = createContext<{
headerHeightAtom: PrimitiveAtom<number>
}>(null!)
@@ -13,8 +13,6 @@ import {
import { SearchFeed } from "@/src/modules/discover/search-tabs/SearchFeed"
import { SearchList } from "@/src/modules/discover/search-tabs/SearchList"
import { SearchTabBar } from "./SearchTabBar"
export const SearchContent = () => {
const scrollContainerAnimatedX = useSearchPageScrollContainerAnimatedX()
const { searchTypeAtom } = useSearchPageContext()
@@ -44,7 +42,6 @@ export const SearchContent = () => {
return (
<>
<SearchTabBar animatedX={scrollContainerAnimatedX} />
<AnimatedScrollView
ref={scrollRef}
horizontal
@@ -16,6 +16,7 @@ export const SearchTabBar: FC<{
return (
<TabBar
tabbarClassName="border-b border-b-opaque-separator/40"
tabScrollContainerAnimatedX={animatedX}
tabs={SearchTabs}
currentTab={SearchTabs.findIndex((tab) => tab.value === searchType)}
@@ -1,23 +1,29 @@
import { FeedViewType } from "@follow/constants"
import { getBackgroundGradient } from "@follow/utils"
import { useQuery } from "@tanstack/react-query"
import { LinearGradient } from "expo-linear-gradient"
import { useAtomValue } from "jotai"
import type { FC } from "react"
import type { ListRenderItem, ListRenderItemInfo } from "react-native"
import { Text, useWindowDimensions, View } from "react-native"
import { ScrollView } from "react-native-gesture-handler"
import Animated, { FadeInUp } from "react-native-reanimated"
import { RelativeDateTime } from "@/src/components/ui/datetime/RelativeDateTime"
import { FeedIcon } from "@/src/components/ui/icon/feed-icon"
import { Image } from "@/src/components/ui/image/Image"
import { ItemPressableStyle } from "@/src/components/ui/pressable/enum"
import { ItemPressable } from "@/src/components/ui/pressable/ItemPressable"
import { RightCuteReIcon } from "@/src/icons/right_cute_re"
import { SafeAlertCuteReIcon } from "@/src/icons/safe_alert_cute_re"
import { SafetyCertificateCuteReIcon } from "@/src/icons/safety_certificate_cute_re"
import { User3CuteReIcon } from "@/src/icons/user_3_cute_re"
import { apiClient } from "@/src/lib/api-fetch"
import { useNavigation } from "@/src/lib/navigation/hooks"
import { FollowScreen } from "@/src/screens/(modal)/FollowScreen"
import { useSubscriptionByFeedId } from "@/src/store/subscription/hooks"
import { useColor } from "@/src/theme/colors"
import { useSearchPageContext } from "../ctx"
import { BaseSearchPageFlatList, ItemSeparator, RenderScrollComponent } from "./__base"
import { ItemSeparator } from "./__base"
import { useDataSkeleton } from "./hooks"
type SearchResultItem = Awaited<ReturnType<typeof apiClient.discover.$post>>["data"][number]
@@ -25,8 +31,9 @@ type SearchResultItem = Awaited<ReturnType<typeof apiClient.discover.$post>>["da
export const SearchFeed = () => {
const { searchValueAtom } = useSearchPageContext()
const searchValue = useAtomValue(searchValueAtom)
const windowWidth = useWindowDimensions().width
const { data, isLoading, refetch } = useQuery({
const { data, isLoading } = useQuery({
queryKey: ["searchFeed", searchValue],
queryFn: () => {
return apiClient.discover.$post({
@@ -45,33 +52,30 @@ export const SearchFeed = () => {
if (data === undefined) return null
return (
<BaseSearchPageFlatList
refreshing={isLoading}
onRefresh={refetch}
keyExtractor={keyExtractor}
renderScrollComponent={RenderScrollComponent}
data={data?.data}
renderItem={renderItem}
ItemSeparatorComponent={ItemSeparator}
/>
<View style={{ width: windowWidth }}>
<Text className="text-text/60 px-6 pt-4">Found {data.data?.length} feeds</Text>
<View>
{data.data?.map((item) => (
<View key={item.feed?.id || Math.random().toString()}>
<SearchFeedItem item={item} />
<ItemSeparator />
</View>
))}
</View>
</View>
)
}
const keyExtractor = (item: SearchResultItem) => {
return item.feed?.id || Math.random().toString()
}
const renderItem: ListRenderItem<SearchResultItem> = (props) => (
<SearchFeedItem key={props.item.feed?.id} {...props} />
)
const SearchFeedItem: FC<ListRenderItemInfo<SearchResultItem>> = ({ item }) => {
const SearchFeedItem = ({ item }: { item: SearchResultItem }) => {
const isSubscribed = useSubscriptionByFeedId(item.feed?.id ?? "")
const navigation = useNavigation()
const iconColor = useColor("text")
return (
<Animated.View entering={FadeInUp}>
<ItemPressable
itemStyle={ItemPressableStyle.Plain}
className="py-4"
className="py-8"
onPress={() => {
if (item.feed?.id) {
navigation.presentControllerView(FollowScreen, {
@@ -118,64 +122,92 @@ const SearchFeedItem: FC<ListRenderItemInfo<SearchResultItem>> = ({ item }) => {
{/* Subscribe */}
{isSubscribed && (
<View className="ml-auto">
<View className="bg-gray-5/60 rounded-full px-2 py-1">
<Text className="text-gray-2 text-sm font-medium">Subscribed</Text>
<View className="bg-gray-5/60 rounded-lg px-3 py-2">
<Text className="text-gray-2 text-sm font-medium">Followed</Text>
</View>
</View>
)}
</View>
<View className="mt-3 flex-row items-center gap-1 pl-4 opacity-60">
<RightCuteReIcon width={16} height={16} />
<Text className="text-text">{item.feed?.url}</Text>
</View>
{/* Preview */}
<View className="mt-3">
<ScrollView
horizontal
showsHorizontalScrollIndicator={false}
contentContainerClassName="flex flex-row gap-4 pl-14 pr-2"
contentContainerClassName="flex flex-row gap-4 pl-4"
>
{item.entries?.map((entry) => <PreviewItem entry={entry} key={entry.id} />)}
</ScrollView>
</View>
<View className="mt-4 flex-row items-center gap-6 pl-4 opacity-60">
<View className="flex-row items-center gap-2">
<User3CuteReIcon width={16} height={16} color={iconColor} />
<Text className="text-text">{item.subscriptionCount} followers</Text>
</View>
<View className="flex-row items-center gap-2">
{item.updatesPerWeek ? (
<>
<SafetyCertificateCuteReIcon width={16} height={16} color={iconColor} />
<Text className="text-text">{item.updatesPerWeek} entries/week</Text>
</>
) : item.entries?.[0]?.publishedAt ? (
<>
<SafeAlertCuteReIcon width={16} height={16} color={iconColor} />
<Text className="text-text">Updated</Text>
<RelativeDateTime
className="text-text"
date={new Date(item.entries[0].publishedAt)}
/>
</>
) : null}
</View>
</View>
</ItemPressable>
</Animated.View>
)
}
const formatter = new Intl.DateTimeFormat("en-US", {
year: "numeric",
month: "short",
day: "numeric",
})
const PreviewItem = ({ entry }: { entry: NonNullable<SearchResultItem["entries"]>[number] }) => {
const { width } = useWindowDimensions()
const firstMedia = entry.media?.[0]
const [, , , bgAccent, bgAccentLight] = getBackgroundGradient(
entry.title || entry.url || "Untitled",
)
return (
<View
className="border-gray-5 bg-system-background h-[68px] flex-row rounded-lg border p-2"
style={{ width: (width / 4) * 3 }}
>
{/* Left */}
<View className="flex-1">
<Text className="text-text" ellipsizeMode="tail" numberOfLines={2}>
<View className="bg-secondary-system-background w-[112] flex-col overflow-hidden rounded-lg">
{firstMedia ? (
<Image
source={{ uri: firstMedia.url }}
className="w-full"
placeholder={{
blurhash: firstMedia.blurhash,
}}
aspectRatio={112 / 63}
proxy={{
width: 112,
height: 63,
}}
/>
) : (
<LinearGradient
className="flex h-[63] w-[112] items-center justify-center"
colors={[bgAccentLight!, bgAccent!]}
locations={[0, 1]}
>
<Text className="text-lg font-bold text-white">{entry.title?.[0]}</Text>
</LinearGradient>
)}
<View className="flex flex-1 justify-between p-2">
<Text className="text-text text-sm" ellipsizeMode="tail" numberOfLines={2}>
{entry.title}
</Text>
<Text className="text-text/60 text-sm" ellipsizeMode="tail" numberOfLines={1}>
{formatter.format(new Date(entry.publishedAt))}
</Text>
<RelativeDateTime className="text-text/60 text-sm" date={new Date(entry.publishedAt)} />
</View>
{/* Right */}
{!!firstMedia && (
<View className="bg-gray-6 ml-auto size-[52px] shrink-0 overflow-hidden rounded-lg">
<Image
source={{ uri: firstMedia.url }}
className="size-full rounded-lg"
contentFit="cover"
placeholder={{
blurhash: firstMedia.blurhash,
}}
/>
</View>
)}
</View>
)
}
@@ -1,7 +1,7 @@
import { useQuery } from "@tanstack/react-query"
import { useAtomValue } from "jotai"
import { memo } from "react"
import { Text, View } from "react-native"
import { Text, useWindowDimensions, View } from "react-native"
import { FallbackIcon } from "@/src/components/ui/icon/fallback-icon"
import { Image } from "@/src/components/ui/image/Image"
@@ -13,7 +13,7 @@ import { FollowScreen } from "@/src/screens/(modal)/FollowScreen"
import { useSubscriptionByListId } from "@/src/store/subscription/hooks"
import { useSearchPageContext } from "../ctx"
import { BaseSearchPageFlatList, ItemSeparator, RenderScrollComponent } from "./__base"
import { ItemSeparator } from "./__base"
import { useDataSkeleton } from "./hooks"
type SearchResultItem = Awaited<ReturnType<typeof apiClient.discover.$post>>["data"][number]
@@ -21,8 +21,9 @@ type SearchResultItem = Awaited<ReturnType<typeof apiClient.discover.$post>>["da
export const SearchList = () => {
const { searchValueAtom } = useSearchPageContext()
const searchValue = useAtomValue(searchValueAtom)
const windowWidth = useWindowDimensions().width
const { data, isLoading, refetch } = useQuery({
const { data, isLoading } = useQuery({
queryKey: ["searchList", searchValue],
queryFn: () => {
return apiClient.discover.$post({
@@ -40,24 +41,20 @@ export const SearchList = () => {
if (data === undefined) return null
return (
<BaseSearchPageFlatList
refreshing={isLoading}
onRefresh={refetch}
keyExtractor={keyExtractor}
renderScrollComponent={RenderScrollComponent}
data={data?.data}
renderItem={renderItem}
ItemSeparatorComponent={ItemSeparator}
/>
<View style={{ width: windowWidth }}>
<Text className="text-text/60 px-6 pt-4">Found {data.data?.length} lists</Text>
<View>
{data.data?.map((item) => (
<View key={item.feed?.id || Math.random().toString()}>
<SearchListCard item={item} />
<ItemSeparator />
</View>
))}
</View>
</View>
)
}
const keyExtractor = (item: SearchResultItem) => item.list?.id ?? Math.random().toString()
const renderItem = ({ item }: { item: SearchResultItem }) => (
<SearchListCard key={item.list?.id} item={item} />
)
const SearchListCard = memo(({ item }: { item: SearchResultItem }) => {
const isSubscribed = useSubscriptionByListId(item.list?.id ?? "")
const navigation = useNavigation()
@@ -1,11 +0,0 @@
import { Text } from "react-native"
import { BaseSearchPageScrollView } from "./__base"
export const SearchUser = () => {
return (
<BaseSearchPageScrollView>
<Text>User</Text>
</BaseSearchPageScrollView>
)
}
@@ -1,35 +1,8 @@
import { cn } from "@follow/utils/src/utils"
import { forwardRef } from "react"
import type { ScrollViewProps } from "react-native"
import { ScrollView, useWindowDimensions, View } from "react-native"
import type { FlatListPropsWithLayout } from "react-native-reanimated"
import ReAnimated, { LinearTransition } from "react-native-reanimated"
import { useSafeAreaInsets } from "react-native-safe-area-context"
import { useWindowDimensions, View } from "react-native"
import { useSearchBarHeight } from "../ctx"
export const BaseSearchPageScrollView = forwardRef<ScrollView, ScrollViewProps>(
({ children, ...props }, ref) => {
const searchBarHeight = useSearchBarHeight()
const insets = useSafeAreaInsets()
const windowWidth = useWindowDimensions().width
const offsetTop = searchBarHeight - insets.top
return (
<ScrollView
ref={ref}
style={{ paddingTop: offsetTop, width: windowWidth }}
automaticallyAdjustContentInsets
contentInsetAdjustmentBehavior="always"
className="flex-1"
scrollIndicatorInsets={{ bottom: insets.bottom, top: offsetTop }}
{...props}
>
{children}
</ScrollView>
)
},
)
export const BaseSearchPageRootView = ({
children,
className,
@@ -48,36 +21,7 @@ export const BaseSearchPageRootView = ({
)
}
export function BaseSearchPageFlatList<T>({
refreshing,
onRefresh,
...props
}: FlatListPropsWithLayout<T> & { refreshing: boolean; onRefresh: () => void }) {
const insets = useSafeAreaInsets()
const searchBarHeight = useSearchBarHeight()
const offsetTop = searchBarHeight - insets.top
const windowWidth = useWindowDimensions().width
return (
<ReAnimated.FlatList
itemLayoutAnimation={LinearTransition}
className="flex-1"
style={{ width: windowWidth }}
contentContainerStyle={{ paddingTop: offsetTop + 8 }}
scrollIndicatorInsets={{ bottom: insets.bottom, top: offsetTop }}
automaticallyAdjustContentInsets
contentInsetAdjustmentBehavior="always"
scrollEventThrottle={16}
{...props}
/>
)
}
const itemSeparator = (
<View className="bg-opaque-separator/70 ml-16 h-px" style={{ transform: [{ scaleY: 0.5 }] }} />
<View className="bg-opaque-separator/70 h-px" style={{ transform: [{ scaleY: 0.5 }] }} />
)
export const ItemSeparator = () => itemSeparator
export const RenderScrollComponent = (props: ScrollViewProps) => (
<BaseSearchPageScrollView {...props} />
)
+9 -4
View File
@@ -13,13 +13,14 @@ import { useSafeAreaFrame, useSafeAreaInsets } from "react-native-safe-area-cont
import { ReAnimatedTouchableOpacity } from "@/src/components/common/AnimatedComponents"
import { BlurEffect } from "@/src/components/common/BlurEffect"
import { getDefaultHeaderHeight } from "@/src/components/layouts/utils"
import { SetNavigationHeaderHeightContext } from "@/src/components/layouts/views/NavigationHeaderContext"
import { Search2CuteReIcon } from "@/src/icons/search_2_cute_re"
import { useScreenIsInSheetModal } from "@/src/lib/navigation/hooks"
import { ScreenItemContext } from "@/src/lib/navigation/ScreenItemContext"
import { accentColor, useColor } from "@/src/theme/colors"
import { useSearchPageContext } from "./ctx"
import { DiscoverContext } from "./DiscoverContext"
import { useSearchPageContext, useSearchPageScrollContainerAnimatedX } from "./ctx"
import { SearchTabBar } from "./SearchTabBar"
const DynamicBlurEffect = () => {
const { reAnimatedScrollY } = useContext(ScreenItemContext)
@@ -38,9 +39,12 @@ export const DiscoverHeader = () => {
const insets = useSafeAreaInsets()
const sheetModal = useScreenIsInSheetModal()
const headerHeight = getDefaultHeaderHeight(frame, sheetModal, insets.top)
const { headerHeightAtom } = useContext(DiscoverContext)
const setHeaderHeight = useSetAtom(headerHeightAtom)
const scrollContainerAnimatedX = useSearchPageScrollContainerAnimatedX()
const { searchFocusedAtom } = useSearchPageContext()
const isFocused = useAtomValue(searchFocusedAtom)
const setHeaderHeight = useContext(SetNavigationHeaderHeightContext)
return (
<View
@@ -55,6 +59,7 @@ export const DiscoverHeader = () => {
<View style={styles.header}>
<SearchInput />
</View>
{isFocused && <SearchTabBar animatedX={scrollContainerAnimatedX} />}
</View>
)
}
@@ -1,5 +1,3 @@
import { atom } from "jotai"
import { useMemo, useState } from "react"
import { View } from "react-native"
import { SafeNavigationScrollView } from "@/src/components/layouts/views/SafeNavigationScrollView"
@@ -11,30 +9,23 @@ import {
SearchPageProvider,
SearchPageScrollContainerAnimatedXProvider,
} from "@/src/modules/discover/ctx"
import { DiscoverContext } from "@/src/modules/discover/DiscoverContext"
import { DiscoverHeader } from "@/src/modules/discover/search"
export default function Discover() {
const headerHeightAtom = useState(() => atom(0))[0]
const ctxValue = useMemo(() => ({ headerHeightAtom }), [headerHeightAtom])
return (
<DiscoverContext.Provider value={ctxValue}>
<SearchPageScrollContainerAnimatedXProvider>
<SearchPageProvider>
<SafeNavigationScrollView
Header={
<View className="absolute top-0 z-10 w-full">
<DiscoverHeader />
</View>
}
>
<Content />
</SafeNavigationScrollView>
</SearchPageProvider>
</SearchPageScrollContainerAnimatedXProvider>
</DiscoverContext.Provider>
<SearchPageScrollContainerAnimatedXProvider>
<SearchPageProvider>
<SafeNavigationScrollView
Header={
<View className="absolute top-0 z-10 w-full">
<DiscoverHeader />
</View>
}
>
<Content />
</SafeNavigationScrollView>
</SearchPageProvider>
</SearchPageScrollContainerAnimatedXProvider>
)
}