fedi/mastodon
1
0
Fork 1
mirror of https://github.com/mastodon/mastodon.git synced 2024-11-23 14:35:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix react warning on notifications column (#1832)

Browse source
This commit is contained in:
Jeong Arm 2022-08-27 22:17:27 +09:00 committed by GitHub
parent 978dd7e73c
commit 54d9a9c18a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
app/javascript/flavours/glitch/features/notifications/index.js
View file

@ -283,13 +283,14 @@ class Notifications extends React.PureComponent {
if (canMarkAsRead) {
extraButtons.push(
<button
key='mark-as-read'
aria-label={intl.formatMessage(messages.markAsRead)}
title={intl.formatMessage(messages.markAsRead)}
onClick={this.handleMarkAsRead}
className='column-header__button'
>
<Icon id='check' />
</button>
</button>,
);
}
@ -306,13 +307,14 @@ class Notifications extends React.PureComponent {
extraButtons.push(
<button
key='notif-cleaning'
aria-label={msgEnterNotifCleaning}
title={msgEnterNotifCleaning}
onClick={this.onEnterCleaningMode}
className={notifCleaningButtonClassName}
>
<Icon id='eraser' />
</button>
</button>,
);
const notifCleaningDrawer = (
@ -323,6 +325,12 @@ class Notifications extends React.PureComponent {
</div>
);
const extraButton = (
<>
{extraButtons}
</>
);
return (
<Column
bindToDocument={!multiColumn}
@ -341,7 +349,7 @@ class Notifications extends React.PureComponent {
pinned={pinned}
multiColumn={multiColumn}
localSettings={this.props.localSettings}
extraButton={extraButtons}
extraButton={extraButton}
appendContent={notifCleaningDrawer}
>
<ColumnSettingsContainer />