SemianiakaVY/openpencil
1
0
Fork 0
Code Issues Pull requests Actions 1 Packages Projects Releases Wiki Activity

fix(git): give branch-picker sub-mode Escape priority over input focus

Browse source 
A stale focused Git input (commit / remote / https) could intercept the
merge-mode Escape, because the sub-mode handler ran after the input
defocus handlers. Move the sub-mode Escape ahead of them so create/merge
always exits to the branch list on the first Escape.
This commit is contained in:
Kayshen-X 2026-05-31 21:05:30 +08:00
parent 2aebc714ae
commit ccf0278ee5
1 changed files with 16 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
crates/op-host-native/src/widget_host/keyboard.rs
View file

@ -729,6 +729,22 @@ impl WidgetHostNative {
self.mark_dirty();
return true;
}
// A branch-picker sub-mode (create / merge) takes Escape priority
// OVER the Git input fields: step it back to the branch list (the
// dropdown stays open). Driven off the mode, not input focus, so a
// stale commit / remote / https focus can't intercept it, and merge
// mode (which has no focused input) exits too.
if self.editor_state.editor_ui.git_panel.branch_picker_open
&& self.editor_state.editor_ui.git_panel.branch_picker_mode
!= op_editor_core::GitBranchPickerMode::List
{
let panel = &mut self.editor_state.editor_ui.git_panel;
panel.branch_picker_mode = op_editor_core::GitBranchPickerMode::List;
panel.branch_create_draft.clear();
panel.branch_create_focused = false;
self.mark_dirty();
return true;
}
// Escape defocuses the Git commit input (the panel stays open).
if self.git_commit_focus_active() {
self.editor_state.editor_ui.git_panel.commit_focused = false;
@ -747,20 +763,6 @@ impl WidgetHostNative {
self.mark_dirty();
return true;
}
// …and a branch-picker sub-mode (create / merge): Escape steps it
// back to the branch list (the dropdown stays open). Driven off the
// mode, not input focus, so merge mode (no focused input) exits too.
if self.editor_state.editor_ui.git_panel.branch_picker_open
&& self.editor_state.editor_ui.git_panel.branch_picker_mode
!= op_editor_core::GitBranchPickerMode::List
{
let panel = &mut self.editor_state.editor_ui.git_panel;
panel.branch_picker_mode = op_editor_core::GitBranchPickerMode::List;
panel.branch_create_draft.clear();
panel.branch_create_focused = false;
self.mark_dirty();
return true;
}
if self.editor_state.editor_ui.agent_settings_open {
self.editor_state.editor_ui.agent_settings_open = false;
self.editor_state.editor_ui.agent_settings_drag = None;