Merge pull request #28589 from software-mansion-labs/ts-migration/emo…

…ji-utils-lib
Expensify · Nov 7, 2023 · 8f5007a · 8f5007a
2 parents 18ba46f + 082a210
commit 8f5007a
Show file tree

Hide file tree

Showing 8 changed files with 242 additions and 266 deletions.
diff --git a/assets/emojis/common.js → assets/emojis/common.ts b/assets/emojis/common.js → assets/emojis/common.ts
@@ -1,12 +1,13 @@
-import Smiley from '../images/emoji.svg';
-import Flags from '../images/emojiCategoryIcons/flag.svg';
-import FoodAndDrink from '../images/emojiCategoryIcons/hamburger.svg';
-import Objects from '../images/emojiCategoryIcons/light-bulb.svg';
-import Symbols from '../images/emojiCategoryIcons/peace-sign.svg';
-import TravelAndPlaces from '../images/emojiCategoryIcons/plane.svg';
-import AnimalsAndNature from '../images/emojiCategoryIcons/plant.svg';
-import Activities from '../images/emojiCategoryIcons/soccer-ball.svg';
-import FrequentlyUsed from '../images/history.svg';
+import Smiley from '@assets/images/emoji.svg';
+import Flags from '@assets/images/emojiCategoryIcons/flag.svg';
+import FoodAndDrink from '@assets/images/emojiCategoryIcons/hamburger.svg';
+import Objects from '@assets/images/emojiCategoryIcons/light-bulb.svg';
+import Symbols from '@assets/images/emojiCategoryIcons/peace-sign.svg';
+import TravelAndPlaces from '@assets/images/emojiCategoryIcons/plane.svg';
+import AnimalsAndNature from '@assets/images/emojiCategoryIcons/plant.svg';
+import Activities from '@assets/images/emojiCategoryIcons/soccer-ball.svg';
+import FrequentlyUsed from '@assets/images/history.svg';
+import {HeaderEmoji, PickerEmojis} from './types';
 
 const skinTones = [
     {
@@ -33,9 +34,9 @@ const skinTones = [
         code: '🖐🏿',
         skinTone: 0,
     },
-];
+] as const;
 
-const emojis = [
+const emojis: PickerEmojis = [
     {
         header: true,
         icon: Smiley,
@@ -7619,7 +7620,7 @@ const emojis = [
     },
 ];
 
-const categoryFrequentlyUsed = {
+const categoryFrequentlyUsed: HeaderEmoji = {
     header: true,
     code: 'frequentlyUsed',
     icon: FrequentlyUsed,

diff --git a/assets/emojis/en.js → assets/emojis/en.ts b/assets/emojis/en.js → assets/emojis/en.ts
@@ -1,4 +1,7 @@
-const enEmojis = {
+import {EmojisList} from './types';
+
+/* eslint-disable @typescript-eslint/naming-convention */
+const enEmojis: EmojisList = {
     '😀': {
         keywords: ['smile', 'happy', 'face', 'grin'],
     },

diff --git a/assets/emojis/es.js → assets/emojis/es.ts b/assets/emojis/es.js → assets/emojis/es.ts
@@ -1,4 +1,7 @@
-const esEmojis = {
+import {EmojisList} from './types';
+
+/* eslint-disable @typescript-eslint/naming-convention */
+const esEmojis: EmojisList = {
     '😀': {
         name: 'sonriendo',
         keywords: ['cara', 'divertido', 'feliz', 'sonrisa', 'cara sonriendo'],

diff --git a/assets/emojis/index.js b/assets/emojis/index.js
diff --git a/assets/emojis/index.ts b/assets/emojis/index.ts
@@ -0,0 +1,35 @@
+import emojis from './common';
+import enEmojis from './en';
+import esEmojis from './es';
+import {Emoji} from './types';
+
+type EmojiTable = Record<string, Emoji>;
+
+const emojiNameTable = emojis.reduce<EmojiTable>((prev, cur) => {
+    const newValue = prev;
+    if (!('header' in cur) && cur.name) {
+        newValue[cur.name] = cur;
+    }
+    return newValue;
+}, {});
+
+const emojiCodeTableWithSkinTones = emojis.reduce<EmojiTable>((prev, cur) => {
+    const newValue = prev;
+    if (!('header' in cur)) {
+        newValue[cur.code] = cur;
+    }
+    if ('types' in cur && cur.types) {
+        cur.types.forEach((type) => {
+            newValue[type] = cur;
+        });
+    }
+    return newValue;
+}, {});
+
+const localeEmojis = {
+    en: enEmojis,
+    es: esEmojis,
+} as const;
+
+export {emojiNameTable, emojiCodeTableWithSkinTones, localeEmojis};
+export {skinTones, categoryFrequentlyUsed, default} from './common';
diff --git a/assets/emojis/types.ts b/assets/emojis/types.ts
@@ -0,0 +1,19 @@
+import {SvgProps} from 'react-native-svg';
+
+type Emoji = {
+    code: string;
+    name: string;
+    types?: string[];
+};
+
+type HeaderEmoji = {
+    header: true;
+    icon: React.FC<SvgProps>;
+    code: string;
+};
+
+type PickerEmojis = Array<Emoji | HeaderEmoji>;
+
+type EmojisList = Record<string, {keywords: string[]; name?: string}>;
+
+export type {Emoji, HeaderEmoji, EmojisList, PickerEmojis};
diff --git a/src/libs/EmojiTrie.ts b/src/libs/EmojiTrie.ts
@@ -23,11 +23,14 @@ type LocalizedEmojis = Record<string, LocalizedEmoji>;
 type Suggestion = {
     code: string;
     types?: string[];
-    name?: string;
+    name: string;
 };
 
 type EmojiMetaData = {
     suggestions?: Suggestion[];
+    code?: string;
+    types?: string[];
+    name?: string;
 };
 
 Timing.start(CONST.TIMING.TRIE_INITIALIZATION);