From fb754b795cc37d2ac9077f6708dd0927319b0814 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sun, 5 Jan 2020 20:30:01 +0000
Subject: [PATCH 1/4] Fix right panel buttons highlighting
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
src/components/structures/GroupView.js | 2 +-
src/components/views/right_panel/HeaderButtons.js | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/components/structures/GroupView.js b/src/components/structures/GroupView.js
index 9df4630136..50b63b94b1 100644
--- a/src/components/structures/GroupView.js
+++ b/src/components/structures/GroupView.js
@@ -1299,7 +1299,7 @@ export default createReactClass({
);
}
- const rightPanel = !RightPanelStore.getSharedInstance().isOpenForGroup
+ const rightPanel = RightPanelStore.getSharedInstance().isOpenForGroup
?
: undefined;
diff --git a/src/components/views/right_panel/HeaderButtons.js b/src/components/views/right_panel/HeaderButtons.js
index ebe1f5f915..dbcae4529a 100644
--- a/src/components/views/right_panel/HeaderButtons.js
+++ b/src/components/views/right_panel/HeaderButtons.js
@@ -74,7 +74,7 @@ export default class HeaderButtons extends React.Component {
const rps = RightPanelStore.getSharedInstance();
if (this.state.headerKind === HEADER_KIND_ROOM) {
this.setState({phase: rps.visibleRoomPanelPhase});
- } else if (this.state.head === HEADER_KIND_GROUP) {
+ } else if (this.state.headerKind === HEADER_KIND_GROUP) {
this.setState({phase: rps.visibleGroupPanelPhase});
}
}
From 4118faa8340baf61610d78217ed80e715c83474d Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sun, 5 Jan 2020 20:31:07 +0000
Subject: [PATCH 2/4] When looking at a MemberInfo, clicking on MemberList
should close not switch
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
src/components/views/right_panel/GroupHeaderButtons.js | 9 +++++++--
src/components/views/right_panel/RoomHeaderButtons.js | 9 +++++++--
2 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/src/components/views/right_panel/GroupHeaderButtons.js b/src/components/views/right_panel/GroupHeaderButtons.js
index c134a5d237..f164b6c578 100644
--- a/src/components/views/right_panel/GroupHeaderButtons.js
+++ b/src/components/views/right_panel/GroupHeaderButtons.js
@@ -66,8 +66,13 @@ export default class GroupHeaderButtons extends HeaderButtons {
}
_onMembersClicked() {
- // This toggles for us, if needed
- this.setPhase(RIGHT_PANEL_PHASES.GroupMemberList);
+ if (this.state.phase === RIGHT_PANEL_PHASES.GroupMemberInfo) {
+ // send the active phase to trigger a toggle
+ this.setPhase(RIGHT_PANEL_PHASES.GroupMemberInfo);
+ } else {
+ // This toggles for us, if needed
+ this.setPhase(RIGHT_PANEL_PHASES.GroupMemberList);
+ }
}
_onRoomsClicked() {
diff --git a/src/components/views/right_panel/RoomHeaderButtons.js b/src/components/views/right_panel/RoomHeaderButtons.js
index f59159d1d9..3831a5953e 100644
--- a/src/components/views/right_panel/RoomHeaderButtons.js
+++ b/src/components/views/right_panel/RoomHeaderButtons.js
@@ -56,8 +56,13 @@ export default class RoomHeaderButtons extends HeaderButtons {
}
_onMembersClicked() {
- // This toggles for us, if needed
- this.setPhase(RIGHT_PANEL_PHASES.RoomMemberList);
+ if (this.state.phase === RIGHT_PANEL_PHASES.RoomMemberInfo) {
+ // send the active phase to trigger a toggle
+ this.setPhase(RIGHT_PANEL_PHASES.RoomMemberInfo);
+ } else {
+ // This toggles for us, if needed
+ this.setPhase(RIGHT_PANEL_PHASES.RoomMemberList);
+ }
}
_onFilesClicked() {
From 0a9d7f43c64da95e74046b589286f92648fbf746 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 9 Jan 2020 15:51:19 +0000
Subject: [PATCH 3/4] pass the correct phase params for consistency
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
src/components/views/right_panel/GroupHeaderButtons.js | 3 ++-
src/components/views/right_panel/RoomHeaderButtons.js | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/components/views/right_panel/GroupHeaderButtons.js b/src/components/views/right_panel/GroupHeaderButtons.js
index f164b6c578..1602f47347 100644
--- a/src/components/views/right_panel/GroupHeaderButtons.js
+++ b/src/components/views/right_panel/GroupHeaderButtons.js
@@ -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";
const GROUP_PHASES = [
RIGHT_PANEL_PHASES.GroupMemberInfo,
@@ -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);
} else {
// This toggles for us, if needed
this.setPhase(RIGHT_PANEL_PHASES.GroupMemberList);
diff --git a/src/components/views/right_panel/RoomHeaderButtons.js b/src/components/views/right_panel/RoomHeaderButtons.js
index 3831a5953e..449ab3d686 100644
--- a/src/components/views/right_panel/RoomHeaderButtons.js
+++ b/src/components/views/right_panel/RoomHeaderButtons.js
@@ -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,
@@ -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);
From 0f61aa57ffae4c3e813390b43aaa93d639b8cc6f Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 16 Jan 2020 17:00:04 +0000
Subject: [PATCH 4/4] Apply suggestions from code review
Co-Authored-By: Travis Ralston
---
src/components/views/right_panel/GroupHeaderButtons.js | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/components/views/right_panel/GroupHeaderButtons.js b/src/components/views/right_panel/GroupHeaderButtons.js
index 1602f47347..f164b6c578 100644
--- a/src/components/views/right_panel/GroupHeaderButtons.js
+++ b/src/components/views/right_panel/GroupHeaderButtons.js
@@ -23,7 +23,6 @@ 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";
const GROUP_PHASES = [
RIGHT_PANEL_PHASES.GroupMemberInfo,
@@ -69,7 +68,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, RightPanelStore.getSharedInstance().roomPanelPhaseParams);
+ this.setPhase(RIGHT_PANEL_PHASES.GroupMemberInfo);
} else {
// This toggles for us, if needed
this.setPhase(RIGHT_PANEL_PHASES.GroupMemberList);