stream-chat-react-native-core 5.24.1-beta.1 → 5.25.0-beta.2

package/src/utils/utils.ts

@@ -14,13 +14,16 @@ import type {
 } from 'stream-chat';
 
 import type { MessageType } from '../components/MessageList/hooks/useMessageList';
-import type { MentionAllAppUsersQuery } from '../contexts/messageInputContext/MessageInputContext';
+import type {
+  EmojiSearchIndex,
+  MentionAllAppUsersQuery,
+} from '../contexts/messageInputContext/MessageInputContext';
 import type {
   SuggestionCommand,
   SuggestionComponentType,
   SuggestionUser,
 } from '../contexts/suggestionsContext/SuggestionsContext';
-import { compiledEmojis, Emoji } from '../emoji-data/compiled';
+import { compiledEmojis, Emoji } from '../emoji-data';
 import type { IconProps } from '../icons/utils/base';
 import type { TableRowJoinedUser } from '../store/types';
 import type { DefaultStreamChatGenerics, ValueOf } from '../types/types';
@@ -287,7 +290,7 @@ export type TriggerSettings<
       query: Emoji['name'],
       _: string,
       onReady?: (data: Emoji[], q: Emoji['name']) => void,
-    ) => Emoji[];
+    ) => Emoji[] | Promise<Emoji[]>;
     output: (entity: Emoji) => {
       caretPosition: string;
       key: string;
@@ -325,6 +328,7 @@ export type ACITriggerSettingsParams<
   channel: Channel<StreamChatGenerics>;
   client: StreamChat<StreamChatGenerics>;
   onMentionSelectItem: (item: SuggestionUser<StreamChatGenerics>) => void;
+  emojiSearchIndex?: EmojiSearchIndex;
 };
 
 export type QueryUsersFunction<
@@ -350,6 +354,41 @@ export type QueryMembersFunction<
   },
 ) => Promise<void>;
 
+/**
+ * Default emoji search index for auto complete text input
+ */
+export const defaultEmojiSearchIndex: EmojiSearchIndex = {
+  search: (query) => {
+    const results = [];
+
+    for (const emoji of compiledEmojis) {
+      if (results.length >= 10) return results;
+      if (emoji.names.some((name) => name.includes(query))) {
+        // Aggregate skins as different toned emojis - if skins are present
+        if (emoji.skins) {
+          results.push({
+            ...emoji,
+            name: `${emoji.name}-tone-1`,
+            skins: undefined,
+          });
+          emoji.skins.forEach((tone, index) =>
+            results.push({
+              ...emoji,
+              name: `${emoji.name}-tone-${index + 2}`,
+              skins: undefined,
+              unicode: tone,
+            }),
+          );
+        } else {
+          results.push(emoji);
+        }
+      }
+    }
+
+    return results;
+  },
+};
+
 /**
  * ACI = AutoCompleteInput
  *
@@ -366,6 +405,7 @@ export const ACITriggerSettings = <
 >({
   channel,
   client,
+  emojiSearchIndex,
   onMentionSelectItem,
 }: ACITriggerSettingsParams<StreamChatGenerics>): TriggerSettings<StreamChatGenerics> => ({
   '/': {
@@ -409,42 +449,16 @@ export const ACITriggerSettings = <
     type: 'command',
   },
   ':': {
-    dataProvider: (query, _, onReady) => {
+    dataProvider: async (query, _, onReady) => {
       if (!query) return [];
 
-      const result = compiledEmojis.emojiArray.reduce((acc, cur) => {
-        if (acc.length >= 10) return acc;
-
-        if (cur.names.some((name) => name.includes(query))) {
-          const emoji = compiledEmojis.emojiLib[cur.name];
-          // Since there can be no emojiLib for the current name we need to check for it being undefined
-          if (emoji?.skin_variations) {
-            acc.push({
-              ...emoji,
-              name: `${emoji.name}-tone-1`,
-              skin_variations: undefined,
-            });
-            emoji.skin_variations.forEach((tone, index) =>
-              acc.push({
-                ...emoji,
-                name: `${emoji.name}-tone-${index + 2}`,
-                skin_variations: undefined,
-                unicode: tone,
-              }),
-            );
-          } else if (emoji) {
-            acc.push(emoji);
-          }
-        }
-
-        return acc;
-      }, [] as Emoji[]);
+      const emojis = (await emojiSearchIndex?.search(query)) ?? [];
 
       if (onReady) {
-        onReady(result, query);
+        onReady(emojis, query);
       }
 
-      return result;
+      return emojis;
     },
     output: (entity) => ({
       caretPosition: 'next',

package/src/version.json

@@ -1,3 +1,3 @@
 {
-  "version": "5.24.1-beta.1"
+  "version": "5.25.0-beta.2"
 }