refactor: remember channel aside

This commit is contained in:
Tristan Yang
2023-04-18 21:55:56 +08:00
parent 0e77e90664
commit 03d4803034
7 changed files with 50 additions and 39 deletions
+7 -5
View File
@@ -17,7 +17,7 @@ import { useAppSelector } from "../../../app/store";
import GoBackNav from "../../../common/component/GoBackNav";
import Members from "./Members";
import VoiceChat from "../VoiceChat";
import { updateChannelVisibleAside } from "../../../app/slices/channels";
import { updateChannelVisibleAside } from "../../../app/slices/footprint";
import Dashboard from "../VoiceChat/Dashboard";
type Props = {
cid?: number;
@@ -33,11 +33,13 @@ function ChannelChat({ cid = 0, dropFiles = [] }: Props) {
userIds,
data,
loginUser,
visibleAside
} = useAppSelector((store) => {
return {
loginUser: store.authData.user,
userIds: store.users.ids,
data: store.channels.byId[cid],
visibleAside: store.footprint.channelAsides[cid]
};
});
useEffect(() => {
@@ -56,7 +58,7 @@ function ChannelChat({ cid = 0, dropFiles = [] }: Props) {
const toggleMembersVisible = () => {
dispatch(updateChannelVisibleAside({
id: cid,
aside: data.visibleAside !== "members" ? "members" : null
aside: visibleAside !== "members" ? "members" : null
}));
};
@@ -109,7 +111,7 @@ function ChannelChat({ cid = 0, dropFiles = [] }: Props) {
onClick={toggleMembersVisible}
>
<Tooltip tip={t("channel_members")} placement="left">
<IconPeople className={data.visibleAside == "members" ? "fill-gray-600" : ""} />
<IconPeople className={visibleAside == "members" ? "fill-gray-600" : ""} />
</Tooltip>
</li>
</ul>
@@ -125,10 +127,10 @@ function ChannelChat({ cid = 0, dropFiles = [] }: Props) {
</header>
}
users={
<Members uids={memberIds} addVisible={addVisible} cid={cid} ownerId={owner} membersVisible={data.visibleAside == "members"} />
<Members uids={memberIds} addVisible={addVisible} cid={cid} ownerId={owner} membersVisible={visibleAside == "members"} />
}
voice={
<Dashboard visible={data.visibleAside == "voice"} id={cid} context="channel" />
<Dashboard visible={visibleAside == "voice"} id={cid} context="channel" />
}
/>;
}
+6 -5
View File
@@ -3,7 +3,7 @@
// import { useState } from 'react';
import { useTranslation } from 'react-i18next';
import { useDispatch } from 'react-redux';
import { updateChannelVisibleAside } from '../../../app/slices/channels';
import { updateChannelVisibleAside } from '../../../app/slices/footprint';
import { useAppSelector } from '../../../app/store';
import IconHeadphone from '../../../assets/icons/headphone.svg';
import Tooltip from '../../../common/component/Tooltip';
@@ -18,11 +18,12 @@ type Props = {
const VoiceChat = ({ id, context = "channel" }: Props) => {
const { joinVoice, joined, joining = false, joinedAtThisContext } = useVoice({ id, context });
const dispatch = useDispatch();
const { loginUser, contextData, voiceList } = useAppSelector(store => {
const { loginUser, voiceList, visibleAside } = useAppSelector(store => {
return {
loginUser: store.authData.user,
contextData: context == "channel" ? store.channels.byId[id] : store.users.byId[id],
voiceList: store.voice.list
voiceList: store.voice.list,
visibleAside: context == "channel" ? store.footprint.channelAsides[id] : null,
};
});
const { data: agoraConfig } = useGetAgoraConfigQuery(undefined, { skip: !loginUser?.is_admin });
@@ -31,7 +32,7 @@ const VoiceChat = ({ id, context = "channel" }: Props) => {
if (context == "channel") {
dispatch(updateChannelVisibleAside({
id,
aside: contextData.visibleAside == "voice" ? null : "voice"
aside: visibleAside == "voice" ? null : "voice"
}));
}
// todo DM
@@ -51,7 +52,7 @@ const VoiceChat = ({ id, context = "channel" }: Props) => {
};
// 只有admin才能看到入口,后续会改
if (!loginUser || !loginUser.is_admin || !agoraConfig?.enabled) return null;
const visible = contextData.visibleAside == "voice";
const visible = visibleAside == "voice";
const memberCount = voiceList.find((v) => v.context == context && v.id == id)?.memberCount ?? 0;
const badgeClass = `absolute -top-2 -right-2 w-4 h-4 rounded-full bg-primary-400 text-white `;
return (