Skip to content

Commit cc6b879

Browse files
Fix emoji stories and add inline emoji story
1 parent ec3acac commit cc6b879

File tree

2 files changed

+38
-5
lines changed

2 files changed

+38
-5
lines changed

ts/components/fun/FunEmoji.stories.tsx

Lines changed: 36 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,10 @@ import { chunk } from 'lodash';
55
import React, { useCallback, useEffect, useRef } from 'react';
66
import { type ComponentMeta } from '../../storybook/types';
77
import type { FunStaticEmojiProps } from './FunEmoji';
8-
import { FunStaticEmoji } from './FunEmoji';
8+
import { FunInlineEmoji, FunStaticEmoji } from './FunEmoji';
99
import {
10-
_allEmojiVariantKeys,
10+
_getAllEmojiVariantKeys,
11+
emojiVariantConstant,
1112
getEmojiParentByKey,
1213
getEmojiParentKeyByVariantKey,
1314
getEmojiVariantByKey,
@@ -30,7 +31,7 @@ type AllProps = Pick<FunStaticEmojiProps, 'size'>;
3031

3132
export function All(props: AllProps): JSX.Element {
3233
const scrollerRef = useRef<HTMLDivElement>(null);
33-
const data = Array.from(_allEmojiVariantKeys());
34+
const data = Array.from(_getAllEmojiVariantKeys());
3435
const rows = chunk(data, COLUMNS);
3536

3637
const getScrollElement = useCallback(() => {
@@ -117,3 +118,35 @@ export function All(props: AllProps): JSX.Element {
117118
</div>
118119
);
119120
}
121+
122+
export function Inline(): JSX.Element {
123+
return (
124+
<div style={{ userSelect: 'none' }}>
125+
<p style={{ userSelect: 'text' }}>
126+
<FunInlineEmoji
127+
role="img"
128+
aria-label="Fried Shrimp"
129+
emoji={emojiVariantConstant('\u{1F364}')}
130+
/>{' '}
131+
Lorem, ipsum dolor sit amet consectetur adipisicing elit. Repellat
132+
voluptates, mollitia tempora alias libero repudiandae nesciunt. Deleniti
133+
ducimus dolorum, debitis, reprehenderit at ut deserunt fuga corrupti
134+
provident quae natus a!{' '}
135+
<FunInlineEmoji
136+
role="img"
137+
aria-label="Fried Shrimp"
138+
emoji={emojiVariantConstant('\u{1F364}')}
139+
/>{' '}
140+
Consectetur quibusdam accusantium magni ipsum nemo eligendi quisquam
141+
dolor, recusandae vero dolore reiciendis doloribus ducimus officiis
142+
minima! Unde accusantium ut eaque error quidem soluta! Distinctio dicta
143+
rem nemo aut quo.{' '}
144+
<FunInlineEmoji
145+
role="img"
146+
aria-label="Fried Shrimp"
147+
emoji={emojiVariantConstant('\u{1F364}')}
148+
/>
149+
</p>
150+
</div>
151+
);
152+
}

ts/components/fun/data/emojis.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -617,8 +617,8 @@ export function getEmojiDefaultEnglishLocalizerIndex(): FunEmojiLocalizerIndex {
617617
}
618618

619619
/** Exported for testing */
620-
export function* _allEmojiVariantKeys(): Iterable<EmojiVariantKey> {
621-
yield* Object.keys(EMOJI_INDEX.variantByKey) as Array<EmojiVariantKey>;
620+
export function _getAllEmojiVariantKeys(): Iterable<EmojiVariantKey> {
621+
return EMOJI_INDEX.variantByKey.keys();
622622
}
623623

624624
export function emojiParentKeyConstant(input: string): EmojiParentKey {

0 commit comments

Comments
 (0)