Skip to content

🎥 Make videos programmatically with React

Fix multi-selected media duration resizing

JonnyBurger5d6511fcff57
diff --git a/packages/studio/src/components/Timeline/Timeline.tsx b/packages/studio/src/components/Timeline/Timeline.tsx
index 506d844114..511baf07f4 100644
--- a/packages/studio/src/components/Timeline/Timeline.tsx
+++ b/packages/studio/src/components/Timeline/Timeline.tsx
@@ -58,6 +58,7 @@ import {
TimelineSelectAllKeybindings,
useTimelineSelection,
} from './TimelineSelection';
+import {TimelineSequenceMediaDurationDragLimitsProvider} from './TimelineSequenceRightEdgeDragHandle';
import {TimelineSlider} from './TimelineSlider';
import {TimelineTickFormatProvider} from './TimelineTickFormatProvider';
import {
@@ -533,7 +534,9 @@ const MemoizedTimelineInner = React.memo(TimelineInner);
export const Timeline: React.FC = () => {
return (
<TimelineTickFormatProvider>
- <MemoizedTimelineInner />
+ <TimelineSequenceMediaDurationDragLimitsProvider>
+ <MemoizedTimelineInner />
+ </TimelineSequenceMediaDurationDragLimitsProvider>
</TimelineTickFormatProvider>
);
};
diff --git a/packages/studio/src/components/Timeline/TimelineSequence.tsx b/packages/studio/src/components/Timeline/TimelineSequence.tsx
index dd86c3c845..afb1e2b019 100644
--- a/packages/studio/src/components/Timeline/TimelineSequence.tsx
+++ b/packages/studio/src/components/Timeline/TimelineSequence.tsx
@@ -2,7 +2,13 @@ import {
getTimelineVisibleDuration,
getTimelineVisibleStart,
} from '@remotion/canvas';
-import React, {useCallback, useContext, useMemo, useRef} from 'react';
+import React, {
+ useCallback,
+ useContext,
+ useEffect,
+ useMemo,
+ useRef,
+} from 'react';
import type {_InternalTypes, TSequence} from 'remotion';
import {Internals, useCurrentFrame} from 'remotion';
import {StudioServerConnectionCtx} from '../../helpers/client-id';
@@ -56,6 +62,7 @@ import {LoopedTimelineIndicator} from './LoopedTimelineIndicators';
import {getTimelineAssetLinkInfo} from './timeline-asset-link';
import {TimelineImageInfo} from './TimelineImageInfo';
import {
+ getTimelineSequenceSelectionKey,
isTimelineSelectionModifierEvent,
shouldSelectTimelineRowOnPointerDown,
TIMELINE_MARQUEE_ITEM_ATTR,
@@ -71,6 +78,7 @@ import {
isTimelineSequenceDurationDraggable,
isTimelineSequenceLeftEdgeDraggable,
TimelineSequenceLeftEdgeDragHandle,
+ TimelineSequenceMediaDurationDragLimitsContext,
TimelineSequenceRightEdgeDragHandle,
useTimelineSequenceFromDrag,
} from './TimelineSequenceRightEdgeDragHandle';
@@ -428,6 +436,9 @@ const TimelineSequenceInner: React.FC<{
const video = Internals.useVideo();
const {sequences} = useContext(Internals.SequenceManager);
const renderWindow = useContext(TimelineViewportContext);
+ const mediaDurationDragLimitsRegistry = useContext(
+ TimelineSequenceMediaDurationDragLimitsContext,
+ );
const dragAwareDoubleClick = useMemo(
() => createDragAwareDoubleClickTracker(),
[],
@@ -924,6 +935,29 @@ const TimelineSequenceInner: React.FC<{
timelineDurationInFrames: video.durationInFrames,
})
: null;
+ const mediaDurationDragSelectionKey = nodePathInfo
+ ? getTimelineSequenceSelectionKey(nodePathInfo)
+ : null;
+ useEffect(() => {
+ if (
+ mediaDurationDragLimitsRegistry === null ||
+ mediaDurationDragSelectionKey === null ||
+ !isMedia
+ ) {
+ return;
+ }
+
+ const registry = mediaDurationDragLimitsRegistry.current;
+ registry.set(mediaDurationDragSelectionKey, mediaDurationDragLimits);
+ return () => {
+ registry.delete(mediaDurationDragSelectionKey);
+ };
+ }, [
+ isMedia,
+ mediaDurationDragLimits,
+ mediaDurationDragLimitsRegistry,
+ mediaDurationDragSelectionKey,
+ ]);
const showRightBorderRadius =
visibleLayout?.rightEdgeVisible === true &&
diff --git a/packages/studio/src/components/Timeline/TimelineSequenceRightEdgeDragHandle.tsx b/packages/studio/src/components/Timeline/TimelineSequenceRightEdgeDragHandle.tsx
index 4b5cbfb82c..e13a9b210a 100644
--- a/packages/studio/src/components/Timeline/TimelineSequenceRightEdgeDragHandle.tsx
+++ b/packages/studio/src/components/Timeline/TimelineSequenceRightEdgeDragHandle.tsx
@@ -55,6 +55,25 @@ export type TimelineSequenceMediaDurationDragLimits = {
readonly maximumDuration: number;
};
+export const TimelineSequenceMediaDurationDragLimitsContext =
+ React.createContext<React.RefObject<
+ Map<string, TimelineSequenceMediaDurationDragLimits | null>
+ > | null>(null);
+
+export const TimelineSequenceMediaDurationDragLimitsProvider: React.FC<{
+ readonly children: React.ReactNode;
+}> = ({children}) => {
+ const limits = useRef(
+ new Map<string, TimelineSequenceMediaDurationDragLimits | null>(),
+ );
+
+ return (
+ <TimelineSequenceMediaDurationDragLimitsContext.Provider value={limits}>
+ {children}
+ </TimelineSequenceMediaDurationDragLimitsContext.Provider>
+ );
+};
+
export const getTimelineSequenceMediaDurationDragLimits = ({
cascadedStart,
displayDurationInFrames,
@@ -810,6 +829,7 @@ const findSequenceTrack = ({
export const getTimelineSequenceDurationDragTargets = ({
draggedNodePathInfo,
draggedSequenceMediaDurationDragLimits,
+ selectedSequenceMediaDurationDragLimits,
selectedItems,
sequences,
overrideIdsToNodePaths,
@@ -818,6 +838,10 @@ export const getTimelineSequenceDurationDragTargets = ({
}: {
readonly draggedNodePathInfo: SequenceNodePathInfo;
readonly draggedSequenceMediaDurationDragLimits: TimelineSequenceMediaDurationDragLimits | null;
+ readonly selectedSequenceMediaDurationDragLimits: ReadonlyMap<
+ string,
+ TimelineSequenceMediaDurationDragLimits | null
+ > | null;
readonly selectedItems: readonly TimelineSelection[];
readonly sequences: TSequence[];
readonly overrideIdsToNodePaths: OverrideIdToNodePaths;
@@ -884,23 +908,18 @@ export const getTimelineSequenceDurationDragTargets = ({
const key = stringifySequenceSubscriptionKey(nodePath);
if (!targets.has(key)) {
+ const selectionKey = getTimelineSequenceSelectionKey(nodePathInfo);
const isMedia =
originalSequence.type === 'audio' || originalSequence.type === 'video';
const hasImplicitMediaDuration =
isMedia &&
durationStatus?.status === 'static' &&
durationStatus.codeValue === undefined;
- const isDraggedSequence =
- getTimelineSequenceSelectionKey(nodePathInfo) === draggedSelectionKey;
+ const isDraggedSequence = selectionKey === draggedSelectionKey;
const mediaDurationDragLimits = isMedia
? isDraggedSequence
? draggedSequenceMediaDurationDragLimits
- : hasImplicitMediaDuration
- ? null
- : {
- initialDuration: originalSequence.duration,
- maximumDuration: originalSequence.duration,
- }
+ : (selectedSequenceMediaDurationDragLimits?.get(selectionKey) ?? null)
: null;
if (isMedia && mediaDurationDragLimits === null) {
return null;
@@ -1881,6 +1900,9 @@ const TimelineSequenceRightEdgeDragHandleInner: React.FC<{
);
const {previewServerState} = useContext(StudioServerConnectionCtx);
const currentSelection = useCurrentTimelineSelectionStateAsRef();
+ const mediaDurationDragLimitsRegistry = useContext(
+ TimelineSequenceMediaDurationDragLimitsContext,
+ );
const stopPointerSessionRef = useRef<(() => void) | null>(null);
const dragStateRef = useRef<{
@@ -2022,6 +2044,8 @@ const TimelineSequenceRightEdgeDragHandleInner: React.FC<{
draggedNodePathInfo: latestNodePathInfo,
draggedSequenceMediaDurationDragLimits:
latestMediaDurationDragLimits,
+ selectedSequenceMediaDurationDragLimits:
+ mediaDurationDragLimitsRegistry?.current ?? null,
selectedItems: latestSelectedItems,
sequences: sequencesRef.current,
overrideIdsToNodePaths: latestOverrideIdsToNodePaths,
@@ -2130,6 +2154,7 @@ const TimelineSequenceRightEdgeDragHandleInner: React.FC<{
[
currentSelection,
finishDrag,
+ mediaDurationDragLimitsRegistry,
propStatusesRef,
selected,
sequencesRef,
diff --git a/packages/studio/src/test/timeline-selection.test.ts b/packages/studio/src/test/timeline-selection.test.ts
index 3c30cfbfed..0b7d0905c6 100644
--- a/packages/studio/src/test/timeline-selection.test.ts
+++ b/packages/studio/src/test/timeline-selection.test.ts
@@ -1793,6 +1793,7 @@ test('Timeline duration drag applies the same delta to selected sequences', () =
const targets = getTimelineSequenceDurationDragTargets({
draggedNodePathInfo: firstNodePathInfo,
draggedSequenceMediaDurationDragLimits: null,
+ selectedSequenceMediaDurationDragLimits: null,
selectedItems: [
{type: 'sequence', nodePathInfo: firstNodePathInfo},
{type: 'sequence', nodePathInfo: secondNodePathInfo},
@@ -1825,12 +1826,85 @@ test('Timeline duration drag applies the same delta to selected sequences', () =
).toEqual([schema, schema]);
});
+test('Timeline duration drag clamps each selected media item to its asset end', () => {
+ const schema = {} satisfies InteractivitySchema;
+ const firstNodePathInfo = makeNodePathInfo(['body', 0], []);
+ const secondNodePathInfo = makeNodePathInfo(['body', 1], []);
+ const sequences = [
+ makeTimelineSequence({
+ schema,
+ id: 'first',
+ overrideId: 'first',
+ duration: 40,
+ type: 'video',
+ }),
+ makeTimelineSequence({
+ schema,
+ id: 'second',
+ overrideId: 'second',
+ duration: 15,
+ type: 'audio',
+ }),
+ ];
+ const common = {
+ draggedNodePathInfo: firstNodePathInfo,
+ draggedSequenceMediaDurationDragLimits: {
+ initialDuration: 40,
+ maximumDuration: 45,
+ },
+ selectedItems: [
+ {type: 'sequence' as const, nodePathInfo: firstNodePathInfo},
+ {type: 'sequence' as const, nodePathInfo: secondNodePathInfo},
+ ],
+ sequences,
+ overrideIdsToNodePaths: {
+ first: firstNodePathInfo.sequenceSubscriptionKey,
+ second: secondNodePathInfo.sequenceSubscriptionKey,
+ },
+ propStatuses: makeDurationPropStatuses([
+ firstNodePathInfo.sequenceSubscriptionKey,
+ secondNodePathInfo.sequenceSubscriptionKey,
+ ]),
+ timelineDurationInFrames: 1000,
+ };
+
+ expect(
+ getTimelineSequenceDurationDragTargets({
+ ...common,
+ selectedSequenceMediaDurationDragLimits: null,
+ }),
+ ).toBe(null);
+
+ const targets = getTimelineSequenceDurationDragTargets({
+ ...common,
+ selectedSequenceMediaDurationDragLimits: new Map([
+ [
+ getTimelineSequenceSelectionKey(secondNodePathInfo),
+ {initialDuration: 15, maximumDuration: 18},
+ ],
+ ]),
+ });
+ expect(
+ getTimelineSequenceDurationDragChanges({
+ targets: targets ?? [],
+ deltaFrames: 10,
+ }).map((change) => change.value),
+ ).toEqual([45, 18]);
+ expect(
+ getTimelineSequenceDurationDragChanges({
+ targets: targets ?? [],
+ deltaFrames: -10,
+ }).map((change) => change.value),
+ ).toEqual([30, 5]);
+});
+
test('Timeline duration drag uses the declared duration for negative from values', () => {
const schema = {} satisfies InteractivitySchema;
const nodePathInfo = makeNodePathInfo(['body', 0], []);
const targets = getTimelineSequenceDurationDragTargets({
draggedNodePathInfo: nodePathInfo,
draggedSequenceMediaDurationDragLimits: null,
+ selectedSequenceMediaDurationDragLimits: null,
selectedItems: [{type: 'sequence', nodePathInfo}],
sequences: [
makeTimelineSequence({
@@ -1863,6 +1937,7 @@ test('Timeline duration drag clamps to the composition end', () => {
const targets = getTimelineSequenceDurationDragTargets({
draggedNodePathInfo: nodePathInfo,
draggedSequenceMediaDurationDragLimits: null,
+ selectedSequenceMediaDurationDragLimits: null,
selectedItems: [{type: 'sequence', nodePathInfo}],
sequences: [
makeTimelineSequence({
@@ -1905,6 +1980,7 @@ test('Timeline duration drag supports interactive video clips', () => {
initialDuration: 78,
maximumDuration: 1000,
},
+ selectedSequenceMediaDurationDragLimits: null,
selectedItems: [{type: 'sequence', nodePathInfo}],
sequences: [video],
overrideIdsToNodePaths: {
@@ -1992,6 +2068,7 @@ test('Timeline duration drag clamps explicit audio and video to the asset end',
initialDuration: 200,
maximumDuration: 225,
},
+ selectedSequenceMediaDurationDragLimits: null,
selectedItems: [{type: 'sequence', nodePathInfo}],
sequences: [
makeTimelineSequence({
@@ -2025,6 +2102,7 @@ test('An overlong explicit Video is only saved once it reaches the asset end', (
initialDuration: 300,
maximumDuration: 225,
},
+ selectedSequenceMediaDurationDragLimits: null,
selectedItems: [{type: 'sequence', nodePathInfo}],
sequences: [
makeTimelineSequence({
@@ -2068,6 +2146,7 @@ test('Timeline duration drag trims audio and video without an explicit duration'
initialDuration: 78,
maximumDuration: 77,
},
+ selectedSequenceMediaDurationDragLimits: null,
selectedItems: [{type: 'sequence', nodePathInfo}],
sequences: [media],
overrideIdsToNodePaths: {
@@ -2123,6 +2202,7 @@ test('Timeline duration drag waits for an effective implicit media duration', ()
getTimelineSequenceDurationDragTargets({
draggedNodePathInfo: nodePathInfo,
draggedSequenceMediaDurationDragLimits: null,
+ selectedSequenceMediaDurationDragLimits: null,
selectedItems: [{type: 'sequence', nodePathInfo}],
sequences: [
makeTimelineSequence({
@@ -2160,6 +2240,7 @@ test('Implicit Video duration is only inserted below the media end', () => {
initialDuration: 300,
maximumDuration: 99,
},
+ selectedSequenceMediaDurationDragLimits: null,
selectedItems: [{type: 'sequence', nodePathInfo}],
sequences: [
makeTimelineSequence({
@@ -2297,6 +2378,7 @@ test('TransitionSeries.Sequence resize clamps to adjacent transition durations',
const durationTargets = getTimelineSequenceDurationDragTargets({
draggedNodePathInfo: nodePathInfo,
draggedSequenceMediaDurationDragLimits: null,
+ selectedSequenceMediaDurationDragLimits: null,
selectedItems,
sequences,
overrideIdsToNodePaths,
@@ -2354,6 +2436,7 @@ test('Timeline duration drag is blocked if one selected sequence cannot update d
getTimelineSequenceDurationDragTargets({
draggedNodePathInfo: firstNodePathInfo,
draggedSequenceMediaDurationDragLimits: null,
+ selectedSequenceMediaDurationDragLimits: null,
selectedItems: [
{type: 'sequence', nodePathInfo: firstNodePathInfo},
{type: 'sequence', nodePathInfo: secondNodePathInfo},
@@ -2417,6 +2500,7 @@ test('Timeline duration drag is blocked if one selected sequence duration is key
getTimelineSequenceDurationDragTargets({
draggedNodePathInfo: firstNodePathInfo,
draggedSequenceMediaDurationDragLimits: null,
+ selectedSequenceMediaDurationDragLimits: null,
selectedItems: [
{type: 'sequence', nodePathInfo: firstNodePathInfo},
{type: 'sequence', nodePathInfo: secondNodePathInfo},
@@ -2454,6 +2538,7 @@ test('Timeline duration drag ignores selection if dragged sequence is not select
const targets = getTimelineSequenceDurationDragTargets({
draggedNodePathInfo: firstNodePathInfo,
draggedSequenceMediaDurationDragLimits: null,
+ selectedSequenceMediaDurationDragLimits: null,
selectedItems: [
{type: 'sequence', nodePathInfo: secondNodePathInfo},
{type: 'sequence', nodePathInfo: thirdNodePathInfo},