imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Ensure the right panel stays the same between room changes if possible

Browse source 
Fixes https://github.com/vector-im/riot-web/issues/10149
This commit is contained in:
Travis Ralston 2019-12-05 23:48:05 -07:00
parent bbdff701b4
commit 4873b526df
3 changed files with 26 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/components/structures/RightPanel.js
View file

@ -28,7 +28,8 @@ import RateLimitedFunc from '../../ratelimitedfunc';
import { showGroupInviteDialog, showGroupAddRoomDialog } from '../../GroupAddressPicker';
import GroupStore from '../../stores/GroupStore';
import SettingsStore from "../../settings/SettingsStore";
import {RIGHT_PANEL_PHASES} from "../../stores/RightPanelStorePhases";
import {RIGHT_PANEL_PHASES, RIGHT_PANEL_PHASES_NO_ARGS} from "../../stores/RightPanelStorePhases";
import RightPanelStore from "../../stores/RightPanelStore";
export default class RightPanel extends React.Component {
static get propTypes() {
@ -63,12 +64,21 @@ export default class RightPanel extends React.Component {
}
_getPhaseFromProps() {
const rps = RightPanelStore.getSharedInstance();
if (this.props.groupId) {
return RIGHT_PANEL_PHASES.GroupMemberList;
if (!RIGHT_PANEL_PHASES_NO_ARGS.includes(rps.groupPanelPhase)) {
rps.setPhase(RIGHT_PANEL_PHASES.GroupMemberList);
return RIGHT_PANEL_PHASES.GroupMemberList;
}
return rps.groupPanelPhase;
} else if (this.props.user) {
return RIGHT_PANEL_PHASES.RoomMemberInfo;
} else {
return RIGHT_PANEL_PHASES.RoomMemberList;
if (!RIGHT_PANEL_PHASES_NO_ARGS.includes(rps.roomPanelPhase)) {
rps.setPhase(RIGHT_PANEL_PHASES.RoomMemberList);
return RIGHT_PANEL_PHASES.RoomMemberList;
}
return rps.roomPanelPhase;
}
}