From 2037c9d4780865f5850b8df29e1be56abac1b16c Mon Sep 17 00:00:00 2001 From: Marc Brooks Date: Wed, 8 Oct 2025 16:28:16 -0500 Subject: [PATCH] File formatting pass --- .devcontainer/docker/devcontainer.json | 2 +- ui/localization/messages/zh.json | 2 +- ui/src/constants/macros.ts | 2 +- ui/src/hooks/hidRpc.ts | 3 +- ui/src/hooks/stores.ts | 74 +++++++++++++------------- ui/src/hooks/useHidRpc.ts | 6 +-- ui/src/hooks/useJsonRpc.ts | 2 +- ui/src/hooks/useKeyboard.ts | 6 ++- ui/src/hooks/useKeyboardLayout.ts | 2 +- ui/src/keyboardLayouts.ts | 2 +- ui/src/keyboardLayouts/cs_CZ.ts | 4 +- ui/src/keyboardLayouts/da_DK.ts | 26 ++++----- ui/src/keyboardLayouts/de_CH.ts | 2 +- ui/src/keyboardLayouts/en_UK.ts | 2 +- ui/src/keyboardLayouts/en_US.ts | 8 +-- ui/src/keyboardLayouts/es_ES.ts | 6 +-- ui/src/keyboardLayouts/fr_BE.ts | 2 +- ui/src/keyboardLayouts/fr_CH.ts | 2 +- ui/src/keyboardLayouts/fr_FR.ts | 2 +- ui/src/keyboardLayouts/it_IT.ts | 4 +- ui/src/keyboardLayouts/nb_NO.ts | 2 +- ui/src/keyboardLayouts/sv_SE.ts | 4 +- ui/src/keyboardMappings.ts | 4 +- ui/src/utils.ts | 16 +++--- 24 files changed, 93 insertions(+), 92 deletions(-) diff --git a/.devcontainer/docker/devcontainer.json b/.devcontainer/docker/devcontainer.json index 2c7c6d17..51c5240e 100644 --- a/.devcontainer/docker/devcontainer.json +++ b/.devcontainer/docker/devcontainer.json @@ -9,7 +9,7 @@ }, "mounts": [ "source=${localEnv:HOME}/.ssh,target=/home/vscode/.ssh,type=bind,consistency=cached", - "source=/var/run/docker.sock,target=/var/run/docker.sock,type=bind" + "source=/var/run/docker.sock,target=/var/run/docker.sock,type=bind" ], "onCreateCommand": ".devcontainer/install-deps.sh", "customizations": { diff --git a/ui/localization/messages/zh.json b/ui/localization/messages/zh.json index c203babd..70ef92f7 100644 --- a/ui/localization/messages/zh.json +++ b/ui/localization/messages/zh.json @@ -11,7 +11,7 @@ "action_bar_web_terminal": "网页终端", "action_bar_wake_on_lan": "局域网唤醒", "action_bar_virtual_keyboard": "虚拟键盘", - "action_bar_extension": "扩展", + "action_bar_extension": "扩展", "action_bar_connection_stats": "连接统计", "action_bar_settings": "设置", "action_bar_fullscreen": "全屏", diff --git a/ui/src/constants/macros.ts b/ui/src/constants/macros.ts index 853cfe9d..7f21269f 100644 --- a/ui/src/constants/macros.ts +++ b/ui/src/constants/macros.ts @@ -1,5 +1,5 @@ export const DEFAULT_DELAY = 50; export const MAX_STEPS_PER_MACRO = 10; export const MAX_KEYS_PER_STEP = 10; -export const MAX_TOTAL_MACROS = 25; +export const MAX_TOTAL_MACROS = 25; export const COPY_SUFFIX = "(copy)"; \ No newline at end of file diff --git a/ui/src/hooks/hidRpc.ts b/ui/src/hooks/hidRpc.ts index 823384ff..e0140904 100644 --- a/ui/src/hooks/hidRpc.ts +++ b/ui/src/hooks/hidRpc.ts @@ -270,9 +270,8 @@ export class KeyboardMacroReportMessage extends RpcMessage { ...keys, ...fromUint16toUint8(step.delay), ]); - const offset = 6 + i * 9; - + const offset = 6 + i * 9; data.set(macroBinary, offset); } diff --git a/ui/src/hooks/stores.ts b/ui/src/hooks/stores.ts index bfbbb26e..cad434d4 100644 --- a/ui/src/hooks/stores.ts +++ b/ui/src/hooks/stores.ts @@ -73,10 +73,10 @@ export interface UIState { export const useUiStore = create(set => ({ terminalType: "none", - setTerminalType: (type: UIState["terminalType"]) => set({ terminalType: type }), + setTerminalType: (type: UIState["terminalType"]) => set({ terminalType: type }), sidebarView: null, - setSidebarView: (view: AvailableSidebarViews | null) => set({ sidebarView: view }), + setSidebarView: (view: AvailableSidebarViews | null) => set({ sidebarView: view }), disableVideoFocusTrap: false, setDisableVideoFocusTrap: (enabled: boolean) => set({ disableVideoFocusTrap: enabled }), @@ -195,7 +195,7 @@ export const useRTCStore = create(set => ({ videoStreamStatsHistory: new Map(), isTurnServerInUse: false, - setTurnServerInUse: (inUse: boolean) => set({ isTurnServerInUse: inUse }), + setTurnServerInUse: (inUse: boolean) => set({ isTurnServerInUse: inUse }), inboundRtpStats: new Map(), appendInboundRtpStats: (stats: RTCInboundRtpStreamStats) => { @@ -461,11 +461,11 @@ export const hidKeyBufferSize = 6; export const hidErrorRollOver = 0x01; export interface KeysDownState { - modifier: number; - keys: number[]; + modifier: number; + keys: number[]; } -export type USBStates = +export type USBStates = | "configured" | "attached" | "not attached" @@ -493,7 +493,7 @@ export const useHidStore = create(set => ({ keyboardLedState: { num_lock: false, caps_lock: false, scroll_lock: false, compose: false, kana: false, shift: false } as KeyboardLedState, setKeyboardLedState: (ledState: KeyboardLedState): void => set({ keyboardLedState: ledState }), - keysDownState: { modifier: 0, keys: [0,0,0,0,0,0] } as KeysDownState, + keysDownState: { modifier: 0, keys: [0, 0, 0, 0, 0, 0] } as KeysDownState, setKeysDownState: (state: KeysDownState): void => set({ keysDownState: state }), isVirtualKeyboardEnabled: false, @@ -521,34 +521,34 @@ export type UpdateModalViews = | "error"; export interface OtaState { - updating: boolean; - error: string | null; + updating: boolean; + error: string | null; - metadataFetchedAt: string | null; + metadataFetchedAt: string | null; - // App update - appUpdatePending: boolean; + // App update + appUpdatePending: boolean; - appDownloadProgress: number; - appDownloadFinishedAt: string | null; + appDownloadProgress: number; + appDownloadFinishedAt: string | null; - appVerificationProgress: number; - appVerifiedAt: string | null; + appVerificationProgress: number; + appVerifiedAt: string | null; - appUpdateProgress: number; - appUpdatedAt: string | null; + appUpdateProgress: number; + appUpdatedAt: string | null; - // System update - systemUpdatePending: boolean; + // System update + systemUpdatePending: boolean; - systemDownloadProgress: number; - systemDownloadFinishedAt: string | null; + systemDownloadProgress: number; + systemDownloadFinishedAt: string | null; - systemVerificationProgress: number; - systemVerifiedAt: string | null; + systemVerificationProgress: number; + systemVerifiedAt: string | null; - systemUpdateProgress: number; - systemUpdatedAt: string | null; + systemUpdateProgress: number; + systemUpdatedAt: string | null; }; export interface UpdateState { @@ -603,7 +603,7 @@ export type UsbConfigModalViews = | "updateUsbConfigSuccess"; export interface UsbConfigModalState { - modalView: UsbConfigModalViews ; + modalView: UsbConfigModalViews; errorMessage: string | null; setModalView: (view: UsbConfigModalViews) => void; setErrorMessage: (message: string | null) => void; @@ -620,7 +620,7 @@ export interface UsbConfigState { export const useUsbConfigModalStore = create(set => ({ modalView: "updateUsbConfig", errorMessage: null, - setModalView: (view: UsbConfigModalViews) => set({ modalView: view }), + setModalView: (view: UsbConfigModalViews) => set({ modalView: view }), setErrorMessage: (message: string | null) => set({ errorMessage: message }), })); @@ -633,13 +633,13 @@ export type LocalAuthModalViews = | "updateSuccess"; export interface LocalAuthModalState { - modalView:LocalAuthModalViews; - setModalView: (view:LocalAuthModalViews) => void; + modalView: LocalAuthModalViews; + setModalView: (view: LocalAuthModalViews) => void; } export const useLocalAuthModalStore = create(set => ({ modalView: "createPassword", - setModalView: (view: LocalAuthModalViews) => set({ modalView: view }), + setModalView: (view: LocalAuthModalViews) => set({ modalView: view }), })); export interface DeviceState { @@ -779,12 +779,12 @@ export interface MacrosState { loadMacros: () => Promise; saveMacros: (macros: KeySequence[]) => Promise; sendFn: - | (( - method: string, - params: unknown, - callback?: ((resp: JsonRpcResponse) => void) | undefined, - ) => void) - | null; + | (( + method: string, + params: unknown, + callback?: ((resp: JsonRpcResponse) => void) | undefined, + ) => void) + | null; setSendFn: ( sendFn: ( method: string, diff --git a/ui/src/hooks/useHidRpc.ts b/ui/src/hooks/useHidRpc.ts index aeb1c4fa..7fb57c20 100644 --- a/ui/src/hooks/useHidRpc.ts +++ b/ui/src/hooks/useHidRpc.ts @@ -71,7 +71,7 @@ export function useHidRpc(onHidRpcMessage?: (payload: RpcMessage) => void) { }: sendMessageParams = {}, ) => { if (hidRpcDisabled) return; - if (rpcHidChannel?.readyState !== "open") return; + if (rpcHidChannel?.readyState !== "open") return; if (!rpcHidReady && !ignoreHandshakeState) return; let data: Uint8Array | undefined; @@ -163,7 +163,7 @@ export function useHidRpc(onHidRpcMessage?: (payload: RpcMessage) => void) { (message: HandshakeMessage) => { if (hidRpcDisabled) return; - if (!message.version) { + if (!message.version) { console.error("Received handshake message without version", message); return; } @@ -238,7 +238,7 @@ export function useHidRpc(onHidRpcMessage?: (payload: RpcMessage) => void) { setRpcHidProtocolVersion, sendHandshake, handleHandshake, - hidRpcDisabled, + hidRpcDisabled, ]); return { diff --git a/ui/src/hooks/useJsonRpc.ts b/ui/src/hooks/useJsonRpc.ts index 5c52d59c..a77c9ce8 100644 --- a/ui/src/hooks/useJsonRpc.ts +++ b/ui/src/hooks/useJsonRpc.ts @@ -79,7 +79,7 @@ export function useJsonRpc(onRequest?: (payload: JsonRpcRequest) => void) { rpcDataChannel.removeEventListener("message", messageHandler); }; }, - [rpcDataChannel, onRequest]); + [rpcDataChannel, onRequest]); return { send }; } diff --git a/ui/src/hooks/useKeyboard.ts b/ui/src/hooks/useKeyboard.ts index 8d101b3b..57e061e2 100644 --- a/ui/src/hooks/useKeyboard.ts +++ b/ui/src/hooks/useKeyboard.ts @@ -54,7 +54,8 @@ export default function useKeyboard() { // support the keyPressReport API. In that case, we need to handle the key presses locally // and send the full state to the device, so it can behave like a real USB HID keyboard. // This flag indicates whether the keyPressReport API is available on the device which is - // dynamically set when the device responds to the first key press event or reports its // keysDownState when queried since the keyPressReport was introduced together with the + // dynamically set when the device responds to the first key press event or reports its + // keysDownState when queried since the keyPressReport was introduced together with the // getKeysDownState API. // HidRPC is a binary format for exchanging keyboard and mouse events @@ -277,7 +278,6 @@ export default function useKeyboard() { cancelKeepAlive(); }, [cancelKeepAlive]); - // executeMacro is used to execute a macro consisting of multiple steps. // Each step can have multiple keys, multiple modifiers and a delay. // The keys and modifiers are pressed together and held for the delay duration. @@ -306,6 +306,7 @@ export default function useKeyboard() { sendKeyboardMacroEventHidRpc(macro); }, [sendKeyboardMacroEventHidRpc]); + const executeMacroClientSide = useCallback(async (steps: MacroSteps) => { const promises: (() => Promise)[] = []; @@ -355,6 +356,7 @@ export default function useKeyboard() { }); }); }, [sendKeystrokeLegacy, resetKeyboardState, setAbortController]); + const executeMacro = useCallback(async (steps: MacroSteps) => { if (rpcHidReady) { return executeMacroRemote(steps); diff --git a/ui/src/hooks/useKeyboardLayout.ts b/ui/src/hooks/useKeyboardLayout.ts index c1d0557c..f96d8f6c 100644 --- a/ui/src/hooks/useKeyboardLayout.ts +++ b/ui/src/hooks/useKeyboardLayout.ts @@ -28,7 +28,7 @@ export default function useKeyboardLayout() { const selectedKeyboard = useMemo(() => { // fallback to original behaviour of en-US if no isoCode given or matching layout not found return keyboards.find(keyboard => keyboard.isoCode === isoCode) - ?? keyboards.find(keyboard => keyboard.isoCode === "en-US")!; + ?? keyboards.find(keyboard => keyboard.isoCode === "en-US")!; }, [isoCode]); return { keyboardOptions, isoCode, selectedKeyboard }; diff --git a/ui/src/keyboardLayouts.ts b/ui/src/keyboardLayouts.ts index c1739c8a..8e305c5a 100644 --- a/ui/src/keyboardLayouts.ts +++ b/ui/src/keyboardLayouts.ts @@ -29,4 +29,4 @@ import { nb_NO } from "@/keyboardLayouts/nb_NO" import { sv_SE } from "@/keyboardLayouts/sv_SE" import { da_DK } from "@/keyboardLayouts/da_DK" -export const keyboards: KeyboardLayout[] = [ cs_CZ, de_CH, de_DE, en_UK, en_US, es_ES, fr_BE, fr_CH, fr_FR, it_IT, nb_NO, sv_SE, da_DK ]; +export const keyboards: KeyboardLayout[] = [cs_CZ, de_CH, de_DE, en_UK, en_US, es_ES, fr_BE, fr_CH, fr_FR, it_IT, nb_NO, sv_SE, da_DK]; diff --git a/ui/src/keyboardLayouts/cs_CZ.ts b/ui/src/keyboardLayouts/cs_CZ.ts index c02be702..fd2dbfa9 100644 --- a/ui/src/keyboardLayouts/cs_CZ.ts +++ b/ui/src/keyboardLayouts/cs_CZ.ts @@ -197,7 +197,7 @@ const chars = { z: { key: "KeyZ" }, "ż": { key: "KeyZ", accentKey: keyOverdot }, ";": { key: "Backquote" }, - "°": { key: "Backquote", shift: true, deadKey: true }, + "°": { key: "Backquote", shift: true, deadKey: true }, "+": { key: "Digit1" }, 1: { key: "Digit1", shift: true }, "ě": { key: "Digit2" }, @@ -251,7 +251,7 @@ export const cs_CZ: KeyboardLayout = { name: name, chars: chars, // TODO need to localize these maps and layouts - keyDisplayMap: en_US.keyDisplayMap, + keyDisplayMap: en_US.keyDisplayMap, modifierDisplayMap: en_US.modifierDisplayMap, virtualKeyboard: en_US.virtualKeyboard }; \ No newline at end of file diff --git a/ui/src/keyboardLayouts/da_DK.ts b/ui/src/keyboardLayouts/da_DK.ts index 397535d3..b8500b4a 100644 --- a/ui/src/keyboardLayouts/da_DK.ts +++ b/ui/src/keyboardLayouts/da_DK.ts @@ -6,10 +6,10 @@ export const name = "Dansk"; const isoCode = "da-DK"; const keyTrema = { key: "BracketRight" } -const keyAcute = { key: "Equal", altRight: true } -const keyHat = { key: "BracketRight", shift: true } -const keyGrave = { key: "Equal", shift: true } -const keyTilde = { key: "BracketRight", altRight: true } +const keyAcute = { key: "Equal", altRight: true } +const keyHat = { key: "BracketRight", shift: true } +const keyGrave = { key: "Equal", shift: true } +const keyTilde = { key: "BracketRight", altRight: true } export const chars = { A: { key: "KeyA", shift: true }, @@ -61,8 +61,8 @@ export const chars = { V: { key: "KeyV", shift: true }, W: { key: "KeyW", shift: true }, X: { key: "KeyX", shift: true }, - Y: { key: "KeyY", shift: true }, - Z: { key: "KeyZ", shift: true }, + Y: { key: "KeyY", shift: true }, + Z: { key: "KeyZ", shift: true }, a: { key: "KeyA" }, "ä": { key: "KeyA", accentKey: keyTrema }, "á": { key: "KeyA", accentKey: keyAcute }, @@ -115,7 +115,7 @@ export const chars = { x: { key: "KeyX" }, y: { key: "KeyY" }, // <-- corrected z: { key: "KeyZ" }, // <-- corrected - "½": { key: "Backquote" }, + "½": { key: "Backquote" }, "§": { key: "Backquote", shift: true }, 1: { key: "Digit1" }, "!": { key: "Digit1", shift: true }, @@ -163,11 +163,11 @@ export const chars = { "_": { key: "Slash", shift: true }, "<": { key: "IntlBackslash" }, ">": { key: "IntlBackslash", shift: true }, - "~": { key: "BracketRight", deadKey: true, altRight: true }, - "^": { key: "BracketRight", deadKey: true, shift: true }, - "¨": { key: "BracketRight", deadKey: true, }, - "|": { key: "Equal", deadKey: true, altRight: true}, - "`": { key: "Equal", deadKey: true, shift: true, }, + "~": { key: "BracketRight", deadKey: true, altRight: true }, + "^": { key: "BracketRight", deadKey: true, shift: true }, + "¨": { key: "BracketRight", deadKey: true, }, + "|": { key: "Equal", deadKey: true, altRight: true }, + "`": { key: "Equal", deadKey: true, shift: true, }, "´": { key: "Equal", deadKey: true, }, " ": { key: "Space" }, "\n": { key: "Enter" }, @@ -181,7 +181,7 @@ export const da_DK: KeyboardLayout = { name: name, chars: chars, // TODO need to localize these maps and layouts - keyDisplayMap: en_US.keyDisplayMap, + keyDisplayMap: en_US.keyDisplayMap, modifierDisplayMap: en_US.modifierDisplayMap, virtualKeyboard: en_US.virtualKeyboard }; diff --git a/ui/src/keyboardLayouts/de_CH.ts b/ui/src/keyboardLayouts/de_CH.ts index 87764097..75ac49e8 100644 --- a/ui/src/keyboardLayouts/de_CH.ts +++ b/ui/src/keyboardLayouts/de_CH.ts @@ -181,7 +181,7 @@ export const de_CH: KeyboardLayout = { isoCode: isoCode, name: name, chars: chars, - keyDisplayMap: keyDisplayMap, + keyDisplayMap: keyDisplayMap, // TODO need to localize these maps and layouts modifierDisplayMap: en_US.modifierDisplayMap, virtualKeyboard: en_US.virtualKeyboard diff --git a/ui/src/keyboardLayouts/en_UK.ts b/ui/src/keyboardLayouts/en_UK.ts index 5341f0f0..74b111a5 100644 --- a/ui/src/keyboardLayouts/en_UK.ts +++ b/ui/src/keyboardLayouts/en_UK.ts @@ -114,7 +114,7 @@ export const en_UK: KeyboardLayout = { name: name, chars: chars, // TODO need to localize these maps and layouts - keyDisplayMap: en_US.keyDisplayMap, + keyDisplayMap: en_US.keyDisplayMap, modifierDisplayMap: en_US.modifierDisplayMap, virtualKeyboard: en_US.virtualKeyboard }; \ No newline at end of file diff --git a/ui/src/keyboardLayouts/en_US.ts b/ui/src/keyboardLayouts/en_US.ts index 2076ce64..c4a1b250 100644 --- a/ui/src/keyboardLayouts/en_US.ts +++ b/ui/src/keyboardLayouts/en_US.ts @@ -113,7 +113,7 @@ export const chars = { "~": { key: "Backquote", shift: true }, "§": { key: "IntlBackslash" }, "±": { key: "IntlBackslash", shift: true }, - " ": { key: "Space" }, + " ": { key: "Space" }, "\n": { key: "Enter" }, Enter: { key: "Enter" }, Escape: { key: "Escape" }, @@ -264,13 +264,13 @@ export const virtualKeyboard = { }, control: { default: [ - "PrintScreen ScrollLock Pause", + "PrintScreen ScrollLock Pause", "Insert Home PageUp", "Delete End PageDown" ], shift: [ "(PrintScreen) ScrollLock (Pause)", - "Insert Home PageUp", + "Insert Home PageUp", "Delete End PageDown" ], }, @@ -303,7 +303,7 @@ export const en_US: KeyboardLayout = { isoCode, name, chars, - keyDisplayMap, + keyDisplayMap, modifierDisplayMap, virtualKeyboard }; diff --git a/ui/src/keyboardLayouts/es_ES.ts b/ui/src/keyboardLayouts/es_ES.ts index ab7762b0..3bf85e93 100644 --- a/ui/src/keyboardLayouts/es_ES.ts +++ b/ui/src/keyboardLayouts/es_ES.ts @@ -116,8 +116,8 @@ const chars = { y: { key: "KeyY" }, z: { key: "KeyZ" }, "º": { key: "Backquote" }, - "ª": { key: "Backquote", shift: true }, - "\\": { key: "Backquote", altRight: true }, + "ª": { key: "Backquote", shift: true }, + "\\": { key: "Backquote", altRight: true }, 1: { key: "Digit1" }, "!": { key: "Digit1", shift: true }, "|": { key: "Digit1", altRight: true }, @@ -175,7 +175,7 @@ export const es_ES: KeyboardLayout = { name: name, chars: chars, // TODO need to localize these maps and layouts - keyDisplayMap: en_US.keyDisplayMap, + keyDisplayMap: en_US.keyDisplayMap, modifierDisplayMap: en_US.modifierDisplayMap, virtualKeyboard: en_US.virtualKeyboard }; \ No newline at end of file diff --git a/ui/src/keyboardLayouts/fr_BE.ts b/ui/src/keyboardLayouts/fr_BE.ts index fb5a79ba..0aa47501 100644 --- a/ui/src/keyboardLayouts/fr_BE.ts +++ b/ui/src/keyboardLayouts/fr_BE.ts @@ -174,7 +174,7 @@ export const fr_BE: KeyboardLayout = { name: name, chars: chars, // TODO need to localize these maps and layouts - keyDisplayMap: en_US.keyDisplayMap, + keyDisplayMap: en_US.keyDisplayMap, modifierDisplayMap: en_US.modifierDisplayMap, virtualKeyboard: en_US.virtualKeyboard }; \ No newline at end of file diff --git a/ui/src/keyboardLayouts/fr_CH.ts b/ui/src/keyboardLayouts/fr_CH.ts index d0a70f35..6b6ee5af 100644 --- a/ui/src/keyboardLayouts/fr_CH.ts +++ b/ui/src/keyboardLayouts/fr_CH.ts @@ -29,7 +29,7 @@ export const fr_CH: KeyboardLayout = { isoCode: isoCode, name: name, chars: chars, - keyDisplayMap: keyDisplayMap, + keyDisplayMap: keyDisplayMap, // TODO need to localize these maps and layouts modifierDisplayMap: de_CH.modifierDisplayMap, virtualKeyboard: de_CH.virtualKeyboard diff --git a/ui/src/keyboardLayouts/fr_FR.ts b/ui/src/keyboardLayouts/fr_FR.ts index 2ac5e74a..561431b4 100644 --- a/ui/src/keyboardLayouts/fr_FR.ts +++ b/ui/src/keyboardLayouts/fr_FR.ts @@ -146,7 +146,7 @@ export const fr_FR: KeyboardLayout = { name: name, chars: chars, // TODO need to localize these maps and layouts - keyDisplayMap: en_US.keyDisplayMap, + keyDisplayMap: en_US.keyDisplayMap, modifierDisplayMap: en_US.modifierDisplayMap, virtualKeyboard: en_US.virtualKeyboard }; \ No newline at end of file diff --git a/ui/src/keyboardLayouts/it_IT.ts b/ui/src/keyboardLayouts/it_IT.ts index 160b0fc7..6d24386f 100644 --- a/ui/src/keyboardLayouts/it_IT.ts +++ b/ui/src/keyboardLayouts/it_IT.ts @@ -60,7 +60,7 @@ const chars = { y: { key: "KeyY" }, z: { key: "KeyZ" }, "\\": { key: "Backquote" }, - "|": { key: "Backquote", shift: true }, + "|": { key: "Backquote", shift: true }, 1: { key: "Digit1" }, "!": { key: "Digit1", shift: true }, 2: { key: "Digit2" }, @@ -120,7 +120,7 @@ export const it_IT: KeyboardLayout = { name: name, chars: chars, // TODO need to localize these maps and layouts - keyDisplayMap: en_US.keyDisplayMap, + keyDisplayMap: en_US.keyDisplayMap, modifierDisplayMap: en_US.modifierDisplayMap, virtualKeyboard: en_US.virtualKeyboard }; \ No newline at end of file diff --git a/ui/src/keyboardLayouts/nb_NO.ts b/ui/src/keyboardLayouts/nb_NO.ts index 25043d95..28dadc59 100644 --- a/ui/src/keyboardLayouts/nb_NO.ts +++ b/ui/src/keyboardLayouts/nb_NO.ts @@ -115,7 +115,7 @@ const chars = { x: { key: "KeyX" }, y: { key: "KeyZ" }, z: { key: "KeyY" }, - "|": { key: "Backquote" }, + "|": { key: "Backquote" }, "§": { key: "Backquote", shift: true }, 1: { key: "Digit1" }, "!": { key: "Digit1", shift: true }, diff --git a/ui/src/keyboardLayouts/sv_SE.ts b/ui/src/keyboardLayouts/sv_SE.ts index 388ddf9f..edefb51c 100644 --- a/ui/src/keyboardLayouts/sv_SE.ts +++ b/ui/src/keyboardLayouts/sv_SE.ts @@ -112,7 +112,7 @@ const chars = { y: { key: "KeyY" }, z: { key: "KeyZ" }, "§": { key: "Backquote" }, - "½": { key: "Backquote", shift: true }, + "½": { key: "Backquote", shift: true }, 1: { key: "Digit1" }, "!": { key: "Digit1", shift: true }, 2: { key: "Digit2" }, @@ -171,7 +171,7 @@ export const sv_SE: KeyboardLayout = { name: name, chars: chars, // TODO need to localize these maps and layouts - keyDisplayMap: en_US.keyDisplayMap, + keyDisplayMap: en_US.keyDisplayMap, modifierDisplayMap: en_US.modifierDisplayMap, virtualKeyboard: en_US.virtualKeyboard }; \ No newline at end of file diff --git a/ui/src/keyboardMappings.ts b/ui/src/keyboardMappings.ts index 1ffc8d78..456a43c4 100644 --- a/ui/src/keyboardMappings.ts +++ b/ui/src/keyboardMappings.ts @@ -121,7 +121,7 @@ export const keys = { Hanja: 0x91, Katakana: 0x92, Hiragana: 0x93, - ZenkakuHankaku:0x94, + ZenkakuHankaku: 0x94, LockingCapsLock: 0x82, LockingNumLock: 0x83, LockingScrollLock: 0x84, @@ -279,7 +279,7 @@ export const hidKeyToModifierMask = { export const latchingKeys = ["CapsLock", "ScrollLock", "NumLock", "Meta", "Compose", "Kana"]; export function decodeModifiers(modifier: number) { - return { + return { isShiftActive: (modifier & (modifiers.ShiftLeft | modifiers.ShiftRight)) !== 0, isControlActive: (modifier & (modifiers.ControlLeft | modifiers.ControlRight)) !== 0, isAltActive: (modifier & (modifiers.AltLeft | modifiers.AltRight)) !== 0, diff --git a/ui/src/utils.ts b/ui/src/utils.ts index 9e361339..f6bb5135 100644 --- a/ui/src/utils.ts +++ b/ui/src/utils.ts @@ -41,14 +41,14 @@ export const formatters = { amount: number; name: Intl.RelativeTimeFormatUnit; }[] = [ - { amount: 60, name: "seconds" }, - { amount: 60, name: "minutes" }, - { amount: 24, name: "hours" }, - { amount: 7, name: "days" }, - { amount: 4.34524, name: "weeks" }, - { amount: 12, name: "months" }, - { amount: Number.POSITIVE_INFINITY, name: "years" }, - ]; + { amount: 60, name: "seconds" }, + { amount: 60, name: "minutes" }, + { amount: 24, name: "hours" }, + { amount: 7, name: "days" }, + { amount: 4.34524, name: "weeks" }, + { amount: 12, name: "months" }, + { amount: Number.POSITIVE_INFINITY, name: "years" }, + ]; let duration = (date.valueOf() - new Date().valueOf()) / 1000;