️(frontend) restore focus-visible rings inside PiP window

Sync React Aria interaction modality with PiP keyboard and mouse events.
This commit is contained in:
Cyril
2026-05-06 13:02:49 +02:00
parent 5a6654b3a8
commit 45b939da5c
2 changed files with 30 additions and 0 deletions
@@ -8,6 +8,7 @@ import { pipLayoutStore } from '../stores/pipLayoutStore'
import { useEscapeDismiss } from '../hooks/useEscapeDismiss'
import { usePipKeyboardShortcuts } from '../hooks/usePipKeyboardShortcuts'
import { usePipRestoreFocus } from '../hooks/usePipRestoreFocus'
import { usePipFocusModality } from '../hooks/usePipFocusModality'
import { PipControlBar } from './PipControlBar'
import { PipReactionsToolbar } from './PipReactionsToolbar'
import { PipStage } from './layouts/PipStage'
@@ -29,6 +30,9 @@ export const PipView = () => {
// Forward keyboard shortcuts (Ctrl+D, Ctrl+E, etc.) to the main store.
usePipKeyboardShortcuts(containerRef)
// Sync React Aria's focus-visible modality with the PiP document.
usePipFocusModality(containerRef)
// Side panels open via a menu item that unmounts on click; fall back to the
// options button so focus returns somewhere visible.
const resolveTrigger = useCallback((activeEl: HTMLElement | null) => {
@@ -0,0 +1,26 @@
import { useEffect, type RefObject } from 'react'
import { setInteractionModality } from '@react-aria/interactions'
/**
* Sync React Aria's interaction modality with the PiP document.
* React Aria only installs keyboard/mouse listeners on the main document,
* so focus-visible rings never appear in PiP without this bridge.
*/
export const usePipFocusModality = (
containerRef: RefObject<HTMLElement | null>
) => {
useEffect(() => {
const doc = containerRef.current?.ownerDocument
if (!doc || doc === document) return
const onKeyDown = () => setInteractionModality('keyboard')
const onMouseDown = () => setInteractionModality('pointer')
doc.addEventListener('keydown', onKeyDown, true)
doc.addEventListener('mousedown', onMouseDown, true)
return () => {
doc.removeEventListener('keydown', onKeyDown, true)
doc.removeEventListener('mousedown', onMouseDown, true)
}
}, [containerRef])
}