mirror of https://github.com/vector-im/riot-web
Fix right panel for peeking rooms
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>pull/21833/head
parent
7fa1214cf1
commit
a9cee7cf70
|
@ -1820,7 +1820,6 @@ export default class RoomView extends React.Component<IProps, IState> {
|
|||
let aux = null;
|
||||
let previewBar;
|
||||
let hideCancel = false;
|
||||
let forceHideRightPanel = false;
|
||||
if (this.state.forwardingEvent) {
|
||||
aux = <ForwardMessage onCancelClick={this.onCancelClick} />;
|
||||
} else if (this.state.searching) {
|
||||
|
@ -1865,8 +1864,6 @@ export default class RoomView extends React.Component<IProps, IState> {
|
|||
{ previewBar }
|
||||
</div>
|
||||
);
|
||||
} else {
|
||||
forceHideRightPanel = true;
|
||||
}
|
||||
} else if (hiddenHighlightCount > 0) {
|
||||
aux = (
|
||||
|
@ -2069,7 +2066,7 @@ export default class RoomView extends React.Component<IProps, IState> {
|
|||
"mx_fadable_faded": this.props.disabled,
|
||||
});
|
||||
|
||||
const showRightPanel = !forceHideRightPanel && this.state.room && this.state.showRightPanel;
|
||||
const showRightPanel = this.state.room && this.state.showRightPanel;
|
||||
const rightPanel = showRightPanel
|
||||
? <RightPanel room={this.state.room} resizeNotifier={this.props.resizeNotifier} />
|
||||
: null;
|
||||
|
|
|
@ -121,8 +121,8 @@ export default class MemberList extends React.Component {
|
|||
this.setState(this._getMembersState(this.roomMembers()));
|
||||
this._listenForMembersChanges();
|
||||
}
|
||||
} else if (membership === "invite") {
|
||||
// show the members we've got when invited
|
||||
} else {
|
||||
// show the members we already have loaded
|
||||
this.setState(this._getMembersState(this.roomMembers()));
|
||||
}
|
||||
}
|
||||
|
|
|
@ -118,6 +118,7 @@ export default class WidgetStore extends AsyncStoreWithClient<IState> {
|
|||
}
|
||||
|
||||
private loadRoomWidgets(room: Room) {
|
||||
if (!room) return;
|
||||
const roomInfo = this.roomMap.get(room.roomId);
|
||||
roomInfo.widgets = [];
|
||||
this.generateApps(room).forEach(app => {
|
||||
|
|
Loading…
Reference in New Issue