moon
/
soapbox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'fix-has-more-in-search' into 'main' 

fix: set hasMore trending statuses inside its own if statement

See merge request soapbox-pub/soapbox!3186
This commit is contained in:
Alex Gleason 2024-10-23 21:41:43 +00:00
parent cbf1c2743b 74be76d65b
commit 50760e0bff
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/features/compose/components/search-results.tsx
View File

@ -160,6 +160,7 @@ const SearchResults = () => {
)); ));
resultsIds = results.statuses; resultsIds = results.statuses;
} else if (!submitted && trendingStatuses && !trendingStatuses.isEmpty()) { } else if (!submitted && trendingStatuses && !trendingStatuses.isEmpty()) {
hasMore = !!nextTrendingStatuses;
searchResults = trendingStatuses.map((statusId: string) => ( searchResults = trendingStatuses.map((statusId: string) => (
// @ts-ignore // @ts-ignore
<StatusContainer <StatusContainer
@ -231,7 +232,7 @@ const SearchResults = () => {
scrollKey={`${selectedFilter}:${value}`} scrollKey={`${selectedFilter}:${value}`}
isLoading={submitted && !loaded} isLoading={submitted && !loaded}
showLoading={submitted && !loaded && searchResults?.isEmpty()} showLoading={submitted && !loaded && searchResults?.isEmpty()}
hasMore={(!!nextTrendingStatuses) || hasMore} hasMore={hasMore}
onLoadMore={handleLoadMore} onLoadMore={handleLoadMore}
placeholderComponent={placeholderComponent} placeholderComponent={placeholderComponent}
placeholderCount={20} placeholderCount={20}