Skip to content
This repository was archived by the owner on Oct 10, 2026. It is now read-only.

Commit dfbda84

Browse files
authored
fix(web): handle sidebar shortcut before editors (pingdotgg#3921)
1 parent 78485e6 commit dfbda84

2 files changed

Lines changed: 11 additions & 2 deletions

File tree

‎apps/web/src/components/AppSidebarLayout.tsx‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,22 @@ function SidebarControl() {
3333
useEffect(() => {
3434
const onKeyDown = (event: KeyboardEvent) => {
3535
if (event.defaultPrevented) return;
36+
if (
37+
event.target instanceof HTMLElement &&
38+
event.target.closest("[data-keybinding-capture]")
39+
) {
40+
return;
41+
}
3642
if (resolveShortcutCommand(event, keybindings) !== "sidebar.toggle") return;
3743

3844
event.preventDefault();
3945
event.stopPropagation();
4046
toggleSidebar();
4147
};
4248

43-
window.addEventListener("keydown", onKeyDown);
44-
return () => window.removeEventListener("keydown", onKeyDown);
49+
// Capture before focused editors consume commands such as Mod+B for rich-text formatting.
50+
window.addEventListener("keydown", onKeyDown, true);
51+
return () => window.removeEventListener("keydown", onKeyDown, true);
4552
}, [keybindings, toggleSidebar]);
4653

4754
return (

‎apps/web/src/components/settings/KeybindingsSettings.tsx‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -846,6 +846,7 @@ function KeybindingTableRow({
846846
</button>
847847
) : (
848848
<Input
849+
data-keybinding-capture=""
849850
autoFocus={isRecording}
850851
aria-label={`Keybinding for ${commandLabel(row.command)}`}
851852
value={isRecording ? "" : keyDraft}
@@ -1011,6 +1012,7 @@ function NewKeybindingTableRow({
10111012
</div>
10121013
<div className="flex min-w-0 items-center gap-2 pr-4">
10131014
<Input
1015+
data-keybinding-capture=""
10141016
aria-label={`Keybinding for ${commandLabelText}`}
10151017
value={isRecording ? "" : keyDraft}
10161018
placeholder={isRecording ? "Press shortcut" : "Unassigned"}

0 commit comments

Comments
 (0)