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

Merge pull request #5602 from matrix-org/t3chguy/peeking 

Fix RoomView re-mounting breaking peeking
pull/21833/head
Michael Telatynski 2021-02-01 12:26:42 +00:00 committed by GitHub
parent 50452d52ff 53334de5a9
commit 72263a4a56
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/components/structures/RoomView.tsx
View File

@ -267,12 +267,6 @@ export default class RoomView extends React.Component<IProps, IState> {
this.layoutWatcherRef = SettingsStore.watchSetting("useIRCLayout", null, this.onLayoutChange); this.layoutWatcherRef = SettingsStore.watchSetting("useIRCLayout", null, this.onLayoutChange);
} }
// TODO: [REACT-WARNING] Move into constructor
// eslint-disable-next-line camelcase
UNSAFE_componentWillMount() {
this.onRoomViewStoreUpdate(true);
}
private onWidgetStoreUpdate = () => { private onWidgetStoreUpdate = () => {
if (this.state.room) { if (this.state.room) {
this.checkWidgets(this.state.room); this.checkWidgets(this.state.room);
@ -512,6 +506,8 @@ export default class RoomView extends React.Component<IProps, IState> {
} }
componentDidMount() { componentDidMount() {
this.onRoomViewStoreUpdate(true);
const call = this.getCallForRoom(); const call = this.getCallForRoom();
const callState = call ? call.state : null; const callState = call ? call.state : null;
this.setState({ this.setState({