Skip to content

Added support for dismissing the toolchain path selector via esc #48201

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
JosephTLyons merged 1 commit into from
Feb 2, 2026
Merged

Added support for dismissing the toolchain path selector via esc #48201

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
39 changes: 26 additions & 13 deletions crates/toolchain_selector/src/toolchain_selector.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,10 +119,20 @@ impl AddToolchainState {
picker
});

let weak_toolchain_selector = weak.clone();
let window_handle = window.window_handle();
Self {
state: AddState::Path {
_subscription: cx.subscribe(&picker, |_, _, _: &DismissEvent, cx| {
cx.stop_propagation();
_subscription: cx.subscribe(&picker, move |_, _, _: &DismissEvent, cx| {
if let Some(toolchain_selector) = weak_toolchain_selector.upgrade() {
window_handle
.update(cx, |_, window, cx| {
toolchain_selector.update(cx, |this, cx| {
this.cancel(&menu::Cancel, window, cx);
});
})
.ok();
}
}),
picker,
error: None,
Expand Down Expand Up @@ -384,7 +394,6 @@ impl Focusable for State {
impl Render for AddToolchainState {
fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
let theme = cx.theme().clone();
let weak = self.weak.upgrade();
let label = SharedString::new_static("Add");

v_flex()
Expand All @@ -395,16 +404,6 @@ impl Render for AddToolchainState {
.border_1()
.border_color(cx.theme().colors().border_variant)
.rounded_lg()
.when_some(weak, |this, weak| {
this.on_action(window.listener_for(
&weak,
|this: &mut ToolchainSelector, _: &menu::Cancel, window, cx| {
this.state = State::Search((this.create_search_state)(window, cx));
this.state.focus_handle(cx).focus(window, cx);
cx.notify();
},
))
})
.on_action(cx.listener(Self::confirm_toolchain))
.map(|this| match &self.state {
AddState::Path { picker, .. } => this.child(picker.clone()),
Expand Down Expand Up @@ -727,6 +726,19 @@ impl ToolchainSelector {
cx.notify();
}
}

fn cancel(&mut self, _: &menu::Cancel, window: &mut Window, cx: &mut Context<Self>) {
match &self.state {
State::Search(_) => {
cx.emit(DismissEvent);
}
State::AddToolchain(_) => {
self.state = State::Search((self.create_search_state)(window, cx));
self.state.focus_handle(cx).focus(window, cx);
cx.notify();
}
}
}
}

impl Render for ToolchainSelector {
Expand All @@ -737,6 +749,7 @@ impl Render for ToolchainSelector {
v_flex()
.key_context(key_context)
.w(rems(34.))
.on_action(cx.listener(Self::cancel))
.on_action(cx.listener(Self::handle_add_toolchain))
.child(self.state.clone().render(window, cx))
}
Expand Down