From c67e7ebc2ca151697b9aec5fed59ce7f63f5cb3d Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Mon, 14 Nov 2022 10:40:02 +0000 Subject: [PATCH] Put PTTButton shortcuts behind the new shortcut --- src/room/PTTButton.tsx | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/room/PTTButton.tsx b/src/room/PTTButton.tsx index 3551cfa2..e083759b 100644 --- a/src/room/PTTButton.tsx +++ b/src/room/PTTButton.tsx @@ -23,6 +23,7 @@ import { ReactComponent as MicIcon } from "../icons/Mic.svg"; import { useEventTarget } from "../useEvents"; import { Avatar } from "../Avatar"; import { usePrefersReducedMotion } from "../usePrefersReducedMotion"; +import { getSetting } from "../settings/useSetting"; interface Props { enabled: boolean; @@ -134,6 +135,12 @@ export const PTTButton: React.FC = ({ (e: KeyboardEvent) => { if (e.code === "Space") { if (!enabled) return; + // Check if keyboard shortcuts are enabled + const keyboardShortcuts = getSetting("keyboard-shortcuts", true); + if (!keyboardShortcuts) { + return; + } + e.preventDefault(); hold(); @@ -148,6 +155,12 @@ export const PTTButton: React.FC = ({ useCallback( (e: KeyboardEvent) => { if (e.code === "Space") { + // Check if keyboard shortcuts are enabled + const keyboardShortcuts = getSetting("keyboard-shortcuts", true); + if (!keyboardShortcuts) { + return; + } + e.preventDefault(); unhold();