Skip to content

fix: Cmd+Left/Right tab shortcuts broken when sidebar has focus — scroll jumps instead #841

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
scriptease wants to merge 1 commit into
base: rc
Choose a base branch
from
Open

fix: Cmd+Left/Right tab shortcuts broken when sidebar has focus — scroll jumps instead #841

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 6 additions & 4 deletions src/renderer/hooks/keyboard/useKeyboardNavigation.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,10 +137,12 @@ export function useKeyboardNavigation(
return false;
}

// Skip if Alt+Cmd+Arrow is pressed (layout toggle shortcut)
const isToggleLayoutShortcut =
e.altKey && (e.metaKey || e.ctrlKey) && (e.key === 'ArrowLeft' || e.key === 'ArrowRight');
if (isToggleLayoutShortcut) return false;
// Skip if Cmd/Ctrl+Arrow is pressed (with or without Alt) — could be a user-configured
// tab navigation shortcut (e.g. Cmd+Left/Right) or layout toggle (Alt+Cmd+Arrow).
// Plain ArrowLeft/Right (no modifiers) is reserved for group collapse/expand.
const isModifiedArrow =
(e.metaKey || e.ctrlKey) && (e.key === 'ArrowLeft' || e.key === 'ArrowRight');
if (isModifiedArrow) return false;
Comment thread
scriptease marked this conversation as resolved.

// Only handle arrow keys and space
if (!['ArrowUp', 'ArrowDown', 'ArrowLeft', 'ArrowRight', ' '].includes(e.key)) {
Expand Down