From 2861aa143ec80a8cf8160b97f4a8417119a9169c Mon Sep 17 00:00:00 2001
From: Cyril <c.gromoff@gmail.com>
Date: Mon, 23 Feb 2026 14:55:38 +0100
Subject: [PATCH] =?UTF-8?q?fixup!=20=E2=99=BB=EF=B8=8F(frontend)=20use=20r?=
 =?UTF-8?q?eact=20aria=20for=20side=20panel=20a11y?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../features/rooms/livekit/components/SidePanel.tsx   | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/frontend/src/features/rooms/livekit/components/SidePanel.tsx b/src/frontend/src/features/rooms/livekit/components/SidePanel.tsx
index 2d56a952..3d9832c0 100644
--- a/src/frontend/src/features/rooms/livekit/components/SidePanel.tsx
+++ b/src/frontend/src/features/rooms/livekit/components/SidePanel.tsx
@@ -14,7 +14,6 @@ import { Admin } from './Admin'
 import { Tools } from './Tools'
 import { Info } from './Info'
 import { HStack } from '@/styled-system/jsx'
-import { FocusScope } from '@react-aria/focus'
 
 const SIDE_PANEL_HEADING_ID = 'side-panel-heading'
 const SIDE_PANEL_CLOSE_ID = 'side-panel-close'
@@ -73,8 +72,7 @@ const StyledSidePanel = ({
       transform: isClosed ? 'translateX(calc(360px + 1.5rem))' : 'none',
     }}
   >
-    <FocusScope contain={!isClosed}>
-      <HStack alignItems="center">
+    <HStack alignItems="center">
         {isSubmenu && (
           <Button
             variant="secondaryText"
@@ -124,7 +122,6 @@ const StyledSidePanel = ({
         </Button>
       </Div>
       {children}
-    </FocusScope>
   </aside>
 )
 
@@ -164,10 +161,8 @@ export const SidePanel = () => {
 
   const triggerRef = useRef<HTMLElement | null>(null)
 
-  //  FocusScope handles Tab containment, but autoFocus/restoreFocus rely on mount/unmount
-  //  lifecycle,  which never happens here because the aside stays mounted (CSS slide + keepAlive).
-  //  This effect manually captures the trigger on open and auto-focuses the close button.
-  //  Restore focus is handled in handleClose with a double RAF to let FocusScope release containment.
+  // The aside stays mounted (CSS slide + keepAlive), so we manually handle
+  // auto-focus on open and restore focus on close (via handleClose).
  
   useEffect(() => {
     if (!isSidePanelOpen) return