Tweak feed card to prevent spinnerz when pushing to screen (#4600)
parent
1715afd80e
commit
35f64535cb
|
@ -8,6 +8,7 @@ import {
|
||||||
} from '@atproto/api'
|
} from '@atproto/api'
|
||||||
import {msg, plural, Trans} from '@lingui/macro'
|
import {msg, plural, Trans} from '@lingui/macro'
|
||||||
import {useLingui} from '@lingui/react'
|
import {useLingui} from '@lingui/react'
|
||||||
|
import {useQueryClient} from '@tanstack/react-query'
|
||||||
|
|
||||||
import {logger} from '#/logger'
|
import {logger} from '#/logger'
|
||||||
import {
|
import {
|
||||||
|
@ -16,6 +17,7 @@ import {
|
||||||
useRemoveFeedMutation,
|
useRemoveFeedMutation,
|
||||||
} from '#/state/queries/preferences'
|
} from '#/state/queries/preferences'
|
||||||
import {sanitizeHandle} from 'lib/strings/handles'
|
import {sanitizeHandle} from 'lib/strings/handles'
|
||||||
|
import {precacheFeedFromGeneratorView, precacheList} from 'state/queries/feed'
|
||||||
import {useSession} from 'state/session'
|
import {useSession} from 'state/session'
|
||||||
import {UserAvatar} from '#/view/com/util/UserAvatar'
|
import {UserAvatar} from '#/view/com/util/UserAvatar'
|
||||||
import * as Toast from 'view/com/util/Toast'
|
import * as Toast from 'view/com/util/Toast'
|
||||||
|
@ -31,10 +33,7 @@ import * as Prompt from '#/components/Prompt'
|
||||||
import {RichText} from '#/components/RichText'
|
import {RichText} from '#/components/RichText'
|
||||||
import {Text} from '#/components/Typography'
|
import {Text} from '#/components/Typography'
|
||||||
|
|
||||||
export function Default({
|
type Props =
|
||||||
type,
|
|
||||||
view,
|
|
||||||
}:
|
|
||||||
| {
|
| {
|
||||||
type: 'feed'
|
type: 'feed'
|
||||||
view: AppBskyFeedDefs.GeneratorView
|
view: AppBskyFeedDefs.GeneratorView
|
||||||
|
@ -42,15 +41,24 @@ export function Default({
|
||||||
| {
|
| {
|
||||||
type: 'list'
|
type: 'list'
|
||||||
view: AppBskyGraphDefs.ListView
|
view: AppBskyGraphDefs.ListView
|
||||||
}) {
|
}
|
||||||
|
|
||||||
|
export function Default(props: Props) {
|
||||||
|
const {type, view} = props
|
||||||
const displayName = type === 'feed' ? view.displayName : view.name
|
const displayName = type === 'feed' ? view.displayName : view.name
|
||||||
|
const purpose = type === 'list' ? view.purpose : undefined
|
||||||
return (
|
return (
|
||||||
<Link feed={view}>
|
<Link label={displayName} {...props}>
|
||||||
<Outer>
|
<Outer>
|
||||||
<Header>
|
<Header>
|
||||||
<Avatar src={view.avatar} />
|
<Avatar src={view.avatar} />
|
||||||
<TitleAndByline title={displayName} creator={view.creator} />
|
<TitleAndByline
|
||||||
<Action uri={view.uri} pin />
|
title={displayName}
|
||||||
|
creator={view.creator}
|
||||||
|
type={type}
|
||||||
|
purpose={purpose}
|
||||||
|
/>
|
||||||
|
<Action uri={view.uri} pin type={type} purpose={purpose} />
|
||||||
</Header>
|
</Header>
|
||||||
<Description description={view.description} />
|
<Description description={view.description} />
|
||||||
{type === 'feed' && <Likes count={view.likeCount || 0} />}
|
{type === 'feed' && <Likes count={view.likeCount || 0} />}
|
||||||
|
@ -60,15 +68,31 @@ export function Default({
|
||||||
}
|
}
|
||||||
|
|
||||||
export function Link({
|
export function Link({
|
||||||
|
type,
|
||||||
|
view,
|
||||||
|
label,
|
||||||
children,
|
children,
|
||||||
feed,
|
}: Props & Omit<LinkProps, 'to'>) {
|
||||||
}: {
|
const queryClient = useQueryClient()
|
||||||
feed: AppBskyFeedDefs.GeneratorView | AppBskyGraphDefs.ListView
|
|
||||||
} & Omit<LinkProps, 'to'>) {
|
|
||||||
const href = React.useMemo(() => {
|
const href = React.useMemo(() => {
|
||||||
return createProfileFeedHref({feed})
|
return createProfileFeedHref({feed: view})
|
||||||
}, [feed])
|
}, [view])
|
||||||
return <InternalLink to={href}>{children}</InternalLink>
|
|
||||||
|
return (
|
||||||
|
<InternalLink
|
||||||
|
to={href}
|
||||||
|
label={label}
|
||||||
|
onPress={() => {
|
||||||
|
if (type === 'feed') {
|
||||||
|
precacheFeedFromGeneratorView(queryClient, view)
|
||||||
|
} else {
|
||||||
|
precacheList(queryClient, view)
|
||||||
|
}
|
||||||
|
}}>
|
||||||
|
{children}
|
||||||
|
</InternalLink>
|
||||||
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
export function Outer({children}: {children: React.ReactNode}) {
|
export function Outer({children}: {children: React.ReactNode}) {
|
||||||
|
@ -108,9 +132,13 @@ export function AvatarPlaceholder({size = 40}: Omit<AvatarProps, 'src'>) {
|
||||||
export function TitleAndByline({
|
export function TitleAndByline({
|
||||||
title,
|
title,
|
||||||
creator,
|
creator,
|
||||||
|
type,
|
||||||
|
purpose,
|
||||||
}: {
|
}: {
|
||||||
title: string
|
title: string
|
||||||
creator?: AppBskyActorDefs.ProfileViewBasic
|
creator?: AppBskyActorDefs.ProfileViewBasic
|
||||||
|
type: 'feed' | 'list'
|
||||||
|
purpose?: AppBskyGraphDefs.ListView['purpose']
|
||||||
}) {
|
}) {
|
||||||
const t = useTheme()
|
const t = useTheme()
|
||||||
|
|
||||||
|
@ -123,7 +151,15 @@ export function TitleAndByline({
|
||||||
<Text
|
<Text
|
||||||
style={[a.leading_snug, t.atoms.text_contrast_medium]}
|
style={[a.leading_snug, t.atoms.text_contrast_medium]}
|
||||||
numberOfLines={1}>
|
numberOfLines={1}>
|
||||||
<Trans>Feed by {sanitizeHandle(creator.handle, '@')}</Trans>
|
{type === 'list' && purpose === 'app.bsky.graph.defs#curatelist' ? (
|
||||||
|
<Trans>List by {sanitizeHandle(creator.handle, '@')}</Trans>
|
||||||
|
) : type === 'list' && purpose === 'app.bsky.graph.defs#modlist' ? (
|
||||||
|
<Trans>
|
||||||
|
Moderation list by {sanitizeHandle(creator.handle, '@')}
|
||||||
|
</Trans>
|
||||||
|
) : (
|
||||||
|
<Trans>Feed by {sanitizeHandle(creator.handle, '@')}</Trans>
|
||||||
|
)}
|
||||||
</Text>
|
</Text>
|
||||||
)}
|
)}
|
||||||
</View>
|
</View>
|
||||||
|
@ -184,13 +220,31 @@ export function Likes({count}: {count: number}) {
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
export function Action({uri, pin}: {uri: string; pin?: boolean}) {
|
export function Action({
|
||||||
|
uri,
|
||||||
|
pin,
|
||||||
|
type,
|
||||||
|
purpose,
|
||||||
|
}: {
|
||||||
|
uri: string
|
||||||
|
pin?: boolean
|
||||||
|
type: 'feed' | 'list'
|
||||||
|
purpose?: AppBskyGraphDefs.ListView['purpose']
|
||||||
|
}) {
|
||||||
const {hasSession} = useSession()
|
const {hasSession} = useSession()
|
||||||
if (!hasSession) return null
|
if (!hasSession || purpose !== 'app.bsky.graph.defs#curatelist') return null
|
||||||
return <ActionInner uri={uri} pin={pin} />
|
return <ActionInner uri={uri} pin={pin} type={type} />
|
||||||
}
|
}
|
||||||
|
|
||||||
function ActionInner({uri, pin}: {uri: string; pin?: boolean}) {
|
function ActionInner({
|
||||||
|
uri,
|
||||||
|
pin,
|
||||||
|
type,
|
||||||
|
}: {
|
||||||
|
uri: string
|
||||||
|
pin?: boolean
|
||||||
|
type: 'feed' | 'list'
|
||||||
|
}) {
|
||||||
const {_} = useLingui()
|
const {_} = useLingui()
|
||||||
const {data: preferences} = usePreferencesQuery()
|
const {data: preferences} = usePreferencesQuery()
|
||||||
const {isPending: isAddSavedFeedPending, mutateAsync: saveFeeds} =
|
const {isPending: isAddSavedFeedPending, mutateAsync: saveFeeds} =
|
||||||
|
@ -198,9 +252,7 @@ function ActionInner({uri, pin}: {uri: string; pin?: boolean}) {
|
||||||
const {isPending: isRemovePending, mutateAsync: removeFeed} =
|
const {isPending: isRemovePending, mutateAsync: removeFeed} =
|
||||||
useRemoveFeedMutation()
|
useRemoveFeedMutation()
|
||||||
const savedFeedConfig = React.useMemo(() => {
|
const savedFeedConfig = React.useMemo(() => {
|
||||||
return preferences?.savedFeeds?.find(
|
return preferences?.savedFeeds?.find(feed => feed.value === uri)
|
||||||
feed => feed.type === 'feed' && feed.value === uri,
|
|
||||||
)
|
|
||||||
}, [preferences?.savedFeeds, uri])
|
}, [preferences?.savedFeeds, uri])
|
||||||
const removePromptControl = Prompt.usePromptControl()
|
const removePromptControl = Prompt.usePromptControl()
|
||||||
const isPending = isAddSavedFeedPending || isRemovePending
|
const isPending = isAddSavedFeedPending || isRemovePending
|
||||||
|
@ -216,7 +268,7 @@ function ActionInner({uri, pin}: {uri: string; pin?: boolean}) {
|
||||||
} else {
|
} else {
|
||||||
await saveFeeds([
|
await saveFeeds([
|
||||||
{
|
{
|
||||||
type: 'feed',
|
type,
|
||||||
value: uri,
|
value: uri,
|
||||||
pinned: pin || false,
|
pinned: pin || false,
|
||||||
},
|
},
|
||||||
|
@ -228,7 +280,7 @@ function ActionInner({uri, pin}: {uri: string; pin?: boolean}) {
|
||||||
Toast.show(_(msg`Failed to update feeds`))
|
Toast.show(_(msg`Failed to update feeds`))
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
[_, pin, saveFeeds, removeFeed, uri, savedFeedConfig],
|
[_, pin, saveFeeds, removeFeed, uri, savedFeedConfig, type],
|
||||||
)
|
)
|
||||||
|
|
||||||
const onPrompRemoveFeed = React.useCallback(
|
const onPrompRemoveFeed = React.useCallback(
|
||||||
|
|
|
@ -578,7 +578,7 @@ function precacheFeed(queryClient: QueryClient, hydratedFeed: FeedSourceInfo) {
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
function precacheList(
|
export function precacheList(
|
||||||
queryClient: QueryClient,
|
queryClient: QueryClient,
|
||||||
list: AppBskyGraphDefs.ListView,
|
list: AppBskyGraphDefs.ListView,
|
||||||
) {
|
) {
|
||||||
|
@ -588,3 +588,11 @@ function precacheList(
|
||||||
list,
|
list,
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function precacheFeedFromGeneratorView(
|
||||||
|
queryClient: QueryClient,
|
||||||
|
view: AppBskyFeedDefs.GeneratorView,
|
||||||
|
) {
|
||||||
|
const hydratedFeed = hydrateFeedGenerator(view)
|
||||||
|
precacheFeed(queryClient, hydratedFeed)
|
||||||
|
}
|
||||||
|
|
|
@ -3,7 +3,6 @@ import {
|
||||||
findNodeHandle,
|
findNodeHandle,
|
||||||
ListRenderItemInfo,
|
ListRenderItemInfo,
|
||||||
StyleProp,
|
StyleProp,
|
||||||
StyleSheet,
|
|
||||||
View,
|
View,
|
||||||
ViewStyle,
|
ViewStyle,
|
||||||
} from 'react-native'
|
} from 'react-native'
|
||||||
|
@ -12,18 +11,17 @@ import {useLingui} from '@lingui/react'
|
||||||
import {useQueryClient} from '@tanstack/react-query'
|
import {useQueryClient} from '@tanstack/react-query'
|
||||||
|
|
||||||
import {cleanError} from '#/lib/strings/errors'
|
import {cleanError} from '#/lib/strings/errors'
|
||||||
import {useTheme} from '#/lib/ThemeContext'
|
|
||||||
import {logger} from '#/logger'
|
import {logger} from '#/logger'
|
||||||
import {isNative, isWeb} from '#/platform/detection'
|
import {isNative, isWeb} from '#/platform/detection'
|
||||||
import {hydrateFeedGenerator} from '#/state/queries/feed'
|
|
||||||
import {usePreferencesQuery} from '#/state/queries/preferences'
|
import {usePreferencesQuery} from '#/state/queries/preferences'
|
||||||
import {RQKEY, useProfileFeedgensQuery} from '#/state/queries/profile-feedgens'
|
import {RQKEY, useProfileFeedgensQuery} from '#/state/queries/profile-feedgens'
|
||||||
import {FeedLoadingPlaceholder} from '#/view/com/util/LoadingPlaceholder'
|
import {FeedLoadingPlaceholder} from '#/view/com/util/LoadingPlaceholder'
|
||||||
import {EmptyState} from 'view/com/util/EmptyState'
|
import {EmptyState} from 'view/com/util/EmptyState'
|
||||||
|
import {atoms as a, useTheme} from '#/alf'
|
||||||
|
import * as FeedCard from '#/components/FeedCard'
|
||||||
import {ErrorMessage} from '../util/error/ErrorMessage'
|
import {ErrorMessage} from '../util/error/ErrorMessage'
|
||||||
import {List, ListRef} from '../util/List'
|
import {List, ListRef} from '../util/List'
|
||||||
import {LoadMoreRetryBtn} from '../util/LoadMoreRetryBtn'
|
import {LoadMoreRetryBtn} from '../util/LoadMoreRetryBtn'
|
||||||
import {FeedSourceCardLoaded} from './FeedSourceCard'
|
|
||||||
|
|
||||||
const LOADING = {_reactKey: '__loading__'}
|
const LOADING = {_reactKey: '__loading__'}
|
||||||
const EMPTY = {_reactKey: '__empty__'}
|
const EMPTY = {_reactKey: '__empty__'}
|
||||||
|
@ -52,7 +50,7 @@ export const ProfileFeedgens = React.forwardRef<
|
||||||
ref,
|
ref,
|
||||||
) {
|
) {
|
||||||
const {_} = useLingui()
|
const {_} = useLingui()
|
||||||
const theme = useTheme()
|
const t = useTheme()
|
||||||
const [isPTRing, setIsPTRing] = React.useState(false)
|
const [isPTRing, setIsPTRing] = React.useState(false)
|
||||||
const opts = React.useMemo(() => ({enabled}), [enabled])
|
const opts = React.useMemo(() => ({enabled}), [enabled])
|
||||||
const {
|
const {
|
||||||
|
@ -79,10 +77,9 @@ export const ProfileFeedgens = React.forwardRef<
|
||||||
items = items.concat([EMPTY])
|
items = items.concat([EMPTY])
|
||||||
} else if (data?.pages) {
|
} else if (data?.pages) {
|
||||||
for (const page of data?.pages) {
|
for (const page of data?.pages) {
|
||||||
items = items.concat(page.feeds.map(feed => hydrateFeedGenerator(feed)))
|
items = items.concat(page.feeds)
|
||||||
}
|
}
|
||||||
}
|
} else if (isError && !isEmpty) {
|
||||||
if (isError && !isEmpty) {
|
|
||||||
items = items.concat([LOAD_MORE_ERROR_ITEM])
|
items = items.concat([LOAD_MORE_ERROR_ITEM])
|
||||||
}
|
}
|
||||||
return items
|
return items
|
||||||
|
@ -132,48 +129,46 @@ export const ProfileFeedgens = React.forwardRef<
|
||||||
// rendering
|
// rendering
|
||||||
// =
|
// =
|
||||||
|
|
||||||
const renderItemInner = React.useCallback(
|
const renderItem = ({item, index}: ListRenderItemInfo<any>) => {
|
||||||
({item, index}: ListRenderItemInfo<any>) => {
|
if (item === EMPTY) {
|
||||||
if (item === EMPTY) {
|
return (
|
||||||
return (
|
<EmptyState
|
||||||
<EmptyState
|
icon="hashtag"
|
||||||
icon="hashtag"
|
message={_(msg`You have no feeds.`)}
|
||||||
message={_(msg`You have no feeds.`)}
|
testID="listsEmpty"
|
||||||
testID="listsEmpty"
|
/>
|
||||||
/>
|
)
|
||||||
)
|
} else if (item === ERROR_ITEM) {
|
||||||
} else if (item === ERROR_ITEM) {
|
return (
|
||||||
return (
|
<ErrorMessage message={cleanError(error)} onPressTryAgain={refetch} />
|
||||||
<ErrorMessage message={cleanError(error)} onPressTryAgain={refetch} />
|
)
|
||||||
)
|
} else if (item === LOAD_MORE_ERROR_ITEM) {
|
||||||
} else if (item === LOAD_MORE_ERROR_ITEM) {
|
return (
|
||||||
return (
|
<LoadMoreRetryBtn
|
||||||
<LoadMoreRetryBtn
|
label={_(
|
||||||
label={_(
|
msg`There was an issue fetching your lists. Tap here to try again.`,
|
||||||
msg`There was an issue fetching your lists. Tap here to try again.`,
|
)}
|
||||||
)}
|
onPress={onPressRetryLoadMore}
|
||||||
onPress={onPressRetryLoadMore}
|
/>
|
||||||
/>
|
)
|
||||||
)
|
} else if (item === LOADING) {
|
||||||
} else if (item === LOADING) {
|
return <FeedLoadingPlaceholder />
|
||||||
return <FeedLoadingPlaceholder />
|
}
|
||||||
}
|
if (preferences) {
|
||||||
if (preferences) {
|
return (
|
||||||
return (
|
<View
|
||||||
<FeedSourceCardLoaded
|
style={[
|
||||||
feedUri={item.uri}
|
(index !== 0 || isWeb) && a.border_t,
|
||||||
feed={item}
|
t.atoms.border_contrast_low,
|
||||||
preferences={preferences}
|
a.px_lg,
|
||||||
style={styles.item}
|
a.py_lg,
|
||||||
showLikes
|
]}>
|
||||||
hideTopBorder={index === 0 && !isWeb}
|
<FeedCard.Default type="feed" view={item} />
|
||||||
/>
|
</View>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
return null
|
return null
|
||||||
},
|
}
|
||||||
[error, refetch, onPressRetryLoadMore, preferences, _],
|
|
||||||
)
|
|
||||||
|
|
||||||
React.useEffect(() => {
|
React.useEffect(() => {
|
||||||
if (enabled && scrollElRef.current) {
|
if (enabled && scrollElRef.current) {
|
||||||
|
@ -189,12 +184,12 @@ export const ProfileFeedgens = React.forwardRef<
|
||||||
ref={scrollElRef}
|
ref={scrollElRef}
|
||||||
data={items}
|
data={items}
|
||||||
keyExtractor={(item: any) => item._reactKey || item.uri}
|
keyExtractor={(item: any) => item._reactKey || item.uri}
|
||||||
renderItem={renderItemInner}
|
renderItem={renderItem}
|
||||||
refreshing={isPTRing}
|
refreshing={isPTRing}
|
||||||
onRefresh={onRefresh}
|
onRefresh={onRefresh}
|
||||||
headerOffset={headerOffset}
|
headerOffset={headerOffset}
|
||||||
contentContainerStyle={isNative && {paddingBottom: headerOffset + 100}}
|
contentContainerStyle={isNative && {paddingBottom: headerOffset + 100}}
|
||||||
indicatorStyle={theme.colorScheme === 'dark' ? 'white' : 'black'}
|
indicatorStyle={t.name === 'light' ? 'black' : 'white'}
|
||||||
removeClippedSubviews={true}
|
removeClippedSubviews={true}
|
||||||
// @ts-ignore our .web version only -prf
|
// @ts-ignore our .web version only -prf
|
||||||
desktopFixedHeight
|
desktopFixedHeight
|
||||||
|
@ -203,9 +198,3 @@ export const ProfileFeedgens = React.forwardRef<
|
||||||
</View>
|
</View>
|
||||||
)
|
)
|
||||||
})
|
})
|
||||||
|
|
||||||
const styles = StyleSheet.create({
|
|
||||||
item: {
|
|
||||||
paddingHorizontal: 18,
|
|
||||||
},
|
|
||||||
})
|
|
||||||
|
|
|
@ -3,7 +3,6 @@ import {
|
||||||
findNodeHandle,
|
findNodeHandle,
|
||||||
ListRenderItemInfo,
|
ListRenderItemInfo,
|
||||||
StyleProp,
|
StyleProp,
|
||||||
StyleSheet,
|
|
||||||
View,
|
View,
|
||||||
ViewStyle,
|
ViewStyle,
|
||||||
} from 'react-native'
|
} from 'react-native'
|
||||||
|
@ -12,17 +11,17 @@ import {useLingui} from '@lingui/react'
|
||||||
import {useQueryClient} from '@tanstack/react-query'
|
import {useQueryClient} from '@tanstack/react-query'
|
||||||
|
|
||||||
import {cleanError} from '#/lib/strings/errors'
|
import {cleanError} from '#/lib/strings/errors'
|
||||||
import {useTheme} from '#/lib/ThemeContext'
|
|
||||||
import {logger} from '#/logger'
|
import {logger} from '#/logger'
|
||||||
import {isNative, isWeb} from '#/platform/detection'
|
import {isNative, isWeb} from '#/platform/detection'
|
||||||
import {RQKEY, useProfileListsQuery} from '#/state/queries/profile-lists'
|
import {RQKEY, useProfileListsQuery} from '#/state/queries/profile-lists'
|
||||||
import {useAnalytics} from 'lib/analytics/analytics'
|
import {useAnalytics} from 'lib/analytics/analytics'
|
||||||
import {FeedLoadingPlaceholder} from '#/view/com/util/LoadingPlaceholder'
|
import {FeedLoadingPlaceholder} from '#/view/com/util/LoadingPlaceholder'
|
||||||
import {EmptyState} from 'view/com/util/EmptyState'
|
import {EmptyState} from 'view/com/util/EmptyState'
|
||||||
|
import {atoms as a, useTheme} from '#/alf'
|
||||||
|
import * as FeedCard from '#/components/FeedCard'
|
||||||
import {ErrorMessage} from '../util/error/ErrorMessage'
|
import {ErrorMessage} from '../util/error/ErrorMessage'
|
||||||
import {List, ListRef} from '../util/List'
|
import {List, ListRef} from '../util/List'
|
||||||
import {LoadMoreRetryBtn} from '../util/LoadMoreRetryBtn'
|
import {LoadMoreRetryBtn} from '../util/LoadMoreRetryBtn'
|
||||||
import {ListCard} from './ListCard'
|
|
||||||
|
|
||||||
const LOADING = {_reactKey: '__loading__'}
|
const LOADING = {_reactKey: '__loading__'}
|
||||||
const EMPTY = {_reactKey: '__empty__'}
|
const EMPTY = {_reactKey: '__empty__'}
|
||||||
|
@ -48,7 +47,7 @@ export const ProfileLists = React.forwardRef<SectionRef, ProfileListsProps>(
|
||||||
{did, scrollElRef, headerOffset, enabled, style, testID, setScrollViewTag},
|
{did, scrollElRef, headerOffset, enabled, style, testID, setScrollViewTag},
|
||||||
ref,
|
ref,
|
||||||
) {
|
) {
|
||||||
const theme = useTheme()
|
const t = useTheme()
|
||||||
const {track} = useAnalytics()
|
const {track} = useAnalytics()
|
||||||
const {_} = useLingui()
|
const {_} = useLingui()
|
||||||
const [isPTRing, setIsPTRing] = React.useState(false)
|
const [isPTRing, setIsPTRing] = React.useState(false)
|
||||||
|
@ -166,15 +165,18 @@ export const ProfileLists = React.forwardRef<SectionRef, ProfileListsProps>(
|
||||||
return <FeedLoadingPlaceholder />
|
return <FeedLoadingPlaceholder />
|
||||||
}
|
}
|
||||||
return (
|
return (
|
||||||
<ListCard
|
<View
|
||||||
list={item}
|
style={[
|
||||||
testID={`list-${item.name}`}
|
(index !== 0 || isWeb) && a.border_t,
|
||||||
style={styles.item}
|
t.atoms.border_contrast_low,
|
||||||
noBorder={index === 0 && !isWeb}
|
a.px_lg,
|
||||||
/>
|
a.py_lg,
|
||||||
|
]}>
|
||||||
|
<FeedCard.Default type="list" view={item} />
|
||||||
|
</View>
|
||||||
)
|
)
|
||||||
},
|
},
|
||||||
[error, refetch, onPressRetryLoadMore, _],
|
[error, refetch, onPressRetryLoadMore, _, t.atoms.border_contrast_low],
|
||||||
)
|
)
|
||||||
|
|
||||||
React.useEffect(() => {
|
React.useEffect(() => {
|
||||||
|
@ -198,7 +200,7 @@ export const ProfileLists = React.forwardRef<SectionRef, ProfileListsProps>(
|
||||||
contentContainerStyle={
|
contentContainerStyle={
|
||||||
isNative && {paddingBottom: headerOffset + 100}
|
isNative && {paddingBottom: headerOffset + 100}
|
||||||
}
|
}
|
||||||
indicatorStyle={theme.colorScheme === 'dark' ? 'white' : 'black'}
|
indicatorStyle={t.name === 'light' ? 'black' : 'white'}
|
||||||
removeClippedSubviews={true}
|
removeClippedSubviews={true}
|
||||||
// @ts-ignore our .web version only -prf
|
// @ts-ignore our .web version only -prf
|
||||||
desktopFixedHeight
|
desktopFixedHeight
|
||||||
|
@ -208,9 +210,3 @@ export const ProfileLists = React.forwardRef<SectionRef, ProfileListsProps>(
|
||||||
)
|
)
|
||||||
},
|
},
|
||||||
)
|
)
|
||||||
|
|
||||||
const styles = StyleSheet.create({
|
|
||||||
item: {
|
|
||||||
paddingHorizontal: 18,
|
|
||||||
},
|
|
||||||
})
|
|
||||||
|
|
|
@ -627,7 +627,7 @@ function FollowingFeed() {
|
||||||
fill={t.palette.white}
|
fill={t.palette.white}
|
||||||
/>
|
/>
|
||||||
</View>
|
</View>
|
||||||
<FeedCard.TitleAndByline title={_(msg`Following`)} />
|
<FeedCard.TitleAndByline title={_(msg`Following`)} type="feed" />
|
||||||
</FeedCard.Header>
|
</FeedCard.Header>
|
||||||
</View>
|
</View>
|
||||||
)
|
)
|
||||||
|
@ -644,7 +644,7 @@ function SavedFeed({
|
||||||
savedFeed.type === 'feed' ? savedFeed.view.displayName : savedFeed.view.name
|
savedFeed.type === 'feed' ? savedFeed.view.displayName : savedFeed.view.name
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<FeedCard.Link testID={`saved-feed-${feed.displayName}`} feed={feed}>
|
<FeedCard.Link testID={`saved-feed-${feed.displayName}`} {...savedFeed}>
|
||||||
{({hovered, pressed}) => (
|
{({hovered, pressed}) => (
|
||||||
<View
|
<View
|
||||||
style={[
|
style={[
|
||||||
|
@ -657,7 +657,10 @@ function SavedFeed({
|
||||||
]}>
|
]}>
|
||||||
<FeedCard.Header>
|
<FeedCard.Header>
|
||||||
<FeedCard.Avatar src={feed.avatar} size={28} />
|
<FeedCard.Avatar src={feed.avatar} size={28} />
|
||||||
<FeedCard.TitleAndByline title={displayName} />
|
<FeedCard.TitleAndByline
|
||||||
|
title={displayName}
|
||||||
|
type={savedFeed.type}
|
||||||
|
/>
|
||||||
|
|
||||||
<ChevronRight size="sm" fill={t.atoms.text_contrast_low.color} />
|
<ChevronRight size="sm" fill={t.atoms.text_contrast_low.color} />
|
||||||
</FeedCard.Header>
|
</FeedCard.Header>
|
||||||
|
|
Loading…
Reference in New Issue