Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。
TypeScript agentai-agentai-assistantandroidclaude-codecodexelectroniosllmmacosreact-nativetypescriptwindows
feat(desktop): 项目选择菜单支持搜索并提示可滚动
zqchris5cb2e092ad0f
diff --git a/apps/desktop/src/renderer/components/new-chat/FolderPickerPopover.tsx b/apps/desktop/src/renderer/components/new-chat/FolderPickerPopover.tsxindex a04f595751..97ddee889c 100644--- a/apps/desktop/src/renderer/components/new-chat/FolderPickerPopover.tsx+++ b/apps/desktop/src/renderer/components/new-chat/FolderPickerPopover.tsx@@ -7,9 +7,10 @@ import {Loader2,MessageCircle,RefreshCw,+ Search,X,} from 'lucide-react';-import { useRef, useState } from 'react';+import { useCallback, useEffect, useLayoutEffect, useMemo, useRef, useState } from 'react';import { useTranslation } from 'react-i18next';import { cn } from '@/lib/utils';@@ -57,6 +58,38 @@ export type FolderPickerSelectSource = 'project' | 'recent' | 'browse' | 'dialogconst WHEEL_LINE_HEIGHT = 16;+/** 带路径的项目行高 56px,可视区约放 4 行;超过这个数才有必要搜索。 */+const PROJECT_SEARCH_MIN_COUNT = 5;++/**+ * 项目列表的可视高度刻意不取行高(56px)整数倍:4.5 行让第 5 行露出半截,+ * 用户一眼看出下面还有内容。224px(恰好 4 行)时第 5 行正卡在边界外,看不出能滚动。+ */+const PROJECT_LIST_MAX_HEIGHT_CLASS = 'max-h-[252px]';++/** 还能继续滚动的一侧渐隐,配合半行露出提示列表未完。 */+const SCROLL_FADE_PX = 24;++function scrollFadeMask(fadeTop: boolean, fadeBottom: boolean): string | undefined {+ if (!fadeTop && !fadeBottom) return undefined;+ const top = fadeTop ? `transparent, #000 ${SCROLL_FADE_PX}px` : '#000, #000';+ const bottom = fadeBottom ? `#000 calc(100% - ${SCROLL_FADE_PX}px), transparent` : '#000, #000';+ return `linear-gradient(to bottom, ${top}, ${bottom})`;+}++export function filterFolderPickerOptions(+ options: readonly FolderPickerOption[],+ query: string,+): readonly FolderPickerOption[] {+ const needle = query.trim().toLocaleLowerCase();+ if (!needle) return options;+ return options.filter((option) =>+ [option.name, option.description, option.path].some((field) =>+ field?.toLocaleLowerCase().includes(needle),+ ),+ );+}+/*** Read recent folders from localStorage.*/@@ -155,6 +188,38 @@ export function FolderPickerPopover({const recentFolders = open && !isProjectPicker ? getRecentFolders() : [];const selectionPendingRef = useRef(false);const [selectionPending, setSelectionPending] = useState(false);+ const [projectQuery, setProjectQuery] = useState('');+ const projectSearchRef = useRef<HTMLInputElement>(null);+ const projectScrollRef = useRef<HTMLDivElement>(null);+ const [scrollFade, setScrollFade] = useState({ top: false, bottom: false });+ const showProjectSearch =+ isProjectPicker && effectiveProjectOptions.length >= PROJECT_SEARCH_MIN_COUNT;+ const activeProjectQuery = showProjectSearch ? projectQuery.trim() : '';+ const visibleProjectOptions = useMemo(+ () => filterFolderPickerOptions(effectiveProjectOptions, activeProjectQuery),+ [effectiveProjectOptions, activeProjectQuery],+ );++ // 每次打开都从完整列表开始,不残留上次的搜索词。+ useEffect(() => {+ if (!open) setProjectQuery('');+ }, [open]);++ const updateScrollFade = useCallback(() => {+ const el = projectScrollRef.current;+ const next = el+ ? {+ top: el.scrollTop > 1,+ bottom: el.scrollTop + el.clientHeight < el.scrollHeight - 1,+ }+ : { top: false, bottom: false };+ setScrollFade((prev) => (prev.top === next.top && prev.bottom === next.bottom ? prev : next));+ }, []);++ useLayoutEffect(() => {+ if (!open) return;+ updateScrollFade();+ }, [open, visibleProjectOptions, deviceScope?.status, updateScrollFade]);const handleSelectPath = async (folderPath: string,@@ -187,8 +252,10 @@ export function FolderPickerPopover({void recentWorkdirsStore.remove(project.path);};- const renderProject = (project: FolderPickerOption) => {+ const renderProject = (project: FolderPickerOption, index: number) => {const canRemove = !project.remoteDevice || onRemoveRemoteProject !== undefined;+ // 有搜索词时首个结果常亮:回车选中的就是它。+ const isEnterTarget = activeProjectQuery !== '' && index === 0;return (/* 行容器**不可交互**(Codex review P1):选择与删除是**兄弟**控件。之前为了避开 <button> 里嵌 <button> 的非法 HTML,把外层改成 div[role="button"] ——@@ -202,6 +269,7 @@ export function FolderPickerPopover({'group flex w-full items-center gap-3 rounded-[8px] px-3 py-[10px]','transition-colors','hover:bg-[var(--folder-item-hover)]',+ isEnterTarget && 'bg-[var(--folder-item-hover)]',)}><button@@ -307,6 +375,24 @@ export function FolderPickerPopover({'border border-[var(--folder-picker-border)]',)}onWheel={handleFolderPickerWheel}+ onOpenAutoFocus={(e) => {+ // 项目多到需要搜索时,打开后的下一个动作多半是输入:直接聚焦搜索框。+ const input = projectSearchRef.current;+ if (!input) return;+ e.preventDefault();+ input.focus();+ }}+ onEscapeKeyDown={(e) => {+ // 输入法组合中的 Esc 属于取消候选词,不关闭也不清空。+ if (e.isComposing) {+ e.preventDefault();+ return;+ }+ // 有搜索词时 Esc 先清空搜索,再按一次才关闭。+ if (!projectQuery) return;+ e.preventDefault();+ setProjectQuery('');+ }}aria-busy={selectionPending}>{isProjectPicker && (@@ -336,9 +422,56 @@ export function FolderPickerPopover({{t('newChat.folderPicker.projects')}</span></div>+ {showProjectSearch && (+ <div className="px-1 pb-1">+ <div className="relative">+ <Search+ size={12}+ className="pointer-events-none absolute left-2.5 top-1/2 -translate-y-1/2 text-[var(--folder-item-path)]"+ />+ <input+ ref={projectSearchRef}+ type="text"+ value={projectQuery}+ onChange={(e) => {+ setProjectQuery(e.target.value);+ if (projectScrollRef.current) projectScrollRef.current.scrollTop = 0;+ }}+ onKeyDown={(e) => {+ // 弹层经 portal 渲染,React 事件仍会冒泡到所在的输入区;搜索框的按键只归它自己。+ e.stopPropagation();+ if (e.key !== 'Enter' || e.nativeEvent.isComposing) return;+ const first = activeProjectQuery ? visibleProjectOptions[0] : undefined;+ if (!first) return;+ e.preventDefault();+ void handleSelectPath(first.path, 'project', first);+ }}+ placeholder={t('newChat.folderPicker.searchProjects')}+ aria-label={t('newChat.folderPicker.searchProjects')}+ className={cn(+ 'h-8 w-full rounded-full border border-[var(--folder-picker-border)] bg-transparent',+ 'pl-7 pr-2 text-13 text-[var(--folder-item-name)] outline-none',+ // DESIGN.md §4 Inputs & Forms:单行 input 一律 pill;placeholder 与 focus+ // 对齐分支选择器的搜索框。+ 'placeholder:text-[var(--text-placeholder)]',+ 'focus:border-[var(--focus-ring)] focus:ring-1 focus:ring-[var(--focus-ring-soft)]',+ )}+ />+ </div>+ </div>+ )}<div+ ref={projectScrollRef}data-folder-picker-scroll="true"- className="pending-queue-scroll -mr-2 max-h-[224px] overflow-x-hidden overflow-y-auto overscroll-contain pr-2"+ onScroll={updateScrollFade}+ style={{+ maskImage: scrollFadeMask(scrollFade.top, scrollFade.bottom),+ WebkitMaskImage: scrollFadeMask(scrollFade.top, scrollFade.bottom),+ }}+ className={cn(+ 'pending-queue-scroll -mr-2 overflow-x-hidden overflow-y-auto overscroll-contain pr-2',+ PROJECT_LIST_MAX_HEIGHT_CLASS,+ )}>{deviceScope?.status === 'loading' ? (<div className="flex items-center gap-2 px-3 py-[10px] text-sm text-[var(--folder-item-path)]">@@ -377,10 +510,17 @@ export function FolderPickerPopover({)}</div></div>- {effectiveProjectOptions.map(renderProject)}+ {visibleProjectOptions.map(renderProject)}</>- ) : effectiveProjectOptions.length > 0 ? (- effectiveProjectOptions.map(renderProject)+ ) : visibleProjectOptions.length > 0 ? (+ visibleProjectOptions.map(renderProject)+ ) : activeProjectQuery ? (+ <div+ role="status"+ className="px-3 py-[10px] text-sm text-[var(--folder-item-path)]"+ >+ {t('newChat.folderPicker.noMatchingProjects')}+ </div>) : deviceScope && onAddRemoteProject ? (/* 对端设备上一个项目都没有:空态里直接给「浏览文件夹」,并带着设备身份进弹窗 ——否则用户得自己退出去找入口,而这台机器恰恰是最可能需要新建目录的。 */@@ -410,7 +550,7 @@ export function FolderPickerPopover({</>)}- {/* Recent folders — list scrolls when more than 4 items, label and+ {/* Recent folders — list scrolls past 4.5 rows, label and"Choose a different folder" button stay outside the scroll area. */}{!isProjectPicker && recentFolders.length > 0 && (<>@@ -421,7 +561,10 @@ export function FolderPickerPopover({</div><divdata-folder-picker-scroll="true"- className="pending-queue-scroll -mr-2 max-h-[224px] overflow-x-hidden overflow-y-auto overscroll-contain pr-2"+ className={cn(+ 'pending-queue-scroll -mr-2 overflow-x-hidden overflow-y-auto overscroll-contain pr-2',+ PROJECT_LIST_MAX_HEIGHT_CLASS,+ )}>{recentFolders.map((folder) => (<buttondiff --git a/apps/desktop/src/renderer/components/new-chat/__tests__/FolderPickerPopoverSearch.test.tsx b/apps/desktop/src/renderer/components/new-chat/__tests__/FolderPickerPopoverSearch.test.tsxnew file mode 100644index 0000000000..de9005c923--- /dev/null+++ b/apps/desktop/src/renderer/components/new-chat/__tests__/FolderPickerPopoverSearch.test.tsx@@ -0,0 +1,98 @@+// @vitest-environment jsdom+import { cleanup, fireEvent, render, screen } from '@testing-library/react';+import { afterEach, describe, expect, it, vi } from 'vitest';++vi.mock('react-i18next', () => ({ useTranslation: () => ({ t: (key: string) => key }) }));+vi.mock('@/lib/recentWorkdirsStore', () => ({ recentWorkdirsStore: { remove: vi.fn() } }));++import {+ FolderPickerPopover,+ filterFolderPickerOptions,+ type FolderPickerOption,+} from '../FolderPickerPopover';++const project = (name: string, dir = 'makecindy'): FolderPickerOption => ({+ path: `/Users/me/Projects/${dir}/${name}`,+ name,+ description: `/Users/me/Projects/${dir}/${name}`,+});++const manyProjects = [+ project('cindy'),+ project('cindy-server', 'xindong'),+ project('cindy-official-plugins'),+ project('filoai-frontend', 'filoai'),+ project('cli-slg', 'filoai'),+];++const SEARCH = 'newChat.folderPicker.searchProjects';++function renderPicker(projectOptions: readonly FolderPickerOption[]) {+ const onSelect = vi.fn();+ const onOpenChange = vi.fn();+ render(+ <FolderPickerPopover+ open+ onOpenChange={onOpenChange}+ onSelect={onSelect}+ projectOptions={projectOptions}+ >+ <button type="button">trigger</button>+ </FolderPickerPopover>,+ );+ return { onSelect, onOpenChange };+}++afterEach(() => {+ cleanup();+});++describe('filterFolderPickerOptions', () => {+ it('matches name or path case-insensitively and keeps order', () => {+ expect(filterFolderPickerOptions(manyProjects, ' SERVER ').map((p) => p.name)).toEqual([+ 'cindy-server',+ ]);+ expect(filterFolderPickerOptions(manyProjects, 'filoai').map((p) => p.name)).toEqual([+ 'filoai-frontend',+ 'cli-slg',+ ]);+ expect(filterFolderPickerOptions(manyProjects, '')).toBe(manyProjects);+ });+});++describe('FolderPickerPopover project search', () => {+ it('stays hidden while every project fits in view', () => {+ renderPicker(manyProjects.slice(0, 4));+ expect(screen.queryByPlaceholderText(SEARCH)).toBeNull();+ });++ it('filters projects, picks the first match on Enter, and shows an empty result', () => {+ const { onSelect } = renderPicker(manyProjects);+ const input = screen.getByPlaceholderText(SEARCH);+ expect(document.activeElement).toBe(input);++ fireEvent.change(input, { target: { value: 'cindy' } });+ expect(screen.queryByText('filoai-frontend')).toBeNull();+ expect(screen.getByText('cindy-server')).toBeTruthy();++ fireEvent.change(input, { target: { value: 'nothing-here' } });+ expect(screen.getByText('newChat.folderPicker.noMatchingProjects')).toBeTruthy();++ fireEvent.change(input, { target: { value: 'slg' } });+ fireEvent.keyDown(input, { key: 'Enter' });+ expect(onSelect).toHaveBeenCalledWith(manyProjects[4].path, 'project', manyProjects[4]);+ });++ it('clears the query on Escape before closing', () => {+ const { onOpenChange } = renderPicker(manyProjects);+ const input = screen.getByPlaceholderText(SEARCH) as HTMLInputElement;+ fireEvent.change(input, { target: { value: 'slg' } });++ fireEvent.keyDown(input, { key: 'Escape' });+ expect(input.value).toBe('');+ expect(onOpenChange).not.toHaveBeenCalledWith(false);++ fireEvent.keyDown(input, { key: 'Escape' });+ expect(onOpenChange).toHaveBeenCalledWith(false);+ });+});diff --git a/apps/desktop/src/renderer/i18n/locales/en/common.json b/apps/desktop/src/renderer/i18n/locales/en/common.jsonindex 5edbcb9fff..c6b984a51c 100644--- a/apps/desktop/src/renderer/i18n/locales/en/common.json+++ b/apps/desktop/src/renderer/i18n/locales/en/common.json@@ -10364,6 +10364,8 @@"browseProjectFolder": "Choose another project folder","dialogue": "Chat","dialogueOrSelectProject": "Chat or select project",+ "searchProjects": "Search projects",+ "noMatchingProjects": "No matching projects","remoteProjectsLoadFailed": "Couldn't load projects from {{device}}. Check the connection and try again.","retryRemoteProjects": "Reload projects","removeFromList": "Remove from list",diff --git a/apps/desktop/src/renderer/i18n/locales/ja/common.json b/apps/desktop/src/renderer/i18n/locales/ja/common.jsonindex a230fc44e8..aa99e0b11c 100644--- a/apps/desktop/src/renderer/i18n/locales/ja/common.json+++ b/apps/desktop/src/renderer/i18n/locales/ja/common.json@@ -10320,6 +10320,8 @@"browseProjectFolder": "別のプロジェクトフォルダを選択","dialogue": "対話","dialogueOrSelectProject": "対話またはプロジェクトを選択",+ "searchProjects": "プロジェクトを検索",+ "noMatchingProjects": "一致するプロジェクトはありません","remoteProjectsLoadFailed": "{{device}} のプロジェクトを読み込めませんでした。接続を確認して再試行してください。","retryRemoteProjects": "プロジェクトを再読み込み","removeFromList": "リストから削除",diff --git a/apps/desktop/src/renderer/i18n/locales/ko/common.json b/apps/desktop/src/renderer/i18n/locales/ko/common.jsonindex ba90aa99a7..1251bac2b2 100644--- a/apps/desktop/src/renderer/i18n/locales/ko/common.json+++ b/apps/desktop/src/renderer/i18n/locales/ko/common.json@@ -10320,6 +10320,8 @@"browseProjectFolder": "다른 프로젝트 폴더 선택","dialogue": "대화","dialogueOrSelectProject": "대화 또는 프로젝트 선택",+ "searchProjects": "프로젝트 검색",+ "noMatchingProjects": "일치하는 프로젝트가 없습니다","remoteProjectsLoadFailed": "{{device}}의 프로젝트를 불러오지 못했습니다. 연결을 확인한 후 다시 시도하세요.","retryRemoteProjects": "프로젝트 다시 불러오기","removeFromList": "목록에서 제거",diff --git a/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json b/apps/desktop/src/renderer/i18n/locales/zh-CN/common.jsonindex b7447cb62b..703910ee0e 100644--- a/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json+++ b/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json@@ -10320,6 +10320,8 @@"browseProjectFolder": "选择其他项目文件夹","dialogue": "对话","dialogueOrSelectProject": "对话或选择项目",+ "searchProjects": "搜索项目",+ "noMatchingProjects": "没有匹配的项目","remoteProjectsLoadFailed": "无法读取 {{device}} 上的项目。请检查连接后重试。","retryRemoteProjects": "重新读取项目","removeFromList": "从列表中移除",diff --git a/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json b/apps/desktop/src/renderer/i18n/locales/zh-TW/common.jsonindex 0deed2e6d0..304bcf7367 100644--- a/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json+++ b/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json@@ -10320,6 +10320,8 @@"browseProjectFolder": "選擇其他專案資料夾","dialogue": "對話","dialogueOrSelectProject": "對話或選擇專案",+ "searchProjects": "搜尋專案",+ "noMatchingProjects": "沒有符合的專案","remoteProjectsLoadFailed": "無法讀取 {{device}} 上的專案。請檢查連線後重試。","retryRemoteProjects": "重新讀取專案","removeFromList": "從列表中移除",