From bf15b1d65dc9f5391edbd57c1c26c303148cc92d Mon Sep 17 00:00:00 2001
From: Echo <ChaosExAnima@users.noreply.github.com>
Date: Mon, 11 Aug 2025 14:00:35 +0200
Subject: [PATCH] Prevent props being added as HTML attributes (#35739)

---
 app/javascript/mastodon/features/emoji/emoji_html.tsx | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/app/javascript/mastodon/features/emoji/emoji_html.tsx b/app/javascript/mastodon/features/emoji/emoji_html.tsx
index ed6f7a204..60a27306d 100644
--- a/app/javascript/mastodon/features/emoji/emoji_html.tsx
+++ b/app/javascript/mastodon/features/emoji/emoji_html.tsx
@@ -38,11 +38,7 @@ export const EmojiHTML = <Element extends ElementType>(
   if (isModernEmojiEnabled()) {
     return <ModernEmojiHTML {...props} />;
   }
-  const Wrapper = props.as ?? 'div';
-  return (
-    <Wrapper
-      {...props}
-      dangerouslySetInnerHTML={{ __html: props.htmlString }}
-    />
-  );
+  const { as: asElement, htmlString, extraEmojis, ...rest } = props;
+  const Wrapper = asElement ?? 'div';
+  return <Wrapper {...rest} dangerouslySetInnerHTML={{ __html: htmlString }} />;
 };