Skip to content

🎥 Make videos programmatically with React

Place incoming source trims after the transition overlap

JonnyBurger723e361737fa
diff --git a/packages/studio/src/components/Timeline/TimelineSequence.tsx b/packages/studio/src/components/Timeline/TimelineSequence.tsx
index de2dd137fb..156ca840af 100644
--- a/packages/studio/src/components/Timeline/TimelineSequence.tsx
+++ b/packages/studio/src/components/Timeline/TimelineSequence.tsx
@@ -2116,6 +2116,15 @@ const TimelineSequenceLayoutInner: React.FC<{
? Math.round(outgoingTransitionStart * frameIncrement) -
visibleLayout.marginLeft
: null;
+ const incomingTransitionEnd = isTransitionSeriesSequence(s)
+ ? (sceneRange?.transitionInEnd ?? null)
+ : null;
+ const transitionEndOffset =
+ incomingTransitionEnd !== null && visibleLayout?.media
+ ? Math.round(incomingTransitionEnd * frameIncrement) -
+ visibleLayout.marginLeft -
+ visibleLayout.media.left
+ : null;
const rightTrimHandleVisible =
transitionStartOffset !== null
? transitionStartOffset >= 0 &&
@@ -2356,7 +2365,9 @@ const TimelineSequenceLayoutInner: React.FC<{
validatedLocation !== null &&
trimBeforeCanUpdate &&
(isMedia || durationCanUpdate) &&
- (visibleLayout?.media?.width ?? 0) >= MIN_SECONDARY_LEFT_EDGE_ACTION_WIDTH;
+ (transitionEndOffset === null || transitionEndOffset >= 0) &&
+ (visibleLayout?.media?.width ?? 0) - (transitionEndOffset ?? 0) >=
+ MIN_SECONDARY_LEFT_EDGE_ACTION_WIDTH;
const secondaryLeftEdgeAction = canShowSecondaryLeftEdgeAction
? isMedia || isTransitionSeriesSequence(s)
? 'source-only'
@@ -2434,7 +2445,9 @@ const TimelineSequenceLayoutInner: React.FC<{
secondaryLeftEdgeAction ||
(s.timelineTrack?.role === 'transition' && rollingEnabled)) &&
(s.timelineTrack?.role === 'transition' ||
- visibleLayout.media?.offset === 0) &&
+ visibleLayout.media?.offset === 0 ||
+ (secondaryLeftEdgeAction !== null &&
+ transitionEndOffset !== null)) &&
// Keep the captured handle mounted when a trim crosses frame zero.
(negativeStartWidth === 0 || activeTrimEdge === 'left') &&
nodePathInfo &&
@@ -2463,7 +2476,8 @@ const TimelineSequenceLayoutInner: React.FC<{
sourceOnlyCursor={`${timelineSourceOnlyCursor}, ew-resize`}
edgeEnabled={
s.timelineTrack?.role !== 'transition' &&
- showLeftEdgeDragHandle
+ showLeftEdgeDragHandle &&
+ visibleLayout.media?.offset === 0
}
edgeMode={
isTransitionSeriesSequence(s) && rollingEnabled
@@ -2490,6 +2504,7 @@ const TimelineSequenceLayoutInner: React.FC<{
touchingPrevious={previousTouchingSequence !== null}
onHoverEnd={clearEdgeHighlight}
secondaryAction={secondaryLeftEdgeAction}
+ transitionEndOffset={transitionEndOffset}
nodePathInfo={nodePathInfo}
windowWidth={windowWidth}
timelineDurationInFrames={video.durationInFrames ?? 1}
diff --git a/packages/studio/src/components/Timeline/TimelineSequenceRightEdgeDragHandle.tsx b/packages/studio/src/components/Timeline/TimelineSequenceRightEdgeDragHandle.tsx
index a228294f72..32151fa0c7 100644
--- a/packages/studio/src/components/Timeline/TimelineSequenceRightEdgeDragHandle.tsx
+++ b/packages/studio/src/components/Timeline/TimelineSequenceRightEdgeDragHandle.tsx
@@ -1945,6 +1945,7 @@ const TimelineSequenceLeftEdgeDragHandleInner: React.FC<{
readonly touchingPrevious: boolean;
readonly onHoverEnd: () => void;
readonly secondaryAction: 'source-only' | 'self-trim' | null;
+ readonly transitionEndOffset: number | null;
readonly nodePathInfo: SequenceNodePathInfo;
readonly windowWidth: number;
readonly timelineDurationInFrames: number;
@@ -1972,6 +1973,7 @@ const TimelineSequenceLeftEdgeDragHandleInner: React.FC<{
touchingPrevious,
onHoverEnd,
secondaryAction,
+ transitionEndOffset,
nodePathInfo,
windowWidth,
timelineDurationInFrames,
@@ -2199,7 +2201,8 @@ const TimelineSequenceLeftEdgeDragHandleInner: React.FC<{
const handleRect = captureTarget.getBoundingClientRect();
const initialEdgeClientX = fillTarget
? handleRect.left + handleRect.width / 2
- : captureTarget.parentElement!.getBoundingClientRect().left;
+ : captureTarget.parentElement!.getBoundingClientRect().left +
+ (mode === 'source-only' ? (transitionEndOffset ?? 0) : 0);
const initialEdgeClientY = handleRect.top;
const initialTimelineEdge = latestRef.current.initialEdgeFrame;
@@ -2626,6 +2629,7 @@ const TimelineSequenceLeftEdgeDragHandleInner: React.FC<{
windowWidth,
fillTarget,
isTransitionSeries,
+ transitionEndOffset,
],
);
@@ -2667,16 +2671,25 @@ const TimelineSequenceLeftEdgeDragHandleInner: React.FC<{
const trimBeforeStyle: React.CSSProperties = {
...baseStyle,
zIndex: isTransitionSeries ? 2 : baseStyle.zIndex,
- left: edgeEnabled
- ? rollingEnabled
- ? edgeMode === 'rolling'
- ? 'min(6px, 12.5%)'
- : 'calc(min(2px, 12.5%) + min(10px, 12.5%))'
- : touchingPrevious
+ // Keep the incoming source trim inside the solid clip, beyond the overlap.
+ left:
+ transitionEndOffset !== null && secondaryAction === 'source-only'
+ ? transitionEndOffset + HANDLE_INSET
+ : edgeEnabled
+ ? rollingEnabled
+ ? edgeMode === 'rolling'
+ ? 'min(6px, 12.5%)'
+ : 'calc(min(2px, 12.5%) + min(10px, 12.5%))'
+ : touchingPrevious
+ ? 'min(10px, 12.5%)'
+ : 'min(4px, 12.5%)'
+ : 0,
+ width:
+ transitionEndOffset !== null
+ ? 10
+ : edgeEnabled
? 'min(10px, 12.5%)'
- : 'min(4px, 12.5%)'
- : 0,
- width: edgeEnabled ? 'min(10px, 12.5%)' : 'min(14px, 25%)',
+ : 'min(14px, 25%)',
cursor:
secondaryAction === 'source-only' ? sourceOnlyCursor : trimBeforeCursor,
background: TRANSPARENT,