@@ -538,14 +538,6 @@ export function ThreadFilesTreeScreen() {
538538 [ projectName ] ,
539539 ) ;
540540
541- if ( selectedThread === null || environmentId === null || threadId === null ) {
542- return < LoadingScreen message = "Opening files..." messagePlacement = "above-spinner" /> ;
543- }
544-
545- if ( cwd === null ) {
546- return < FilesUnavailable /> ;
547- }
548-
549541 if ( fileInspector . supported ) {
550542 return (
551543 < ThreadRouteScreen
@@ -555,6 +547,14 @@ export function ThreadFilesTreeScreen() {
555547 ) ;
556548 }
557549
550+ if ( selectedThread === null || environmentId === null || threadId === null ) {
551+ return < LoadingScreen message = "Opening files..." messagePlacement = "above-spinner" /> ;
552+ }
553+
554+ if ( cwd === null ) {
555+ return < FilesUnavailable /> ;
556+ }
557+
558558 return (
559559 < View className = "flex-1 bg-sheet" >
560560 < Stack . Screen
@@ -652,6 +652,15 @@ export function ThreadFileScreen() {
652652 assetPreviewUri === null || previewRevision === 0
653653 ? assetPreviewUri
654654 : `${ assetPreviewUri } ${ assetPreviewUri . includes ( "?" ) ? "&" : "?" } revision=${ previewRevision } ` ;
655+ const handleReturnToThread = useCallback ( ( ) => {
656+ if ( router . canGoBack ( ) ) {
657+ router . back ( ) ;
658+ return ;
659+ }
660+ if ( environmentId !== null && threadId !== null ) {
661+ router . replace ( buildThreadRoutePath ( { environmentId, threadId } ) ) ;
662+ }
663+ } , [ environmentId , router , threadId ] ) ;
655664 const needsFileContents =
656665 relativePath !== null &&
657666 ( resolvedActiveMode === "source" || isMarkdownPreviewFile ( relativePath ) ) ;
@@ -692,6 +701,15 @@ export function ThreadFileScreen() {
692701 [ cwd , environmentId , fileInspector . supported , handleSelectFile , projectName , relativePath ] ,
693702 ) ;
694703
704+ if ( fileInspector . supported && environmentId !== null && threadId !== null ) {
705+ return (
706+ < ThreadRouteScreen
707+ onReturnToThread = { handleReturnToThread }
708+ renderInspector = { renderInspector }
709+ />
710+ ) ;
711+ }
712+
695713 if ( selectedThread === null || environmentId === null || threadId === null ) {
696714 return < LoadingScreen message = "Opening file..." messagePlacement = "above-spinner" /> ;
697715 }
0 commit comments