@remotion/cli 4.0.0-alpha.4 → 4.0.0-alpha11

package/dist/editor/components/Timeline/TimelinePlayCursorSyncer.js

@@ -9,14 +9,16 @@ const timeline_refs_1 = require("./timeline-refs");
 const timeline_scroll_logic_1 = require("./timeline-scroll-logic");
 let lastTimelinePositionWhileScrolling = null;
 const TimelinePlayCursorSyncer = () => {
-    var _a, _b;
+    var _a, _b, _c;
     const video = remotion_1.Internals.useVideo();
     const timelineContext = (0, react_1.useContext)(remotion_1.Internals.Timeline.TimelineContext);
+    const timelinePosition = remotion_1.Internals.Timeline.useTimelinePosition();
     const { zoom } = (0, react_1.useContext)(timeline_zoom_1.TimelineZoomCtx);
-    (0, imperative_state_1.setCurrentFrame)(timelineContext.frame);
+    (0, imperative_state_1.setCurrentFrame)(timelinePosition);
     (0, imperative_state_1.setCurrentZoom)(zoom);
     (0, imperative_state_1.setCurrentDuration)((_a = video === null || video === void 0 ? void 0 : video.durationInFrames) !== null && _a !== void 0 ? _a : 1);
-    const playing = (_b = timelineContext.playing) !== null && _b !== void 0 ? _b : false;
+    (0, imperative_state_1.setCurrentFps)((_b = video === null || video === void 0 ? void 0 : video.fps) !== null && _b !== void 0 ? _b : 1);
+    const playing = (_c = timelineContext.playing) !== null && _c !== void 0 ? _c : false;
     /**
      * While playing (forwards or backwards), jump one viewport width to the left or right when the cursor goes out of the viewport.
      */
@@ -30,9 +32,9 @@ const TimelinePlayCursorSyncer = () => {
         (0, timeline_scroll_logic_1.ensureFrameIsInViewport)({
             direction: timelineContext.playbackRate > 0 ? 'page-right' : 'page-left',
             durationInFrames: video.durationInFrames,
-            frame: timelineContext.frame,
+            frame: timelinePosition,
         });
-    }, [playing, timelineContext, video]);
+    }, [playing, timelineContext, timelinePosition, video]);
     /**
      * Restore state if `enter` is being pressed
      */

package/dist/editor/components/Timeline/TimelineScrollable.js

@@ -3,13 +3,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.TimelineScrollable = void 0;
 const jsx_runtime_1 = require("react/jsx-runtime");
 const react_1 = require("react");
+const colors_1 = require("../../helpers/colors");
+const is_menu_item_1 = require("../Menu/is-menu-item");
 const timeline_refs_1 = require("./timeline-refs");
 const outer = {
     width: '100%',
     height: '100%',
     overflowX: 'auto',
+    overflowY: 'hidden',
     position: 'relative',
-    backgroundColor: '#111',
+    backgroundColor: colors_1.TIMELINE_BACKGROUND,
 };
 const TimelineScrollable = ({ children }) => {
     const containerStyle = (0, react_1.useMemo)(() => {
@@ -18,6 +21,6 @@ const TimelineScrollable = ({ children }) => {
             minHeight: '100%',
         };
     }, []);
-    return ((0, jsx_runtime_1.jsx)("div", { ref: timeline_refs_1.scrollableRef, style: outer, children: (0, jsx_runtime_1.jsx)("div", { style: containerStyle, children: children }) }));
+    return ((0, jsx_runtime_1.jsx)("div", { ref: timeline_refs_1.scrollableRef, style: outer, className: is_menu_item_1.HORIZONTAL_SCROLLBAR_CLASSNAME, children: (0, jsx_runtime_1.jsx)("div", { style: containerStyle, children: children }) }));
 };
 exports.TimelineScrollable = TimelineScrollable;

package/dist/editor/components/Timeline/TimelineSequence.js

@@ -5,24 +5,21 @@ const jsx_runtime_1 = require("react/jsx-runtime");
 const player_1 = require("@remotion/player");
 const react_1 = require("react");
 const remotion_1 = require("remotion");
+const colors_1 = require("../../helpers/colors");
 const get_timeline_sequence_layout_1 = require("../../helpers/get-timeline-sequence-layout");
 const timeline_layout_1 = require("../../helpers/timeline-layout");
-const rich_timeline_1 = require("../../state/rich-timeline");
 const AudioWaveform_1 = require("../AudioWaveform");
-const Thumbnail_1 = require("../Thumbnail");
 const LoopedTimelineIndicators_1 = require("./LoopedTimelineIndicators");
 const timeline_refs_1 = require("./timeline-refs");
 const TimelineVideoInfo_1 = require("./TimelineVideoInfo");
-const SEQUENCE_GRADIENT = 'linear-gradient(to bottom, #3697e1, #348AC7 60%)';
 const AUDIO_GRADIENT = 'linear-gradient(rgb(16 171 58), rgb(43 165 63) 60%)';
 const VIDEO_GRADIENT = 'linear-gradient(to top, #8e44ad, #9b59b6)';
 const TimelineSequence = ({ s, fps }) => {
-    var _a, _b;
+    var _a;
     const size = player_1.PlayerInternals.useElementSize(timeline_refs_1.sliderAreaRef, {
         triggerOnWindowResize: false,
         shouldApplyCssTransforms: true,
     });
-    const { richTimeline } = (0, react_1.useContext)(rich_timeline_1.RichTimelineContext);
     const windowWidth = (_a = size === null || size === void 0 ? void 0 : size.width) !== null && _a !== void 0 ? _a : 0;
     // If a duration is 1, it is essentially a still and it should have width 0
     // Some compositions may not be longer than their media duration,
@@ -33,8 +30,10 @@ const TimelineSequence = ({ s, fps }) => {
         throw new TypeError('Expected video config');
     }
     const { marginLeft, width } = (0, get_timeline_sequence_layout_1.getTimelineSequenceLayout)({
-        durationInFrames: s.duration * ((_b = s.showLoopTimesInTimeline) !== null && _b !== void 0 ? _b : 1),
-        startFrom: s.from,
+        durationInFrames: s.loopDisplay
+            ? s.loopDisplay.durationInFrames * s.loopDisplay.numberOfTimes
+            : s.duration,
+        startFrom: s.loopDisplay ? s.from + s.loopDisplay.startOffset : s.from,
         startFromMedia: s.type === 'sequence' ? 0 : s.startMediaFrom,
         maxMediaDuration,
         video,
@@ -46,7 +45,7 @@ const TimelineSequence = ({ s, fps }) => {
                 ? AUDIO_GRADIENT
                 : s.type === 'video'
                     ? VIDEO_GRADIENT
-                    : SEQUENCE_GRADIENT,
+                    : colors_1.BLUE,
             border: get_timeline_sequence_layout_1.SEQUENCE_BORDER_WIDTH + 'px solid rgba(255, 255, 255, 0.2)',
             borderRadius: 4,
             position: 'absolute',
@@ -58,15 +57,6 @@ const TimelineSequence = ({ s, fps }) => {
             overflow: 'hidden',
         };
     }, [marginLeft, s.type, width]);
-    const row = (0, react_1.useMemo)(() => {
-        return {
-            flexDirection: 'row',
-            display: 'flex',
-            borderRadius: 5,
-            overflow: 'hidden',
-        };
-    }, []);
-    const thumbnailWidth = timeline_layout_1.TIMELINE_LAYER_HEIGHT * (video.width / video.height);
-    return ((0, jsx_runtime_1.jsxs)("div", { style: style, title: s.displayName, children: [(0, jsx_runtime_1.jsx)("div", { style: row, children: richTimeline && s.type === 'sequence' ? ((0, jsx_runtime_1.jsx)(Thumbnail_1.Thumbnail, { targetHeight: timeline_layout_1.TIMELINE_LAYER_HEIGHT, targetWidth: thumbnailWidth, composition: video, frameToDisplay: Math.floor(s.from + s.duration / 2) })) : null }), s.type === 'audio' ? ((0, jsx_runtime_1.jsx)(AudioWaveform_1.AudioWaveform, { src: s.src, doesVolumeChange: s.doesVolumeChange, visualizationWidth: width, startFrom: s.startMediaFrom, durationInFrames: s.duration, fps: fps, volume: s.volume, setMaxMediaDuration: setMaxMediaDuration })) : null, s.type === 'video' ? (0, jsx_runtime_1.jsx)(TimelineVideoInfo_1.TimelineVideoInfo, { src: s.src }) : null, s.showLoopTimesInTimeline === undefined ? null : ((0, jsx_runtime_1.jsx)(LoopedTimelineIndicators_1.LoopedTimelineIndicator, { loops: s.showLoopTimesInTimeline }))] }, s.id));
+    return ((0, jsx_runtime_1.jsxs)("div", { style: style, title: s.displayName, children: [s.type === 'audio' ? ((0, jsx_runtime_1.jsx)(AudioWaveform_1.AudioWaveform, { src: s.src, doesVolumeChange: s.doesVolumeChange, visualizationWidth: width, startFrom: s.startMediaFrom, durationInFrames: s.duration, fps: fps, volume: s.volume, setMaxMediaDuration: setMaxMediaDuration, playbackRate: s.playbackRate })) : null, s.type === 'video' ? (0, jsx_runtime_1.jsx)(TimelineVideoInfo_1.TimelineVideoInfo, { src: s.src }) : null, s.loopDisplay === undefined ? null : ((0, jsx_runtime_1.jsx)(LoopedTimelineIndicators_1.LoopedTimelineIndicator, { loops: s.loopDisplay.numberOfTimes }))] }, s.id));
 };
 exports.TimelineSequence = TimelineSequence;

package/dist/editor/components/Timeline/TimelineSequenceFrame.js

@@ -16,6 +16,7 @@ const TimelineSequenceFrame = ({ from, duration }) => {
     const frame = (0, remotion_1.useCurrentFrame)();
     const { fps } = (0, remotion_1.useVideoConfig)();
     const relativeFrame = frame - from;
+    const roundedFrame = Math.round(relativeFrame * 100) / 100;
     const isInRange = relativeFrame >= 0 && relativeFrame < duration;
     if (!isInRange) {
         return null;
@@ -26,6 +27,6 @@ The current time within the sequence.
 Call \`useCurrentFrame()\` within the sequence to get the time programmatically.
 
 Call \`const {durationInFrames} = useVideoConfig()\` to get the duration of the sequence.
-`.trim(), style: relativeFrameStyle, children: [(0, render_frame_1.renderFrame)(relativeFrame, fps), " (", relativeFrame, ")"] }));
+`.trim(), style: relativeFrameStyle, children: [(0, render_frame_1.renderFrame)(relativeFrame, fps), " (", roundedFrame, ")"] }));
 };
 exports.TimelineSequenceFrame = TimelineSequenceFrame;

package/dist/editor/components/Timeline/TimelineSlider.d.ts

@@ -1,2 +1,5 @@
 import React from 'react';
+export declare const redrawTimelineSliderFast: React.RefObject<{
+    draw: (frame: number, width?: number) => void;
+}>;
 export declare const TimelineSlider: React.FC;

package/dist/editor/components/Timeline/TimelineSlider.js

@@ -1,10 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TimelineSlider = void 0;
+exports.TimelineSlider = exports.redrawTimelineSliderFast = void 0;
 const jsx_runtime_1 = require("react/jsx-runtime");
 const react_1 = require("react");
 const remotion_1 = require("remotion");
 const get_left_of_timeline_slider_1 = require("../../helpers/get-left-of-timeline-slider");
+const imperative_state_1 = require("./imperative-state");
+const timeline_refs_1 = require("./timeline-refs");
 const TimelineSliderHandle_1 = require("./TimelineSliderHandle");
 const container = {
     position: 'absolute',
@@ -18,9 +20,11 @@ const line = {
     position: 'fixed',
     backgroundColor: '#f02c00',
 };
+exports.redrawTimelineSliderFast = (0, react_1.createRef)();
 const TimelineSlider = () => {
     const timelinePosition = remotion_1.Internals.Timeline.useTimelinePosition();
     const { get } = (0, get_left_of_timeline_slider_1.useGetXPositionOfItemInTimeline)();
+    const ref = (0, react_1.useRef)(null);
     const style = (0, react_1.useMemo)(() => {
         const left = get(timelinePosition);
         return {
@@ -28,6 +32,35 @@ const TimelineSlider = () => {
             transform: `translateX(${left}px)`,
         };
     }, [timelinePosition, get]);
-    return ((0, jsx_runtime_1.jsx)("div", { style: style, children: (0, jsx_runtime_1.jsx)("div", { style: line, children: (0, jsx_runtime_1.jsx)(TimelineSliderHandle_1.TimelineSliderHandle, {}) }) }));
+    (0, react_1.useImperativeHandle)(exports.redrawTimelineSliderFast, () => {
+        return {
+            draw: (frame, width) => {
+                var _a, _b;
+                const { current } = ref;
+                if (!current) {
+                    throw new Error('unexpectedly did not have ref to timelineslider');
+                }
+                current.style.transform = `translateX(${(0, get_left_of_timeline_slider_1.getXPositionOfItemInTimelineImperatively)(frame, (0, imperative_state_1.getCurrentDuration)(), (_b = width !== null && width !== void 0 ? width : (_a = timeline_refs_1.sliderAreaRef.current) === null || _a === void 0 ? void 0 : _a.clientWidth) !== null && _b !== void 0 ? _b : 0)}px)`;
+            },
+        };
+    }, []);
+    (0, react_1.useEffect)(() => {
+        const currentRef = ref.current;
+        if (!currentRef) {
+            return;
+        }
+        const { current } = timeline_refs_1.timelineVerticalScroll;
+        if (!current) {
+            return;
+        }
+        const onScroll = () => {
+            currentRef.style.top = current.scrollTop + 'px';
+        };
+        current.addEventListener('scroll', onScroll);
+        return () => {
+            current.removeEventListener('scroll', onScroll);
+        };
+    }, []);
+    return ((0, jsx_runtime_1.jsxs)("div", { ref: ref, style: style, children: [(0, jsx_runtime_1.jsx)("div", { style: line }), (0, jsx_runtime_1.jsx)(TimelineSliderHandle_1.TimelineSliderHandle, {})] }));
 };
 exports.TimelineSlider = TimelineSlider;

package/dist/editor/components/Timeline/TimelineSliderHandle.js

@@ -6,11 +6,9 @@ const container = {
     width: 20,
     height: 20,
     position: 'fixed',
-};
-const style = {
     marginLeft: -8,
 };
 const TimelineSliderHandle = () => {
-    return ((0, jsx_runtime_1.jsx)("div", { style: container, children: (0, jsx_runtime_1.jsx)("svg", { width: 17, viewBox: "0 0 159 212", version: "1.1", style: style, children: (0, jsx_runtime_1.jsx)("path", { d: "M17.0234375,1.07763419 L143.355469,1.07763419 C151.63974,1.07763419 158.355469,7.79336295 158.355469,16.0776342 L158.355469,69.390507 C158.355469,73.7938677 156.420655,77.9748242 153.064021,80.8248415 L89.3980057,134.881757 C83.7986799,139.635978 75.5802263,139.635978 69.9809005,134.881757 L6.66764807,81.1243622 C3.0872392,78.0843437 1.0234375,73.6246568 1.0234375,68.9277387 L1.0234375,17.0776342 C1.0234375,8.2410782 8.1868815,1.07763419 17.0234375,1.07763419 Z", fill: "#f02c00" }) }) }));
+    return ((0, jsx_runtime_1.jsx)("div", { style: container, children: (0, jsx_runtime_1.jsx)("svg", { width: 17, viewBox: "0 0 159 212", version: "1.1", children: (0, jsx_runtime_1.jsx)("path", { d: "M17.0234375,1.07763419 L143.355469,1.07763419 C151.63974,1.07763419 158.355469,7.79336295 158.355469,16.0776342 L158.355469,69.390507 C158.355469,73.7938677 156.420655,77.9748242 153.064021,80.8248415 L89.3980057,134.881757 C83.7986799,139.635978 75.5802263,139.635978 69.9809005,134.881757 L6.66764807,81.1243622 C3.0872392,78.0843437 1.0234375,73.6246568 1.0234375,68.9277387 L1.0234375,17.0776342 C1.0234375,8.2410782 8.1868815,1.07763419 17.0234375,1.07763419 Z", fill: "#f02c00" }) }) }));
 };
 exports.TimelineSliderHandle = TimelineSliderHandle;

package/dist/editor/components/Timeline/TimelineTimeIndicators.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-export declare const TIMELINE_TIME_INDICATOR_HEIGHT = 45;
+export declare const TIMELINE_TIME_INDICATOR_HEIGHT = 30;
 export declare const TimelineTimePlaceholders: React.FC;
 export declare const TimelineTimePadding: React.FC;
 export declare const TimelineTimeIndicators: React.FC;

package/dist/editor/components/Timeline/TimelineTimeIndicators.js

@@ -4,8 +4,50 @@ exports.TimelineTimeIndicators = exports.TimelineTimePadding = exports.TimelineT
 const jsx_runtime_1 = require("react/jsx-runtime");
 const player_1 = require("@remotion/player");
 const react_1 = require("react");
+const remotion_1 = require("remotion");
+const colors_1 = require("../../helpers/colors");
+const timeline_layout_1 = require("../../helpers/timeline-layout");
+const render_frame_1 = require("../../state/render-frame");
+const TimeValue_1 = require("../TimeValue");
 const timeline_refs_1 = require("./timeline-refs");
-exports.TIMELINE_TIME_INDICATOR_HEIGHT = 45;
+const timeline_scroll_logic_1 = require("./timeline-scroll-logic");
+const TimelineListItem_1 = require("./TimelineListItem");
+exports.TIMELINE_TIME_INDICATOR_HEIGHT = 30;
+const container = {
+    height: exports.TIMELINE_TIME_INDICATOR_HEIGHT - 4,
+    boxShadow: `0 0 4px ${colors_1.TIMELINE_BACKGROUND}`,
+    position: 'absolute',
+    backgroundColor: colors_1.TIMELINE_BACKGROUND,
+    top: 0,
+    left: 0,
+};
+const tick = {
+    width: 1,
+    backgroundColor: 'rgba(255, 255, 255, 0.15)',
+    height: 20,
+    position: 'absolute',
+};
+const secondTick = {
+    ...tick,
+    height: 15,
+};
+const tickLabel = {
+    fontSize: 12,
+    marginLeft: 8,
+    marginTop: 7,
+    color: colors_1.LIGHT_TEXT,
+};
+const timeValue = {
+    height: exports.TIMELINE_TIME_INDICATOR_HEIGHT,
+    position: 'absolute',
+    top: 0,
+    width: '100%',
+    paddingLeft: TimelineListItem_1.TOTAL_TIMELINE_LAYER_LEFT_PADDING,
+    boxShadow: `0 0 20px ${colors_1.BACKGROUND}`,
+    display: 'flex',
+    alignItems: 'center',
+    background: colors_1.BACKGROUND,
+};
 const TimelineTimePlaceholders = () => {
     const ref = (0, react_1.useRef)(null);
     (0, react_1.useEffect)(() => {
@@ -25,13 +67,7 @@ const TimelineTimePlaceholders = () => {
             current.removeEventListener('scroll', onScroll);
         };
     }, []);
-    return ((0, jsx_runtime_1.jsx)("div", { ref: ref, style: {
-            height: exports.TIMELINE_TIME_INDICATOR_HEIGHT,
-            backgroundColor: 'green',
-            position: 'absolute',
-            top: 0,
-            width: '100%',
-        } }));
+    return ((0, jsx_runtime_1.jsx)("div", { ref: ref, style: timeValue, children: (0, jsx_runtime_1.jsx)(TimeValue_1.TimeValue, {}) }));
 };
 exports.TimelineTimePlaceholders = TimelineTimePlaceholders;
 const TimelineTimePadding = () => {
@@ -46,6 +82,7 @@ const TimelineTimeIndicators = () => {
         triggerOnWindowResize: false,
         shouldApplyCssTransforms: true,
     });
+    const video = remotion_1.Internals.useVideo();
     const windowWidth = (_a = size === null || size === void 0 ? void 0 : size.width) !== null && _a !== void 0 ? _a : 0;
     const ref = (0, react_1.useRef)(null);
     (0, react_1.useEffect)(() => {
@@ -65,15 +102,67 @@ const TimelineTimeIndicators = () => {
             current.removeEventListener('scroll', onScroll);
         };
     }, []);
-    return ((0, jsx_runtime_1.jsx)("div", { ref: ref, 
-        // TODO: Remove inline styles in this file
-        style: {
-            height: exports.TIMELINE_TIME_INDICATOR_HEIGHT,
-            backgroundColor: 'yellow',
+    const style = (0, react_1.useMemo)(() => {
+        return {
+            ...container,
             width: windowWidth,
-            position: 'absolute',
-            top: 0,
-            left: 0,
-        } }));
+            overflow: 'hidden',
+        };
+    }, [windowWidth]);
+    const ticks = (0, react_1.useMemo)(() => {
+        if (!video) {
+            return [];
+        }
+        const frameInterval = (0, timeline_scroll_logic_1.getFrameIncrementFromWidth)(video.durationInFrames, windowWidth);
+        const MIN_SPACING_BETWEEN_TICKS_PX = 5;
+        const seconds = Math.floor(video.durationInFrames / video.fps);
+        const secondMarkerEveryNth = Math.ceil((MIN_SPACING_BETWEEN_TICKS_PX * video.fps) / (frameInterval * video.fps));
+        const frameMarkerEveryNth = Math.ceil(MIN_SPACING_BETWEEN_TICKS_PX / frameInterval);
+        // Big ticks showing for every second
+        const secondTicks = new Array(seconds)
+            .fill(true)
+            .map((_, index) => {
+            return {
+                frame: index * video.fps,
+                style: {
+                    ...secondTick,
+                    left: frameInterval * index * video.fps + timeline_layout_1.TIMELINE_PADDING,
+                },
+                showTime: index > 0,
+            };
+        })
+            .filter((_, idx) => idx % secondMarkerEveryNth === 0);
+        const frameTicks = new Array(video.durationInFrames)
+            .fill(true)
+            .map((_, index) => {
+            return {
+                frame: index,
+                style: {
+                    ...tick,
+                    left: frameInterval * index + timeline_layout_1.TIMELINE_PADDING,
+                    height: index % video.fps === 0
+                        ? 10
+                        : (index / frameMarkerEveryNth) % 2 === 0
+                            ? 5
+                            : 2,
+                },
+                showTime: false,
+            };
+        })
+            .filter((_, idx) => idx % frameMarkerEveryNth === 0);
+        // Merge and deduplicate ticks
+        const hasTicks = [];
+        return [...secondTicks, ...frameTicks].filter((t) => {
+            const alreadyUsed = hasTicks.find((ht) => ht === t.frame) !== undefined;
+            hasTicks.push(t.frame);
+            return !alreadyUsed;
+        });
+    }, [video, windowWidth]);
+    if (!video) {
+        return null;
+    }
+    return ((0, jsx_runtime_1.jsx)("div", { ref: ref, style: style, children: ticks.map((t) => {
+            return ((0, jsx_runtime_1.jsx)("div", { style: t.style, children: t.showTime ? ((0, jsx_runtime_1.jsx)("div", { style: tickLabel, children: (0, render_frame_1.renderFrame)(t.frame, video.fps) })) : null }, t.frame));
+        }) }));
 };
 exports.TimelineTimeIndicators = TimelineTimeIndicators;

package/dist/editor/components/Timeline/TimelineTracks.js

@@ -7,14 +7,13 @@ const timeline_layout_1 = require("../../helpers/timeline-layout");
 const is_collapsed_1 = require("./is-collapsed");
 const MaxTimelineTracks_1 = require("./MaxTimelineTracks");
 const TimelineSequence_1 = require("./TimelineSequence");
+const TimelineTimeIndicators_1 = require("./TimelineTimeIndicators");
 const content = {
     paddingLeft: timeline_layout_1.TIMELINE_PADDING,
     paddingRight: timeline_layout_1.TIMELINE_PADDING,
 };
 const timelineContent = {
-    flex: 1,
-    backgroundColor: '#111111',
-    width: '100%',
+    minHeight: '100%',
 };
 const TimelineTracks = ({ timeline, fps, viewState, hasBeenCut }) => {
     const inner = (0, react_1.useMemo)(() => {
@@ -22,11 +21,17 @@ const TimelineTracks = ({ timeline, fps, viewState, hasBeenCut }) => {
             height: timeline_layout_1.TIMELINE_LAYER_HEIGHT + timeline_layout_1.TIMELINE_BORDER * 2,
         };
     }, []);
-    return ((0, jsx_runtime_1.jsxs)("div", { style: timelineContent, children: [(0, jsx_runtime_1.jsx)("div", { style: content, children: timeline.map((track) => {
-                    if ((0, is_collapsed_1.isTrackHidden)(track, timeline, viewState)) {
-                        return null;
-                    }
-                    return ((0, jsx_runtime_1.jsx)("div", { style: inner, children: (0, jsx_runtime_1.jsx)(TimelineSequence_1.TimelineSequence, { fps: fps, s: track.sequence }) }, track.sequence.id));
-                }) }), hasBeenCut ? (0, jsx_runtime_1.jsx)(MaxTimelineTracks_1.MaxTimelineTracksReached, {}) : null] }));
+    const timelineStyle = (0, react_1.useMemo)(() => {
+        return {
+            ...timelineContent,
+            width: 100 + '%',
+        };
+    }, []);
+    return ((0, jsx_runtime_1.jsxs)("div", { style: timelineStyle, children: [(0, jsx_runtime_1.jsxs)("div", { style: content, children: [(0, jsx_runtime_1.jsx)(TimelineTimeIndicators_1.TimelineTimePadding, {}), timeline.map((track) => {
+                        if ((0, is_collapsed_1.isTrackHidden)(track, timeline, viewState)) {
+                            return null;
+                        }
+                        return ((0, jsx_runtime_1.jsx)("div", { style: inner, children: (0, jsx_runtime_1.jsx)(TimelineSequence_1.TimelineSequence, { fps: fps, s: track.sequence }) }, track.sequence.id));
+                    }), (0, jsx_runtime_1.jsx)(TimelineTimeIndicators_1.TimelineTimeIndicators, {})] }), hasBeenCut ? (0, jsx_runtime_1.jsx)(MaxTimelineTracks_1.MaxTimelineTracksReached, {}) : null] }));
 };
 exports.TimelineTracks = TimelineTracks;

package/dist/editor/components/Timeline/TimelineZoomControls.js

@@ -7,12 +7,14 @@ const is_current_selected_still_1 = require("../../helpers/is-current-selected-s
 const minus_1 = require("../../icons/minus");
 const plus_1 = require("../../icons/plus");
 const timeline_zoom_1 = require("../../state/timeline-zoom");
+const z_index_1 = require("../../state/z-index");
 const ControlButton_1 = require("../ControlButton");
 const layout_1 = require("../layout");
 const container = {
     color: 'black',
     flexDirection: 'row',
     display: 'flex',
+    alignItems: 'center',
 };
 const buttonStyle = {
     fontSize: 24,
@@ -21,12 +23,9 @@ const iconStyle = {
     color: 'white',
     width: 14,
 };
-const slider = {
-    width: 60,
-    accentColor: 'var(--blue)',
-};
 const TimelineZoomControls = () => {
     const { setZoom, zoom } = (0, react_1.useContext)(timeline_zoom_1.TimelineZoomCtx);
+    const { tabIndex } = (0, z_index_1.useZIndex)();
     const onMinusClicked = (0, react_1.useCallback)(() => {
         setZoom((z) => Math.max(timeline_zoom_1.TIMELINE_MIN_ZOOM, z - 0.2));
     }, [setZoom]);
@@ -40,6 +39,6 @@ const TimelineZoomControls = () => {
     if (isStill) {
         return null;
     }
-    return ((0, jsx_runtime_1.jsxs)("div", { style: container, children: [(0, jsx_runtime_1.jsx)(ControlButton_1.ControlButton, { onClick: onMinusClicked, style: buttonStyle, title: "Zoom out timeline", role: 'ControlButton', type: "button", children: (0, jsx_runtime_1.jsx)(minus_1.Minus, { style: iconStyle }) }), (0, jsx_runtime_1.jsx)(layout_1.Spacing, { x: 0.5 }), (0, jsx_runtime_1.jsx)("input", { title: `Timeline zoom (${zoom}x)`, alt: `Timeline zoom (${zoom}x)`, type: 'range', min: timeline_zoom_1.TIMELINE_MIN_ZOOM, step: 0.1, value: zoom, max: timeline_zoom_1.TIMELINE_MAX_ZOOM, onChange: onChange, style: slider }), (0, jsx_runtime_1.jsx)(layout_1.Spacing, { x: 0.5 }), (0, jsx_runtime_1.jsx)(ControlButton_1.ControlButton, { onClick: onPlusClicked, style: buttonStyle, title: "Zoom in timeline", role: 'button', type: "button", children: (0, jsx_runtime_1.jsx)(plus_1.Plus, { style: iconStyle }) })] }));
+    return ((0, jsx_runtime_1.jsxs)("div", { style: container, children: [(0, jsx_runtime_1.jsx)(ControlButton_1.ControlButton, { onClick: onMinusClicked, style: buttonStyle, title: "Zoom out timeline", role: 'ControlButton', type: "button", disabled: timeline_zoom_1.TIMELINE_MIN_ZOOM === zoom, children: (0, jsx_runtime_1.jsx)(minus_1.Minus, { style: iconStyle }) }), (0, jsx_runtime_1.jsx)(layout_1.Spacing, { x: 0.5 }), (0, jsx_runtime_1.jsx)("input", { title: `Timeline zoom (${zoom}x)`, alt: `Timeline zoom (${zoom}x)`, type: 'range', min: timeline_zoom_1.TIMELINE_MIN_ZOOM, step: 0.1, value: zoom, max: timeline_zoom_1.TIMELINE_MAX_ZOOM, onChange: onChange, className: "__remotion-timeline-slider", tabIndex: tabIndex }), (0, jsx_runtime_1.jsx)(layout_1.Spacing, { x: 0.5 }), (0, jsx_runtime_1.jsx)(ControlButton_1.ControlButton, { onClick: onPlusClicked, style: buttonStyle, title: "Zoom in timeline", role: 'button', type: "button", disabled: timeline_zoom_1.TIMELINE_MAX_ZOOM === zoom, children: (0, jsx_runtime_1.jsx)(plus_1.Plus, { style: iconStyle }) })] }));
 };
 exports.TimelineZoomControls = TimelineZoomControls;

package/dist/editor/components/Timeline/imperative-state.d.ts

@@ -1,9 +1,8 @@
-export declare let currentFrame: number;
-export declare let currentZoom: number;
-export declare let currentDuration: number;
 export declare const getCurrentZoom: () => number;
 export declare const setCurrentZoom: (z: number) => void;
 export declare const getCurrentFrame: () => number;
 export declare const setCurrentFrame: (f: number) => void;
 export declare const getCurrentDuration: () => number;
 export declare const setCurrentDuration: (d: number) => void;
+export declare const getCurrentFps: () => number;
+export declare const setCurrentFps: (d: number) => void;

package/dist/editor/components/Timeline/imperative-state.js

@@ -1,30 +1,39 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.setCurrentDuration = exports.getCurrentDuration = exports.setCurrentFrame = exports.getCurrentFrame = exports.setCurrentZoom = exports.getCurrentZoom = exports.currentDuration = exports.currentZoom = exports.currentFrame = void 0;
-exports.currentFrame = 0;
-exports.currentZoom = 1;
-exports.currentDuration = 1;
+exports.setCurrentFps = exports.getCurrentFps = exports.setCurrentDuration = exports.getCurrentDuration = exports.setCurrentFrame = exports.getCurrentFrame = exports.setCurrentZoom = exports.getCurrentZoom = void 0;
+let currentFrame = 0;
+let currentZoom = 1;
+let currentDuration = 1;
+let currentFps = 1;
 const getCurrentZoom = () => {
-    return exports.currentZoom;
+    return currentZoom;
 };
 exports.getCurrentZoom = getCurrentZoom;
 const setCurrentZoom = (z) => {
-    exports.currentZoom = z;
+    currentZoom = z;
 };
 exports.setCurrentZoom = setCurrentZoom;
 const getCurrentFrame = () => {
-    return exports.currentFrame;
+    return currentFrame;
 };
 exports.getCurrentFrame = getCurrentFrame;
 const setCurrentFrame = (f) => {
-    exports.currentFrame = f;
+    currentFrame = f;
 };
 exports.setCurrentFrame = setCurrentFrame;
 const getCurrentDuration = () => {
-    return exports.currentDuration;
+    return currentDuration;
 };
 exports.getCurrentDuration = getCurrentDuration;
 const setCurrentDuration = (d) => {
-    exports.currentDuration = d;
+    currentDuration = d;
 };
 exports.setCurrentDuration = setCurrentDuration;
+const getCurrentFps = () => {
+    return currentFps;
+};
+exports.getCurrentFps = getCurrentFps;
+const setCurrentFps = (d) => {
+    currentFps = d;
+};
+exports.setCurrentFps = setCurrentFps;

package/dist/editor/components/Timeline/is-collapsed.js

@@ -9,11 +9,10 @@ const isTrackHidden = (track, allTracks, viewState) => {
     if (!track.sequence.parent) {
         return false;
     }
-    const parent = allTracks.find((t) => t.sequence.id === track.sequence.parent);
-    if (!parent) {
-        // TODO: Tighten up, when toggling rich timeline this case can happen right now
+    if (!track.canCollapse) {
         return false;
     }
+    const parent = allTracks.find((t) => t.sequence.id === track.sequence.parent);
     if ((0, exports.isTrackCollapsed)(parent.hash, viewState)) {
         return true;
     }

package/dist/editor/components/Timeline/timeline-refs.d.ts

@@ -1,2 +1,4 @@
 import React from 'react';
 export declare const sliderAreaRef: React.RefObject<HTMLDivElement>;
+export declare const scrollableRef: React.RefObject<HTMLDivElement>;
+export declare const timelineVerticalScroll: React.RefObject<HTMLDivElement>;

package/dist/editor/components/Timeline/timeline-refs.js

@@ -3,6 +3,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.sliderAreaRef = void 0;
+exports.timelineVerticalScroll = exports.scrollableRef = exports.sliderAreaRef = void 0;
 const react_1 = __importDefault(require("react"));
 exports.sliderAreaRef = react_1.default.createRef();
+exports.scrollableRef = react_1.default.createRef();
+exports.timelineVerticalScroll = react_1.default.createRef();

package/dist/editor/components/Timeline/timeline-scroll-logic.d.ts

@@ -2,7 +2,6 @@ export declare const canScrollTimelineIntoDirection: () => {
     canScrollRight: boolean;
     canScrollLeft: boolean;
 };
-export declare const SCROLL_INCREMENT = 200;
 export declare const getFrameWhileScrollingLeft: ({ durationInFrames, width, }: {
     durationInFrames: number;
     width: number;
@@ -25,7 +24,7 @@ export declare const getScrollPositionForCursorOnRightEdge: ({ nextFrame, durati
     nextFrame: number;
     durationInFrames: number;
 }) => number;
-export declare const getFrameIncrement: (durationInFrames: number) => number;
+export declare const getFrameIncrementFromWidth: (durationInFrames: number, width: number) => number;
 export declare const getFrameWhileScrollingRight: ({ durationInFrames, width, }: {
     durationInFrames: number;
     width: number;