Repository navigation
fix(shortcuts): reject conflicting individual resets - #808
Merged
Merged
Conversation
Check the effective binding before saving any individual shortcut change. Restoring a default must preserve both mappings when another action uses it. Cover disable, reassign, reset, recovery and global reset with the mounted production component, and clarify the existing conflict-safe contract.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Disable New task, assign Cmd+N to Search, then restore New task's default: both actions end up on Cmd+N, which opens New task instead of Search.
Individual resets now use the existing conflict check. An occupied default shows an inline error and leaves both mappings unchanged. Ordinary resets and Restore defaults still work.
shortcut-reset-before-after-english-hd.mp4
Validated with a failing-before/passing-after component regression and real desktop interaction. The settings spec and E2E-072 are updated in both languages.
Validation details
d432ef47d90c9603aee44349a4a05e87a02bf57e; base:4413e25cb2d9620a570e042d5353960aff9ab696.pnpm test:e2e:shortcut-settings: mounted production component, macOS/Windows/Linux binding rules on macOS; disable, reassign, conflicting reset, recovery, and global reset.pnpm build:js, desktop typecheck,pnpm lint,pnpm docs:check, andpnpm check:pr-basepassed.