Skip to content

fix(web): handle sidebar shortcut before editors #3921

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Bortlesboat wants to merge 2 commits into
base: main
Choose a base branch
from
+11 −2
Open

fix(web): handle sidebar shortcut before editors #3921

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5fa8008
fix(web): handle sidebar shortcut before editors
Bortlesboat Jul 12, 2026
a881201
fix(web): preserve keybinding capture
Bortlesboat Jul 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions apps/web/src/components/AppSidebarLayout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,22 @@ function SidebarControl() {
useEffect(() => {
const onKeyDown = (event: KeyboardEvent) => {
if (event.defaultPrevented) return;
if (
event.target instanceof HTMLElement &&
event.target.closest("[data-keybinding-capture]")
) {
return;
}
if (resolveShortcutCommand(event, keybindings) !== "sidebar.toggle") return;

event.preventDefault();
event.stopPropagation();
toggleSidebar();
};

window.addEventListener("keydown", onKeyDown);
return () => window.removeEventListener("keydown", onKeyDown);
// Capture before focused editors consume commands such as Mod+B for rich-text formatting.
window.addEventListener("keydown", onKeyDown, true);
return () => window.removeEventListener("keydown", onKeyDown, true);
Comment thread
Bortlesboat marked this conversation as resolved.
}, [keybindings, toggleSidebar]);

return (
Expand Down
2 changes: 2 additions & 0 deletions apps/web/src/components/settings/KeybindingsSettings.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -846,6 +846,7 @@ function KeybindingTableRow({
</button>
) : (
<Input
data-keybinding-capture=""
autoFocus={isRecording}
aria-label={`Keybinding for ${commandLabel(row.command)}`}
value={isRecording ? "" : keyDraft}
Expand Down Expand Up @@ -1011,6 +1012,7 @@ function NewKeybindingTableRow({
</div>
<div className="flex min-w-0 items-center gap-2 pr-4">
<Input
data-keybinding-capture=""
aria-label={`Keybinding for ${commandLabelText}`}
value={isRecording ? "" : keyDraft}
placeholder={isRecording ? "Press shortcut" : "Unassigned"}
Expand Down
Loading