diff --git a/app/javascript/mastodon/components/emoji/picker/constants.ts b/app/javascript/mastodon/components/emoji/picker/constants.ts index 577da6bf3e..917128b043 100644 --- a/app/javascript/mastodon/components/emoji/picker/constants.ts +++ b/app/javascript/mastodon/components/emoji/picker/constants.ts @@ -1,4 +1,4 @@ -import type { GroupMessage } from 'emojibase'; +import type { GroupKey, GroupMessage } from 'emojibase'; import groupData from 'emojibase-data/meta/groups.json'; import type { CustomEmojiData } from '@/mastodon/features/emoji/types'; @@ -7,6 +7,8 @@ type CustomGroupMessage = Omit & { key: string; }; +export const groupsToHide: readonly GroupKey[] = ['component']; + export const groupKeysToNumber = Object.fromEntries( Object.entries(groupData.groups).map(([number, key]) => [ key, diff --git a/app/javascript/mastodon/components/emoji/picker/index.tsx b/app/javascript/mastodon/components/emoji/picker/index.tsx index f9fbd4ad20..e2b112058f 100644 --- a/app/javascript/mastodon/components/emoji/picker/index.tsx +++ b/app/javascript/mastodon/components/emoji/picker/index.tsx @@ -16,6 +16,7 @@ import { CustomEmojiProvider } from '../context'; import { groupKeysToNumber, + groupsToHide, mockCustomEmojis, mockCustomGroups, } from './constants'; @@ -58,11 +59,17 @@ export const MockEmojiPicker: FC = ({ onSelect }) => { `../../../../../../node_modules/emojibase-data/${currentLocale}/messages.json` ) .then((module: { default: MessagesDataset }) => { - setGroups(module.default.groups); + setGroups( + module.default.groups.filter( + (group) => !groupsToHide.includes(group.key), + ), + ); }) .catch((err: unknown) => { console.warn('fell back to en messages', err); - setGroups(messages.groups); + setGroups( + messages.groups.filter((group) => !groupsToHide.includes(group.key)), + ); }); }