Skip to content

fix: prevent shortcut editor from creating override when unchanged #282

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
antfu merged 1 commit into from
Apr 8, 2026
Merged

fix: prevent shortcut editor from creating override when unchanged #282

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
28 changes: 25 additions & 3 deletions packages/core/src/client/webcomponents/components/views-builtin/SettingsShortcuts.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,18 @@ function isOverridden(id: string): boolean {
return shortcutOverrides.value[id] !== undefined
}

function getDefaultKey(id: string): string | undefined {
for (const cmd of commandsCtx.commands) {
if (cmd.id === id)
return cmd.keybindings?.[0]?.key
if (cmd.children) {
const child = cmd.children.find(c => c.id === id)
if (child)
return child.keybindings?.[0]?.key
}
}
}

function clearShortcut(commandId: string) {
commandsCtx.settings.mutate((state) => {
state.commandShortcuts[commandId] = []
Expand Down Expand Up @@ -187,9 +199,19 @@ function onEditorKeyDown(e: KeyboardEvent) {
function saveEditor() {
if (!editorCommandId.value || !editorCanSave.value)
return
commandsCtx.settings.mutate((state) => {
state.commandShortcuts[editorCommandId.value!] = [{ key: editorComposedKey.value }]
})
const defaultKey = getDefaultKey(editorCommandId.value)
if (editorComposedKey.value === defaultKey) {
if (isOverridden(editorCommandId.value)) {
commandsCtx.settings.mutate((state) => {
delete state.commandShortcuts[editorCommandId.value!]
})
}
}
else {
commandsCtx.settings.mutate((state) => {
state.commandShortcuts[editorCommandId.value!] = [{ key: editorComposedKey.value }]
})
}
closeEditor()
}

Expand Down
Loading