remotion 4.0.532 → 4.0.534

package/dist/cjs/with-interactivity-schema.js

@@ -121,13 +121,12 @@ const mergeValues = ({ flatSchema, props, valuesDotNotation, schemaKeys, propsTo
     return merged;
 };
 exports.mergeValues = mergeValues;
-const stackToOverrideMap = {};
 const DisableInteractivityContext = (0, react_1.createContext)(false);
 const DisableInteractivityProvider = ({ children }) => {
     return react_1.default.createElement(DisableInteractivityContext.Provider, { value: true }, children);
 };
 exports.DisableInteractivityProvider = DisableInteractivityProvider;
-// Authoring surfaces outside the Studio, such as @remotion/canvas, opt into
+// Authoring surfaces outside the Studio, such as @remotion/sdk, opt into
 // populating `controls` and applying Visual Mode overrides.
 const EnableInteractivityContext = (0, react_1.createContext)(false);
 const EnableInteractivityProvider = ({ children }) => {
@@ -139,6 +138,9 @@ const withInteractivitySchema = ({ Component, componentName, componentIdentity =
     const schemaWithSequenceName = (0, interactivity_schema_js_1.extendSchemaWithSequenceName)(schema);
     const flatSchema = (0, flatten_schema_js_1.getFlatSchemaWithAllKeys)(schemaWithSequenceName);
     const flatKeys = Object.keys(flatSchema);
+    // A structural edit can put a different component at the same stack.
+    // Only reuse overrides for instances of this component.
+    const stackToOverrideMap = {};
     const Wrapped = (0, react_1.forwardRef)((props, ref) => {
         var _a;
         const { _remotionInternalStack: internalStack, ...propsWithoutInternalStack } = props;
@@ -160,8 +162,6 @@ const withInteractivitySchema = ({ Component, componentName, componentIdentity =
         // eslint-disable-next-line react-hooks/rules-of-hooks
         const { propStatuses } = (0, react_1.useContext)(SequenceManager_js_1.VisualModePropStatusesContext);
         // eslint-disable-next-line react-hooks/rules-of-hooks
-        const { getDragOverrides } = (0, react_1.useContext)(SequenceManager_js_1.VisualModeDragOverridesContext);
-        // eslint-disable-next-line react-hooks/rules-of-hooks
         const nodePathMapping = (0, react_1.useContext)(sequence_node_path_js_1.OverrideIdsToNodePathsGettersContext);
         // eslint-disable-next-line react-hooks/rules-of-hooks
         const frame = (0, use_current_frame_js_1.useCurrentFrame)();
@@ -212,6 +212,8 @@ const withInteractivitySchema = ({ Component, componentName, componentIdentity =
         const nodePath = env.isReadOnlyStudio
             ? null
             : ((_a = nodePathMapping.overrideIdToNodePathMappings[overrideId]) !== null && _a !== void 0 ? _a : null);
+        // eslint-disable-next-line react-hooks/rules-of-hooks
+        const dragOverrides = (0, SequenceManager_js_1.useDragOverridesForNodePath)(nodePath);
         // Read the runtime values for every flat key from the JSX props,
         // memoized on the leaf values so the object reference is stable
         // when nothing changed — otherwise downstream `useMemo`s churn and
@@ -258,17 +260,21 @@ const withInteractivitySchema = ({ Component, componentName, componentIdentity =
             return (0, use_schema_js_1.computeEffectiveSchemaValuesDotNotation)({
                 schema: schemaWithSequenceName,
                 currentValue: currentRuntimeValueDotNotation,
-                overrideValues: nodePath === null ? {} : getDragOverrides(nodePath),
+                overrideValues: dragOverrides,
                 propStatus: nodePath === null
                     ? undefined
-                    : (0, use_memoized_effects_js_1.getPropStatusesCtx)(propStatuses, nodePath),
+                    : (0, use_memoized_effects_js_1.getPropStatusesCtx)(propStatuses, {
+                        ...nodePath,
+                        videoConfigValues,
+                    }),
                 frame,
             });
         }, [
             currentRuntimeValueDotNotation,
-            getDragOverrides,
+            dragOverrides,
             nodePath,
             propStatuses,
+            videoConfigValues,
             frame,
         ]);
         // 4. Eliminate values forbidden by the resolved discriminated union.

package/dist/cjs/wrap-remotion-context.d.ts

@@ -4,6 +4,8 @@ export declare function useRemotionContexts(): {
     timelineContext: import("./TimelineContext.js").TimelineContextValue | null;
     setTimelineContext: import("./TimelineContext.js").SetTimelineContextValue;
     sequenceContext: import("./SequenceContext.js").SequenceContextType | null;
+    experimentalTracksEnabled: boolean;
+    timelineTrackContext: import("./timeline-track-context.js").TimelineTrack | null;
     canUseRemotionHooksContext: boolean;
     preloadContext: {
         [x: string]: string;

package/dist/cjs/wrap-remotion-context.js

@@ -49,12 +49,15 @@ const RenderAssetManager_js_1 = require("./RenderAssetManager.js");
 const ResolveCompositionConfig_js_1 = require("./ResolveCompositionConfig.js");
 const SequenceContext_js_1 = require("./SequenceContext.js");
 const SequenceManager_js_1 = require("./SequenceManager.js");
+const timeline_track_context_js_1 = require("./timeline-track-context.js");
 const TimelineContext_js_1 = require("./TimelineContext.js");
 function useRemotionContexts() {
     const compositionManagerCtx = react_1.default.useContext(CompositionManagerContext_js_1.CompositionManager);
     const timelineContext = react_1.default.useContext(TimelineContext_js_1.TimelineContext);
     const setTimelineContext = react_1.default.useContext(TimelineContext_js_1.SetTimelineContext);
     const sequenceContext = react_1.default.useContext(SequenceContext_js_1.SequenceContext);
+    const experimentalTracksEnabled = react_1.default.useContext(timeline_track_context_js_1.ExperimentalTracksEnabledContext);
+    const timelineTrackContext = react_1.default.useContext(timeline_track_context_js_1.TimelineTrackContext);
     const canUseRemotionHooksContext = react_1.default.useContext(CanUseRemotionHooks_js_1.CanUseRemotionHooks);
     const preloadContext = react_1.default.useContext(prefetch_state_js_1.PreloadContext);
     const resolveCompositionContext = react_1.default.useContext(ResolveCompositionConfig_js_1.ResolveCompositionContext);
@@ -69,6 +72,8 @@ function useRemotionContexts() {
         timelineContext,
         setTimelineContext,
         sequenceContext,
+        experimentalTracksEnabled,
+        timelineTrackContext,
         canUseRemotionHooksContext,
         preloadContext,
         resolveCompositionContext,
@@ -81,6 +86,8 @@ function useRemotionContexts() {
     }), [
         compositionManagerCtx,
         sequenceContext,
+        experimentalTracksEnabled,
+        timelineTrackContext,
         setTimelineContext,
         timelineContext,
         canUseRemotionHooksContext,
@@ -96,6 +103,6 @@ function useRemotionContexts() {
 }
 const RemotionContextProvider = (props) => {
     const { children, contexts } = props;
-    return (jsx_runtime_1.jsx(log_level_context_js_1.LogLevelContext.Provider, { value: contexts.logLevelContext, children: jsx_runtime_1.jsx(CanUseRemotionHooks_js_1.CanUseRemotionHooks.Provider, { value: contexts.canUseRemotionHooksContext, children: jsx_runtime_1.jsx(prefetch_state_js_1.PreloadContext.Provider, { value: contexts.preloadContext, children: jsx_runtime_1.jsx(CompositionManagerContext_js_1.CompositionManager.Provider, { value: contexts.compositionManagerCtx, children: jsx_runtime_1.jsx(SequenceManager_js_1.SequenceManagerRefContext.Provider, { value: contexts.sequenceManagerRefContext, children: jsx_runtime_1.jsx(SequenceManager_js_1.SequenceManager.Provider, { value: contexts.sequenceManagerContext, children: jsx_runtime_1.jsx(SequenceManager_js_1.VisualModePropStatusesRefContext.Provider, { value: contexts.visualModePropStatusesRefContext, children: jsx_runtime_1.jsx(RenderAssetManager_js_1.RenderAssetManager.Provider, { value: contexts.renderAssetManagerContext, children: jsx_runtime_1.jsx(ResolveCompositionConfig_js_1.ResolveCompositionContext.Provider, { value: contexts.resolveCompositionContext, children: jsx_runtime_1.jsx(TimelineContext_js_1.TimelineContext.Provider, { value: contexts.timelineContext, children: jsx_runtime_1.jsx(TimelineContext_js_1.SetTimelineContext.Provider, { value: contexts.setTimelineContext, children: jsx_runtime_1.jsx(SequenceContext_js_1.SequenceContext.Provider, { value: contexts.sequenceContext, children: jsx_runtime_1.jsx(buffering_js_1.BufferingContextReact.Provider, { value: contexts.bufferManagerContext, children: children }) }) }) }) }) }) }) }) }) }) }) }) }));
+    return (jsx_runtime_1.jsx(log_level_context_js_1.LogLevelContext.Provider, { value: contexts.logLevelContext, children: jsx_runtime_1.jsx(CanUseRemotionHooks_js_1.CanUseRemotionHooks.Provider, { value: contexts.canUseRemotionHooksContext, children: jsx_runtime_1.jsx(prefetch_state_js_1.PreloadContext.Provider, { value: contexts.preloadContext, children: jsx_runtime_1.jsx(CompositionManagerContext_js_1.CompositionManager.Provider, { value: contexts.compositionManagerCtx, children: jsx_runtime_1.jsx(SequenceManager_js_1.SequenceManagerRefContext.Provider, { value: contexts.sequenceManagerRefContext, children: jsx_runtime_1.jsx(SequenceManager_js_1.SequenceManager.Provider, { value: contexts.sequenceManagerContext, children: jsx_runtime_1.jsx(SequenceManager_js_1.VisualModePropStatusesRefContext.Provider, { value: contexts.visualModePropStatusesRefContext, children: jsx_runtime_1.jsx(RenderAssetManager_js_1.RenderAssetManager.Provider, { value: contexts.renderAssetManagerContext, children: jsx_runtime_1.jsx(ResolveCompositionConfig_js_1.ResolveCompositionContext.Provider, { value: contexts.resolveCompositionContext, children: jsx_runtime_1.jsx(TimelineContext_js_1.TimelineContext.Provider, { value: contexts.timelineContext, children: jsx_runtime_1.jsx(TimelineContext_js_1.SetTimelineContext.Provider, { value: contexts.setTimelineContext, children: jsx_runtime_1.jsx(SequenceContext_js_1.SequenceContext.Provider, { value: contexts.sequenceContext, children: jsx_runtime_1.jsx(buffering_js_1.BufferingContextReact.Provider, { value: contexts.bufferManagerContext, children: jsx_runtime_1.jsx(timeline_track_context_js_1.ExperimentalTracksEnabledContext.Provider, { value: contexts.experimentalTracksEnabled, children: jsx_runtime_1.jsx(timeline_track_context_js_1.TimelineTrackContext.Provider, { value: contexts.timelineTrackContext, children: children }) }) }) }) }) }) }) }) }) }) }) }) }) }) }));
 };
 exports.RemotionContextProvider = RemotionContextProvider;