@@ -382,24 +382,40 @@ export function ReviewSheet(props: ReviewSheetProps) {
382382 useEffect ( ( ) => {
383383 showAuxiliaryPane ( "inspector" ) ;
384384 } , [ environmentId , showAuxiliaryPane , threadId ] ) ;
385- const { error, reviewSections, selectedSection, refreshSelectedSection, selectSection } =
386- useReviewSections ( {
387- enabled : isEnvironmentReady ,
388- environmentId,
389- threadId,
390- reviewCache,
391- } ) ;
385+ const {
386+ error,
387+ reviewSections,
388+ selectedSection,
389+ refreshSelectedSection,
390+ selectSection,
391+ isSelectedSectionPending,
392+ diffPreviewRevision,
393+ } = useReviewSections ( {
394+ enabled : isEnvironmentReady ,
395+ environmentId,
396+ threadId,
397+ reviewCache,
398+ } ) ;
392399 useReviewDiffPrewarming ( {
393400 threadKey : reviewCache . threadKey ,
394401 sections : reviewSections ,
395402 selectedSectionId : selectedSection ?. id ?? null ,
396403 } ) ;
397- const { headerDiffSummary, nativeReviewDiffData, parsedDiff, pendingReviewCommentCount } =
398- useReviewDiffData ( {
399- threadKey : reviewCache . threadKey ,
400- selectedSection,
401- draftMessage,
402- } ) ;
404+ const {
405+ headerDiffSummary,
406+ nativeReviewDiffData,
407+ parsedDiff,
408+ pendingReviewCommentCount,
409+ loadVisibleFile,
410+ isPending : areFilePatchesPending ,
411+ } = useReviewDiffData ( {
412+ threadKey : reviewCache . threadKey ,
413+ environmentId,
414+ cwd : selectedThreadCwd ,
415+ selectedSection,
416+ revision : diffPreviewRevision ,
417+ draftMessage,
418+ } ) ;
403419 // Resolution returns null while Expo registers the native view (or forever
404420 // when the binary lacks it). Rendering a null component type crashes the
405421 // app, so callers must fall back — ThreadFeed's ReviewCommentCard does the
@@ -469,6 +485,7 @@ export function ReviewSheet(props: ReviewSheetProps) {
469485
470486 const handleSelectFile = useCallback (
471487 ( fileId : string | null ) => {
488+ loadVisibleFile ( fileId , true ) ;
472489 commentSelection . clearSelection ( ) ;
473490 if ( fileId !== null && collapsedFileIds . includes ( fileId ) ) {
474491 toggleExpandedFile ( fileId ) ;
@@ -481,13 +498,14 @@ export function ReviewSheet(props: ReviewSheetProps) {
481498 console . error ( "[review] Failed to navigate to diff file" , error ) ;
482499 } ) ;
483500 } ,
484- [ collapsedFileIds , commentSelection , toggleExpandedFile ] ,
501+ [ collapsedFileIds , commentSelection , toggleExpandedFile , loadVisibleFile ] ,
485502 ) ;
486503 const handleVisibleFileChange = useCallback (
487504 ( event : NativeSyntheticEvent < { readonly fileId ?: string | null } > ) => {
505+ loadVisibleFile ( event . nativeEvent . fileId ?? null ) ;
488506 reviewFileNavigatorRef . current ?. setVisibleFile ( event . nativeEvent . fileId ?? null ) ;
489507 } ,
490- [ ] ,
508+ [ loadVisibleFile ] ,
491509 ) ;
492510 const renderInspector = useCallback (
493511 ( ) => (
@@ -508,10 +526,11 @@ export function ReviewSheet(props: ReviewSheetProps) {
508526 ( event : NativeSyntheticEvent < { readonly fileId ?: string } > ) => {
509527 const { fileId } = event . nativeEvent ;
510528 if ( fileId ) {
529+ loadVisibleFile ( fileId , true ) ;
511530 toggleExpandedFile ( fileId ) ;
512531 }
513532 } ,
514- [ toggleExpandedFile ] ,
533+ [ toggleExpandedFile , loadVisibleFile ] ,
515534 ) ;
516535
517536 const handleNativeToggleViewedFile = useCallback (
@@ -574,12 +593,12 @@ export function ReviewSheet(props: ReviewSheetProps) {
574593 ( event : { nativeEvent : { event : string } } ) => {
575594 const id = event . nativeEvent . event ;
576595 if ( id === "refresh" ) {
577- void refreshSelectedSection ( ) ;
596+ void handlePullToRefresh ( ) ;
578597 } else if ( id . startsWith ( "section:" ) ) {
579598 selectSection ( id . slice ( "section:" . length ) ) ;
580599 }
581600 } ,
582- [ refreshSelectedSection , selectSection ] ,
601+ [ handlePullToRefresh , selectSection ] ,
583602 ) ;
584603 const handleRetryEnvironment = useCallback ( ( ) => {
585604 void retryEnvironment ( environmentId ) ;
@@ -818,7 +837,7 @@ export function ReviewSheet(props: ReviewSheetProps) {
818837 < NativeReviewDiffView
819838 collapsable = { false }
820839 testID = "review-native-diff-view"
821- refreshing = { isPullRefreshing }
840+ refreshing = { isPullRefreshing || isSelectedSectionPending || areFilePatchesPending }
822841 onPullToRefresh = { ( ) => void handlePullToRefresh ( ) }
823842 style = { StyleSheet . absoluteFill }
824843 appearanceScheme = { selectedTheme }
@@ -862,7 +881,7 @@ export function ReviewSheet(props: ReviewSheetProps) {
862881 // iOS has no other refresh affordance here (the explicit
863882 // "Refresh current diff" menu is Android-only).
864883 < RefreshControl
865- refreshing = { isPullRefreshing }
884+ refreshing = { isPullRefreshing || isSelectedSectionPending || areFilePatchesPending }
866885 onRefresh = { ( ) => void handlePullToRefresh ( ) }
867886 />
868887 }
0 commit comments