From 2b3d9deabe66e601e8b984a07188ade678e2689d Mon Sep 17 00:00:00 2001
From: Piotr Osiewicz <24362066+osiewicz@users.noreply.github.com>
Date: Fri, 15 Dec 2023 12:07:25 +0100
Subject: [PATCH] Dismiss Recent Projects & VCS modals on ESC (#3671)

Release Notes:

- N/A
---
 crates/recent_projects2/src/recent_projects.rs | 5 ++++-
 crates/vcs_menu2/src/lib.rs                    | 9 +++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/crates/recent_projects2/src/recent_projects.rs b/crates/recent_projects2/src/recent_projects.rs
index dff6aa12ccc30f43766451d244619159c2a7c8bb..3ecf1180af535ea23190bd41ad2c8dd0e329810d 100644
--- a/crates/recent_projects2/src/recent_projects.rs
+++ b/crates/recent_projects2/src/recent_projects.rs
@@ -76,7 +76,10 @@ impl RecentProjects {
                         let delegate =
                             RecentProjectsDelegate::new(weak_workspace, workspace_locations, true);
 
-                        RecentProjects::new(delegate, cx)
+                        let modal = RecentProjects::new(delegate, cx);
+                        cx.subscribe(&modal.picker, |_, _, _, cx| cx.emit(DismissEvent))
+                            .detach();
+                        modal
                     });
                 } else {
                     workspace.show_notification(0, cx, |cx| {
diff --git a/crates/vcs_menu2/src/lib.rs b/crates/vcs_menu2/src/lib.rs
index e867e04dcdb96229eb7513f891d60cc31ce1ec26..ca3b685aa60ad93f63cc2ba203fa52a184ff564b 100644
--- a/crates/vcs_menu2/src/lib.rs
+++ b/crates/vcs_menu2/src/lib.rs
@@ -65,8 +65,13 @@ impl ModalBranchList {
     ) -> Result<()> {
         // Modal branch picker has a longer trailoff than a popover one.
         let delegate = BranchListDelegate::new(workspace, cx.view().clone(), 70, cx)?;
-        workspace.toggle_modal(cx, |cx| ModalBranchList {
-            picker: cx.build_view(|cx| Picker::new(delegate, cx)),
+        workspace.toggle_modal(cx, |cx| {
+            let modal = ModalBranchList {
+                picker: cx.build_view(|cx| Picker::new(delegate, cx)),
+            };
+            cx.subscribe(&modal.picker, |_, _, _, cx| cx.emit(DismissEvent))
+                .detach();
+            modal
         });
 
         Ok(())