🎥 Make videos programmatically with React
Merge remote-tracking branch 'origin/main' into codex/sequence-registration-on-commit
Jonny Burger3816b3f94ff4
diff --cc packages/core/src/Sequence.tsxindex a2d017cb3e,e9a483243a..4bbb04a5f3--- a/packages/core/src/Sequence.tsx+++ b/packages/core/src/Sequence.tsx@@@ -873,11 -897,23 +897,24 @@@ const RegularSequenceRefForwardingFunct)}</SequenceContext.Provider>);+ // Keep the provider mounted when track grouping changes so clip state survives.+ const sequence = (+ <TimelineTrackContext.Provider+ value={+ timelineTrackRole === 'track' ||+ (timelineTrackRole === 'clip' && !showInTimeline)+ ? timelineTrack+ : null+ }+ >+ {sequenceContent}+ </TimelineTrackContext.Provider>+ );- return shouldDiscoverOutline ? (+ return shouldDiscoverOutline || registration !== null ? (<SequenceOrderMarkersequenceId={id}+ registration={registration}outlineChildrenRef={automaticOutlineRef}>{sequence}diff --cc packages/core/src/wrap-remotion-context.tsxindex 0b3de452f2,c7ae11f95f..d45b1fb5e2--- a/packages/core/src/wrap-remotion-context.tsx+++ b/packages/core/src/wrap-remotion-context.tsx@@@ -20,14 -14,12 +20,18 @@@ import {SequenceContext} from './Sequenimport {SequenceManager,SequenceManagerRefContext,+ SequenceRegistryContext,+ SequenceRegistryScopeContext,+ SequenceRegistryProvider,+ SequenceCommitRegistrationContext,+ SequenceRegistrationContext,+ DisableSequenceRegistrationContext,VisualModePropStatusesRefContext,} from './SequenceManager.js';+ import {+ ExperimentalTracksEnabledContext,+ TimelineTrackContext,+ } from './timeline-track-context.js';import {SetTimelineContext, TimelineContext} from './TimelineContext.js';export function useRemotionContexts() {@@@ -193,49 -98,45 +205,57 @@@ export const RemotionContextProvider =<SequenceManagerRefContext.Providervalue={contexts.sequenceManagerRefContext}>- <SequenceManager.Provider value={contexts.sequenceManagerContext}>- <VisualModePropStatusesRefContext.Provider- value={contexts.visualModePropStatusesRefContext}+ <RemotionEnvironmentContext.Provider+ value={contexts.remotionEnvironmentContext}+ >+ <SequenceRegistrationContext.Provider+ value={contexts.sequenceRegistrationContext}>- <RenderAssetManager.Provider- value={contexts.renderAssetManagerContext}+ <DisableSequenceRegistrationContext.Provider+ value={contexts.disableSequenceRegistrationContext}>- <ResolveCompositionContext.Provider- value={contexts.resolveCompositionContext}- >- <TimelineContext.Provider- value={contexts.timelineContext}+ <ForwardedSequenceRegistry contexts={contexts}>+ <VisualModePropStatusesRefContext.Provider+ value={contexts.visualModePropStatusesRefContext}>- <SetTimelineContext.Provider- value={contexts.setTimelineContext}+ <RenderAssetManager.Provider+ value={contexts.renderAssetManagerContext}>- <SequenceContext.Provider- value={contexts.sequenceContext}+ <ResolveCompositionContext.Provider+ value={contexts.resolveCompositionContext}>- <BufferingContextReact.Provider- value={contexts.bufferManagerContext}+ <TimelineContext.Provider+ value={contexts.timelineContext}>- <ExperimentalTracksEnabledContext.Provider- value={contexts.experimentalTracksEnabled}+ <SetTimelineContext.Provider+ value={contexts.setTimelineContext}>- <TimelineTrackContext.Provider- value={contexts.timelineTrackContext}+ <SequenceContext.Provider+ value={contexts.sequenceContext}>- {children}- </TimelineTrackContext.Provider>- </ExperimentalTracksEnabledContext.Provider>- </BufferingContextReact.Provider>- </SequenceContext.Provider>- </SetTimelineContext.Provider>- </TimelineContext.Provider>- </ResolveCompositionContext.Provider>- </RenderAssetManager.Provider>- </VisualModePropStatusesRefContext.Provider>- </SequenceManager.Provider>+ <BufferingContextReact.Provider+ value={contexts.bufferManagerContext}+ >- {children}++ <ExperimentalTracksEnabledContext.Provider++ value={contexts.experimentalTracksEnabled}++ >++ <TimelineTrackContext.Provider++ value={contexts.timelineTrackContext}++ >++ {children}++ </TimelineTrackContext.Provider>++ </ExperimentalTracksEnabledContext.Provider>+ </BufferingContextReact.Provider>+ </SequenceContext.Provider>+ </SetTimelineContext.Provider>+ </TimelineContext.Provider>+ </ResolveCompositionContext.Provider>+ </RenderAssetManager.Provider>+ </VisualModePropStatusesRefContext.Provider>+ </ForwardedSequenceRegistry>+ </DisableSequenceRegistrationContext.Provider>+ </SequenceRegistrationContext.Provider>+ </RemotionEnvironmentContext.Provider></SequenceManagerRefContext.Provider></CompositionManager.Provider></PreloadContext.Provider>