Skip to content

🎥 Make videos programmatically with React

Merge remote-tracking branch 'origin/main' into codex/sequence-layout-none-outlines

JonnyBurger971860d7f73f
diff --cc packages/canvas/src/canvas.tsx
index 860a8a98d4,c83a7ce9f6..29472d05d7
--- a/packages/canvas/src/canvas.tsx
+++ b/packages/canvas/src/canvas.tsx
@@@ -4,17 -4,18 +4,20 @@@ import type {RefObject} from 'react'
import React, {
forwardRef,
useCallback,
+ useContext,
useEffect,
+ useLayoutEffect,
useMemo,
} from 'react';
- import {Internals, type AnyZodObject, type TSequence} from 'remotion';
+ import type {AnyZodObject, TSequence} from 'remotion';
+ import {Internals} from 'remotion';
import type {CanvasController} from './canvas-controller';
import {getCanvasControllerInternals} from './canvas-controller';
import {CanvasOutlineOverlay} from './canvas-outline-overlay';
+import {installFiberCommitOrderObserver} from './install-fiber-sequence-order-observer';
import type {CanvasSequenceNodePathResolver} from './sequence-node-path';
import {getCanvasSequenceNodePathInfo} from './sequence-node-path';
+ import {useSyncExternalStore} from './use-sync-external-store';
export type CanvasProps<
Schema extends AnyZodObject,
@@@ -48,40 -74,40 +76,52 @@@ const CanvasFn =
useEffect(() => {
return () => internals.clear();
}, [internals]);
+ // React Refresh (used by Browser Studio) or React DevTools must have
+ // registered the renderer before this commit. Install before the commit hook
+ // fires so the initial outline nodes are discovered as well.
+ useLayoutEffect(() => {
+ if (showOutlines && typeof window !== 'undefined') {
+ installFiberCommitOrderObserver(window);
+ }
+ }, [showOutlines]);
const overlay = useMemo(
- () =>
- showOutlines ? (
- <CanvasOutlineOverlay
- controller={controller}
- resolveSequenceNodePathInfo={resolveSequenceNodePathInfo}
- />
- ) : null,
+ () => (
+ <>
+ <CanvasVisualModeBridge controller={controller} />
+ {showOutlines ? (
+ <CanvasOutlineOverlay
+ controller={controller}
+ resolveSequenceNodePathInfo={resolveSequenceNodePathInfo}
+ />
+ ) : null}
+ </>
+ ),
[controller, resolveSequenceNodePathInfo, showOutlines],
);
return React.createElement(
- PlayerInternals.TimelineSequenceObserverContext.Provider,
- {value: onTimelineSequenceChange},
+ Internals.EnableInteractivityProvider,
+ null,
React.createElement(
- Internals.OverrideIdsToNodePathsGettersContext.Provider,
- {value: nodePathGetters},
+ Internals.SequenceOutlineContext.Provider,
+ {value: showOutlines},
React.createElement(
- PlayerInternals.CanvasOverlayContext.Provider,
- {value: overlay},
- PlayerInternals.TimelineSequenceObserverContext.Provider,
- {value: onTimelineSequenceChange},
++ Internals.OverrideIdsToNodePathsGettersContext.Provider,
++ {value: nodePathGetters},
React.createElement(
- Player as React.ComponentType,
- {
- ...(playerProps as Record<string, unknown>),
- ref,
- } as Record<string, unknown>,
- PlayerInternals.CanvasOverlayContext.Provider,
- {value: overlay},
++ PlayerInternals.TimelineSequenceObserverContext.Provider,
++ {value: onTimelineSequenceChange},
+ React.createElement(
- Player as React.ComponentType,
- {
- ...(playerProps as Record<string, unknown>),
- ref,
- } as Record<string, unknown>,
++ PlayerInternals.CanvasOverlayContext.Provider,
++ {value: overlay},
++ React.createElement(
++ Player as React.ComponentType,
++ {
++ ...(playerProps as Record<string, unknown>),
++ ref,
++ } as Record<string, unknown>,
++ ),
+ ),
),
),
),