From d05e8852d300d54505cac0383759e0422f3a67e0 Mon Sep 17 00:00:00 2001
From: Mikayla <mikayla@zed.dev>
Date: Tue, 15 Aug 2023 11:02:18 -0700
Subject: [PATCH] Add dismiss on escape

---
 crates/collab_ui/src/collab_panel/channel_modal.rs  | 5 +++++
 crates/collab_ui/src/collab_panel/contact_finder.rs | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/crates/collab_ui/src/collab_panel/channel_modal.rs b/crates/collab_ui/src/collab_panel/channel_modal.rs
index 48d3a7a0ec11b05024e39271500c1467b92a256c..3e4f274f234494e47660d9b7b51aadb6b7f6a4ca 100644
--- a/crates/collab_ui/src/collab_panel/channel_modal.rs
+++ b/crates/collab_ui/src/collab_panel/channel_modal.rs
@@ -27,6 +27,7 @@ pub fn init(cx: &mut AppContext) {
     cx.add_action(ChannelModal::toggle_mode);
     cx.add_action(ChannelModal::toggle_member_admin);
     cx.add_action(ChannelModal::remove_member);
+    cx.add_action(ChannelModal::dismiss);
 }
 
 pub struct ChannelModal {
@@ -131,6 +132,10 @@ impl ChannelModal {
             picker.delegate_mut().remove_selected_member(cx);
         });
     }
+
+    fn dismiss(&mut self, _: &menu::Cancel, cx: &mut ViewContext<Self>) {
+        cx.emit(PickerEvent::Dismiss);
+    }
 }
 
 impl Entity for ChannelModal {
diff --git a/crates/collab_ui/src/collab_panel/contact_finder.rs b/crates/collab_ui/src/collab_panel/contact_finder.rs
index 4cc7034f49a46607bd28a3d4eff5b75503625d36..539e041ae728ca2770076d1e8849af96a44fefe3 100644
--- a/crates/collab_ui/src/collab_panel/contact_finder.rs
+++ b/crates/collab_ui/src/collab_panel/contact_finder.rs
@@ -9,6 +9,7 @@ use workspace::Modal;
 
 pub fn init(cx: &mut AppContext) {
     Picker::<ContactFinderDelegate>::init(cx);
+    cx.add_action(ContactFinder::dismiss)
 }
 
 pub struct ContactFinder {
@@ -43,6 +44,10 @@ impl ContactFinder {
             picker.set_query(query, cx);
         });
     }
+
+    fn dismiss(&mut self, _: &menu::Cancel, cx: &mut ViewContext<Self>) {
+        cx.emit(PickerEvent::Dismiss);
+    }
 }
 
 impl Entity for ContactFinder {