mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Replace Draft with Quill for composition area

Browse source 
Co-authored-by: Sidney Keese <sidney@carbonfive.com>
This commit is contained in:
Sidney Keese 2020-10-21 09:53:32 -07:00 • committed by Evan Hahn
parent 544995cc21
commit fbf93374c1
20 changed files with 2933 additions and 1130 deletions
Download patch file Download diff file Expand all files Collapse all files

26
ts/components/emoji/lib.ts
View file

@ -240,14 +240,14 @@ export function unifiedToEmoji(unified: string): string {
.join('');
}
export function convertShortName(
export function convertShortNameToData(
shortName: string,
skinTone: number | SkinToneKey = 0
): string {
): EmojiData | undefined {
const base = dataByShortName[shortName];
if (!base) {
return '';
return undefined;
}
const toneKey = is.number(skinTone) ? skinTones[skinTone - 1] : skinTone;
@ -255,11 +255,27 @@ export function convertShortName(
if (skinTone && base.skin_variations) {
const variation = base.skin_variations[toneKey];
if (variation) {
return unifiedToEmoji(variation.unified);
return {
...base,
...variation,
};
}
}
return unifiedToEmoji(base.unified);
return base;
}
export function convertShortName(
shortName: string,
skinTone: number | SkinToneKey = 0
): string {
const emojiData = convertShortNameToData(shortName, skinTone);
if (!emojiData) {
return '';
}
return unifiedToEmoji(emojiData.unified);
}
export function emojiToImage(emoji: string): string | undefined {