Skip to content

Commit af1d91b

Browse files
fix(studio): dispose SDK session if cleanup fires during openComposition
Reviewer found a race: if the effect cleanup runs while openComposition is awaited, comp is null so cleanup is a no-op, but the composition is then set and never disposed. Add an explicit check after the await so any composition opened after cancellation is disposed immediately. Also wire the missing useSdkSession call in App.tsx (sdkSession was referenced but never declared — pre-existing typecheck failure), move the stableRenderQueue memo into useRenderQueue so App.tsx stays under the 600-line architecture gate. Co-Authored-By: Claude Sonnet 4.6 <[email protected]> Co-authored-by: Miguel Ángel <[email protected]>
1 parent 6a66aa9 commit af1d91b

3 files changed

Lines changed: 21 additions & 22 deletions

File tree

‎packages/studio/src/App.tsx‎

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -266,6 +266,7 @@ export function StudioApp() {
266266
() => leftSidebarRef.current?.getTab() ?? "compositions",
267267
[],
268268
);
269+
const sdkSession = useSdkSession(projectId, activeCompPath);
269270
const domEditSession = useDomEditSession({
270271
projectId,
271272
activeCompPath,
@@ -426,17 +427,6 @@ export function StudioApp() {
426427
applyDomSelection: domEditSession.applyDomSelection,
427428
initialState: initialUrlStateRef.current,
428429
});
429-
const { jobs, isRendering, deleteRender, clearCompleted, startRender } = renderQueue;
430-
const stableRenderQueue = useMemo(
431-
() => ({
432-
jobs,
433-
isRendering,
434-
deleteRender,
435-
clearCompleted,
436-
startRender: startRender as (options: unknown) => Promise<void>,
437-
}),
438-
[jobs, isRendering, deleteRender, clearCompleted, startRender],
439-
);
440430
const studioCtxValue = buildStudioContextValue({
441431
projectId: projectId!,
442432
activeCompPath,
@@ -452,7 +442,7 @@ export function StudioApp() {
452442
editHistory,
453443
handleUndo: appHotkeys.handleUndo,
454444
handleRedo: appHotkeys.handleRedo,
455-
renderQueue: stableRenderQueue,
445+
renderQueue,
456446
compositionDimensions,
457447
waitForPendingDomEditSaves: previewPersistence.waitForPendingDomEditSaves,
458448
handlePreviewIframeRef,
@@ -492,7 +482,7 @@ export function StudioApp() {
492482
refreshCaptureFrameTime={frameCapture.refreshCaptureFrameTime}
493483
inspectorButtonActive={inspectorButtonActive}
494484
inspectorPanelActive={inspectorPanelActive}
495-
onExport={() => void renderQueue.startRender()}
485+
onExport={() => void renderQueue.startRender(undefined)}
496486
/>
497487
{previewPersistence.domEditSaveQueuePaused && (
498488
<SaveQueuePausedBanner

‎packages/studio/src/components/renders/useRenderQueue.ts‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { useState, useEffect, useCallback, useRef } from "react";
1+
import { useState, useEffect, useCallback, useRef, useMemo } from "react";
22
import { trackStudioRenderStart } from "../../telemetry/events";
33

44
export interface RenderJob {
@@ -238,11 +238,15 @@ export function useRenderQueue(projectId: string | null) {
238238
};
239239
}, [projectId]);
240240

241-
return {
242-
jobs,
243-
startRender,
244-
deleteRender,
245-
clearCompleted,
246-
isRendering: jobs.some((j) => j.status === "rendering"),
247-
};
241+
const isRendering = jobs.some((j) => j.status === "rendering");
242+
return useMemo(
243+
() => ({
244+
jobs,
245+
isRendering,
246+
deleteRender,
247+
clearCompleted,
248+
startRender: startRender as (options: unknown) => Promise<void>,
249+
}),
250+
[jobs, isRendering, deleteRender, clearCompleted, startRender],
251+
);
248252
}

‎packages/studio/src/hooks/useSdkSession.ts‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,12 @@ export function useSdkSession(
3636
comp.on("persist:error", (e) => {
3737
console.warn("[sdk] persist:error", e.error);
3838
});
39-
if (!cancelled) setSession(comp);
39+
// Cleanup may have fired while openComposition was awaited; dispose immediately.
40+
if (cancelled) {
41+
comp.dispose();
42+
return;
43+
}
44+
setSession(comp);
4045
})
4146
.catch(() => {
4247
if (!cancelled) setSession(null);

0 commit comments

Comments
 (0)