Merge pull request #859 from kmycode/kbtopic-fix-emoji-reaction-button

Fix upstream-20241001
kmycode · Oct 1, 2024 · 007ed79 · 007ed79
2 parents 429469b + 4182f75
commit 007ed79
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 9 deletions.
diff --git a/app/javascript/mastodon/actions/notification_groups.ts b/app/javascript/mastodon/actions/notification_groups.ts
@@ -68,7 +68,11 @@ function dispatchAssociatedRecords(
     dispatch(importFetchedStatuses(fetchedStatuses));
 }
 
-const supportedGroupedNotificationTypes = ['favourite', 'reblog'];
+const supportedGroupedNotificationTypes = [
+  'favourite',
+  'reblog',
+  'emoji_reaction',
+];
 
 export const fetchNotifications = createDataLoadingThunk(
   'notificationGroups/fetch',

diff --git a/app/javascript/mastodon/components/status_action_bar.jsx b/app/javascript/mastodon/components/status_action_bar.jsx
@@ -484,11 +484,13 @@ class StatusActionBar extends ImmutablePureComponent {
     const outside = emojiReactionPolicy !== 'outside_only' || (relationship && (relationship.get('following') || relationship.get('followed_by')));
     const denyFromAll = emojiReactionPolicy !== 'block' && emojiReactionPolicy !== 'block';
     const emojiPickerDropdown = (enableEmojiReaction && emojiReactionAvailableServer && denyFromAll && (writtenByMe || (following && followed && mutual && outside)) && (
-      <EmojiPickerDropdown onPickEmoji={this.handleEmojiPick} button={(
-        <IconButton className='status__action-bar__button' icon='smile-o' iconComponent={EmojiReactionIcon} onClick={this.handleEmojiPickInnerButton} />
-      )} />
+      <div className='status__action-bar__button-wrapper'>
+        <EmojiPickerDropdown onPickEmoji={this.handleEmojiPick} button={(
+          <IconButton icon='smile-o' iconComponent={EmojiReactionIcon} onClick={this.handleEmojiPickInnerButton} />
+        )} />
+      </div>
     )) || (enableEmojiReaction && (
-      <div className='status__action-bar__button__blank' />
+      <div className='status__action-bar__button-wrapper status__action-bar__button-wrapper__blank' />
     )) || null;
 
     const isReply = status.get('in_reply_to_account_id') === status.getIn(['account', 'id']);

diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
@@ -1524,6 +1524,10 @@ body > [data-popper-placement] {
     &:last-child {
       flex-grow: 0;
     }
+
+    &__blank {
+      width: 24px;
+    }
   }
 
   &--first-in-thread {
@@ -1767,10 +1771,6 @@ body > [data-popper-placement] {
   align-items: center;
   gap: 18px;
   margin-top: 16px;
-
-  &__button__blank {
-    width: 24px;
-  }
 }
 
 .detailed-status__action-bar-dropdown {