From d69b10adf576bca1f2335146e4bc4b28e5f59e88 Mon Sep 17 00:00:00 2001
From: Paul <paulmakles@gmail.com>
Date: Tue, 6 Jul 2021 22:44:38 +0100
Subject: [PATCH] Persist the state of member sidebar toggle.
---
src/pages/channels/Channel.tsx | 24 ++++++++++++++++++++----
1 file changed, 20 insertions(+), 4 deletions(-)
diff --git a/src/pages/channels/Channel.tsx b/src/pages/channels/Channel.tsx
index 7b459ed..f4d0b3d 100644
--- a/src/pages/channels/Channel.tsx
+++ b/src/pages/channels/Channel.tsx
@@ -18,6 +18,7 @@ import MemberSidebar from "../../components/navigation/right/MemberSidebar";
import ChannelHeader from "./ChannelHeader";
import { MessageArea } from "./messaging/MessageArea";
import VoiceHeader from "./voice/VoiceHeader";
+import { dispatch, getState } from "../../redux";
const ChannelMain = styled.div`
flex-grow: 1;
@@ -73,9 +74,8 @@ export function Channel({ id }: { id: string }) {
}
}
+const MEMBERS_SIDEBAR_KEY = 'sidebar_members';
function TextChannel({ channel }: { channel: Channels.Channel }) {
- const [showMembers, setMembers] = useState(true);
-
if (
(channel.channel_type === "TextChannel" ||
channel.channel_type === "Group") &&
@@ -115,13 +115,29 @@ function TextChannel({ channel }: { channel: Channels.Channel }) {
}
}
+ const [showMembers, setMembers] = useState(getState().sectionToggle[MEMBERS_SIDEBAR_KEY] ?? true);
+
let id = channel._id;
return (
<>
<ChannelHeader
channel={channel}
- toggleSidebar={() => setMembers(!showMembers)}
- />
+ toggleSidebar={() => {
+ setMembers(!showMembers);
+
+ if (showMembers) {
+ dispatch({
+ type: 'SECTION_TOGGLE_SET',
+ id: MEMBERS_SIDEBAR_KEY,
+ state: false
+ });
+ } else {
+ dispatch({
+ type: 'SECTION_TOGGLE_UNSET',
+ id: MEMBERS_SIDEBAR_KEY
+ });
+ }
+ }} />
<ChannelMain>
<ChannelContent>
<VoiceHeader id={id} />
--
GitLab