fix(shortcuts): match single-letter hotkeys by layout-aware key

react-hotkeys-hook 4.6.2 matches a hotkey's letter against both the
layout-aware event.key and the physical event.code. For a single-letter
shortcut like "mod+i" (Inbox), that means any key at the physical QWERTY-"I"
position triggers it — so on a Dvorak layout Cmd+C (whose key sits at that
physical slot) navigates to the inbox instead of copying. Every single-letter
mod+<letter> shortcut has the same problem on non-QWERTY layouts.

Patch the library matcher to derive the key from event.key, falling back to
the physical event.code only when a modifier (e.g. macOS Option) turns
event.key into a non-alphanumeric glyph. Special keys (arrows, escape, space)
and Option shortcuts keep working via the fallback.

Generated-By: PostHog Code
Task-Id: 570b6a35-794b-45bb-933f-7b54751b014a

Author: haacked

packages/ui/src/features/command/hotkeysLayout.test.ts

@@ -0,0 +1,31 @@
+import { renderHook } from "@testing-library/react";
+import { useHotkeys } from "react-hotkeys-hook";
+import { describe, expect, it, vi } from "vitest";
+
+// Regression guard for patches/react-hotkeys-hook.patch. Single-letter shortcuts must match the
+// layout-aware event.key, not the physical event.code. On a Dvorak layout the key labelled "c"
+// sits at the physical QWERTY-"I" slot (event.code "KeyI"), which used to trigger the "mod+i"
+// Inbox shortcut and hijack Cmd+C.
+function press(init: KeyboardEventInit): void {
+  document.dispatchEvent(new KeyboardEvent("keydown", { bubbles: true, ...init }));
+}
+
+describe("react-hotkeys-hook layout-aware matching", () => {
+  it("fires mod+i when the logical key is i", () => {
+    const onInbox = vi.fn();
+    renderHook(() => useHotkeys("mod+i", onInbox, { enableOnContentEditable: true }));
+
+    press({ key: "i", code: "KeyI", metaKey: true });
+
+    expect(onInbox).toHaveBeenCalledTimes(1);
+  });
+
+  it("does not fire mod+i on a Dvorak Cmd+C that lands on the physical KeyI slot", () => {
+    const onInbox = vi.fn();
+    renderHook(() => useHotkeys("mod+i", onInbox, { enableOnContentEditable: true }));
+
+    press({ key: "c", code: "KeyI", metaKey: true });
+
+    expect(onInbox).not.toHaveBeenCalled();
+  });
+});

patches/react-hotkeys-hook.patch

@@ -0,0 +1,16 @@
+--- a/dist/react-hotkeys-hook.esm.js
++++ b/dist/react-hotkeys-hook.esm.js
+@@ -206,7 +206,12 @@
+     metaKey = e.metaKey,
+     shiftKey = e.shiftKey,
+     altKey = e.altKey;
+-  var keyCode = mapKey(code);
++  var layoutKey = mapKey(pressedKeyUppercase);
++  // PostHog patch: prefer the layout-aware key (event.key). Fall back to the physical
++  // event.code only when a modifier such as macOS Option turns event.key into a
++  // non-alphanumeric glyph, so single-letter shortcuts match the printed letter on
++  // non-QWERTY layouts (Dvorak, AZERTY, ...) instead of the QWERTY key at that slot.
++  var keyCode = /^[a-z0-9]$/.test(layoutKey) ? layoutKey : mapKey(code);
+   var pressedKey = pressedKeyUppercase.toLowerCase();
+   if (!(keys != null && keys.includes(keyCode)) && !(keys != null && keys.includes(pressedKey)) && !['ctrl', 'control', 'unknown', 'meta', 'alt', 'shift', 'os'].includes(keyCode)) {
+     return false;

pnpm-lock.yaml

@@ -115,3 +115,4 @@ onlyBuiltDependencies:
 
 patchedDependencies:
   node-pty: patches/node-pty.patch
+  react-hotkeys-hook: patches/react-hotkeys-hook.patch