@@ -387,7 +387,7 @@ import { ChatComposer, type ChatComposerHandle } from "./chat/ChatComposer";
387387import { createPageScrollController , type PageScrollKey } from "./chat/pageScrollController" ;
388388import { isTimelineScrollTarget } from "./chat/timelineScrollTarget" ;
389389import { DraftHeroHeadline } from "./chat/DraftHeroHeadline" ;
390- import { ExpandedImageDialog } from "./chat/ExpandedImageDialog" ;
390+ import { ExpandedImageDialogHost , openExpandedImagePreview } from "./chat/ExpandedImageDialog" ;
391391import {
392392 BranchRestoreConfirmHost ,
393393 DeviceSetupDialogHost ,
@@ -417,7 +417,7 @@ import {
417417 type PanelLayoutControlsProps ,
418418 RightPanelMaximizeControl ,
419419} from "./chat/PanelLayoutControls" ;
420- import { expandedImageKey , type ExpandedImagePreview } from "./chat/ExpandedImagePreview" ;
420+ import type { ExpandedImagePreview } from "./chat/ExpandedImagePreview" ;
421421import { ThreadDetailsPanel , type ThreadDetailsPanelProps } from "./chat/ThreadDetailsPanel" ;
422422import { NoActiveThreadState } from "./NoActiveThreadState" ;
423423import {
@@ -1275,13 +1275,6 @@ export default function ChatView(props: ChatViewProps) {
12751275 const citeAssistantTextStable = useStableCallback ( citeAssistantText ) ;
12761276 const [ showScrollToBottom , setShowScrollToBottom ] = useState ( false ) ;
12771277 const [ isWorkspaceFileDragActive , setIsWorkspaceFileDragActive ] = useState ( false ) ;
1278- const [ expandedImage , setExpandedImage ] = useState < ExpandedImagePreview | null > ( null ) ;
1279- useEffect ( ( ) => {
1280- const item = expandedImage ?. images [ expandedImage . index ] ;
1281- if ( item ?. type !== "video" || item . src === null || ! item . src . startsWith ( "blob:" ) ) return ;
1282- const src = item . src ;
1283- return ( ) => revokeBlobPreviewUrl ( src ) ;
1284- } , [ expandedImage ] ) ;
12851278 const [ optimisticUserMessages , setOptimisticUserMessages ] = useState < ChatMessage [ ] > ( [ ] ) ;
12861279 // Set by "Work locally": the draft whose restored message should be resent
12871280 // once the cancelled dispatch has settled and the draft is in local mode.
@@ -4657,19 +4650,13 @@ export default function ChatView(props: ChatViewProps) {
46574650 setRetiredOptimisticMessages ( optimisticUserMessages ) ;
46584651 setOptimisticUserMessages ( [ ] ) ;
46594652 resetLocalDispatch ( ) ;
4660- setExpandedImage ( null ) ;
46614653 }
46624654 useEffect ( ( ) => {
46634655 for ( const message of retiredOptimisticMessages ) {
46644656 revokeUserMessagePreviewUrls ( message ) ;
46654657 }
46664658 } , [ retiredOptimisticMessages ] ) ;
46674659
4668- const closeExpandedImage = ( ) => {
4669- setExpandedImage ( null ) ;
4670- } ;
4671- const closeExpandedImageStable = useStableCallback ( closeExpandedImage ) ;
4672-
46734660 const activeWorktreePath = activeThread ?. worktreePath ?? null ;
46744661 const derivedEnvMode : DraftThreadEnvMode = resolveEffectiveEnvMode ( {
46754662 activeWorktreePath,
@@ -7695,7 +7682,7 @@ export default function ChatView(props: ChatViewProps) {
76957682 } ;
76967683
76977684 const onExpandTimelineImage = ( preview : ExpandedImagePreview ) => {
7698- setExpandedImage ( preview ) ;
7685+ openExpandedImagePreview ( routeThreadKey , preview ) ;
76997686 } ;
77007687 const onExpandTimelineImageStable = useStableCallback ( onExpandTimelineImage ) ;
77017688 const onOpenTurnDiff = ( runId : RunId , filePath ?: string ) => {
@@ -8672,13 +8659,7 @@ export default function ChatView(props: ChatViewProps) {
86728659
86738660 < RevertConfirmHost threadKey = { routeThreadKey } onConfirm = { onConfirmRevertStable } />
86748661 < LinkPullRequestDialogHost />
8675- { expandedImage && (
8676- < ExpandedImageDialog
8677- key = { expandedImageKey ( expandedImage ) }
8678- preview = { expandedImage }
8679- onClose = { closeExpandedImageStable }
8680- />
8681- ) }
8662+ < ExpandedImageDialogHost threadKey = { routeThreadKey } />
86828663 </ div >
86838664 ) ;
86848665 return (
0 commit comments