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

Use emoji sheet with fallback

Browse Source
This commit is contained in:
Fedor Indutny
2025-10-29 12:39:47 -07:00
committed by GitHub
parent 06448ea80e
commit 1f7ea7d088
5 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ts/components/fun/data/emojis.std.ts
View File

@@ -406,6 +406,9 @@ function addVariant(parentKey: EmojiParentKey, variant: EmojiVariantData) {
}
for (const rawEmoji of RAW_EMOJI_DATA) {
if (!rawEmoji.has_img_apple) {
continue;
}
const parentKey = toEmojiParentKey(rawEmoji.unified);
const defaultVariant: EmojiVariantData = {
@@ -426,6 +429,9 @@ for (const rawEmoji of RAW_EMOJI_DATA) {
const map = new Map<string, EmojiVariantKey>();
for (const [key, value] of Object.entries(rawEmoji.skin_variations)) {
if (!value.has_img_apple) {
continue;
}
const variantKey = toEmojiVariantKey(value.unified);
map.set(key, variantKey);

9
ts/components/fun/useFunEmojiLocalizer.dom.tsx
View File

@@ -9,7 +9,6 @@ import {
isEmojiVariantValue,
} from './data/emojis.std.js';
import type { LocaleEmojiListType } from '../../types/emoji.std.js';
import { strictAssert } from '../../util/assert.std.js';
import { useFunEmojiLocalization } from './FunEmojiLocalizationProvider.dom.js';
export type FunEmojiLocalizerIndex = Readonly<{
@@ -30,10 +29,10 @@ export function createFunEmojiLocalizerIndex(
const localeShortNameToParentKey = new Map<string, EmojiParentKey>();
for (const entry of localeEmojiList) {
strictAssert(
isEmojiVariantValue(entry.emoji),
'createFunEmojiLocalizerIndex: Must be emoji variant value'
);
// Sadly some localized emoji are not present in our spritesheets
if (!isEmojiVariantValue(entry.emoji)) {
continue;
}
const variantKey = getEmojiVariantKeyByValue(entry.emoji);
const parentKey = getEmojiParentKeyByVariantKey(variantKey);