octo/tooot
octo
/
tooot
mirror of https://github.com/tooot-app/app
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix timeline when length is short 

When list is short, it somehow can fetch more
This commit is contained in:
Zhiyuan Zheng 2020-12-13 00:22:49 +01:00
parent 70743ec82d
commit f0daae30cd
No known key found for this signature in database
GPG Key ID: 078A93AB607D85E0
1 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/components/Timelines/Timeline.tsx
View File

@ -39,7 +39,16 @@ const Timeline: React.FC<Props> = ({
return () => AppState.removeEventListener('change', handleAppStateChange)
})
const queryKey: App.QueryKey = [page, { page, hashtag, list, toot, account }]
const queryKey: App.QueryKey = [
page,
{
page,
...(hashtag && { hashtag }),
...(list && { list }),
...(toot && { toot }),
...(account && { account })
}
]
const {
isSuccess,
isLoading,
@ -50,7 +59,14 @@ const Timeline: React.FC<Props> = ({
fetchMore,
refetch
} = useInfiniteQuery(queryKey, timelineFetch, {
getFetchMore: last => last?.toots.length > 0
getFetchMore: (last, all) => {
const allLastGroup = all[all.length - 1]!
return (
last?.toots.length > 0 &&
allLastGroup.toots[allLastGroup.toots.length - 1].id !==
last?.toots[last?.toots.length - 1].id
)
}
})
const flattenData = data ? data.flatMap(d => [...d?.toots]) : []
const flattenPointer = data ? data.flatMap(d => [d?.pointer]) : []
@ -71,7 +87,7 @@ const Timeline: React.FC<Props> = ({
const flRenderItem = useCallback(({ item }) => {
switch (page) {
case 'Conversations':
return <TimelineConversation item={item} />
return <TimelineConversation item={item} queryKey={queryKey} />
case 'Notifications':
return <TimelineNotifications notification={item} queryKey={queryKey} />
default: