Skip to content

🎥 Make videos programmatically with React

Fix timeline edge trimming behavior

JonnyBurgerdf4da12df89a
diff --git a/packages/media/src/media-player.ts b/packages/media/src/media-player.ts
index 1b3084899c..b998d958d9 100644
--- a/packages/media/src/media-player.ts
+++ b/packages/media/src/media-player.ts
@@ -641,22 +641,13 @@ export class MediaPlayer {
});
}
- public async setTrimBefore(
+ public async setTrimRange(
trimBefore: number | undefined,
- unloopedTimeInSeconds: number,
- ): Promise<void> {
- if (this.trimBefore !== trimBefore) {
- this.trimBefore = trimBefore;
- this.audioIteratorManager?.destroyIterator();
- await this.seekTo(unloopedTimeInSeconds, 'discontinuity');
- }
- }
-
- public async setTrimAfter(
trimAfter: number | undefined,
unloopedTimeInSeconds: number,
): Promise<void> {
- if (this.trimAfter !== trimAfter) {
+ if (this.trimBefore !== trimBefore || this.trimAfter !== trimAfter) {
+ this.trimBefore = trimBefore;
this.trimAfter = trimAfter;
this.audioIteratorManager?.destroyIterator();
await this.seekTo(unloopedTimeInSeconds, 'discontinuity');
diff --git a/packages/media/src/test/trim-change-seek.test.ts b/packages/media/src/test/trim-change-seek.test.ts
index acf6dcf6be..1f1822ba89 100644
--- a/packages/media/src/test/trim-change-seek.test.ts
+++ b/packages/media/src/test/trim-change-seek.test.ts
@@ -1,7 +1,7 @@
import {expect, test} from 'vitest';
import {MediaPlayer} from '../media-player';
-test('setTrimBefore and setTrimAfter should update frame when paused', async () => {
+test('setTrimRange should atomically update trims when paused', async () => {
const player = new MediaPlayer({
canvas: null,
src: '/bigbuckbunny.mp4',
@@ -34,16 +34,15 @@ test('setTrimBefore and setTrimAfter should update frame when paused', async ()
await player.initialize(0, false, 1);
const initialFrames = player.videoIteratorManager!.getFramesRendered();
- await player.setTrimBefore(30, 0);
+ await player.setTrimRange(30, 90, 0);
expect(player.videoIteratorManager!.getFramesRendered()).toBeGreaterThan(
initialFrames,
);
- const framesAfterTrimBefore =
- player.videoIteratorManager!.getFramesRendered();
- await player.setTrimAfter(90, 0);
- expect(player.videoIteratorManager!.getFramesRendered()).toBe(
- framesAfterTrimBefore,
+ const framesAfterFirstTrim = player.videoIteratorManager!.getFramesRendered();
+ await player.setTrimRange(120, 180, 0);
+ expect(player.videoIteratorManager!.getFramesRendered()).toBeGreaterThan(
+ framesAfterFirstTrim,
);
await player.dispose();
diff --git a/packages/media/src/use-common-effects.ts b/packages/media/src/use-common-effects.ts
index b581d50258..53087ec104 100644
--- a/packages/media/src/use-common-effects.ts
+++ b/packages/media/src/use-common-effects.ts
@@ -97,17 +97,8 @@ export const useCommonEffects = ({
return;
}
- mediaPlayer.setTrimBefore(trimBefore, currentTimeRef.current);
- }, [trimBefore, mediaPlayerReady, mediaPlayerRef, currentTimeRef]);
-
- useLayoutEffect(() => {
- const mediaPlayer = mediaPlayerRef.current;
- if (!mediaPlayer || !mediaPlayerReady) {
- return;
- }
-
- mediaPlayer.setTrimAfter(trimAfter, currentTimeRef.current);
- }, [trimAfter, mediaPlayerReady, mediaPlayerRef, currentTimeRef]);
+ mediaPlayer.setTrimRange(trimBefore, trimAfter, currentTimeRef.current);
+ }, [trimAfter, trimBefore, mediaPlayerReady, mediaPlayerRef, currentTimeRef]);
useLayoutEffect(() => {
const mediaPlayer = mediaPlayerRef.current;
diff --git a/packages/studio/src/components/Timeline/TimelineSequence.tsx b/packages/studio/src/components/Timeline/TimelineSequence.tsx
index f3b4865daf..b19ba31325 100644
--- a/packages/studio/src/components/Timeline/TimelineSequence.tsx
+++ b/packages/studio/src/components/Timeline/TimelineSequence.tsx
@@ -99,6 +99,7 @@ const {
} = CanvasInternals;
const NEGATIVE_START_BORDER_WIDTH = 1;
const EDGE_DRAG_HIGHLIGHT_WIDTH = 12;
+const MIN_SECONDARY_LEFT_EDGE_ACTION_WIDTH = 32;
type RippleEditHighlight = {
readonly sequenceId: TSequence['id'];
@@ -521,10 +522,11 @@ const TimelineSequenceInner: React.FC<{
const [activeTrimEdge, setActiveTrimEdge] = useState<'left' | 'right' | null>(
null,
);
- const adjacentSeriesSequences = useMemo(() => {
- if (
- s.controls?.componentIdentity !== 'dev.remotion.remotion.Series.Sequence'
- ) {
+ const cascadingSequenceComponentIdentity = isCascadingSequence(s)
+ ? s.controls?.componentIdentity
+ : null;
+ const adjacentCascadingSequences = useMemo(() => {
+ if (!cascadingSequenceComponentIdentity) {
return {previous: null, next: null};
}
@@ -533,7 +535,7 @@ const TimelineSequenceInner: React.FC<{
(candidate) =>
candidate.parent === s.parent &&
candidate.controls?.componentIdentity ===
- 'dev.remotion.remotion.Series.Sequence',
+ cascadingSequenceComponentIdentity,
),
(candidate) => candidate.timelineOrder,
);
@@ -542,19 +544,19 @@ const TimelineSequenceInner: React.FC<{
previous: siblings[index - 1] ?? null,
next: siblings[index + 1] ?? null,
};
- }, [s.controls?.componentIdentity, s.id, s.parent, sequences]);
+ }, [cascadingSequenceComponentIdentity, s.id, s.parent, sequences]);
const startEdgeDrag = useCallback(
- (edge: 'left' | 'right', trimBeforeOnly: boolean) => {
+ (edge: 'left' | 'right', highlightAdjacent: boolean) => {
setActiveTrimEdge(edge);
- if (trimBeforeOnly) {
+ if (!highlightAdjacent) {
rippleEditHighlight?.setHighlight(null);
return;
}
const adjacent =
edge === 'left'
- ? adjacentSeriesSequences.previous
- : adjacentSeriesSequences.next;
+ ? adjacentCascadingSequences.previous
+ : adjacentCascadingSequences.next;
rippleEditHighlight?.setHighlight(
adjacent
? {
@@ -564,14 +566,15 @@ const TimelineSequenceInner: React.FC<{
: null,
);
},
- [adjacentSeriesSequences, rippleEditHighlight],
+ [adjacentCascadingSequences, rippleEditHighlight],
);
const startLeftEdgeDrag = useCallback(
- (trimBeforeOnly: boolean) => startEdgeDrag('left', trimBeforeOnly),
+ (mode: 'ripple' | 'source-only' | 'self-trim') =>
+ startEdgeDrag('left', mode === 'ripple'),
[startEdgeDrag],
);
const startRightEdgeDrag = useCallback(
- () => startEdgeDrag('right', false),
+ () => startEdgeDrag('right', true),
[startEdgeDrag],
);
const endEdgeDrag = useCallback(
@@ -690,17 +693,19 @@ const TimelineSequenceInner: React.FC<{
isStudioInteractivityEnabled() &&
propStatusesForOverride?.trimBefore?.status === 'static',
);
- const previousSeriesNodePath = adjacentSeriesSequences.previous?.controls
- ?.overrideId
+ const previousCascadingSequenceNodePath = adjacentCascadingSequences.previous
+ ?.controls?.overrideId
? overrideIdToNodePathMappingsRef.current[
- adjacentSeriesSequences.previous.controls.overrideId
+ adjacentCascadingSequences.previous.controls.overrideId
]
: null;
- const previousSeriesCanResize = Boolean(
+ const previousCascadingSequenceCanResize = Boolean(
isStudioInteractivityEnabled() &&
- previousSeriesNodePath &&
- Internals.getPropStatusesCtx(propStatuses, previousSeriesNodePath)
- ?.durationInFrames?.status === 'static',
+ previousCascadingSequenceNodePath &&
+ Internals.getPropStatusesCtx(
+ propStatuses,
+ previousCascadingSequenceNodePath,
+ )?.durationInFrames?.status === 'static',
);
const {previewServerState} = useContext(StudioServerConnectionCtx);
const previewConnected = previewServerState.type === 'connected';
@@ -1209,17 +1214,24 @@ const TimelineSequenceInner: React.FC<{
isTimelineSequenceLeftEdgeDraggable(s) &&
nodePath !== null &&
validatedLocation !== null &&
- (adjacentSeriesSequences.previous
- ? previousSeriesCanResize
+ (adjacentCascadingSequences.previous
+ ? previousCascadingSequenceCanResize
: (isCascadingSequence(s) || fromCanUpdate) &&
durationCanUpdate &&
trimBeforeCanUpdate);
- const showTrimBeforeDragHandle =
- isMedia &&
+ const canShowSecondaryLeftEdgeAction =
+ (isMedia || isCascadingSequence(s)) &&
isTimelineSequenceLeftEdgeDraggable(s) &&
nodePath !== null &&
validatedLocation !== null &&
- trimBeforeCanUpdate;
+ trimBeforeCanUpdate &&
+ (isMedia || durationCanUpdate) &&
+ (visibleLayout?.width ?? 0) >= MIN_SECONDARY_LEFT_EDGE_ACTION_WIDTH;
+ const secondaryLeftEdgeAction = canShowSecondaryLeftEdgeAction
+ ? isMedia
+ ? 'source-only'
+ : 'self-trim'
+ : null;
if ((maxMediaDuration === null && !s.loopDisplay) || visibleLayout === null) {
return null;
@@ -1259,7 +1271,7 @@ const TimelineSequenceInner: React.FC<{
onClick={canHandleSequenceDoubleClick ? onSequenceClick : null}
edgeDragHandles={
<>
- {(showLeftEdgeDragHandle || showTrimBeforeDragHandle) &&
+ {(showLeftEdgeDragHandle || secondaryLeftEdgeAction) &&
visibleLayout.leftEdgeVisible &&
negativeStartWidth === 0 &&
nodePathInfo &&
@@ -1268,7 +1280,7 @@ const TimelineSequenceInner: React.FC<{
cursor={`${timelineTrimEdgeCursor}, ew-resize`}
trimBeforeCursor={`${timelineLeftEdgeCursor}, e-resize`}
edgeEnabled={showLeftEdgeDragHandle}
- trimBeforeEnabled={showTrimBeforeDragHandle}
+ secondaryAction={secondaryLeftEdgeAction}
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 10818656e7..f98b4ed66b 100644
--- a/packages/studio/src/components/Timeline/TimelineSequenceRightEdgeDragHandle.tsx
+++ b/packages/studio/src/components/Timeline/TimelineSequenceRightEdgeDragHandle.tsx
@@ -65,6 +65,8 @@ const {getParentSequencePlaybackRate, sortItemsByCommitOrder} = CanvasInternals;
const HANDLE_INSET = 6;
const HANDLE_OUTSET = 8;
+const LEFT_EDGE_HANDLE_INSET = 4;
+const LEFT_EDGE_HANDLE_OUTSET = 4;
const timelineSequenceEdgeDragThresholdPx = 4;
export const timelineSequenceFromDragSnapThresholdPx = 10;
@@ -119,25 +121,43 @@ export const getTimelineSequenceMediaDurationDragLimits = ({
return null;
}
- const initialDuration =
- explicitDurationInFrames ??
- Math.ceil(
- displayStart +
- Math.max(
- 0,
- Math.min(
- displayDurationInFrames,
- timelineDurationInFrames - displayStart,
- effectiveMaxMediaDuration ?? Infinity,
- ),
- ) -
- cascadedStart,
- );
- const maximumDuration =
+ const containerEdgeDuration = Math.ceil(
+ displayStart +
+ Math.max(
+ 0,
+ Math.min(
+ displayDurationInFrames,
+ timelineDurationInFrames - displayStart,
+ ),
+ ) -
+ cascadedStart,
+ );
+ const displayedMediaEdgeDuration = Math.ceil(
+ displayStart +
+ Math.max(
+ 0,
+ Math.min(
+ displayDurationInFrames,
+ timelineDurationInFrames - displayStart,
+ effectiveMaxMediaDuration ?? Infinity,
+ ),
+ ) -
+ cascadedStart,
+ );
+ const hasInvisibleExplicitTail =
+ explicitDurationInFrames !== null &&
+ explicitDurationInFrames > containerEdgeDuration;
+ const initialDuration = hasInvisibleExplicitTail
+ ? containerEdgeDuration
+ : (explicitDurationInFrames ?? displayedMediaEdgeDuration);
+ const naturalMaximumDuration =
// Keeping duration omitted represents the media's natural end. An
// explicit duration is only useful once its edge is before that end.
Math.ceil(displayStart + naturalMediaDuration - cascadedStart) -
(hasImplicitDuration ? 1 : 0);
+ const maximumDuration = hasInvisibleExplicitTail
+ ? Math.min(naturalMaximumDuration, containerEdgeDuration)
+ : naturalMaximumDuration;
if (hasImplicitDuration && initialDuration > maximumDuration) {
return null;
@@ -962,6 +982,7 @@ export const getTimelineSequenceLeftEdgeDragTargets = ({
propStatuses,
timelineDurationInFrames = Infinity,
trimBeforeOnly = false,
+ rippleEdit = true,
}: {
readonly draggedNodePathInfo: SequenceNodePathInfo;
readonly selectedItems: readonly TimelineSelection[];
@@ -970,6 +991,7 @@ export const getTimelineSequenceLeftEdgeDragTargets = ({
readonly propStatuses: PropStatuses;
readonly timelineDurationInFrames?: number;
readonly trimBeforeOnly?: boolean;
+ readonly rippleEdit?: boolean;
}): TimelineSequenceLeftEdgeDragTarget[] | null => {
const draggedSelectionKey =
getTimelineSequenceSelectionKey(draggedNodePathInfo);
@@ -996,7 +1018,9 @@ export const getTimelineSequenceLeftEdgeDragTargets = ({
nodePathInfo: draggedNodePathInfo,
});
const targetNodePathInfos =
- !trimBeforeOnly && draggedTrack && isSeriesSequence(draggedTrack.sequence)
+ !trimBeforeOnly &&
+ draggedTrack &&
+ isCascadingSequence(draggedTrack.sequence)
? [draggedNodePathInfo]
: draggedItemIsSelected && selectedSequenceItems.length > 1
? selectedSequenceItems.map((item) => item.nodePathInfo)
@@ -1027,15 +1051,17 @@ export const getTimelineSequenceLeftEdgeDragTargets = ({
let ripplePrevious: TimelineSequenceLeftEdgeDragTarget['ripplePrevious'] =
null;
if (
+ rippleEdit &&
!trimBeforeOnly &&
targetNodePathInfos.length === 1 &&
- isSeriesSequence(originalSequence)
+ isCascadingSequence(originalSequence)
) {
+ const componentIdentity = originalSequence.controls?.componentIdentity;
const siblings = sortItemsByCommitOrder(
sequences.filter(
(candidate) =>
candidate.parent === originalSequence.parent &&
- isSeriesSequence(candidate),
+ candidate.controls?.componentIdentity === componentIdentity,
),
(candidate) => candidate.timelineOrder,
);
@@ -1370,13 +1396,13 @@ const TimelineSequenceLeftEdgeDragHandleInner: React.FC<{
readonly cursor: string;
readonly trimBeforeCursor: string;
readonly edgeEnabled: boolean;
- readonly trimBeforeEnabled: boolean;
+ readonly secondaryAction: 'source-only' | 'self-trim' | null;
readonly nodePathInfo: SequenceNodePathInfo;
readonly windowWidth: number;
readonly timelineDurationInFrames: number;
readonly initialEdgeFrame: number;
readonly fps: number;
- readonly onDragStart: (trimBeforeOnly: boolean) => void;
+ readonly onDragStart: (mode: 'ripple' | 'source-only' | 'self-trim') => void;
readonly onDragEnd: (wasDragged: boolean) => void;
readonly onSelect: (interaction?: TimelineSelectionInteraction) => void;
readonly selected: boolean;
@@ -1384,7 +1410,7 @@ const TimelineSequenceLeftEdgeDragHandleInner: React.FC<{
cursor,
trimBeforeCursor,
edgeEnabled,
- trimBeforeEnabled,
+ secondaryAction,
nodePathInfo,
windowWidth,
timelineDurationInFrames,
@@ -1419,7 +1445,7 @@ const TimelineSequenceLeftEdgeDragHandleInner: React.FC<{
pointerId: number;
selectionInteraction: TimelineSelectionInteraction | null;
targets: readonly TimelineSequenceLeftEdgeDragTarget[];
- trimBeforeOnly: boolean;
+ mode: 'ripple' | 'source-only' | 'self-trim';
} | null>(null);
const latestRef = useRef({
@@ -1474,7 +1500,7 @@ const TimelineSequenceLeftEdgeDragHandleInner: React.FC<{
const changes = getTimelineSequenceLeftEdgeDragChanges({
targets: dragState.targets,
deltaFrames: dragState.latestDeltaFrames,
- trimBeforeOnly: dragState.trimBeforeOnly,
+ trimBeforeOnly: dragState.mode === 'source-only',
});
if (
@@ -1495,20 +1521,22 @@ const TimelineSequenceLeftEdgeDragHandleInner: React.FC<{
changes,
setPropStatuses: latestSetPropStatuses,
clientId: latestServerState.clientId,
- undoLabel: dragState.trimBeforeOnly
- ? dragState.targets.length > 1
- ? 'Adjust source start of selected sequences'
- : 'Adjust source start'
- : dragState.targets.length > 1
- ? 'Resize selected sequences'
- : 'Resize sequence',
- redoLabel: dragState.trimBeforeOnly
- ? dragState.targets.length > 1
- ? 'Adjust source start of selected sequences back'
- : 'Adjust source start back'
- : dragState.targets.length > 1
- ? 'Resize selected sequences back'
- : 'Resize sequence back',
+ undoLabel:
+ dragState.mode === 'source-only'
+ ? dragState.targets.length > 1
+ ? 'Adjust source start of selected sequences'
+ : 'Adjust source start'
+ : dragState.targets.length > 1
+ ? 'Resize selected sequences'
+ : 'Resize sequence',
+ redoLabel:
+ dragState.mode === 'source-only'
+ ? dragState.targets.length > 1
+ ? 'Adjust source start of selected sequences back'
+ : 'Adjust source start back'
+ : dragState.targets.length > 1
+ ? 'Resize selected sequences back'
+ : 'Resize sequence back',
});
savePromise
@@ -1533,8 +1561,14 @@ const TimelineSequenceLeftEdgeDragHandleInner: React.FC<{
return;
}
- const trimBeforeOnly = e.currentTarget.dataset.trimMode === 'source';
- const activeCursor = trimBeforeOnly ? trimBeforeCursor : cursor;
+ const mode =
+ e.currentTarget.dataset.trimMode === 'source-only'
+ ? 'source-only'
+ : e.currentTarget.dataset.trimMode === 'self-trim'
+ ? 'self-trim'
+ : 'ripple';
+ const trimBeforeOnly = mode === 'source-only';
+ const activeCursor = mode === 'ripple' ? cursor : trimBeforeCursor;
e.stopPropagation();
e.preventDefault();
@@ -1566,6 +1600,7 @@ const TimelineSequenceLeftEdgeDragHandleInner: React.FC<{
propStatuses: propStatusesRef.current,
timelineDurationInFrames,
trimBeforeOnly,
+ rippleEdit: mode === 'ripple',
}) ?? [])
: [];
const draggedKey = stringifySequenceSubscriptionKey(
@@ -1580,7 +1615,7 @@ const TimelineSequenceLeftEdgeDragHandleInner: React.FC<{
const initialTimelineEdge = latestRef.current.initialEdgeFrame;
stopPointerSessionRef.current?.();
- onDragStart(trimBeforeOnly);
+ onDragStart(mode);
dragStateRef.current = {
initialClientX: e.clientX,
latestDeltaFrames: 0,
@@ -1589,7 +1624,7 @@ const TimelineSequenceLeftEdgeDragHandleInner: React.FC<{
pointerId: e.pointerId,
selectionInteraction,
targets,
- trimBeforeOnly,
+ mode,
};
document.body.style.userSelect = 'none';
document.body.style.webkitUserSelect = 'none';
@@ -1602,21 +1637,25 @@ const TimelineSequenceLeftEdgeDragHandleInner: React.FC<{
}
const dx = pointerEvent.clientX - dragState.initialClientX;
- const deltaFrames = Math.round(dx / dragState.pxPerFrame);
+ const pointerDeltaFrames = Math.round(dx / dragState.pxPerFrame);
+ const deltaFrames =
+ dragState.mode === 'self-trim'
+ ? -pointerDeltaFrames
+ : pointerDeltaFrames;
dragState.latestDeltaFrames = deltaFrames;
if (
Math.abs(dx) >= timelineSequenceEdgeDragThresholdPx ||
getTimelineSequenceLeftEdgeDragChanges({
targets: dragState.targets,
deltaFrames,
- trimBeforeOnly: dragState.trimBeforeOnly,
+ trimBeforeOnly: dragState.mode === 'source-only',
}).length > 0
) {
dragState.didMove = true;
}
for (const target of dragState.targets) {
- if (target.ripplePrevious && !dragState.trimBeforeOnly) {
+ if (target.ripplePrevious) {
const previous = target.ripplePrevious;
const nextDuration = getTimelineSequenceDurationDragValue({
initialDuration: previous.initialDuration,
@@ -1644,10 +1683,13 @@ const TimelineSequenceLeftEdgeDragHandleInner: React.FC<{
deltaFrames: deltaFrames * target.parentPlaybackRate,
playbackRate: target.playbackRate,
minimumDuration: target.minimumDuration,
- trimBeforeOnly: dragState.trimBeforeOnly,
+ trimBeforeOnly: dragState.mode === 'source-only',
});
- if (!dragState.trimBeforeOnly && target.positionField !== null) {
+ if (
+ dragState.mode !== 'source-only' &&
+ target.positionField !== null
+ ) {
latestRef.current.setDragOverrides(
target.nodePath,
target.positionField,
@@ -1655,7 +1697,7 @@ const TimelineSequenceLeftEdgeDragHandleInner: React.FC<{
);
}
- if (!dragState.trimBeforeOnly) {
+ if (dragState.mode !== 'source-only') {
latestRef.current.setDragOverrides(
target.nodePath,
'durationInFrames',
@@ -1693,16 +1735,17 @@ const TimelineSequenceLeftEdgeDragHandleInner: React.FC<{
deltaFrames,
playbackRate: draggedTarget.playbackRate,
minimumDuration: draggedTarget.minimumDuration,
- trimBeforeOnly: dragState.trimBeforeOnly,
+ trimBeforeOnly: dragState.mode === 'source-only',
});
- appliedDelta = dragState.trimBeforeOnly
- ? (values.trimBefore - draggedTarget.initialTrimBefore) /
- draggedTarget.playbackRate
- : values.from - draggedTarget.initialFrom;
+ appliedDelta =
+ dragState.mode === 'source-only'
+ ? (values.trimBefore - draggedTarget.initialTrimBefore) /
+ draggedTarget.playbackRate
+ : values.from - draggedTarget.initialFrom;
}
const edgeDelta =
- dragState.trimBeforeOnly ||
+ dragState.mode === 'source-only' ||
(draggedTarget.positionField === null && ripplePrevious === null)
? 0
: appliedDelta;
@@ -1774,8 +1817,8 @@ const TimelineSequenceLeftEdgeDragHandleInner: React.FC<{
const edgeStyle: React.CSSProperties = {
...baseStyle,
- left: -HANDLE_OUTSET,
- width: 'calc(8px + min(4px, 12.5%))',
+ left: -LEFT_EDGE_HANDLE_OUTSET,
+ width: `calc(${LEFT_EDGE_HANDLE_OUTSET}px + min(${LEFT_EDGE_HANDLE_INSET}px, 12.5%))`,
cursor,
background: TRANSPARENT,
};
@@ -1798,12 +1841,16 @@ const TimelineSequenceLeftEdgeDragHandleInner: React.FC<{
onPointerDown={onPointerDown}
/>
) : null}
- {trimBeforeEnabled ? (
+ {secondaryAction ? (
<div
role="separator"
aria-orientation="vertical"
- aria-label="Drag to adjust source start"
- data-trim-mode="source"
+ aria-label={
+ secondaryAction === 'source-only'
+ ? 'Drag to adjust source start'
+ : 'Drag to trim start without ripple'
+ }
+ data-trim-mode={secondaryAction}
style={trimBeforeStyle}
onPointerDown={onPointerDown}
/>
@@ -2367,11 +2414,13 @@ const TimelineSequenceRightEdgeDragHandleInner: React.FC<{
if (dragState.didMove && draggedTarget) {
const previewValue = getTimelineSequenceDurationDragValue({
initialDuration: draggedTarget.initialDuration,
- deltaFrames,
+ deltaFrames: deltaFrames * draggedTarget.parentPlaybackRate,
maximumDuration: draggedTarget.maximumDuration,
minimumDuration: draggedTarget.minimumDuration,
});
- const appliedDelta = previewValue - draggedTarget.initialDuration;
+ const appliedDelta =
+ (previewValue - draggedTarget.initialDuration) /
+ draggedTarget.parentPlaybackRate;
setTrimTooltip({
deltaFrames: appliedDelta,
edgeFrame: initialTimelineEdge + appliedDelta,
diff --git a/packages/studio/src/components/Timeline/timeline-left-edge-cursor.ts b/packages/studio/src/components/Timeline/timeline-left-edge-cursor.ts
index 4eafc0e697..e56f3204d6 100644
--- a/packages/studio/src/components/Timeline/timeline-left-edge-cursor.ts
+++ b/packages/studio/src/components/Timeline/timeline-left-edge-cursor.ts
@@ -11,4 +11,4 @@ const timelineLeftEdgeCursorSvg = `<svg width="24" height="24" viewBox="0 0 32 3
</defs>
</svg>`;
-export const timelineLeftEdgeCursor = `url("data:image/svg+xml,${encodeURIComponent(timelineLeftEdgeCursorSvg)}") 12 12`;
+export const timelineLeftEdgeCursor = `url("data:image/svg+xml,${encodeURIComponent(timelineLeftEdgeCursorSvg)}") 2.25 12`;
diff --git a/packages/studio/src/components/Timeline/timeline-right-edge-cursor.ts b/packages/studio/src/components/Timeline/timeline-right-edge-cursor.ts
new file mode 100644
index 0000000000..904aacc961
--- /dev/null
+++ b/packages/studio/src/components/Timeline/timeline-right-edge-cursor.ts
@@ -0,0 +1,14 @@
+const timelineRightEdgeCursorSvg = `<svg width="24" height="24" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g transform="translate(32 0) scale(-1 1)" filter="url(#shadow)">
+<path d="M3 16L12 10V22L3 16Z" fill="black" stroke="white" stroke-width="1.5" stroke-linejoin="round"/>
+<path d="M23 4.5H18C16.9 4.5 16 5.4 16 6.5V25.5C16 26.6 16.9 27.5 18 27.5H23" stroke="white" stroke-width="5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M23 4.5H18C16.9 4.5 16 5.4 16 6.5V25.5C16 26.6 16.9 27.5 18 27.5H23" stroke="black" stroke-width="2.5" stroke-linecap="round" stroke-linejoin="round"/>
+</g>
+<defs>
+<filter id="shadow" x="0" y="0" width="32" height="32" filterUnits="userSpaceOnUse">
+<feDropShadow dx="0" dy="1.5" stdDeviation="1" flood-color="black" flood-opacity="0.35"/>
+</filter>
+</defs>
+</svg>`;
+
+export const timelineRightEdgeCursor = `url("data:image/svg+xml,${encodeURIComponent(timelineRightEdgeCursorSvg)}") 21.75 12`;
diff --git a/packages/studio/src/test/timeline-selection.test.ts b/packages/studio/src/test/timeline-selection.test.ts
index 25728a3cbf..7d701650e9 100644
--- a/packages/studio/src/test/timeline-selection.test.ts
+++ b/packages/studio/src/test/timeline-selection.test.ts
@@ -2432,6 +2432,7 @@ test('Timeline duration drag clamps each selected sequence to one frame', () =>
test('TransitionSeries.Sequence resize clamps to adjacent transition durations', () => {
const schema = {} satisfies InteractivitySchema;
+ const firstNodePathInfo = makeNodePathInfo(['body', 0], []);
const nodePathInfo = makeNodePathInfo(['body', 2], []);
const transitionSeriesSequence = (
id: string,
@@ -2465,10 +2466,14 @@ test('TransitionSeries.Sequence resize clamps to adjacent transition durations',
transition('next-transition', 12, 3),
];
const propStatuses = makeLeftEdgePropStatuses(
- [nodePathInfo.sequenceSubscriptionKey],
+ [
+ firstNodePathInfo.sequenceSubscriptionKey,
+ nodePathInfo.sequenceSubscriptionKey,
+ ],
true,
);
const overrideIdsToNodePaths = {
+ first: firstNodePathInfo.sequenceSubscriptionKey,
target: nodePathInfo.sequenceSubscriptionKey,
};
const selectedItems = [{type: 'sequence' as const, nodePathInfo}];
@@ -2499,16 +2504,13 @@ test('TransitionSeries.Sequence resize clamps to adjacent transition durations',
propStatuses,
});
- expect(leftEdgeTargets?.[0].minimumDuration).toBe(12);
+ expect(leftEdgeTargets?.[0].ripplePrevious?.minimumDuration).toBe(8);
expect(
getTimelineSequenceLeftEdgeDragChanges({
targets: leftEdgeTargets ?? [],
- deltaFrames: 100,
+ deltaFrames: -100,
}).map((change) => [change.fieldKey, change.value]),
- ).toEqual([
- ['durationInFrames', 12],
- ['trimBefore', 28],
- ]);
+ ).toEqual([['durationInFrames', 8]]);
});
test('Timeline duration drag is blocked if one selected sequence cannot update duration', () => {
@@ -2735,7 +2737,7 @@ test('Timeline left edge drag adjusts from, duration and trimBefore for selected
]);
});
-test('TransitionSeries.Sequence left edge drag leaves its calculated position unchanged', () => {
+test('TransitionSeries.Sequence self-trim changes its duration and trimBefore', () => {
const schema = {} satisfies InteractivitySchema;
const nodePathInfo = makeNodePathInfo(['body', 0], []);
const subscriptionKey = nodePathInfo.sequenceSubscriptionKey;
@@ -2773,6 +2775,7 @@ test('TransitionSeries.Sequence left edge drag leaves its calculated position un
effects: [],
},
},
+ rippleEdit: false,
});
expect(targets?.[0]).toMatchObject({
@@ -2792,7 +2795,7 @@ test('TransitionSeries.Sequence left edge drag leaves its calculated position un
]);
});
-test('Series.Sequence left edge drag leaves its calculated position unchanged', () => {
+test('Series.Sequence self-trim changes its duration and trimBefore', () => {
const schema = {} satisfies InteractivitySchema;
const nodePathInfo = makeNodePathInfo(['body', 0], []);
const subscriptionKey = nodePathInfo.sequenceSubscriptionKey;
@@ -2830,6 +2833,7 @@ test('Series.Sequence left edge drag leaves its calculated position unchanged',
effects: [],
},
},
+ rippleEdit: false,
});
expect(targets?.[0]).toMatchObject({