diff options
Diffstat (limited to 'src/view/com/posts')
-rw-r--r-- | src/view/com/posts/Feed.tsx | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/src/view/com/posts/Feed.tsx b/src/view/com/posts/Feed.tsx index 74883f82a..591afe3a3 100644 --- a/src/view/com/posts/Feed.tsx +++ b/src/view/com/posts/Feed.tsx @@ -29,26 +29,26 @@ export const Feed = observer(function Feed({ feed, style, scrollElRef, - onPressTryAgain, onScroll, scrollEventThrottle, renderEmptyState, renderEndOfFeed, testID, headerOffset = 0, + desktopFixedHeightOffset, ListHeaderComponent, extraData, }: { feed: PostsFeedModel style?: StyleProp<ViewStyle> scrollElRef?: MutableRefObject<FlatList<any> | null> - onPressTryAgain?: () => void onScroll?: OnScrollCb scrollEventThrottle?: number renderEmptyState: () => JSX.Element renderEndOfFeed?: () => JSX.Element testID?: string headerOffset?: number + desktopFixedHeightOffset?: number ListHeaderComponent?: () => JSX.Element extraData?: any }) { @@ -71,6 +71,8 @@ export const Feed = observer(function Feed({ if (feed.loadMoreError) { feedItems = feedItems.concat([LOAD_MORE_ERROR_ITEM]) } + } else { + feedItems.push(LOADING_ITEM) } return feedItems }, [ @@ -106,6 +108,10 @@ export const Feed = observer(function Feed({ } }, [feed, track]) + const onPressTryAgain = React.useCallback(() => { + feed.refresh() + }, [feed]) + const onPressRetryLoadMore = React.useCallback(() => { feed.retryLoadMore() }, [feed]) @@ -158,7 +164,7 @@ export const Feed = observer(function Feed({ <FlatList testID={testID ? `${testID}-flatlist` : undefined} ref={scrollElRef} - data={!feed.hasLoaded ? [LOADING_ITEM] : data} + data={data} keyExtractor={item => item._reactKey} renderItem={renderItem} ListFooterComponent={FeedFooter} @@ -183,7 +189,9 @@ export const Feed = observer(function Feed({ contentOffset={{x: 0, y: headerOffset * -1}} extraData={extraData} // @ts-ignore our .web version only -prf - desktopFixedHeight + desktopFixedHeight={ + desktopFixedHeightOffset ? desktopFixedHeightOffset : true + } /> </View> ) |