Compare commits

...

2 Commits

Author SHA1 Message Date
Eric Bailey 8ad261aa50 Add isFetching 2023-11-14 11:22:35 -06:00
Eric Bailey cd5352e53a Handle end of feed 2023-11-14 10:17:09 -06:00
+18 -3
View File
@@ -107,6 +107,7 @@ export const FeedsScreen = withAuthRequired(function FeedsScreenImpl(
refetch: refetchPopularFeeds,
fetchNextPage: fetchNextPopularFeedsPage,
isFetchingNextPage: isPopularFeedsFetchingNextPage,
hasNextPage: hasNextPopularFeedsPage,
} = useGetPopularFeedsQuery()
const {_} = useLingui()
const setMinimalShellMode = useSetMinimalShellMode()
@@ -154,6 +155,22 @@ export const FeedsScreen = withAuthRequired(function FeedsScreenImpl(
await refetchPopularFeeds()
setIsPTR(false)
}, [setIsPTR, refetchPopularFeeds])
const onEndReached = React.useCallback(() => {
if (
isPopularFeedsFetching ||
isUserSearching ||
!hasNextPopularFeedsPage ||
popularFeedsError
)
return
fetchNextPopularFeedsPage()
}, [
isPopularFeedsFetching,
isUserSearching,
popularFeedsError,
hasNextPopularFeedsPage,
fetchNextPopularFeedsPage,
])
useFocusEffect(
React.useCallback(() => {
@@ -474,9 +491,7 @@ export const FeedsScreen = withAuthRequired(function FeedsScreenImpl(
/>
}
initialNumToRender={10}
onEndReached={() =>
isUserSearching ? undefined : fetchNextPopularFeedsPage()
}
onEndReached={onEndReached}
// @ts-ignore our .web version only -prf
desktopFixedHeight
/>