Merge pull request #5603 from matrix-org/t3chguy/cherrypick/5602

[Release] Fix RoomView re-mounting breaking peeking
This commit is contained in:
Michael Telatynski 2021-02-01 13:01:04 +00:00 committed by GitHub
commit d06f61393d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -267,12 +267,6 @@ export default class RoomView extends React.Component<IProps, IState> {
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 = () => {
if (this.state.room) {
this.checkWidgets(this.state.room);
@ -512,6 +506,8 @@ export default class RoomView extends React.Component<IProps, IState> {
}
componentDidMount() {
this.onRoomViewStoreUpdate(true);
const call = this.getCallForRoom();
const callState = call ? call.state : null;
this.setState({