Matrix/element-web-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-web.git synced 2024-11-15 20:54:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

Don't restore MemberInfo from RightPanel history when viewing a room (#8090)

Browse Source 
As bringing up a specific MemberInfo when you view a room is freaky,
even if it happened to be the last thing you were doing in that room.
Fixes https://github.com/vector-im/element-web/issues/21487
This commit is contained in:
Matthew Hodgson 2022-03-21 14:01:06 +00:00 committed by GitHub
parent dd53b226eb
commit 8cd805ad23
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/stores/right-panel/RightPanelStore.ts
View File

@ -159,7 +159,7 @@ export default class RightPanelStore extends ReadyWatchingStore {
if (!this.isPhaseValid(targetPhase)) return; if (!this.isPhaseValid(targetPhase)) return;
if ((targetPhase === this.currentCardForRoom(rId)?.phase && !!cardState)) { if ((targetPhase === this.currentCardForRoom(rId)?.phase && !!cardState)) {
// Update state: set right panel with a new state but keep the phase (dont know it this is ever needed...) // Update state: set right panel with a new state but keep the phase (don't know it this is ever needed...)
const hist = this.byRoom[rId]?.history ?? []; const hist = this.byRoom[rId]?.history ?? [];
hist[hist.length - 1].state = cardState; hist[hist.length - 1].state = cardState;
this.emitAndUpdateSettings(); this.emitAndUpdateSettings();
@ -367,6 +367,7 @@ export default class RightPanelStore extends ReadyWatchingStore {
} }
private onVerificationRequestUpdate = () => { private onVerificationRequestUpdate = () => {
if (!this.currentCard?.state) return;
const { member } = this.currentCard.state; const { member } = this.currentCard.state;
if (!member) return; if (!member) return;
const pendingRequest = pendingVerificationRequestForUser(member); const pendingRequest = pendingVerificationRequestForUser(member);
@ -378,9 +379,25 @@ export default class RightPanelStore extends ReadyWatchingStore {
private onRoomViewStoreUpdate = () => { private onRoomViewStoreUpdate = () => {
// TODO: only use this function instead of the onDispatch (the whole onDispatch can get removed!) as soon groups are removed // TODO: only use this function instead of the onDispatch (the whole onDispatch can get removed!) as soon groups are removed
const oldRoomId = this.viewedRoomId;
this.viewedRoomId = RoomViewStore.getRoomId(); this.viewedRoomId = RoomViewStore.getRoomId();
// load values from byRoomCache with the viewedRoomId. // load values from byRoomCache with the viewedRoomId.
this.loadCacheFromSettings(); this.loadCacheFromSettings();
// if we're switching to a room, clear out any stale MemberInfo cards
// in order to fix https://github.com/vector-im/element-web/issues/21487
if (oldRoomId !== this.viewedRoomId) {
if (this.currentCard?.phase !== RightPanelPhases.EncryptionPanel) {
const panel = this.byRoom[this.viewedRoomId];
if (panel?.history) {
panel.history = panel.history.filter(
(card) => card.phase != RightPanelPhases.RoomMemberInfo &&
card.phase != RightPanelPhases.Room3pidMemberInfo,
);
}
}
}
// If the right panel stays open mode is used, and the panel was either // If the right panel stays open mode is used, and the panel was either
// closed or never shown for that room, then force it open and display // closed or never shown for that room, then force it open and display
// the room member list. // the room member list.