Skip to content

🎥 Make videos programmatically with React

Preserve source trim on stationary edge clicks

JonnyBurgerb96e1a345f9e
diff --git a/packages/studio/src/components/Timeline/TimelineSequenceRightEdgeDragHandle.tsx b/packages/studio/src/components/Timeline/TimelineSequenceRightEdgeDragHandle.tsx
index 32b3bcfa8c..7539435862 100644
--- a/packages/studio/src/components/Timeline/TimelineSequenceRightEdgeDragHandle.tsx
+++ b/packages/studio/src/components/Timeline/TimelineSequenceRightEdgeDragHandle.tsx
@@ -562,6 +562,14 @@ const getTimelineSequenceLeftEdgeDragValuesForTarget = ({
readonly deltaFrames: number;
readonly trimBeforeOnly: boolean;
}) => {
+ if (deltaFrames === 0) {
+ return {
+ durationInFrames: target.initialDuration,
+ from: target.initialFrom,
+ trimBefore: target.initialTrimBefore,
+ };
+ }
+
if (target.rollingDuration && target.ripplePrevious) {
const outgoing = target.ripplePrevious;
const current = target.rollingDuration;
diff --git a/packages/studio/src/components/Timeline/get-timeline-sequence-timing-limits.ts b/packages/studio/src/components/Timeline/get-timeline-sequence-timing-limits.ts
index 13f00f96b2..57793e47bb 100644
--- a/packages/studio/src/components/Timeline/get-timeline-sequence-timing-limits.ts
+++ b/packages/studio/src/components/Timeline/get-timeline-sequence-timing-limits.ts
@@ -278,19 +278,29 @@ export const getTimelineSequenceTimingLimits = ({
const minimumFrom =
sequence.from +
(minimumMoveStart - track.cascadedStart) * track.keyframePlaybackRate;
- const minimumTrimBefore = Math.max(
- keyframeLimits.minimumEnd - initialDuration * sequence.sequencePlaybackRate,
- isMedia && inferredDuration && !Number.isFinite(sourceEnd)
- ? trimBefore
- : inferredDuration && !loops && Number.isFinite(sourceEnd)
- ? Math.max(0, sourceEnd - spatialMaximumDuration * playbackRate)
- : 0,
+ // A parent may already clip an inferred media source. Preserve the current
+ // trim in the allowed range instead of normalizing it when a drag begins.
+ const minimumTrimBefore = Math.min(
+ trimBefore,
+ Math.max(
+ keyframeLimits.minimumEnd -
+ initialDuration * sequence.sequencePlaybackRate,
+ isMedia && inferredDuration && !Number.isFinite(sourceEnd)
+ ? trimBefore
+ : inferredDuration && !loops && Number.isFinite(sourceEnd)
+ ? Math.max(0, sourceEnd - spatialMaximumDuration * playbackRate)
+ : 0,
+ ),
);
- const maximumTrimBefore = Math.min(
- keyframeLimits.maximumEnd - initialDuration * sequence.sequencePlaybackRate,
- isMedia && !Number.isFinite(sourceEnd)
- ? trimBefore
- : Math.max(0, sourceEnd - reservedDuration * playbackRate),
+ const maximumTrimBefore = Math.max(
+ trimBefore,
+ Math.min(
+ keyframeLimits.maximumEnd -
+ initialDuration * sequence.sequencePlaybackRate,
+ isMedia && !Number.isFinite(sourceEnd)
+ ? trimBefore
+ : Math.max(0, sourceEnd - reservedDuration * playbackRate),
+ ),
);
const spatialLimitReason: TimelineTrimLimitReason =
maximumEnd === maximumNeighbourEnd