Skip to content

armgit / cindy

Public Imported from GitHub
0

Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。

fix(desktop): 项目列表渐隐在弹层挂载后重新测量

zqchrisfcb0b5b14ae0
diff --git a/apps/desktop/src/renderer/components/new-chat/FolderPickerPopover.tsx b/apps/desktop/src/renderer/components/new-chat/FolderPickerPopover.tsx
index 97ddee889c..759370097e 100644
--- a/apps/desktop/src/renderer/components/new-chat/FolderPickerPopover.tsx
+++ b/apps/desktop/src/renderer/components/new-chat/FolderPickerPopover.tsx
@@ -67,16 +67,6 @@ const PROJECT_SEARCH_MIN_COUNT = 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,
@@ -190,7 +180,9 @@ export function FolderPickerPopover({
const [selectionPending, setSelectionPending] = useState(false);
const [projectQuery, setProjectQuery] = useState('');
const projectSearchRef = useRef<HTMLInputElement>(null);
- const projectScrollRef = useRef<HTMLDivElement>(null);
+ // 用 state 持有列表元素:内容经 Radix Portal 渲染,首个 commit 时还没挂进 DOM,
+ // 普通 ref 配依赖数组的 effect 会在元素出现前测量一次,之后列表不变就再也不测。
+ const [projectScrollEl, setProjectScrollEl] = useState<HTMLDivElement | null>(null);
const [scrollFade, setScrollFade] = useState({ top: false, bottom: false });
const showProjectSearch =
isProjectPicker && effectiveProjectOptions.length >= PROJECT_SEARCH_MIN_COUNT;
@@ -206,7 +198,7 @@ export function FolderPickerPopover({
}, [open]);
const updateScrollFade = useCallback(() => {
- const el = projectScrollRef.current;
+ const el = projectScrollEl;
const next = el
? {
top: el.scrollTop > 1,
@@ -214,12 +206,11 @@ export function FolderPickerPopover({
}
: { top: false, bottom: false };
setScrollFade((prev) => (prev.top === next.top && prev.bottom === next.bottom ? prev : next));
- }, []);
+ }, [projectScrollEl]);
useLayoutEffect(() => {
- if (!open) return;
updateScrollFade();
- }, [open, visibleProjectOptions, deviceScope?.status, updateScrollFade]);
+ }, [visibleProjectOptions, deviceScope?.status, updateScrollFade]);
const handleSelectPath = async (
folderPath: string,
@@ -435,7 +426,7 @@ export function FolderPickerPopover({
value={projectQuery}
onChange={(e) => {
setProjectQuery(e.target.value);
- if (projectScrollRef.current) projectScrollRef.current.scrollTop = 0;
+ if (projectScrollEl) projectScrollEl.scrollTop = 0;
}}
onKeyDown={(e) => {
// 弹层经 portal 渲染,React 事件仍会冒泡到所在的输入区;搜索框的按键只归它自己。
@@ -461,15 +452,13 @@ export function FolderPickerPopover({
</div>
)}
<div
- ref={projectScrollRef}
+ ref={setProjectScrollEl}
data-folder-picker-scroll="true"
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',
+ scrollFade.top && 'folder-picker-fade-top',
+ scrollFade.bottom && 'folder-picker-fade-bottom',
PROJECT_LIST_MAX_HEIGHT_CLASS,
)}
>
diff --git a/apps/desktop/src/renderer/components/new-chat/__tests__/FolderPickerPopoverSearch.test.tsx b/apps/desktop/src/renderer/components/new-chat/__tests__/FolderPickerPopoverSearch.test.tsx
index de9005c923..e71e7995b6 100644
--- a/apps/desktop/src/renderer/components/new-chat/__tests__/FolderPickerPopoverSearch.test.tsx
+++ b/apps/desktop/src/renderer/components/new-chat/__tests__/FolderPickerPopoverSearch.test.tsx
@@ -83,6 +83,25 @@ describe('FolderPickerPopover project search', () => {
expect(onSelect).toHaveBeenCalledWith(manyProjects[4].path, 'project', manyProjects[4]);
});
+ it('fades whichever edge can still scroll once the portal content mounts', () => {
+ const height = vi.spyOn(HTMLElement.prototype, 'scrollHeight', 'get').mockReturnValue(392);
+ const client = vi.spyOn(HTMLElement.prototype, 'clientHeight', 'get').mockReturnValue(252);
+ try {
+ renderPicker(manyProjects);
+ const list = document.querySelector('[data-folder-picker-scroll]') as HTMLElement;
+ expect(list.className).toContain('folder-picker-fade-bottom');
+ expect(list.className).not.toContain('folder-picker-fade-top');
+
+ list.scrollTop = 140;
+ fireEvent.scroll(list);
+ expect(list.className).toContain('folder-picker-fade-top');
+ expect(list.className).not.toContain('folder-picker-fade-bottom');
+ } finally {
+ height.mockRestore();
+ client.mockRestore();
+ }
+ });
+
it('clears the query on Escape before closing', () => {
const { onOpenChange } = renderPicker(manyProjects);
const input = screen.getByPlaceholderText(SEARCH) as HTMLInputElement;
diff --git a/apps/desktop/src/renderer/styles/globals.css b/apps/desktop/src/renderer/styles/globals.css
index 59127ef179..1b68b30818 100644
--- a/apps/desktop/src/renderer/styles/globals.css
+++ b/apps/desktop/src/renderer/styles/globals.css
@@ -1620,6 +1620,17 @@ body.resizing-pane [data-ghost-webview] {
background-color: var(--msg-scrollbar-hover);
}
+/* 项目选择菜单的列表:还能继续滚动的一侧 24px 渐隐,提示列表未完(只改透明度,双模式通用)。 */
+.folder-picker-fade-top {
+ mask-image: linear-gradient(to bottom, transparent, #000 24px);
+}
+.folder-picker-fade-bottom {
+ mask-image: linear-gradient(to bottom, #000 calc(100% - 24px), transparent);
+}
+.folder-picker-fade-top.folder-picker-fade-bottom {
+ mask-image: linear-gradient(to bottom, transparent, #000 24px, #000 calc(100% - 24px), transparent);
+}
+
/* Composer 形变面板(MorphPopover)内的下拉列表 — 8px 细滚动条。
配合列表容器的 -mr-2 + scrollbar-gutter:stable,滚动条整体挪进面板右侧
8px 内边距留白;行宽不再被 12px 全局滚动条挤窄,行高亮/对勾与搜索框、