Skip to content

fix: prevent keyboard shortcuts from capturing input in diff commit textbox #627

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

Merged
matt2e merged 1 commit into from
Apr 15, 2026
Merged

fix: prevent keyboard shortcuts from capturing input in diff commit textbox #627

Show file tree
Hide file tree
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
12 changes: 10 additions & 2 deletions apps/staged/src/lib/features/diff/DiffModal.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -447,7 +447,11 @@
}
// Hold A to reveal AI annotations
if (event.key === 'a' || event.key === 'A') {
if (event.target instanceof HTMLInputElement || event.target instanceof HTMLTextAreaElement)
if (
event.target instanceof HTMLInputElement ||
event.target instanceof HTMLTextAreaElement ||
(event.target instanceof HTMLElement && event.target.isContentEditable)
)
return;
if (!event.repeat) {
annotationsRevealed = true;
Expand All @@ -457,7 +461,11 @@

function handleKeyup(event: KeyboardEvent) {
if (event.key === 'a' || event.key === 'A') {
if (event.target instanceof HTMLInputElement || event.target instanceof HTMLTextAreaElement)
if (
event.target instanceof HTMLInputElement ||
event.target instanceof HTMLTextAreaElement ||
(event.target instanceof HTMLElement && event.target.isContentEditable)
)
return;
annotationsRevealed = false;
}
Expand Down
3 changes: 2 additions & 1 deletion packages/diff-viewer/src/lib/utils/diffKeyboard.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,8 @@ export function setupDiffKeyboardNav(config: Partial<DiffNavConfig> = {}): () =>

function handleKeydown(event: KeyboardEvent): void {
const target = event.target as HTMLElement;
const inInput = target.tagName === 'INPUT' || target.tagName === 'TEXTAREA';
const inInput =
target.tagName === 'INPUT' || target.tagName === 'TEXTAREA' || target.isContentEditable;

const key = event.key.toLowerCase();
const ctrl = event.ctrlKey;
Expand Down