@@ -386,7 +386,7 @@ import { ChatComposer, type ChatComposerHandle } from "./chat/ChatComposer";
386386import { createPageScrollController , type PageScrollKey } from "./chat/pageScrollController" ;
387387import { isTimelineScrollTarget } from "./chat/timelineScrollTarget" ;
388388import { DraftHeroHeadline } from "./chat/DraftHeroHeadline" ;
389- import { ExpandedImageDialog } from "./chat/ExpandedImageDialog" ;
389+ import { ExpandedImageDialogHost , openExpandedImagePreview } from "./chat/ExpandedImageDialog" ;
390390import { PullRequestThreadDialog } from "./PullRequestThreadDialog" ;
391391import type { AssistantCitationRequest } from "./chat/AssistantCitationSource" ;
392392import { MessagesTimeline , type MessagesTimelineHistoryControls } from "./chat/MessagesTimeline" ;
@@ -407,7 +407,7 @@ import {
407407 type PanelLayoutControlsProps ,
408408 RightPanelMaximizeControl ,
409409} from "./chat/PanelLayoutControls" ;
410- import { expandedImageKey , type ExpandedImagePreview } from "./chat/ExpandedImagePreview" ;
410+ import type { ExpandedImagePreview } from "./chat/ExpandedImagePreview" ;
411411import { ThreadDetailsPanel , type ThreadDetailsPanelProps } from "./chat/ThreadDetailsPanel" ;
412412import { NoActiveThreadState } from "./NoActiveThreadState" ;
413413import {
@@ -1274,13 +1274,6 @@ export default function ChatView(props: ChatViewProps) {
12741274 const citeAssistantTextStable = useStableCallback ( citeAssistantText ) ;
12751275 const [ showScrollToBottom , setShowScrollToBottom ] = useState ( false ) ;
12761276 const [ isWorkspaceFileDragActive , setIsWorkspaceFileDragActive ] = useState ( false ) ;
1277- const [ expandedImage , setExpandedImage ] = useState < ExpandedImagePreview | null > ( null ) ;
1278- useEffect ( ( ) => {
1279- const item = expandedImage ?. images [ expandedImage . index ] ;
1280- if ( item ?. type !== "video" || item . src === null || ! item . src . startsWith ( "blob:" ) ) return ;
1281- const src = item . src ;
1282- return ( ) => revokeBlobPreviewUrl ( src ) ;
1283- } , [ expandedImage ] ) ;
12841277 const [ optimisticUserMessages , setOptimisticUserMessages ] = useState < ChatMessage [ ] > ( [ ] ) ;
12851278 // Set by "Work locally": the draft whose restored message should be resent
12861279 // once the cancelled dispatch has settled and the draft is in local mode.
@@ -4663,19 +4656,13 @@ export default function ChatView(props: ChatViewProps) {
46634656 setRetiredOptimisticMessages ( optimisticUserMessages ) ;
46644657 setOptimisticUserMessages ( [ ] ) ;
46654658 resetLocalDispatch ( ) ;
4666- setExpandedImage ( null ) ;
46674659 }
46684660 useEffect ( ( ) => {
46694661 for ( const message of retiredOptimisticMessages ) {
46704662 revokeUserMessagePreviewUrls ( message ) ;
46714663 }
46724664 } , [ retiredOptimisticMessages ] ) ;
46734665
4674- const closeExpandedImage = ( ) => {
4675- setExpandedImage ( null ) ;
4676- } ;
4677- const closeExpandedImageStable = useStableCallback ( closeExpandedImage ) ;
4678-
46794666 const activeWorktreePath = activeThread ?. worktreePath ?? null ;
46804667 const derivedEnvMode : DraftThreadEnvMode = resolveEffectiveEnvMode ( {
46814668 activeWorktreePath,
@@ -7709,7 +7696,7 @@ export default function ChatView(props: ChatViewProps) {
77097696 } ;
77107697
77117698 const onExpandTimelineImage = ( preview : ExpandedImagePreview ) => {
7712- setExpandedImage ( preview ) ;
7699+ openExpandedImagePreview ( routeThreadKey , preview ) ;
77137700 } ;
77147701 const onExpandTimelineImageStable = useStableCallback ( onExpandTimelineImage ) ;
77157702 const onOpenTurnDiff = ( runId : RunId , filePath ?: string ) => {
@@ -8775,13 +8762,7 @@ export default function ChatView(props: ChatViewProps) {
87758762 </ AlertDialogPopup >
87768763 </ AlertDialog >
87778764 < LinkPullRequestDialogHost />
8778- { expandedImage && (
8779- < ExpandedImageDialog
8780- key = { expandedImageKey ( expandedImage ) }
8781- preview = { expandedImage }
8782- onClose = { closeExpandedImageStable }
8783- />
8784- ) }
8765+ < ExpandedImageDialogHost threadKey = { routeThreadKey } />
87858766 </ div >
87868767 ) ;
87878768 return (
0 commit comments