From 3f224274da77afb77841c4ad1a2b5b3c44fb8ea8 Mon Sep 17 00:00:00 2001
From: Kirill Bulatov <kirill@zed.dev>
Date: Wed, 13 Nov 2024 12:45:30 +0100
Subject: [PATCH] Restore the ability to navigate into project search input
 with the keyboard (#20579)

---
 crates/search/src/buffer_search.rs  | 1 +
 crates/search/src/project_search.rs | 9 ++++++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/crates/search/src/buffer_search.rs b/crates/search/src/buffer_search.rs
index fd7bcbdcd0a0e1799dda3c020187f62372d1d07b..41e5ba28df7adb7263ff4fd7d6d60e6155bffcc7 100644
--- a/crates/search/src/buffer_search.rs
+++ b/crates/search/src/buffer_search.rs
@@ -657,6 +657,7 @@ impl BufferSearchBar {
             return true;
         }
 
+        cx.propagate();
         false
     }
 
diff --git a/crates/search/src/project_search.rs b/crates/search/src/project_search.rs
index d4b44a1611c1a31b487c94a261e5d706de197f0d..1f4492d992b027c2a8fd5d1fb4b078d6611db85f 100644
--- a/crates/search/src/project_search.rs
+++ b/crates/search/src/project_search.rs
@@ -1,7 +1,7 @@
 use crate::{
-    BufferSearchBar, FocusSearch, NextHistoryQuery, PreviousHistoryQuery, ReplaceAll, ReplaceNext,
-    SearchOptions, SelectNextMatch, SelectPrevMatch, ToggleCaseSensitive, ToggleIncludeIgnored,
-    ToggleRegex, ToggleReplace, ToggleWholeWord,
+    buffer_search::Deploy, BufferSearchBar, FocusSearch, NextHistoryQuery, PreviousHistoryQuery,
+    ReplaceAll, ReplaceNext, SearchOptions, SelectNextMatch, SelectPrevMatch, ToggleCaseSensitive,
+    ToggleIncludeIgnored, ToggleRegex, ToggleReplace, ToggleWholeWord,
 };
 use collections::{HashMap, HashSet};
 use editor::{
@@ -58,6 +58,9 @@ impl Global for ActiveSettings {}
 pub fn init(cx: &mut AppContext) {
     cx.set_global(ActiveSettings::default());
     cx.observe_new_views(|workspace: &mut Workspace, _cx| {
+        register_workspace_action(workspace, move |search_bar, _: &Deploy, cx| {
+            search_bar.focus_search(cx);
+        });
         register_workspace_action(workspace, move |search_bar, _: &FocusSearch, cx| {
             search_bar.focus_search(cx);
         });