Skip to content

🎥 Make videos programmatically with React

Shorten incoming sequences when trimming their source start

JonnyBurgerf074abe438cf
diff --git a/packages/studio/src/components/Timeline/TimelineSequence.tsx b/packages/studio/src/components/Timeline/TimelineSequence.tsx
index 156ca840af..b846e50eaa 100644
--- a/packages/studio/src/components/Timeline/TimelineSequence.tsx
+++ b/packages/studio/src/components/Timeline/TimelineSequence.tsx
@@ -2369,7 +2369,7 @@ const TimelineSequenceLayoutInner: React.FC<{
(visibleLayout?.media?.width ?? 0) - (transitionEndOffset ?? 0) >=
MIN_SECONDARY_LEFT_EDGE_ACTION_WIDTH;
const secondaryLeftEdgeAction = canShowSecondaryLeftEdgeAction
- ? isMedia || isTransitionSeriesSequence(s)
+ ? isMedia
? 'source-only'
: 'self-trim'
: null;
diff --git a/packages/studio/src/components/Timeline/TimelineSequenceRightEdgeDragHandle.tsx b/packages/studio/src/components/Timeline/TimelineSequenceRightEdgeDragHandle.tsx
index 32151fa0c7..f12fc1f013 100644
--- a/packages/studio/src/components/Timeline/TimelineSequenceRightEdgeDragHandle.tsx
+++ b/packages/studio/src/components/Timeline/TimelineSequenceRightEdgeDragHandle.tsx
@@ -2202,7 +2202,9 @@ const TimelineSequenceLeftEdgeDragHandleInner: React.FC<{
const initialEdgeClientX = fillTarget
? handleRect.left + handleRect.width / 2
: captureTarget.parentElement!.getBoundingClientRect().left +
- (mode === 'source-only' ? (transitionEndOffset ?? 0) : 0);
+ (mode === 'source-only' || mode === 'self-trim'
+ ? (transitionEndOffset ?? 0)
+ : 0);
const initialEdgeClientY = handleRect.top;
const initialTimelineEdge = latestRef.current.initialEdgeFrame;
@@ -2671,9 +2673,9 @@ const TimelineSequenceLeftEdgeDragHandleInner: React.FC<{
const trimBeforeStyle: React.CSSProperties = {
...baseStyle,
zIndex: isTransitionSeries ? 2 : baseStyle.zIndex,
- // Keep the incoming source trim inside the solid clip, beyond the overlap.
+ // Keep the incoming head trim inside the solid clip, beyond the overlap.
left:
- transitionEndOffset !== null && secondaryAction === 'source-only'
+ transitionEndOffset !== null
? transitionEndOffset + HANDLE_INSET
: edgeEnabled
? rollingEnabled
@@ -2769,7 +2771,9 @@ const TimelineSequenceLeftEdgeDragHandleInner: React.FC<{
aria-label={
secondaryAction === 'source-only'
? 'Drag to adjust source start'
- : 'Drag to trim start without ripple'
+ : isTransitionSeries
+ ? 'Drag to trim source start'
+ : 'Drag to trim start without ripple'
}
data-trim-mode={secondaryAction}
style={trimBeforeStyle}