🎥 Make videos programmatically with React
Merge commit '3c39eb558f5d9949c86d9d73085c981261d6b93b' into codex/sequence-registration-on-commit
Jonny Burger3193ec7e95d8
diff --cc packages/core/src/internals.tsindex b4cf86c8a0,ccc6ede554..c82c433ce2--- a/packages/core/src/internals.ts+++ b/packages/core/src/internals.ts@@@ -44,9 -40,9 +45,10 @@@ importCompositionSetters,} from './CompositionManagerContext.js';import {CompositionManagerProvider} from './CompositionManagerProvider.js';+import {CompositionRegistryProvider} from './CompositionRegistryProvider.js';import * as CSSUtils from './default-css.js';import {OBJECTFIT_CONTAIN_CLASS_NAME} from './default-css.js';+ import {DefaultPremountContext} from './DefaultPremountContext.js';import {EditorPropsContext,EditorPropsProvider,@@@ -113,19 -109,19 +115,19 @@@ importfromField,hiddenField,premountSchema,-- sequencePremountSchema,sequenceCropSchema,++ sequencePremountSchema,sequenceSchema,sequenceStyleSchema,sequenceVisualStyleSchema,textSchema,-- trimAfterField,transformSchema,-- type AssetFieldSchema,++ trimAfterField,type ArrayFieldSchema,type ArrayItemFieldSchema,-- type InteractivitySchemaField,++ type AssetFieldSchema,type InteractivitySchema,++ type InteractivitySchemaField,type VisibleFieldSchema,} from './interactivity-schema.js';import {@@@ -201,10 -198,9 +203,10 @@@ importSequenceManager,SequenceManagerProvider,SequenceManagerRefContext,++ SequenceRegistrationContext,+ SequenceRegistryContext,useActiveFromDragOverrideKeys,useSequenceManagerSequences,-- SequenceRegistrationContext,VisualModeBatchSettersContext,VisualModeDragOverridesContext,VisualModePropStatusesContext,@@@ -217,8 -213,8 +219,8 @@@type CanUpdateSequencePropsResponseFalse,type CanUpdateSequencePropsResponseTrue,type SequenceNodePath,-- type SequencePropsSubscriptionKey,type SequencePropsStatusRemapping,++ type SequencePropsSubscriptionKey,type VideoConfigValues,} from './SequenceManager.js';import {setupEnvVariables} from './setup-env-variables.js';@@@ -262,8 -258,8 +264,8 @@@ import {PixelDensityContext} from './usimport {usePlaying} from './use-playing.js';import {usePremounting} from './use-premounting.js';import type {-- CanUpdateSequencePropStatusFalse,CanUpdateSequencePropStatusEasing,++ CanUpdateSequencePropStatusFalse,CanUpdateSequencePropStatusKeyframed,CanUpdateSequencePropStatusStatic,DragOverrideValue,@@@ -312,8 -308,8 +314,8 @@@ import typeimport {MediaVolumeContext,SetMediaVolumeContext,-- usePlayerMutedState,useMediaVolumeState,++ usePlayerMutedState,} from './volume-position-state.js';import {evaluateVolume} from './volume-prop.js';import {warnAboutTooHighVolume} from './volume-safeguard.js';@@@ -339,8 -335,7 +341,9 @@@ const compositionSelectorRef = createRe// Mark them as Internals so use don't assume this is public// API and are less likely to use itexport const Internals = {+ CommittedMetadataProvider,+ withCommittedMetadata,+ DefaultPremountContext,evaluateSourceNumericValue,evaluateSourcePropStatuses,AbsoluteFillElement,@@@ -546,8 -540,8 +550,8 @@@ Object.assign(Internals, {useSyncExternexport type {ArrayFieldSchema,-- AssetFieldSchema,ArrayItemFieldSchema,++ AssetFieldSchema,CannotUpdateSequenceReason,CanUpdateEffectPropsResponse,CanUpdateEffectPropsResponseFalse,@@@ -560,7 -554,7 +564,6 @@@CanUpdateSequencePropStatusFalse,CanUpdateSequencePropStatusKeyframed,CanUpdateSequencePropStatusStatic,-- VideoConfigNumericExpression,CompositionManagerContext,CompProps,DragOverrides,@@@ -570,6 -564,6 +573,8 @@@GetEffectDragOverrides,GetEffectPropStatuses,GetPropStatuses,++ InteractivitySchema,++ InteractivitySchemaField,JsxComponentIdentity,LoggingContextValue,MediaVolumeContextValue,@@@ -586,12 -580,12 +591,9 @@@ResolvedStackLocation,ScheduleAudioNodeOptions,ScheduleAudioNodeResult,-- InteractivitySchemaField,SequenceNodePath,-- SequencePropsSubscriptionKey,SequencePropsStatusRemapping,-- VideoConfigValues,-- InteractivitySchema,++ SequencePropsSubscriptionKey,SerializedJSONWithCustomFields,SetMediaVolumeContextValue,SetTimelineContextValue,@@@ -600,6 -594,6 +602,8 @@@TimelineContextValue,TRenderAsset,TSequence,++ VideoConfigNumericExpression,++ VideoConfigValues,VisibleFieldSchema,WatchRemotionStaticFilesPayload,};diff --cc packages/core/src/wrap-remotion-context.tsxindex deaf673eda,87a66f03ea..53f146940b--- a/packages/core/src/wrap-remotion-context.tsx+++ b/packages/core/src/wrap-remotion-context.tsx@@@ -2,31 -2,19 +2,32 @@@// such as in React Three Fiber. All the contexts need to be passed again// for them to be useable-import React, {useMemo} from 'react';+import React, {useCallback, useMemo, useRef, useState} from 'react';import {BufferingContextReact} from './buffering.js';import {CanUseRemotionHooks} from './CanUseRemotionHooks.js';+import {+ COMMIT_REGISTRATION_ERROR_EVENT,+ isCommitRegistrationObserverInstalled,+ withCommittedMetadata,+ type CommittedMetadata,+} from './committed-metadata.js';+import type {TSequence} from './CompositionManager.js';import {CompositionManager} from './CompositionManagerContext.js';+ import {DefaultPremountContext} from './DefaultPremountContext.js';import {LogLevelContext} from './log-level-context.js';import {PreloadContext} from './prefetch-state.js';+import {RemotionEnvironmentContext} from './remotion-environment-context.js';import {RenderAssetManager} from './RenderAssetManager.js';import {ResolveCompositionContext} from './ResolveCompositionConfig.js';import {SequenceContext} from './SequenceContext.js';import {- SequenceManager,++ DisableSequenceRegistrationContext,++ SequenceCommitRegistrationContext,+ SequenceManagerActionsContext,SequenceManagerRefContext,++ SequenceRegistrationContext,+ SequenceRegistryContext,+ SequenceRegistryScopeContext,- SequenceCommitRegistrationContext,- SequenceRegistrationContext,- DisableSequenceRegistrationContext,VisualModePropStatusesRefContext,} from './SequenceManager.js';import {@@@ -250,57 -102,49 +254,63 @@@ 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}>- <DefaultPremountContext.Provider- value={contexts.defaultPremountInSeconds}+ <BufferingContextReact.Provider+ value={contexts.bufferManagerContext}>- {children}- </DefaultPremountContext.Provider>- </TimelineTrackContext.Provider>- </ExperimentalTracksEnabledContext.Provider>- </BufferingContextReact.Provider>- </SequenceContext.Provider>- </SetTimelineContext.Provider>- </TimelineContext.Provider>- </ResolveCompositionContext.Provider>- </RenderAssetManager.Provider>- </VisualModePropStatusesRefContext.Provider>- </SequenceManager.Provider>+ <ExperimentalTracksEnabledContext.Provider+ value={contexts.experimentalTracksEnabled}+ >+ <TimelineTrackContext.Provider+ value={contexts.timelineTrackContext}+ >- {children}++ <DefaultPremountContext.Provider++ value={++ contexts.defaultPremountInSeconds++ }++ >++ {children}++ </DefaultPremountContext.Provider>+ </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>