add topic screen
This commit is contained in:
@@ -100,6 +100,7 @@ import {LanguageSettingsScreen} from './screens/Settings/LanguageSettings'
|
|||||||
import {PrivacyAndSecuritySettingsScreen} from './screens/Settings/PrivacyAndSecuritySettings'
|
import {PrivacyAndSecuritySettingsScreen} from './screens/Settings/PrivacyAndSecuritySettings'
|
||||||
import {SettingsScreen} from './screens/Settings/Settings'
|
import {SettingsScreen} from './screens/Settings/Settings'
|
||||||
import {ThreadPreferencesScreen} from './screens/Settings/ThreadPreferences'
|
import {ThreadPreferencesScreen} from './screens/Settings/ThreadPreferences'
|
||||||
|
import TopicScreen from './screens/Topic'
|
||||||
|
|
||||||
const navigationRef = createNavigationContainerRef<AllNavigatorParams>()
|
const navigationRef = createNavigationContainerRef<AllNavigatorParams>()
|
||||||
|
|
||||||
@@ -376,6 +377,11 @@ function commonScreens(Stack: typeof HomeTab, unreadCountLabel?: string) {
|
|||||||
getComponent={() => HashtagScreen}
|
getComponent={() => HashtagScreen}
|
||||||
options={{title: title(msg`Hashtag`)}}
|
options={{title: title(msg`Hashtag`)}}
|
||||||
/>
|
/>
|
||||||
|
<Stack.Screen
|
||||||
|
name="Topic"
|
||||||
|
getComponent={() => TopicScreen}
|
||||||
|
options={{title: title(msg`Topic`)}}
|
||||||
|
/>
|
||||||
<Stack.Screen
|
<Stack.Screen
|
||||||
name="MessagesConversation"
|
name="MessagesConversation"
|
||||||
getComponent={() => MessagesConversationScreen}
|
getComponent={() => MessagesConversationScreen}
|
||||||
|
|||||||
@@ -47,6 +47,7 @@ export type CommonNavigatorParams = {
|
|||||||
AppIconSettings: undefined
|
AppIconSettings: undefined
|
||||||
Search: {q?: string}
|
Search: {q?: string}
|
||||||
Hashtag: {tag: string; author?: string}
|
Hashtag: {tag: string; author?: string}
|
||||||
|
Topic: {topic: string}
|
||||||
MessagesConversation: {conversation: string; embed?: string}
|
MessagesConversation: {conversation: string; embed?: string}
|
||||||
MessagesSettings: undefined
|
MessagesSettings: undefined
|
||||||
NotificationSettings: undefined
|
NotificationSettings: undefined
|
||||||
@@ -92,6 +93,7 @@ export type FlatNavigatorParams = CommonNavigatorParams & {
|
|||||||
Feeds: undefined
|
Feeds: undefined
|
||||||
Notifications: undefined
|
Notifications: undefined
|
||||||
Hashtag: {tag: string; author?: string}
|
Hashtag: {tag: string; author?: string}
|
||||||
|
Topic: {topic: string}
|
||||||
Messages: {pushToConversation?: string; animation?: 'push' | 'pop'}
|
Messages: {pushToConversation?: string; animation?: 'push' | 'pop'}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -105,6 +107,7 @@ export type AllNavigatorParams = CommonNavigatorParams & {
|
|||||||
Notifications: undefined
|
Notifications: undefined
|
||||||
MyProfileTab: undefined
|
MyProfileTab: undefined
|
||||||
Hashtag: {tag: string; author?: string}
|
Hashtag: {tag: string; author?: string}
|
||||||
|
Topic: {topic: string}
|
||||||
MessagesTab: undefined
|
MessagesTab: undefined
|
||||||
Messages: {animation?: 'push' | 'pop'}
|
Messages: {animation?: 'push' | 'pop'}
|
||||||
Start: {name: string; rkey: string}
|
Start: {name: string; rkey: string}
|
||||||
|
|||||||
@@ -53,6 +53,7 @@ export const router = new Router({
|
|||||||
CopyrightPolicy: '/support/copyright',
|
CopyrightPolicy: '/support/copyright',
|
||||||
// hashtags
|
// hashtags
|
||||||
Hashtag: '/hashtag/:tag',
|
Hashtag: '/hashtag/:tag',
|
||||||
|
Topic: '/topic/:topic',
|
||||||
// DMs
|
// DMs
|
||||||
Messages: '/messages',
|
Messages: '/messages',
|
||||||
MessagesSettings: '/messages/settings',
|
MessagesSettings: '/messages/settings',
|
||||||
|
|||||||
@@ -0,0 +1,200 @@
|
|||||||
|
import React from 'react'
|
||||||
|
import {ListRenderItemInfo, View} from 'react-native'
|
||||||
|
import {PostView} from '@atproto/api/dist/client/types/app/bsky/feed/defs'
|
||||||
|
import {msg} from '@lingui/macro'
|
||||||
|
import {useLingui} from '@lingui/react'
|
||||||
|
import {useFocusEffect} from '@react-navigation/native'
|
||||||
|
import {NativeStackScreenProps} from '@react-navigation/native-stack'
|
||||||
|
|
||||||
|
import {HITSLOP_10} from '#/lib/constants'
|
||||||
|
import {useInitialNumToRender} from '#/lib/hooks/useInitialNumToRender'
|
||||||
|
import {CommonNavigatorParams} from '#/lib/routes/types'
|
||||||
|
import {shareUrl} from '#/lib/sharing'
|
||||||
|
import {cleanError} from '#/lib/strings/errors'
|
||||||
|
import {enforceLen} from '#/lib/strings/helpers'
|
||||||
|
import {useSearchPostsQuery} from '#/state/queries/search-posts'
|
||||||
|
import {useSetMinimalShellMode} from '#/state/shell'
|
||||||
|
import {Pager} from '#/view/com/pager/Pager'
|
||||||
|
import {TabBar} from '#/view/com/pager/TabBar'
|
||||||
|
import {Post} from '#/view/com/post/Post'
|
||||||
|
import {List} from '#/view/com/util/List'
|
||||||
|
import {atoms as a, web} from '#/alf'
|
||||||
|
import {Button, ButtonIcon} from '#/components/Button'
|
||||||
|
import {ArrowOutOfBox_Stroke2_Corner0_Rounded as Share} from '#/components/icons/ArrowOutOfBox'
|
||||||
|
import * as Layout from '#/components/Layout'
|
||||||
|
import {ListFooter, ListMaybePlaceholder} from '#/components/Lists'
|
||||||
|
|
||||||
|
const renderItem = ({item}: ListRenderItemInfo<PostView>) => {
|
||||||
|
return <Post post={item} />
|
||||||
|
}
|
||||||
|
|
||||||
|
const keyExtractor = (item: PostView, index: number) => {
|
||||||
|
return `${item.uri}-${index}`
|
||||||
|
}
|
||||||
|
|
||||||
|
export default function TopicScreen({
|
||||||
|
route,
|
||||||
|
}: NativeStackScreenProps<CommonNavigatorParams, 'Topic'>) {
|
||||||
|
const {topic} = route.params
|
||||||
|
const {_} = useLingui()
|
||||||
|
|
||||||
|
const headerTitle = React.useMemo(() => {
|
||||||
|
return enforceLen(topic, 24, true, 'middle')
|
||||||
|
}, [topic])
|
||||||
|
|
||||||
|
const onShare = React.useCallback(() => {
|
||||||
|
const url = new URL('https://bsky.app')
|
||||||
|
url.pathname = `/topic/${topic}`
|
||||||
|
shareUrl(url.toString())
|
||||||
|
}, [topic])
|
||||||
|
|
||||||
|
const [activeTab, setActiveTab] = React.useState(0)
|
||||||
|
const setMinimalShellMode = useSetMinimalShellMode()
|
||||||
|
|
||||||
|
useFocusEffect(
|
||||||
|
React.useCallback(() => {
|
||||||
|
setMinimalShellMode(false)
|
||||||
|
}, [setMinimalShellMode]),
|
||||||
|
)
|
||||||
|
|
||||||
|
const onPageSelected = React.useCallback(
|
||||||
|
(index: number) => {
|
||||||
|
setMinimalShellMode(false)
|
||||||
|
setActiveTab(index)
|
||||||
|
},
|
||||||
|
[setMinimalShellMode],
|
||||||
|
)
|
||||||
|
|
||||||
|
const sections = React.useMemo(() => {
|
||||||
|
return [
|
||||||
|
{
|
||||||
|
title: _(msg`Top`),
|
||||||
|
component: (
|
||||||
|
<TopicScreenTab topic={topic} sort="top" active={activeTab === 0} />
|
||||||
|
),
|
||||||
|
},
|
||||||
|
{
|
||||||
|
title: _(msg`Latest`),
|
||||||
|
component: (
|
||||||
|
<TopicScreenTab
|
||||||
|
topic={topic}
|
||||||
|
sort="latest"
|
||||||
|
active={activeTab === 1}
|
||||||
|
/>
|
||||||
|
),
|
||||||
|
},
|
||||||
|
]
|
||||||
|
}, [_, topic, activeTab])
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Layout.Screen>
|
||||||
|
<Layout.Header.Outer noBottomBorder>
|
||||||
|
<Layout.Header.BackButton />
|
||||||
|
<Layout.Header.Content>
|
||||||
|
<Layout.Header.TitleText>{headerTitle}</Layout.Header.TitleText>
|
||||||
|
</Layout.Header.Content>
|
||||||
|
<Layout.Header.Slot>
|
||||||
|
<Button
|
||||||
|
label={_(msg`Share`)}
|
||||||
|
size="small"
|
||||||
|
variant="ghost"
|
||||||
|
color="primary"
|
||||||
|
shape="round"
|
||||||
|
onPress={onShare}
|
||||||
|
hitSlop={HITSLOP_10}
|
||||||
|
style={[{right: -3}]}>
|
||||||
|
<ButtonIcon icon={Share} size="md" />
|
||||||
|
</Button>
|
||||||
|
</Layout.Header.Slot>
|
||||||
|
</Layout.Header.Outer>
|
||||||
|
<Pager
|
||||||
|
onPageSelected={onPageSelected}
|
||||||
|
renderTabBar={props => (
|
||||||
|
<Layout.Center style={[a.z_10, web([a.sticky, {top: 0}])]}>
|
||||||
|
<TabBar items={sections.map(section => section.title)} {...props} />
|
||||||
|
</Layout.Center>
|
||||||
|
)}
|
||||||
|
initialPage={0}>
|
||||||
|
{sections.map((section, i) => (
|
||||||
|
<View key={i}>{section.component}</View>
|
||||||
|
))}
|
||||||
|
</Pager>
|
||||||
|
</Layout.Screen>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
function TopicScreenTab({
|
||||||
|
topic,
|
||||||
|
sort,
|
||||||
|
active,
|
||||||
|
}: {
|
||||||
|
topic: string
|
||||||
|
sort: 'top' | 'latest'
|
||||||
|
active: boolean
|
||||||
|
}) {
|
||||||
|
const {_} = useLingui()
|
||||||
|
const initialNumToRender = useInitialNumToRender()
|
||||||
|
const [isPTR, setIsPTR] = React.useState(false)
|
||||||
|
|
||||||
|
const {
|
||||||
|
data,
|
||||||
|
isFetched,
|
||||||
|
isFetchingNextPage,
|
||||||
|
isLoading,
|
||||||
|
isError,
|
||||||
|
error,
|
||||||
|
refetch,
|
||||||
|
fetchNextPage,
|
||||||
|
hasNextPage,
|
||||||
|
} = useSearchPostsQuery({query: topic, sort, enabled: active})
|
||||||
|
|
||||||
|
const posts = React.useMemo(() => {
|
||||||
|
return data?.pages.flatMap(page => page.posts) || []
|
||||||
|
}, [data])
|
||||||
|
|
||||||
|
const onRefresh = React.useCallback(async () => {
|
||||||
|
setIsPTR(true)
|
||||||
|
await refetch()
|
||||||
|
setIsPTR(false)
|
||||||
|
}, [refetch])
|
||||||
|
|
||||||
|
const onEndReached = React.useCallback(() => {
|
||||||
|
if (isFetchingNextPage || !hasNextPage || error) return
|
||||||
|
fetchNextPage()
|
||||||
|
}, [isFetchingNextPage, hasNextPage, error, fetchNextPage])
|
||||||
|
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
{posts.length < 1 ? (
|
||||||
|
<ListMaybePlaceholder
|
||||||
|
isLoading={isLoading || !isFetched}
|
||||||
|
isError={isError}
|
||||||
|
onRetry={refetch}
|
||||||
|
emptyType="results"
|
||||||
|
emptyMessage={_(msg`We couldn't find any results for that hashtag.`)}
|
||||||
|
/>
|
||||||
|
) : (
|
||||||
|
<List
|
||||||
|
data={posts}
|
||||||
|
renderItem={renderItem}
|
||||||
|
keyExtractor={keyExtractor}
|
||||||
|
refreshing={isPTR}
|
||||||
|
onRefresh={onRefresh}
|
||||||
|
onEndReached={onEndReached}
|
||||||
|
onEndReachedThreshold={4}
|
||||||
|
// @ts-ignore web only -prf
|
||||||
|
desktopFixedHeight
|
||||||
|
ListFooterComponent={
|
||||||
|
<ListFooter
|
||||||
|
isFetchingNextPage={isFetchingNextPage}
|
||||||
|
error={cleanError(error)}
|
||||||
|
onRetry={fetchNextPage}
|
||||||
|
/>
|
||||||
|
}
|
||||||
|
initialNumToRender={initialNumToRender}
|
||||||
|
windowSize={11}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
|
</>
|
||||||
|
)
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user