diff --git a/src/lib/components/Action.svelte b/src/lib/components/Action.svelte index 8de66019..9ca5e393 100644 --- a/src/lib/components/Action.svelte +++ b/src/lib/components/Action.svelte @@ -9,7 +9,7 @@ export let display: "inline-keys" | "keys" = "inline-keys" $: info = typeof action === "number" ? KEYMAP_CODES[action] ?? {code: action} : action - $: dynamicMapping = info.keyCode && $osLayout[JSON.stringify([info.keyCode])] + $: dynamicMapping = info.keyCode && $osLayout.get(info.keyCode) $: tooltip = (info.title ?? info.id ?? `0x${info.code.toString(16)}`) + diff --git a/src/lib/components/layout/KeyText.svelte b/src/lib/components/layout/KeyText.svelte index f8c9da47..25f31526 100644 --- a/src/lib/components/layout/KeyText.svelte +++ b/src/lib/components/layout/KeyText.svelte @@ -25,7 +25,7 @@ {#each positions as position, layer} {@const {action: actionId, isApplied} = $layout[layer][key.id] ?? {action: 0, isApplied: true}} {@const {code, icon, id, display, title, keyCode, variant} = KEYMAP_CODES[actionId] ?? {code: actionId}} - {@const dynamicMapping = keyCode && $osLayout[JSON.stringify([keyCode])]} + {@const dynamicMapping = keyCode && $osLayout.get(keyCode)} {@const tooltip = (title ?? id ?? `0x${code.toString(16)}`) + (variant === "left" ? " (left)" : variant === "right" ? " (right)" : "")}