Skip to content

🎥 Make videos programmatically with React

`@remotion/studio`: Show trimmed layer extent during timeline drag

JonnyBurger5ccc7f8dba37
diff --git a/packages/studio/src/components/Timeline/TimelineSequence.tsx b/packages/studio/src/components/Timeline/TimelineSequence.tsx
index 5634ea9fd1..7ca00b25f8 100644
--- a/packages/studio/src/components/Timeline/TimelineSequence.tsx
+++ b/packages/studio/src/components/Timeline/TimelineSequence.tsx
@@ -1538,19 +1538,19 @@ const TimelineSequenceInner: React.FC<{
validatedLocation !== null &&
durationCanResize &&
(!isMedia || Boolean(s.loopDisplay) || mediaDurationDragLimits !== null);
+ const isFirstCascadingSequence =
+ isCascadingSequence(s) && adjacentCascadingSequences.previous === null;
const showLeftEdgeDragHandle =
isTimelineSequenceLeftEdgeDraggable(s) &&
nodePath !== null &&
validatedLocation !== null &&
- (adjacentCascadingSequences.previous
- ? previousCascadingSequenceCanResize
- : (isCascadingSequence(s) || fromCanUpdate) &&
- durationCanUpdate &&
- trimBeforeCanUpdate);
+ (isFirstCascadingSequence
+ ? trimBeforeCanUpdate
+ : adjacentCascadingSequences.previous
+ ? previousCascadingSequenceCanResize
+ : fromCanUpdate && durationCanUpdate && trimBeforeCanUpdate);
const canShowSecondaryLeftEdgeAction =
- (isMedia ||
- (isCascadingSequence(s) &&
- adjacentCascadingSequences.previous !== null)) &&
+ (isMedia || (isCascadingSequence(s) && !isFirstCascadingSequence)) &&
isTimelineSequenceLeftEdgeDraggable(s) &&
nodePath !== null &&
validatedLocation !== null &&
@@ -1616,6 +1616,7 @@ const TimelineSequenceInner: React.FC<{
cursor={`${timelineTrimEdgeCursor}, ew-resize`}
trimBeforeCursor={`${timelineLeftEdgeCursor}, e-resize`}
edgeEnabled={showLeftEdgeDragHandle}
+ edgeMode={isFirstCascadingSequence ? 'source-only' : 'ripple'}
secondaryAction={secondaryLeftEdgeAction}
nodePathInfo={nodePathInfo}
windowWidth={windowWidth}
diff --git a/packages/studio/src/components/Timeline/TimelineSequenceRightEdgeDragHandle.tsx b/packages/studio/src/components/Timeline/TimelineSequenceRightEdgeDragHandle.tsx
index 91e8714caf..83a844b1f0 100644
--- a/packages/studio/src/components/Timeline/TimelineSequenceRightEdgeDragHandle.tsx
+++ b/packages/studio/src/components/Timeline/TimelineSequenceRightEdgeDragHandle.tsx
@@ -1126,7 +1126,11 @@ export const getTimelineSequenceLeftEdgeDragTargets = ({
const nodePath = track.nodePathInfo.sequenceSubscriptionKey;
const trimsMedia =
originalSequence.type === 'audio' || originalSequence.type === 'video';
- if (trimBeforeOnly && !trimsMedia) {
+ if (
+ trimBeforeOnly &&
+ !trimsMedia &&
+ !isCascadingSequence(originalSequence)
+ ) {
return null;
}
@@ -1478,6 +1482,7 @@ const TimelineSequenceLeftEdgeDragHandleInner: React.FC<{
readonly cursor: string;
readonly trimBeforeCursor: string;
readonly edgeEnabled: boolean;
+ readonly edgeMode: 'ripple' | 'source-only';
readonly secondaryAction: 'source-only' | 'self-trim' | null;
readonly nodePathInfo: SequenceNodePathInfo;
readonly windowWidth: number;
@@ -1495,6 +1500,7 @@ const TimelineSequenceLeftEdgeDragHandleInner: React.FC<{
cursor,
trimBeforeCursor,
edgeEnabled,
+ edgeMode,
secondaryAction,
nodePathInfo,
windowWidth,
@@ -1952,7 +1958,7 @@ const TimelineSequenceLeftEdgeDragHandleInner: React.FC<{
...baseStyle,
left: -LEFT_EDGE_HANDLE_OUTSET,
width: `calc(${LEFT_EDGE_HANDLE_OUTSET}px + min(${LEFT_EDGE_HANDLE_INSET}px, 12.5%))`,
- cursor,
+ cursor: edgeMode === 'source-only' ? trimBeforeCursor : cursor,
background: TRANSPARENT,
pointerEvents: 'auto',
};
@@ -1971,7 +1977,12 @@ const TimelineSequenceLeftEdgeDragHandleInner: React.FC<{
<div
role="separator"
aria-orientation="vertical"
- aria-label="Drag to trim start"
+ aria-label={
+ edgeMode === 'source-only'
+ ? 'Drag to adjust source start'
+ : 'Drag to trim start'
+ }
+ data-trim-mode={edgeMode}
style={edgeStyle}
onPointerDown={onPointerDown}
onClick={(e) => e.stopPropagation()}