Signal/Desktop
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Desktop.git synced 2025-12-24 04:09:49 +00: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

BIN
images/emoji-sheet-32.webp
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.3 MiB

After

Width:  |  Height:  |  Size: 1.3 MiB

BIN
images/emoji-sheet-64.webp
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.5 MiB

After

Width:  |  Height:  |  Size: 3.5 MiB

4
package.json
View File

@@ -102,8 +102,8 @@
"build:release-win32-all": "pnpm run build:release --arm64 --x64", "build:release-win32-all": "pnpm run build:release --arm64 --x64",
"build:preload-cache": "node ts/scripts/generate-preload-cache.node.js", "build:preload-cache": "node ts/scripts/generate-preload-cache.node.js",
"build:emoji": "run-p build:emoji:32 build:emoji:64", "build:emoji": "run-p build:emoji:32 build:emoji:64",
"build:emoji:32": "cwebp -progress -mt -preset icon -alpha_filter best -alpha_q 20 -pass 10 -q 75 ./node_modules/emoji-datasource-apple/img/apple/sheets-clean/32.png -o ./images/emoji-sheet-32.webp", "build:emoji:32": "cwebp -progress -mt -preset icon -alpha_filter best -alpha_q 20 -pass 10 -q 75 ./node_modules/emoji-datasource-apple/img/apple/sheets/32.png -o ./images/emoji-sheet-32.webp",
"build:emoji:64": "cwebp -progress -mt -preset icon -alpha_filter best -alpha_q 20 -pass 10 -q 75 ./node_modules/emoji-datasource-apple/img/apple/sheets-clean/64.png -o ./images/emoji-sheet-64.webp", "build:emoji:64": "cwebp -progress -mt -preset icon -alpha_filter best -alpha_q 20 -pass 10 -q 75 ./node_modules/emoji-datasource-apple/img/apple/sheets/64.png -o ./images/emoji-sheet-64.webp",
"verify": "run-p --print-label verify:*", "verify": "run-p --print-label verify:*",
"verify:ts": "tsc --noEmit", "verify:ts": "tsc --noEmit",
"electron:install-app-deps": "electron-builder install-app-deps", "electron:install-app-deps": "electron-builder install-app-deps",

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

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

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