@remotion/studio 4.0.462 → 4.0.464

package/dist/components/ColorPicker/HueSlider.js

@@ -0,0 +1,68 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.HueSlider = void 0;
+const jsx_runtime_1 = require("react/jsx-runtime");
+const react_1 = require("react");
+const color_conversion_1 = require("../../helpers/color-conversion");
+const SLIDER_HEIGHT = 12;
+const HANDLE_WIDTH = 8;
+const containerStyle = {
+    position: 'relative',
+    height: SLIDER_HEIGHT,
+    width: '100%',
+    borderRadius: 3,
+    cursor: 'ew-resize',
+    background: 'linear-gradient(to right, #f00 0%, #ff0 17%, #0f0 33%, #0ff 50%, #00f 67%, #f0f 83%, #f00 100%)',
+    touchAction: 'none',
+};
+const HueSlider = ({ hue, onChange, onChangeComplete }) => {
+    const ref = (0, react_1.useRef)(null);
+    const updateFromEvent = (0, react_1.useCallback)((clientX, isFinal) => {
+        const { current } = ref;
+        if (!current) {
+            return;
+        }
+        const rect = current.getBoundingClientRect();
+        const x = (0, color_conversion_1.clamp)((clientX - rect.left) / rect.width, 0, 1);
+        const next = x * 360;
+        if (isFinal) {
+            onChangeComplete(next);
+        }
+        else {
+            onChange(next);
+        }
+    }, [onChange, onChangeComplete]);
+    const onPointerDown = (0, react_1.useCallback)((e) => {
+        if (e.button !== 0) {
+            return;
+        }
+        e.preventDefault();
+        updateFromEvent(e.clientX, false);
+        const onMove = (ev) => {
+            updateFromEvent(ev.clientX, false);
+        };
+        const onUp = (ev) => {
+            window.removeEventListener('pointermove', onMove);
+            window.removeEventListener('pointerup', onUp);
+            updateFromEvent(ev.clientX, true);
+        };
+        window.addEventListener('pointermove', onMove);
+        window.addEventListener('pointerup', onUp);
+    }, [updateFromEvent]);
+    const handleStyle = (0, react_1.useMemo)(() => {
+        return {
+            position: 'absolute',
+            top: -2,
+            left: `${(hue / 360) * 100}%`,
+            marginLeft: -HANDLE_WIDTH / 2,
+            width: HANDLE_WIDTH,
+            height: SLIDER_HEIGHT + 4,
+            borderRadius: 2,
+            border: '2px solid #fff',
+            boxShadow: '0 0 0 1px rgba(0, 0, 0, 0.6)',
+            pointerEvents: 'none',
+        };
+    }, [hue]);
+    return (jsx_runtime_1.jsx("div", { ref: ref, style: containerStyle, onPointerDown: onPointerDown, children: jsx_runtime_1.jsx("div", { style: handleStyle }) }));
+};
+exports.HueSlider = HueSlider;

package/dist/components/ColorPicker/SaturationValueArea.d.ts

@@ -0,0 +1,14 @@
+import React from 'react';
+export declare const SaturationValueArea: React.FC<{
+    readonly hue: number;
+    readonly saturation: number;
+    readonly value: number;
+    readonly onChange: (next: {
+        s: number;
+        v: number;
+    }) => void;
+    readonly onChangeComplete: (next: {
+        s: number;
+        v: number;
+    }) => void;
+}>;

package/dist/components/ColorPicker/SaturationValueArea.js

@@ -0,0 +1,93 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SaturationValueArea = void 0;
+const jsx_runtime_1 = require("react/jsx-runtime");
+const react_1 = require("react");
+const color_conversion_1 = require("../../helpers/color-conversion");
+const AREA_HEIGHT = 140;
+const containerStyle = {
+    position: 'relative',
+    width: '100%',
+    height: AREA_HEIGHT,
+    cursor: 'crosshair',
+    borderRadius: 3,
+    overflow: 'hidden',
+    touchAction: 'none',
+};
+const valueOverlay = {
+    position: 'absolute',
+    inset: 0,
+    background: 'linear-gradient(to top, #000, transparent)',
+};
+const saturationOverlay = {
+    position: 'absolute',
+    inset: 0,
+    background: 'linear-gradient(to right, #fff, transparent)',
+};
+const SaturationValueArea = ({ hue, saturation, value, onChange, onChangeComplete }) => {
+    const containerRef = (0, react_1.useRef)(null);
+    const baseColor = (0, react_1.useMemo)(() => {
+        const { r, g, b } = (0, color_conversion_1.hsvToRgb)({ h: hue, s: 1, v: 1 });
+        return `rgb(${r}, ${g}, ${b})`;
+    }, [hue]);
+    const updateFromEvent = (0, react_1.useCallback)((clientX, clientY, isFinal) => {
+        const { current } = containerRef;
+        if (!current) {
+            return;
+        }
+        const rect = current.getBoundingClientRect();
+        const x = (0, color_conversion_1.clamp)((clientX - rect.left) / rect.width, 0, 1);
+        const y = (0, color_conversion_1.clamp)((clientY - rect.top) / rect.height, 0, 1);
+        const next = { s: x, v: 1 - y };
+        if (isFinal) {
+            onChangeComplete(next);
+        }
+        else {
+            onChange(next);
+        }
+    }, [onChange, onChangeComplete]);
+    const onPointerDown = (0, react_1.useCallback)((e) => {
+        var _a, _b;
+        if (e.button !== 0) {
+            return;
+        }
+        e.preventDefault();
+        (_b = (_a = e.target).setPointerCapture) === null || _b === void 0 ? void 0 : _b.call(_a, e.pointerId);
+        updateFromEvent(e.clientX, e.clientY, false);
+        const onMove = (ev) => {
+            updateFromEvent(ev.clientX, ev.clientY, false);
+        };
+        const onUp = (ev) => {
+            window.removeEventListener('pointermove', onMove);
+            window.removeEventListener('pointerup', onUp);
+            updateFromEvent(ev.clientX, ev.clientY, true);
+        };
+        window.addEventListener('pointermove', onMove);
+        window.addEventListener('pointerup', onUp);
+    }, [updateFromEvent]);
+    const containerWithBg = (0, react_1.useMemo)(() => {
+        return {
+            ...containerStyle,
+            backgroundColor: baseColor,
+        };
+    }, [baseColor]);
+    const handleStyle = (0, react_1.useMemo)(() => {
+        return {
+            position: 'absolute',
+            left: `${saturation * 100}%`,
+            top: `${(1 - value) * 100}%`,
+            width: 12,
+            height: 12,
+            marginLeft: -6,
+            marginTop: -6,
+            borderRadius: '50%',
+            border: '2px solid #fff',
+            boxShadow: '0 0 0 1px rgba(0, 0, 0, 0.6)',
+            pointerEvents: 'none',
+        };
+    }, [saturation, value]);
+    return (jsx_runtime_1.jsxs("div", { ref: containerRef, style: containerWithBg, onPointerDown: onPointerDown, children: [
+            jsx_runtime_1.jsx("div", { style: saturationOverlay }), jsx_runtime_1.jsx("div", { style: valueOverlay }), jsx_runtime_1.jsx("div", { style: handleStyle })
+        ] }));
+};
+exports.SaturationValueArea = SaturationValueArea;

package/dist/components/ColorPicker/checker.d.ts

@@ -0,0 +1,4 @@
+export declare const CHECKER_BACKGROUND_IMAGE = "linear-gradient(45deg, #888 25%, transparent 25%), linear-gradient(-45deg, #888 25%, transparent 25%), linear-gradient(45deg, transparent 75%, #888 75%), linear-gradient(-45deg, transparent 75%, #888 75%)";
+export declare const CHECKER_BACKGROUND_SIZE = "8px 8px";
+export declare const CHECKER_BACKGROUND_POSITION = "0 0, 0 4px, 4px -4px, -4px 0";
+export declare const CHECKER_BACKGROUND_COLOR = "#444";

package/dist/components/ColorPicker/checker.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CHECKER_BACKGROUND_COLOR = exports.CHECKER_BACKGROUND_POSITION = exports.CHECKER_BACKGROUND_SIZE = exports.CHECKER_BACKGROUND_IMAGE = void 0;
+// Checkerboard background used to indicate transparency in color swatches
+// and the alpha slider. Rendered as a CSS gradient so we don't need an asset.
+exports.CHECKER_BACKGROUND_IMAGE = 'linear-gradient(45deg, #888 25%, transparent 25%), linear-gradient(-45deg, #888 25%, transparent 25%), linear-gradient(45deg, transparent 75%, #888 75%), linear-gradient(-45deg, transparent 75%, #888 75%)';
+exports.CHECKER_BACKGROUND_SIZE = '8px 8px';
+exports.CHECKER_BACKGROUND_POSITION = '0 0, 0 4px, 4px -4px, -4px 0';
+exports.CHECKER_BACKGROUND_COLOR = '#444';

package/dist/components/CompSelectorRef.js

@@ -5,6 +5,7 @@ const jsx_runtime_1 = require("react/jsx-runtime");
 const react_1 = require("react");
 const remotion_1 = require("remotion");
 const create_folder_tree_1 = require("../helpers/create-folder-tree");
+const persist_boolean_map_1 = require("../helpers/persist-boolean-map");
 const persist_open_folders_1 = require("../helpers/persist-open-folders");
 const folders_1 = require("../state/folders");
 const InitialCompositionLoader_1 = require("./InitialCompositionLoader");
@@ -14,13 +15,8 @@ const CompSelectorRef = ({ children }) => {
     const selectComposition = (0, InitialCompositionLoader_1.useSelectComposition)();
     const toggleFolder = (0, react_1.useCallback)((folderName, parentName) => {
         setCompositionFoldersExpanded((p) => {
-            var _a;
             const key = (0, persist_open_folders_1.openFolderKey)({ folderName, parentName });
-            const prev = (_a = p[key]) !== null && _a !== void 0 ? _a : false;
-            const foldersExpandedState = {
-                ...p,
-                [key]: !prev,
-            };
+            const foldersExpandedState = (0, persist_boolean_map_1.toggleBooleanMapKey)(p, key);
             (0, persist_open_folders_1.persistExpandedFolders)('compositions', foldersExpandedState);
             return foldersExpandedState;
         });

package/dist/components/ExpandedTracksProvider.d.ts

@@ -1,4 +1,5 @@
 import React from 'react';
+import type { SequencePropsSubscriptionKey } from 'remotion';
 import type { SequenceNodePathInfo } from '../helpers/get-timeline-sequence-sort-key';
 export type GetIsExpanded = (nodePathInfo: SequenceNodePathInfo) => boolean;
 type ExpandedTracksGetterContextValue = {
@@ -6,6 +7,7 @@ type ExpandedTracksGetterContextValue = {
 };
 type ExpandedTracksSetterContextValue = {
     readonly toggleTrack: (nodePathInfo: SequenceNodePathInfo) => void;
+    readonly migrateExpandedTracksForSubscriptionKey: (oldKey: SequencePropsSubscriptionKey, newKey: SequencePropsSubscriptionKey) => void;
 };
 export declare const ExpandedTracksGetterContext: React.Context<ExpandedTracksGetterContextValue>;
 export declare const ExpandedTracksSetterContext: React.Context<ExpandedTracksSetterContextValue>;

package/dist/components/ExpandedTracksProvider.js

@@ -4,30 +4,16 @@ exports.ExpandedTracksProvider = exports.ExpandedTracksSetterContext = exports.E
 const jsx_runtime_1 = require("react/jsx-runtime");
 const studio_shared_1 = require("@remotion/studio-shared");
 const react_1 = require("react");
+const migrate_expanded_tracks_for_subscription_key_1 = require("../helpers/migrate-expanded-tracks-for-subscription-key");
+const persist_boolean_map_1 = require("../helpers/persist-boolean-map");
 const nodePathInfoToExpandedKey = (info) => [
     (0, studio_shared_1.stringifySequenceExpandedRowKey)(info.sequenceSubscriptionKey),
     info.auxiliaryKeys.join('.'),
     info.index,
 ].join('.');
-const LOCAL_STORAGE_KEY = 'remotion.editor.expandedTracks';
+const SESSION_STORAGE_KEY = 'remotion.editor.expandedTracks';
 const loadExpandedTracks = () => {
-    if (typeof window === 'undefined') {
-        return {};
-    }
-    const item = window.localStorage.getItem(LOCAL_STORAGE_KEY);
-    if (item === null) {
-        return {};
-    }
-    try {
-        const parsed = JSON.parse(item);
-        if (parsed && typeof parsed === 'object') {
-            return parsed;
-        }
-        return {};
-    }
-    catch (_a) {
-        return {};
-    }
+    return (0, persist_boolean_map_1.loadPersistedBooleanMap)(SESSION_STORAGE_KEY);
 };
 exports.ExpandedTracksGetterContext = (0, react_1.createContext)({
     getIsExpanded: () => {
@@ -38,14 +24,27 @@ exports.ExpandedTracksSetterContext = (0, react_1.createContext)({
     toggleTrack: () => {
         throw new Error('ExpandedTracksSetterContext not initialized');
     },
+    migrateExpandedTracksForSubscriptionKey: () => {
+        throw new Error('ExpandedTracksSetterContext not initialized');
+    },
 });
 const ExpandedTracksProvider = ({ children }) => {
     const [expandedTracks, setExpandedTracks] = (0, react_1.useState)(loadExpandedTracks);
     const toggleTrack = (0, react_1.useCallback)((nodePathInfo) => {
         setExpandedTracks((prev) => {
             const key = nodePathInfoToExpandedKey(nodePathInfo);
-            const next = { ...prev, [key]: !prev[key] };
-            window.localStorage.setItem(LOCAL_STORAGE_KEY, JSON.stringify(next));
+            const next = (0, persist_boolean_map_1.toggleBooleanMapKey)(prev, key);
+            (0, persist_boolean_map_1.persistBooleanMap)(SESSION_STORAGE_KEY, next);
+            return next;
+        });
+    }, []);
+    const migrateExpandedTracks = (0, react_1.useCallback)((oldKey, newKey) => {
+        setExpandedTracks((prev) => {
+            const next = (0, migrate_expanded_tracks_for_subscription_key_1.migrateExpandedTracksForSubscriptionKey)(prev, oldKey, newKey);
+            if (!next) {
+                return prev;
+            }
+            (0, persist_boolean_map_1.persistBooleanMap)(SESSION_STORAGE_KEY, next);
             return next;
         });
     }, []);
@@ -55,7 +54,10 @@ const ExpandedTracksProvider = ({ children }) => {
             return (_a = expandedTracks[nodePathInfoToExpandedKey(nodePathInfo)]) !== null && _a !== void 0 ? _a : false;
         },
     }), [expandedTracks]);
-    const setterValue = (0, react_1.useMemo)(() => ({ toggleTrack }), [toggleTrack]);
+    const setterValue = (0, react_1.useMemo)(() => ({
+        toggleTrack,
+        migrateExpandedTracksForSubscriptionKey: migrateExpandedTracks,
+    }), [toggleTrack, migrateExpandedTracks]);
     return (jsx_runtime_1.jsx(exports.ExpandedTracksSetterContext.Provider, { value: setterValue, children: jsx_runtime_1.jsx(exports.ExpandedTracksGetterContext.Provider, { value: getterValue, children: children }) }));
 };
 exports.ExpandedTracksProvider = ExpandedTracksProvider;

package/dist/components/RenderModal/SchemaEditor/ZodColorEditor.js

@@ -3,12 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ZodColorEditor = void 0;
 const jsx_runtime_1 = require("react/jsx-runtime");
 const react_1 = require("react");
-const color_math_1 = require("../../../helpers/color-math");
-const get_zod_if_possible_1 = require("../../get-zod-if-possible");
+const ColorPicker_1 = require("../../ColorPicker/ColorPicker");
 const layout_1 = require("../../layout");
-const InputDragger_1 = require("../../NewComposition/InputDragger");
 const RemInput_1 = require("../../NewComposition/RemInput");
-const RemInputTypeColor_1 = require("../../NewComposition/RemInputTypeColor");
 const Fieldset_1 = require("./Fieldset");
 const SchemaLabel_1 = require("./SchemaLabel");
 const zod_schema_type_1 = require("./zod-schema-type");
@@ -17,25 +14,13 @@ const fullWidth = {
     width: '100%',
 };
 const ZodColorEditor = ({ jsonPath, value, setValue, schema, onRemove, mayPad }) => {
-    const z = (0, get_zod_if_possible_1.useZodIfPossible)();
-    if (!z) {
-        throw new Error('expected zod');
-    }
-    const zodTypes = (0, get_zod_if_possible_1.useZodTypesIfPossible)();
-    if (!zodTypes) {
-        throw new Error('expected zod color');
-    }
     const localValue = (0, react_1.useMemo)(() => (0, zod_schema_type_1.zodSafeParse)(schema, value), [schema, value]);
-    const { a, b, g, r } = localValue.success
-        ? zodTypes.ZodZypesInternals.parseColor(value)
-        : { a: 1, b: 0, g: 0, r: 0 };
-    const onChange = (0, react_1.useCallback)((e) => {
-        const newColor = (0, color_math_1.colorWithNewOpacity)(e.target.value, Math.round(a), zodTypes);
-        setValue(() => newColor, { shouldSave: false });
-    }, [a, setValue, zodTypes]);
-    const onColorBlur = (0, react_1.useCallback)(() => {
-        setValue(() => value, { shouldSave: true });
-    }, [setValue, value]);
+    const onPickerChange = (0, react_1.useCallback)((next) => {
+        setValue(() => next, { shouldSave: false });
+    }, [setValue]);
+    const onPickerComplete = (0, react_1.useCallback)((next) => {
+        setValue(() => next, { shouldSave: true });
+    }, [setValue]);
     const onTextChange = (0, react_1.useCallback)((e) => {
         const newValue = e.target.value;
         setValue(() => newValue, { shouldSave: false });
@@ -43,35 +28,11 @@ const ZodColorEditor = ({ jsonPath, value, setValue, schema, onRemove, mayPad })
     const onTextBlur = (0, react_1.useCallback)(() => {
         setValue(() => value, { shouldSave: true });
     }, [setValue, value]);
-    const rgb = `#${r.toString(16).padStart(2, '0')}${g
-        .toString(16)
-        .padStart(2, '0')}${b.toString(16).padStart(2, '0')}`;
     const status = localValue.success ? 'ok' : 'error';
-    const colorPicker = (0, react_1.useMemo)(() => {
-        return {
-            height: 39,
-            width: 45,
-            display: 'inline-block',
-        };
-    }, []);
-    const onOpacityChange = (0, react_1.useCallback)((newValue) => {
-        const newColor = (0, color_math_1.colorWithNewOpacity)(value, Math.round((Number(newValue) / 100) * 255), zodTypes);
-        setValue(() => newColor, { shouldSave: true });
-    }, [setValue, value, zodTypes]);
-    const onOpacityValueChange = (0, react_1.useCallback)((newValue) => {
-        const newColor = (0, color_math_1.colorWithNewOpacity)(value, Math.round((Number(newValue) / 100) * 255), zodTypes);
-        setValue(() => newColor, { shouldSave: false });
-    }, [setValue, value, zodTypes]);
-    const onOpacityValueChangeEnd = (0, react_1.useCallback)((newValue) => {
-        const newColor = (0, color_math_1.colorWithNewOpacity)(value, Math.round((Number(newValue) / 100) * 255), zodTypes);
-        setValue(() => newColor, { shouldSave: true });
-    }, [setValue, value, zodTypes]);
     return (jsx_runtime_1.jsxs(Fieldset_1.Fieldset, { shouldPad: mayPad, children: [
             jsx_runtime_1.jsx(SchemaLabel_1.SchemaLabel, { handleClick: null, jsonPath: jsonPath, onRemove: onRemove, valid: localValue.success, suffix: null }), jsx_runtime_1.jsxs("div", { style: fullWidth, children: [
                     jsx_runtime_1.jsxs(layout_1.Row, { align: "center", children: [
-                            jsx_runtime_1.jsx("div", { style: colorPicker, children: jsx_runtime_1.jsx(RemInputTypeColor_1.RemInputTypeColor, { type: "color", style: {
-                                        height: 39,
-                                    }, value: rgb, onChange: onChange, onBlur: onColorBlur, className: "__remotion_color_picker", status: status, name: jsonPath.join('.') }) }), jsx_runtime_1.jsx(layout_1.Spacing, { x: 1, block: true }), jsx_runtime_1.jsx(RemInput_1.RemotionInput, { value: value, status: status, placeholder: jsonPath.join('.'), onChange: onTextChange, onBlur: onTextBlur, rightAlign: false }), jsx_runtime_1.jsx(layout_1.Spacing, { x: 1 }), jsx_runtime_1.jsx(InputDragger_1.InputDragger, { onTextChange: onOpacityChange, onValueChange: onOpacityValueChange, onValueChangeEnd: onOpacityValueChangeEnd, status: status, value: (a / 255) * 100, min: 0, max: 100, step: 1, formatter: (v) => `${Math.round(Number(v))}%`, rightAlign: false })
+                            jsx_runtime_1.jsx(ColorPicker_1.ColorPicker, { value: value, status: status, onChange: onPickerChange, onChangeComplete: onPickerComplete, width: 45, height: 39, name: jsonPath.join('.') }), jsx_runtime_1.jsx(layout_1.Spacing, { x: 1, block: true }), jsx_runtime_1.jsx(RemInput_1.RemotionInput, { value: value, status: status, placeholder: jsonPath.join('.'), onChange: onTextChange, onBlur: onTextBlur, rightAlign: false })
                         ] }), jsx_runtime_1.jsx(ZodFieldValidation_1.ZodFieldValidation, { path: jsonPath, zodValidation: localValue })
                 ] })
         ] }));

package/dist/components/Timeline/Padder.js

@@ -3,10 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Padder = void 0;
 const jsx_runtime_1 = require("react/jsx-runtime");
 const react_1 = require("react");
-const TimelineListItem_1 = require("./TimelineListItem");
+const timeline_indent_1 = require("./timeline-indent");
 const Padder = ({ depth }) => {
     const style = (0, react_1.useMemo)(() => ({
-        width: TimelineListItem_1.INDENT * depth,
+        width: timeline_indent_1.TIMELINE_INDENT * depth,
         flexShrink: 0,
     }), [depth]);
     return jsx_runtime_1.jsx("div", { style: style });

package/dist/components/Timeline/SubscribeToNodePaths.d.ts

@@ -3,6 +3,6 @@ import type { EffectDefinition, SequenceSchema } from 'remotion';
 export declare const SubscribeToNodePaths: FC<{
     readonly overrideId: string;
     readonly schema: SequenceSchema;
-    readonly stack: string;
+    readonly getStack: () => string | null;
     readonly effects: readonly EffectDefinition<unknown>[];
 }>;

package/dist/components/Timeline/SubscribeToNodePaths.js

@@ -3,10 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.SubscribeToNodePaths = void 0;
 const react_1 = require("react");
 const no_react_1 = require("remotion/no-react");
-const use_resolved_stack_1 = require("./use-resolved-stack");
+const use_resolved_stack_react_to_change_1 = require("./use-resolved-stack-react-to-change");
 const use_sequence_props_subscription_1 = require("./use-sequence-props-subscription");
-const SubscribeToNodePaths = ({ overrideId, schema, stack, effects }) => {
-    const originalLocation = (0, use_resolved_stack_1.useResolvedStack)(stack);
+const SubscribeToNodePaths = ({ overrideId, schema, getStack, effects }) => {
+    const originalLocation = (0, use_resolved_stack_react_to_change_1.useResolveStackAndReactToChange)(getStack);
     const effectSubscriptions = (0, react_1.useMemo)(() => {
         return effects
             .map((effect) => {

package/dist/components/Timeline/Timeline.js

@@ -44,9 +44,9 @@ const is_menu_item_1 = require("../Menu/is-menu-item");
 const SplitterContainer_1 = require("../Splitter/SplitterContainer");
 const SplitterElement_1 = require("../Splitter/SplitterElement");
 const SplitterHandle_1 = require("../Splitter/SplitterHandle");
-const is_collapsed_1 = require("./is-collapsed");
 const MaxTimelineTracks_1 = require("./MaxTimelineTracks");
 const SequencePropsObserver_1 = require("./SequencePropsObserver");
+const should_show_track_in_timeline_1 = require("./should-show-track-in-timeline");
 const SubscribeToNodePaths_1 = require("./SubscribeToNodePaths");
 const timeline_refs_1 = require("./timeline-refs");
 const TimelineDragHandler_1 = require("./TimelineDragHandler");
@@ -88,10 +88,7 @@ const TimelineInner = () => {
     }, [sequences, videoConfigIsNull, overrideIdToNodePathMappings]);
     const durationInFrames = (_a = videoConfig === null || videoConfig === void 0 ? void 0 : videoConfig.durationInFrames) !== null && _a !== void 0 ? _a : 0;
     const filtered = (0, react_1.useMemo)(() => {
-        return timeline.filter((t) => !(0, is_collapsed_1.isTrackHidden)(t) &&
-            t.sequence.from <= durationInFrames &&
-            t.sequence.duration > 0 &&
-            t.sequence.showInTimeline);
+        return timeline.filter((t) => (0, should_show_track_in_timeline_1.shouldShowTrackInTimeline)(t, durationInFrames));
     }, [durationInFrames, timeline]);
     const shown = (0, react_1.useMemo)(() => {
         return filtered.length > MaxTimelineTracks_1.MAX_TIMELINE_TRACKS
@@ -100,10 +97,10 @@ const TimelineInner = () => {
     }, [filtered]);
     const hasBeenCut = filtered.length > shown.length;
     return (jsx_runtime_1.jsxs("div", { ref: timeline_refs_1.timelineVerticalScroll, style: container, className: 'css-reset ' + is_menu_item_1.VERTICAL_SCROLLBAR_CLASSNAME, children: [sequences.map((sequence) => {
-                if (!sequence.controls || !previewConnected || !sequence.stack) {
+                if (!sequence.controls || !previewConnected || !sequence.getStack()) {
                     return null;
                 }
-                return (jsx_runtime_1.jsx(SubscribeToNodePaths_1.SubscribeToNodePaths, { overrideId: sequence.controls.overrideId, schema: sequence.controls.schema, stack: sequence.stack, effects: sequence.effects }, sequence.id));
+                return (jsx_runtime_1.jsx(SubscribeToNodePaths_1.SubscribeToNodePaths, { overrideId: sequence.controls.overrideId, schema: sequence.controls.schema, getStack: sequence.getStack, effects: sequence.effects }, sequence.id));
             }), jsx_runtime_1.jsx(SequencePropsObserver_1.SequencePropsObserver, {}), jsx_runtime_1.jsxs(TimelineWidthProvider_1.TimelineWidthProvider, { children: [
                     jsx_runtime_1.jsx(TimelinePinchZoom_1.TimelinePinchZoom, {}), jsx_runtime_1.jsx(TimelineHeightContainer_1.TimelineHeightContainer, { shown: shown, hasBeenCut: hasBeenCut, children: jsx_runtime_1.jsxs(SplitterContainer_1.SplitterContainer, { orientation: "vertical", defaultFlex: 0.2, id: "names-to-timeline", maxFlex: 0.5, minFlex: 0.15, children: [
                                 jsx_runtime_1.jsx(SplitterElement_1.SplitterElement, { type: "flexer", sticky: jsx_runtime_1.jsx(TimelineTimeIndicators_1.TimelineTimePlaceholders, {}), children: jsx_runtime_1.jsx(TimelineList_1.TimelineList, { timeline: shown }) }), jsx_runtime_1.jsx(SplitterHandle_1.SplitterHandle, { onCollapse: noop, allowToCollapse: "none" }), jsx_runtime_1.jsx(SplitterElement_1.SplitterElement, { type: "anti-flexer", sticky: null, children: jsx_runtime_1.jsxs(TimelineScrollable_1.TimelineScrollable, { children: [