@@ -10,6 +10,7 @@ import type {
1010} from "@t3tools/contracts" ;
1111import { scopedThreadKey } from "@t3tools/client-runtime/environment" ;
1212import { lazy , Suspense } from "react" ;
13+ import SideChatPane from "./SideChatPane" ;
1314import type { ComposerImageAttachment , DraftId } from "../../composerDraftStore" ;
1415import type { ShortcutMatchContext } from "../../keybindings" ;
1516import { type RightPanelSurface , useRightPanelStore } from "../../rightPanelStore" ;
@@ -31,7 +32,6 @@ const DevicePanel = lazy(() =>
3132 import ( "../device/DevicePanel" ) . then ( ( module ) => ( { default : module . DevicePanel } ) ) ,
3233) ;
3334const FilePreviewPanel = lazy ( ( ) => import ( "../files/FilePreviewPanel" ) ) ;
34- const SideChatPane = lazy ( ( ) => import ( "./SideChatPane" ) ) ;
3535
3636type RightPanelTerminalProps = Omit <
3737 PersistentThreadTerminalPanelProps ,
@@ -167,15 +167,14 @@ export function RightPanelSurfaceContent(props: {
167167 case "pull-requests" :
168168 return < ThreadPullRequestsPanel threadRef = { threadRef } /> ;
169169 case "side-chat" :
170+ // Not lazy: revealing a suspended tiptap editor tears down its view and crashes the composer.
170171 return (
171- < Suspense fallback = { null } >
172- < SideChatPane
173- key = { surface . id }
174- parentRef = { threadRef }
175- threadId = { surface . threadId }
176- onClose = { ( ) => props . onCloseSurface ( surface ) }
177- />
178- </ Suspense >
172+ < SideChatPane
173+ key = { surface . id }
174+ parentRef = { threadRef }
175+ threadId = { surface . threadId }
176+ onClose = { ( ) => props . onCloseSurface ( surface ) }
177+ />
179178 ) ;
180179 case "device" :
181180 return (
0 commit comments