gnh1201/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2025-10-05 16:42:47 +00:00
Code Issues Actions 10 Packages Projects Releases Wiki Activity

Revert change to EmojiHTML (#36051)

Browse Source
This commit is contained in:
Echo 2025-09-08 14:08:07 +02:00 committed by GitHub
parent a5fbe2f5c1
commit b99c94537b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/javascript/mastodon/features/emoji/emoji_html.tsx
View File

@ -1,5 +1,7 @@
import type { ComponentPropsWithoutRef, ElementType } from 'react'; import type { ComponentPropsWithoutRef, ElementType } from 'react';
import { isModernEmojiEnabled } from '@/mastodon/utils/environment';
import { useEmojify } from './hooks'; import { useEmojify } from './hooks';
import type { CustomEmojiMapArg } from './types'; import type { CustomEmojiMapArg } from './types';
@ -13,7 +15,7 @@ type EmojiHTMLProps<Element extends ElementType = 'div'> = Omit<
shallow?: boolean; shallow?: boolean;
}; };
export const EmojiHTML = ({ export const ModernEmojiHTML = ({
extraEmojis, extraEmojis,
htmlString, htmlString,
as: Wrapper = 'div', // Rename for syntax highlighting as: Wrapper = 'div', // Rename for syntax highlighting
@ -34,3 +36,14 @@ export const EmojiHTML = ({
<Wrapper {...props} dangerouslySetInnerHTML={{ __html: emojifiedHtml }} /> <Wrapper {...props} dangerouslySetInnerHTML={{ __html: emojifiedHtml }} />
); );
}; };
export const EmojiHTML = <Element extends ElementType>(
props: EmojiHTMLProps<Element>,
) => {
if (isModernEmojiEnabled()) {
return <ModernEmojiHTML {...props} />;
}
const { as: asElement, htmlString, extraEmojis, ...rest } = props;
const Wrapper = asElement ?? 'div';
return <Wrapper {...rest} dangerouslySetInnerHTML={{ __html: htmlString }} />;
};