Skip to content

fix(core): keep transient-context commands listed in shortcut settings #524

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

Open
SaKaNa-Y wants to merge 1 commit into
base: main
Choose a base branch
from
+11 −4
Open

fix(core): keep transient-context commands listed in shortcut settings #524

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
15 changes: 11 additions & 4 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 @@ -22,10 +22,17 @@ interface ShortcutRow {
indent: boolean
}

// Only offer to bind commands that are actually reachable right now — binding a
// key to something the current context rules out (e.g. the dock-mode commands
// while the dock is detached into a popup) would silently do nothing.
const availableCommands = computed(() => filterCommandsByWhen(commandsCtx.commands, props.context.when.context))
// This page is only reachable with the dock open and the palette closed, so `when`
// is evaluated against that context rather than the live one. `dockOpen`/`paletteOpen`
// are transient dispatch state — `close-panel`'s `!paletteOpen` exists to hand Escape
// to the palette, not to say the command is unbindable — so filtering by them would
// drop permanently bindable rows the moment Ctrl+K is pressed. `popupOpen` and
// `clientType` stay live: those describe whether a command can exist at all, which is
// why the dock-mode commands still vanish while the dock is detached into a popup.
const availableCommands = computed(() => filterCommandsByWhen(
commandsCtx.commands,
{ ...props.context.when.context, dockOpen: true, paletteOpen: false },
))

const shortcutRows = computed<ShortcutRow[]>(() => {
const rows: ShortcutRow[] = []
Expand Down
Loading