Skip to content

fix(desktop): keep settings shortcut from opening search#1204

Merged
wesbillman merged 1 commit into
mainfrom
pinky/settings-search-dialog
Jun 23, 2026
Merged

fix(desktop): keep settings shortcut from opening search#1204
wesbillman merged 1 commit into
mainfrom
pinky/settings-search-dialog

Conversation

@wesbillman

Copy link
Copy Markdown
Collaborator

Summary

  • consume the Cmd+, settings shortcut during the capture phase so the global search shortcut cannot also handle the same keydown
  • add e2e coverage for opening settings with Cmd+, using Back to app, and confirming the search dialog remains closed

Why

Opening settings navigates away from the normal app shell. Without stopping propagation, other global shortcut listeners can still observe the same keydown during the route transition, which leaves the app with the search dialog open after returning from settings.

Validation

  • bin/pnpm --dir desktop exec biome check src/app/useSettingsShortcuts.ts tests/e2e/navigation.spec.ts
  • bin/pnpm --dir desktop typecheck
  • bin/pnpm --dir desktop build
  • bin/pnpm --dir desktop exec playwright test tests/e2e/navigation.spec.ts --project=smoke --grep "settings shortcut returns without opening search dialog"
  • pre-commit hook via Hermit (desktop-fix, desktop-tauri-fmt, rust-fmt, mobile-fix, web-fix)
  • pre-push hook via Hermit (desktop-test, desktop-tauri-test, mobile-test, rust-tests)

Co-authored-by: Wes <wesbillman@users.noreply.github.com>
Co-authored-by: Pinky <44b8e82baa6e0e254e0208d68f335c283c94e7b78dd1fa10d5a49d3f13dd0435@sprout-oss.stage.blox.sqprod.co>
Signed-off-by: Wes <wesbillman@users.noreply.github.com>
@wesbillman wesbillman merged commit 89ff950 into main Jun 23, 2026
25 checks passed
@wesbillman wesbillman deleted the pinky/settings-search-dialog branch June 23, 2026 21:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant