Skip to content

Commit 7d84def

Browse files
zubidenAjaxy
authored andcommitted
Middle Search: Fix pagination (#5827)
1 parent 79949b7 commit 7d84def

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

‎src/components/middle/search/MiddleSearch.tsx

+1
Original file line numberDiff line numberDiff line change
@@ -595,6 +595,7 @@ const MiddleSearch: FC<StateProps> = ({
595595
ref={containerRef}
596596
className={buildClassName(styles.results, 'custom-scroll')}
597597
items={viewportResults}
598+
itemSelector={`.${RESULT_ITEM_CLASS_NAME}`}
598599
preloadBackwards={0}
599600
onLoadMore={getMore}
600601
onKeyDown={handleKeyDown}

‎src/global/actions/api/middleSearch.ts

+6-4
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,12 @@ addActionHandler('performMiddleSearch', async (global, actions, payload): Promis
6666
const {
6767
results, savedTag, type, isHashtag,
6868
} = currentSearch;
69-
const offsetId = results?.nextOffsetId;
70-
const offsetRate = results?.nextOffsetRate;
71-
const offsetPeerId = results?.nextOffsetPeerId;
72-
const offsetPeer = offsetPeerId ? selectChat(global, offsetPeerId) : undefined;
69+
const shouldReuseParams = results?.query === query;
70+
71+
const offsetId = shouldReuseParams ? results?.nextOffsetId : undefined;
72+
const offsetRate = shouldReuseParams ? results?.nextOffsetRate : undefined;
73+
const offsetPeerId = shouldReuseParams ? results?.nextOffsetPeerId : undefined;
74+
const offsetPeer = shouldReuseParams && offsetPeerId ? selectChat(global, offsetPeerId) : undefined;
7375

7476
const shouldHaveQuery = isHashtag || !savedTag;
7577
if (shouldHaveQuery && !query) {

0 commit comments

Comments
 (0)