Skip to content

git_graph: Fix search bar Vim key handling (#55510) (cherry-pick to preview) #55511

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
zed-zippy merged 1 commit into from
May 3, 2026
Merged

git_graph: Fix search bar Vim key handling (#55510) (cherry-pick to preview) #55511

Show file tree
Hide file tree
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
14 changes: 14 additions & 0 deletions assets/keymaps/default-linux.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1534,4 +1534,18 @@
"ctrl-shift-backspace": "worktree_picker::DeleteWorktree",
},
},
{
"context": "GitGraph",
"bindings": {
"tab": "git_graph::FocusNextTabStop",
"shift-tab": "git_graph::FocusPreviousTabStop",
},
},
{
"context": "GitGraphSearchBar > Editor",
"bindings": {
"tab": "git_graph::FocusNextTabStop",
"shift-tab": "git_graph::FocusPreviousTabStop",
},
},
]
14 changes: 14 additions & 0 deletions assets/keymaps/default-macos.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1626,4 +1626,18 @@
"escape": "notebook::EnterCommandMode",
},
},
{
"context": "GitGraph",
"bindings": {
"tab": "git_graph::FocusNextTabStop",
"shift-tab": "git_graph::FocusPreviousTabStop",
},
},
{
"context": "GitGraphSearchBar > Editor",
"bindings": {
"tab": "git_graph::FocusNextTabStop",
"shift-tab": "git_graph::FocusPreviousTabStop",
},
},
]
14 changes: 14 additions & 0 deletions assets/keymaps/default-windows.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1551,4 +1551,18 @@
"escape": "notebook::EnterCommandMode",
},
},
{
"context": "GitGraph",
"bindings": {
"tab": "git_graph::FocusNextTabStop",
"shift-tab": "git_graph::FocusPreviousTabStop",
},
},
{
"context": "GitGraphSearchBar > Editor",
"bindings": {
"tab": "git_graph::FocusNextTabStop",
"shift-tab": "git_graph::FocusPreviousTabStop",
},
},
]
14 changes: 14 additions & 0 deletions assets/keymaps/vim.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1035,6 +1035,20 @@
},
{
"context": "GitGraph",
"bindings": {
"tab": "git_graph::FocusNextTabStop",
"shift-tab": "git_graph::FocusPreviousTabStop",
},
},
{
"context": "GitGraphSearchBar > Editor",
"bindings": {
"tab": "git_graph::FocusNextTabStop",
"shift-tab": "git_graph::FocusPreviousTabStop",
},
},
{
"context": "GitGraph && !GitGraphSearchBar",
"bindings": {
"j": "vim::MenuSelectNext",
"k": "vim::MenuSelectPrevious",
Expand Down
4 changes: 4 additions & 0 deletions crates/editor/src/editor.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3526,6 +3526,10 @@ impl Editor {
cx.notify();
}

pub fn show_cursor(&mut self, cx: &mut Context<Self>) {
self.blink_manager.update(cx, BlinkManager::show_cursor);
}

pub fn cursor_shape(&self) -> CursorShape {
self.cursor_shape
}
Expand Down
68 changes: 65 additions & 3 deletions crates/git_graph/src/git_graph.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,6 +282,10 @@ actions!(
OpenCommitView,
/// Focuses the search field.
FocusSearch,
/// Focuses the next git graph tab stop.
FocusNextTabStop,
/// Focuses the previous git graph tab stop.
FocusPreviousTabStop,
]
);

Expand Down Expand Up @@ -1105,7 +1109,11 @@ impl GitGraph {
editor
});

let table_interaction_state = cx.new(|cx| TableInteractionState::new(cx));
let table_interaction_state = cx.new(|cx| {
let mut state = TableInteractionState::new(cx);
state.focus_handle = state.focus_handle.tab_index(1).tab_stop(true);
state
});

let column_widths = if matches!(log_source, LogSource::File(_)) {
cx.new(|_cx| {
Expand Down Expand Up @@ -1597,6 +1605,39 @@ impl GitGraph {
self.search(query, cx);
}

fn activate_search_editor_if_focused(&self, window: &mut Window, cx: &mut Context<Self>) {
self.search_state.editor.update(cx, |editor, cx| {
if editor.is_focused(window) {
editor.select_all(&Default::default(), window, cx);
editor.show_cursor(cx);
}
});
}

fn focus_next_tab_stop(
&mut self,
_: &FocusNextTabStop,
window: &mut Window,
cx: &mut Context<Self>,
) {
window.focus_next(cx);
self.activate_search_editor_if_focused(window, cx);
cx.stop_propagation();
cx.notify();
}

fn focus_previous_tab_stop(
&mut self,
_: &FocusPreviousTabStop,
window: &mut Window,
cx: &mut Context<Self>,
) {
window.focus_prev(cx);
self.activate_search_editor_if_focused(window, cx);
cx.stop_propagation();
cx.notify();
}

fn select_entry(
&mut self,
idx: usize,
Expand Down Expand Up @@ -1778,7 +1819,12 @@ impl GitGraph {

fn render_search_bar(&self, cx: &mut Context<Self>) -> impl IntoElement {
let color = cx.theme().colors();
let query_focus_handle = self.search_state.editor.focus_handle(cx);
let query_focus_handle = self
.search_state
.editor
.focus_handle(cx)
.tab_index(1)
.tab_stop(true);
let search_options = {
let mut options = SearchOptions::NONE;
options.set(
Expand All @@ -1789,6 +1835,10 @@ impl GitGraph {
};

h_flex()
.key_context("GitGraphSearchBar")
.tab_index(1)
.tab_group()
.tab_stop(false)
.w_full()
.p_1p5()
.gap_1p5()
Expand All @@ -1801,6 +1851,7 @@ impl GitGraph {
.min_w_0()
.px_1p5()
.gap_1()
.track_focus(&query_focus_handle)
.border_1()
.border_color(color.border_variant)
.rounded_md()
Expand Down Expand Up @@ -2806,6 +2857,8 @@ impl Render for GitGraph {
let hovered_entry_idx = self.hovered_entry_idx;
let weak_self = cx.weak_entity();
let focus_handle = self.focus_handle.clone();
let table_focus_handle =
self.table_interaction_state.read(cx).focus_handle.clone();

let graph_canvas = div()
.id("graph-canvas")
Expand Down Expand Up @@ -2834,7 +2887,9 @@ impl Render for GitGraph {
.map_row(move |(index, row), window, cx| {
let is_selected = selected_entry_idx == Some(index);
let is_hovered = hovered_entry_idx == Some(index);
let is_focused = focus_handle.is_focused(window);
let table_focus_handle = table_focus_handle.clone();
let is_focused = focus_handle.is_focused(window)
|| table_focus_handle.is_focused(window);
let weak = weak_self.clone();
let weak_for_hover = weak.clone();

Expand Down Expand Up @@ -2866,6 +2921,7 @@ impl Render for GitGraph {
})
.on_click(move |event, window, cx| {
let click_count = event.click_count();
table_focus_handle.focus(window, cx);
weak.update(cx, |this, cx| {
this.select_entry(
index,
Expand Down Expand Up @@ -2907,6 +2963,9 @@ impl Render for GitGraph {
})
.child(
div()
.tab_index(2)
.tab_group()
.tab_stop(false)
.w(DefiniteLength::Fraction(table_fraction))
.h_full()
.min_w_0()
Expand Down Expand Up @@ -2951,12 +3010,15 @@ impl Render for GitGraph {
this.search_state
.editor
.update(cx, |editor, cx| editor.focus_handle(cx).focus(window, cx));
this.activate_search_editor_if_focused(window, cx);
}))
.on_action(cx.listener(Self::select_first))
.on_action(cx.listener(Self::select_prev))
.on_action(cx.listener(Self::select_next))
.on_action(cx.listener(Self::select_last))
.on_action(cx.listener(Self::confirm))
.on_action(cx.listener(Self::focus_next_tab_stop))
.on_action(cx.listener(Self::focus_previous_tab_stop))
.on_action(cx.listener(|this, _: &SelectNextMatch, _window, cx| {
this.select_next_match(cx);
}))
Expand Down
Loading