From 21dd1f4e95c4ceac554b5c9992667e32b25f1e48 Mon Sep 17 00:00:00 2001 From: GitStart <1501599+gitstart@users.noreply.github.com> Date: Thu, 8 Dec 2022 05:35:41 +0800 Subject: [PATCH] [CAL-462] Team settings dropdown menu should be open when you navigate from Teams (#5868) Co-authored-by: Nitesh Singh Co-authored-by: niteshsingh1357 Co-authored-by: Rafael Toledo <87545086+Toledodev@users.noreply.github.com> Co-authored-by: gitstart Co-authored-by: Rafael Co-authored-by: gitstart Co-authored-by: Matheus Benini Ferreira <88898100+MatheusBeniniF@users.noreply.github.com> Co-authored-by: gitstart-app[bot] <57568882+gitstart-app[bot]@users.noreply.github.com> Co-authored-by: gitstart_bot Co-authored-by: Thiago Nascimbeni Co-authored-by: Matheus Muniz <87545749+matheusmuniz03@users.noreply.github.com> Co-authored-by: gitstart Co-authored-by: Nitesh Singh Co-authored-by: niteshsingh1357 Co-authored-by: Rafael Toledo <87545086+Toledodev@users.noreply.github.com> Co-authored-by: Rafael Co-authored-by: gitstart Co-authored-by: Matheus Benini Ferreira <88898100+MatheusBeniniF@users.noreply.github.com> Co-authored-by: gitstart-app[bot] <57568882+gitstart-app[bot]@users.noreply.github.com> Co-authored-by: gitstart_bot Co-authored-by: Thiago Nascimbeni Co-authored-by: Matheus Muniz <87545749+matheusmuniz03@users.noreply.github.com> --- packages/ui/v2/core/layouts/SettingsLayout.tsx | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/packages/ui/v2/core/layouts/SettingsLayout.tsx b/packages/ui/v2/core/layouts/SettingsLayout.tsx index 53ff1a5d7c..84c06b50f4 100644 --- a/packages/ui/v2/core/layouts/SettingsLayout.tsx +++ b/packages/ui/v2/core/layouts/SettingsLayout.tsx @@ -102,6 +102,7 @@ const useTabs = () => { const SettingsSidebarContainer = ({ className = "" }) => { const { t } = useLocale(); + const router = useRouter(); const tabsWithPermissions = useTabs(); const [teamMenuState, setTeamMenuState] = useState<{ teamId: number | undefined; teamMenuOpen: boolean }[]>(); @@ -110,10 +111,19 @@ const SettingsSidebarContainer = ({ className = "" }) => { useEffect(() => { if (teams) { - const teamStates = teams?.map((team) => ({ teamId: team.id, teamMenuOpen: false })); + const teamStates = teams?.map((team) => ({ + teamId: team.id, + teamMenuOpen: String(team.id) === router.query.id, + })); setTeamMenuState(teamStates); + setTimeout(() => { + const tabMembers = Array.from(document.getElementsByTagName("a")).filter( + (bottom) => bottom.dataset.testid === "vertical-tab-Members" + )[1]; + tabMembers?.scrollIntoView({ behavior: "smooth" }); + }, 100); } - }, [teams]); + }, [router.query.id, teams]); return (