From 9b8ab98cd96ceeadbabdaf1eca3a2f4c09418b7e Mon Sep 17 00:00:00 2001 From: mushka Date: Tue, 6 Sep 2022 22:23:52 +0300 Subject: [PATCH] fixed isRoom var after-deletion crash in InfoPanel Header --- .../src/pages/Home/InfoPanel/Header/index.js | 33 ++++++++++++++----- 1 file changed, 25 insertions(+), 8 deletions(-) diff --git a/packages/client/src/pages/Home/InfoPanel/Header/index.js b/packages/client/src/pages/Home/InfoPanel/Header/index.js index 526836845b..408730dffd 100644 --- a/packages/client/src/pages/Home/InfoPanel/Header/index.js +++ b/packages/client/src/pages/Home/InfoPanel/Header/index.js @@ -17,26 +17,37 @@ import { import { ColorTheme, ThemeType } from "@docspace/common/components/ColorTheme"; const InfoPanelHeaderContent = (props) => { - const { t, setIsVisible, roomState, setRoomState, isGallery, isRoom } = props; + const { + t, + selection, + setIsVisible, + roomState, + setRoomState, + isGallery, + } = props; const closeInfoPanel = () => setIsVisible(false); + const setMembers = () => setRoomState("members"); + const setHistory = () => setRoomState("history"); + const setDetails = () => setRoomState("details"); + const submenuData = [ { id: "members", name: "Members", - onClick: () => setRoomState("members"), + onClick: setMembers, content: null, }, { id: "history", name: "History", - onClick: () => setRoomState("history"), + onClick: setHistory, content: null, }, { id: "details", name: "Details", - onClick: () => setRoomState("details"), + onClick: setDetails, content: null, }, ]; @@ -46,7 +57,7 @@ const InfoPanelHeaderContent = (props) => { ); return ( - +
{isGallery ? t("FormGallery:FormTemplateInfo") : t("Common:Info")} @@ -72,7 +83,7 @@ const InfoPanelHeaderContent = (props) => {
- {isRoom && ( + {selection?.isRoom && (
{ }; export default inject(({ auth }) => { - const { setIsVisible, roomState, setRoomState, isRoom } = auth.infoPanelStore; - return { setIsVisible, roomState, setRoomState, isRoom }; + const { + selection, + setIsVisible, + roomState, + setRoomState, + isRoom, + } = auth.infoPanelStore; + return { selection, setIsVisible, roomState, setRoomState, isRoom }; })( withTranslation(["Common", "FormGallery"])( withLoader(observer(InfoPanelHeaderContent))(