PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Merge pull request #2710 from matrix-org/t3chguy/composer_demote

Browse source 
move canSendMessages into state so that it will re-render the composer
This commit is contained in:
Michael Telatynski 2019-02-27 15:40:00 +00:00 committed by GitHub
commit 9dede7ab65
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/components/views/rooms/MessageComposer.js
View file

@ -68,6 +68,7 @@ export default class MessageComposer extends React.Component {
showFormatting: SettingsStore.getValue('MessageComposer.showFormatting'), showFormatting: SettingsStore.getValue('MessageComposer.showFormatting'),
isQuoting: Boolean(RoomViewStore.getQuotingEvent()), isQuoting: Boolean(RoomViewStore.getQuotingEvent()),
tombstone: this._getRoomTombstone(), tombstone: this._getRoomTombstone(),
canSendMessages: this.props.room.maySendMessage(),
}; };
} }
@ -120,6 +121,9 @@ export default class MessageComposer extends React.Component {
if (ev.getType() === 'm.room.tombstone') { if (ev.getType() === 'm.room.tombstone') {
this.setState({tombstone: this._getRoomTombstone()}); this.setState({tombstone: this._getRoomTombstone()});
} }
if (ev.getType() === 'm.room.power_levels') {
this.setState({canSendMessages: this.props.room.maySendMessage()});
}
} }
_getRoomTombstone() { _getRoomTombstone() {
@ -359,10 +363,7 @@ export default class MessageComposer extends React.Component {
</AccessibleButton>; </AccessibleButton>;
} }
const canSendMessages = !this.state.tombstone && if (!this.state.tombstone && this.state.canSendMessages) {
this.props.room.maySendMessage();
if (canSendMessages) {
// This also currently includes the call buttons. Really we should // This also currently includes the call buttons. Really we should
// check separately for whether we can call, but this is slightly // check separately for whether we can call, but this is slightly
// complex because of conference calls. // complex because of conference calls.