@@ -7836,17 +7836,30 @@ export default function ChatView(props: ChatViewProps) {
78367836 queueSendGate ,
78377837 ] ) ;
78387838
7839- const onSteerQueuedMessage = ( id : string ) => {
7840- const message = queuedMessages . find ( ( entry ) => entry . id === id ) ;
7841- if ( ! message || sendInFlightRef . current || queueBlockedByPendingRequest ) return ;
7842- void onSend ( undefined , message . submissionIntent , undefined , message ) ;
7843- } ;
7844-
7845- const onRemoveQueuedMessage = ( id : string ) => {
7846- if ( ! activeThreadKey ) return ;
7847- const message = useQueuedMessageStore . getState ( ) . remove ( activeThreadKey , id ) ;
7848- if ( message ) restoreQueuedMessagesToComposer ( [ message ] ) ;
7839+ // The row handlers are read from refs at call-time so their identity stays
7840+ // stable and does not bust TimelineRowCtx on every ChatView render.
7841+ const queuedMessageActionsRef = useRef ( {
7842+ steer : ( _id : string ) => { } ,
7843+ remove : ( _id : string ) => { } ,
7844+ } ) ;
7845+ queuedMessageActionsRef . current = {
7846+ steer : ( id ) => {
7847+ const message = queuedMessages . find ( ( entry ) => entry . id === id ) ;
7848+ if ( ! message || sendInFlightRef . current || queueBlockedByPendingRequest ) return ;
7849+ void onSend ( undefined , message . submissionIntent , undefined , message ) ;
7850+ } ,
7851+ remove : ( id ) => {
7852+ if ( ! activeThreadKey ) return ;
7853+ const message = useQueuedMessageStore . getState ( ) . remove ( activeThreadKey , id ) ;
7854+ if ( message ) restoreQueuedMessagesToComposer ( [ message ] ) ;
7855+ } ,
78497856 } ;
7857+ const onSteerQueuedMessage = useCallback ( ( id : string ) => {
7858+ queuedMessageActionsRef . current . steer ( id ) ;
7859+ } , [ ] ) ;
7860+ const onRemoveQueuedMessage = useCallback ( ( id : string ) => {
7861+ queuedMessageActionsRef . current . remove ( id ) ;
7862+ } , [ ] ) ;
78507863 // Stop also cancels the queue: the messages return to the composer instead
78517864 // of starting a new turn the moment the interrupted one settles.
78527865 restoreQueuedMessagesRef . current = restoreQueuedMessagesToComposer ;
0 commit comments