@remotion/studio 4.0.442 → 4.0.443

package/dist/components/MenuBuildIndicator.js

@@ -4,8 +4,11 @@ exports.MenuBuildIndicator = void 0;
 const jsx_runtime_1 = require("react/jsx-runtime");
 const react_1 = require("react");
 const client_id_1 = require("../helpers/client-id");
+const get_git_menu_item_1 = require("../helpers/get-git-menu-item");
+const open_in_editor_1 = require("../helpers/open-in-editor");
 const layout_1 = require("./layout");
-const OpenEditorButton_1 = require("./OpenEditorButton");
+const MenuCompositionName_1 = require("./MenuCompositionName");
+const NotificationCenter_1 = require("./Notifications/NotificationCenter");
 const Spinner_1 = require("./Spinner");
 const cwd = {
     fontSize: 13,
@@ -25,10 +28,61 @@ const noSpinner = {
     position: 'relative',
     width: spinnerSize,
 };
+const projectNameLinkBase = {
+    color: 'inherit',
+    textDecoration: 'none',
+    cursor: 'pointer',
+    fontSize: 'inherit',
+    textUnderlineOffset: 2,
+};
+const projectNameLink = {
+    ...projectNameLinkBase,
+};
+const projectNameLinkHovered = {
+    ...projectNameLinkBase,
+    textDecoration: 'underline',
+};
 const MenuBuildIndicator = () => {
     const [isBuilding, setIsBuilding] = (0, react_1.useState)(false);
+    const [projectNameHovered, setProjectNameHovered] = (0, react_1.useState)(false);
     const ctx = (0, react_1.useContext)(client_id_1.StudioServerConnectionCtx).previewServerState;
-    const showButton = window.remotion_editorName && ctx.type === 'connected';
+    const showEditorLink = window.remotion_editorName && ctx.type === 'connected';
+    const showGitLink = !showEditorLink && Boolean(window.remotion_gitSource);
+    const handleProjectNameClick = (0, react_1.useCallback)(async () => {
+        if (showEditorLink) {
+            await (0, open_in_editor_1.openInEditor)({
+                originalFileName: `${window.remotion_cwd}`,
+                originalLineNumber: 1,
+                originalColumnNumber: 1,
+                originalFunctionName: null,
+                originalScriptCode: null,
+            })
+                .then((res) => res.json())
+                .then(({ success }) => {
+                if (!success) {
+                    (0, NotificationCenter_1.showNotification)(`Could not open ${window.remotion_editorName}`, 2000);
+                }
+            })
+                .catch((err) => {
+                // eslint-disable-next-line no-console
+                console.error(err);
+                (0, NotificationCenter_1.showNotification)(`Could not open ${window.remotion_editorName}`, 2000);
+            });
+        }
+        else if (showGitLink) {
+            window.open((0, get_git_menu_item_1.getGitSourceBranchUrl)(window.remotion_gitSource), '_blank');
+        }
+    }, [showEditorLink, showGitLink]);
+    const projectNameTitle = (0, react_1.useMemo)(() => {
+        if (showEditorLink) {
+            return `Open in ${window.remotion_editorName}`;
+        }
+        if (showGitLink) {
+            return `Open ${(0, get_git_menu_item_1.getGitSourceName)(window.remotion_gitSource)} Repo`;
+        }
+        return undefined;
+    }, [showEditorLink, showGitLink]);
+    const isClickable = showEditorLink || showGitLink;
     (0, react_1.useEffect)(() => {
         window.remotion_isBuilding = () => {
             setIsBuilding(true);
@@ -41,6 +95,7 @@ const MenuBuildIndicator = () => {
             window.remotion_finishedBuilding = undefined;
         };
     }, []);
-    return (jsx_runtime_1.jsxs("div", { style: cwd, title: window.remotion_cwd, children: [showButton ? jsx_runtime_1.jsx(layout_1.Spacing, { x: 2 }) : null, isBuilding ? (jsx_runtime_1.jsx("div", { style: spinner, children: jsx_runtime_1.jsx(Spinner_1.Spinner, { duration: 0.5, size: spinnerSize }) })) : (jsx_runtime_1.jsx("div", { style: noSpinner })), showButton ? jsx_runtime_1.jsx(layout_1.Spacing, { x: 0.5 }) : null, window.remotion_projectName, showButton ? jsx_runtime_1.jsx(layout_1.Spacing, { x: 0.25 }) : null, showButton ? (jsx_runtime_1.jsx(OpenEditorButton_1.OpenEditorButton, { type: "editor" })) : window.remotion_gitSource ? (jsx_runtime_1.jsx(OpenEditorButton_1.OpenEditorButton, { type: "git" })) : null] }));
+    return (jsx_runtime_1.jsxs("div", { style: cwd, title: window.remotion_cwd, children: [isClickable ? jsx_runtime_1.jsx(layout_1.Spacing, { x: 2 }) : null, isBuilding ? (jsx_runtime_1.jsx("div", { style: spinner, children: jsx_runtime_1.jsx(Spinner_1.Spinner, { duration: 0.5, size: spinnerSize }) })) : (jsx_runtime_1.jsx("div", { style: noSpinner })), isClickable ? jsx_runtime_1.jsx(layout_1.Spacing, { x: 0.5 }) : null, isClickable ? (jsx_runtime_1.jsx("a", { style: projectNameHovered ? projectNameLinkHovered : projectNameLink, title: projectNameTitle, onClick: handleProjectNameClick, onPointerEnter: () => setProjectNameHovered(true), onPointerLeave: () => setProjectNameHovered(false), children: window.remotion_projectName })) : (window.remotion_projectName), jsx_runtime_1.jsx(MenuCompositionName_1.MenuCompositionName, {})
+        ] }));
 };
 exports.MenuBuildIndicator = MenuBuildIndicator;

package/dist/components/MenuCompositionName.d.ts

@@ -0,0 +1,2 @@
+import React from 'react';
+export declare const MenuCompositionName: React.FC;

package/dist/components/MenuCompositionName.js

@@ -0,0 +1,80 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MenuCompositionName = 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 colors_1 = require("../helpers/colors");
+const open_in_editor_1 = require("../helpers/open-in-editor");
+const NotificationCenter_1 = require("./Notifications/NotificationCenter");
+const use_resolved_stack_1 = require("./Timeline/use-resolved-stack");
+const baseStyle = {
+    color: 'inherit',
+    textDecoration: 'none',
+    fontSize: 'inherit',
+    textUnderlineOffset: 2,
+};
+const compositionNameStyle = {
+    ...baseStyle,
+    cursor: 'default',
+};
+const clickableStyle = {
+    ...baseStyle,
+    cursor: 'pointer',
+};
+const clickableHoveredStyle = {
+    ...clickableStyle,
+    textDecoration: 'underline',
+};
+const slashStyle = {
+    color: colors_1.LIGHT_TEXT,
+    marginInline: 4,
+    position: 'relative',
+    top: 1,
+};
+const MenuCompositionName = () => {
+    var _a;
+    const { canvasContent, compositions } = (0, react_1.useContext)(remotion_1.Internals.CompositionManager);
+    const connectionStatus = (0, react_1.useContext)(client_id_1.StudioServerConnectionCtx)
+        .previewServerState.type;
+    const [opening, setOpening] = (0, react_1.useState)(false);
+    const [hovered, setHovered] = (0, react_1.useState)(false);
+    const composition = (0, react_1.useMemo)(() => {
+        var _a;
+        if (canvasContent === null || canvasContent.type !== 'composition') {
+            return null;
+        }
+        return ((_a = compositions.find((c) => c.id === canvasContent.compositionId)) !== null && _a !== void 0 ? _a : null);
+    }, [canvasContent, compositions]);
+    const resolvedLocation = (0, use_resolved_stack_1.useResolvedStack)((_a = composition === null || composition === void 0 ? void 0 : composition.stack) !== null && _a !== void 0 ? _a : null);
+    const canOpen = resolvedLocation &&
+        window.remotion_editorName &&
+        connectionStatus === 'connected';
+    const handleClick = (0, react_1.useCallback)(async () => {
+        if (!canOpen || !resolvedLocation) {
+            return;
+        }
+        setOpening(true);
+        try {
+            await (0, open_in_editor_1.openOriginalPositionInEditor)(resolvedLocation);
+        }
+        catch (err) {
+            (0, NotificationCenter_1.showNotification)(err.message, 2000);
+        }
+        finally {
+            setOpening(false);
+        }
+    }, [canOpen, resolvedLocation]);
+    if (!composition) {
+        return null;
+    }
+    return (jsx_runtime_1.jsxs(jsx_runtime_1.Fragment, { children: [
+            jsx_runtime_1.jsx("span", { style: slashStyle, children: "/" }), jsx_runtime_1.jsx("a", { style: canOpen && !opening
+                    ? hovered
+                        ? clickableHoveredStyle
+                        : clickableStyle
+                    : compositionNameStyle, title: canOpen ? `Open in ${window.remotion_editorName}` : composition.id, onClick: handleClick, onPointerEnter: () => setHovered(true), onPointerLeave: () => setHovered(false), children: composition.id })
+        ] }));
+};
+exports.MenuCompositionName = MenuCompositionName;

package/dist/components/Timeline/TimelineRotationField.js

@@ -5,7 +5,18 @@ const jsx_runtime_1 = require("react/jsx-runtime");
 const react_1 = require("react");
 const InputDragger_1 = require("../NewComposition/InputDragger");
 const timeline_field_utils_1 = require("./timeline-field-utils");
+const unitPattern = /^([+-]?(?:\d+\.?\d*|\.\d+))(deg|rad|turn|grad)$/;
+const unitToDegrees = {
+    deg: 1,
+    rad: 180 / Math.PI,
+    turn: 360,
+    grad: 360 / 400,
+};
 const parseCssRotationToDegrees = (value) => {
+    const match = value.trim().match(unitPattern);
+    if (match) {
+        return Number(match[1]) * unitToDegrees[match[2]];
+    }
     try {
         const m = new DOMMatrix(`rotate(${value})`);
         return Math.round(Math.atan2(m.b, m.a) * (180 / Math.PI) * 1e6) / 1e6;

package/dist/components/Timeline/TimelineSequence.js

@@ -107,7 +107,7 @@ const Inner = ({ s, windowWidth }) => {
 						)`,
                     position: 'absolute',
                     right: 0,
-                } })) : null, s.type === 'audio' ? (jsx_runtime_1.jsx(AudioWaveform_1.AudioWaveform, { src: s.src, doesVolumeChange: s.doesVolumeChange, visualizationWidth: width, startFrom: s.startMediaFrom, durationInFrames: s.duration, volume: s.volume, playbackRate: s.playbackRate })) : null, s.type === 'video' ? (jsx_runtime_1.jsx(TimelineVideoInfo_1.TimelineVideoInfo, { src: s.src, visualizationWidth: width, naturalWidth: naturalWidth, trimBefore: s.startMediaFrom, durationInFrames: s.duration, playbackRate: s.playbackRate })) : null, s.type === 'image' ? (jsx_runtime_1.jsx(TimelineImageInfo_1.TimelineImageInfo, { src: s.src, visualizationWidth: width })) : null, s.loopDisplay === undefined ? null : (jsx_runtime_1.jsx(LoopedTimelineIndicators_1.LoopedTimelineIndicator, { loops: s.loopDisplay.numberOfTimes })), s.type !== 'audio' &&
+                } })) : null, s.type === 'audio' ? (jsx_runtime_1.jsx(AudioWaveform_1.AudioWaveform, { src: s.src, doesVolumeChange: s.doesVolumeChange, visualizationWidth: width, startFrom: s.startMediaFrom, durationInFrames: s.duration, volume: s.volume, playbackRate: s.playbackRate })) : null, s.type === 'video' ? (jsx_runtime_1.jsx(TimelineVideoInfo_1.TimelineVideoInfo, { src: s.src, visualizationWidth: width, naturalWidth: naturalWidth, trimBefore: s.startMediaFrom, durationInFrames: s.duration, playbackRate: s.playbackRate, volume: s.volume, doesVolumeChange: s.doesVolumeChange, premountWidth: premountWidth !== null && premountWidth !== void 0 ? premountWidth : 0, postmountWidth: postmountWidth !== null && postmountWidth !== void 0 ? postmountWidth : 0 })) : null, s.type === 'image' ? (jsx_runtime_1.jsx(TimelineImageInfo_1.TimelineImageInfo, { src: s.src, visualizationWidth: width })) : null, s.loopDisplay === undefined ? null : (jsx_runtime_1.jsx(LoopedTimelineIndicators_1.LoopedTimelineIndicator, { loops: s.loopDisplay.numberOfTimes })), s.type !== 'audio' &&
                 s.type !== 'video' &&
                 s.type !== 'image' &&
                 s.loopDisplay === undefined &&

package/dist/components/Timeline/TimelineStack/index.js

@@ -149,7 +149,8 @@ const TimelineStack = ({ isCompact, sequence, originalLocation }) => {
             color: opening && isCompact ? colors_1.VERY_LIGHT_TEXT : colors_1.LIGHT_COLOR,
             userSelect: 'none',
             WebkitUserSelect: 'none',
-            borderBottom: hoverEffect ? '1px solid #fff' : 'none',
+            textDecoration: hoverEffect ? 'underline' : 'none',
+            textUnderlineOffset: 2,
             cursor: hoverEffect ? 'pointer' : undefined,
         };
     }, [titleHoverable, isCompact, opening, titleHovered]);

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

@@ -6,4 +6,8 @@ export declare const TimelineVideoInfo: React.FC<{
     readonly trimBefore: number;
     readonly durationInFrames: number;
     readonly playbackRate: number;
+    readonly volume: string | number;
+    readonly doesVolumeChange: boolean;
+    readonly premountWidth: number;
+    readonly postmountWidth: number;
 }>;

package/dist/components/Timeline/TimelineVideoInfo.js

@@ -8,21 +8,27 @@ const extract_frames_1 = require("../../helpers/extract-frames");
 const frame_database_1 = require("../../helpers/frame-database");
 const resize_video_frame_1 = require("../../helpers/resize-video-frame");
 const timeline_layout_1 = require("../../helpers/timeline-layout");
-const HEIGHT = (0, timeline_layout_1.getTimelineLayerHeight)('video') - 2;
-const containerStyle = {
-    height: HEIGHT,
+const AudioWaveform_1 = require("../AudioWaveform");
+const FILMSTRIP_HEIGHT = timeline_layout_1.TIMELINE_LAYER_HEIGHT_IMAGE - 2;
+const outerStyle = {
+    width: '100%',
+    height: '100%',
+    display: 'flex',
+    flexDirection: 'column',
+};
+const filmstripContainerStyle = {
+    height: FILMSTRIP_HEIGHT,
     width: '100%',
     backgroundColor: 'rgba(0, 0, 0, 0.3)',
     display: 'flex',
     borderTopLeftRadius: 2,
-    borderBottomLeftRadius: 2,
     fontSize: 10,
     fontFamily: 'Arial, Helvetica',
 };
 const WEBCODECS_TIMESCALE = 1000000;
 const MAX_TIME_DEVIATION = WEBCODECS_TIMESCALE * 0.05;
 const getDurationOfOneFrame = ({ visualizationWidth, aspectRatio, segmentDuration, }) => {
-    const framesFitInWidthUnrounded = visualizationWidth / (HEIGHT * aspectRatio);
+    const framesFitInWidthUnrounded = visualizationWidth / (FILMSTRIP_HEIGHT * aspectRatio);
     return (segmentDuration / framesFitInWidthUnrounded) * WEBCODECS_TIMESCALE;
 };
 const fixRounding = (value) => {
@@ -32,7 +38,7 @@ const fixRounding = (value) => {
     return Math.floor(value);
 };
 const calculateTimestampSlots = ({ visualizationWidth, fromSeconds, segmentDuration, aspectRatio, }) => {
-    const framesFitInWidthUnrounded = visualizationWidth / (HEIGHT * aspectRatio);
+    const framesFitInWidthUnrounded = visualizationWidth / (FILMSTRIP_HEIGHT * aspectRatio);
     const framesFitInWidth = Math.ceil(framesFitInWidthUnrounded);
     const durationOfOneFrame = getDurationOfOneFrame({
         visualizationWidth,
@@ -70,8 +76,10 @@ const drawSlot = ({ frame, ctx, filledSlots, visualizationWidth, timestamp, segm
     });
     const relativeTimestamp = timestamp - fromSeconds * WEBCODECS_TIMESCALE;
     const frameIndex = relativeTimestamp / durationOfOneFrame;
-    const left = Math.floor((frameIndex * frame.displayWidth) / window.devicePixelRatio); // round to avoid antialiasing
-    ctx.drawImage(frame, left, 0, frame.displayWidth / window.devicePixelRatio, frame.displayHeight / window.devicePixelRatio);
+    const thumbnailWidth = frame.displayWidth / window.devicePixelRatio;
+    const left = Math.floor(frameIndex * thumbnailWidth);
+    const right = Math.ceil((frameIndex + 1) * thumbnailWidth);
+    ctx.drawImage(frame, left, 0, right - left, frame.displayHeight / window.devicePixelRatio);
     filledSlots.set(timestamp, frame.timestamp);
 };
 const fillWithCachedFrames = ({ ctx, naturalWidth, filledSlots, src, segmentDuration, fromSeconds, }) => {
@@ -138,7 +146,7 @@ const fillFrameWhereItFits = ({ frame, filledSlots, ctx, visualizationWidth, seg
         });
     }
 };
-const TimelineVideoInfo = ({ src, visualizationWidth, naturalWidth, trimBefore, durationInFrames, playbackRate, }) => {
+const TimelineVideoInfo = ({ src, visualizationWidth, naturalWidth, trimBefore, durationInFrames, playbackRate, volume, doesVolumeChange, premountWidth, postmountWidth, }) => {
     const { fps } = (0, remotion_1.useVideoConfig)();
     const ref = (0, react_1.useRef)(null);
     const [error, setError] = (0, react_1.useState)(null);
@@ -160,7 +168,7 @@ const TimelineVideoInfo = ({ src, visualizationWidth, naturalWidth, trimBefore,
         const controller = new AbortController();
         const canvas = document.createElement('canvas');
         canvas.width = visualizationWidth;
-        canvas.height = HEIGHT;
+        canvas.height = FILMSTRIP_HEIGHT;
         const ctx = canvas.getContext('2d');
         if (!ctx) {
             return;
@@ -216,7 +224,7 @@ const TimelineVideoInfo = ({ src, visualizationWidth, naturalWidth, trimBefore,
                 let frame;
                 try {
                     frame = sample.toVideoFrame();
-                    const scale = (HEIGHT / frame.displayHeight) * window.devicePixelRatio;
+                    const scale = (FILMSTRIP_HEIGHT / frame.displayHeight) * window.devicePixelRatio;
                     const transformed = (0, resize_video_frame_1.resizeVideoFrame)({
                         frame,
                         scale,
@@ -298,6 +306,17 @@ const TimelineVideoInfo = ({ src, visualizationWidth, naturalWidth, trimBefore,
         trimBefore,
         visualizationWidth,
     ]);
-    return jsx_runtime_1.jsx("div", { ref: ref, style: containerStyle });
+    const audioWidth = visualizationWidth - premountWidth - postmountWidth;
+    const audioStyle = (0, react_1.useMemo)(() => {
+        return {
+            height: timeline_layout_1.TIMELINE_LAYER_HEIGHT_AUDIO,
+            width: audioWidth,
+            position: 'relative',
+            marginLeft: premountWidth,
+        };
+    }, [audioWidth, premountWidth]);
+    return (jsx_runtime_1.jsxs("div", { style: outerStyle, children: [
+            jsx_runtime_1.jsx("div", { ref: ref, style: filmstripContainerStyle }), jsx_runtime_1.jsx("div", { style: audioStyle, children: jsx_runtime_1.jsx(AudioWaveform_1.AudioWaveform, { src: src, visualizationWidth: audioWidth, startFrom: trimBefore, durationInFrames: durationInFrames, volume: volume, doesVolumeChange: doesVolumeChange, playbackRate: playbackRate }) })
+        ] }));
 };
 exports.TimelineVideoInfo = TimelineVideoInfo;