From e9659ae0312d0bf0acf2b55eed5dc688929cae04 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 23 Jul 2021 02:53:17 +0200
Subject: [PATCH] Fix crashes with Microsoft Translate on Microsoft Edge
(#16525)
Fixes #16509
Microsoft Edge with translation enabled rewrites the DOM in ways that confuse
react and prevent it from working properly. Wrapping the offending parts in
a span avoids this issue.
---
app/javascript/mastodon/components/status.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/app/javascript/mastodon/components/status.js b/app/javascript/mastodon/components/status.js
index 295e83f58..ccc9067d1 100644
--- a/app/javascript/mastodon/components/status.js
+++ b/app/javascript/mastodon/components/status.js
@@ -309,8 +309,8 @@ class Status extends ImmutablePureComponent {
return (
<HotKeys handlers={handlers}>
<div ref={this.handleRef} className={classNames('status__wrapper', { focusable: !this.props.muted })} tabIndex='0'>
- {status.getIn(['account', 'display_name']) || status.getIn(['account', 'username'])}
- {status.get('content')}
+ <span>{status.getIn(['account', 'display_name']) || status.getIn(['account', 'username'])}</span>
+ <span>{status.get('content')}</span>
</div>
</HotKeys>
);