mirror of
https://github.com/AutoMaker-Org/automaker.git
synced 2026-02-03 08:53:36 +00:00
fix: ensure current project is highlighted in project picker dropdown without side effects
This commit is contained in:
@@ -29,8 +29,19 @@ export function useProjectPicker({
|
|||||||
return projects.filter((project) => project.name.toLowerCase().includes(query));
|
return projects.filter((project) => project.name.toLowerCase().includes(query));
|
||||||
}, [projects, projectSearchQuery]);
|
}, [projects, projectSearchQuery]);
|
||||||
|
|
||||||
|
const getCurrentProjectIndex = useCallback(() => {
|
||||||
|
return currentProject ? filteredProjects.findIndex((p) => p.id === currentProject.id) : -1;
|
||||||
|
}, [currentProject, filteredProjects]);
|
||||||
|
|
||||||
// Reset selection when filtered results change
|
// Reset selection when filtered results change
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
|
if (!projectSearchQuery.trim()) {
|
||||||
|
const currentIndex = getCurrentProjectIndex();
|
||||||
|
if (currentIndex !== -1) {
|
||||||
|
setSelectedProjectIndex(currentIndex);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
setSelectedProjectIndex(0);
|
setSelectedProjectIndex(0);
|
||||||
}, [filteredProjects.length, projectSearchQuery]);
|
}, [filteredProjects.length, projectSearchQuery]);
|
||||||
|
|
||||||
@@ -39,13 +50,13 @@ export function useProjectPicker({
|
|||||||
if (!isProjectPickerOpen) {
|
if (!isProjectPickerOpen) {
|
||||||
setProjectSearchQuery('');
|
setProjectSearchQuery('');
|
||||||
setSelectedProjectIndex(0);
|
setSelectedProjectIndex(0);
|
||||||
} else if (currentProject) {
|
} else {
|
||||||
const currentIndex = filteredProjects.findIndex((p) => p.id === currentProject.id);
|
const currentIndex = getCurrentProjectIndex();
|
||||||
if (currentIndex !== -1) {
|
if (currentIndex !== -1) {
|
||||||
setSelectedProjectIndex(currentIndex);
|
setSelectedProjectIndex(currentIndex);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}, [isProjectPickerOpen, currentProject, filteredProjects]);
|
}, [isProjectPickerOpen, currentProject]);
|
||||||
|
|
||||||
// Focus the search input when dropdown opens
|
// Focus the search input when dropdown opens
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
|
|||||||
Reference in New Issue
Block a user