Skip to content

Commit 1220982

Browse files
authored
fix: Use messageSearchQuery.keyword in MessageSearch (#1300)
Made from #1292 Thanks to @sasha1107 ### Changelog * Also use the `messageSearchQuery.keyword` when searching in MessageSearch module * Note: The `searchString` has higher priority, P0: `searchString`, P1: `messageSearchQuery.keyword`
1 parent cdeb26e commit 1220982

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

src/modules/MessageSearch/context/MessageSearchProvider.tsx

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import React, {
22
useRef,
33
useState,
44
useReducer,
5+
useMemo,
56
} from 'react';
67
import { SendbirdError } from '@sendbird/chat';
78
import type { MessageSearchQuery } from '@sendbird/chat/message';
@@ -104,7 +105,10 @@ const MessageSearchProvider: React.FC<MessageSearchProviderProps> = (props: Mess
104105
{ sdk, logger, messageSearchDispatcher },
105106
);
106107

107-
const requestString = useSearchStringEffect({ searchString: searchString ?? '' }, { messageSearchDispatcher });
108+
const _searchString = useMemo(() => {
109+
return searchString ?? messageSearchQuery?.keyword ?? '';
110+
}, [searchString, messageSearchQuery?.keyword]);
111+
const requestString = useSearchStringEffect({ searchString: _searchString }, { messageSearchDispatcher });
108112

109113
useGetSearchMessages(
110114
{ currentChannel, channelUrl, requestString, messageSearchQuery, onResultLoaded, retryCount },
@@ -122,7 +126,7 @@ const MessageSearchProvider: React.FC<MessageSearchProviderProps> = (props: Mess
122126
return (
123127
<MessageSearchContext.Provider value={{
124128
channelUrl,
125-
searchString,
129+
searchString: _searchString,
126130
requestString,
127131
messageSearchQuery,
128132
onResultLoaded,

0 commit comments

Comments
 (0)