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

package/dist/config/scale.d.ts

@@ -0,0 +1,3 @@
+export declare type Scale = number;
+export declare const setScale: (newScale: Scale) => void;
+export declare const getScale: () => number;

package/dist/config/scale.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getScale = exports.setScale = void 0;
+let currentScale = 1;
+const setScale = (newScale) => {
+    if (typeof newScale !== 'number') {
+        throw new Error('--scale flag must be a number.');
+    }
+    currentScale = newScale;
+};
+exports.setScale = setScale;
+const getScale = () => {
+    return currentScale;
+};
+exports.getScale = getScale;

package/dist/config/still-frame.d.ts

@@ -0,0 +1,2 @@
+export declare const setStillFrame: (frame: number) => void;
+export declare const getStillFrame: () => number;

package/dist/config/still-frame.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getStillFrame = exports.setStillFrame = void 0;
+const renderer_1 = require("@remotion/renderer");
+let stillFrame = 0;
+const setStillFrame = (frame) => {
+    renderer_1.RenderInternals.validateFrame(frame, Infinity);
+    stillFrame = frame;
+};
+exports.setStillFrame = setStillFrame;
+const getStillFrame = () => stillFrame;
+exports.getStillFrame = getStillFrame;

package/dist/config/timeout.d.ts

@@ -0,0 +1,2 @@
+export declare const setPuppeteerTimeout: (newPuppeteerTimeout: number) => void;
+export declare const getCurrentPuppeteerTimeout: () => number;

package/dist/config/timeout.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getCurrentPuppeteerTimeout = exports.setPuppeteerTimeout = void 0;
+const renderer_1 = require("@remotion/renderer");
+let currentTimeout = renderer_1.RenderInternals.DEFAULT_TIMEOUT;
+const setPuppeteerTimeout = (newPuppeteerTimeout) => {
+    if (typeof newPuppeteerTimeout !== 'number') {
+        throw new Error('--timeout flag / setTimeoutInMilliseconds() must be a number, but got ' +
+            JSON.stringify(newPuppeteerTimeout));
+    }
+    currentTimeout = newPuppeteerTimeout;
+};
+exports.setPuppeteerTimeout = setPuppeteerTimeout;
+const getCurrentPuppeteerTimeout = () => {
+    return currentTimeout;
+};
+exports.getCurrentPuppeteerTimeout = getCurrentPuppeteerTimeout;

package/dist/config/webpack-caching.d.ts

@@ -0,0 +1,3 @@
+export declare const DEFAULT_WEBPACK_CACHE_ENABLED = true;
+export declare const setWebpackCaching: (flag: boolean) => void;
+export declare const getWebpackCaching: () => boolean;

package/dist/config/webpack-caching.js

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getWebpackCaching = exports.setWebpackCaching = exports.DEFAULT_WEBPACK_CACHE_ENABLED = void 0;
+exports.DEFAULT_WEBPACK_CACHE_ENABLED = true;
+let webpackCaching = exports.DEFAULT_WEBPACK_CACHE_ENABLED;
+const setWebpackCaching = (flag) => {
+    if (typeof flag !== 'boolean') {
+        throw new TypeError('Caching flag must be a boolean.');
+    }
+    webpackCaching = flag;
+};
+exports.setWebpackCaching = setWebpackCaching;
+const getWebpackCaching = () => {
+    return webpackCaching;
+};
+exports.getWebpackCaching = getWebpackCaching;

package/dist/download-progress.d.ts

@@ -1,2 +1,3 @@
-import { DownloadProgress } from './progress-bar';
+import type { DownloadProgress } from './progress-bar';
+export declare const getFileSizeDownloadBar: (downloaded: number) => string;
 export declare const makeMultiDownloadProgress: (progresses: DownloadProgress[]) => string | null;

package/dist/download-progress.js

@@ -1,22 +1,37 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.makeMultiDownloadProgress = void 0;
+exports.makeMultiDownloadProgress = exports.getFileSizeDownloadBar = void 0;
+const format_bytes_1 = require("./format-bytes");
 const make_progress_bar_1 = require("./make-progress-bar");
+const getFileSizeDownloadBar = (downloaded) => {
+    const desiredLength = (0, make_progress_bar_1.makeProgressBar)(0).length;
+    return `[${(0, format_bytes_1.formatBytes)(downloaded).padEnd(desiredLength - 2, ' ')}]`;
+};
+exports.getFileSizeDownloadBar = getFileSizeDownloadBar;
 const makeMultiDownloadProgress = (progresses) => {
     if (progresses.length === 0) {
         return null;
     }
     if (progresses.length === 1) {
         const [progress] = progresses;
+        const truncatedFileName = progress.name.length >= 60
+            ? progress.name.substring(0, 57) + '...'
+            : progress.name;
         return [
             `    +`,
-            (0, make_progress_bar_1.makeProgressBar)(progress.progress),
-            `Downloading ${progress.name}`,
+            progress.progress
+                ? (0, make_progress_bar_1.makeProgressBar)(progress.progress)
+                : (0, exports.getFileSizeDownloadBar)(progress.downloaded),
+            `Downloading ${truncatedFileName}`,
         ].join(' ');
     }
+    const everyFileHasContentLength = progresses.every((p) => p.totalBytes !== null);
     return [
         `    +`,
-        (0, make_progress_bar_1.makeProgressBar)(progresses.reduce((a, b) => a + b.progress, 0) / progresses.length),
+        everyFileHasContentLength
+            ? (0, make_progress_bar_1.makeProgressBar)(progresses.reduce((a, b) => a + b.progress, 0) /
+                progresses.length)
+            : (0, exports.getFileSizeDownloadBar)(progresses.reduce((a, b) => a + b.downloaded, 0)),
         `Downloading ${progresses.length} files`,
     ].join(' ');
 };

package/dist/editor/components/AudioWaveform.js

@@ -98,13 +98,13 @@ const AudioWaveform = ({ src, fps, startFrom, durationInFrames, visualizationWid
         });
     }, [durationInFrames, fps, metadata, startFrom, visualizationWidth]);
     if (error) {
-        return ((0, jsx_runtime_1.jsx)("div", { style: container, children: (0, jsx_runtime_1.jsx)("div", { style: errorMessage, children: "No waveform available. Audio might not support CORS." }, void 0) }, void 0));
+        return ((0, jsx_runtime_1.jsx)("div", { style: container, children: (0, jsx_runtime_1.jsx)("div", { style: errorMessage, children: "No waveform available. Audio might not support CORS." }) }));
     }
     if (!metadata) {
         return null;
     }
     return ((0, jsx_runtime_1.jsxs)("div", { style: container, children: [normalized.map((w) => {
                 return (0, jsx_runtime_1.jsx)(AudioWaveformBar_1.AudioWaveformBar, { amplitude: w.amplitude }, w.index);
-            }), (0, jsx_runtime_1.jsx)("canvas", { ref: canvas, style: canvasStyle, width: visualizationWidth, height: timeline_layout_1.TIMELINE_LAYER_HEIGHT }, void 0)] }, void 0));
+            }), (0, jsx_runtime_1.jsx)("canvas", { ref: canvas, style: canvasStyle, width: visualizationWidth, height: timeline_layout_1.TIMELINE_LAYER_HEIGHT })] }));
 };
 exports.AudioWaveform = AudioWaveform;

package/dist/editor/components/AudioWaveformBar.js

@@ -19,6 +19,6 @@ const AudioWaveformBar = ({ amplitude }) => {
             height: (timeline_layout_1.TIMELINE_LAYER_HEIGHT / 2) * amplitude,
         };
     }, [amplitude]);
-    return (0, jsx_runtime_1.jsx)("div", { style: style }, void 0);
+    return (0, jsx_runtime_1.jsx)("div", { style: style });
 };
 exports.AudioWaveformBar = AudioWaveformBar;

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

@@ -0,0 +1,4 @@
+import React from 'react';
+export declare const Button: React.FC<React.DetailedHTMLProps<React.ButtonHTMLAttributes<HTMLButtonElement>, HTMLButtonElement> & {
+    children: React.ReactNode;
+}>;

package/dist/editor/components/Button.js

@@ -0,0 +1,24 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Button = void 0;
+const jsx_runtime_1 = require("react/jsx-runtime");
+const colors_1 = require("../helpers/colors");
+const layout_1 = require("./layout");
+const container = {
+    padding: 10,
+    cursor: 'pointer',
+    fontSize: 14,
+};
+const button = {
+    border: `1px solid ${colors_1.INPUT_BORDER_COLOR_UNHOVERED}`,
+    borderRadius: 4,
+    backgroundColor: colors_1.INPUT_BACKGROUND,
+    appearance: 'none',
+    fontFamily: 'inherit',
+    fontSize: 14,
+    color: 'white',
+};
+const Button = ({ children, ...props }) => {
+    return ((0, jsx_runtime_1.jsx)("button", { ...props, style: button, type: "button", children: (0, jsx_runtime_1.jsx)(layout_1.Row, { style: container, children: children }) }));
+};
+exports.Button = Button;

package/dist/editor/components/Canvas.js

@@ -4,19 +4,209 @@ exports.Canvas = void 0;
 const jsx_runtime_1 = require("react/jsx-runtime");
 const player_1 = require("@remotion/player");
 const react_1 = require("react");
+const smooth_zoom_1 = require("../../smooth-zoom");
+const colors_1 = require("../helpers/colors");
+const get_effective_translation_1 = require("../helpers/get-effective-translation");
+const is_current_selected_still_1 = require("../helpers/is-current-selected-still");
+const use_keybinding_1 = require("../helpers/use-keybinding");
+const preview_size_1 = require("../state/preview-size");
+const layout_1 = require("./layout");
 const Preview_1 = require("./Preview");
+const ResetZoomButton_1 = require("./ResetZoomButton");
 const container = {
     flex: 1,
     display: 'flex',
     overflow: 'hidden',
     position: 'relative',
+    backgroundColor: colors_1.BACKGROUND,
 };
+const resetZoom = {
+    position: 'absolute',
+    top: layout_1.SPACING_UNIT * 2,
+    right: layout_1.SPACING_UNIT * 2,
+};
+const ZOOM_PX_FACTOR = 0.003;
 const Canvas = () => {
+    const dimensions = (0, is_current_selected_still_1.useDimensions)();
     const ref = (0, react_1.useRef)(null);
+    const { setSize, size: previewSize } = (0, react_1.useContext)(preview_size_1.PreviewSizeContext);
+    const keybindings = (0, use_keybinding_1.useKeybinding)();
     const size = player_1.PlayerInternals.useElementSize(ref, {
         triggerOnWindowResize: false,
         shouldApplyCssTransforms: true,
     });
-    return ((0, jsx_runtime_1.jsx)("div", { ref: ref, style: container, children: size ? (0, jsx_runtime_1.jsx)(Preview_1.VideoPreview, { canvasSize: size }, void 0) : null }, void 0));
+    const isFit = previewSize.size === 'auto' ||
+        (previewSize.size === 1 &&
+            previewSize.translation.x === 0 &&
+            previewSize.translation.y === 0);
+    const onWheel = (0, react_1.useCallback)((e) => {
+        if (!size) {
+            return;
+        }
+        if (!dimensions) {
+            return;
+        }
+        const wantsToZoom = e.ctrlKey || e.metaKey;
+        if (!wantsToZoom && isFit) {
+            return;
+        }
+        e.preventDefault();
+        setSize((prevSize) => {
+            const scale = player_1.PlayerInternals.calculateScale({
+                canvasSize: size,
+                compositionHeight: dimensions.height,
+                compositionWidth: dimensions.width,
+                previewSize: prevSize.size,
+            });
+            // Zoom in/out
+            if (wantsToZoom) {
+                const oldSize = prevSize.size === 'auto' ? scale : prevSize.size;
+                const smoothened = (0, smooth_zoom_1.smoothenZoom)(oldSize);
+                const added = smoothened + e.deltaY * ZOOM_PX_FACTOR;
+                const unsmoothened = (0, smooth_zoom_1.unsmoothenZoom)(added);
+                const { centerX, centerY } = (0, get_effective_translation_1.getCenterPointWhileScrolling)({
+                    size,
+                    clientX: e.clientX,
+                    clientY: e.clientY,
+                    compositionWidth: dimensions.width,
+                    compositionHeight: dimensions.height,
+                    scale,
+                    translation: prevSize.translation,
+                });
+                const zoomDifference = unsmoothened - oldSize;
+                const uvCoordinatesX = centerX / dimensions.width;
+                const uvCoordinatesY = centerY / dimensions.height;
+                const correctionLeft = -uvCoordinatesX * (zoomDifference * dimensions.width) +
+                    (1 - uvCoordinatesX) * zoomDifference * dimensions.width;
+                const correctionTop = -uvCoordinatesY * (zoomDifference * dimensions.height) +
+                    (1 - uvCoordinatesY) * zoomDifference * dimensions.height;
+                return {
+                    translation: (0, get_effective_translation_1.getEffectiveTranslation)({
+                        translation: {
+                            x: prevSize.translation.x - correctionLeft / 2,
+                            y: prevSize.translation.y - correctionTop / 2,
+                        },
+                        canvasSize: size,
+                        compositionHeight: dimensions.height,
+                        compositionWidth: dimensions.width,
+                        scale,
+                    }),
+                    size: unsmoothened,
+                };
+            }
+            const effectiveTranslation = (0, get_effective_translation_1.getEffectiveTranslation)({
+                translation: prevSize.translation,
+                canvasSize: size,
+                compositionHeight: dimensions.height,
+                compositionWidth: dimensions.width,
+                scale,
+            });
+            // Pan
+            return {
+                ...prevSize,
+                translation: (0, get_effective_translation_1.getEffectiveTranslation)({
+                    translation: {
+                        x: effectiveTranslation.x + e.deltaX,
+                        y: effectiveTranslation.y + e.deltaY,
+                    },
+                    canvasSize: size,
+                    compositionHeight: dimensions.height,
+                    compositionWidth: dimensions.width,
+                    scale,
+                }),
+            };
+        });
+    }, [dimensions, isFit, setSize, size]);
+    (0, react_1.useEffect)(() => {
+        const { current } = ref;
+        if (!current) {
+            return;
+        }
+        current.addEventListener('wheel', onWheel);
+        return () => current.removeEventListener('wheel', onWheel);
+    }, [onWheel]);
+    const onReset = (0, react_1.useCallback)(() => {
+        setSize(() => {
+            return {
+                translation: {
+                    x: 0,
+                    y: 0,
+                },
+                size: 'auto',
+            };
+        });
+    }, [setSize]);
+    const onZoomIn = (0, react_1.useCallback)(() => {
+        if (!dimensions) {
+            return;
+        }
+        if (!size) {
+            return;
+        }
+        setSize((prevSize) => {
+            const scale = player_1.PlayerInternals.calculateScale({
+                canvasSize: size,
+                compositionHeight: dimensions.height,
+                compositionWidth: dimensions.width,
+                previewSize: prevSize.size,
+            });
+            return {
+                translation: {
+                    x: 0,
+                    y: 0,
+                },
+                size: Math.min(smooth_zoom_1.MAX_ZOOM, scale * 2),
+            };
+        });
+    }, [dimensions, setSize, size]);
+    const onZoomOut = (0, react_1.useCallback)(() => {
+        if (!dimensions) {
+            return;
+        }
+        if (!size) {
+            return;
+        }
+        setSize((prevSize) => {
+            const scale = player_1.PlayerInternals.calculateScale({
+                canvasSize: size,
+                compositionHeight: dimensions.height,
+                compositionWidth: dimensions.width,
+                previewSize: prevSize.size,
+            });
+            return {
+                translation: {
+                    x: 0,
+                    y: 0,
+                },
+                size: Math.max(smooth_zoom_1.MIN_ZOOM, scale / 2),
+            };
+        });
+    }, [dimensions, setSize, size]);
+    (0, react_1.useEffect)(() => {
+        const resetBinding = keybindings.registerKeybinding({
+            event: 'keydown',
+            key: '0',
+            commandCtrlKey: false,
+            callback: onReset,
+        });
+        const zoomIn = keybindings.registerKeybinding({
+            event: 'keydown',
+            key: '+',
+            commandCtrlKey: false,
+            callback: onZoomIn,
+        });
+        const zoomOut = keybindings.registerKeybinding({
+            event: 'keydown',
+            key: '-',
+            commandCtrlKey: false,
+            callback: onZoomOut,
+        });
+        return () => {
+            resetBinding.unregister();
+            zoomIn.unregister();
+            zoomOut.unregister();
+        };
+    }, [keybindings, onReset, onZoomIn, onZoomOut]);
+    return ((0, jsx_runtime_1.jsxs)("div", { ref: ref, style: container, children: [size ? (0, jsx_runtime_1.jsx)(Preview_1.VideoPreview, { canvasSize: size }) : null, isFit ? null : ((0, jsx_runtime_1.jsx)("div", { style: resetZoom, children: (0, jsx_runtime_1.jsx)(ResetZoomButton_1.ResetZoomButton, { onClick: onReset }) }))] }));
 };
 exports.Canvas = Canvas;

package/dist/editor/components/CheckboardToggle.js

@@ -3,9 +3,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.CheckboardToggle = void 0;
 const jsx_runtime_1 = require("react/jsx-runtime");
 const react_1 = require("react");
+const truthy_1 = require("../../truthy");
+const use_keybinding_1 = require("../helpers/use-keybinding");
 const checkerboard_1 = require("../state/checkerboard");
 const ControlButton_1 = require("./ControlButton");
-const accessibilityLabel = 'Show transparency as checkerboard (T)';
+const accessibilityLabel = [
+    'Show transparency as checkerboard',
+    (0, use_keybinding_1.areKeyboardShortcutsDisabled)() ? null : '(T)',
+]
+    .filter(truthy_1.truthy)
+    .join(' ');
 const CheckboardToggle = () => {
     const { checkerboard, setCheckerboard } = (0, react_1.useContext)(checkerboard_1.CheckerboardContext);
     const onClick = (0, react_1.useCallback)(() => {
@@ -13,6 +20,6 @@ const CheckboardToggle = () => {
             return !c;
         });
     }, [setCheckerboard]);
-    return ((0, jsx_runtime_1.jsx)(ControlButton_1.ControlButton, { title: accessibilityLabel, "aria-label": accessibilityLabel, onClick: onClick, children: (0, jsx_runtime_1.jsx)("svg", { "aria-hidden": "true", focusable: "false", "data-prefix": "fas", "data-icon": "game-board-alt", className: "svg-inline--fa fa-game-board-alt fa-w-16", role: "img", xmlns: "http://www.w3.org/2000/svg", viewBox: "0 0 512 512", style: { width: 16, height: 16 }, children: (0, jsx_runtime_1.jsx)("path", { fill: checkerboard ? 'var(--blue)' : 'white', d: "M480 0H32A32 32 0 0 0 0 32v448a32 32 0 0 0 32 32h448a32 32 0 0 0 32-32V32a32 32 0 0 0-32-32zm-32 256H256v192H64V256h192V64h192z" }, void 0) }, void 0) }, void 0));
+    return ((0, jsx_runtime_1.jsx)(ControlButton_1.ControlButton, { title: accessibilityLabel, "aria-label": accessibilityLabel, onClick: onClick, children: (0, jsx_runtime_1.jsx)("svg", { "aria-hidden": "true", focusable: "false", "data-prefix": "fas", "data-icon": "game-board-alt", className: "svg-inline--fa fa-game-board-alt fa-w-16", role: "img", xmlns: "http://www.w3.org/2000/svg", viewBox: "0 0 512 512", style: { width: 16, height: 16 }, children: (0, jsx_runtime_1.jsx)("path", { fill: checkerboard ? 'var(--blue)' : 'white', d: "M480 0H32A32 32 0 0 0 0 32v448a32 32 0 0 0 32 32h448a32 32 0 0 0 32-32V32a32 32 0 0 0-32-32zm-32 256H256v192H64V256h192V64h192z" }) }) }));
 };
 exports.CheckboardToggle = CheckboardToggle;

package/dist/editor/components/ClipboardIcon.js

@@ -7,6 +7,6 @@ const ClipboardIcon = () => {
             height: 16,
             verticalAlign: 'middle',
             marginTop: -3,
-        }, children: (0, jsx_runtime_1.jsx)("path", { fill: "currentColor", d: "M336 64h-80c0-35.3-28.7-64-64-64s-64 28.7-64 64H48C21.5 64 0 85.5 0 112v352c0 26.5 21.5 48 48 48h288c26.5 0 48-21.5 48-48V112c0-26.5-21.5-48-48-48zM192 40c13.3 0 24 10.7 24 24s-10.7 24-24 24-24-10.7-24-24 10.7-24 24-24zm144 418c0 3.3-2.7 6-6 6H54c-3.3 0-6-2.7-6-6V118c0-3.3 2.7-6 6-6h42v36c0 6.6 5.4 12 12 12h168c6.6 0 12-5.4 12-12v-36h42c3.3 0 6 2.7 6 6z" }, void 0) }, void 0));
+        }, children: (0, jsx_runtime_1.jsx)("path", { fill: "currentColor", d: "M336 64h-80c0-35.3-28.7-64-64-64s-64 28.7-64 64H48C21.5 64 0 85.5 0 112v352c0 26.5 21.5 48 48 48h288c26.5 0 48-21.5 48-48V112c0-26.5-21.5-48-48-48zM192 40c13.3 0 24 10.7 24 24s-10.7 24-24 24-24-10.7-24-24 10.7-24 24-24zm144 418c0 3.3-2.7 6-6 6H54c-3.3 0-6-2.7-6-6V118c0-3.3 2.7-6 6-6h42v36c0 6.6 5.4 12 12 12h168c6.6 0 12-5.4 12-12v-36h42c3.3 0 6 2.7 6 6z" }) }));
 };
 exports.ClipboardIcon = ClipboardIcon;

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

@@ -0,0 +1,4 @@
+import React from 'react';
+export declare const CollapsedCompositionSelector: React.FC<{
+    onExpand: () => void;
+}>;

package/dist/editor/components/CollapsedCompositionSelector.js

@@ -0,0 +1,39 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CollapsedCompositionSelector = void 0;
+const jsx_runtime_1 = require("react/jsx-runtime");
+const react_1 = require("react");
+const colors_1 = require("../helpers/colors");
+const caret_1 = require("../icons/caret");
+const z_index_1 = require("../state/z-index");
+const CollapsedCompositionSelector = ({ onExpand }) => {
+    const [hovered, setHovered] = (0, react_1.useState)(false);
+    const { tabIndex } = (0, z_index_1.useZIndex)();
+    const onPointerEnter = (0, react_1.useCallback)(() => {
+        setHovered(true);
+    }, []);
+    const onPointerLeave = (0, react_1.useCallback)(() => {
+        setHovered(false);
+    }, []);
+    const style = (0, react_1.useMemo)(() => {
+        return {
+            border: 'none',
+            borderRight: '2px solid black',
+            cursor: 'pointer',
+            color: 'white',
+            display: 'flex',
+            justifyContent: 'center',
+            alignItems: 'center',
+            paddingLeft: 7,
+            paddingRight: 4,
+            backgroundColor: (0, colors_1.getBackgroundFromHoverState)({
+                hovered,
+                selected: false,
+            }),
+            appearance: 'none',
+            WebkitAppearance: 'none',
+        };
+    }, [hovered]);
+    return ((0, jsx_runtime_1.jsx)("button", { style: style, onPointerEnter: onPointerEnter, onPointerLeave: onPointerLeave, type: "button", role: "button", tabIndex: tabIndex, onClick: onExpand, children: (0, jsx_runtime_1.jsx)(caret_1.CaretRight, {}) }));
+};
+exports.CollapsedCompositionSelector = CollapsedCompositionSelector;

package/dist/editor/components/CompositionSelector.js

@@ -4,20 +4,20 @@ exports.CompositionSelector = exports.getKeysToExpand = 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 create_folder_tree_1 = require("../helpers/create-folder-tree");
 const persist_open_folders_1 = require("../helpers/persist-open-folders");
-const marks_1 = require("../state/marks");
 const z_index_1 = require("../state/z-index");
 const CompositionSelectorItem_1 = require("./CompositionSelectorItem");
 const CurrentComposition_1 = require("./CurrentComposition");
-const FramePersistor_1 = require("./FramePersistor");
-const TimelineInOutToggle_1 = require("./TimelineInOutToggle");
+const InitialCompositionLoader_1 = require("./InitialCompositionLoader");
 const container = {
     borderRight: '1px solid black',
     position: 'absolute',
     height: '100%',
     width: '100%',
     flex: 1,
+    backgroundColor: colors_1.BACKGROUND,
 };
 const list = {
     padding: 5,
@@ -34,32 +34,10 @@ const getKeysToExpand = (initialFolderName, parentFolderName, initial = []) => {
 };
 exports.getKeysToExpand = getKeysToExpand;
 const CompositionSelector = () => {
-    const { compositions, setCurrentComposition, currentComposition, folders } = (0, react_1.useContext)(remotion_1.Internals.CompositionManager);
+    const { compositions, currentComposition, folders } = (0, react_1.useContext)(remotion_1.Internals.CompositionManager);
     const [foldersExpanded, setFoldersExpanded] = (0, react_1.useState)((0, persist_open_folders_1.loadExpandedFolders)());
     const { tabIndex } = (0, z_index_1.useZIndex)();
-    const setCurrentFrame = remotion_1.Internals.Timeline.useTimelineSetFrame();
-    const selectComposition = (0, react_1.useCallback)((c) => {
-        var _a;
-        (_a = TimelineInOutToggle_1.inOutHandles.current) === null || _a === void 0 ? void 0 : _a.setMarks((0, marks_1.loadMarks)(c.id, c.durationInFrames));
-        window.history.pushState({}, 'Preview', `/${c.id}`);
-        const frame = (0, FramePersistor_1.getFrameForComposition)(c.id);
-        const frameInBounds = Math.min(c.durationInFrames - 1, frame);
-        setCurrentFrame(frameInBounds);
-        setCurrentComposition(c.id);
-        const { folderName, parentFolderName } = c;
-        if (folderName !== null) {
-            setFoldersExpanded((ex) => {
-                const keysToExpand = (0, exports.getKeysToExpand)(folderName, parentFolderName);
-                const newState = {
-                    ...ex,
-                };
-                for (const key of keysToExpand) {
-                    newState[key] = true;
-                }
-                return newState;
-            });
-        }
-    }, [setCurrentComposition, setCurrentFrame]);
+    const selectComposition = (0, InitialCompositionLoader_1.useSelectComposition)();
     const toggleFolder = (0, react_1.useCallback)((folderName, parentName) => {
         setFoldersExpanded((p) => {
             var _a;
@@ -73,27 +51,11 @@ const CompositionSelector = () => {
             return foldersExpandedState;
         });
     }, []);
-    (0, react_1.useEffect)(() => {
-        if (currentComposition) {
-            return;
-        }
-        const compositionFromUrl = (0, FramePersistor_1.getCurrentCompositionFromUrl)();
-        if (compositionFromUrl) {
-            const exists = compositions.find((c) => c.id === compositionFromUrl);
-            if (exists) {
-                selectComposition(exists);
-                return;
-            }
-        }
-        if (compositions.length > 0) {
-            selectComposition(compositions[0]);
-        }
-    }, [compositions, currentComposition, selectComposition]);
     const items = (0, react_1.useMemo)(() => {
         return (0, create_folder_tree_1.createFolderTree)(compositions, folders, foldersExpanded);
     }, [compositions, folders, foldersExpanded]);
-    return ((0, jsx_runtime_1.jsxs)("div", { style: container, children: [(0, jsx_runtime_1.jsx)(CurrentComposition_1.CurrentComposition, {}, void 0), (0, jsx_runtime_1.jsx)("div", { style: list, children: items.map((c) => {
+    return ((0, jsx_runtime_1.jsxs)("div", { style: container, children: [(0, jsx_runtime_1.jsx)(CurrentComposition_1.CurrentComposition, {}), (0, jsx_runtime_1.jsx)("div", { style: list, children: items.map((c) => {
                     return ((0, jsx_runtime_1.jsx)(CompositionSelectorItem_1.CompositionSelectorItem, { level: 0, currentComposition: currentComposition, selectComposition: selectComposition, toggleFolder: toggleFolder, tabIndex: tabIndex, item: c }, c.key + c.type));
-                }) }, void 0)] }, void 0));
+                }) })] }));
 };
 exports.CompositionSelector = CompositionSelector;

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

@@ -1,5 +1,5 @@
 import React from 'react';
-import { TComposition } from 'remotion';
+import type { TComposition } from 'remotion';
 export declare type CompositionSelectorItemType = {
     key: string;
     type: 'composition';
@@ -16,7 +16,7 @@ export declare const CompositionSelectorItem: React.FC<{
     item: CompositionSelectorItemType;
     currentComposition: string | null;
     tabIndex: number;
-    selectComposition: (c: TComposition) => void;
+    selectComposition: (c: TComposition, push: boolean) => void;
     toggleFolder: (folderName: string, parentName: string | null) => void;
     level: number;
 }>;

package/dist/editor/components/CompositionSelectorItem.js

@@ -22,6 +22,8 @@ const itemStyle = {
     appearance: 'none',
     border: 'none',
     width: '100%',
+    textAlign: 'left',
+    backgroundColor: colors_1.BACKGROUND,
 };
 const iconStyle = {
     width: 18,
@@ -58,19 +60,19 @@ const CompositionSelectorItem = ({ item, level, currentComposition, tabIndex, se
     const onClick = (0, react_1.useCallback)((evt) => {
         evt.preventDefault();
         if (item.type === 'composition') {
-            selectComposition(item.composition);
+            selectComposition(item.composition, true);
         }
         else {
             toggleFolder(item.folderName, item.parentName);
         }
     }, [item, selectComposition, toggleFolder]);
     if (item.type === 'folder') {
-        return ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsxs)("button", { style: style, onPointerEnter: onPointerEnter, onPointerLeave: onPointerLeave, tabIndex: tabIndex, onClick: onClick, type: "button", children: [item.expanded ? ((0, jsx_runtime_1.jsx)(folder_1.ExpandedFolderIcon, { style: iconStyle }, void 0)) : ((0, jsx_runtime_1.jsx)(folder_1.CollapsedFolderIcon, { style: iconStyle }, void 0)), (0, jsx_runtime_1.jsx)(layout_1.Spacing, { x: 1 }, void 0), item.folderName] }, void 0), item.expanded
+        return ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsxs)("button", { style: style, onPointerEnter: onPointerEnter, onPointerLeave: onPointerLeave, tabIndex: tabIndex, onClick: onClick, type: "button", children: [item.expanded ? ((0, jsx_runtime_1.jsx)(folder_1.ExpandedFolderIcon, { style: iconStyle })) : ((0, jsx_runtime_1.jsx)(folder_1.CollapsedFolderIcon, { style: iconStyle })), (0, jsx_runtime_1.jsx)(layout_1.Spacing, { x: 1 }), item.folderName] }), item.expanded
                     ? item.items.map((childItem) => {
                         return ((0, jsx_runtime_1.jsx)(exports.CompositionSelectorItem, { currentComposition: currentComposition, selectComposition: selectComposition, item: childItem, tabIndex: tabIndex, level: level + 1, toggleFolder: toggleFolder }, childItem.key + childItem.type));
                     })
-                    : null] }, void 0));
+                    : null] }));
     }
-    return ((0, jsx_runtime_1.jsxs)("button", { style: style, onPointerEnter: onPointerEnter, onPointerLeave: onPointerLeave, tabIndex: tabIndex, onClick: onClick, type: "button", children: [(0, is_composition_still_1.isCompositionStill)(item.composition) ? ((0, jsx_runtime_1.jsx)(still_1.StillIcon, { style: iconStyle }, void 0)) : ((0, jsx_runtime_1.jsx)(film_1.FilmIcon, { style: iconStyle }, void 0)), (0, jsx_runtime_1.jsx)(layout_1.Spacing, { x: 1 }, void 0), item.composition.id] }, void 0));
+    return ((0, jsx_runtime_1.jsxs)("button", { style: style, onPointerEnter: onPointerEnter, onPointerLeave: onPointerLeave, tabIndex: tabIndex, onClick: onClick, type: "button", children: [(0, is_composition_still_1.isCompositionStill)(item.composition) ? ((0, jsx_runtime_1.jsx)(still_1.StillIcon, { style: iconStyle })) : ((0, jsx_runtime_1.jsx)(film_1.FilmIcon, { style: iconStyle })), (0, jsx_runtime_1.jsx)(layout_1.Spacing, { x: 1 }), item.composition.id] }));
 };
 exports.CompositionSelectorItem = CompositionSelectorItem;

package/dist/editor/components/ControlButton.js

@@ -16,6 +16,6 @@ const ControlButton = (props) => {
         };
     }, [props.disabled]);
     const { tabIndex } = (0, z_index_1.useZIndex)();
-    return ((0, jsx_runtime_1.jsx)("button", { type: 'button', tabIndex: tabIndex, ...props, style: style }, void 0));
+    return ((0, jsx_runtime_1.jsx)("button", { type: 'button', tabIndex: tabIndex, ...props, style: style }));
 };
 exports.ControlButton = ControlButton;