}
+ />
{(videoStream.peerConnectionState === "connected" || forceHttp) && (
,
@@ -14,7 +15,9 @@ export const useKeyboardEvents = (
const keyboardLedStateSyncAvailable = useHidStore(state => state.keyboardLedStateSyncAvailable);
const keyboardLedSync = useSettingsStore(state => state.keyboardLedSync);
const isKeyboardLedManagedByHost = keyboardLedSync !== "browser" && keyboardLedStateSyncAvailable;
- const overrideCtrlV = useSettingsStore(state => state.overrideCtrlV);
+ const pasteShortcutEnabled = useSettingsStore(state => state.pasteShortcutEnabled);
+ const pasteShortcut = useSettingsStore(state => state.pasteShortcut);
+ const isOcrMode = useUiStore(state => state.isOcrMode);
const handleModifierKeys = useCallback((e: KeyboardEvent, activeModifiers: number[]) => {
const { shiftKey, ctrlKey, altKey, metaKey } = e;
@@ -28,15 +31,15 @@ export const useKeyboardEvents = (
}, []);
const keyDownHandler = useCallback(async (e: KeyboardEvent) => {
- if (overrideCtrlV && (e.code === "KeyV" || e.key.toLowerCase() === "v") && (e.ctrlKey || e.metaKey)) {
- console.log("Override Ctrl V");
- if (isReinitializingGadget) return;
- if (pasteCaptureRef && pasteCaptureRef.current) {
- pasteCaptureRef.current.value = "";
- pasteCaptureRef.current.focus();
- }
- return;
+ if (isOcrMode) return;
+ if (pasteShortcutEnabled && eventMatchesShortcut(e, pasteShortcut)) {
+ if (isReinitializingGadget) return;
+ if (pasteCaptureRef && pasteCaptureRef.current) {
+ pasteCaptureRef.current.value = "";
+ pasteCaptureRef.current.focus();
}
+ return;
+ }
if (isReinitializingGadget) return;
e.preventDefault();
@@ -74,9 +77,10 @@ export const useKeyboardEvents = (
// Still update the full state for legacy compatibility and UI display
sendKeyboardEvent([...new Set(newKeys)], [...new Set(newModifiers)]);
- }, [handleModifierKeys, sendKeyboardEvent, sendKeypress, isKeyboardLedManagedByHost, setIsNumLockActive, setIsCapsLockActive, setIsScrollLockActive, overrideCtrlV, pasteCaptureRef, isReinitializingGadget]);
+ }, [handleModifierKeys, sendKeyboardEvent, sendKeypress, isKeyboardLedManagedByHost, setIsNumLockActive, setIsCapsLockActive, setIsScrollLockActive, pasteShortcutEnabled, pasteShortcut, pasteCaptureRef, isReinitializingGadget, isOcrMode]);
const keyUpHandler = useCallback((e: KeyboardEvent) => {
+ if (isOcrMode) return;
if (isReinitializingGadget) return;
e.preventDefault();
const prev = useHidStore.getState();
@@ -101,7 +105,7 @@ export const useKeyboardEvents = (
// Still update the full state for legacy compatibility and UI display
sendKeyboardEvent([...new Set(newKeys)], [...new Set(newModifiers)]);
- }, [handleModifierKeys, sendKeyboardEvent, sendKeypress, isKeyboardLedManagedByHost, setIsNumLockActive, setIsCapsLockActive, setIsScrollLockActive]);
+ }, [handleModifierKeys, sendKeyboardEvent, sendKeypress, isKeyboardLedManagedByHost, setIsNumLockActive, setIsCapsLockActive, setIsScrollLockActive, isOcrMode]);
const setupKeyboardEvents = useCallback(() => {
const abortController = new AbortController();
@@ -118,4 +122,4 @@ export const useKeyboardEvents = (
return {
setupKeyboardEvents,
};
-};
\ No newline at end of file
+};
diff --git a/ui/src/layout/core/desktop/hooks/usePasteHandler.ts b/ui/src/layout/core/desktop/hooks/usePasteHandler.ts
index 23cff38..b3b79cf 100644
--- a/ui/src/layout/core/desktop/hooks/usePasteHandler.ts
+++ b/ui/src/layout/core/desktop/hooks/usePasteHandler.ts
@@ -5,10 +5,12 @@ import { useSettingsStore, useHidStore, useUiStore } from "@/hooks/stores";
import { keys, modifiers } from "@/keyboardMappings";
import { chars } from "@/keyboardLayouts";
import notifications from "@/notifications";
+import { eventMatchesShortcut } from "@/utils/shortcuts";
export const usePasteHandler = (pasteCaptureRef?: React.RefObject) => {
const [send] = useJsonRpc();
- const overrideCtrlV = useSettingsStore(state => state.overrideCtrlV);
+ const pasteShortcutEnabled = useSettingsStore(state => state.pasteShortcutEnabled);
+ const pasteShortcut = useSettingsStore(state => state.pasteShortcut);
const keyboardLayout = useSettingsStore(state => state.keyboardLayout);
const setKeyboardLayout = useSettingsStore(state => state.setKeyboardLayout);
const debugMode = useSettingsStore(state => state.debugMode);
@@ -140,12 +142,11 @@ export const usePasteHandler = (pasteCaptureRef?: React.RefObject {
- if (!overrideCtrlV) return;
+ if (!pasteShortcutEnabled) return;
const onKeyDownCapture = (e: KeyboardEvent) => {
- if (!overrideCtrlV) return;
- if (!(e.ctrlKey || e.metaKey)) return;
- if (e.code !== "KeyV" && e.key.toLowerCase() !== "v") return;
+ if (!pasteShortcutEnabled) return;
+ if (!eventMatchesShortcut(e, pasteShortcut)) return;
if (isReinitializingGadget) return;
const activeElement = document.activeElement as HTMLElement | null;
@@ -196,20 +197,20 @@ export const usePasteHandler = (pasteCaptureRef?: React.RefObject {
document.removeEventListener("keydown", onKeyDownCapture, { capture: true });
};
- }, [ensureFocusTrapPaused, isReinitializingGadget, log, overrideCtrlV, pasteCaptureRef, safeKeyboardLayout, sendTextToRemote]);
+ }, [ensureFocusTrapPaused, isReinitializingGadget, log, pasteShortcutEnabled, pasteShortcut, pasteCaptureRef, safeKeyboardLayout, sendTextToRemote]);
const handleGlobalPaste = useCallback(async (e: React.ClipboardEvent | ClipboardEvent) => {
- if (!overrideCtrlV) return;
+ if (!pasteShortcutEnabled) return;
e.preventDefault();
const clipboardData = (e as React.ClipboardEvent).clipboardData || (e as ClipboardEvent).clipboardData;
const txt = clipboardData?.getData("text") || "";
await sendTextToRemote(txt);
- }, [log, overrideCtrlV, safeKeyboardLayout, sendTextToRemote]);
+ }, [log, pasteShortcutEnabled, safeKeyboardLayout, sendTextToRemote]);
return {
handleGlobalPaste,
- overrideCtrlV,
+ pasteShortcutEnabled,
};
};