Repository navigation
fix: restrict Esc shortcut to editor context to fix dialog dismissal - #484
Merged
Merged
Conversation
Update global Esc shortcut to only apply within MarkdownEditor context. This prevents it from overriding local cancel actions in dialogs and lists. Add test to verify Esc closes the quick open dialog.
feigeCode
added a commit
that referenced
this pull request
Oct 31, 2026
冲突解决：main/src/home/home_tabs.rs 保留三产品拆分布局，快捷键复制改走 TabContainer::duplicate_active_tab（等价 #483：与标签菜单共用复制路径，终端保留当前工作目录， 并对任何可复制标签生效），复制出的终端标签在 main/src/home_tab/lifecycle.rs 补回 OpenSftp / SaveAsConnection 订阅；随之删除不再被使用的 ShellExtras::duplicate_terminal_tab 契约。 origin/main 上的 #482 / #483 / #484 其余改动（标签收缩、Esc 只在编辑器上下文生效、 terminal 测试隔离）均无冲突合入。 顺带修 main/src/home/home_tabs.rs 里 notify_unsupported 的属性与文档注释空行（clippy 告警）。
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.
Description
When the Esc key was bound globally, the
Dismiss Transient UIshortcut had the highest priority in gpui and always won over the localCancelactions of dialogs and lists. As a result, pressing Esc in the quick open dialog dismissed the editor's transient UI instead of closing the dialog itself.This PR restricts the Esc shortcut to the
MarkdownEditorkey context only. It introduces a dedicatedEDITOR_CONTEXT("MarkdownEditor") that is set on the editor's root element and used by the shortcut definition, so the binding no longer intercepts key events outside the editor. A regression test was added to verify that Esc closes the quick open dialog.How to Test
Run the story tests for the affected crates:
Specifically, verify the new regression test
escape_closes_quick_open_dialoginmain/src/home/home_connection_quick_open.rs:cargo test -p navop escape_closes_quick_open_dialogManual check:
Checklist
cargo runfor story tests related to the changes.