@remotion/studio 4.0.512 → 4.0.514

package/dist/components/FixComputedValueModal.js

@@ -0,0 +1,217 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FixComputedValueModal = void 0;
+const jsx_runtime_1 = require("react/jsx-runtime");
+const react_1 = __importStar(require("react"));
+const colors_1 = require("../helpers/colors");
+const copy_text_1 = require("../helpers/copy-text");
+const open_in_editor_1 = require("../helpers/open-in-editor");
+const caret_1 = require("../icons/caret");
+const clipboard_1 = require("../icons/clipboard");
+const z_index_1 = require("../state/z-index");
+const CodingAgentIcon_1 = require("./CodingAgentIcon");
+const InlineAction_1 = require("./InlineAction");
+const InlineDropdown_1 = require("./InlineDropdown");
+const ModalFooter_1 = require("./ModalFooter");
+const ModalHeader_1 = require("./ModalHeader");
+const DismissableModal_1 = require("./NewComposition/DismissableModal");
+const NotificationCenter_1 = require("./Notifications/NotificationCenter");
+const SettingsContext_1 = require("./SettingsContext");
+const panelStyle = {
+    borderRadius: 6,
+    overflow: 'hidden',
+};
+const container = {
+    padding: '12px 16px 18px',
+};
+const text = {
+    color: colors_1.LIGHT_TEXT,
+    fontFamily: 'sans-serif',
+    fontSize: 14,
+    lineHeight: 1.5,
+};
+const commandField = {
+    alignItems: 'center',
+    background: colors_1.SELECTED_BACKGROUND,
+    borderRadius: 6,
+    boxSizing: 'border-box',
+    display: 'flex',
+    marginTop: 10,
+    padding: '8px 8px 8px 10px',
+    width: '100%',
+};
+const code = {
+    color: colors_1.WHITE,
+    flex: 1,
+    fontFamily: 'monospace',
+    fontSize: 14,
+    lineHeight: 1.5,
+    margin: 0,
+    minWidth: 0,
+    overflowX: 'auto',
+    whiteSpace: 'pre-wrap',
+};
+const copyIcon = {
+    flexShrink: 0,
+    height: 12,
+    width: 12,
+};
+const footer = {
+    display: 'flex',
+    flex: 'none',
+    justifyContent: 'flex-end',
+};
+const splitButton = {
+    alignItems: 'center',
+    borderRadius: 4,
+    display: 'inline-flex',
+    flexDirection: 'row',
+    gap: 1,
+    height: 24,
+    overflow: 'hidden',
+};
+const mainButtonBase = {
+    alignItems: 'center',
+    background: colors_1.TRANSPARENT,
+    border: 'none',
+    borderRadius: '4px 0 0 4px',
+    color: colors_1.LIGHT_TEXT,
+    display: 'inline-flex',
+    fontFamily: 'sans-serif',
+    fontSize: 12,
+    gap: 6,
+    height: 24,
+    padding: '0 9px',
+    whiteSpace: 'nowrap',
+};
+const singleButton = {
+    borderRadius: 4,
+};
+const dropdownButton = {
+    borderRadius: '0 4px 4px 0',
+    height: 24,
+    width: 24,
+};
+const menuLabel = {
+    color: 'inherit',
+    fontFamily: 'sans-serif',
+    fontSize: 13,
+    lineHeight: '16px',
+};
+const FixComputedValueModal = ({ state }) => {
+    var _a, _b;
+    const { codingAgentInfo } = (0, SettingsContext_1.useSettings)();
+    const { tabIndex } = (0, z_index_1.useZIndex)();
+    const [hovered, setHovered] = react_1.default.useState(false);
+    const prompt = `/remotion-interactivity ${state.context} make "${state.prop}" interactive`;
+    const installCommand = 'npx remotion skills add';
+    const installedCodingAgents = (_a = codingAgentInfo === null || codingAgentInfo === void 0 ? void 0 : codingAgentInfo.installedCodingAgents) !== null && _a !== void 0 ? _a : [];
+    const defaultCodingAgent = (_b = installedCodingAgents.find((agent) => agent.id === (codingAgentInfo === null || codingAgentInfo === void 0 ? void 0 : codingAgentInfo.defaultCodingAgent))) !== null && _b !== void 0 ? _b : installedCodingAgents[0];
+    const alternativeCodingAgents = installedCodingAgents.filter((agent) => agent.id !== (defaultCodingAgent === null || defaultCodingAgent === void 0 ? void 0 : defaultCodingAgent.id));
+    const onCopyPrompt = (0, react_1.useCallback)(() => {
+        (0, copy_text_1.copyText)(prompt).catch((err) => {
+            (0, NotificationCenter_1.showNotification)(`Could not copy: ${err.message}`, 2000);
+        });
+    }, [prompt]);
+    const onCopyInstallCommand = (0, react_1.useCallback)(() => {
+        (0, copy_text_1.copyText)(installCommand).catch((err) => {
+            (0, NotificationCenter_1.showNotification)(`Could not copy: ${err.message}`, 2000);
+        });
+    }, [installCommand]);
+    const renderCopyAction = (0, react_1.useCallback)((color) => {
+        return jsx_runtime_1.jsx(clipboard_1.ClipboardIcon, { color: color, style: copyIcon });
+    }, []);
+    const openWithCodingAgent = (0, react_1.useCallback)(async (codingAgentId, codingAgentName) => {
+        try {
+            const response = await (0, open_in_editor_1.openInCodingAgent)(codingAgentId, codingAgentId === 'copilot' ? null : prompt);
+            if (!response.success) {
+                (0, NotificationCenter_1.showNotification)(`Could not open ${codingAgentName}`, 2000);
+            }
+        }
+        catch (err) {
+            (0, NotificationCenter_1.showNotification)(err.message, 2000);
+        }
+    }, [prompt]);
+    const agentMenuItems = react_1.default.useMemo(() => {
+        return alternativeCodingAgents.map((codingAgent) => ({
+            id: `fix-computed-value-in-${codingAgent.id}`,
+            keyHint: null,
+            label: jsx_runtime_1.jsx("span", { style: menuLabel, children: codingAgent.name }),
+            leftItem: jsx_runtime_1.jsx(CodingAgentIcon_1.CodingAgentIcon, { codingAgentId: codingAgent.id, size: 18 }),
+            onClick: () => {
+                openWithCodingAgent(codingAgent.id, codingAgent.nameWithType).catch(() => undefined);
+            },
+            quickSwitcherLabel: null,
+            subMenu: null,
+            type: 'item',
+            value: `coding-agent-${codingAgent.id}`,
+        }));
+    }, [alternativeCodingAgents, openWithCodingAgent]);
+    const renderDropdownAction = (0, react_1.useCallback)((color) => {
+        return jsx_runtime_1.jsx(caret_1.CaretDown, { color: color, small: true });
+    }, []);
+    const mainButtonStyle = react_1.default.useMemo(() => {
+        return {
+            ...mainButtonBase,
+            ...(alternativeCodingAgents.length === 0 ? singleButton : null),
+            background: (0, colors_1.getBackgroundFromHoverState)({
+                hovered,
+                selected: false,
+            }),
+            color: hovered ? colors_1.WHITE : colors_1.LIGHT_TEXT,
+        };
+    }, [alternativeCodingAgents.length, hovered]);
+    return (jsx_runtime_1.jsxs(DismissableModal_1.DismissableModal, { panelStyle: panelStyle, children: [
+            jsx_runtime_1.jsx(ModalHeader_1.ModalHeader, { title: "Fix computed value" }), jsx_runtime_1.jsxs("div", { style: container, children: [state.remotionInteractivitySkillAvailable ? null : (jsx_runtime_1.jsxs(jsx_runtime_1.Fragment, { children: [
+                            jsx_runtime_1.jsx("div", { style: text, children: "First, install the Remotion Agent Skills:" }), jsx_runtime_1.jsxs("div", { style: commandField, children: [
+                                    jsx_runtime_1.jsx("pre", { style: code, children: installCommand }), jsx_runtime_1.jsx(InlineAction_1.InlineAction, { variant: null, onClick: onCopyInstallCommand, renderAction: renderCopyAction, title: "Copy command" })
+                                ] })
+                        ] })), jsx_runtime_1.jsx("div", { style: {
+                            ...text,
+                            marginTop: state.remotionInteractivitySkillAvailable ? 0 : 16,
+                        }, children: state.remotionInteractivitySkillAvailable
+                            ? 'Paste this prompt into your coding agent to make this value editable in Studio:'
+                            : 'Then, paste this prompt into your coding agent:' }), jsx_runtime_1.jsxs("div", { style: commandField, children: [
+                            jsx_runtime_1.jsx("pre", { style: code, children: prompt }), jsx_runtime_1.jsx(InlineAction_1.InlineAction, { variant: null, onClick: onCopyPrompt, renderAction: renderCopyAction, title: "Copy prompt" })
+                        ] })
+                ] }), defaultCodingAgent ? (jsx_runtime_1.jsx(ModalFooter_1.ModalFooterContainer, { style: footer, children: jsx_runtime_1.jsxs("div", { style: splitButton, onPointerEnter: () => setHovered(true), onPointerLeave: () => setHovered(false), children: [
+                        jsx_runtime_1.jsxs("button", { "aria-label": `Open in ${defaultCodingAgent.nameWithType}`, onClick: () => {
+                                openWithCodingAgent(defaultCodingAgent.id, defaultCodingAgent.nameWithType).catch(() => undefined);
+                            }, style: mainButtonStyle, tabIndex: tabIndex, title: `Open in ${defaultCodingAgent.nameWithType}`, type: "button", children: [
+                                jsx_runtime_1.jsx(CodingAgentIcon_1.CodingAgentIcon, { codingAgentId: defaultCodingAgent.id, size: 18 }),
+                                "Open in ", defaultCodingAgent.name] }), alternativeCodingAgents.length > 0 ? (jsx_runtime_1.jsx(InlineDropdown_1.InlineDropdown, { renderAction: renderDropdownAction, style: dropdownButton, title: "Open in another coding agent", values: agentMenuItems, variant: null })) : null] }) })) : null] }));
+};
+exports.FixComputedValueModal = FixComputedValueModal;

package/dist/components/InitialCompositionLoader.js

@@ -6,6 +6,7 @@ const remotion_1 = require("remotion");
 const create_folder_tree_1 = require("../helpers/create-folder-tree");
 const persist_open_folders_1 = require("../helpers/persist-open-folders");
 const url_state_1 = require("../helpers/url-state");
+const composition_list_1 = require("../state/composition-list");
 const folders_1 = require("../state/folders");
 const ExplorerPanelRef_1 = require("./ExplorerPanelRef");
 const load_canvas_content_from_url_1 = require("./load-canvas-content-from-url");
@@ -45,11 +46,16 @@ exports.useSelectComposition = useSelectComposition;
 const InitialCompositionLoader = () => {
     const { compositions, canvasContent } = (0, react_1.useContext)(remotion_1.Internals.CompositionManager);
     const { setCanvasContent } = (0, react_1.useContext)(remotion_1.Internals.CompositionSetters);
+    const { setCompositionListState } = (0, react_1.useContext)(composition_list_1.CompositionListContext);
     const selectComposition = (0, exports.useSelectComposition)();
     const selectAsset = (0, use_select_asset_1.useSelectAsset)();
     const staticFiles = (0, use_static_files_1.useStaticFiles)();
     (0, react_1.useEffect)(() => {
+        var _a;
         const canvasContentFromUrl = (0, load_canvas_content_from_url_1.deriveCanvasContentFromUrl)();
+        const seenCompositionIds = (_a = window.remotion_seenCompositionIds) !== null && _a !== void 0 ? _a : [];
+        const compositionListIsReady = composition_list_1.compositionListRenderedRef.current &&
+            seenCompositionIds.every((id) => compositions.some((composition) => composition.id === id));
         if (canvasContent) {
             // If the URL points to a different composition than the one currently
             // displayed, switch to it. This handles the case where the URL is
@@ -63,13 +69,19 @@ const InitialCompositionLoader = () => {
                     selectComposition(exists, false);
                 }
             }
+            setCompositionListState('ready');
             return;
         }
         if (canvasContentFromUrl && canvasContentFromUrl.type === 'composition') {
+            if (!compositionListIsReady) {
+                return;
+            }
             const exists = compositions.find((c) => c.id === canvasContentFromUrl.compositionId);
             if (exists) {
                 selectComposition(exists, false);
+                return;
             }
+            setCompositionListState('ready');
             return;
         }
         if (canvasContentFromUrl && canvasContentFromUrl.type === 'asset') {
@@ -80,14 +92,21 @@ const InitialCompositionLoader = () => {
             setCanvasContent(canvasContentFromUrl);
             return;
         }
+        if (!compositionListIsReady) {
+            return;
+        }
         if (compositions.length > 0) {
             selectComposition(compositions[0], true);
         }
+        else {
+            setCompositionListState('ready');
+        }
     }, [
         compositions,
         canvasContent,
         selectComposition,
         setCanvasContent,
+        setCompositionListState,
         selectAsset,
     ]);
     (0, react_1.useEffect)(() => {

package/dist/components/InlineDropdown.js

@@ -31,11 +31,11 @@ const InlineDropdown = ({ values, getItems, onOpenChange, unhoveredColor, ...pro
     });
     const isMobileLayout = (0, mobile_layout_1.useMobileLayout)();
     const onClick = (0, react_1.useCallback)((e) => {
-        var _a;
+        var _a, _b;
         e.preventDefault();
         e.stopPropagation();
-        const invocationValues = (_a = getItems === null || getItems === void 0 ? void 0 : getItems()) !== null && _a !== void 0 ? _a : null;
-        if ((invocationValues === null || invocationValues === void 0 ? void 0 : invocationValues.length) === 0) {
+        const invocationValues = (_b = (_a = getItems === null || getItems === void 0 ? void 0 : getItems()) !== null && _a !== void 0 ? _a : values) !== null && _b !== void 0 ? _b : [];
+        if (invocationValues.length === 0) {
             return;
         }
         setOpened({
@@ -45,7 +45,7 @@ const InlineDropdown = ({ values, getItems, onOpenChange, unhoveredColor, ...pro
             values: invocationValues,
         });
         onOpenChange === null || onOpenChange === void 0 ? void 0 : onOpenChange(true);
-    }, [getItems, onOpenChange]);
+    }, [getItems, onOpenChange, values]);
     const spaceToBottom = (0, react_1.useMemo)(() => {
         if (size && opened.type === 'open') {
             return size.windowSize.height - opened.top;

package/dist/components/InspectorInfoHeader.js

@@ -49,10 +49,10 @@ const inspectorSubtitle = {
     boxSizing: 'border-box',
     fontFamily: 'sans-serif',
     fontSize: 13,
-    height: 28,
-    lineHeight: '18px',
+    height: 20,
+    lineHeight: '20px',
     margin: '0 4px',
-    padding: '5px 8px',
+    padding: '0 8px',
     width: 'calc(100% - 8px)',
 };
 const InspectorInfoHeader = ({ children, contentSized = false, minHeight, padding }) => {

package/dist/components/InspectorOpenInEditor.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.InspectorOpenInEditor = void 0;
 const jsx_runtime_1 = require("react/jsx-runtime");
 const react_1 = require("react");
+const browser_studio_operations_1 = require("../helpers/browser-studio-operations");
 const client_id_1 = require("../helpers/client-id");
 const colors_1 = require("../helpers/colors");
 const open_in_editor_1 = require("../helpers/open-in-editor");
@@ -42,16 +43,14 @@ const mainButtonBase = {
 };
 const editorButtonIconSize = 18;
 const InspectorOpenInEditor = ({ contextForAgents = null, label, location, locationType }) => {
-    var _a, _b;
     const { previewServerState } = (0, react_1.useContext)(client_id_1.StudioServerConnectionCtx);
     const { setSelectedModal } = (0, react_1.useContext)(modals_1.SetSelectedModalContext);
     const { tabIndex } = (0, z_index_1.useZIndex)();
     const [hovered, setHovered] = (0, react_1.useState)(false);
     const [dropdownOpened, setDropdownOpened] = (0, react_1.useState)(false);
     const ignorePointerEnter = (0, react_1.useRef)(false);
-    const editorPickerAvailable = (0, use_default_editor_info_1.canUseEditorPicker)(previewServerState.type === 'connected');
-    const editorInfo = (0, use_default_editor_info_1.useDefaultEditorInfo)(editorPickerAvailable);
-    const codingAgentInfo = (0, use_default_editor_info_1.useDefaultCodingAgentInfo)(editorPickerAvailable);
+    const { canConfigureApps, canOpenInEditor, defaultEditorId, defaultEditorName, editorInfo, } = (0, use_default_editor_info_1.useEditorOpening)(previewServerState.type === 'connected');
+    const codingAgentInfo = (0, use_default_editor_info_1.useDefaultCodingAgentInfo)(canConfigureApps);
     const openWithEditor = (0, react_1.useCallback)(async (editorId) => {
         if (!location) {
             return;
@@ -63,8 +62,6 @@ const InspectorOpenInEditor = ({ contextForAgents = null, label, location, locat
             (0, NotificationCenter_1.showNotification)(err.message, 2000);
         }
     }, [location]);
-    const preferredEditorId = (0, use_default_editor_info_1.getPreferredEditorId)(editorInfo);
-    const preferredEditor = editorInfo === null || editorInfo === void 0 ? void 0 : editorInfo.installedEditors.find((editor) => editor.id === preferredEditorId);
     const openWithCodingAgent = (0, react_1.useCallback)(async (codingAgentId, codingAgentName) => {
         try {
             const response = await (0, open_in_editor_1.openInCodingAgent)(codingAgentId, codingAgentId === 'copilot' ? null : contextForAgents);
@@ -76,13 +73,14 @@ const InspectorOpenInEditor = ({ contextForAgents = null, label, location, locat
             (0, NotificationCenter_1.showNotification)(err.message, 2000);
         }
     }, [contextForAgents]);
-    const editorName = (_b = (_a = window.remotion_editorName) !== null && _a !== void 0 ? _a : preferredEditor === null || preferredEditor === void 0 ? void 0 : preferredEditor.nameWithType) !== null && _b !== void 0 ? _b : 'default editor';
-    const canOpenDefault = location !== null &&
-        (window.remotion_editorName !== null || preferredEditorId !== null);
+    const editorName = defaultEditorName !== null && defaultEditorName !== void 0 ? defaultEditorName : 'default editor';
+    const canOpenDefault = location !== null && canOpenInEditor;
     const onOpenDefault = (0, react_1.useCallback)((event) => {
         event.stopPropagation();
-        openWithEditor(window.remotion_editorName === null ? preferredEditorId : null).catch(() => undefined);
-    }, [openWithEditor, preferredEditorId]);
+        if (defaultEditorId) {
+            openWithEditor(defaultEditorId).catch(() => undefined);
+        }
+    }, [defaultEditorId, openWithEditor]);
     const onDropdownOpenChange = (0, react_1.useCallback)((open) => {
         setDropdownOpened(open);
         if (!open) {
@@ -123,19 +121,21 @@ const InspectorOpenInEditor = ({ contextForAgents = null, label, location, locat
             editorDisabled: location === null,
             editorInfo,
             excludeCodingAgentId: null,
-            excludeEditorId: preferredEditorId,
+            excludeEditorId: defaultEditorId,
             fileManagerDisabled: !(location === null || location === void 0 ? void 0 : location.source),
             folder: locationType === 'folder',
             location,
-            onConfigureApps: () => {
-                var _a;
-                var _b;
-                setSelectedModal({
-                    type: 'settings',
-                    initialTab: 'apps',
-                    initialPublicLicenseKey: (_b = (_a = window.remotion_renderDefaults) === null || _a === void 0 ? void 0 : _a.publicLicenseKey) !== null && _b !== void 0 ? _b : null,
-                });
-            },
+            onConfigureApps: canConfigureApps
+                ? () => {
+                    var _a;
+                    var _b;
+                    setSelectedModal({
+                        type: 'settings',
+                        initialTab: 'apps',
+                        initialPublicLicenseKey: (_b = (_a = window.remotion_renderDefaults) === null || _a === void 0 ? void 0 : _a.publicLicenseKey) !== null && _b !== void 0 ? _b : null,
+                    });
+                }
+                : null,
             onOpenInCodingAgent: (codingAgentId, codingAgentName) => {
                 openWithCodingAgent(codingAgentId, codingAgentName).catch(() => undefined);
             },
@@ -178,15 +178,17 @@ const InspectorOpenInEditor = ({ contextForAgents = null, label, location, locat
         });
     }, [
         codingAgentInfo,
+        canConfigureApps,
+        defaultEditorId,
         editorInfo,
         location,
         locationType,
         openWithCodingAgent,
         openWithEditor,
-        preferredEditorId,
         setSelectedModal,
     ]);
-    if (!editorPickerAvailable) {
+    if (previewServerState.type !== 'connected' ||
+        (0, browser_studio_operations_1.getBrowserStudioOperations)() !== null) {
         return null;
     }
     return (jsx_runtime_1.jsxs("div", { style: splitButton, onPointerEnter: () => {
@@ -197,7 +199,7 @@ const InspectorOpenInEditor = ({ contextForAgents = null, label, location, locat
             ignorePointerEnter.current = false;
             setHovered(false);
         }, children: [
-            jsx_runtime_1.jsxs("button", { "aria-label": `Open in ${editorName}`, disabled: !canOpenDefault, onClick: onOpenDefault, style: mainButtonStyle, tabIndex: tabIndex, title: `Open in ${editorName}`, type: "button", children: [label, jsx_runtime_1.jsx(editor_1.EditorIcon, { editorId: preferredEditorId, size: editorButtonIconSize })
+            jsx_runtime_1.jsxs("button", { "aria-label": `Open in ${editorName}`, disabled: !canOpenDefault, onClick: onOpenDefault, style: mainButtonStyle, tabIndex: tabIndex, title: `Open in ${editorName}`, type: "button", children: [label, jsx_runtime_1.jsx(editor_1.EditorIcon, { editorId: defaultEditorId, size: editorButtonIconSize })
                 ] }), jsx_runtime_1.jsx(InlineDropdown_1.InlineDropdown, { onOpenChange: onDropdownOpenChange, renderAction: renderDropdownAction, style: dropdownStyle, title: "Open in another app", unhoveredColor: dropdownForegroundColor, values: menuItems, variant: "compact" })
         ] }));
 };

package/dist/components/InspectorPanel/AlignmentControls.js

@@ -18,6 +18,7 @@ const InspectorPanelLayout_1 = require("../InspectorPanelLayout");
 const selected_outline_drag_1 = require("../selected-outline-drag");
 const selected_outline_types_1 = require("../selected-outline-types");
 const call_add_keyframe_1 = require("../Timeline/call-add-keyframe");
+const get_timeline_keyframes_1 = require("../Timeline/get-timeline-keyframes");
 const save_sequence_prop_1 = require("../Timeline/save-sequence-prop");
 const timeline_translate_utils_1 = require("../Timeline/timeline-translate-utils");
 const alignment_controls_1 = require("./alignment-controls");
@@ -77,7 +78,12 @@ const AlignmentControls = ({ track }) => {
         }
         const nodePath = track.nodePathInfo.sequenceSubscriptionKey;
         const nodePropStatuses = remotion_1.Internals.getPropStatusesCtx(propStatuses, nodePath);
-        const sourceFrame = timelinePosition - track.keyframeDisplayOffset;
+        const firstKeyframedStatus = Object.values(nodePropStatuses !== null && nodePropStatuses !== void 0 ? nodePropStatuses : {}).find((status) => status.status === 'keyframed');
+        const sourceFrame = timelinePosition -
+            (0, get_timeline_keyframes_1.getKeyframeDisplayOffset)({
+                propStatus: firstKeyframedStatus,
+                keyframeDisplayOffset: track.keyframeDisplayOffset,
+            });
         const dragOverrides = (_b = getDragOverrides(nodePath)) !== null && _b !== void 0 ? _b : {};
         const activeSchema = (0, selected_outline_drag_1.getSelectedOutlineActiveSchema)({
             schema: track.sequence.controls.schema,
@@ -191,7 +197,12 @@ const AlignmentControls = ({ track }) => {
     }
     const renderNodePath = track.nodePathInfo.sequenceSubscriptionKey;
     const renderNodePropStatuses = remotion_1.Internals.getPropStatusesCtx(propStatuses, renderNodePath);
-    const renderSourceFrame = timelinePosition - track.keyframeDisplayOffset;
+    const firstRenderKeyframedStatus = Object.values(renderNodePropStatuses !== null && renderNodePropStatuses !== void 0 ? renderNodePropStatuses : {}).find((status) => status.status === 'keyframed');
+    const renderSourceFrame = timelinePosition -
+        (0, get_timeline_keyframes_1.getKeyframeDisplayOffset)({
+            propStatus: firstRenderKeyframedStatus,
+            keyframeDisplayOffset: track.keyframeDisplayOffset,
+        });
     const renderDragOverrides = (_a = getDragOverrides(renderNodePath)) !== null && _a !== void 0 ? _a : {};
     const renderActiveSchema = (0, selected_outline_drag_1.getSelectedOutlineActiveSchema)({
         schema: track.sequence.controls.schema,

package/dist/components/InspectorPanel/CompositionInspector.js

@@ -4,6 +4,7 @@ exports.CompositionInspector = void 0;
 const jsx_runtime_1 = require("react/jsx-runtime");
 const react_1 = require("react");
 const client_id_1 = require("../../helpers/client-id");
+const colors_1 = require("../../helpers/colors");
 const interactivity_enabled_1 = require("../../helpers/interactivity-enabled");
 const browse_elements_1 = require("../../icons/browse-elements");
 const frame_1 = require("../../icons/frame");
@@ -38,6 +39,13 @@ const browseElementsIconContainerStyle = {
     marginRight: -2,
     width: 22,
 };
+const browseElementsArrowStyle = {
+    display: 'inline-block',
+    height: 12,
+    marginLeft: 4,
+    verticalAlign: -2,
+    width: 12,
+};
 const CompositionActions = ({ readOnlyStudio }) => {
     const { canInsertAsset, canInsertComposition, canInsertSolid, canShowInsertAsset, canShowInsertComposition, canShowInsertSolid, insertAsset, insertComposition, insertSolid, } = (0, use_composition_actions_1.useCompositionActions)();
     const openElementsLibrary = (0, react_1.useCallback)(() => {
@@ -47,7 +55,9 @@ const CompositionActions = ({ readOnlyStudio }) => {
         (!canShowInsertAsset && !canShowInsertComposition && !canShowInsertSolid)) {
         return null;
     }
-    return (jsx_runtime_1.jsxs(common_1.InspectorActionSection, { children: [canShowInsertSolid ? (jsx_runtime_1.jsx(common_1.InspectorInlineAction, { disabled: !canInsertSolid, onClick: insertSolid, renderIcon: (color) => (jsx_runtime_1.jsx(solid_1.SolidIcon, { color: color, style: actionIconStyle })), children: "Add Solid" })) : null, canShowInsertAsset ? (jsx_runtime_1.jsx(common_1.InspectorInlineAction, { disabled: !canInsertAsset, onClick: insertAsset, renderIcon: (color) => (jsx_runtime_1.jsx(frame_1.PicIcon, { color: color, style: actionIconStyle })), children: "Add asset..." })) : null, canShowInsertComposition ? (jsx_runtime_1.jsx(common_1.InspectorInlineAction, { disabled: !canInsertComposition, onClick: insertComposition, renderIcon: (color) => (jsx_runtime_1.jsx(video_1.FilmIcon, { color: color, style: actionIconStyle })), children: "Add composition..." })) : null, canShowInsertAsset ? (jsx_runtime_1.jsx(common_1.InspectorInlineAction, { disabled: false, iconContainerStyle: browseElementsIconContainerStyle, onClick: openElementsLibrary, renderIcon: (color) => (jsx_runtime_1.jsx(browse_elements_1.BrowseElementsIcon, { color: color, style: browseElementsIconStyle })), title: "Open the Remotion Elements library in a new tab. Install an Element there to send it to this composition.", children: "Browse Elements..." })) : null] }));
+    return (jsx_runtime_1.jsxs(common_1.InspectorQuickActionsSection, { children: [canShowInsertSolid ? (jsx_runtime_1.jsx(common_1.InspectorQuickAction, { disabled: !canInsertSolid, onClick: insertSolid, renderIcon: (color) => (jsx_runtime_1.jsx(solid_1.SolidIcon, { color: color, style: actionIconStyle })), children: "Add Solid" })) : null, canShowInsertAsset ? (jsx_runtime_1.jsx(common_1.InspectorQuickAction, { disabled: !canInsertAsset, onClick: insertAsset, renderIcon: (color) => (jsx_runtime_1.jsx(frame_1.PicIcon, { color: color, style: actionIconStyle })), children: "Add asset..." })) : null, canShowInsertComposition ? (jsx_runtime_1.jsx(common_1.InspectorQuickAction, { disabled: !canInsertComposition, onClick: insertComposition, renderIcon: (color) => (jsx_runtime_1.jsx(video_1.FilmIcon, { color: color, style: actionIconStyle })), children: "Add composition..." })) : null, canShowInsertAsset ? (jsx_runtime_1.jsxs(common_1.InspectorQuickAction, { disabled: false, iconContainerStyle: browseElementsIconContainerStyle, onClick: openElementsLibrary, renderIcon: (color) => (jsx_runtime_1.jsx(browse_elements_1.BrowseElementsIcon, { color: color, style: browseElementsIconStyle })), title: "Open the Remotion Elements library in a new tab. Install an Element there to send it to this composition.", children: ["Browse Elements",
+                    jsx_runtime_1.jsx("svg", { "aria-hidden": "true", viewBox: "0 0 16 16", style: browseElementsArrowStyle, children: jsx_runtime_1.jsx("path", { d: "M4 12 12 4M6 4h6v6", fill: "none", stroke: colors_1.CURRENT_COLOR, strokeLinecap: "round", strokeLinejoin: "round", strokeWidth: "1.5" }) })
+                ] })) : null] }));
 };
 const CompositionDefaultPropsSection = ({ composition, currentDefaultProps, readOnlyStudio, setDefaultProps }) => {
     var _a;

package/dist/components/InspectorPanel/CompositionInspectorHeader.js

@@ -4,6 +4,7 @@ exports.CompositionInspectorHeader = void 0;
 const jsx_runtime_1 = require("react/jsx-runtime");
 const react_1 = require("react");
 const remotion_1 = require("remotion");
+const client_id_1 = require("../../helpers/client-id");
 const is_composition_still_1 = require("../../helpers/is-composition-still");
 const open_in_editor_1 = require("../../helpers/open-in-editor");
 const react_2 = require("../../icons/react");
@@ -16,6 +17,7 @@ const InspectorSourceLocation_1 = require("../InspectorSourceLocation");
 const layout_1 = require("../layout");
 const NotificationCenter_1 = require("../Notifications/NotificationCenter");
 const use_resolved_stack_1 = require("../Timeline/use-resolved-stack");
+const use_default_editor_info_1 = require("../use-default-editor-info");
 const COMPOSITION_INSPECTOR_HEADER_HEIGHT = 66;
 const sourceLocationIconStyle = {
     flexShrink: 0,
@@ -33,6 +35,8 @@ const CompositionInspectorHeader = () => {
     var _a, _b, _c, _d, _e;
     const video = remotion_1.Internals.useVideo();
     const { compositions } = (0, react_1.useContext)(remotion_1.Internals.CompositionManager);
+    const { previewServerState } = (0, react_1.useContext)(client_id_1.StudioServerConnectionCtx);
+    const { canOpenInEditor, defaultEditorId } = (0, use_default_editor_info_1.useEditorOpening)(previewServerState.type === 'connected');
     const currentComposition = (0, react_1.useMemo)(() => {
         var _a;
         if (!video) {
@@ -69,21 +73,21 @@ const CompositionInspectorHeader = () => {
         });
     }, [compositionFile, compositionId]);
     const openFileLocation = (0, react_1.useCallback)(() => {
-        if (!validatedLocation) {
+        if (!validatedLocation || !defaultEditorId || !canOpenInEditor) {
             return;
         }
-        (0, open_in_editor_1.openOriginalPositionInEditor)(validatedLocation, null).catch((err) => {
+        (0, open_in_editor_1.openOriginalPositionInEditor)(validatedLocation, defaultEditorId).catch((err) => {
             (0, NotificationCenter_1.showNotification)(err.message, 2000);
         });
-    }, [validatedLocation]);
+    }, [canOpenInEditor, defaultEditorId, validatedLocation]);
     const openComponentLocation = (0, react_1.useCallback)(() => {
-        if (!componentLocation) {
+        if (!componentLocation || !defaultEditorId || !canOpenInEditor) {
             return;
         }
-        (0, open_in_editor_1.openOriginalPositionInEditor)(componentLocation, null).catch((err) => {
+        (0, open_in_editor_1.openOriginalPositionInEditor)(componentLocation, defaultEditorId).catch((err) => {
             (0, NotificationCenter_1.showNotification)(err.message, 2000);
         });
-    }, [componentLocation]);
+    }, [canOpenInEditor, componentLocation, defaultEditorId]);
     const renderCompositionIcon = (0, react_1.useCallback)((color) => {
         if (!video) {
             return null;
@@ -91,8 +95,8 @@ const CompositionInspectorHeader = () => {
         return (0, is_composition_still_1.isCompositionStill)(video) ? (jsx_runtime_1.jsx(still_1.StillIcon, { color: color, style: sourceLocationIconStyle })) : (jsx_runtime_1.jsx(video_1.FilmIcon, { color: color, style: sourceLocationIconStyle }));
     }, [video]);
     return (jsx_runtime_1.jsx(InspectorInfoHeader_1.InspectorInfoHeader, { minHeight: COMPOSITION_INSPECTOR_HEADER_HEIGHT, padding: "4px 0", children: video ? (jsx_runtime_1.jsxs(InspectorLocationCopy_1.InspectorLocationCopy, { location: validatedLocation, name: video.id, openInEditorLocation: componentLocation, children: [
-                jsx_runtime_1.jsx(InlineCompositionName_1.InlineCompositionName, { compositionId: video.id, stack: (_e = currentComposition === null || currentComposition === void 0 ? void 0 : currentComposition.stack) !== null && _e !== void 0 ? _e : null, compositions: compositions }, video.id), jsx_runtime_1.jsx(InspectorSourceLocation_1.InspectorSourceLocation, { location: validatedLocation, canOpen: validatedLocation !== null, onOpen: openFileLocation, renderIcon: renderCompositionIcon, size: "inline-action" }), compositionComponentInfo === null &&
+                jsx_runtime_1.jsx(InlineCompositionName_1.InlineCompositionName, { compositionId: video.id, stack: (_e = currentComposition === null || currentComposition === void 0 ? void 0 : currentComposition.stack) !== null && _e !== void 0 ? _e : null, compositions: compositions }, video.id), jsx_runtime_1.jsx(InspectorSourceLocation_1.InspectorSourceLocation, { location: validatedLocation, canOpen: validatedLocation !== null && canOpenInEditor, onOpen: openFileLocation, renderIcon: renderCompositionIcon, size: "quick-action" }), compositionComponentInfo === null &&
                     compositionFile !== null &&
-                    compositionId !== null ? (jsx_runtime_1.jsx("div", { "aria-hidden": true, style: componentLocationPlaceholder })) : (jsx_runtime_1.jsx(InspectorSourceLocation_1.InspectorSourceLocation, { location: componentLocation, canOpen: componentLocation !== null, onOpen: openComponentLocation, renderIcon: renderReactIcon, size: "inline-action" }))] })) : null }));
+                    compositionId !== null ? (jsx_runtime_1.jsx("div", { "aria-hidden": true, style: componentLocationPlaceholder })) : (jsx_runtime_1.jsx(InspectorSourceLocation_1.InspectorSourceLocation, { location: componentLocation, canOpen: componentLocation !== null && canOpenInEditor, onOpen: openComponentLocation, renderIcon: renderReactIcon, size: "quick-action" }))] })) : null }));
 };
 exports.CompositionInspectorHeader = CompositionInspectorHeader;

package/dist/components/InspectorPanel/ConnectedCompositionsSection.js

@@ -13,6 +13,7 @@ const CompositionOrStillIcon_1 = require("../CompositionOrStillIcon");
 const ContextMenu_1 = require("../ContextMenu");
 const InitialCompositionLoader_1 = require("../InitialCompositionLoader");
 const use_resolved_stack_1 = require("../Timeline/use-resolved-stack");
+const use_default_editor_info_1 = require("../use-default-editor-info");
 const common_1 = require("./common");
 const compositionIconStyle = {
     height: 18,
@@ -43,15 +44,25 @@ const ConnectedCompositionRow = ({ composition }) => {
     const { setSelectedModal } = (0, react_1.useContext)(modals_1.SetSelectedModalContext);
     const connectionStatus = (0, react_1.useContext)(client_id_1.StudioServerConnectionCtx)
         .previewServerState.type;
+    const { defaultEditorId, defaultEditorName } = (0, use_default_editor_info_1.useEditorOpening)(connectionStatus === 'connected');
     const resolvedLocation = (0, use_resolved_stack_1.useResolvedStack)(composition.stack);
     const getContextMenuItems = (0, react_1.useCallback)(() => (0, composition_menu_items_1.getCompositionContextMenuItems)({
         closeMenu: noop_1.noop,
         composition,
         connectionStatus,
+        editorId: defaultEditorId,
+        editorName: defaultEditorName,
         includeCompositionManagementItems: false,
         readOnlyStudio: window.remotion_isReadOnlyStudio,
         resolvedLocation,
         setSelectedModal,
-    }), [composition, connectionStatus, resolvedLocation, setSelectedModal]);
-    return (jsx_runtime_1.jsx(ContextMenu_1.ContextMenu, { getItems: getContextMenuItems, style: compositionContextMenuStyle, children: jsx_runtime_1.jsx(common_1.InspectorInlineAction, { disabled: false, onClick: () => selectComposition(composition, true), renderIcon: (color) => (jsx_runtime_1.jsx(CompositionOrStillIcon_1.CompositionOrStillIcon, { color: color, composition: composition, style: compositionIconStyle })), children: composition.id }) }));
+    }), [
+        composition,
+        connectionStatus,
+        defaultEditorId,
+        defaultEditorName,
+        resolvedLocation,
+        setSelectedModal,
+    ]);
+    return (jsx_runtime_1.jsx(ContextMenu_1.ContextMenu, { getItems: getContextMenuItems, style: compositionContextMenuStyle, children: jsx_runtime_1.jsx(common_1.InspectorQuickAction, { disabled: false, onClick: () => selectComposition(composition, true), renderIcon: (color) => (jsx_runtime_1.jsx(CompositionOrStillIcon_1.CompositionOrStillIcon, { color: color, composition: composition, style: compositionIconStyle })), children: composition.id }) }));
 };