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

Use a handler instead of an action for clicks

Browse source 
This prevents dispatching actions on buttons that were not the target of the click.

Co-Authored-By: Marshall <marshall@zed.dev>
This commit is contained in:
Antonio Scandurra 2023-12-06 19:12:01 +01:00
parent e4884f1d76
commit cc9eff89f5
5 changed files with 48 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

50
crates/search2/src/buffer_search.rs
View file

@ -18,7 +18,7 @@ use project::search::SearchQuery;
use serde::Deserialize;
use std::{any::Any, sync::Arc};
use ui::{h_stack, Icon, IconButton, IconElement};
use ui::{h_stack, Clickable, Icon, IconButton, IconElement};
use util::ResultExt;
use workspace::{
item::ItemHandle,
@ -161,16 +161,6 @@ impl Render for BufferSearchBar {
Some(ui::Label::new(message))
});
let nav_button_for_direction = |icon, direction| {
render_nav_button(
icon,
self.active_match_index.is_some(),
cx.listener(move |this, _, cx| match direction {
Direction::Prev => this.select_prev_match(&Default::default(), cx),
Direction::Next => this.select_next_match(&Default::default(), cx),
}),
)
};
let should_show_replace_input = self.replace_enabled && supported_options.replacement;
let replace_all = should_show_replace_input
.then(|| super::render_replace_button(ReplaceAll, ui::Icon::ReplaceAll));
@ -237,15 +227,21 @@ impl Render for BufferSearchBar {
h_stack()
.gap_0p5()
.flex_none()
.child(self.render_action_button())
.child(self.render_action_button(cx))
.children(match_count)
.child(nav_button_for_direction(
.child(render_nav_button(
ui::Icon::ChevronLeft,
Direction::Prev,
self.active_match_index.is_some(),
cx.listener(move |this, _, cx| {
this.select_prev_match(&Default::default(), cx);
}),
))
.child(nav_button_for_direction(
.child(render_nav_button(
ui::Icon::ChevronRight,
Direction::Next,
self.active_match_index.is_some(),
cx.listener(move |this, _, cx| {
this.select_next_match(&Default::default(), cx);
}),
)),
)
}
@ -317,13 +313,7 @@ impl BufferSearchBar {
pane.update(cx, |this, cx| {
this.toolbar().update(cx, |this, cx| {
if let Some(search_bar) = this.item_of_type::<BufferSearchBar>() {
search_bar.update(cx, |this, cx| {
if this.is_dismissed() {
this.show(cx);
} else {
this.dismiss(&Dismiss, cx);
}
});
search_bar.update(cx, |this, cx| this.toggle(cx));
return;
}
let view = cx.build_view(|cx| BufferSearchBar::new(cx));
@ -487,6 +477,14 @@ impl BufferSearchBar {
false
}
pub fn toggle(&mut self, cx: &mut ViewContext<Self>) {
if self.is_dismissed() {
self.show(cx);
} else {
self.dismiss(&Dismiss, cx);
}
}
pub fn show(&mut self, cx: &mut ViewContext<Self>) -> bool {
if self.active_searchable_item.is_none() {
return false;
@ -588,12 +586,14 @@ impl BufferSearchBar {
self.update_matches(cx)
}
fn render_action_button(&self) -> impl IntoElement {
fn render_action_button(&self, cx: &mut ViewContext<Self>) -> impl IntoElement {
// let tooltip_style = theme.tooltip.clone();
// let style = theme.search.action_button.clone();
IconButton::new(0, ui::Icon::SelectAll).action(Box::new(SelectAllMatches))
IconButton::new("select-all", ui::Icon::SelectAll).on_click(cx.listener(|this, _, cx| {
this.select_all_matches(&SelectAllMatches, cx);
}))
}
pub fn activate_search_mode(&mut self, mode: SearchMode, cx: &mut ViewContext<Self>) {