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

Tweak ReactionsRow to make saner use of its RoomContext (#8623) 

* Tweak ReactionsRow to make saner use of its RoomContext

* `this.context.canReact` already asserts membership=join
t3chguy/dedup-icons-17oct
Michael Telatynski 2022-05-17 14:17:27 +01:00 committed by GitHub
parent de4e0cfcaa
commit 007b8816df
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/components/views/messages/ReactionsRow.tsx
View File

@ -165,11 +165,6 @@ export default class ReactionsRow extends React.PureComponent<IProps, IState> {
return null;
}
const cli = this.context.room.client;
const room = cli.getRoom(mxEvent.getRoomId());
const isPeeking = room.getMyMembership() !== "join";
const canReact = !isPeeking && this.context.canReact;
let items = reactions.getSortedAnnotationsByKey().map(([content, events]) => {
const count = events.size;
if (!count) {
@ -188,7 +183,7 @@ export default class ReactionsRow extends React.PureComponent<IProps, IState> {
mxEvent={mxEvent}
reactionEvents={events}
myReactionEvent={myReactionEvent}
disabled={!canReact}
disabled={!this.context.canReact}
/>;
}).filter(item => !!item);
@ -197,7 +192,7 @@ export default class ReactionsRow extends React.PureComponent<IProps, IState> {
// Show the first MAX_ITEMS if there are MAX_ITEMS + 1 or more items.
// The "+ 1" ensure that the "show all" reveals something that takes up
// more space than the button itself.
let showAllButton;
let showAllButton: JSX.Element;
if ((items.length > MAX_ITEMS_WHEN_LIMITED + 1) && !showAll) {
items = items.slice(0, MAX_ITEMS_WHEN_LIMITED);
showAllButton = <AccessibleButton
@ -209,8 +204,8 @@ export default class ReactionsRow extends React.PureComponent<IProps, IState> {
</AccessibleButton>;
}
let addReactionButton;
if (room.getMyMembership() === "join" && this.context.canReact) {
let addReactionButton: JSX.Element;
if (this.context.canReact) {
addReactionButton = <ReactButton mxEvent={mxEvent} reactions={reactions} />;
}