fix emoticon search for emoji picker, typo

pull/2246/head
koray-eren 3 years ago
parent b4a57b32eb
commit ebe1ae8f12

@ -423,7 +423,7 @@ class CompositionBoxInner extends React.Component<Props, State> {
const { isKickedFromGroup, left, isPrivate, isBlocked } = this.props.selectedConversation; const { isKickedFromGroup, left, isPrivate, isBlocked } = this.props.selectedConversation;
const messagePlaceHolder = makeMessagePlaceHolderText(); const messagePlaceHolder = makeMessagePlaceHolderText();
const { typingEnabled } = this.props; const { typingEnabled } = this.props;
const neverMatchingRegex = /(\W)$/; const neverMatchingRegex = /($a)/;
return ( return (
<MentionsInput <MentionsInput

@ -28,16 +28,18 @@ export const searchEmojiForQuery = (query: string): Array<SuggestionDataItem> =>
if (query.length === 0 || !emojiIndex) { if (query.length === 0 || !emojiIndex) {
return []; return [];
} }
const results = emojiIndex.search(query); const results1 = emojiIndex.search(":"+query) || [];
const results2 = emojiIndex.search(query) || [];
const results = [...new Set(results1.concat(results2))];
if (!results || !results.length) { if (!results || !results.length) {
return []; return [];
} }
return results return results
.map(o => { .map(o => {
const onlyBaseEmokji = o as BaseEmoji; const onlyBaseEmoji = o as BaseEmoji;
return { return {
id: onlyBaseEmokji.native, id: onlyBaseEmoji.native,
display: onlyBaseEmokji.colons, display: onlyBaseEmoji.colons,
}; };
}) })
.slice(0, 8); .slice(0, 8);

Loading…
Cancel
Save