From 50a595a8dab733634bf0e491921e4fd8f422412d Mon Sep 17 00:00:00 2001
From: Illia Filippov <filippov.illia.ukr@gmail.com>
Date: Tue, 23 Dec 2025 02:30:28 +0100
Subject: [PATCH] fix(useProjectPicker): ensure project selection resets
 correctly when project picker is opened

---
 .../sidebar/hooks/use-project-picker.ts       | 22 ++++++++-----------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/apps/ui/src/components/layout/sidebar/hooks/use-project-picker.ts b/apps/ui/src/components/layout/sidebar/hooks/use-project-picker.ts
index c8cf0d23..341921c6 100644
--- a/apps/ui/src/components/layout/sidebar/hooks/use-project-picker.ts
+++ b/apps/ui/src/components/layout/sidebar/hooks/use-project-picker.ts
@@ -29,14 +29,16 @@ export function useProjectPicker({
     return projects.filter((project) => project.name.toLowerCase().includes(query));
   }, [projects, projectSearchQuery]);
 
-  const getCurrentProjectIndex = () => {
-    return currentProject ? filteredProjects.findIndex((p) => p.id === currentProject.id) : -1;
-  };
-
-  // Reset selection when filtered results change
+  // Reset selection when filtered results change and project picker is open
   useEffect(() => {
+    if (!isProjectPickerOpen) {
+      return;
+    }
+
     if (!projectSearchQuery.trim()) {
-      const currentIndex = getCurrentProjectIndex();
+      const currentIndex = currentProject
+        ? filteredProjects.findIndex((p) => p.id === currentProject.id)
+        : -1;
       if (currentIndex !== -1) {
         setSelectedProjectIndex(currentIndex);
         return;
@@ -44,7 +46,7 @@ export function useProjectPicker({
     }
 
     setSelectedProjectIndex(0);
-  }, [filteredProjects.length, projectSearchQuery, currentProject]);
+  }, [isProjectPickerOpen, filteredProjects.length, projectSearchQuery, currentProject]);
 
   // Reset search query when dropdown closes, set to current project index when it opens
   useEffect(() => {
@@ -52,12 +54,6 @@ export function useProjectPicker({
       setProjectSearchQuery('');
       setSelectedProjectIndex(0);
     } else {
-      // Set the selected project index to the current project index
-      const currentIndex = getCurrentProjectIndex();
-      if (currentIndex !== -1) {
-        setSelectedProjectIndex(currentIndex);
-      }
-
       // Focus the search input when dropdown opens
       // Small delay to ensure the dropdown is rendered
       setTimeout(() => {