octo/tooot
1
0
Fork 0
mirror of https://github.com/tooot-app/app synced 2025-06-05 22:19:13 +02:00
Code Issues Projects Releases Wiki Activity

Fix remote toot not interactable

Browse Source
This commit is contained in:
xmflsct
2023-02-12 17:08:44 +01:00
parent 398f34d95d
commit 4a340fca8e
4 changed files with 32 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/screens/Tabs/Shared/Toot.tsx
View File

@ -29,7 +29,7 @@ const TabSharedToot: React.FC<TabSharedStackScreenProps<'Tab-Shared-Toot'>> = ({
const { colors } = useTheme()
const { t } = useTranslation(['componentTimeline', 'screenTabs'])
const [hasRemoteContent, setHasRemoteContent] = useState<boolean>(false)
const [hasRemoteContent, setHasRemoteContent] = useState<boolean>(toot._remote || false)
const queryKey: { local: QueryKeyTimeline; remote: QueryKeyTimeline } = {
local: ['Timeline', { page: 'Toot', toot: toot.id, remote: false }],
remote: ['Timeline', { page: 'Toot', toot: toot.id, remote: true }]
@ -70,7 +70,7 @@ const TabSharedToot: React.FC<TabSharedStackScreenProps<'Tab-Shared-Toot'>> = ({
headerLeft: () => <HeaderLeft onPress={() => navigation.goBack()} />,
headerBackVisible: false
})
navigation.setParams({ toot, queryKey: queryKey.local })
navigation.setParams({ queryKey: queryKey.local })
}, [hasRemoteContent])
const PREV_PER_BATCH = 1
@ -236,12 +236,15 @@ const TabSharedToot: React.FC<TabSharedStackScreenProps<'Tab-Shared-Toot'>> = ({
return
}
if ((query.data?.pages[0].body.length || 0) < data.length) {
if ((query.data?.pages[0].body.length || 0) <= data.length) {
if (!hasRemoteContent && (query.data?.pages[0].body.length || 0) <= data.length) {
setHasRemoteContent(true)
}
queryClient.cancelQueries(queryKey.local)
queryClient.setQueryData<{ pages: { body: Mastodon.Status[] }[] }>(
queryKey.local,
old => {
setHasRemoteContent(true)
return {
pages: [
{
@ -350,7 +353,7 @@ const TabSharedToot: React.FC<TabSharedStackScreenProps<'Tab-Shared-Toot'>> = ({
) : null}
<TimelineDefault
item={item}
queryKey={item._remote ? queryKey.remote : queryKey.local}
queryKey={queryKey.local}
highlighted={toot.id === item.id}
suppressSpoiler={
toot.id !== item.id &&