From e8dfef4bd4631a6ae498ff9faf81c2dcacaad32d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?KMY=EF=BC=88=E9=9B=AA=E3=81=82=E3=81=99=E3=81=8B=EF=BC=89?=
 <tt@kmycode.net>
Date: Mon, 24 Jun 2024 12:18:48 +0900
Subject: [PATCH] =?UTF-8?q?Fix:=20#762=20=E3=80=8C=E3=83=96=E3=83=BC?=
 =?UTF-8?q?=E3=82=B9=E3=83=88=E3=83=9C=E3=82=BF=E3=83=B3=E3=82=92=E6=8A=BC?=
 =?UTF-8?q?=E3=81=97=E3=81=9F=E3=81=A8=E3=81=8D=E3=81=AB=E3=83=9D=E3=83=83?=
 =?UTF-8?q?=E3=83=97=E3=82=A2=E3=83=83=E3=83=97=E3=83=A1=E3=83=8B=E3=83=A5?=
 =?UTF-8?q?=E3=83=BC=E3=82=92=E8=A1=A8=E7=A4=BA=E3=81=99=E3=82=8B=E3=80=8D?=
 =?UTF-8?q?=E8=A8=AD=E5=AE=9A=E3=82=92=E6=9C=89=E5=8A=B9=E3=81=AB=E3=81=97?=
 =?UTF-8?q?=E3=81=A6=E3=82=8B=E3=81=A8=E3=80=81=E3=83=97=E3=83=AD=E3=83=95?=
 =?UTF-8?q?=E3=82=A3=E3=83=BC=E3=83=AB=E3=83=9A=E3=83=BC=E3=82=B8=E3=81=AE?=
 =?UTF-8?q?=E5=90=84=E6=8A=95=E7=A8=BF=E3=81=AE=E3=83=96=E3=83=BC=E3=82=B9?=
 =?UTF-8?q?=E3=83=88=E6=95=B0=E3=81=8C=E8=A1=A8=E7=A4=BA=E3=81=95=E3=82=8C?=
 =?UTF-8?q?=E3=81=AA=E3=81=8F=E3=81=AA=E3=82=8B=20(#765)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mastodon/components/status_action_bar.jsx          | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/javascript/mastodon/components/status_action_bar.jsx b/app/javascript/mastodon/components/status_action_bar.jsx
index c816dc8a1e4998..d88e68a1e48c7e 100644
--- a/app/javascript/mastodon/components/status_action_bar.jsx
+++ b/app/javascript/mastodon/components/status_action_bar.jsx
@@ -503,12 +503,12 @@ class StatusActionBar extends ImmutablePureComponent {
 
     const isReply = status.get('in_reply_to_account_id') === status.getIn(['account', 'id']);
 
+    const reblogButton = <IconButton className={classNames('status__action-bar__button', { reblogPrivate })} disabled={!publicStatus && !reblogPrivate} active={status.get('reblogged')} title={reblogTitle} icon='retweet' iconComponent={reblogIconComponent} onClick={this.handleReblogClick} counter={withCounters ? status.get('reblogs_count') : undefined} />;
+
     return (
       <div className='status__action-bar'>
         <IconButton className='status__action-bar__button' title={replyTitle} icon={isReply ? 'reply' : replyIcon} iconComponent={isReply ? ReplyIcon : replyIconComponent} onClick={this.handleReplyClick} counter={status.get('replies_count')} />
-        {reblogMenu.length === 0 ? (
-          <IconButton className={classNames('status__action-bar__button', { reblogPrivate })} disabled={!publicStatus && !reblogPrivate} active={status.get('reblogged')} title={reblogTitle} icon='retweet' iconComponent={reblogIconComponent} onClick={this.handleReblogClick} counter={withCounters ? status.get('reblogs_count') : undefined} />
-        ) : (
+        {reblogMenu.length === 0 ? reblogButton : (
           <DropdownMenuContainer
             className={classNames('status__action-bar__button', { reblogPrivate })}
             scrollKey={scrollKey}
@@ -520,7 +520,9 @@ class StatusActionBar extends ImmutablePureComponent {
             title={reblogTitle}
             active={status.get('reblogged')}
             disabled={!publicStatus && !reblogPrivate}
-          />
+          >
+            {reblogButton}
+          </DropdownMenuContainer>
         )}
         <IconButton className='status__action-bar__button star-icon' animate active={status.get('favourited')} title={intl.formatMessage(messages.favourite)} icon='star' iconComponent={status.get('favourited') ? StarIcon : StarBorderIcon} onClick={this.handleFavouriteClick} counter={withCounters ? status.get('favourites_count') : undefined} />
         <IconButton className='status__action-bar__button bookmark-icon' disabled={!signedIn} active={status.get('bookmarked')} title={intl.formatMessage(messages.bookmark)} icon='bookmark' iconComponent={status.get('bookmarked') ? BookmarkIcon : BookmarkBorderIcon} onClick={this.handleBookmarkClick} />