Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

'Members' button always toggle the right panel #3804

Merged
merged 7 commits into from
Jan 16, 2020
Merged

'Members' button always toggle the right panel #3804

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
fb754b7
Fix right panel buttons highlighting
t3chguy Jan 5, 2020
4118faa
When looking at a MemberInfo, clicking on MemberList should close not…
t3chguy Jan 5, 2020
7dfc392
Merge branches 'develop' and 't3chguy/rightpanel' of github.com:matri…
t3chguy Jan 9, 2020
0a9d7f4
pass the correct phase params for consistency
t3chguy Jan 9, 2020
5a5a0d2
Merge branches 'develop' and 't3chguy/rightpanel' of github.com:matri…
t3chguy Jan 15, 2020
0f61aa5
Apply suggestions from code review
t3chguy Jan 16, 2020
cd9fc72
Merge branch 'develop' into t3chguy/rightpanel
turt2live Jan 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/components/views/right_panel/GroupHeaderButtons.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import { _t } from '../../../languageHandler';
import HeaderButton from './HeaderButton';
import HeaderButtons, {HEADER_KIND_GROUP} from './HeaderButtons';
import {RIGHT_PANEL_PHASES} from "../../../stores/RightPanelStorePhases";
import RightPanelStore from "../../../stores/RightPanelStore";
t3chguy marked this conversation as resolved.
Show resolved Hide resolved

const GROUP_PHASES = [
RIGHT_PANEL_PHASES.GroupMemberInfo,
Expand Down Expand Up @@ -68,7 +69,7 @@ export default class GroupHeaderButtons extends HeaderButtons {
_onMembersClicked() {
if (this.state.phase === RIGHT_PANEL_PHASES.GroupMemberInfo) {
// send the active phase to trigger a toggle
this.setPhase(RIGHT_PANEL_PHASES.GroupMemberInfo);
this.setPhase(RIGHT_PANEL_PHASES.GroupMemberInfo, RightPanelStore.getSharedInstance().roomPanelPhaseParams);
t3chguy marked this conversation as resolved.
Show resolved Hide resolved
t3chguy marked this conversation as resolved.
Show resolved Hide resolved
} else {
// This toggles for us, if needed
this.setPhase(RIGHT_PANEL_PHASES.GroupMemberList);
Expand Down
3 changes: 2 additions & 1 deletion src/components/views/right_panel/RoomHeaderButtons.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import { _t } from '../../../languageHandler';
import HeaderButton from './HeaderButton';
import HeaderButtons, {HEADER_KIND_ROOM} from './HeaderButtons';
import {RIGHT_PANEL_PHASES} from "../../../stores/RightPanelStorePhases";
import RightPanelStore from "../../../stores/RightPanelStore";

const MEMBER_PHASES = [
RIGHT_PANEL_PHASES.RoomMemberList,
Expand Down Expand Up @@ -58,7 +59,7 @@ export default class RoomHeaderButtons extends HeaderButtons {
_onMembersClicked() {
if (this.state.phase === RIGHT_PANEL_PHASES.RoomMemberInfo) {
// send the active phase to trigger a toggle
this.setPhase(RIGHT_PANEL_PHASES.RoomMemberInfo);
this.setPhase(RIGHT_PANEL_PHASES.RoomMemberInfo, RightPanelStore.getSharedInstance().roomPanelPhaseParams);
} else {
// This toggles for us, if needed
this.setPhase(RIGHT_PANEL_PHASES.RoomMemberList);
Expand Down