Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Ensure pane where search buttons are clicked is focused before dispatching action (#24037)

Browse source 
Closes #23906

Note: Changes the focused pane when search UI is interacted with on an
unfocused pane rather than leaving the focused pane unchanged as
focusing on click is more likely to be the expected behavior

Release Notes:

- Fixes an issue with search actions so that they now execute on the
clicked pane rather than the focused pane when using search UI in
multiple panes
This commit is contained in:
Ben Kunkle 2025-01-31 13:03:11 -06:00 • committed by GitHub
parent 990bdde5e8
commit 027fe1b4b5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

10
crates/search/src/search_bar.rs
View file

@ -14,7 +14,15 @@ pub(super) fn render_nav_button(
icon,
)
.shape(IconButtonShape::Square)
.on_click(|_, window, cx| window.dispatch_action(action.boxed_clone(), cx))
.on_click({
let focus_handle = focus_handle.clone();
move |_, window, cx| {
if !focus_handle.is_focused(&window) {
window.focus(&focus_handle);
}
window.dispatch_action(action.boxed_clone(), cx)
}
})
.tooltip(move |window, cx| Tooltip::for_action_in(tooltip, action, &focus_handle, window, cx))
.disabled(!active)
}