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

Fix right panel not closing user info when changing rooms

pull/21833/head
Michael Telatynski 2021-07-09 14:43:07 +01:00
parent ac309a0d08
commit a7aa87a9fc
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/stores/RightPanelStore.ts
View File

@ -68,6 +68,7 @@ const MEMBER_INFO_PHASES = [
export default class RightPanelStore extends Store<ActionPayload> { export default class RightPanelStore extends Store<ActionPayload> {
private static instance: RightPanelStore; private static instance: RightPanelStore;
private state: RightPanelStoreState; private state: RightPanelStoreState;
private lastRoomId: string;
constructor() { constructor() {
super(dis); super(dis);
@ -147,8 +148,10 @@ export default class RightPanelStore extends Store<ActionPayload> {
__onDispatch(payload: ActionPayload) { __onDispatch(payload: ActionPayload) {
switch (payload.action) { switch (payload.action) {
case 'view_room': case 'view_room':
if (payload.room_id === this.lastRoomId) break; // skip this transition, probably a permalink
// fallthrough
case 'view_group': case 'view_group':
if (payload.room_id === RoomViewStore.getRoomId()) break; // skip this transition, probably a permalink this.lastRoomId = payload.room_id;
// Reset to the member list if we're viewing member info // Reset to the member list if we're viewing member info
if (MEMBER_INFO_PHASES.includes(this.state.lastRoomPhase)) { if (MEMBER_INFO_PHASES.includes(this.state.lastRoomPhase)) {