From 84157e74f5ac5a05f15ed2bb75c38610829dc2ea Mon Sep 17 00:00:00 2001 From: thornbill Date: Wed, 22 Jan 2025 03:12:50 -0500 Subject: [PATCH] Backport pull request #6450 from jellyfin-web/release-10.10.z Fix menu closing when expanding section Original-merge: 8710de09d4a7dc7d4cddb1ae05a990cdf2335f1d Merged-by: thornbill Backported-by: thornbill --- .../components/drawer/sections/ServerDrawerSection.tsx | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/apps/dashboard/components/drawer/sections/ServerDrawerSection.tsx b/src/apps/dashboard/components/drawer/sections/ServerDrawerSection.tsx index be509af859..1c95db9845 100644 --- a/src/apps/dashboard/components/drawer/sections/ServerDrawerSection.tsx +++ b/src/apps/dashboard/components/drawer/sections/ServerDrawerSection.tsx @@ -7,7 +7,7 @@ import ListItemButton from '@mui/material/ListItemButton/ListItemButton'; import ListItemIcon from '@mui/material/ListItemIcon'; import ListItemText from '@mui/material/ListItemText'; import ListSubheader from '@mui/material/ListSubheader'; -import React, { useCallback, useState } from 'react'; +import React, { type MouseEvent, useCallback, useState } from 'react'; import { useLocation } from 'react-router-dom'; import ListItemLink from 'components/ListItemLink'; @@ -33,11 +33,15 @@ const ServerDrawerSection = () => { const [ isLibrarySectionOpen, setIsLibrarySectionOpen ] = useState(LIBRARY_PATHS.includes(location.pathname)); const [ isPlaybackSectionOpen, setIsPlaybackSectionOpen ] = useState(PLAYBACK_PATHS.includes(location.pathname)); - const onLibrarySectionClick = useCallback(() => { + const onLibrarySectionClick = useCallback((e: MouseEvent) => { + e.preventDefault(); + e.stopPropagation(); setIsLibrarySectionOpen(isOpen => !isOpen); }, []); - const onPlaybackSectionClick = useCallback(() => { + const onPlaybackSectionClick = useCallback((e: MouseEvent) => { + e.preventDefault(); + e.stopPropagation(); setIsPlaybackSectionOpen(isOpen => !isOpen); }, []);