diff options
| -rw-r--r-- | src/screens/Search/Explore.tsx | 54 | ||||
| -rw-r--r-- | src/state/queries/explore-feed-previews.tsx | 5 |
2 files changed, 27 insertions, 32 deletions
diff --git a/src/screens/Search/Explore.tsx b/src/screens/Search/Explore.tsx index a6d6b1703..79e27ec9a 100644 --- a/src/screens/Search/Explore.tsx +++ b/src/screens/Search/Explore.tsx @@ -1,5 +1,5 @@ import {useCallback, useMemo, useRef, useState} from 'react' -import {View, type ViewabilityConfig, type ViewToken} from 'react-native' +import {View, type ViewabilityConfig} from 'react-native' import { type AppBskyActorDefs, type AppBskyFeedDefs, @@ -837,36 +837,26 @@ export function Explore({ // track headers and report module viewability const alreadyReportedRef = useRef<Map<string, string>>(new Map()) - const onViewableItemsChanged = useCallback( - ({ - viewableItems, - }: { - viewableItems: ViewToken<ExploreScreenItems>[] - changed: ViewToken<ExploreScreenItems>[] - }) => { - for (const {item, index} of viewableItems.filter(vi => vi.isViewable)) { - let module: MetricEvents['explore:module:seen']['module'] - if (item.type === 'trendingTopics' || item.type === 'trendingVideos') { - module = item.type - } else if (item.type === 'profile') { - module = 'suggestedAccounts' - } else if (item.type === 'feed') { - module = 'suggestedFeeds' - } else if (item.type === 'starterPack') { - module = 'suggestedStarterPacks' - } else if (item.type === 'preview:header') { - module = `feed:feedgen|${item.feed.uri}` - } else { - continue - } - if (!alreadyReportedRef.current.has(module)) { - alreadyReportedRef.current.set(module, module) - logger.metric('explore:module:seen', {module, index: index ?? -1}) - } - } - }, - [], - ) + const onItemSeen = useCallback((item: ExploreScreenItems) => { + let module: MetricEvents['explore:module:seen']['module'] + if (item.type === 'trendingTopics' || item.type === 'trendingVideos') { + module = item.type + } else if (item.type === 'profile') { + module = 'suggestedAccounts' + } else if (item.type === 'feed') { + module = 'suggestedFeeds' + } else if (item.type === 'starterPack') { + module = 'suggestedStarterPacks' + } else if (item.type === 'preview:sliceItem') { + module = `feed:feedgen|${item.feed.uri}` + } else { + return + } + if (!alreadyReportedRef.current.has(module)) { + alreadyReportedRef.current.set(module, module) + logger.metric('explore:module:seen', {module}) //, index: index ?? -1}) + } + }, []) return ( <List @@ -879,7 +869,7 @@ export function Explore({ keyboardDismissMode="on-drag" stickyHeaderIndices={native(stickyHeaderIndices)} viewabilityConfig={viewabilityConfig} - onViewableItemsChanged={onViewableItemsChanged} + onItemSeen={onItemSeen} onEndReached={onLoadMoreFeedPreviews} onEndReachedThreshold={3} initialNumToRender={initialNumToRender} diff --git a/src/state/queries/explore-feed-previews.tsx b/src/state/queries/explore-feed-previews.tsx index eaa343cec..fcf9194db 100644 --- a/src/state/queries/explore-feed-previews.tsx +++ b/src/state/queries/explore-feed-previews.tsx @@ -73,6 +73,7 @@ export type FeedPreviewItem = key: string slice: FeedPostSlice indexInSlice: number + feed: AppBskyFeedDefs.GeneratorView showReplyTo: boolean hideTopBorder: boolean } @@ -202,6 +203,7 @@ export function useFeedPreviews( key: slice.items[0]._reactKey, slice: slice, indexInSlice: 0, + feed: page.feed, showReplyTo: false, hideTopBorder: rowIndex === 0, }) @@ -215,6 +217,7 @@ export function useFeedPreviews( key: slice.items[beforeLast]._reactKey, slice: slice, indexInSlice: beforeLast, + feed: page.feed, showReplyTo: slice.items[beforeLast].parentAuthor?.did !== slice.items[beforeLast].post.author.did, @@ -225,6 +228,7 @@ export function useFeedPreviews( key: slice.items[last]._reactKey, slice: slice, indexInSlice: last, + feed: page.feed, showReplyTo: false, hideTopBorder: false, }) @@ -235,6 +239,7 @@ export function useFeedPreviews( key: slice.items[i]._reactKey, slice: slice, indexInSlice: i, + feed: page.feed, showReplyTo: i === 0, hideTopBorder: i === 0 && rowIndex === 0, }) |