diff options
author | ThibG <thib@sitedethib.com> | 2020-07-10 17:29:43 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-07-10 17:29:43 +0200 |
commit | ddf7cc1ab56b888fdf61ee8cb1456c71cd9c33c9 (patch) | |
tree | b2e64f065128f5df5d910d7ea393ebc2575be54b /app/javascript/flavours/glitch/features/direct_timeline/components/conversation.js | |
parent | d42a23fdbe59f5a8f2beed4201ccd6d797fbd5f4 (diff) | |
parent | 66c0953c33d6d872e720eb8dedc5ab94bb3cd69a (diff) |
Merge pull request #1380 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/javascript/flavours/glitch/features/direct_timeline/components/conversation.js')
-rw-r--r-- | app/javascript/flavours/glitch/features/direct_timeline/components/conversation.js | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/app/javascript/flavours/glitch/features/direct_timeline/components/conversation.js b/app/javascript/flavours/glitch/features/direct_timeline/components/conversation.js index 47b92560d..0af8b348f 100644 --- a/app/javascript/flavours/glitch/features/direct_timeline/components/conversation.js +++ b/app/javascript/flavours/glitch/features/direct_timeline/components/conversation.js @@ -36,6 +36,7 @@ class Conversation extends ImmutablePureComponent { accounts: ImmutablePropTypes.list.isRequired, lastStatus: ImmutablePropTypes.map, unread:PropTypes.bool.isRequired, + scrollKey: PropTypes.string, onMoveUp: PropTypes.func, onMoveDown: PropTypes.func, markRead: PropTypes.func.isRequired, @@ -156,7 +157,7 @@ class Conversation extends ImmutablePureComponent { } render () { - const { accounts, lastStatus, unread, intl } = this.props; + const { accounts, lastStatus, unread, scrollKey, intl } = this.props; const { isExpanded } = this.state; if (lastStatus === null) { @@ -223,7 +224,15 @@ class Conversation extends ImmutablePureComponent { <IconButton className='status__action-bar-button' title={intl.formatMessage(messages.reply)} icon='reply' onClick={this.handleReply} /> <div className='status__action-bar-dropdown'> - <DropdownMenuContainer status={lastStatus} items={menu} icon='ellipsis-h' size={18} direction='right' title={intl.formatMessage(messages.more)} /> + <DropdownMenuContainer + scrollKey={scrollKey} + status={lastStatus} + items={menu} + icon='ellipsis-h' + size={18} + direction='right' + title={intl.formatMessage(messages.more)} + /> </div> </div> </div> |