@@ -122,10 +114,6 @@ export function All(props: AllProps): JSX.Element {
);
}
-const FRIED_SHRIMP = getEmojiVariantByKey(
- EMOJI_VARIANT_KEY_CONSTANTS.FRIED_SHRIMP
-);
-
export function Inline(): JSX.Element {
return (
@@ -133,7 +121,7 @@ export function Inline(): JSX.Element {
{' '}
Lorem, ipsum dolor sit amet consectetur adipisicing elit. Repellat
voluptates, mollitia tempora alias libero repudiandae nesciunt. Deleniti
@@ -142,7 +130,7 @@ export function Inline(): JSX.Element {
{' '}
Consectetur quibusdam accusantium magni ipsum nemo eligendi quisquam
dolor, recusandae vero dolore reiciendis doloribus ducimus officiis
@@ -151,7 +139,7 @@ export function Inline(): JSX.Element {
diff --git a/ts/components/fun/FunEmoji.dom.tsx b/ts/components/fun/FunEmoji.dom.tsx
index a3d9f6d5a0..25a21ff9bf 100644
--- a/ts/components/fun/FunEmoji.dom.tsx
+++ b/ts/components/fun/FunEmoji.dom.tsx
@@ -4,14 +4,9 @@ import classNames from 'classnames';
import type { CSSProperties, JSX } from 'react';
import { useMemo, useState, useCallback } from 'react';
import MANIFEST from '../../../build/jumbomoji.json';
-import {
- getEmojiDebugLabel,
- isSafeEmojifyEmoji,
- type EmojiVariantData,
- type EmojiVariantValue,
-} from './data/emojis.std.ts';
import type { FunImageAriaProps } from './types.dom.tsx';
import { createLogger } from '../../logging/log.std.ts';
+import { Emoji } from '../../axo/emoji.std.ts';
const log = createLogger('FunEmoji');
@@ -28,14 +23,14 @@ const KNOWN_JUMBOMOJI = new Set
(Object.values(MANIFEST).flat());
const MIN_JUMBOMOJI_SIZE = 33;
function getEmojiJumboUrl(
- emoji: EmojiVariantData,
+ emoji: Emoji.Variant,
size: number | undefined
): string | null {
if (size != null && size < MIN_JUMBOMOJI_SIZE) {
return null;
}
- if (KNOWN_JUMBOMOJI.has(emoji.value)) {
- return `emoji://jumbo?emoji=${encodeURIComponent(emoji.value)}`;
+ if (KNOWN_JUMBOMOJI.has(emoji)) {
+ return `emoji://jumbo?emoji=${encodeURIComponent(emoji)}`;
}
return null;
}
@@ -84,7 +79,7 @@ const funStaticEmojiSizeClasses = {
export type FunStaticEmojiProps = FunImageAriaProps &
Readonly<{
size: FunStaticEmojiSize;
- emoji: EmojiVariantData;
+ emoji: Emoji.Variant;
}>;
export function FunStaticEmoji(props: FunStaticEmojiProps): JSX.Element {
@@ -103,8 +98,7 @@ export function FunStaticEmoji(props: FunStaticEmojiProps): JSX.Element {
height={props.size}
role={props.role}
aria-label={props['aria-label']}
- data-emoji-key={props.emoji.key}
- data-emoji-value={props.emoji.value}
+ data-emoji={props.emoji}
className={classNames(
FUN_STATIC_EMOJI_CLASS,
funStaticEmojiSizeClasses[props.size]
@@ -122,8 +116,7 @@ export function FunStaticEmoji(props: FunStaticEmojiProps): JSX.Element {
- {props.emoji.value}
+ {props.emoji}
)}
@@ -162,16 +155,15 @@ export function createStaticEmojiBlot(
node.setAttribute('aria-label', props['aria-label']);
}
// Needed to lookup emoji value in `matchEmojiBlot`
- node.dataset.emojiKey = props.emoji.key;
- node.dataset.emojiValue = props.emoji.value;
+ node.dataset.emoji = props.emoji;
- node.innerText = props.emoji.value;
+ node.innerText = props.emoji;
}
export type FunInlineEmojiProps = FunImageAriaProps &
Readonly<{
size?: number | null;
- emoji: EmojiVariantData;
+ emoji: Emoji.Variant;
style?: CSSProperties;
}>;
@@ -210,8 +202,7 @@ export function FunInlineEmoji(props: FunInlineEmojiProps): JSX.Element {
className={FUN_INLINE_EMOJI_CLASS}
aria-label={props['aria-label']}
// Needed to lookup emoji value in `matchEmojiBlot`
- data-emoji-key={props.emoji.key}
- data-emoji-value={props.emoji.value}
+ data-emoji={props.emoji}
style={
{
'--fun-inline-emoji-size':
@@ -220,9 +211,9 @@ export function FunInlineEmoji(props: FunInlineEmojiProps): JSX.Element {
} as CSSProperties
}
>
- {props.emoji.value}
+ {props.emoji}
- {!isLoaded && props.emoji.value}
+ {!isLoaded && props.emoji}
{img}
@@ -238,23 +229,23 @@ function isFunEmojiElement(element: HTMLElement): boolean {
export function getFunEmojiElementValue(
element: HTMLElement
-): EmojiVariantValue | null {
+): Emoji.Variant | null {
if (!isFunEmojiElement(element)) {
return null;
}
- const value = element.dataset.emojiValue;
+ const value = element.dataset.emoji;
if (value == null) {
- log.error('Missing a data-emoji-value attribute on emoji element');
+ log.error('Missing a data-emoji attribute on emoji element');
return null;
}
- if (!isSafeEmojifyEmoji(value)) {
+ if (!Emoji.isEmoji(value)) {
log.error(
- `Expected a valid emoji variant value, got ${getEmojiDebugLabel(value)}`
+ `Expected a valid emoji variant value, got ${Emoji.getDebugLabel(value)}`
);
return null;
}
- return value;
+ return Emoji.ignorePreferredSkinTone(value);
}
diff --git a/ts/components/fun/FunEmojiLocalizationProvider.dom.tsx b/ts/components/fun/FunEmojiLocalizationProvider.dom.tsx
deleted file mode 100644
index c3bb2bf8af..0000000000
--- a/ts/components/fun/FunEmojiLocalizationProvider.dom.tsx
+++ /dev/null
@@ -1,152 +0,0 @@
-// Copyright 2025 Signal Messenger, LLC
-// SPDX-License-Identifier: AGPL-3.0-only
-import {
- createContext,
- memo,
- type ReactNode,
- useContext,
- useEffect,
- useMemo,
- useState,
- type JSX,
-} from 'react';
-import type { LocaleEmojiListType } from '../../types/emoji.std.ts';
-import { createLogger } from '../../logging/log.std.ts';
-import * as Errors from '../../types/errors.std.ts';
-import { drop } from '../../util/drop.std.ts';
-import {
- getEmojiDefaultEnglishLocalizerIndex,
- getEmojiDefaultEnglishSearchIndex,
-} from './data/emojis.std.ts';
-import {
- createFunEmojiLocalizerIndex,
- type FunEmojiLocalizerIndex,
-} from './useFunEmojiLocalizer.dom.tsx';
-import {
- createFunEmojiSearchIndex,
- type FunEmojiSearchIndex,
-} from './useFunEmojiSearch.dom.tsx';
-import type { LocalizerType } from '../../types/I18N.std.ts';
-import { strictAssert } from '../../util/assert.std.ts';
-import { isTestOrMockEnvironment } from '../../environment.std.ts';
-
-const log = createLogger('FunEmojiLocalizationProvider');
-
-export type FunEmojiLocalizationContextType = Readonly<{
- emojiSearchIndex: FunEmojiSearchIndex;
- emojiLocalizerIndex: FunEmojiLocalizerIndex;
-}>;
-
-const FunEmojiLocalizationContext =
- createContext