feat: implement hotkey conflict detection and display warnings by toast notification on startup#9700
Open
ZxBing0066 wants to merge 3 commits intodevelopfrom
Open
feat: implement hotkey conflict detection and display warnings by toast notification on startup#9700ZxBing0066 wants to merge 3 commits intodevelopfrom
ZxBing0066 wants to merge 3 commits intodevelopfrom
Conversation
✅ Circular References ReportGenerated at: 2026-03-06T06:43:39.567Z Summary
Click to view all circular references in PR (76)Click to view all circular references in base branch (76)Analysis✅ No Change: This PR does not introduce or remove any circular references. This report was generated automatically by comparing against the |
Contributor
There was a problem hiding this comment.
Pull request overview
This PR implements three related improvements: hotkey conflict detection displayed via toast notification on app startup, removal of the unused sidebar_focusFilter shortcut, and support for line breaks in toast notifications.
Changes:
- Added
detectHotKeyConflictsfunction inhotkeys.tsthat detects when multiple shortcuts share the same key combination on the current platform, and wired it into the app startup flow inroot.tsxusingoncefromes-toolkitto run the detection exactly once per app session - Removed
sidebar_focusFilterfrom theKeyboardShortcuttype,keyboardShortcutDescriptions, anddefaultRegistry(confirmed no remaining usages) - Added
whitespace-pre-lineTailwind class to the toast description element to support\nline breaks in toast strings
Reviewed changes
Copilot reviewed 4 out of 4 changed files in this pull request and generated 3 comments.
| File | Description |
|---|---|
packages/insomnia/src/common/hotkeys.ts |
Adds serializeKeyCombination, flattenPlatformKeyCombinations, detectHotKeyConflicts, and HotKeyConflict interface; removes sidebar_focusFilter entries |
packages/insomnia/src/common/settings.ts |
Removes sidebar_focusFilter from KeyboardShortcut union type |
packages/insomnia/src/root.tsx |
Wires conflict detection with once on startup; imports es-toolkit/function |
packages/insomnia/src/ui/components/toast-notification.tsx |
Adds whitespace-pre-line class to support multiline toast descriptions |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
CurryYangxx
reviewed
Mar 12, 2026
CurryYangxx
reviewed
Mar 12, 2026
CurryYangxx
approved these changes
Mar 12, 2026
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
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.
Background
INS-2184
Changes
\nUI