mirror of
https://github.com/AutoMaker-Org/automaker.git
synced 2026-02-04 09:13:08 +00:00
refactor: simplify project index retrieval and selection logic in project picker
This commit is contained in:
@@ -29,9 +29,9 @@ 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(() => {
|
const getCurrentProjectIndex = () => {
|
||||||
return currentProject ? filteredProjects.findIndex((p) => p.id === currentProject.id) : -1;
|
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(() => {
|
||||||
@@ -42,8 +42,9 @@ export function useProjectPicker({
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
setSelectedProjectIndex(0);
|
setSelectedProjectIndex(0);
|
||||||
}, [filteredProjects.length, projectSearchQuery]);
|
}, [filteredProjects.length, projectSearchQuery, currentProject]);
|
||||||
|
|
||||||
// Reset search query when dropdown closes, set to current project index when it opens
|
// Reset search query when dropdown closes, set to current project index when it opens
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
@@ -51,16 +52,13 @@ export function useProjectPicker({
|
|||||||
setProjectSearchQuery('');
|
setProjectSearchQuery('');
|
||||||
setSelectedProjectIndex(0);
|
setSelectedProjectIndex(0);
|
||||||
} else {
|
} else {
|
||||||
|
// Set the selected project index to the current project index
|
||||||
const currentIndex = getCurrentProjectIndex();
|
const currentIndex = getCurrentProjectIndex();
|
||||||
if (currentIndex !== -1) {
|
if (currentIndex !== -1) {
|
||||||
setSelectedProjectIndex(currentIndex);
|
setSelectedProjectIndex(currentIndex);
|
||||||
}
|
}
|
||||||
}
|
|
||||||
}, [isProjectPickerOpen, currentProject]);
|
|
||||||
|
|
||||||
// Focus the search input when dropdown opens
|
// Focus the search input when dropdown opens
|
||||||
useEffect(() => {
|
|
||||||
if (isProjectPickerOpen) {
|
|
||||||
// Small delay to ensure the dropdown is rendered
|
// Small delay to ensure the dropdown is rendered
|
||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
projectSearchInputRef.current?.focus();
|
projectSearchInputRef.current?.focus();
|
||||||
|
|||||||
Reference in New Issue
Block a user