Skip to content

🎥 Make videos programmatically with React

`@remotion/studio`: Add duration format menu to composition inspector

Jonny Burgerca5a78ea1792
diff --git a/packages/studio/src/components/EditorContent.tsx b/packages/studio/src/components/EditorContent.tsx
index 132f86d730..71df97cb1c 100644
--- a/packages/studio/src/components/EditorContent.tsx
+++ b/packages/studio/src/components/EditorContent.tsx
@@ -15,6 +15,7 @@ import {
TimelineSelectionProvider,
useTimelineSelection,
} from './Timeline/TimelineSelection';
+import {TimelineTickFormatProvider} from './Timeline/TimelineTickFormatProvider';
import {WebMcp} from './WebMcp';
const noop = () => undefined;
@@ -90,18 +91,20 @@ export const EditorContent: React.FC<{
);
return (
- <TimelineSelectionProvider>
- <WebMcp />
- <Transform3DModeStateProvider>
- <StudioClearSelectionArea>
- <InitialCompositionLoader />
- <MenuToolbar readOnlyStudio={readOnlyStudio} />
- <GlobalKeybindings />
- <TimelineKeyframeDragStateProvider>
- {content}
- </TimelineKeyframeDragStateProvider>
- </StudioClearSelectionArea>
- </Transform3DModeStateProvider>
- </TimelineSelectionProvider>
+ <TimelineTickFormatProvider>
+ <TimelineSelectionProvider>
+ <WebMcp />
+ <Transform3DModeStateProvider>
+ <StudioClearSelectionArea>
+ <InitialCompositionLoader />
+ <MenuToolbar readOnlyStudio={readOnlyStudio} />
+ <GlobalKeybindings />
+ <TimelineKeyframeDragStateProvider>
+ {content}
+ </TimelineKeyframeDragStateProvider>
+ </StudioClearSelectionArea>
+ </Transform3DModeStateProvider>
+ </TimelineSelectionProvider>
+ </TimelineTickFormatProvider>
);
};
diff --git a/packages/studio/src/components/InspectorPanel/CompositionMetadata.tsx b/packages/studio/src/components/InspectorPanel/CompositionMetadata.tsx
index 00e574eff2..2d1142bfbf 100644
--- a/packages/studio/src/components/InspectorPanel/CompositionMetadata.tsx
+++ b/packages/studio/src/components/InspectorPanel/CompositionMetadata.tsx
@@ -1,9 +1,19 @@
-import React, {useCallback, useEffect, useMemo, useRef, useState} from 'react';
+import React, {
+ useCallback,
+ useContext,
+ useEffect,
+ useMemo,
+ useRef,
+ useState,
+} from 'react';
import {Internals} from 'remotion';
import {WHITE_ALPHA_40} from '../../helpers/colors';
import {isCompositionStill} from '../../helpers/is-composition-still';
import {resolvedStackToSymbolicated} from '../../helpers/resolved-stack-to-symbolicated';
import {CaretDown} from '../../icons/caret';
+import {Checkmark} from '../../icons/Checkmark';
+import {renderFrame} from '../../state/render-frame';
+import {ContextMenu} from '../ContextMenu';
import {InlineDropdown} from '../InlineDropdown';
import type {ComboboxValue} from '../NewComposition/ComboBox';
import {
@@ -12,6 +22,7 @@ import {
} from '../NewComposition/InputDragger';
import {showNotification} from '../Notifications/NotificationCenter';
import {updateCompositionMetadata} from '../RenderQueue/actions';
+import {TimelineTickFormatContext} from '../Timeline/TimelineTickFormatProvider';
import {useResolvedStack} from '../Timeline/use-resolved-stack';
import {InspectorDetailRow} from './common';
import {
@@ -196,6 +207,8 @@ const CompositionMetadataValue: React.FC<{
readonly value: number;
}> = ({computed, disabled, field, onSave, pendingValue, value}) => {
const [dragValue, setDragValue] = useState<number | null>(null);
+ const {showFrames, setShowFrames} = useContext(TimelineTickFormatContext);
+ const fps = Internals.useVideo()?.fps ?? null;
const save = useCallback(
(newValue: number) => {
@@ -219,37 +232,80 @@ const CompositionMetadataValue: React.FC<{
const roundedValue = Math.round(numberValue);
if (field === 'durationInFrames') {
+ if (!showFrames && fps !== null) {
+ return renderFrame(roundedValue, fps);
+ }
+
return `${roundedValue} ${roundedValue === 1 ? 'frame' : 'frames'}`;
}
return String(roundedValue);
},
- [field],
+ [field, fps, showFrames],
+ );
+ const getTimeFormatItems = useCallback(
+ (): ComboboxValue[] => [
+ {
+ type: 'item',
+ id: 'timecode',
+ label: 'Timecode',
+ value: 'timecode',
+ onClick: () => setShowFrames(false),
+ keyHint: null,
+ leftItem: showFrames ? null : <Checkmark />,
+ subMenu: null,
+ quickSwitcherLabel: null,
+ },
+ {
+ type: 'item',
+ id: 'frames',
+ label: 'Frames',
+ value: 'frames',
+ onClick: () => setShowFrames(true),
+ keyHint: null,
+ leftItem: showFrames ? <Checkmark /> : null,
+ subMenu: null,
+ quickSwitcherLabel: null,
+ },
+ ],
+ [setShowFrames, showFrames],
);
- return computed || disabled ? (
- <span style={computedContainerStyle}>
- <span style={computedValueStyle}>{formatValue(value)}</span>
- </span>
+ const content =
+ computed || disabled ? (
+ <span style={computedContainerStyle}>
+ <span style={computedValueStyle}>{formatValue(value)}</span>
+ </span>
+ ) : (
+ <InputDragger
+ aria-label={fieldLabels[field]}
+ buttonStyle={metadataDraggerStyles[field]}
+ type="number"
+ value={dragValue ?? pendingValue?.value ?? value}
+ disabled={pendingValue !== null}
+ status="ok"
+ onValueChange={setDragValue}
+ onValueChangeEnd={save}
+ onTextChange={() => undefined}
+ min={isFps ? 0.01 : 1}
+ step={isFps ? 0.01 : 1}
+ dragDecimalPlaces={isFps ? 2 : 0}
+ formatter={formatValue}
+ formatterStyle={metadataFormatterStyle}
+ rightAlign
+ style={metadataDraggerStyles[field]}
+ />
+ );
+
+ return field === 'durationInFrames' ? (
+ <ContextMenu
+ getItems={getTimeFormatItems}
+ style={{display: 'inline-block'}}
+ >
+ {content}
+ </ContextMenu>
) : (
- <InputDragger
- aria-label={fieldLabels[field]}
- buttonStyle={metadataDraggerStyles[field]}
- type="number"
- value={dragValue ?? pendingValue?.value ?? value}
- disabled={pendingValue !== null}
- status="ok"
- onValueChange={setDragValue}
- onValueChangeEnd={save}
- onTextChange={() => undefined}
- min={isFps ? 0.01 : 1}
- step={isFps ? 0.01 : 1}
- dragDecimalPlaces={isFps ? 2 : 0}
- formatter={formatValue}
- formatterStyle={metadataFormatterStyle}
- rightAlign
- style={metadataDraggerStyles[field]}
- />
+ content
);
};
diff --git a/packages/studio/src/components/Timeline/Timeline.tsx b/packages/studio/src/components/Timeline/Timeline.tsx
index b9a45573f6..b1e57d1bb3 100644
--- a/packages/studio/src/components/Timeline/Timeline.tsx
+++ b/packages/studio/src/components/Timeline/Timeline.tsx
@@ -64,7 +64,6 @@ import {
import {TimelineEdgeHighlightProvider} from './TimelineSequence';
import {TimelineSequenceMediaDurationDragLimitsProvider} from './TimelineSequenceRightEdgeDragHandle';
import {TimelineSlider} from './TimelineSlider';
-import {TimelineTickFormatProvider} from './TimelineTickFormatProvider';
import {
TimelineTimeIndicators,
TimelineTimePlaceholders,
@@ -627,12 +626,10 @@ const MemoizedTimelineInner = React.memo(TimelineInner);
export const Timeline: React.FC = () => {
return (
- <TimelineTickFormatProvider>
- <TimelineEdgeHighlightProvider>
- <TimelineSequenceMediaDurationDragLimitsProvider>
- <MemoizedTimelineInner />
- </TimelineSequenceMediaDurationDragLimitsProvider>
- </TimelineEdgeHighlightProvider>
- </TimelineTickFormatProvider>
+ <TimelineEdgeHighlightProvider>
+ <TimelineSequenceMediaDurationDragLimitsProvider>
+ <MemoizedTimelineInner />
+ </TimelineSequenceMediaDurationDragLimitsProvider>
+ </TimelineEdgeHighlightProvider>
);
};