@@ -112,11 +112,6 @@ function getCachedFileEntry(fileDiff: FileDiffMetadata) {
112112 return entry ;
113113}
114114
115- interface CollapsedDiffFilesState {
116- readonly scopeKey : string | null ;
117- readonly fileKeys : ReadonlySet < string > ;
118- }
119-
120115const EMPTY_COLLAPSED_DIFF_FILE_KEYS : ReadonlySet < string > = new Set ( ) ;
121116
122117/** Collapse control for one file header; re-renders only when its own file changes. */
@@ -210,10 +205,6 @@ export default function DiffPanel({
210205 Schema . Boolean ,
211206 ) ;
212207 const [ baseRefQuery , setBaseRefQuery ] = useState ( "" ) ;
213- const [ collapsedDiffFiles , setCollapsedDiffFiles ] = useState < CollapsedDiffFilesState > ( ( ) => ( {
214- scopeKey : null ,
215- fileKeys : EMPTY_COLLAPSED_DIFF_FILE_KEYS ,
216- } ) ) ;
217208 const [ codeViewRevision , setCodeViewRevision ] = useState ( 0 ) ;
218209 const [ codeView , setCodeView ] = useState < AnnotatableCodeViewHandle | null > ( null ) ;
219210
@@ -518,10 +509,10 @@ export default function DiffPanel({
518509 : EMPTY_COLLAPSED_DIFF_FILE_KEYS ,
519510 [ renderableFileEntries , settings . diffFilesCollapsed ] ,
520511 ) ;
521- const collapsedDiffFileKeys =
522- collapsedDiffFiles . scopeKey === collapseScopeKey
523- ? collapsedDiffFiles . fileKeys
524- : defaultCollapsedDiffFileKeys ;
512+ const storedCollapsedDiffFileKeys = useDiffPanelStore ( ( state ) =>
513+ collapseScopeKey ? state . collapsedFileKeysByScopeKey [ collapseScopeKey ] : undefined ,
514+ ) ;
515+ const collapsedDiffFileKeys = storedCollapsedDiffFileKeys ?? defaultCollapsedDiffFileKeys ;
525516 const renderLoadingBoundary = useCallback (
526517 ( ) =>
527518 settledFileCount < renderableFiles . length ? (
@@ -593,13 +584,15 @@ export default function DiffPanel({
593584 ) ;
594585 const file = renderableFileEntries [ index ] ;
595586 if ( ! file ) return ;
596- setCollapsedDiffFiles ( ( current ) => {
597- const next = new Set (
598- current . scopeKey === collapseScopeKey ? current . fileKeys : defaultCollapsedDiffFileKeys ,
599- ) ;
600- next . delete ( file . fileKey ) ;
601- return { scopeKey : collapseScopeKey , fileKeys : next } ;
602- } ) ;
587+ if ( collapseScopeKey ) {
588+ useDiffPanelStore
589+ . getState ( )
590+ . updateCollapsedFileKeys ( collapseScopeKey , defaultCollapsedDiffFileKeys , ( current ) => {
591+ const next = new Set ( current ) ;
592+ next . delete ( file . fileKey ) ;
593+ return next ;
594+ } ) ;
595+ }
603596 if ( lazySource && index >= settledFileCount ) {
604597 requestFile ( index ) ;
605598 }
@@ -663,42 +656,41 @@ export default function DiffPanel({
663656 } , [ collapseScopeKey , defaultCollapsedDiffFileKeys ] ) ;
664657 const toggleDiffFileCollapsed = useCallback ( ( fileKey : string ) => {
665658 const { collapseScopeKey, defaultCollapsedDiffFileKeys } = collapseDefaultsRef . current ;
666- setCollapsedDiffFiles ( ( current ) => {
667- const next = new Set (
668- current . scopeKey === collapseScopeKey ? current . fileKeys : defaultCollapsedDiffFileKeys ,
669- ) ;
670- if ( next . has ( fileKey ) ) {
671- next . delete ( fileKey ) ;
672- } else {
673- next . add ( fileKey ) ;
674- }
675- return { scopeKey : collapseScopeKey , fileKeys : next } ;
676- } ) ;
659+ if ( ! collapseScopeKey ) return ;
660+ useDiffPanelStore
661+ . getState ( )
662+ . updateCollapsedFileKeys ( collapseScopeKey , defaultCollapsedDiffFileKeys , ( current ) => {
663+ const next = new Set ( current ) ;
664+ if ( next . has ( fileKey ) ) {
665+ next . delete ( fileKey ) ;
666+ } else {
667+ next . add ( fileKey ) ;
668+ }
669+ return next ;
670+ } ) ;
677671 } , [ ] ) ;
678672 // Find can ask again before the unfolded file reaches the viewer, so this must never fold.
679673 const unfoldDiffFile = useCallback ( ( fileKey : string ) => {
680674 const { collapseScopeKey, defaultCollapsedDiffFileKeys } = collapseDefaultsRef . current ;
681- setCollapsedDiffFiles ( ( current ) => {
682- const fileKeys =
683- current . scopeKey === collapseScopeKey ? current . fileKeys : defaultCollapsedDiffFileKeys ;
684- if ( ! fileKeys . has ( fileKey ) ) return current ;
685- const next = new Set ( fileKeys ) ;
686- next . delete ( fileKey ) ;
687- return { scopeKey : collapseScopeKey , fileKeys : next } ;
688- } ) ;
675+ if ( ! collapseScopeKey ) return ;
676+ useDiffPanelStore
677+ . getState ( )
678+ . updateCollapsedFileKeys ( collapseScopeKey , defaultCollapsedDiffFileKeys , ( current ) => {
679+ if ( ! current . has ( fileKey ) ) return current ;
680+ const next = new Set ( current ) ;
681+ next . delete ( fileKey ) ;
682+ return next ;
683+ } ) ;
689684 } , [ ] ) ;
690685
691686 const toggleDiffFileCollapse = useCallback ( ( ) => {
692687 setCodeViewRevision ( ( current ) => current + 1 ) ;
693- setCollapsedDiffFiles ( ( current ) => {
694- const currentKeys =
695- current . scopeKey === collapseScopeKey ? current . fileKeys : defaultCollapsedDiffFileKeys ;
696-
697- return {
698- scopeKey : collapseScopeKey ,
699- fileKeys : toggleAllDiffFiles ( diffFileKeys , currentKeys ) ,
700- } ;
701- } ) ;
688+ if ( ! collapseScopeKey ) return ;
689+ useDiffPanelStore
690+ . getState ( )
691+ . updateCollapsedFileKeys ( collapseScopeKey , defaultCollapsedDiffFileKeys , ( current ) =>
692+ toggleAllDiffFiles ( diffFileKeys , current ) ,
693+ ) ;
702694 } , [ collapseScopeKey , defaultCollapsedDiffFileKeys , diffFileKeys ] ) ;
703695
704696 const selectTurn = ( runId : RunId ) => {
0 commit comments