wieerwill/platform
1
0
Fork 0
mirror of https://github.com/hcengineering/platform.git synced 2025-05-15 03:51:04 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Fix combined tones emoji

Browse Source 
Signed-off-by: Anton Alexeyev <alexeyev.anton@gmail.com>
This commit is contained in:
Anton Alexeyev 2025-05-02 07:43:32 +07:00
parent 2d2f4dbfd5
commit ea5616d9b2
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packages/ui/src/components/emoji/ActionsPopup.svelte
View File

@ -5,8 +5,8 @@
// //
import { createEventDispatcher } from 'svelte' import { createEventDispatcher } from 'svelte'
import type { Emoji } from 'emojibase' import type { Emoji } from 'emojibase'
import type { EmojiWithGroup } from '.' import { EmojiWithGroup, getEmojiForHexcode, getSkinnedEmojiTest } from '.'
import { EmojiButton, getEmoji, getSkinTone, emojiStore } from '.' import { EmojiButton, getSkinTone, emojiStore } from '.'
import { Label, IconDelete, closeTooltip, ButtonBase } from '../..' import { Label, IconDelete, closeTooltip, ButtonBase } from '../..'
import plugin from '../../plugin' import plugin from '../../plugin'
import SkinToneTooltip from './SkinToneTooltip.svelte' import SkinToneTooltip from './SkinToneTooltip.svelte'
@ -28,8 +28,8 @@
const def = $emojiStore[168] const def = $emojiStore[168]
const temp = e.skins?.find((skin) => Array.isArray(skin.tone) && skin.tone.length > 1)?.hexcode.split('-200D-') const temp = e.skins?.find((skin) => Array.isArray(skin.tone) && skin.tone.length > 1)?.hexcode.split('-200D-')
if (temp === undefined || temp.length < 2) return [def, def] if (temp === undefined || temp.length < 2) return [def, def]
const firstEmoji = getEmoji(temp[0].slice(0, -6))?.emoji ?? def const firstEmoji = getEmojiForHexcode(temp[0].slice(0, -6)) ?? def
const secondEmoji = getEmoji(temp[temp.length - 1].slice(0, -6))?.emoji ?? def const secondEmoji = getEmojiForHexcode(temp[temp.length - 1].slice(0, -6)) ?? def
return [firstEmoji, secondEmoji] return [firstEmoji, secondEmoji]
} }
const emojiParts = getEmojiParts(emoji) const emojiParts = getEmojiParts(emoji)

2
packages/ui/src/components/emoji/SkinToneTooltip.svelte
View File

@ -13,7 +13,7 @@
const dispatch = createEventDispatcher() const dispatch = createEventDispatcher()
const skins: Emoji[] = emoji.skins ?? [] const skins: Emoji[] = emoji.skins !== undefined ? [emoji, ...emoji.skins] : []
</script> </script>
<div class="flex-row-center flex-gap-1"> <div class="flex-row-center flex-gap-1">

6
packages/ui/src/components/emoji/utils.ts
View File

@ -72,6 +72,10 @@ export async function updateEmojis (lang?: string): Promise<void> {
emojiStore.set(emojis) emojiStore.set(emojis)
} }
export function getEmojiForHexcode (hexcode: string): EmojiWithGroup | undefined {
return get(emojiStore).find((e) => e.hexcode === hexcode)
}
export function getSkinnedEmoji (shortcode: string | undefined, skinTone?: number): Emoji | undefined { export function getSkinnedEmoji (shortcode: string | undefined, skinTone?: number): Emoji | undefined {
if (shortcode === undefined) return undefined if (shortcode === undefined) return undefined
const shortcodeSlice = shortcode.slice(1, -1) const shortcodeSlice = shortcode.slice(1, -1)
@ -148,7 +152,7 @@ export const getFrequentlyEmojis = (): EmojiWithGroup[] | undefined => {
const parsedEmojis = JSON.parse(frequentlyEmojis) const parsedEmojis = JSON.parse(frequentlyEmojis)
if (!Array.isArray(parsedEmojis)) return undefined if (!Array.isArray(parsedEmojis)) return undefined
const emojis = get(emojiStore) const emojis = get(emojiStore)
return emojis.filter(e => parsedEmojis.find(pe => pe.hexcode === e.hexcode) !== undefined) return emojis.filter(e => parsedEmojis.find(pe => pe.hexcode === e.hexcode || e.skins?.find(s => s.hexcode === pe.hexcode) !== undefined) !== undefined)
} catch (e) { } catch (e) {
console.error(e) console.error(e)
return undefined return undefined