OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #3068 from matrix-org/jryans/reaction-row-button-live 

Fix live updates to reaction row buttons
pull/21833/head
J. Ryan Stinnett 2019-06-05 17:20:30 +01:00 committed by GitHub
parent 85858c731c c8cd1f30dd
commit 97019fbfb5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/components/views/messages/ReactionsRow.js
View File

@ -116,6 +116,7 @@ export default class ReactionsRow extends React.PureComponent {
return <ReactionsRowButton return <ReactionsRowButton
key={content} key={content}
content={content} content={content}
count={count}
mxEvent={mxEvent} mxEvent={mxEvent}
reactionEvents={events} reactionEvents={events}
myReactionEvent={myReactionEvent} myReactionEvent={myReactionEvent}

9
src/components/views/messages/ReactionsRowButton.js
View File

@ -27,6 +27,8 @@ export default class ReactionsRowButton extends React.PureComponent {
mxEvent: PropTypes.object.isRequired, mxEvent: PropTypes.object.isRequired,
// The reaction content / key / emoji // The reaction content / key / emoji
content: PropTypes.string.isRequired, content: PropTypes.string.isRequired,
// The count of votes for this key
count: PropTypes.number.isRequired,
// A Set of Martix reaction events for this key // A Set of Martix reaction events for this key
reactionEvents: PropTypes.object.isRequired, reactionEvents: PropTypes.object.isRequired,
// A possible Matrix event if the current user has voted for this type // A possible Matrix event if the current user has voted for this type
@ -77,12 +79,7 @@ export default class ReactionsRowButton extends React.PureComponent {
render() { render() {
const ReactionsRowButtonTooltip = const ReactionsRowButtonTooltip =
sdk.getComponent('messages.ReactionsRowButtonTooltip'); sdk.getComponent('messages.ReactionsRowButtonTooltip');
const { content, reactionEvents, myReactionEvent } = this.props; const { content, count, reactionEvents, myReactionEvent } = this.props;
const count = reactionEvents.size;
if (!count) {
return null;
}
const classes = classNames({ const classes = classNames({
mx_ReactionsRowButton: true, mx_ReactionsRowButton: true,