Signal/Desktop
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Desktop.git synced 2026-04-27 11:53:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix rendering non/overly-qualified emoji in emojify

Browse Source
This commit is contained in:
Jamie Kyle
2025-03-28 16:01:27 -07:00
committed by GitHub
parent d66ce9ad6a
commit 22fb468481
3 changed files with 42 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ts/components/fun/data/emojis.ts
View File

@@ -252,10 +252,12 @@ type EmojiIndex = Readonly<{
parentByKey: Record<EmojiParentKey, EmojiParentData>;
parentKeysByName: Record<EmojiEnglishShortName, EmojiParentKey>;
parentKeysByValue: Record<EmojiParentValue, EmojiParentKey>;
parentKeysByValueNonQualified: Record<EmojiParentValue, EmojiParentKey>;
parentKeysByVariantKeys: Record<EmojiVariantKey, EmojiParentKey>;
variantByKey: Record<EmojiVariantKey, EmojiVariantData>;
variantKeysByValue: Record<EmojiVariantValue, EmojiVariantKey>;
variantKeysByValueNonQualified: Record<EmojiVariantValue, EmojiVariantKey>;
unicodeCategories: Record<EmojiUnicodeCategory, Array<EmojiParentKey>>;
pickerCategories: Record<EmojiPickerCategory, Array<EmojiParentKey>>;
@@ -266,10 +268,12 @@ type EmojiIndex = Readonly<{
const EMOJI_INDEX: EmojiIndex = {
parentByKey: {},
parentKeysByValue: {},
parentKeysByValueNonQualified: {},
parentKeysByName: {},
parentKeysByVariantKeys: {},
variantByKey: {},
variantKeysByValue: {},
variantKeysByValueNonQualified: {},
unicodeCategories: {
[EmojiUnicodeCategory.SmileysAndEmotion]: [],
[EmojiUnicodeCategory.PeopleAndBody]: [],
@@ -300,6 +304,8 @@ function addParent(parent: EmojiParentData, rank: number) {
EMOJI_INDEX.parentKeysByValue[parent.value] = parent.key;
if (parent.valueNonqualified != null) {
EMOJI_INDEX.parentKeysByValue[parent.valueNonqualified] = parent.key;
EMOJI_INDEX.parentKeysByValueNonQualified[parent.valueNonqualified] =
parent.key;
}
EMOJI_INDEX.parentKeysByName[parent.englishShortNameDefault] = parent.key;
EMOJI_INDEX.unicodeCategories[parent.unicodeCategory].push(parent.key);
@@ -327,6 +333,8 @@ function addVariant(parentKey: EmojiParentKey, variant: EmojiVariantData) {
EMOJI_INDEX.variantKeysByValue[variant.value] = variant.key;
if (variant.valueNonqualified) {
EMOJI_INDEX.variantKeysByValue[variant.valueNonqualified] = variant.key;
EMOJI_INDEX.variantKeysByValueNonQualified[variant.valueNonqualified] =
variant.key;
}
}
@@ -419,6 +427,12 @@ export function isEmojiVariantValue(input: string): input is EmojiVariantValue {
return Object.hasOwn(EMOJI_INDEX.variantKeysByValue, input);
}
export function isEmojiVariantValueNonQualified(
input: EmojiVariantValue
): boolean {
return Object.hasOwn(EMOJI_INDEX.variantKeysByValueNonQualified, input);
}
/** @deprecated Prefer EmojiKey for refs, load short names from translations */
export function isEmojiEnglishShortName(
input: string