@remotion/cli 4.0.0-oops.3 → 4.0.0-prefetch.7

package/dist/editor/components/PlaybackRateSelector.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.PlaybackRateSelector = exports.getPlaybackRateLabel = exports.commonPlaybackRates = void 0;
 const jsx_runtime_1 = require("react/jsx-runtime");
 const react_1 = require("react");
+const is_current_selected_still_1 = require("../helpers/is-current-selected-still");
 const Checkmark_1 = require("../icons/Checkmark");
 const playbackrate_1 = require("../state/playbackrate");
 const ControlButton_1 = require("./ControlButton");
@@ -17,6 +18,7 @@ exports.getPlaybackRateLabel = getPlaybackRateLabel;
 const accessibilityLabel = 'Change the playback rate';
 const comboStyle = { width: 80 };
 const PlaybackRateSelector = ({ playbackRate, setPlaybackRate }) => {
+    const isStill = (0, is_current_selected_still_1.useIsStill)();
     const style = (0, react_1.useMemo)(() => {
         return {
             padding: ControlButton_1.CONTROL_BUTTON_PADDING,
@@ -40,13 +42,16 @@ const PlaybackRateSelector = ({ playbackRate, setPlaybackRate }) => {
                 type: 'item',
                 value: newPlaybackRate,
                 keyHint: null,
-                leftItem: String(playbackRate) === String(newPlaybackRate) ? ((0, jsx_runtime_1.jsx)(Checkmark_1.Checkmark, {}, void 0)) : null,
+                leftItem: String(playbackRate) === String(newPlaybackRate) ? ((0, jsx_runtime_1.jsx)(Checkmark_1.Checkmark, {})) : null,
                 subMenu: null,
             };
         });
         const middle = Math.floor(exports.commonPlaybackRates.length / 2);
         return [...values.slice(0, middle), divider, ...values.slice(middle)];
     }, [playbackRate, setPlaybackRate]);
-    return ((0, jsx_runtime_1.jsx)("div", { style: style, "aria-label": accessibilityLabel, children: (0, jsx_runtime_1.jsx)(ComboBox_1.Combobox, { title: accessibilityLabel, style: comboStyle, selectedId: String(playbackRate), values: items }, void 0) }, void 0));
+    if (isStill) {
+        return null;
+    }
+    return ((0, jsx_runtime_1.jsx)("div", { style: style, "aria-label": accessibilityLabel, children: (0, jsx_runtime_1.jsx)(ComboBox_1.Combobox, { title: accessibilityLabel, style: comboStyle, selectedId: String(playbackRate), values: items }) }));
 };
 exports.PlaybackRateSelector = PlaybackRateSelector;

package/dist/editor/components/Preview.d.ts

@@ -1,5 +1,6 @@
-import { Size } from '@remotion/player';
+import type { Size } from '@remotion/player';
 import React from 'react';
+export declare const checkerboardSize = 49;
 export declare const VideoPreview: React.FC<{
     canvasSize: Size;
 }>;

package/dist/editor/components/Preview.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.VideoPreview = void 0;
+exports.VideoPreview = exports.checkerboardSize = void 0;
 const jsx_runtime_1 = require("react/jsx-runtime");
 const player_1 = require("@remotion/player");
 const react_1 = require("react");
@@ -8,8 +8,7 @@ const remotion_1 = require("remotion");
 const checkerboard_background_1 = require("../helpers/checkerboard-background");
 const checkerboard_1 = require("../state/checkerboard");
 const preview_size_1 = require("../state/preview-size");
-const LoadingIndicator_1 = require("./LoadingIndicator");
-const checkerboardSize = 49;
+exports.checkerboardSize = 49;
 const containerStyle = (options) => {
     return {
         transform: `scale(${options.scale})`,
@@ -21,21 +20,20 @@ const containerStyle = (options) => {
         position: 'absolute',
         backgroundColor: (0, checkerboard_background_1.checkerboardBackgroundColor)(options.checkerboard),
         backgroundImage: (0, checkerboard_background_1.checkerboardBackgroundImage)(options.checkerboard),
-        backgroundSize: (0, checkerboard_background_1.getCheckerboardBackgroundSize)(checkerboardSize) /* Must be a square */,
-        backgroundPosition: (0, checkerboard_background_1.getCheckerboardBackgroundPos)(checkerboardSize) /* Must be half of one side of the square */,
+        backgroundSize: (0, checkerboard_background_1.getCheckerboardBackgroundSize)(exports.checkerboardSize) /* Must be a square */,
+        backgroundPosition: (0, checkerboard_background_1.getCheckerboardBackgroundPos)(exports.checkerboardSize) /* Must be half of one side of the square */,
     };
 };
 const Inner = ({ canvasSize }) => {
-    var _a;
     const { size: previewSize } = (0, react_1.useContext)(preview_size_1.PreviewSizeContext);
-    const video = remotion_1.Internals.useVideo();
+    const portalContainer = (0, react_1.useRef)(null);
     const config = (0, remotion_1.useVideoConfig)();
     const { checkerboard } = (0, react_1.useContext)(checkerboard_1.CheckerboardContext);
-    const { centerX, centerY, yCorrection, xCorrection, scale } = player_1.PlayerInternals.calculateScale({
+    const { centerX, centerY, yCorrection, xCorrection, scale } = player_1.PlayerInternals.calculateCanvasTransformation({
         canvasSize,
         compositionHeight: config.height,
         compositionWidth: config.width,
-        previewSize,
+        previewSize: previewSize.size,
     });
     const outer = (0, react_1.useMemo)(() => {
         return {
@@ -44,11 +42,19 @@ const Inner = ({ canvasSize }) => {
             display: 'flex',
             flexDirection: 'column',
             position: 'absolute',
-            left: centerX,
-            top: centerY,
+            left: centerX - previewSize.translation.x,
+            top: centerY - previewSize.translation.y,
             overflow: 'hidden',
         };
-    }, [centerX, centerY, config.height, config.width, scale]);
+    }, [
+        centerX,
+        centerY,
+        config.height,
+        config.width,
+        previewSize.translation.x,
+        previewSize.translation.y,
+        scale,
+    ]);
     const style = (0, react_1.useMemo)(() => {
         return containerStyle({
             checkerboard,
@@ -66,15 +72,20 @@ const Inner = ({ canvasSize }) => {
         xCorrection,
         yCorrection,
     ]);
-    const Component = video ? video.component : null;
-    const inputProps = (0, remotion_1.getInputProps)();
-    return ((0, jsx_runtime_1.jsx)(react_1.Suspense, { fallback: (0, jsx_runtime_1.jsx)(LoadingIndicator_1.Loading, {}, void 0), children: (0, jsx_runtime_1.jsx)("div", { style: outer, children: (0, jsx_runtime_1.jsx)("div", { style: style, children: Component ? ((0, jsx_runtime_1.jsx)(Component, { ...((_a = video === null || video === void 0 ? void 0 : video.defaultProps) !== null && _a !== void 0 ? _a : {}), ...inputProps }, void 0)) : null }, void 0) }, void 0) }, void 0));
+    (0, react_1.useEffect)(() => {
+        const { current } = portalContainer;
+        current === null || current === void 0 ? void 0 : current.appendChild(remotion_1.Internals.portalNode());
+        return () => {
+            current === null || current === void 0 ? void 0 : current.removeChild(remotion_1.Internals.portalNode());
+        };
+    }, []);
+    return ((0, jsx_runtime_1.jsx)("div", { style: outer, children: (0, jsx_runtime_1.jsx)("div", { ref: portalContainer, style: style }) }));
 };
 const VideoPreview = ({ canvasSize }) => {
     const config = remotion_1.Internals.useUnsafeVideoConfig();
     if (!config) {
         return null;
     }
-    return (0, jsx_runtime_1.jsx)(Inner, { canvasSize: canvasSize }, void 0);
+    return (0, jsx_runtime_1.jsx)(Inner, { canvasSize: canvasSize });
 };
 exports.VideoPreview = VideoPreview;

package/dist/editor/components/PreviewToolbar.js

@@ -4,6 +4,7 @@ exports.PreviewToolbar = void 0;
 const jsx_runtime_1 = require("react/jsx-runtime");
 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 loop_1 = require("../state/loop");
 const CheckboardToggle_1 = require("./CheckboardToggle");
@@ -17,8 +18,8 @@ const PlaybackRateSelector_1 = require("./PlaybackRateSelector");
 const PlayPause_1 = require("./PlayPause");
 const RichTimelineToggle_1 = require("./RichTimelineToggle");
 const SizeSelector_1 = require("./SizeSelector");
+const TimelineZoomControls_1 = require("./Timeline/TimelineZoomControls");
 const TimelineInOutToggle_1 = require("./TimelineInOutToggle");
-const TimeValue_1 = require("./TimeValue");
 const container = {
     display: 'flex',
     justifyContent: 'center',
@@ -27,6 +28,7 @@ const container = {
     paddingBottom: 2,
     alignItems: 'center',
     flexDirection: 'row',
+    background: colors_1.BACKGROUND,
 };
 const sideContainer = {
     width: 300,
@@ -43,6 +45,6 @@ const PreviewToolbar = () => {
     const { mediaMuted } = (0, react_1.useContext)(remotion_1.Internals.MediaVolumeContext);
     const { setMediaMuted } = (0, react_1.useContext)(remotion_1.Internals.SetMediaVolumeContext);
     const [loop, setLoop] = (0, react_1.useState)((0, loop_1.loadLoopOption)());
-    return ((0, jsx_runtime_1.jsxs)("div", { style: container, className: "css-reset", children: [(0, jsx_runtime_1.jsxs)("div", { style: sideContainer, children: [(0, jsx_runtime_1.jsx)("div", { style: padding }, void 0), (0, jsx_runtime_1.jsx)(TimeValue_1.TimeValue, {}, void 0)] }, void 0), (0, jsx_runtime_1.jsx)(layout_1.Flex, {}, void 0), (0, jsx_runtime_1.jsx)(SizeSelector_1.SizeSelector, {}, void 0), (0, jsx_runtime_1.jsx)(PlaybackRateSelector_1.PlaybackRateSelector, { setPlaybackRate: setPlaybackRate, playbackRate: playbackRate }, void 0), (0, jsx_runtime_1.jsx)(layout_1.Spacing, { x: 2 }, void 0), (0, jsx_runtime_1.jsx)(PlayPause_1.PlayPause, { loop: loop, playbackRate: playbackRate }, void 0), (0, jsx_runtime_1.jsx)(layout_1.Spacing, { x: 2 }, void 0), (0, jsx_runtime_1.jsx)(LoopToggle_1.LoopToggle, { loop: loop, setLoop: setLoop }, void 0), (0, jsx_runtime_1.jsx)(CheckboardToggle_1.CheckboardToggle, {}, void 0), (0, jsx_runtime_1.jsx)(RichTimelineToggle_1.RichTimelineToggle, {}, void 0), (0, jsx_runtime_1.jsx)(TimelineInOutToggle_1.TimelineInOutPointToggle, {}, void 0), (0, jsx_runtime_1.jsx)(MuteToggle_1.MuteToggle, { muted: mediaMuted, setMuted: setMediaMuted }, void 0), (0, jsx_runtime_1.jsx)(layout_1.Flex, {}, void 0), (0, jsx_runtime_1.jsxs)("div", { style: sideContainer, children: [(0, jsx_runtime_1.jsx)(layout_1.Flex, {}, void 0), (0, jsx_runtime_1.jsx)(FpsCounter_1.FpsCounter, { playbackSpeed: playbackRate }, void 0), (0, jsx_runtime_1.jsx)("div", { style: padding }, void 0)] }, void 0), (0, jsx_runtime_1.jsx)(PlaybackKeyboardShortcutsManager_1.PlaybackKeyboardShortcutsManager, { setPlaybackRate: setPlaybackRate }, void 0), (0, jsx_runtime_1.jsx)(PlaybackRatePersistor_1.PlaybackRatePersistor, {}, void 0)] }, void 0));
+    return ((0, jsx_runtime_1.jsxs)("div", { style: container, className: "css-reset", children: [(0, jsx_runtime_1.jsxs)("div", { style: sideContainer, children: [(0, jsx_runtime_1.jsx)("div", { style: padding }), (0, jsx_runtime_1.jsx)(TimelineZoomControls_1.TimelineZoomControls, {})] }), (0, jsx_runtime_1.jsx)(layout_1.Flex, {}), (0, jsx_runtime_1.jsx)(SizeSelector_1.SizeSelector, {}), (0, jsx_runtime_1.jsx)(PlaybackRateSelector_1.PlaybackRateSelector, { setPlaybackRate: setPlaybackRate, playbackRate: playbackRate }), (0, jsx_runtime_1.jsx)(layout_1.Spacing, { x: 2 }), (0, jsx_runtime_1.jsx)(PlayPause_1.PlayPause, { loop: loop, playbackRate: playbackRate }), (0, jsx_runtime_1.jsx)(layout_1.Spacing, { x: 2 }), (0, jsx_runtime_1.jsx)(LoopToggle_1.LoopToggle, { loop: loop, setLoop: setLoop }), (0, jsx_runtime_1.jsx)(CheckboardToggle_1.CheckboardToggle, {}), (0, jsx_runtime_1.jsx)(RichTimelineToggle_1.RichTimelineToggle, {}), (0, jsx_runtime_1.jsx)(TimelineInOutToggle_1.TimelineInOutPointToggle, {}), (0, jsx_runtime_1.jsx)(MuteToggle_1.MuteToggle, { muted: mediaMuted, setMuted: setMediaMuted }), (0, jsx_runtime_1.jsx)(layout_1.Flex, {}), (0, jsx_runtime_1.jsxs)("div", { style: sideContainer, children: [(0, jsx_runtime_1.jsx)(layout_1.Flex, {}), (0, jsx_runtime_1.jsx)(FpsCounter_1.FpsCounter, { playbackSpeed: playbackRate }), (0, jsx_runtime_1.jsx)("div", { style: padding })] }), (0, jsx_runtime_1.jsx)(PlaybackKeyboardShortcutsManager_1.PlaybackKeyboardShortcutsManager, { setPlaybackRate: setPlaybackRate }), (0, jsx_runtime_1.jsx)(PlaybackRatePersistor_1.PlaybackRatePersistor, {})] }));
 };
 exports.PreviewToolbar = PreviewToolbar;

package/dist/editor/components/PreviewZoomControls.d.ts

@@ -0,0 +1,2 @@
+/// <reference types="react" />
+export declare const PreviewZoomControls: React.FC;

package/dist/editor/components/PreviewZoomControls.js

@@ -0,0 +1,67 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PreviewZoomControls = void 0;
+const jsx_runtime_1 = require("react/jsx-runtime");
+const react_1 = require("react");
+const minus_1 = require("../icons/minus");
+const plus_1 = require("../icons/plus");
+const preview_size_1 = require("../state/preview-size");
+const ControlButton_1 = require("./ControlButton");
+const layout_1 = require("./layout");
+const container = {
+    color: 'black',
+    flexDirection: 'row',
+    display: 'flex',
+};
+const buttonStyle = {
+    fontSize: 24,
+};
+const iconStyle = {
+    color: 'white',
+    width: 14,
+};
+const slider = {
+    width: 120,
+    accentColor: 'var(--blue)',
+};
+const PreviewZoomControls = () => {
+    const { size, setSize } = (0, react_1.useContext)(preview_size_1.PreviewSizeContext);
+    const onZoomOutClicked = (0, react_1.useCallback)(() => {
+        setSize((z) => {
+            if (z === 'auto')
+                return 1 - preview_size_1.ZOOM_BUTTON_STEP;
+            const newSize = Number((Number(z) - preview_size_1.ZOOM_BUTTON_STEP).toFixed(2));
+            return Math.max(preview_size_1.PREVIEW_MIN_ZOOM, newSize);
+        });
+    }, [setSize]);
+    const onZoomInClicked = (0, react_1.useCallback)(() => {
+        setSize((z) => {
+            if (z === 'auto')
+                return 1 + preview_size_1.ZOOM_BUTTON_STEP;
+            const newSize = Number((Number(z) + preview_size_1.ZOOM_BUTTON_STEP).toFixed(2));
+            return Math.min(preview_size_1.PREVIEW_MAX_ZOOM, newSize);
+        });
+    }, [setSize]);
+    const onChange = (0, react_1.useCallback)((e) => {
+        setSize(() => Number(e.target.value));
+    }, [setSize]);
+    const onWheel = (0, react_1.useCallback)((e) => {
+        setSize((z) => {
+            if (e.deltaY > 0) {
+                if (z === 'auto')
+                    return 1 - preview_size_1.ZOOM_SLIDER_STEP;
+                const newSize = Number((Number(z) - preview_size_1.ZOOM_SLIDER_STEP).toFixed(2));
+                return Math.max(preview_size_1.PREVIEW_MIN_ZOOM, newSize);
+            }
+            if (e.deltaY < 0) {
+                if (z === 'auto')
+                    return 1 + preview_size_1.ZOOM_SLIDER_STEP;
+                const newSize = Number((Number(z) + preview_size_1.ZOOM_SLIDER_STEP).toFixed(2));
+                return Math.min(preview_size_1.PREVIEW_MAX_ZOOM, newSize);
+            }
+            return z;
+        });
+    }, [setSize]);
+    return ((0, jsx_runtime_1.jsxs)("div", { style: container, children: [(0, jsx_runtime_1.jsx)(ControlButton_1.ControlButton, { onClick: onZoomOutClicked, style: buttonStyle, title: "Zoom out preview", role: 'ControlButton', type: "button", disabled: preview_size_1.PREVIEW_MIN_ZOOM === size, 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: `Preview size (${size}x)`, alt: `Preview size (${size}x)`, type: 'range', min: preview_size_1.PREVIEW_MIN_ZOOM, step: preview_size_1.ZOOM_SLIDER_STEP, value: size, max: preview_size_1.PREVIEW_MAX_ZOOM, onChange: onChange, onWheel: onWheel, style: slider }), (0, jsx_runtime_1.jsx)(layout_1.Spacing, { x: 0.5 }), (0, jsx_runtime_1.jsx)(ControlButton_1.ControlButton, { onClick: onZoomInClicked, style: buttonStyle, title: "Zoom in preview", role: 'button', type: "button", disabled: preview_size_1.PREVIEW_MAX_ZOOM === size, children: (0, jsx_runtime_1.jsx)(plus_1.Plus, { style: iconStyle }) })] }));
+};
+exports.PreviewZoomControls = PreviewZoomControls;

package/dist/editor/components/ResetZoomButton.d.ts

@@ -0,0 +1,4 @@
+/// <reference types="react" />
+export declare const ResetZoomButton: React.FC<{
+    onClick: () => void;
+}>;

package/dist/editor/components/ResetZoomButton.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ResetZoomButton = void 0;
+const jsx_runtime_1 = require("react/jsx-runtime");
+const Button_1 = require("../../preview-server/error-overlay/remotion-overlay/Button");
+const ResetZoomButton = ({ onClick }) => {
+    return (0, jsx_runtime_1.jsx)(Button_1.Button, { onClick: onClick, children: "Reset zoom" });
+};
+exports.ResetZoomButton = ResetZoomButton;

package/dist/editor/components/RichTimelineToggle.js

@@ -24,6 +24,6 @@ const RichTimelineToggle = () => {
                 width: 16,
                 height: 16,
                 color: richTimeline ? 'var(--blue)' : 'white',
-            } }, void 0) }, void 0));
+            } }) }));
 };
 exports.RichTimelineToggle = RichTimelineToggle;

package/dist/editor/components/SizeSelector.d.ts

@@ -1,5 +1,6 @@
-import { PreviewSize } from '@remotion/player';
+import type { PreviewSize } from '@remotion/player';
 import React from 'react';
 export declare const commonPreviewSizes: PreviewSize[];
-export declare const getPreviewSizeLabel: (previewSize: PreviewSize) => "100%" | "50%" | "25%" | "Fit" | undefined;
+export declare const getPreviewSizeLabel: (previewSize: PreviewSize) => string;
+export declare const getUniqueSizes: (size: PreviewSize) => PreviewSize[];
 export declare const SizeSelector: React.FC;

package/dist/editor/components/SizeSelector.js

@@ -1,30 +1,70 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SizeSelector = exports.getPreviewSizeLabel = exports.commonPreviewSizes = void 0;
+exports.SizeSelector = exports.getUniqueSizes = exports.getPreviewSizeLabel = exports.commonPreviewSizes = void 0;
 const jsx_runtime_1 = require("react/jsx-runtime");
 const react_1 = require("react");
 const Checkmark_1 = require("../icons/Checkmark");
 const preview_size_1 = require("../state/preview-size");
 const ControlButton_1 = require("./ControlButton");
 const ComboBox_1 = require("./NewComposition/ComboBox");
-exports.commonPreviewSizes = ['auto', 0.25, 0.5, 1];
+exports.commonPreviewSizes = [
+    {
+        size: 'auto',
+        translation: {
+            x: 0,
+            y: 0,
+        },
+    },
+    {
+        size: 0.25,
+        translation: {
+            x: 0,
+            y: 0,
+        },
+    },
+    {
+        size: 0.5,
+        translation: {
+            x: 0,
+            y: 0,
+        },
+    },
+    {
+        size: 1,
+        translation: {
+            x: 0,
+            y: 0,
+        },
+    },
+];
 const getPreviewSizeLabel = (previewSize) => {
-    if (previewSize === 1) {
-        return '100%';
-    }
-    if (previewSize === 0.5) {
-        return '50%';
-    }
-    if (previewSize === 0.25) {
-        return '25%';
-    }
-    if (previewSize === 'auto') {
+    if (previewSize.size === 'auto') {
         return 'Fit';
     }
+    return `${(previewSize.size * 100).toFixed(0)}%`;
 };
 exports.getPreviewSizeLabel = getPreviewSizeLabel;
 const accessibilityLabel = 'Preview Size';
 const comboStyle = { width: 80 };
+const getUniqueSizes = (size) => {
+    const customPreviewSizes = [size, ...exports.commonPreviewSizes];
+    const uniqueSizes = [];
+    customPreviewSizes.forEach((p) => {
+        if (!uniqueSizes.find((s) => s.size === p.size)) {
+            uniqueSizes.push(p);
+        }
+    });
+    return uniqueSizes.sort((a, b) => {
+        if (a.size === 'auto') {
+            return -1;
+        }
+        if (b.size === 'auto') {
+            return 1;
+        }
+        return a.size - b.size;
+    });
+};
+exports.getUniqueSizes = getUniqueSizes;
 const SizeSelector = () => {
     const { size, setSize } = (0, react_1.useContext)(preview_size_1.PreviewSizeContext);
     const style = (0, react_1.useMemo)(() => {
@@ -33,9 +73,9 @@ const SizeSelector = () => {
         };
     }, []);
     const items = (0, react_1.useMemo)(() => {
-        return exports.commonPreviewSizes.map((newSize) => {
+        return (0, exports.getUniqueSizes)(size).map((newSize) => {
             return {
-                id: String(newSize),
+                id: String(newSize.size),
                 label: (0, exports.getPreviewSizeLabel)(newSize),
                 onClick: () => {
                     return setSize(() => {
@@ -43,13 +83,13 @@ const SizeSelector = () => {
                     });
                 },
                 type: 'item',
-                value: newSize,
-                keyHint: null,
-                leftItem: String(size) === String(newSize) ? (0, jsx_runtime_1.jsx)(Checkmark_1.Checkmark, {}, void 0) : null,
+                value: newSize.size,
+                keyHint: newSize.size ? '0' : null,
+                leftItem: String(size.size) === String(newSize.size) ? (0, jsx_runtime_1.jsx)(Checkmark_1.Checkmark, {}) : null,
                 subMenu: null,
             };
         });
     }, [setSize, size]);
-    return ((0, jsx_runtime_1.jsx)("div", { style: style, "aria-label": accessibilityLabel, children: (0, jsx_runtime_1.jsx)(ComboBox_1.Combobox, { title: accessibilityLabel, style: comboStyle, selectedId: String(size), values: items }, void 0) }, void 0));
+    return ((0, jsx_runtime_1.jsx)("div", { style: style, "aria-label": accessibilityLabel, children: (0, jsx_runtime_1.jsx)(ComboBox_1.Combobox, { title: accessibilityLabel, style: comboStyle, selectedId: String(size.size), values: items }) }));
 };
 exports.SizeSelector = SizeSelector;

package/dist/editor/components/Splitter/SplitterContainer.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-import { SplitterOrientation } from './SplitterContext';
+import type { SplitterOrientation } from './SplitterContext';
 export declare const SplitterContainer: React.FC<{
     orientation: SplitterOrientation;
     maxFlex: number;

package/dist/editor/components/Splitter/SplitterContainer.js

@@ -62,6 +62,6 @@ const SplitterContainer = ({ orientation, children, defaultFlex, maxFlex, minFle
         orientation,
         persistFlex,
     ]);
-    return ((0, jsx_runtime_1.jsx)(SplitterContext_1.SplitterContext.Provider, { value: value, children: (0, jsx_runtime_1.jsx)("div", { ref: ref, style: orientation === 'horizontal' ? containerColumn : containerRow, children: children }, void 0) }, void 0));
+    return ((0, jsx_runtime_1.jsx)(SplitterContext_1.SplitterContext.Provider, { value: value, children: (0, jsx_runtime_1.jsx)("div", { ref: ref, style: orientation === 'horizontal' ? containerColumn : containerRow, children: children }) }));
 };
 exports.SplitterContainer = SplitterContainer;

package/dist/editor/components/Splitter/SplitterElement.js

@@ -8,11 +8,14 @@ const SplitterElement = ({ children, type }) => {
     const context = (0, react_1.useContext)(SplitterContext_1.SplitterContext);
     const style = (0, react_1.useMemo)(() => {
         return {
-            flex: type === 'flexer' ? context.flexValue : 1 - context.flexValue,
+            flex: 
+            // Multiply by 1000 because if flex values don't add up to at least 1, they will not fill up the screen
+            (type === 'flexer' ? context.flexValue : 1 - context.flexValue) * 1000,
             display: 'flex',
             position: 'relative',
+            overflow: 'hidden',
         };
     }, [context.flexValue, type]);
-    return (0, jsx_runtime_1.jsx)("div", { style: style, children: children }, void 0);
+    return (0, jsx_runtime_1.jsx)("div", { style: style, children: children });
 };
 exports.SplitterElement = SplitterElement;

package/dist/editor/components/Splitter/SplitterHandle.d.ts

@@ -1,3 +1,6 @@
 import React from 'react';
 export declare const SPLITTER_HANDLE_SIZE = 3;
-export declare const SplitterHandle: React.FC;
+export declare const SplitterHandle: React.FC<{
+    allowToCollapse: boolean;
+    onCollapse: () => void;
+}>;

package/dist/editor/components/Splitter/SplitterHandle.js

@@ -14,7 +14,7 @@ const containerColumn = {
     width: exports.SPLITTER_HANDLE_SIZE,
     cursor: 'col-resize',
 };
-const SplitterHandle = () => {
+const SplitterHandle = ({ allowToCollapse, onCollapse }) => {
     const context = (0, react_1.useContext)(SplitterContext_1.SplitterContext);
     if (!context) {
         throw new Error('Cannot find splitter context');
@@ -32,7 +32,7 @@ const SplitterHandle = () => {
         if (!current) {
             return;
         }
-        const getNewValue = (e) => {
+        const getNewValue = (e, clamp) => {
             if (!context.isDragging.current) {
                 throw new Error('cannot get value if not dragging');
             }
@@ -49,7 +49,10 @@ const SplitterHandle = () => {
                     (height - exports.SPLITTER_HANDLE_SIZE));
             })();
             const newFlex = context.flexValue + change;
-            return Math.min(context.maxFlex, Math.max(context.minFlex, newFlex));
+            if (clamp) {
+                return Math.min(context.maxFlex, Math.max(context.minFlex, newFlex));
+            }
+            return newFlex;
         };
         const onPointerDown = (e) => {
             var _a;
@@ -59,7 +62,10 @@ const SplitterHandle = () => {
             };
             (_a = ref.current) === null || _a === void 0 ? void 0 : _a.classList.add('remotion-splitter-active');
             window.addEventListener('pointerup', (ev) => {
-                context.persistFlex(getNewValue(ev));
+                if (!context.isDragging.current) {
+                    return;
+                }
+                context.persistFlex(getNewValue(ev, true));
                 cleanup();
                 setLastPointerUp(Date.now());
             }, { once: true });
@@ -67,8 +73,16 @@ const SplitterHandle = () => {
         };
         const onPointerMove = (e) => {
             if (context.isDragging.current) {
-                const val = getNewValue(e);
+                const val = getNewValue(e, true);
                 context.setFlexValue(val);
+                if (allowToCollapse) {
+                    const unclamped = getNewValue(e, false);
+                    if (unclamped < context.minFlex / 2) {
+                        cleanup();
+                        onCollapse();
+                        setLastPointerUp(Date.now());
+                    }
+                }
             }
         };
         const cleanup = () => {
@@ -85,7 +99,14 @@ const SplitterHandle = () => {
                 cleanup();
             }
         };
-    }, [context, context.domRect, context.flexValue, lastPointerUp]);
-    return ((0, jsx_runtime_1.jsx)("div", { ref: ref, className: "remotion-splitter", style: context.orientation === 'horizontal' ? containerRow : containerColumn }, void 0));
+    }, [
+        allowToCollapse,
+        context,
+        context.domRect,
+        context.flexValue,
+        lastPointerUp,
+        onCollapse,
+    ]);
+    return ((0, jsx_runtime_1.jsx)("div", { ref: ref, className: "remotion-splitter", style: context.orientation === 'horizontal' ? containerRow : containerColumn }));
 };
 exports.SplitterHandle = SplitterHandle;

package/dist/editor/components/Thumbnail.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-import { TComposition } from 'remotion';
+import type { TComposition } from 'remotion';
 export declare const Thumbnail: React.FC<{
     composition: TComposition<unknown>;
     targetHeight: number;

package/dist/editor/components/Thumbnail.js

@@ -71,6 +71,6 @@ const Thumbnail = ({ composition, targetHeight, targetWidth, frameToDisplay }) =
         return (_a = composition.defaultProps) !== null && _a !== void 0 ? _a : {};
     }, [composition.defaultProps]);
     const ThumbnailComponent = composition.component;
-    return ((0, jsx_runtime_1.jsx)("div", { style: container, children: (0, jsx_runtime_1.jsx)(react_1.Suspense, { fallback: null, children: (0, jsx_runtime_1.jsx)("div", { style: outer, children: (0, jsx_runtime_1.jsx)("div", { style: inner, children: (0, jsx_runtime_1.jsx)(remotion_1.Internals.Timeline.TimelineContext.Provider, { value: timelineState, children: (0, jsx_runtime_1.jsx)(ThumbnailComponent, { ...props }, void 0) }, void 0) }, void 0) }, void 0) }, void 0) }, void 0));
+    return ((0, jsx_runtime_1.jsx)("div", { style: container, children: (0, jsx_runtime_1.jsx)(react_1.Suspense, { fallback: null, children: (0, jsx_runtime_1.jsx)("div", { style: outer, children: (0, jsx_runtime_1.jsx)("div", { style: inner, children: (0, jsx_runtime_1.jsx)(remotion_1.Internals.Timeline.TimelineContext.Provider, { value: timelineState, children: (0, jsx_runtime_1.jsx)(ThumbnailComponent, { ...props }) }) }) }) }) }));
 };
 exports.Thumbnail = Thumbnail;

package/dist/editor/components/TimeValue.js

@@ -5,24 +5,28 @@ const jsx_runtime_1 = require("react/jsx-runtime");
 const remotion_1 = require("remotion");
 const is_current_selected_still_1 = require("../helpers/is-current-selected-still");
 const render_frame_1 = require("../state/render-frame");
+const layout_1 = require("./layout");
 const text = {
     color: 'white',
-    fontSize: 16,
+    fontSize: 18,
     display: 'flex',
-    flexDirection: 'column',
-    justifyContent: 'center',
+    flexDirection: 'row',
+    alignItems: 'flex-end',
     fontVariantNumeric: 'tabular-nums',
     lineHeight: 1,
 };
 const time = {
     display: 'inline-block',
-    fontSize: 16,
+    fontSize: 18,
 };
 const frameStyle = {
     color: '#ccc',
     fontSize: 10,
     fontWeight: 500,
 };
+const spacer = {
+    width: layout_1.SPACING_UNIT,
+};
 const TimeValue = () => {
     const frame = (0, remotion_1.useCurrentFrame)();
     const config = remotion_1.Internals.useUnsafeVideoConfig();
@@ -33,6 +37,6 @@ const TimeValue = () => {
     if (isStill) {
         return null;
     }
-    return ((0, jsx_runtime_1.jsxs)("div", { style: text, children: [(0, jsx_runtime_1.jsx)("div", { style: time, children: (0, render_frame_1.renderFrame)(frame, config.fps) }, void 0), ' ', (0, jsx_runtime_1.jsxs)("div", { style: frameStyle, children: [frame, " ", (0, jsx_runtime_1.jsxs)("span", { style: frameStyle, children: ["(", config.fps, " fps)"] }, void 0)] }, void 0)] }, void 0));
+    return ((0, jsx_runtime_1.jsxs)("div", { style: text, children: [(0, jsx_runtime_1.jsx)("div", { style: time, children: (0, render_frame_1.renderFrame)(frame, config.fps) }), ' ', (0, jsx_runtime_1.jsx)("div", { style: spacer }), (0, jsx_runtime_1.jsxs)("div", { style: frameStyle, children: [frame, " ", (0, jsx_runtime_1.jsxs)("span", { style: frameStyle, children: ["(", config.fps, " fps)"] })] })] }));
 };
 exports.TimeValue = TimeValue;

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

@@ -13,7 +13,7 @@ const icon = {
     height: 12,
     width: 12,
 };
-const Icon = () => ((0, jsx_runtime_1.jsx)("svg", { "aria-hidden": "true", focusable: "false", "data-prefix": "fas", "data-icon": "repeat", className: "svg-inline--fa fa-repeat fa-w-16", role: "img", xmlns: "http://www.w3.org/2000/svg", viewBox: "0 0 512 512", style: icon, children: (0, jsx_runtime_1.jsx)("path", { fill: "currentColor", d: "M512 256c0 88.224-71.775 160-160 160H170.067l34.512 32.419c9.875 9.276 10.119 24.883.539 34.464l-10.775 10.775c-9.373 9.372-24.568 9.372-33.941 0l-92.686-92.686c-9.373-9.373-9.373-24.568 0-33.941l92.686-92.686c9.373-9.373 24.568-9.373 33.941 0l10.775 10.775c9.581 9.581 9.337 25.187-.539 34.464L170.067 352H352c52.935 0 96-43.065 96-96 0-13.958-2.996-27.228-8.376-39.204-4.061-9.039-2.284-19.626 4.723-26.633l12.183-12.183c11.499-11.499 30.965-8.526 38.312 5.982C505.814 205.624 512 230.103 512 256zM72.376 295.204C66.996 283.228 64 269.958 64 256c0-52.935 43.065-96 96-96h181.933l-34.512 32.419c-9.875 9.276-10.119 24.883-.539 34.464l10.775 10.775c9.373 9.372 24.568 9.372 33.941 0l92.686-92.686c9.373-9.373 9.373-24.568 0-33.941l-92.686-92.686c-9.373-9.373-24.568-9.373-33.941 0L306.882 29.12c-9.581 9.581-9.337 25.187.539 34.464L341.933 96H160C71.775 96 0 167.776 0 256c0 25.897 6.186 50.376 17.157 72.039 7.347 14.508 26.813 17.481 38.312 5.982l12.183-12.183c7.008-7.008 8.786-17.595 4.724-26.634z" }, void 0) }, void 0));
+const Icon = () => ((0, jsx_runtime_1.jsx)("svg", { "aria-hidden": "true", focusable: "false", "data-prefix": "fas", "data-icon": "repeat", className: "svg-inline--fa fa-repeat fa-w-16", role: "img", xmlns: "http://www.w3.org/2000/svg", viewBox: "0 0 512 512", style: icon, children: (0, jsx_runtime_1.jsx)("path", { fill: "currentColor", d: "M512 256c0 88.224-71.775 160-160 160H170.067l34.512 32.419c9.875 9.276 10.119 24.883.539 34.464l-10.775 10.775c-9.373 9.372-24.568 9.372-33.941 0l-92.686-92.686c-9.373-9.373-9.373-24.568 0-33.941l92.686-92.686c9.373-9.373 24.568-9.373 33.941 0l10.775 10.775c9.581 9.581 9.337 25.187-.539 34.464L170.067 352H352c52.935 0 96-43.065 96-96 0-13.958-2.996-27.228-8.376-39.204-4.061-9.039-2.284-19.626 4.723-26.633l12.183-12.183c11.499-11.499 30.965-8.526 38.312 5.982C505.814 205.624 512 230.103 512 256zM72.376 295.204C66.996 283.228 64 269.958 64 256c0-52.935 43.065-96 96-96h181.933l-34.512 32.419c-9.875 9.276-10.119 24.883-.539 34.464l10.775 10.775c9.373 9.372 24.568 9.372 33.941 0l92.686-92.686c9.373-9.373 9.373-24.568 0-33.941l-92.686-92.686c-9.373-9.373-24.568-9.373-33.941 0L306.882 29.12c-9.581 9.581-9.337 25.187.539 34.464L341.933 96H160C71.775 96 0 167.776 0 256c0 25.897 6.186 50.376 17.157 72.039 7.347 14.508 26.813 17.481 38.312 5.982l12.183-12.183c7.008-7.008 8.786-17.595 4.724-26.634z" }) }));
 const topLine = {
     top: 0,
     height: 10,
@@ -39,6 +39,6 @@ const bottomContainer = {
     alignItems: 'center',
 };
 const LoopedIndicator = () => {
-    return ((0, jsx_runtime_1.jsxs)("div", { style: width, children: [(0, jsx_runtime_1.jsx)(remotion_1.AbsoluteFill, { style: topContainer, children: (0, jsx_runtime_1.jsx)("div", { style: topLine }, void 0) }, void 0), (0, jsx_runtime_1.jsx)(remotion_1.AbsoluteFill, { style: bottomContainer, children: (0, jsx_runtime_1.jsx)("div", { style: bottomLine }, void 0) }, void 0), (0, jsx_runtime_1.jsx)(remotion_1.AbsoluteFill, { style: centerContainer, children: (0, jsx_runtime_1.jsx)(Icon, {}, void 0) }, void 0)] }, void 0));
+    return ((0, jsx_runtime_1.jsxs)("div", { style: width, children: [(0, jsx_runtime_1.jsx)(remotion_1.AbsoluteFill, { style: topContainer, children: (0, jsx_runtime_1.jsx)("div", { style: topLine }) }), (0, jsx_runtime_1.jsx)(remotion_1.AbsoluteFill, { style: bottomContainer, children: (0, jsx_runtime_1.jsx)("div", { style: bottomLine }) }), (0, jsx_runtime_1.jsx)(remotion_1.AbsoluteFill, { style: centerContainer, children: (0, jsx_runtime_1.jsx)(Icon, {}) })] }));
 };
 exports.LoopedIndicator = LoopedIndicator;

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

@@ -13,10 +13,10 @@ const row = {
     flexDirection: 'row',
 };
 const LoopedTimelineIndicator = ({ loops }) => {
-    return ((0, jsx_runtime_1.jsx)(remotion_1.AbsoluteFill, { style: row, children: new Array(loops).fill(true).map((l, i) => {
+    return ((0, jsx_runtime_1.jsx)(remotion_1.AbsoluteFill, { style: row, children: new Array(loops).fill(true).map((_l, i) => {
             return ((0, jsx_runtime_1.jsxs)(react_1.default.Fragment
             // eslint-disable-next-line
-            , { children: [(0, jsx_runtime_1.jsx)(layout_1.Flex, {}, void 0), i === loops - 1 ? null : (0, jsx_runtime_1.jsx)(LoopedIndicator_1.LoopedIndicator, {}, void 0)] }, i));
-        }) }, void 0));
+            , { children: [(0, jsx_runtime_1.jsx)(layout_1.Flex, {}), i === loops - 1 ? null : (0, jsx_runtime_1.jsx)(LoopedIndicator_1.LoopedIndicator, {})] }, i));
+        }) }));
 };
 exports.LoopedTimelineIndicator = LoopedTimelineIndicator;

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

@@ -1,3 +1,4 @@
 import React from 'react';
 export declare const MAX_TIMELINE_TRACKS: number;
+export declare const MAX_TIMELINE_TRACKS_NOTICE_HEIGHT = 24;
 export declare const MaxTimelineTracksReached: React.FC;