diff --git a/packages/frontend/src/components/MkEmojiPicker.vue b/packages/frontend/src/components/MkEmojiPicker.vue
index 39e274ba11..2063ab4dec 100644
--- a/packages/frontend/src/components/MkEmojiPicker.vue
+++ b/packages/frontend/src/components/MkEmojiPicker.vue
@@ -74,7 +74,7 @@
- {{ category }}
+ {{ category }}
@@ -90,7 +90,7 @@
import { ref, shallowRef, computed, watch, onMounted } from 'vue';
import * as Misskey from 'misskey-js';
import XSection from '@/components/MkEmojiPicker.section.vue';
-import { emojilist, UnicodeEmojiDef, unicodeEmojiCategories as categories } from '@/scripts/emojilist';
+import { emojilist, emojiCharByCategory, UnicodeEmojiDef, unicodeEmojiCategories as categories } from '@/scripts/emojilist';
import MkRippleEffect from '@/components/MkRippleEffect.vue';
import * as os from '@/os';
import { isTouchUsing } from '@/scripts/touch';
diff --git a/packages/frontend/src/scripts/emojilist.ts b/packages/frontend/src/scripts/emojilist.ts
index bc52fa7a43..2e853b58b5 100644
--- a/packages/frontend/src/scripts/emojilist.ts
+++ b/packages/frontend/src/scripts/emojilist.ts
@@ -12,6 +12,25 @@ import _emojilist from '../emojilist.json';
export const emojilist = _emojilist as UnicodeEmojiDef[];
+const _indexByChar = new Map();
+const _charGroupByCategory = new Map();
+emojilist.forEach((emo, i) => {
+ _indexByChar.set(emo.char, i);
+
+ if (_charGroupByCategory.has(emo.category)) {
+ _charGroupByCategory.get(emo.category)?.push(emo.char);
+ } else {
+ _charGroupByCategory.set(emo.category, [emo.char]);
+ }
+});
+
+export const emojiCharByCategory = _charGroupByCategory;
+
export function getEmojiName(char: string): string | undefined {
- return emojilist.find(emo => emo.char === char)?.name;
+ const idx = _indexByChar.get(char);
+ if (typeof idx === 'undefined') {
+ return undefined;
+ } else {
+ return emojilist[idx].name;
+ }
}