Skip to content

Commit 6027026

Browse files
committed
fixup! ♿️(frontend) shortcuts table: semantic structure and kbd badge
1 parent 8aa416f commit 6027026

2 files changed

Lines changed: 22 additions & 4 deletions

File tree

src/frontend/src/features/rooms/livekit/prefabs/VideoConference.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ import { ScreenShareErrorModal } from '../components/ScreenShareErrorModal'
3232
import { useConnectionObserver } from '../hooks/useConnectionObserver'
3333
import { useNoiseReduction } from '../hooks/useNoiseReduction'
3434
import { useRegisterKeyboardShortcut } from '@/features/shortcuts/useRegisterKeyboardShortcut'
35-
import { settingsStore } from '@/stores/settings'
35+
import { useSettingsDialog } from '@/features/settings'
3636
import { SettingsDialogExtendedKey } from '@/features/settings/type'
3737
import { useVideoResolutionSubscription } from '../hooks/useVideoResolutionSubscription'
3838
import { SettingsDialogProvider } from '@/features/settings/components/SettingsDialogProvider'
@@ -100,6 +100,7 @@ export function VideoConference({ ...props }: VideoConferenceProps) {
100100
const { t: tRooms } = useTranslation('rooms')
101101
const room = useRoomContext()
102102
const announce = useScreenReaderAnnounce()
103+
const { toggleSettingsDialog } = useSettingsDialog()
103104

104105
const getAnnouncementName = useCallback(
105106
(participant?: Participant | null) => {
@@ -117,9 +118,8 @@ export function VideoConference({ ...props }: VideoConferenceProps) {
117118
useRegisterKeyboardShortcut({
118119
id: 'open-shortcuts',
119120
handler: useCallback(() => {
120-
settingsStore.defaultSelectedTab = SettingsDialogExtendedKey.SHORTCUTS
121-
settingsStore.areSettingsOpen = true
122-
}, []),
121+
toggleSettingsDialog(SettingsDialogExtendedKey.SHORTCUTS)
122+
}, [toggleSettingsDialog]),
123123
})
124124

125125
const tracks = useTracks(

src/frontend/src/features/settings/hook/useSettingsDialog.ts

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,25 @@ export const useSettingsDialog = () => {
1414
settingsStore.areSettingsOpen = true
1515
}
1616

17+
const closeSettingsDialog = () => {
18+
settingsStore.areSettingsOpen = false
19+
}
20+
21+
const toggleSettingsDialog = (
22+
defaultSelectedTab?: SettingsDialogExtendedKey
23+
) => {
24+
if (areSettingsOpen) {
25+
closeSettingsDialog()
26+
} else {
27+
if (defaultSelectedTab)
28+
settingsStore.defaultSelectedTab = defaultSelectedTab
29+
settingsStore.areSettingsOpen = true
30+
}
31+
}
32+
1733
return {
1834
openSettingsDialog,
35+
closeSettingsDialog,
36+
toggleSettingsDialog,
1937
}
2038
}

0 commit comments

Comments
 (0)