@@ -226,10 +226,6 @@ export default function DiffPanel({
226226 ? `${ routeThreadRef . environmentId } :${ routeThreadRef . threadId } :${ reviewSectionId } `
227227 : null ;
228228 const codeViewMountKey = `${ collapseScopeKey ?? reviewSectionId } :${ codeViewRevision } ` ;
229- const collapsedDiffFileKeys =
230- collapsedDiffFiles . scopeKey === collapseScopeKey
231- ? collapsedDiffFiles . fileKeys
232- : EMPTY_COLLAPSED_DIFF_FILE_KEYS ;
233229 const reviewSectionTitle = selectedTurn
234230 ? `Turn ${ selectedCheckpointTurnCount ?? "?" } `
235231 : selectedGitScope === "unstaged"
@@ -425,6 +421,17 @@ export default function DiffPanel({
425421 } ) ) ,
426422 [ renderableFiles ] ,
427423 ) ;
424+ const defaultCollapsedDiffFileKeys = useMemo (
425+ ( ) =>
426+ settings . diffFilesCollapsed
427+ ? new Set ( renderableFileEntries . map ( ( file ) => file . fileKey ) )
428+ : EMPTY_COLLAPSED_DIFF_FILE_KEYS ,
429+ [ renderableFileEntries , settings . diffFilesCollapsed ] ,
430+ ) ;
431+ const collapsedDiffFileKeys =
432+ collapsedDiffFiles . scopeKey === collapseScopeKey
433+ ? collapsedDiffFiles . fileKeys
434+ : defaultCollapsedDiffFileKeys ;
428435 const codeViewFiles = useMemo (
429436 ( ) =>
430437 renderableFileEntries . map ( ( { fileDiff, fileKey, fileVersion } ) => {
@@ -462,14 +469,16 @@ export default function DiffPanel({
462469 if ( ! file ) return ;
463470 if ( file . collapsed ) {
464471 setCollapsedDiffFiles ( ( current ) => {
465- const next = new Set ( current . scopeKey === collapseScopeKey ? current . fileKeys : [ ] ) ;
472+ const next = new Set (
473+ current . scopeKey === collapseScopeKey ? current . fileKeys : defaultCollapsedDiffFileKeys ,
474+ ) ;
466475 next . delete ( file . fileKey ) ;
467476 return { scopeKey : collapseScopeKey , fileKeys : next } ;
468477 } ) ;
469478 }
470479 requestTreeReveal ( file . fileKey ) ;
471480 } ,
472- [ codeViewFiles , collapseScopeKey , requestTreeReveal ] ,
481+ [ codeViewFiles , collapseScopeKey , defaultCollapsedDiffFileKeys , requestTreeReveal ] ,
473482 ) ;
474483
475484 const openDiffFile = useCallback (
@@ -503,7 +512,9 @@ export default function DiffPanel({
503512 const toggleDiffFileCollapsed = useCallback (
504513 ( fileKey : string ) => {
505514 setCollapsedDiffFiles ( ( current ) => {
506- const next = new Set ( current . scopeKey === collapseScopeKey ? current . fileKeys : [ ] ) ;
515+ const next = new Set (
516+ current . scopeKey === collapseScopeKey ? current . fileKeys : defaultCollapsedDiffFileKeys ,
517+ ) ;
507518 if ( next . has ( fileKey ) ) {
508519 next . delete ( fileKey ) ;
509520 } else {
@@ -512,21 +523,21 @@ export default function DiffPanel({
512523 return { scopeKey : collapseScopeKey , fileKeys : next } ;
513524 } ) ;
514525 } ,
515- [ collapseScopeKey ] ,
526+ [ collapseScopeKey , defaultCollapsedDiffFileKeys ] ,
516527 ) ;
517528
518529 const toggleDiffFileCollapse = useCallback ( ( ) => {
519530 setCodeViewRevision ( ( current ) => current + 1 ) ;
520531 setCollapsedDiffFiles ( ( current ) => {
521532 const currentKeys =
522- current . scopeKey === collapseScopeKey ? current . fileKeys : EMPTY_COLLAPSED_DIFF_FILE_KEYS ;
533+ current . scopeKey === collapseScopeKey ? current . fileKeys : defaultCollapsedDiffFileKeys ;
523534
524535 return {
525536 scopeKey : collapseScopeKey ,
526537 fileKeys : toggleAllDiffFiles ( diffFileKeys , currentKeys ) ,
527538 } ;
528539 } ) ;
529- } , [ collapseScopeKey , diffFileKeys ] ) ;
540+ } , [ collapseScopeKey , defaultCollapsedDiffFileKeys , diffFileKeys ] ) ;
530541
531542 const selectTurn = ( turnId : TurnId ) => {
532543 if ( ! routeThreadRef ) return ;
0 commit comments