imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update reactions when redacted

Browse source 
This updates the reaction state in the reaction row and action bar when a
reaction is redacted.

Part of https://github.com/vector-im/riot-web/issues/9574
This commit is contained in:
J. Ryan Stinnett 2019-05-09 15:14:58 +01:00
parent 8fdb59a909
commit 6a59143ffb
2 changed files with 62 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

32
src/components/views/messages/ReactionDimension.js
View file

@ -32,11 +32,36 @@ export default class ReactionDimension extends React.PureComponent {
super(props);
this.state = {
selected: this.getInitialSelection(),
selected: this.getSelection(),
};
if (props.reactions) {
props.reactions.on("Relations.redaction", this.onReactionsChange);
}
}
getInitialSelection() {
componentWillReceiveProps(nextProps) {
if (this.props.reactions !== nextProps.reactions) {
nextProps.reactions.on("Relations.redaction", this.onReactionsChange);
}
}
componentWillUnmount() {
if (this.props.reactions) {
this.props.reactions.removeListener(
"Relations.redaction",
this.onReactionsChange,
);
}
}
onReactionsChange = () => {
this.setState({
selected: this.getSelection(),
});
}
getSelection() {
const myReactions = this.getMyReactions();
if (!myReactions) {
return null;
@ -45,6 +70,9 @@ export default class ReactionDimension extends React.PureComponent {
let selected = null;
for (const { key, content } of options) {
const reactionExists = myReactions.some(mxEvent => {
if (mxEvent.isRedacted()) {
return false;
}
return mxEvent.getContent()["m.relates_to"].key === content;
});
if (reactionExists) {