techhub/mastodon
2
0
Fork 0
Code Activity

Prevent props being added as HTML attributes (#35739)

Browse Source
This commit is contained in:
Echo
2025-08-11 14:00:35 +02:00
committed by GitHub
parent 4cabc031e6
commit bf15b1d65d
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -38,11 +38,7 @@ export const EmojiHTML = <Element extends ElementType>(
if (isModernEmojiEnabled()) { if (isModernEmojiEnabled()) {
return <ModernEmojiHTML {...props} />; return <ModernEmojiHTML {...props} />;
} }
const Wrapper = props.as ?? 'div'; const { as: asElement, htmlString, extraEmojis, ...rest } = props;
return ( const Wrapper = asElement ?? 'div';
<Wrapper return <Wrapper {...rest} dangerouslySetInnerHTML={{ __html: htmlString }} />;
{...props}
dangerouslySetInnerHTML={{ __html: props.htmlString }}
/>
);
}; };