@remotion/studio 4.0.459 → 4.0.461

package/dist/components/Timeline/use-sequence-props-subscription.js

@@ -5,22 +5,11 @@ const react_1 = require("react");
 const remotion_1 = require("remotion");
 const client_id_1 = require("../../helpers/client-id");
 const sequence_props_subscription_store_1 = require("./sequence-props-subscription-store");
-const EMPTY_STATE = {
-    nodePath: null,
-    jsxInMapCallback: false,
-};
-const useSequencePropsSubscription = (sequence, originalLocation, visualModeEnabled) => {
-    var _a, _b;
-    var _c, _d, _e, _f;
-    const { setCodeValues } = (0, react_1.useContext)(remotion_1.Internals.VisualModeOverridesContext);
-    const overrideId = (_c = (_a = sequence.controls) === null || _a === void 0 ? void 0 : _a.overrideId) !== null && _c !== void 0 ? _c : null;
-    const setPropStatusesForSequence = (0, react_1.useCallback)((statuses) => {
-        if (!overrideId) {
-            return;
-        }
-        setCodeValues(overrideId, statuses);
-    }, [overrideId, setCodeValues]);
-    const { previewServerState: state, subscribeToEvent } = (0, react_1.useContext)(client_id_1.StudioServerConnectionCtx);
+const useSequencePropsSubscription = ({ originalLocation, overrideId, schema, }) => {
+    var _a, _b, _c;
+    const { setCodeValues } = (0, react_1.useContext)(remotion_1.Internals.VisualModeSettersContext);
+    const { setOverrideIdToNodePath } = (0, react_1.useContext)(remotion_1.Internals.OverrideIdsToNodePathsSettersContext);
+    const { previewServerState: state } = (0, react_1.useContext)(client_id_1.StudioServerConnectionCtx);
     const clientId = state.type === 'connected' ? state.clientId : undefined;
     const validatedLocation = (0, react_1.useMemo)(() => {
         var _a;
@@ -35,67 +24,48 @@ const useSequencePropsSubscription = (sequence, originalLocation, visualModeEnab
             column: (_a = originalLocation.column) !== null && _a !== void 0 ? _a : 0,
         };
     }, [originalLocation]);
-    const [subscriptionState, setSubscriptionState] = (0, react_1.useState)(EMPTY_STATE);
-    const isMountedRef = (0, react_1.useRef)(true);
-    (0, react_1.useEffect)(() => {
-        isMountedRef.current = true;
-        return () => {
-            isMountedRef.current = false;
-        };
-    }, []);
-    const schema = (_b = sequence.controls) === null || _b === void 0 ? void 0 : _b.schema;
-    const locationSource = (_d = validatedLocation === null || validatedLocation === void 0 ? void 0 : validatedLocation.source) !== null && _d !== void 0 ? _d : null;
-    const locationLine = (_e = validatedLocation === null || validatedLocation === void 0 ? void 0 : validatedLocation.line) !== null && _e !== void 0 ? _e : null;
-    const locationColumn = (_f = validatedLocation === null || validatedLocation === void 0 ? void 0 : validatedLocation.column) !== null && _f !== void 0 ? _f : null;
+    const locationSource = (_a = validatedLocation === null || validatedLocation === void 0 ? void 0 : validatedLocation.source) !== null && _a !== void 0 ? _a : null;
+    const locationLine = (_b = validatedLocation === null || validatedLocation === void 0 ? void 0 : validatedLocation.line) !== null && _b !== void 0 ? _b : null;
+    const locationColumn = (_c = validatedLocation === null || validatedLocation === void 0 ? void 0 : validatedLocation.column) !== null && _c !== void 0 ? _c : null;
     (0, react_1.useEffect)(() => {
-        if (!visualModeEnabled) {
-            setPropStatusesForSequence(null);
-            setSubscriptionState(EMPTY_STATE);
-            return;
-        }
         if (!clientId ||
             !locationSource ||
             !locationLine ||
             locationColumn === null ||
             !schema) {
-            setPropStatusesForSequence(null);
-            setSubscriptionState(EMPTY_STATE);
             return;
         }
-        const onChange = (snapshot) => {
-            setSubscriptionState({
-                nodePath: snapshot.nodePath,
-                jsxInMapCallback: snapshot.jsxInMapCallback,
-            });
-            setPropStatusesForSequence(snapshot.props);
-        };
-        const release = (0, sequence_props_subscription_store_1.acquireSequencePropsSubscription)({
-            clientId,
+        const { release } = (0, sequence_props_subscription_store_1.acquireSequencePropsSubscription)({
             fileName: locationSource,
             line: locationLine,
             column: locationColumn,
             schema,
-            subscribeToEvent,
-            onChange,
+            clientId,
+            applyOnce: (result) => {
+                if (!result.success) {
+                    return;
+                }
+                setCodeValues(result.nodePath, () => result.status);
+            },
+            applyEach: (result) => {
+                if (!result.success) {
+                    return;
+                }
+                setOverrideIdToNodePath(overrideId, result.nodePath);
+            },
         });
         return () => {
             release();
-            // Only clear props on true unmount, not on re-subscribe due to
-            // location changes — avoids flicker while re-subscribing.
-            if (!isMountedRef.current) {
-                setPropStatusesForSequence(null);
-            }
         };
     }, [
         clientId,
         locationColumn,
         locationLine,
         locationSource,
+        overrideId,
         schema,
-        setPropStatusesForSequence,
-        subscribeToEvent,
-        visualModeEnabled,
+        setCodeValues,
+        setOverrideIdToNodePath,
     ]);
-    return subscriptionState;
 };
 exports.useSequencePropsSubscription = useSequencePropsSubscription;

package/dist/components/Timeline/use-timeline-height.d.ts

@@ -0,0 +1,5 @@
+import type { TrackWithHash } from '../../helpers/get-timeline-sequence-sort-key';
+export declare const useTimelineHeight: ({ shown, hasBeenCut, }: {
+    shown: TrackWithHash[];
+    hasBeenCut: boolean;
+}) => number;

package/dist/components/Timeline/use-timeline-height.js

@@ -0,0 +1,39 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.useTimelineHeight = void 0;
+const react_1 = require("react");
+const remotion_1 = require("remotion");
+const client_id_1 = require("../../helpers/client-id");
+const timeline_layout_1 = require("../../helpers/timeline-layout");
+const ExpandedTracksProvider_1 = require("../ExpandedTracksProvider");
+const MaxTimelineTracks_1 = require("./MaxTimelineTracks");
+const TimelineTimeIndicators_1 = require("./TimelineTimeIndicators");
+const useTimelineHeight = ({ shown, hasBeenCut, }) => {
+    const { getIsExpanded } = (0, react_1.useContext)(ExpandedTracksProvider_1.ExpandedTracksGetterContext);
+    const { previewServerState } = (0, react_1.useContext)(client_id_1.StudioServerConnectionCtx);
+    const { getCodeValues } = (0, react_1.useContext)(remotion_1.Internals.VisualModeCodeValuesContext);
+    const previewServerConnected = previewServerState.type === 'connected';
+    return (0, react_1.useMemo)(() => {
+        const tracksHeight = shown.reduce((acc, track) => {
+            const isExpanded = previewServerConnected &&
+                track.nodePathInfo !== null &&
+                getIsExpanded(track.nodePathInfo);
+            const layerHeight = (0, timeline_layout_1.getTimelineLayerHeight)(track.sequence.type) +
+                timeline_layout_1.TIMELINE_ITEM_BORDER_BOTTOM;
+            const expandedHeight = isExpanded && track.nodePathInfo
+                ? (0, timeline_layout_1.getExpandedTrackHeight)({
+                    sequence: track.sequence,
+                    nodePathInfo: track.nodePathInfo,
+                    getIsExpanded,
+                    getCodeValues,
+                }) + timeline_layout_1.TIMELINE_ITEM_BORDER_BOTTOM
+                : 0;
+            return acc + layerHeight + expandedHeight;
+        }, 0);
+        return (tracksHeight +
+            timeline_layout_1.TIMELINE_ITEM_BORDER_BOTTOM +
+            (hasBeenCut ? MaxTimelineTracks_1.MAX_TIMELINE_TRACKS_NOTICE_HEIGHT : 0) +
+            TimelineTimeIndicators_1.TIMELINE_TIME_INDICATOR_HEIGHT);
+    }, [shown, hasBeenCut, previewServerConnected, getIsExpanded, getCodeValues]);
+};
+exports.useTimelineHeight = useTimelineHeight;

package/dist/error-overlay/react-overlay/utils/get-source-map.d.ts

@@ -1,4 +1,4 @@
-import { SourceMapConsumer } from 'source-map';
+import { TraceMap } from '@jridgewell/trace-mapping';
 export type OriginalPosition = {
     line: number | null;
     column: number | null;
@@ -9,5 +9,5 @@ export type CodePosition = {
     column: number;
     source: string;
 };
-export declare const getOriginalPosition: (source_map: SourceMapConsumer, line: number, column: number) => OriginalPosition;
-export declare function getSourceMap(fileUri: string, fileContents: string): Promise<SourceMapConsumer | null>;
+export declare const getOriginalPosition: (sourceMap: TraceMap, line: number, column: number) => OriginalPosition;
+export declare function getSourceMap(fileUri: string, fileContents: string): Promise<TraceMap | null>;

package/dist/error-overlay/react-overlay/utils/get-source-map.js

@@ -5,9 +5,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getOriginalPosition = void 0;
 exports.getSourceMap = getSourceMap;
-const source_map_1 = require("source-map");
-const getOriginalPosition = (source_map, line, column) => {
-    const result = source_map.originalPositionFor({
+const trace_mapping_1 = require("@jridgewell/trace-mapping");
+const getOriginalPosition = (sourceMap, line, column) => {
+    const result = (0, trace_mapping_1.originalPositionFor)(sourceMap, {
         line,
         column,
     });
@@ -42,10 +42,10 @@ async function getSourceMap(fileUri, fileContents) {
             throw new Error('Sorry, non-base64 inline source-map encoding is not supported.');
         }
         const converted = window.atob(sm.substring(match2[0].length));
-        return new source_map_1.SourceMapConsumer(JSON.parse(converted));
+        return new trace_mapping_1.TraceMap(JSON.parse(converted));
     }
     const index = fileUri.lastIndexOf('/');
     const url = fileUri.substring(0, index + 1) + sm;
     const obj = await fetch(url).then((res) => res.json());
-    return new source_map_1.SourceMapConsumer(obj);
+    return new trace_mapping_1.TraceMap(obj);
 }

package/dist/error-overlay/react-overlay/utils/unmapper.d.ts

@@ -1,9 +1,3 @@
-/**
- * Copyright (c) 2015-present, Facebook, Inc.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
 import type { SomeStackFrame, SymbolicatedStackFrame } from '@remotion/studio-shared';
 export declare const getFileContents: (fileName: string) => Promise<string>;
 export declare const unmap: (frames: SomeStackFrame[], contextLines: number) => Promise<SymbolicatedStackFrame[]>;

package/dist/error-overlay/react-overlay/utils/unmapper.js

@@ -4,6 +4,13 @@
 */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.unmap = exports.getFileContents = void 0;
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+const trace_mapping_1 = require("@jridgewell/trace-mapping");
 const remotion_1 = require("remotion");
 const get_lines_around_1 = require("./get-lines-around");
 const get_source_map_1 = require("./get-source-map");
@@ -40,7 +47,7 @@ const unmap = async (frames, contextLines) => {
         const pos = (0, get_source_map_1.getOriginalPosition)(map, frame.frame.lineNumber, frame.frame.columnNumber);
         const { functionName } = frame.frame;
         let hasSource = null;
-        hasSource = pos.source ? map.sourceContentFor(pos.source, false) : null;
+        hasSource = pos.source ? (0, trace_mapping_1.sourceContentFor)(map, pos.source) : null;
         const scriptCode = hasSource && pos.line
             ? (0, get_lines_around_1.getLinesAround)(pos.line, contextLines, hasSource.split('\n'))
             : null;