@remotion/studio 4.0.501 → 4.0.502

package/dist/components/PreviewToolbarOverflowButton.d.ts

@@ -0,0 +1,12 @@
+import React from 'react';
+export declare const PreviewToolbarOverflowButton: React.FC<{
+    readonly readOnlyStudio: boolean;
+    readonly showFullscreen: boolean;
+    readonly showPlaybackRate: boolean;
+    readonly showLoop: boolean;
+    readonly showCompositionControls: boolean;
+    readonly playbackRate: number;
+    readonly setPlaybackRate: React.Dispatch<React.SetStateAction<number>>;
+    readonly loop: boolean;
+    readonly setLoop: React.Dispatch<React.SetStateAction<boolean>>;
+}>;

package/dist/components/PreviewToolbarOverflowButton.js

@@ -0,0 +1,217 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PreviewToolbarOverflowButton = 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 use_keybinding_1 = require("../helpers/use-keybinding");
+const Checkmark_1 = require("../icons/Checkmark");
+const ellipsis_1 = require("../icons/ellipsis");
+const checkerboard_1 = require("../state/checkerboard");
+const editor_outlines_1 = require("../state/editor-outlines");
+const InlineDropdown_1 = require("./InlineDropdown");
+const LoopToggle_1 = require("./LoopToggle");
+const PlaybackRateSelector_1 = require("./PlaybackRateSelector");
+const SizeSelector_1 = require("./SizeSelector");
+const clickButton = (id) => {
+    var _a;
+    (_a = document.getElementById(id)) === null || _a === void 0 ? void 0 : _a.click();
+};
+const PreviewToolbarOverflowButton = ({ readOnlyStudio, showFullscreen, showPlaybackRate, showLoop, showCompositionControls, playbackRate, setPlaybackRate, loop, setLoop, }) => {
+    const video = remotion_1.Internals.useVideo();
+    const { checkerboard, setCheckerboard } = (0, react_1.useContext)(checkerboard_1.CheckerboardContext);
+    const { editorShowOutlines, setEditorShowOutlines } = (0, react_1.useContext)(editor_outlines_1.EditorShowOutlinesContext);
+    const { items: previewSizeItems, selectedId: selectedPreviewSize, zoomable, } = (0, SizeSelector_1.usePreviewSizeMenuItems)();
+    const { items: playbackRateItems, selectedId: selectedPlaybackRate } = (0, PlaybackRateSelector_1.usePlaybackRateMenuItems)({ playbackRate, setPlaybackRate });
+    const iconStyle = (0, react_1.useMemo)(() => {
+        return {
+            style: {
+                width: 14,
+                height: 14,
+                flexShrink: 0,
+            },
+        };
+    }, []);
+    const renderAction = (0, react_1.useCallback)((color) => jsx_runtime_1.jsx(ellipsis_1.EllipsisIcon, { fill: color, svgProps: iconStyle }), [iconStyle]);
+    const renderItems = (0, react_1.useMemo)(() => {
+        if (readOnlyStudio) {
+            return [
+                {
+                    type: 'item',
+                    id: 'client-render',
+                    label: 'Render on web',
+                    value: 'client-render',
+                    onClick: () => clickButton('render-modal-button-client'),
+                    keyHint: null,
+                    leftItem: null,
+                    subMenu: null,
+                    quickSwitcherLabel: null,
+                },
+                {
+                    type: 'item',
+                    id: 'render-command',
+                    label: 'Render via CLI',
+                    value: 'render-command',
+                    onClick: () => clickButton('render-modal-button-command'),
+                    keyHint: null,
+                    leftItem: null,
+                    subMenu: null,
+                    quickSwitcherLabel: null,
+                },
+            ];
+        }
+        return [
+            {
+                type: 'item',
+                id: 'server-render',
+                label: 'Server-side render',
+                value: 'server-render',
+                onClick: () => clickButton('render-modal-button-server'),
+                keyHint: null,
+                leftItem: null,
+                subMenu: null,
+                quickSwitcherLabel: null,
+            },
+            {
+                type: 'item',
+                id: 'client-render',
+                label: 'Client-side render',
+                value: 'client-render',
+                onClick: () => clickButton('render-modal-button-client'),
+                keyHint: null,
+                leftItem: null,
+                subMenu: null,
+                quickSwitcherLabel: null,
+            },
+        ];
+    }, [readOnlyStudio]);
+    const values = (0, react_1.useMemo)(() => {
+        const items = [];
+        if (zoomable) {
+            items.push({
+                type: 'item',
+                id: 'preview-size',
+                label: 'Preview Size',
+                value: 'preview-size',
+                onClick: () => undefined,
+                keyHint: null,
+                leftItem: null,
+                subMenu: {
+                    items: previewSizeItems,
+                    leaveLeftSpace: true,
+                    preselectIndex: previewSizeItems.findIndex((item) => item.id === selectedPreviewSize),
+                },
+                quickSwitcherLabel: null,
+            });
+        }
+        if (showPlaybackRate) {
+            items.push({
+                type: 'item',
+                id: 'playback-rate',
+                label: 'Playback Rate',
+                value: 'playback-rate',
+                onClick: () => undefined,
+                keyHint: null,
+                leftItem: null,
+                subMenu: {
+                    items: playbackRateItems,
+                    leaveLeftSpace: true,
+                    preselectIndex: playbackRateItems.findIndex((item) => item.id === selectedPlaybackRate),
+                },
+                quickSwitcherLabel: null,
+            });
+        }
+        if (showLoop) {
+            items.push({
+                type: 'item',
+                id: 'loop',
+                label: 'Loop',
+                value: 'loop',
+                onClick: () => (0, LoopToggle_1.toggleLoop)(setLoop),
+                keyHint: null,
+                leftItem: loop ? jsx_runtime_1.jsx(Checkmark_1.Checkmark, {}) : null,
+                subMenu: null,
+                quickSwitcherLabel: null,
+            });
+        }
+        if (showCompositionControls) {
+            items.push({
+                type: 'item',
+                id: 'checkerboard',
+                label: 'Transparency as checkerboard',
+                value: 'checkerboard',
+                onClick: () => setCheckerboard((current) => !current),
+                keyHint: (0, use_keybinding_1.areKeyboardShortcutsDisabled)() ? null : 'T',
+                leftItem: checkerboard ? jsx_runtime_1.jsx(Checkmark_1.Checkmark, {}) : null,
+                subMenu: null,
+                quickSwitcherLabel: null,
+            });
+            items.push({
+                type: 'item',
+                id: 'outlines',
+                label: 'Outlines',
+                value: 'outlines',
+                onClick: () => setEditorShowOutlines((current) => !current),
+                keyHint: null,
+                leftItem: editorShowOutlines ? jsx_runtime_1.jsx(Checkmark_1.Checkmark, {}) : null,
+                subMenu: null,
+                quickSwitcherLabel: null,
+            });
+        }
+        if (showFullscreen) {
+            items.push({
+                type: 'item',
+                id: 'fullscreen',
+                label: 'Fullscreen',
+                value: 'fullscreen',
+                onClick: () => clickButton('fullscreen-toggle'),
+                keyHint: (0, use_keybinding_1.areKeyboardShortcutsDisabled)() ? null : 'F',
+                leftItem: null,
+                subMenu: null,
+                quickSwitcherLabel: null,
+            });
+        }
+        if (video) {
+            items.push({
+                type: 'item',
+                id: 'render',
+                label: 'Render',
+                value: 'render',
+                onClick: () => undefined,
+                keyHint: null,
+                leftItem: null,
+                subMenu: {
+                    items: renderItems,
+                    leaveLeftSpace: false,
+                    preselectIndex: 0,
+                },
+                quickSwitcherLabel: null,
+            });
+        }
+        return items;
+    }, [
+        previewSizeItems,
+        playbackRateItems,
+        renderItems,
+        selectedPlaybackRate,
+        selectedPreviewSize,
+        showFullscreen,
+        showLoop,
+        showPlaybackRate,
+        showCompositionControls,
+        loop,
+        checkerboard,
+        editorShowOutlines,
+        setCheckerboard,
+        setEditorShowOutlines,
+        setLoop,
+        video,
+        zoomable,
+    ]);
+    if (values.length === 0) {
+        return null;
+    }
+    return (jsx_runtime_1.jsx(InlineDropdown_1.InlineDropdown, { renderAction: renderAction, values: values, title: "More actions", unhoveredColor: colors_1.WHITE }));
+};
+exports.PreviewToolbarOverflowButton = PreviewToolbarOverflowButton;

package/dist/components/QuickSwitcher/QuickSwitcher.d.ts

@@ -8,6 +8,7 @@ declare const QuickSwitcher: React.FC<{
     readonly readOnlyStudio: boolean;
     readonly assetSelection: {
         readonly initialQuery: string;
+        readonly onSelectFile: () => void;
         readonly onSelected: (asset: StaticFile) => void;
     } | null;
     readonly compositionSelection: {

package/dist/components/QuickSwitcher/QuickSwitcherContent.d.ts

@@ -8,6 +8,7 @@ export declare const QuickSwitcherContent: React.FC<{
     readonly readOnlyStudio: boolean;
     readonly assetSelection: {
         readonly initialQuery: string;
+        readonly onSelectFile: () => void;
         readonly onSelected: (asset: StaticFile) => void;
     } | null;
     readonly compositionSelection: {

package/dist/components/QuickSwitcher/QuickSwitcherContent.js

@@ -156,7 +156,7 @@ const QuickSwitcherContent = ({ initialMode, invocationTimestamp, readOnlyStudio
             return docResults.results;
         }
         if (mode === 'assets') {
-            return (0, fuzzy_search_1.fuzzySearch)(assetSearch.query, assetSearch.assets.map((asset) => {
+            const assetResults = (0, fuzzy_search_1.fuzzySearch)(assetSearch.query, assetSearch.assets.map((asset) => {
                 return {
                     id: 'asset-' + asset.name,
                     title: asset.name,
@@ -174,6 +174,21 @@ const QuickSwitcherContent = ({ initialMode, invocationTimestamp, readOnlyStudio
                     },
                 };
             }));
+            if (assetSelection === null) {
+                return assetResults;
+            }
+            return [
+                {
+                    id: 'select-file',
+                    title: 'Select file...',
+                    type: 'select-file',
+                    onSelected: () => {
+                        assetSelection.onSelectFile();
+                        setSelectedModal(null);
+                    },
+                },
+                ...assetResults,
+            ];
         }
         return (0, fuzzy_search_1.fuzzySearch)(actualQuery, compositions
             .filter((c) => c.id !== (compositionSelection === null || compositionSelection === void 0 ? void 0 : compositionSelection.excludeCompositionId))

package/dist/components/QuickSwitcher/QuickSwitcherResult.d.ts

@@ -8,6 +8,8 @@ type QuickSwitcherResultDetail = {
     compositionType: 'composition' | 'still';
 } | {
     type: 'menu-item';
+} | {
+    type: 'select-file';
 } | {
     type: 'search-result';
     titleLine: string;

package/dist/components/QuickSwitcher/QuickSwitcherResult.js

@@ -6,6 +6,7 @@ const react_1 = require("react");
 const colors_1 = require("../../helpers/colors");
 const use_keybinding_1 = require("../../helpers/use-keybinding");
 const still_1 = require("../../icons/still");
+const upload_1 = require("../../icons/upload");
 const video_1 = require("../../icons/video");
 const AssetFileIcon_1 = require("../AssetFileIcon");
 const layout_1 = require("../layout");
@@ -35,6 +36,11 @@ const iconStyle = {
     height: 18,
     flexShrink: 0,
 };
+const selectFileIconStyle = {
+    ...iconStyle,
+    width: 20,
+    height: 20,
+};
 const labelContainer = {
     overflow: 'hidden',
     flex: 1,
@@ -95,7 +101,7 @@ const QuickSwitcherResult = ({ result, selected }) => {
             fontSize: shared_1.QUICK_SWITCHER_RESULT_LABEL_FONT_SIZE,
         };
     }, [hovered, result.type, selected]);
-    return (jsx_runtime_1.jsxs("div", { ref: ref, style: style, onClick: result.onSelected, children: [result.type === 'composition' ? (result.compositionType === 'still' ? (jsx_runtime_1.jsx(still_1.StillIcon, { color: selected || hovered ? colors_1.WHITE : colors_1.LIGHT_TEXT, style: iconStyle })) : (jsx_runtime_1.jsx(video_1.FilmIcon, { color: selected || hovered ? colors_1.WHITE : colors_1.LIGHT_TEXT, style: iconStyle }))) : result.type === 'asset' ? (jsx_runtime_1.jsx(AssetFileIcon_1.AssetFileIcon, { fileType: result.fileType, color: selected || hovered ? colors_1.WHITE : colors_1.LIGHT_TEXT, style: iconStyle })) : null, jsx_runtime_1.jsx(layout_1.Spacing, { x: 1 }), jsx_runtime_1.jsx("div", { style: labelContainer, children: result.type === 'search-result' ? (jsx_runtime_1.jsxs(jsx_runtime_1.Fragment, { children: [
+    return (jsx_runtime_1.jsxs("div", { ref: ref, style: style, onClick: result.onSelected, children: [result.type === 'composition' ? (result.compositionType === 'still' ? (jsx_runtime_1.jsx(still_1.StillIcon, { color: selected || hovered ? colors_1.WHITE : colors_1.LIGHT_TEXT, style: iconStyle })) : (jsx_runtime_1.jsx(video_1.FilmIcon, { color: selected || hovered ? colors_1.WHITE : colors_1.LIGHT_TEXT, style: iconStyle }))) : result.type === 'asset' ? (jsx_runtime_1.jsx(AssetFileIcon_1.AssetFileIcon, { fileType: result.fileType, color: selected || hovered ? colors_1.WHITE : colors_1.LIGHT_TEXT, style: iconStyle })) : result.type === 'select-file' ? (jsx_runtime_1.jsx(upload_1.UploadIcon, { color: selected || hovered ? colors_1.WHITE : colors_1.LIGHT_TEXT, style: selectFileIconStyle })) : null, jsx_runtime_1.jsx(layout_1.Spacing, { x: 1 }), jsx_runtime_1.jsx("div", { style: labelContainer, children: result.type === 'search-result' ? (jsx_runtime_1.jsxs(jsx_runtime_1.Fragment, { children: [
                         jsx_runtime_1.jsx("div", { 
                             // eslint-disable-next-line react/no-danger
                             dangerouslySetInnerHTML: {

package/dist/components/RenderButton.d.ts

@@ -3,4 +3,5 @@ export type RenderType = 'server-render' | 'client-render' | 'render-command';
 export declare const RenderButton: React.FC<{
     readonly readOnlyStudio: boolean;
     readonly size?: 'default' | 'compact';
+    readonly hidden: boolean;
 }>;

package/dist/components/RenderButton.js

@@ -123,7 +123,7 @@ const getInitialRenderType = (readOnlyStudio) => {
     }
     return 'server-render';
 };
-const RenderButton = ({ readOnlyStudio, size: controlSize = 'default' }) => {
+const RenderButton = ({ readOnlyStudio, size: controlSize = 'default', hidden }) => {
     const { inFrame, outFrame } = (0, in_out_1.useTimelineInOutFramePosition)();
     const { setSelectedModal } = (0, react_1.useContext)(modals_1.ModalsContext);
     const [preferredRenderType, setPreferredRenderType] = (0, react_1.useState)(() => getInitialRenderType(readOnlyStudio));
@@ -437,15 +437,17 @@ const RenderButton = ({ readOnlyStudio, size: controlSize = 'default' }) => {
         return null;
     }
     return (jsx_runtime_1.jsxs(jsx_runtime_1.Fragment, { children: [
-            jsx_runtime_1.jsx("button", { style: { display: 'none' }, id: "render-modal-button-server", disabled: !canServerRender, onClick: () => openServerRenderModal(false), type: "button" }), ' ', jsx_runtime_1.jsx("button", { style: { display: 'none' }, id: "render-modal-button-client", onClick: openClientRenderModal, type: "button" }), jsx_runtime_1.jsxs("div", { ref: containerRef, style: containerStyle, title: tooltip, children: [
-                    jsx_runtime_1.jsx("button", { type: "button", style: controlSize === 'compact' ? compactMainButtonStyle : mainButtonStyle, onClick: onClick, id: "render-modal-button", children: jsx_runtime_1.jsxs(layout_1.Row, { align: "center", style: controlSize === 'compact'
+            jsx_runtime_1.jsx("button", { style: { display: 'none' }, id: "render-modal-button-server", disabled: !canServerRender, onClick: () => openServerRenderModal(false), type: "button" }), ' ', jsx_runtime_1.jsx("button", { style: { display: 'none' }, id: "render-modal-button-client", onClick: openClientRenderModal, type: "button" }), jsx_runtime_1.jsx("button", { style: { display: 'none' }, id: "render-modal-button-command", onClick: () => openServerRenderModal(true), type: "button" }), hidden ? (jsx_runtime_1.jsx("button", { style: { display: 'none' }, onClick: onClick, id: "render-modal-button", type: "button" })) : (jsx_runtime_1.jsxs("div", { ref: containerRef, style: containerStyle, title: tooltip, children: [
+                    jsx_runtime_1.jsx("button", { type: "button", style: controlSize === 'compact'
+                            ? compactMainButtonStyle
+                            : mainButtonStyle, onClick: onClick, id: "render-modal-button", children: jsx_runtime_1.jsxs(layout_1.Row, { align: "center", style: controlSize === 'compact'
                                 ? compactMainButtonContent
                                 : mainButtonContent, children: [
                                 jsx_runtime_1.jsx(render_1.ThinRenderIcon, { fill: colors_1.CURRENT_COLOR_LOWERCASE, svgProps: iconStyle }), jsx_runtime_1.jsx(layout_1.Spacing, { x: controlSize === 'compact' ? 0.75 : 1 }), jsx_runtime_1.jsx("span", { style: controlSize === 'compact' ? compactLabel : label, children: renderLabel })
                             ] }) }), jsx_runtime_1.jsx("div", { style: dividerStyle }), jsx_runtime_1.jsx("button", { ref: dropdownRef, type: "button", style: controlSize === 'compact'
                             ? compactDropdownTriggerStyle
                             : dropdownTriggerStyle, className: is_menu_item_1.MENU_INITIATOR_CLASSNAME, onPointerDown: onPointerDown, onClick: onClickDropdown, children: jsx_runtime_1.jsx(caret_1.CaretDown, {}) })
-                ] }), portalStyle
+                ] })), portalStyle
                 ? react_dom_1.default.createPortal(jsx_runtime_1.jsx("div", { style: styles_1.fullScreenOverlay, children: jsx_runtime_1.jsx("div", { style: styles_1.outerPortal, className: "css-reset", children: jsx_runtime_1.jsx(z_index_1.HigherZIndex, { onOutsideClick: onHideDropdown, onEscape: onHideDropdown, children: jsx_runtime_1.jsx("div", { style: portalStyle, onPointerDown: onMenuPointerDown, children: jsx_runtime_1.jsx(MenuContent_1.MenuContent, { onNextMenu: () => { }, onPreviousMenu: () => { }, values: dropdownValues, onHide: onHideDropdown, leaveLeftSpace: false, preselectIndex: dropdownValues.findIndex((v) => v.id === renderType), topItemCanBeUnselected: false, fixedHeight: derivedMaxHeight }) }) }) }) }), (0, portals_1.getPortal)(currentZIndex))
                 : null] }));
 };

package/dist/components/SizeSelector.d.ts

@@ -1,5 +1,11 @@
 import React from 'react';
 import type { PreviewSize } from 'remotion';
+import type { ComboboxValue } from './NewComposition/ComboBox';
 export declare const getPreviewSizeLabel: (previewSize: PreviewSize) => string;
 export declare const getUniqueSizes: (size: PreviewSize) => PreviewSize[];
+export declare const usePreviewSizeMenuItems: () => {
+    items: ComboboxValue[];
+    selectedId: string;
+    zoomable: boolean | null;
+};
 export declare const SizeSelector: React.FC;

package/dist/components/SizeSelector.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SizeSelector = exports.getUniqueSizes = exports.getPreviewSizeLabel = void 0;
+exports.SizeSelector = exports.usePreviewSizeMenuItems = exports.getUniqueSizes = exports.getPreviewSizeLabel = void 0;
 const jsx_runtime_1 = require("react/jsx-runtime");
 const react_1 = require("react");
 const remotion_1 = require("remotion");
@@ -67,14 +67,9 @@ const getUniqueSizes = (size) => {
 };
 exports.getUniqueSizes = getUniqueSizes;
 const zoomableFileTypes = ['video', 'image'];
-const SizeSelector = () => {
+const usePreviewSizeMenuItems = () => {
     const { size, setSize } = (0, react_1.useContext)(remotion_1.Internals.PreviewSizeContext);
     const { canvasContent } = (0, react_1.useContext)(remotion_1.Internals.CompositionManager);
-    const style = (0, react_1.useMemo)(() => {
-        return {
-            padding: ControlButton_1.CONTROL_BUTTON_PADDING - 2,
-        };
-    }, []);
     const zoomable = (0, react_1.useMemo)(() => {
         if (!canvasContent) {
             return null;
@@ -111,9 +106,23 @@ const SizeSelector = () => {
             };
         });
     }, [setSize, size]);
+    return {
+        items,
+        selectedId: String(size.size),
+        zoomable,
+    };
+};
+exports.usePreviewSizeMenuItems = usePreviewSizeMenuItems;
+const SizeSelector = () => {
+    const { items, selectedId, zoomable } = (0, exports.usePreviewSizeMenuItems)();
+    const style = (0, react_1.useMemo)(() => {
+        return {
+            padding: ControlButton_1.CONTROL_BUTTON_PADDING - 2,
+        };
+    }, []);
     if (!zoomable) {
         return null;
     }
-    return (jsx_runtime_1.jsx("div", { style: style, "aria-label": accessibilityLabel, children: jsx_runtime_1.jsx(ComboBox_1.Combobox, { size: "compact", title: accessibilityLabel, style: comboStyle, selectedId: String(size.size), values: items }) }));
+    return (jsx_runtime_1.jsx("div", { style: style, "aria-label": accessibilityLabel, children: jsx_runtime_1.jsx(ComboBox_1.Combobox, { size: "compact", title: accessibilityLabel, style: comboStyle, selectedId: selectedId, values: items }) }));
 };
 exports.SizeSelector = SizeSelector;

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

@@ -6,6 +6,7 @@ export declare const SplitterContainer: React.FC<{
     readonly maxFlex: number;
     readonly minFlex: number;
     readonly maxFlexerSize: number | null;
+    readonly minFlexerSize: number | null;
     readonly maxAntiFlexerSize: number | null;
     readonly id: string;
     readonly defaultFlex: number;

package/dist/components/Splitter/SplitterContainer.js

@@ -6,6 +6,7 @@ const player_1 = require("@remotion/player");
 const react_1 = require("react");
 const timeline_1 = require("../../state/timeline");
 const SplitterContext_1 = require("./SplitterContext");
+const SplitterHandle_1 = require("./SplitterHandle");
 const containerRow = {
     display: 'flex',
     flexDirection: 'row',
@@ -19,14 +20,31 @@ exports.containerColumn = {
     flex: 1,
     height: 0,
 };
-const SplitterContainer = ({ orientation, children, defaultFlex, maxFlex, minFlex, maxFlexerSize, maxAntiFlexerSize, id, }) => {
+const SplitterContainer = ({ orientation, children, defaultFlex, maxFlex, minFlex, maxFlexerSize, minFlexerSize, maxAntiFlexerSize, id, }) => {
     const [initialTimelineFlex, persistFlex] = (0, timeline_1.useTimelineFlex)(id);
     const [flexValue, setFlexValue] = (0, react_1.useState)(initialTimelineFlex !== null && initialTimelineFlex !== void 0 ? initialTimelineFlex : defaultFlex);
     const ref = (0, react_1.useRef)(null);
     const isDragging = (0, react_1.useRef)(false);
+    const size = player_1.PlayerInternals.useElementSize(ref, {
+        triggerOnWindowResize: true,
+        shouldApplyCssTransforms: true,
+    });
+    const availableSize = size
+        ? (orientation === 'vertical' ? size.width : size.height) -
+            SplitterHandle_1.SPLITTER_HANDLE_SIZE
+        : null;
+    const effectiveFlexValue = (0, SplitterContext_1.getClampedSplitterFlex)({
+        availableSize,
+        flexValue,
+        maxAntiFlexerSize,
+        maxFlex,
+        maxFlexerSize,
+        minFlex,
+        minFlexerSize,
+    });
     const value = (0, react_1.useMemo)(() => {
         return {
-            flexValue,
+            flexValue: effectiveFlexValue,
             ref,
             setFlexValue,
             isDragging,
@@ -35,16 +53,18 @@ const SplitterContainer = ({ orientation, children, defaultFlex, maxFlex, minFle
             maxFlex,
             minFlex,
             maxFlexerSize,
+            minFlexerSize,
             maxAntiFlexerSize,
             defaultFlex,
             persistFlex,
         };
     }, [
         defaultFlex,
-        flexValue,
+        effectiveFlexValue,
         id,
         maxFlex,
         maxFlexerSize,
+        minFlexerSize,
         maxAntiFlexerSize,
         minFlex,
         orientation,

package/dist/components/Splitter/SplitterContext.d.ts

@@ -12,6 +12,7 @@ export type TSplitterContext = {
     maxFlex: number;
     minFlex: number;
     maxFlexerSize: number | null;
+    minFlexerSize: number | null;
     maxAntiFlexerSize: number | null;
     defaultFlex: number;
     id: string;
@@ -21,4 +22,17 @@ export type TSplitterContext = {
         y: number;
     }>;
 };
+type SplitterFlexBounds = Pick<TSplitterContext, 'maxAntiFlexerSize' | 'maxFlex' | 'maxFlexerSize' | 'minFlex' | 'minFlexerSize'> & {
+    readonly availableSize: number | null;
+};
+export declare const getSplitterFlexBounds: ({ availableSize, maxAntiFlexerSize, maxFlex, maxFlexerSize, minFlex, minFlexerSize, }: SplitterFlexBounds) => {
+    minFlex: number;
+    maxFlex: number;
+};
+export declare const getClampedSplitterFlex: ({ flexValue, ...bounds }: Pick<TSplitterContext, "maxAntiFlexerSize" | "maxFlex" | "maxFlexerSize" | "minFlex" | "minFlexerSize"> & {
+    readonly availableSize: number | null;
+} & {
+    readonly flexValue: number;
+}) => number;
 export declare const SplitterContext: React.Context<TSplitterContext>;
+export {};

package/dist/components/Splitter/SplitterContext.js

@@ -3,8 +3,22 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SplitterContext = void 0;
+exports.SplitterContext = exports.getClampedSplitterFlex = exports.getSplitterFlexBounds = void 0;
 const react_1 = __importDefault(require("react"));
+const getSplitterFlexBounds = ({ availableSize, maxAntiFlexerSize, maxFlex, maxFlexerSize, minFlex, minFlexerSize, }) => {
+    if (availableSize === null || availableSize <= 0) {
+        return { minFlex, maxFlex };
+    }
+    const minimum = Math.min(1, Math.max(minFlex, minFlexerSize === null ? 0 : minFlexerSize / availableSize, maxAntiFlexerSize === null ? 0 : 1 - maxAntiFlexerSize / availableSize));
+    const maximum = Math.max(minimum, Math.min(maxFlex, maxFlexerSize === null ? 1 : maxFlexerSize / availableSize));
+    return { minFlex: minimum, maxFlex: maximum };
+};
+exports.getSplitterFlexBounds = getSplitterFlexBounds;
+const getClampedSplitterFlex = ({ flexValue, ...bounds }) => {
+    const { minFlex, maxFlex } = (0, exports.getSplitterFlexBounds)(bounds);
+    return Math.min(maxFlex, Math.max(minFlex, flexValue));
+};
+exports.getClampedSplitterFlex = getClampedSplitterFlex;
 exports.SplitterContext = react_1.default.createContext({
     flexValue: 1,
     ref: { current: null },
@@ -14,6 +28,7 @@ exports.SplitterContext = react_1.default.createContext({
     maxFlex: 1,
     minFlex: 1,
     maxFlexerSize: null,
+    minFlexerSize: null,
     maxAntiFlexerSize: null,
     defaultFlex: 1,
     id: '--',

package/dist/components/Splitter/SplitterHandle.js

@@ -49,12 +49,14 @@ const SplitterHandle = ({ allowToCollapse, onCollapse }) => {
             const availableSize = (dragContext.orientation === 'vertical'
                 ? containerWidth
                 : containerHeight) - exports.SPLITTER_HANDLE_SIZE;
-            const minFlex = dragContext.maxAntiFlexerSize === null || availableSize <= 0
-                ? dragContext.minFlex
-                : Math.max(dragContext.minFlex, 1 - dragContext.maxAntiFlexerSize / availableSize);
-            const maxFlex = dragContext.maxFlexerSize === null || availableSize <= 0
-                ? dragContext.maxFlex
-                : Math.min(dragContext.maxFlex, dragContext.maxFlexerSize / availableSize);
+            const { minFlex, maxFlex } = (0, SplitterContext_1.getSplitterFlexBounds)({
+                availableSize,
+                maxAntiFlexerSize: dragContext.maxAntiFlexerSize,
+                maxFlex: dragContext.maxFlex,
+                maxFlexerSize: dragContext.maxFlexerSize,
+                minFlex: dragContext.minFlex,
+                minFlexerSize: dragContext.minFlexerSize,
+            });
             const startFlex = Math.min(maxFlex, Math.max(minFlex, dragContext.flexValue));
             dragContext.isDragging.current = start;
             (0, ForceSpecificCursor_1.forceSpecificCursor)(dragContext.orientation === 'horizontal' ? 'row-resize' : 'col-resize');

package/dist/components/Timeline/Timeline.js

@@ -75,6 +75,7 @@ const TimelineTracks_1 = require("./TimelineTracks");
 const TimelineWidthProvider_1 = require("./TimelineWidthProvider");
 const use_resolved_stack_1 = require("./use-resolved-stack");
 const use_timeline_asset_drop_1 = require("./use-timeline-asset-drop");
+const MIN_TIMELINE_LABELS_WIDTH = 240;
 const container = {
     minHeight: '100%',
     flex: 1,
@@ -267,7 +268,7 @@ const TimelineInner = () => {
                 }
                 return (jsx_runtime_1.jsx(SubscribeToNodePaths_1.SubscribeToNodePaths, { overrideId: sequence.controls.overrideId, componentIdentity: sequence.controls.componentIdentity, schema: sequence.controls.schema, getStack: sequence.getStack, effects: sequence.effects }, sequence.id));
             }), (0, interactivity_enabled_1.isStudioInteractivityEnabled)() ? jsx_runtime_1.jsx(SequencePropsObserver_1.SequencePropsObserver, {}) : null, jsx_runtime_1.jsx(TimelineKeyframeTracksContext_1.TimelineKeyframeTracksProvider, { tracks: filtered, children: jsx_runtime_1.jsxs(TimelineSelection_1.TimelineSelectableItemsProvider, { timeline: shown, children: [(0, interactivity_enabled_1.isStudioInteractivityEnabled)() ? (jsx_runtime_1.jsx(TimelineSelection_1.TimelineSelectAllKeybindings, { timeline: shown })) : null, jsx_runtime_1.jsx(TimelineHeightContainer_1.TimelineHeightContainer, { shown: shown, hasBeenCut: hasBeenCut, children: isStill ? (jsx_runtime_1.jsx(TimelineList_1.TimelineList, { timeline: shown })) : (jsx_runtime_1.jsxs(TimelineWidthProvider_1.TimelineWidthProvider, { children: [
-                                    jsx_runtime_1.jsx(TimelinePinchZoom_1.TimelinePinchZoom, {}), jsx_runtime_1.jsxs(SplitterContainer_1.SplitterContainer, { orientation: "vertical", defaultFlex: 0.2, id: "names-to-timeline", maxFlex: 0.5, minFlex: 0.15, maxFlexerSize: null, maxAntiFlexerSize: null, children: [
+                                    jsx_runtime_1.jsx(TimelinePinchZoom_1.TimelinePinchZoom, {}), jsx_runtime_1.jsxs(SplitterContainer_1.SplitterContainer, { orientation: "vertical", defaultFlex: 0.2, id: "names-to-timeline", maxFlex: 0.5, minFlex: 0.15, maxFlexerSize: null, minFlexerSize: MIN_TIMELINE_LABELS_WIDTH, maxAntiFlexerSize: null, children: [
                                             jsx_runtime_1.jsx(SplitterElement_1.SplitterElement, { type: "flexer", sticky: jsx_runtime_1.jsx(TimelineTimeIndicators_1.TimelineTimePlaceholders, {}), children: jsx_runtime_1.jsx(TimelineList_1.TimelineList, { timeline: shown }) }), jsx_runtime_1.jsx(SplitterHandle_1.SplitterHandle, { onCollapse: noop, allowToCollapse: "none" }), jsx_runtime_1.jsx(SplitterElement_1.SplitterElement, { type: "anti-flexer", sticky: null, children: jsx_runtime_1.jsxs(TimelineScrollable_1.TimelineScrollable, { children: [
                                                         jsx_runtime_1.jsx(TimelineTracks_1.TimelineTracks, { timeline: shown, hasBeenCut: hasBeenCut }), jsx_runtime_1.jsx(TimelinePlayCursorSyncer_1.TimelinePlayCursorSyncer, {}), jsx_runtime_1.jsx(TimelineInOutPointer_1.TimelineInOutPointer, {}), jsx_runtime_1.jsx(TimelineTimeIndicators_1.TimelineTimeIndicators, {}), jsx_runtime_1.jsx(TimelineDragHandler_1.TimelineDragHandler, {}), (0, interactivity_enabled_1.isStudioInteractivityEnabled)() ? (jsx_runtime_1.jsx(TimelineInOutDragHandler_1.TimelineInOutDragHandler, {})) : null, jsx_runtime_1.jsx(TimelineSlider_1.TimelineSlider, {})
                                                     ] }) })

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

@@ -1,5 +1,5 @@
 import React from 'react';
-import type { CanUpdateSequencePropStatusStatic } from 'remotion';
+import { type CanUpdateSequencePropStatusStatic } from 'remotion';
 import type { SchemaFieldInfo, TimelineFieldOnDragValueChange, TimelineFieldOnSave } from '../../helpers/timeline-layout';
 import { type InspectorInlineActionProps } from '../InspectorPanel/common';
 export type InspectorSourceAction = Omit<InspectorInlineActionProps, 'variant'>;