@remotion/cli 3.1.10 → 3.2.1

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

@@ -8,41 +8,38 @@ const remotion_1 = require("remotion");
 const get_left_of_timeline_slider_1 = require("../../helpers/get-left-of-timeline-slider");
 const timeline_layout_1 = require("../../helpers/timeline-layout");
 const in_out_1 = require("../../state/in-out");
+const timeline_zoom_1 = require("../../state/timeline-zoom");
 const FramePersistor_1 = require("../FramePersistor");
 const timeline_refs_1 = require("./timeline-refs");
+const timeline_scroll_logic_1 = require("./timeline-scroll-logic");
 const TimelineInOutPointer_1 = require("./TimelineInOutPointer");
 const TimelineInOutPointerHandle_1 = require("./TimelineInOutPointerHandle");
+const TimelineSlider_1 = require("./TimelineSlider");
 const inner = {
     overflowY: 'auto',
     overflowX: 'hidden',
 };
 const container = {
     userSelect: 'none',
-    overflow: 'hidden',
     position: 'absolute',
-    width: '100%',
     height: '100%',
+    top: 0,
 };
-const getFrameFromX = (clientX, durationInFrames, width, extrapolate) => {
+const getClientXWithScroll = (x) => {
     var _a;
-    const pos = clientX - timeline_layout_1.TIMELINE_PADDING;
-    const frame = Math.round((0, remotion_1.interpolate)(pos, [0, width - timeline_layout_1.TIMELINE_PADDING * 2], [0, (_a = durationInFrames - 1) !== null && _a !== void 0 ? _a : 0], {
-        extrapolateLeft: extrapolate,
-        extrapolateRight: extrapolate,
-    }));
-    return frame;
+    return x + ((_a = timeline_refs_1.scrollableRef.current) === null || _a === void 0 ? void 0 : _a.scrollLeft);
 };
 const TimelineDragHandler = () => {
-    var _a, _b;
-    const size = player_1.PlayerInternals.useElementSize(timeline_refs_1.sliderAreaRef, {
+    var _a, _b, _c;
+    const size = player_1.PlayerInternals.useElementSize(timeline_refs_1.scrollableRef, {
         triggerOnWindowResize: true,
         shouldApplyCssTransforms: true,
     });
     const [inOutDragging, setInOutDragging] = (0, react_1.useState)({
         dragging: false,
     });
-    const width = (_a = size === null || size === void 0 ? void 0 : size.width) !== null && _a !== void 0 ? _a : 0;
-    const left = (_b = size === null || size === void 0 ? void 0 : size.left) !== null && _b !== void 0 ? _b : 0;
+    const width = (_b = (_a = timeline_refs_1.scrollableRef.current) === null || _a === void 0 ? void 0 : _a.scrollWidth) !== null && _b !== void 0 ? _b : 0;
+    const left = (_c = size === null || size === void 0 ? void 0 : size.left) !== null && _c !== void 0 ? _c : 0;
     const { inFrame, outFrame } = (0, in_out_1.useTimelineInOutFramePosition)();
     const { setInAndOutFrames } = (0, in_out_1.useTimelineSetInOutFramePosition)();
     const { get } = (0, get_left_of_timeline_slider_1.useGetXPositionOfItemInTimeline)();
@@ -51,7 +48,15 @@ const TimelineDragHandler = () => {
     });
     const { playing, play, pause, seek } = player_1.PlayerInternals.usePlayer();
     const videoConfig = remotion_1.Internals.useUnsafeVideoConfig();
+    const scroller = (0, react_1.useRef)(null);
+    const stopInterval = () => {
+        if (scroller.current) {
+            clearInterval(scroller.current);
+            scroller.current = null;
+        }
+    };
     const onPointerDown = (0, react_1.useCallback)((e) => {
+        stopInterval();
         if (!videoConfig) {
             return;
         }
@@ -63,7 +68,7 @@ const TimelineDragHandler = () => {
             const outMarker = outFrame === null ? Infinity : get(outFrame - 1);
             setInOutDragging({
                 dragging: 'in',
-                initialOffset: e.clientX,
+                initialOffset: getClientXWithScroll(e.clientX),
                 boundaries: [-Infinity, outMarker - inMarker],
             });
             return;
@@ -76,12 +81,17 @@ const TimelineDragHandler = () => {
             const inMarker = inFrame === null ? -Infinity : get(inFrame + 1);
             setInOutDragging({
                 dragging: 'out',
-                initialOffset: e.clientX,
+                initialOffset: getClientXWithScroll(e.clientX),
                 boundaries: [inMarker - outMarker, Infinity],
             });
             return;
         }
-        const frame = getFrameFromX(e.clientX - left, videoConfig.durationInFrames, width, 'clamp');
+        const frame = (0, timeline_scroll_logic_1.getFrameFromX)({
+            clientX: getClientXWithScroll(e.clientX) - left,
+            durationInFrames: videoConfig.durationInFrames,
+            width,
+            extrapolate: 'clamp',
+        });
         seek(frame);
         setDragging({
             dragging: true,
@@ -90,15 +100,84 @@ const TimelineDragHandler = () => {
         pause();
     }, [videoConfig, left, width, seek, playing, pause, outFrame, get, inFrame]);
     const onPointerMoveScrubbing = (0, react_1.useCallback)((e) => {
+        var _a;
         if (!videoConfig) {
             return;
         }
         if (!dragging.dragging) {
             return;
         }
-        const frame = getFrameFromX(e.clientX - left, videoConfig.durationInFrames, width, 'clamp');
-        seek(frame);
-    }, [dragging.dragging, seek, left, videoConfig, width]);
+        const isRightOfArea = e.clientX >=
+            ((_a = timeline_refs_1.scrollableRef.current) === null || _a === void 0 ? void 0 : _a.clientWidth) +
+                left -
+                timeline_layout_1.TIMELINE_PADDING;
+        const isLeftOfArea = e.clientX <= left;
+        const frame = (0, timeline_scroll_logic_1.getFrameFromX)({
+            clientX: getClientXWithScroll(e.clientX) - left,
+            durationInFrames: videoConfig.durationInFrames,
+            width,
+            extrapolate: 'clamp',
+        });
+        if (isLeftOfArea && (0, timeline_scroll_logic_1.canScrollTimelineIntoDirection)().canScrollLeft) {
+            if (scroller.current) {
+                return;
+            }
+            const scrollEvery = () => {
+                var _a;
+                if (!(0, timeline_scroll_logic_1.canScrollTimelineIntoDirection)().canScrollLeft) {
+                    stopInterval();
+                    return;
+                }
+                const nextFrame = (0, timeline_scroll_logic_1.getFrameWhileScrollingLeft)({
+                    durationInFrames: videoConfig.durationInFrames,
+                    width,
+                });
+                const scrollPos = (0, timeline_scroll_logic_1.getScrollPositionForCursorOnLeftEdge)({
+                    nextFrame,
+                    durationInFrames: videoConfig.durationInFrames,
+                });
+                (_a = TimelineSlider_1.redrawTimelineSliderFast.current) === null || _a === void 0 ? void 0 : _a.draw(nextFrame);
+                seek(nextFrame);
+                (0, timeline_scroll_logic_1.scrollToTimelineXOffset)(scrollPos);
+            };
+            scrollEvery();
+            scroller.current = setInterval(() => {
+                scrollEvery();
+            }, 100);
+        }
+        else if (isRightOfArea &&
+            (0, timeline_scroll_logic_1.canScrollTimelineIntoDirection)().canScrollRight) {
+            if (scroller.current) {
+                return;
+            }
+            const scrollEvery = () => {
+                var _a;
+                if (!(0, timeline_scroll_logic_1.canScrollTimelineIntoDirection)().canScrollRight) {
+                    stopInterval();
+                    return;
+                }
+                const nextFrame = (0, timeline_scroll_logic_1.getFrameWhileScrollingRight)({
+                    durationInFrames: videoConfig.durationInFrames,
+                    width,
+                });
+                const scrollPos = (0, timeline_scroll_logic_1.getScrollPositionForCursorOnRightEdge)({
+                    nextFrame,
+                    durationInFrames: videoConfig.durationInFrames,
+                });
+                (_a = TimelineSlider_1.redrawTimelineSliderFast.current) === null || _a === void 0 ? void 0 : _a.draw(nextFrame);
+                seek(nextFrame);
+                (0, timeline_scroll_logic_1.scrollToTimelineXOffset)(scrollPos);
+            };
+            scrollEvery();
+            scroller.current = setInterval(() => {
+                scrollEvery();
+            }, 100);
+        }
+        else {
+            stopInterval();
+            seek(frame);
+        }
+    }, [videoConfig, dragging.dragging, left, width, seek]);
     const onPointerMoveInOut = (0, react_1.useCallback)((e) => {
         if (!videoConfig) {
             return;
@@ -106,7 +185,7 @@ const TimelineDragHandler = () => {
         if (!inOutDragging.dragging) {
             return;
         }
-        const offset = Math.max(inOutDragging.boundaries[0], Math.min(inOutDragging.boundaries[1], e.clientX - inOutDragging.initialOffset));
+        const offset = Math.max(inOutDragging.boundaries[0], Math.min(inOutDragging.boundaries[1], getClientXWithScroll(e.clientX) - inOutDragging.initialOffset));
         if (inOutDragging.dragging === 'in') {
             if (!TimelineInOutPointerHandle_1.inPointerHandle.current) {
                 throw new Error('in pointer handle');
@@ -139,6 +218,7 @@ const TimelineDragHandler = () => {
         }
     }, [get, inFrame, inOutDragging, outFrame, videoConfig, width]);
     const onPointerUpScrubbing = (0, react_1.useCallback)((e) => {
+        stopInterval();
         if (!videoConfig) {
             return;
         }
@@ -148,7 +228,12 @@ const TimelineDragHandler = () => {
         setDragging({
             dragging: false,
         });
-        const frame = getFrameFromX(e.clientX - left, videoConfig.durationInFrames, width, 'clamp');
+        const frame = (0, timeline_scroll_logic_1.getFrameFromX)({
+            clientX: getClientXWithScroll(e.clientX) - left,
+            durationInFrames: videoConfig.durationInFrames,
+            width,
+            extrapolate: 'clamp',
+        });
         (0, FramePersistor_1.persistCurrentFrame)(frame);
         if (dragging.wasPlaying) {
             play();
@@ -164,7 +249,12 @@ const TimelineDragHandler = () => {
         setInOutDragging({
             dragging: false,
         });
-        const frame = getFrameFromX(e.clientX - left, videoConfig.durationInFrames, width, 'extend');
+        const frame = (0, timeline_scroll_logic_1.getFrameFromX)({
+            clientX: getClientXWithScroll(e.clientX) - left,
+            durationInFrames: videoConfig.durationInFrames,
+            width,
+            extrapolate: 'extend',
+        });
         if (inOutDragging.dragging === 'in') {
             if (frame < 1) {
                 return setInAndOutFrames((prev) => ({
@@ -222,6 +312,13 @@ const TimelineDragHandler = () => {
             window.removeEventListener('pointerup', onPointerUpInOut);
         };
     }, [inOutDragging.dragging, onPointerMoveInOut, onPointerUpInOut]);
-    return ((0, jsx_runtime_1.jsxs)("div", { ref: timeline_refs_1.sliderAreaRef, style: container, onPointerDown: onPointerDown, children: [(0, jsx_runtime_1.jsx)("div", { style: inner }), inFrame !== null && ((0, jsx_runtime_1.jsx)(TimelineInOutPointerHandle_1.TimelineInOutPointerHandle, { type: "in", atFrame: inFrame, dragging: inOutDragging.dragging === 'in' })), outFrame !== null && ((0, jsx_runtime_1.jsx)(TimelineInOutPointerHandle_1.TimelineInOutPointerHandle, { type: "out", dragging: inOutDragging.dragging === 'out', atFrame: outFrame }))] }));
+    const { zoom } = (0, react_1.useContext)(timeline_zoom_1.TimelineZoomCtx);
+    const containerStyle = (0, react_1.useMemo)(() => {
+        return {
+            ...container,
+            width: 100 * zoom + '%',
+        };
+    }, [zoom]);
+    return ((0, jsx_runtime_1.jsxs)("div", { ref: timeline_refs_1.sliderAreaRef, style: containerStyle, onPointerDown: onPointerDown, children: [(0, jsx_runtime_1.jsx)("div", { style: inner }), inFrame !== null && ((0, jsx_runtime_1.jsx)(TimelineInOutPointerHandle_1.TimelineInOutPointerHandle, { type: "in", atFrame: inFrame, dragging: inOutDragging.dragging === 'in' })), outFrame !== null && ((0, jsx_runtime_1.jsx)(TimelineInOutPointerHandle_1.TimelineInOutPointerHandle, { type: "out", dragging: inOutDragging.dragging === 'out', atFrame: outFrame }))] }));
 };
 exports.TimelineDragHandler = TimelineDragHandler;

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

@@ -5,6 +5,7 @@ const jsx_runtime_1 = require("react/jsx-runtime");
 const colors_1 = require("../../helpers/colors");
 const is_collapsed_1 = require("./is-collapsed");
 const TimelineListItem_1 = require("./TimelineListItem");
+const TimelineTimeIndicators_1 = require("./TimelineTimeIndicators");
 const container = {
     flex: 1,
     display: 'flex',
@@ -12,9 +13,9 @@ const container = {
     background: colors_1.BACKGROUND,
 };
 const TimelineList = ({ timeline, viewState, dispatchStateChange }) => {
-    return ((0, jsx_runtime_1.jsx)("div", { style: container, children: timeline.map((track, i) => {
-            const beforeDepth = i === 0 ? 0 : timeline[i - 1].depth;
-            return ((0, jsx_runtime_1.jsx)("div", { children: (0, jsx_runtime_1.jsx)(TimelineListItem_1.TimelineListItem, { hash: track.hash, dispatchStateChange: dispatchStateChange, collapsed: (0, is_collapsed_1.isTrackCollapsed)(track.hash, viewState), nestedDepth: track.depth, sequence: track.sequence, beforeDepth: beforeDepth, canCollapse: track.canCollapse }, track.sequence.id) }, track.sequence.id));
-        }) }));
+    return ((0, jsx_runtime_1.jsxs)("div", { style: container, children: [(0, jsx_runtime_1.jsx)(TimelineTimeIndicators_1.TimelineTimePadding, {}), timeline.map((track, i) => {
+                const beforeDepth = i === 0 ? 0 : timeline[i - 1].depth;
+                return ((0, jsx_runtime_1.jsx)("div", { children: (0, jsx_runtime_1.jsx)(TimelineListItem_1.TimelineListItem, { hash: track.hash, dispatchStateChange: dispatchStateChange, collapsed: (0, is_collapsed_1.isTrackCollapsed)(track.hash, viewState), nestedDepth: track.depth, sequence: track.sequence, beforeDepth: beforeDepth, canCollapse: track.canCollapse }, track.sequence.id) }, track.sequence.id));
+            }), (0, jsx_runtime_1.jsx)(TimelineTimeIndicators_1.TimelineTimePlaceholders, {})] }));
 };
 exports.TimelineList = TimelineList;

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

@@ -1,6 +1,7 @@
 import React from 'react';
 import type { TSequence } from 'remotion';
 import type { TimelineActionState } from './timeline-state-reducer';
+export declare const TOTAL_TIMELINE_LAYER_LEFT_PADDING: number;
 export declare const TimelineListItem: React.FC<{
     sequence: TSequence;
     nestedDepth: number;

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TimelineListItem = void 0;
+exports.TimelineListItem = exports.TOTAL_TIMELINE_LAYER_LEFT_PADDING = void 0;
 const jsx_runtime_1 = require("react/jsx-runtime");
 const react_1 = require("react");
 const timeline_layout_1 = require("../../helpers/timeline-layout");
@@ -10,6 +10,10 @@ const TimelineSequenceFrame_1 = require("./TimelineSequenceFrame");
 const HOOK_WIDTH = 7;
 const BORDER_BOTTOM_LEFT_RADIUS = 2;
 const SPACING = 5;
+const TIMELINE_LAYER_PADDING = HOOK_WIDTH + SPACING * 1.5;
+const TIMELINE_COLLAPSER_WIDTH = 8;
+const TIMELINE_COLLAPSER_MARGIN_RIGHT = 10;
+exports.TOTAL_TIMELINE_LAYER_LEFT_PADDING = TIMELINE_COLLAPSER_WIDTH + TIMELINE_COLLAPSER_MARGIN_RIGHT + timeline_layout_1.TIMELINE_PADDING;
 const textStyle = {
     fontSize: 13,
 };
@@ -44,9 +48,9 @@ const smallSpace = {
     width: SPACING * 0.5,
 };
 const collapser = {
-    width: 8,
+    width: TIMELINE_COLLAPSER_WIDTH,
     userSelect: 'none',
-    marginRight: 10,
+    marginRight: TIMELINE_COLLAPSER_MARGIN_RIGHT,
 };
 const collapserButton = {
     ...collapser,
@@ -55,7 +59,7 @@ const collapserButton = {
 };
 const TimelineListItem = ({ nestedDepth, sequence, collapsed, beforeDepth, dispatchStateChange, hash, canCollapse, }) => {
     const { tabIndex } = (0, z_index_1.useZIndex)();
-    const leftOffset = HOOK_WIDTH + SPACING * 1.5;
+    const leftOffset = TIMELINE_LAYER_PADDING;
     const hookStyle = (0, react_1.useMemo)(() => {
         return {
             ...hook,

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

@@ -9,14 +9,15 @@ 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 { zoom } = (0, react_1.useContext)(timeline_zoom_1.TimelineZoomCtx);
     (0, imperative_state_1.setCurrentFrame)(timelineContext.frame);
     (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.
      */

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

@@ -3,13 +3,15 @@ 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 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)(() => {

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

@@ -40,6 +40,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, 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", disabled: timeline_zoom_1.TIMELINE_MAX_ZOOM === zoom, children: (0, jsx_runtime_1.jsx)(plus_1.Plus, { style: iconStyle }) })] }));
 };
 exports.TimelineZoomControls = TimelineZoomControls;