Record your screen, ship a demo. Free and open-source, GPU-accelerated, no watermarks, no subscriptions. Windows, macOS, Linux. Actively maintained.
TypeScript cross-platformelectronffmpegopen-sourceproduct-demorustscreen-capturescreen-recorderscreen-recordingscreen-studioscreencastspeech-to-texttypescriptvideo-editingvideo-editorwaylandwgpuwhisper
fix(preview): hand out no native view while the view for a new source is created
EtienneLescotb834416cc6fc
diff --git a/src/native/hooks/useNativeCompositorView.test.ts b/src/native/hooks/useNativeCompositorView.test.tsindex 199a1ee67..55b89174b 100644--- a/src/native/hooks/useNativeCompositorView.test.ts+++ b/src/native/hooks/useNativeCompositorView.test.ts@@ -291,4 +291,30 @@ describe("useNativeCompositorView", () => {expect(mocks.readCompositorFrame).not.toHaveBeenCalled();expect(result.current.error).toBeNull();});++ // Issue #960: on a project switch the old view is destroyed in the same commit that+ // starts creating the new one. Handing out the old id meanwhile let the caller push the+ // new project's scene and clip to the dying view, and the preview drew captions and+ // frames at the wrong times.+ it("hands out no view id while the view for a new source is being created", async () => {+ mocks.readCompositorFrame.mockResolvedValue(null);+ let resolveSecond: (value: { id: number }) => void = () => undefined;+ mocks.createCompositorView+ .mockResolvedValueOnce({ id: 7 })+ .mockReturnValueOnce(new Promise((resolve) => (resolveSecond = resolve)));++ const ref = stubCanvasRef();+ const { result, rerender } = renderHook(+ ({ screenPath }) => useNativeCompositorView(ref, { sources: { screenPath } }),+ { initialProps: { screenPath: "a.mp4" } },+ );+ await waitFor(() => expect(result.current.viewId).toBe(7));++ rerender({ screenPath: "b.mp4" });+ expect(result.current.viewId).toBeNull();+ expect(mocks.destroyCompositorView).toHaveBeenCalledWith(7);++ resolveSecond({ id: 8 });+ await waitFor(() => expect(result.current.viewId).toBe(8));+ });});diff --git a/src/native/hooks/useNativeCompositorView.ts b/src/native/hooks/useNativeCompositorView.tsindex e07953268..416b57c77 100644--- a/src/native/hooks/useNativeCompositorView.ts+++ b/src/native/hooks/useNativeCompositorView.ts@@ -91,12 +91,19 @@ export function useNativeCompositorView(// Re-create the native view when the screen source changes (e.g. loading a different// project) so it never keeps showing a stale clip.const screenPath = opts.sources?.screenPath;- const [viewId, setViewId] = useState<number | null>(null);+ const [view, setView] = useState<{ id: number; screenPath: string | undefined } | null>(null);+ // A view is only handed out for the source it was created for. When a project switch+ // changes the source, the old view is destroyed in this very commit while the new one is+ // still being created; returning its id in the meantime let the caller's effects push the+ // NEW project's scene and clip to the dying view, and the preview then drew captions and+ // frames at the wrong times until something re-pushed the scene (#960).+ const viewId = view && view.screenPath === screenPath ? view.id : null;const [error, setError] = useState<string | null>(null);// Mirror into a ref so async callbacks always see the freshest id without- // re-subscribing the main effect.+ // re-subscribing the main effect. It tracks the live native view, not `viewId`, so the+ // cleanup still destroys the old view after a source change.const viewIdRef = useRef<number | null>(null);- viewIdRef.current = viewId;+ viewIdRef.current = view?.id ?? null;useEffect(() => {if (!enabled) {@@ -300,7 +307,7 @@ export function useNativeCompositorView(return;}viewIdRef.current = result.id;- setViewId(result.id);+ setView({ id: result.id, screenPath });});const observer = new ResizeObserver(scheduleRectUpdate);