Skip to content

🎥 Make videos programmatically with React

Show full Series extent with timeline trim indicators

Jonny Burgera3f5e4fc6eed
diff --git a/packages/studio/src/components/Timeline/TimelineSequence.tsx b/packages/studio/src/components/Timeline/TimelineSequence.tsx
index 2ca48901c8..19cfb0b873 100644
--- a/packages/studio/src/components/Timeline/TimelineSequence.tsx
+++ b/packages/studio/src/components/Timeline/TimelineSequence.tsx
@@ -67,6 +67,7 @@ import {
getKeyframePlaybackRate,
} from './get-timeline-keyframes';
import {getTimelineMediaStartFrame} from './get-timeline-media-start-frame';
+import {getTimelineSequenceNaturalDuration} from './get-timeline-sequence-natural-duration';
import {getTimelineSequenceVisibleLayout} from './get-timeline-sequence-visible-layout';
import {getCurrentFrame} from './imperative-state';
import {LoopedTimelineIndicator} from './LoopedTimelineIndicators';
@@ -1382,6 +1383,12 @@ const TimelineSequenceInner: React.FC<{
return null;
}
+ const naturalSequenceDuration = originalSequence
+ ? getTimelineSequenceNaturalDuration({
+ sequence: originalSequence,
+ sequences,
+ })
+ : null;
const trimmedBefore = Math.max(
0,
isMedia
@@ -1393,7 +1400,15 @@ const TimelineSequenceInner: React.FC<{
naturalMediaDuration !== null &&
Number.isFinite(naturalMediaDuration)
? Math.max(0, naturalMediaDuration - displayDurationInFrames)
- : 0;
+ : naturalSequenceDuration !== null
+ ? Math.max(
+ 0,
+ cascadedStart +
+ naturalSequenceDuration / keyframePlaybackRate -
+ s.from -
+ displayDurationInFrames,
+ )
+ : 0;
if (!Number.isFinite(trimmedBefore)) {
return null;
}
diff --git a/packages/studio/src/components/Timeline/TimelineSequenceRightEdgeDragHandle.tsx b/packages/studio/src/components/Timeline/TimelineSequenceRightEdgeDragHandle.tsx
index 4bdbd6e6dd..be41d7e24e 100644
--- a/packages/studio/src/components/Timeline/TimelineSequenceRightEdgeDragHandle.tsx
+++ b/packages/studio/src/components/Timeline/TimelineSequenceRightEdgeDragHandle.tsx
@@ -46,6 +46,7 @@ import {
type TimelineSequenceEffectKeyframeDragTarget,
type TimelineSequenceKeyframeDragTarget,
} from './get-keyframed-sequence-drag-targets';
+import {getTimelineSequenceNaturalDuration} from './get-timeline-sequence-natural-duration';
import {
saveSequenceProps,
type SaveSequencePropChange,
@@ -1052,65 +1053,42 @@ export const getTimelineSequenceDurationDragTargets = ({
track.cascadedStart) *
track.keyframePlaybackRate
: originalSequence.duration;
- const isSeriesContainer =
- controls.componentIdentity === 'dev.remotion.remotion.Series' ||
- controls.componentIdentity ===
- 'dev.remotion.transitions.TransitionSeries';
- let canRestoreInferredDuration =
- isSeriesContainer && originalSequence.canInferDuration === true;
+ const naturalDuration = getTimelineSequenceNaturalDuration({
+ sequence: originalSequence,
+ sequences,
+ });
let parentDurationLimit = Infinity;
- let ancestor: TSequence | undefined = originalSequence;
- while (ancestor && canRestoreInferredDuration) {
- if (ancestor.loopDisplay || ancestor.frozenFrame !== null) {
- canRestoreInferredDuration = false;
- }
-
- const parentId: string | null = ancestor.parent;
- ancestor = sequences.find((candidate) => candidate.id === parentId);
- if (ancestor) {
- const parentTrack = tracks.find(
- (candidate) => candidate.sequence.id === parentId,
- );
- if (parentTrack) {
- parentDurationLimit = Math.min(
- parentDurationLimit,
- (parentTrack.cascadedStart +
- ancestor.duration / parentTrack.keyframePlaybackRate -
- track.cascadedStart) *
- track.keyframePlaybackRate,
+ if (naturalDuration !== null) {
+ let ancestor: TSequence | undefined = originalSequence;
+ while (ancestor) {
+ const parentId: string | null = ancestor.parent;
+ ancestor = sequences.find((candidate) => candidate.id === parentId);
+ if (ancestor) {
+ const parentTrack = tracks.find(
+ (candidate) => candidate.sequence.id === parentId,
);
+ if (parentTrack) {
+ parentDurationLimit = Math.min(
+ parentDurationLimit,
+ (parentTrack.cascadedStart +
+ ancestor.duration / parentTrack.keyframePlaybackRate -
+ track.cascadedStart) *
+ track.keyframePlaybackRate,
+ );
+ }
}
}
}
- const children = sequences.filter(
- (child) => child.parent === originalSequence.id,
- );
- const naturalDuration =
- canRestoreInferredDuration &&
- children.length > 0 &&
- children.every(
- (child) =>
- child.unclippedDuration !== null &&
- child.unclippedDuration !== undefined,
- )
- ? Math.max(
- ...children.map(
- (child) =>
- (child.from -
- (originalSequence.trimBefore ?? 0) +
- (child.unclippedDuration ?? 0)) /
- originalSequence.sequencePlaybackRate,
- ),
- )
- : Infinity;
const constrainedMaximumDuration = Math.min(
mediaDurationDragLimits
? mediaDurationDragLimits.maximumDuration * track.keyframePlaybackRate
: Infinity,
(timelineDurationInFrames - track.cascadedStart) *
track.keyframePlaybackRate,
- naturalDuration >= minimumDuration ? naturalDuration : Infinity,
+ naturalDuration !== null && naturalDuration >= minimumDuration
+ ? naturalDuration
+ : Infinity,
parentDurationLimit,
);
const maximumDuration = isMedia
@@ -1125,8 +1103,7 @@ export const getTimelineSequenceDurationDragTargets = ({
fileName: nodePath.absolutePath,
initialDuration,
maximumDuration,
- ...(Number.isFinite(naturalDuration) &&
- maximumDuration === naturalDuration
+ ...(naturalDuration !== null && maximumDuration === naturalDuration
? {naturalDuration, initiallyExplicit: !originalSequence.autoDuration}
: {}),
// A negative start needs enough duration to retain one visible frame.
diff --git a/packages/studio/src/components/Timeline/get-timeline-sequence-natural-duration.ts b/packages/studio/src/components/Timeline/get-timeline-sequence-natural-duration.ts
new file mode 100644
index 0000000000..319cd1409d
--- /dev/null
+++ b/packages/studio/src/components/Timeline/get-timeline-sequence-natural-duration.ts
@@ -0,0 +1,49 @@
+import type {TSequence} from 'remotion';
+
+// Returns the full child end in the wrapper's parent clock, independently of
+// its current trim. Resizing and the available-content outline share this end.
+export const getTimelineSequenceNaturalDuration = ({
+ sequence,
+ sequences,
+}: {
+ readonly sequence: TSequence;
+ readonly sequences: readonly TSequence[];
+}): number | null => {
+ if (!sequence.canInferDuration) {
+ return null;
+ }
+
+ let ancestor: TSequence | undefined = sequence;
+ while (ancestor) {
+ if (ancestor.loopDisplay || ancestor.frozenFrame !== null) {
+ return null;
+ }
+
+ const parentId: string | null = ancestor.parent;
+ ancestor = sequences.find((candidate) => candidate.id === parentId);
+ }
+
+ const children = sequences.filter((child) => child.parent === sequence.id);
+ if (
+ children.length === 0 ||
+ children.some(
+ (child) =>
+ child.unclippedDuration === null ||
+ child.unclippedDuration === undefined,
+ )
+ ) {
+ return null;
+ }
+
+ const duration = Math.max(
+ ...children.map(
+ (child) =>
+ (child.from -
+ (sequence.trimBefore ?? 0) +
+ (child.unclippedDuration ?? 0)) /
+ sequence.sequencePlaybackRate,
+ ),
+ );
+
+ return Number.isFinite(duration) ? duration : null;
+};