@@ -123,8 +123,9 @@ import {
123123 getFileViewedRange ,
124124 isFileDiffCollapsed ,
125125 isLineInFileDiff ,
126- toggleFileDiffFoldForViewed ,
126+ withFileDiffFold ,
127127 type DiffFoldOverride ,
128+ type FileDiffFoldChoices ,
128129} from "./pullRequestDiff.logic" ;
129130import { PullRequestDiffStat , PullRequestMetaLine } from "./pullRequestPresentation" ;
130131import { PullRequestDiffUnavailableState } from "./PullRequestDiffUnavailableState" ;
@@ -385,7 +386,7 @@ function PullRequestCodeTab({
385386 diffLayout : settings . diffLayout ,
386387 wordWrap : settings . wordWrap ,
387388 } ) ) ;
388- const [ toggledFiles , setToggledFiles ] = useState < ReadonlySet < string > > ( ( ) => new Set ( ) ) ;
389+ const [ foldChoices , setFoldChoices ] = useState < FileDiffFoldChoices > ( ( ) => new Map ( ) ) ;
389390 const [ lastViewedFileKey , setLastViewedFileKey ] = useState < string | null > ( null ) ;
390391 const [ visibleCommitCount , setVisibleCommitCount ] = useState ( COMMIT_PAGE_SIZE ) ;
391392 const [ foldOverride , setFoldOverride ] = useState < DiffFoldOverride > ( null ) ;
@@ -430,7 +431,7 @@ function PullRequestCodeTab({
430431 setLastViewedFileKey ( null ) ;
431432 setDraft ( null ) ;
432433 setSelectedLines ( null ) ;
433- setToggledFiles ( new Set ( ) ) ;
434+ setFoldChoices ( new Map ( ) ) ;
434435 setFoldOverride ( null ) ;
435436 setVisibleCommitCount ( COMMIT_PAGE_SIZE ) ;
436437 setOrphansOpen ( false ) ;
@@ -740,9 +741,17 @@ function PullRequestCodeTab({
740741 </ div >
741742 ) ;
742743
744+ // A stale mark means the file changed since it was viewed; Fold all and Expand all outrank marks.
745+ const foldsAsViewed = ( path : string ) =>
746+ foldOverride === null && filesViewedEnabled && isFileViewed ( path ) && ! isFileViewedStale ( path ) ;
743747 const items : CodeViewDiffItem < ReviewAnnotationGroup > [ ] = annotatedFiles . map (
744748 ( { fileKey, path, fileDiff, annotations, annotationsVersion } ) => {
745- const collapsed = isFileDiffCollapsed ( fileKey , effectiveFoldOverride , toggledFiles ) ;
749+ const collapsed = isFileDiffCollapsed (
750+ fileKey ,
751+ effectiveFoldOverride ,
752+ foldChoices ,
753+ foldsAsViewed ( path ) ,
754+ ) ;
746755 const viewedMark = filesViewedEnabled
747756 ? `e${ isFileViewed ( path ) ? "v" : "" } ${ isFileViewedStale ( path ) ? "s" : "" } `
748757 : "" ;
@@ -783,13 +792,17 @@ function PullRequestCodeTab({
783792 ) ;
784793 } ;
785794
786- const toggleFile = ( fileKey : string ) =>
787- setToggledFiles ( ( current ) => {
788- const next = new Set ( current ) ;
789- if ( next . has ( fileKey ) ) next . delete ( fileKey ) ;
790- else next . add ( fileKey ) ;
791- return next ;
792- } ) ;
795+ const toggleFile = ( fileKey : string ) => {
796+ const path = annotatedFiles . find ( ( file ) => file . fileKey === fileKey ) ?. path ;
797+ const viewed = path !== undefined && foldsAsViewed ( path ) ;
798+ setFoldChoices ( ( current ) =>
799+ withFileDiffFold (
800+ current ,
801+ fileKey ,
802+ ! isFileDiffCollapsed ( fileKey , effectiveFoldOverride , current , viewed ) ,
803+ ) ,
804+ ) ;
805+ } ;
793806
794807 const setFileViewed = ( fileKey : string , viewed : boolean , extendRange : boolean ) => {
795808 const range = getFileViewedRange (
@@ -799,12 +812,8 @@ function PullRequestCodeTab({
799812 ) ;
800813 setLastViewedFileKey ( fileKey ) ;
801814 for ( const file of range ) setViewed ( file . path , viewed ) ;
802- setToggledFiles ( ( current ) =>
803- range . reduce (
804- ( next , file ) =>
805- toggleFileDiffFoldForViewed ( file . fileKey , viewed , effectiveFoldOverride , next ) ,
806- current ,
807- ) ,
815+ setFoldChoices ( ( current ) =>
816+ range . reduce ( ( next , file ) => withFileDiffFold ( next , file . fileKey , viewed ) , current ) ,
808817 ) ;
809818 } ;
810819 const fileViewedToggle = {
@@ -817,19 +826,15 @@ function PullRequestCodeTab({
817826 const revealFile = ( path : string , range ?: SelectedLineRange ) => {
818827 const item = items . find ( ( candidate ) => resolveFileDiffPath ( candidate . fileDiff ) === path ) ;
819828 if ( item === undefined ) return ;
820- // Unfold only: a second reveal before the unfold renders must not fold the file again.
821- if ( item . collapsed === true ) {
822- setToggledFiles ( ( current ) =>
823- toggleFileDiffFoldForViewed ( item . id , false , effectiveFoldOverride , current ) ,
824- ) ;
825- }
829+ // Record the unfold even when already open, so a Viewed mark that loads later cannot fold it.
830+ setFoldChoices ( ( current ) => withFileDiffFold ( current , item . id , false ) ) ;
826831 if ( range ) setSelectedLines ( { id : item . id , range } ) ;
827832 codeViewReveal . request ( item . id , range ) ;
828833 } ;
829834
830835 const toggleAllFiles = ( ) => {
831836 setFoldOverride ( areAllDiffFilesCollapsed ( fileKeys , collapsedFileKeys ) ? "expanded" : "folded" ) ;
832- setToggledFiles ( new Set ( ) ) ;
837+ setFoldChoices ( new Map ( ) ) ;
833838 } ;
834839
835840 const orderedCommits = // GitLab preserves UTC offsets, so compare instants.
@@ -971,9 +976,7 @@ function PullRequestCodeTab({
971976 onPostRender : codeViewReveal . flush ,
972977 // Find may repeat requests before render; only unfold, never toggle.
973978 onRevealSearchMatch : ( item : CodeViewItem < ReviewAnnotationGroup > ) =>
974- setToggledFiles ( ( current ) =>
975- toggleFileDiffFoldForViewed ( item . id , false , effectiveFoldOverride , current ) ,
976- ) ,
979+ setFoldChoices ( ( current ) => withFileDiffFold ( current , item . id , false ) ) ,
977980 } ;
978981
979982 const runThreadCommand = async (
0 commit comments