@@ -19,99 +19,60 @@ import { DiffStatLabel, hasNonZeroStat } from "./DiffStatLabel";
1919import { PierreEntryIcon } from "./PierreEntryIcon" ;
2020import { Button } from "../ui/button" ;
2121import { Tooltip , TooltipPopup , TooltipTrigger } from "../ui/tooltip" ;
22- import {
23- changedFileName ,
24- selectChangedFilePreview ,
25- summarizeChangedFileScopes ,
26- } from "./changedFilesPresentation" ;
2722
2823const EMPTY_DIRECTORY_OVERRIDES : Record < string , boolean > = { } ;
2924
3025export const ChangedFilesCard = memo ( function ChangedFilesCard ( props : {
3126 turnId : TurnId ;
3227 files : ReadonlyArray < TurnDiffFileChange > ;
33- expanded : boolean ;
34- showCompactPreview : boolean ;
3528 allDirectoriesExpanded : boolean ;
3629 resolvedTheme : "light" | "dark" ;
37- onExpandedChange : ( expanded : boolean ) => void ;
3830 onToggleAllDirectories : ( ) => void ;
3931 onOpenTurnDiff : ( turnId : TurnId , filePath ?: string ) => void ;
4032} ) {
4133 const {
4234 turnId,
4335 files,
44- expanded,
45- showCompactPreview,
4636 allDirectoriesExpanded,
4737 resolvedTheme,
48- onExpandedChange,
4938 onToggleAllDirectories,
5039 onOpenTurnDiff,
5140 } = props ;
5241 const summaryStat = useMemo ( ( ) => summarizeTurnDiffStats ( files ) , [ files ] ) ;
53- const scopeSummary = useMemo ( ( ) => summarizeChangedFileScopes ( files ) , [ files ] ) ;
54- const previewFiles = useMemo ( ( ) => selectChangedFilePreview ( files ) , [ files ] ) ;
55- const compactPreviewVisible = showCompactPreview && ! expanded ;
42+ const hasDirectories = files . some ( ( file ) => / [ / \\ ] / . test ( file . path ) ) ;
5643
5744 return (
5845 < div
59- className = "@container/changed-files mt-4 rounded-2xl border border-border/70 bg-secondary p-2 dark:border-transparent dark:bg-input/32"
60- data-changed-files-state = {
61- expanded ? "expanded" : compactPreviewVisible ? "preview" : "collapsed"
62- }
46+ className = "@container/changed-files mt-4 rounded-lg bg-secondary dark:bg-input/20"
47+ data-changed-files-state = "tree"
6348 >
6449 < div
6550 data-changed-files-header = ""
66- className = { cn (
67- "flex items-center justify-between gap-2 rounded-xl" ,
68- expanded &&
69- "sticky top-2 z-10 mb-2 bg-secondary dark:bg-[color-mix(in_srgb,var(--contrast-foreground)_2.5%,var(--background))]" ,
70- ) }
51+ className = "sticky top-2 z-10 flex items-center justify-between gap-2 rounded-t-lg bg-secondary px-3 py-2 dark:bg-[color-mix(in_srgb,var(--input)_20%,var(--background))]"
7152 >
72- < button
73- type = "button"
74- aria-expanded = { expanded }
75- data-scroll-anchor-ignore
76- className = "group flex min-w-0 flex-1 items-center rounded-xl px-2 py-1.5 text-left transition-colors hover:bg-accent/60 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring"
77- onClick = { ( ) => onExpandedChange ( ! expanded ) }
78- >
79- < span className = "flex min-w-0 flex-1 items-center gap-1.5 overflow-hidden" >
80- < ChevronRightIcon
81- aria-hidden = "true"
82- className = { cn (
83- "size-3.5 shrink-0 text-muted-foreground transition-transform" ,
84- expanded && "rotate-90" ,
85- ) }
86- />
87- < span className = "flex shrink-0 items-center gap-1 whitespace-nowrap font-medium text-foreground text-xs leading-4" >
88- < span >
89- { files . length } changed file{ files . length === 1 ? "" : "s" }
90- </ span >
91- { hasNonZeroStat ( summaryStat ) && (
92- < DiffStatLabel
93- additions = { summaryStat . additions }
94- className = "text-xs leading-4"
95- deletions = { summaryStat . deletions }
96- layout = "inline"
97- />
98- ) }
99- </ span >
100- < span className = "ml-1 hidden min-w-0 flex-1 truncate text-[11px] text-muted-foreground group-hover:text-foreground/80 @[24rem]/changed-files:inline" >
101- { expanded ? "Hide files" : "Show files" }
102- </ span >
53+ < div className = "flex min-w-0 flex-wrap items-center gap-x-3 gap-y-1 text-xs font-medium text-foreground" >
54+ < span >
55+ { files . length } changed file{ files . length === 1 ? "" : "s" }
10356 </ span >
104- </ button >
105- < div className = "flex shrink-0 items-center gap-1.5 pr-1" >
106- { expanded ? (
57+ { hasNonZeroStat ( summaryStat ) && (
58+ < DiffStatLabel
59+ additions = { summaryStat . additions }
60+ deletions = { summaryStat . deletions }
61+ layout = "inline"
62+ className = "text-xs leading-4"
63+ />
64+ ) }
65+ </ div >
66+ < div className = "flex shrink-0 items-center gap-1" >
67+ { hasDirectories && (
10768 < Tooltip >
10869 < TooltipTrigger
10970 render = {
11071 < Button
11172 type = "button"
11273 size = "icon-xs"
113- variant = "outline "
114- className = "!size-[22px] "
74+ variant = "ghost "
75+ className = "text-muted-foreground "
11576 aria-label = {
11677 allDirectoriesExpanded ? "Collapse all folders" : "Expand all folders"
11778 }
@@ -130,14 +91,15 @@ export const ChangedFilesCard = memo(function ChangedFilesCard(props: {
13091 { allDirectoriesExpanded ? "Collapse all folders" : "Expand all folders" }
13192 </ TooltipPopup >
13293 </ Tooltip >
133- ) : null }
94+ ) }
13495 < Tooltip >
13596 < TooltipTrigger
13697 render = {
13798 < Button
13899 type = "button"
139100 size = "xs"
140- variant = "outline"
101+ variant = "ghost"
102+ className = "text-muted-foreground hover:text-foreground"
141103 aria-label = "Open diff"
142104 onClick = { ( ) => onOpenTurnDiff ( turnId , files [ 0 ] ?. path ) }
143105 />
@@ -150,61 +112,14 @@ export const ChangedFilesCard = memo(function ChangedFilesCard(props: {
150112 </ Tooltip >
151113 </ div >
152114 </ div >
153- { expanded ? (
154- < ChangedFilesTree
155- key = { `changed-files-tree:${ turnId } ` }
156- turnId = { turnId }
157- files = { files }
158- allDirectoriesExpanded = { allDirectoriesExpanded }
159- resolvedTheme = { resolvedTheme }
160- onOpenTurnDiff = { onOpenTurnDiff }
161- />
162- ) : compactPreviewVisible ? (
163- < div className = "px-2 pb-1.5 pt-1" >
164- < p className = "flex flex-wrap items-center gap-x-1.5 gap-y-0.5 text-[11px] text-muted-foreground" >
165- { scopeSummary . map ( ( scope , index ) => (
166- < span key = { scope . label } className = "inline-flex items-center gap-1" >
167- { index > 0 ? < span aria-hidden = "true" > ·</ span > : null }
168- < span className = "font-mono text-foreground/75" > { scope . label } </ span >
169- < span >
170- { scope . fileCount } file{ scope . fileCount === 1 ? "" : "s" }
171- </ span >
172- </ span >
173- ) ) }
174- </ p >
175- < div className = "mt-2 flex flex-wrap items-center gap-1.5" >
176- { previewFiles . map ( ( file ) => (
177- < Tooltip key = { file . path } >
178- < TooltipTrigger
179- render = {
180- < button
181- type = "button"
182- className = "inline-flex max-w-48 items-center gap-1 rounded-md border border-border/70 bg-background/45 px-1.5 py-1 font-mono text-[10px] text-muted-foreground transition-colors hover:bg-accent/60 hover:text-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring"
183- onClick = { ( ) => onOpenTurnDiff ( turnId , file . path ) }
184- />
185- }
186- >
187- < PierreEntryIcon
188- pathValue = { file . path }
189- kind = "file"
190- theme = { resolvedTheme }
191- className = "size-3 shrink-0 text-muted-foreground/70"
192- />
193- < span className = "truncate" > { changedFileName ( file . path ) } </ span >
194- </ TooltipTrigger >
195- < TooltipPopup side = "top" > { file . path } </ TooltipPopup >
196- </ Tooltip >
197- ) ) }
198- < button
199- type = "button"
200- className = "rounded-md px-1.5 py-1 text-[11px] font-medium text-muted-foreground transition-colors hover:bg-accent/60 hover:text-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring"
201- onClick = { ( ) => onExpandedChange ( true ) }
202- >
203- Show all { files . length } files
204- </ button >
205- </ div >
206- </ div >
207- ) : null }
115+ < ChangedFilesTree
116+ key = { `${ turnId } :${ allDirectoriesExpanded } ` }
117+ turnId = { turnId }
118+ files = { files }
119+ allDirectoriesExpanded = { allDirectoriesExpanded }
120+ resolvedTheme = { resolvedTheme }
121+ onOpenTurnDiff = { onOpenTurnDiff }
122+ />
208123 </ div >
209124 ) ;
210125} ) ;
@@ -261,7 +176,8 @@ export const ChangedFilesTree = memo(function ChangedFilesTree(props: {
261176 < button
262177 type = "button"
263178 data-scroll-anchor-ignore
264- className = "group flex w-full items-center gap-1.5 rounded-xl py-1 pr-3 text-left transition-colors hover:bg-accent/60 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-1 focus-visible:ring-offset-background"
179+ aria-expanded = { isExpanded }
180+ className = "group flex w-full items-center gap-2 rounded-md py-1.5 pr-2 text-left transition-colors hover:bg-accent/60 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-1 focus-visible:ring-offset-background"
265181 style = { { paddingLeft : `${ leftPadding } px` } }
266182 onClick = { ( ) => toggleDirectory ( node . path ) }
267183 >
@@ -287,9 +203,7 @@ export const ChangedFilesTree = memo(function ChangedFilesTree(props: {
287203 ) }
288204 </ button >
289205 { isExpanded && (
290- < div className = "space-y-0.5" >
291- { node . children . map ( ( childNode ) => renderTreeNode ( childNode , depth + 1 ) ) }
292- </ div >
206+ < div > { node . children . map ( ( childNode ) => renderTreeNode ( childNode , depth + 1 ) ) } </ div >
293207 ) }
294208 </ div >
295209 ) ;
@@ -299,7 +213,7 @@ export const ChangedFilesTree = memo(function ChangedFilesTree(props: {
299213 < button
300214 key = { `file:${ node . path } ` }
301215 type = "button"
302- className = "group flex w-full items-center gap-1.5 rounded-xl py-1 pr-3 text-left transition-colors hover:bg-accent/60 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-1 focus-visible:ring-offset-background"
216+ className = "group flex w-full items-center gap-2 rounded-md py-1.5 pr-2 text-left transition-colors hover:bg-accent/60 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-1 focus-visible:ring-offset-background"
303217 style = { { paddingLeft : `${ leftPadding } px` } }
304218 onClick = { ( ) => onOpenTurnDiff ( turnId , node . path ) }
305219 >
@@ -312,7 +226,7 @@ export const ChangedFilesTree = memo(function ChangedFilesTree(props: {
312226 theme = { resolvedTheme }
313227 className = "size-3.5 text-muted-foreground/70"
314228 />
315- < span className = "truncate font-mono text-[11px] text-muted- foreground/80 group-hover:text-foreground/90 " >
229+ < span className = "truncate font-mono text-xs text-foreground/85 group-hover:text-foreground" >
316230 { node . name }
317231 </ span >
318232 { node . stat && (
@@ -324,7 +238,7 @@ export const ChangedFilesTree = memo(function ChangedFilesTree(props: {
324238 ) ;
325239 } ;
326240
327- return < div className = "space-y-0.5 " > { treeNodes . map ( ( node ) => renderTreeNode ( node , 0 ) ) } </ div > ;
241+ return < div className = "p-2 " > { treeNodes . map ( ( node ) => renderTreeNode ( node , 0 ) ) } </ div > ;
328242} ) ;
329243
330244function collectDirectoryPaths ( nodes : ReadonlyArray < TurnDiffTreeNode > ) : string [ ] {
0 commit comments