ros/automaker
1
0
Fork 0
mirror of https://github.com/AutoMaker-Org/automaker.git synced 2026-02-02 20:43:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #225 from illia1f/fix/project-picker-dropdown

Browse Source 
fix: project picker dropdown highlights first item instead of current project
This commit is contained in:
Web Dev Cody
2025-12-22 21:22:35 -05:00
committed by GitHub
parent 7618a75d85 50a595a8da
commit 870df88cd1
2 changed files with 23 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
apps/ui/src/components/layout/sidebar/components/project-selector-with-options.tsx
View File

@@ -69,6 +69,7 @@ export function ProjectSelectorWithOptions({
filteredProjects,
} = useProjectPicker({
projects,
currentProject,
isProjectPickerOpen,
setIsProjectPickerOpen,
setCurrentProject,

32
apps/ui/src/components/layout/sidebar/hooks/use-project-picker.ts
View File

@@ -3,6 +3,7 @@ import type { Project } from '@/lib/electron';
interface UseProjectPickerProps {
projects: Project[];
currentProject: Project | null;
isProjectPickerOpen: boolean;
setIsProjectPickerOpen: (value: boolean | ((prev: boolean) => boolean)) => void;
setCurrentProject: (project: Project) => void;
@@ -10,6 +11,7 @@ interface UseProjectPickerProps {
export function useProjectPicker({
projects,
currentProject,
isProjectPickerOpen,
setIsProjectPickerOpen,
setCurrentProject,
@@ -27,22 +29,32 @@ export function useProjectPicker({
return projects.filter((project) => project.name.toLowerCase().includes(query));
}, [projects, projectSearchQuery]);
// Reset selection when filtered results change
// Reset selection when filtered results change and project picker is open
useEffect(() => {
setSelectedProjectIndex(0);
}, [filteredProjects.length, projectSearchQuery]);
if (!isProjectPickerOpen) {
return;
}
// Reset search query when dropdown closes
if (!projectSearchQuery.trim()) {
const currentIndex = currentProject
? filteredProjects.findIndex((p) => p.id === currentProject.id)
: -1;
if (currentIndex !== -1) {
setSelectedProjectIndex(currentIndex);
return;
}
}
setSelectedProjectIndex(0);
}, [isProjectPickerOpen, filteredProjects.length, projectSearchQuery, currentProject]);
// Reset search query when dropdown closes, set to current project index when it opens
useEffect(() => {
if (!isProjectPickerOpen) {
setProjectSearchQuery('');
setSelectedProjectIndex(0);
}
}, [isProjectPickerOpen]);
// Focus the search input when dropdown opens
useEffect(() => {
if (isProjectPickerOpen) {
} else {
// Focus the search input when dropdown opens
// Small delay to ensure the dropdown is rendered
setTimeout(() => {
projectSearchInputRef.current?.focus();