Add new interstitial to Discover

This commit is contained in:
Eric Bailey
2024-12-12 16:45:45 -06:00
parent ea7b710ebc
commit e3574a0809
5 changed files with 137 additions and 22 deletions
+17 -1
View File
@@ -23,6 +23,7 @@ import {logger} from '#/logger'
import {isIOS, isWeb} from '#/platform/detection'
import {listenPostCreated} from '#/state/events'
import {useFeedFeedbackContext} from '#/state/feed-feedback'
import {useTrendingSettings} from '#/state/preferences/trending'
import {STALE} from '#/state/queries'
import {
FeedDescriptor,
@@ -35,6 +36,7 @@ import {
import {useSession} from '#/state/session'
import {useProgressGuide} from '#/state/shell/progress-guide'
import {ProgressGuide, SuggestedFollows} from '#/components/FeedInterstitials'
import {TrendingInterstitial} from '#/components/interstitials/Trending'
import {List, ListRef} from '../util/List'
import {PostFeedLoadingPlaceholder} from '../util/LoadingPlaceholder'
import {LoadMoreRetryBtn} from '../util/LoadMoreRetryBtn'
@@ -90,6 +92,10 @@ type FeedRow =
type: 'interstitialProgressGuide'
key: string
}
| {
type: 'interstitialTrending'
key: string
}
export function getFeedPostSlice(feedRow: FeedRow): FeedPostSlice | null {
if (feedRow.type === 'sliceItem') {
@@ -258,6 +264,8 @@ let PostFeed = ({
const {isDesktop} = useWebMediaQueries()
const showProgressIntersitial = progressGuide && !isDesktop
const {trendingDiscoverHidden} = useTrendingSettings()
const feedItems: FeedRow[] = React.useMemo(() => {
let feedKind: 'following' | 'discover' | 'profile' | undefined
if (feedType === 'following') {
@@ -303,7 +311,12 @@ let PostFeed = ({
type: 'interstitialProgressGuide',
key: 'interstitial-' + sliceIndex + '-' + lastFetchedAt,
})
} else if (sliceIndex === 20) {
} else if (sliceIndex === 15 && !trendingDiscoverHidden) {
arr.push({
type: 'interstitialTrending',
key: 'interstitial-' + sliceIndex + '-' + lastFetchedAt,
})
} else if (sliceIndex === 30) {
arr.push({
type: 'interstitialFollows',
key: 'interstitial-' + sliceIndex + '-' + lastFetchedAt,
@@ -389,6 +402,7 @@ let PostFeed = ({
feedTab,
hasSession,
showProgressIntersitial,
trendingDiscoverHidden,
])
// events
@@ -475,6 +489,8 @@ let PostFeed = ({
return <SuggestedFollows feed={feed} />
} else if (row.type === 'interstitialProgressGuide') {
return <ProgressGuide />
} else if (row.type === 'interstitialTrending') {
return <TrendingInterstitial />
} else if (row.type === 'sliceItem') {
const slice = row.slice
if (slice.isFallbackMarker) {