gnh1201/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2025-09-07 18:31:07 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki 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
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 3 additions and 7 deletions
Show Stats 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 }}
/>
);
}; };