Skip to content

🎥 Make videos programmatically with React

Prevent timeline moves from overlapping Track clips

Jonny Burger1d680cfa1f6f
diff --git a/packages/studio/src/components/Timeline/TimelineSequenceRightEdgeDragHandle.tsx b/packages/studio/src/components/Timeline/TimelineSequenceRightEdgeDragHandle.tsx
index 15e3bd5e56..3d92be8282 100644
--- a/packages/studio/src/components/Timeline/TimelineSequenceRightEdgeDragHandle.tsx
+++ b/packages/studio/src/components/Timeline/TimelineSequenceRightEdgeDragHandle.tsx
@@ -259,6 +259,7 @@ export type TimelineSequenceFromDragTarget = {
readonly parentPlaybackRate: number;
readonly canSnapToTimelineStart: boolean;
readonly minimumDeltaFrames: number;
+ readonly maximumDeltaFrames: number;
readonly initialTimelineStart: number;
readonly effectKeyframes: TimelineSequenceEffectKeyframeDragTarget[];
readonly fileName: string;
@@ -769,8 +770,11 @@ const getTimelineSequenceFromDragResult = ({
),
);
const maximumDelta = Math.min(
- ...targets.map(
- (target) => timelineDurationInFrames - 1 - target.initialTimelineStart,
+ ...targets.map((target) =>
+ Math.min(
+ target.maximumDeltaFrames,
+ timelineDurationInFrames - 1 - target.initialTimelineStart,
+ ),
),
);
// Keep selected clips inside their parents unless they started before them,
@@ -1046,6 +1050,7 @@ export const getTimelineSequenceDurationDragTargets = ({
}
const timingLimits = getTimelineSequenceTimingLimits({
+ movingSequenceIds: null,
track,
tracks,
sequences,
@@ -1311,6 +1316,7 @@ export const getTimelineSequenceLeftEdgeDragTargets = ({
positionField,
ripplePrevious,
timingLimits: getTimelineSequenceTimingLimits({
+ movingSequenceIds: null,
track,
tracks,
sequences,
@@ -1464,15 +1470,39 @@ export const getTimelineSequenceFromDragTargets = ({
const sequenceKeyframes = descendantKeyframes.flatMap(
(descendant) => descendant.sequenceKeyframes,
);
+ const parentPlaybackRate = getParentSequencePlaybackRate(
+ originalSequence,
+ sequences,
+ );
+ const track = tracks.find(
+ (candidate) => candidate.sequence.id === originalSequence.id,
+ )!;
+ const timingLimits = getTimelineSequenceTimingLimits({
+ track,
+ tracks,
+ sequences,
+ timelineDurationInFrames: Infinity,
+ movingSequenceIds: selectedSequenceIds,
+ });
+ // All selected clips share a composition-frame delta. Ignore moving neighbours
+ // and intersect each clip's bounds so the selection keeps its spacing.
targets.set(key, {
- parentPlaybackRate: getParentSequencePlaybackRate(
- originalSequence,
- sequences,
- ),
+ parentPlaybackRate,
canSnapToTimelineStart: true,
- minimumDeltaFrames:
+ minimumDeltaFrames: Math.max(
(1 - originalSequence.duration - originalSequence.from) /
- getParentSequencePlaybackRate(originalSequence, sequences),
+ parentPlaybackRate,
+ Math.min(
+ 0,
+ (timingLimits.minimumFrom - originalSequence.from) /
+ parentPlaybackRate,
+ ),
+ ),
+ maximumDeltaFrames: Math.max(
+ 0,
+ (timingLimits.maximumFrom - originalSequence.from) /
+ parentPlaybackRate,
+ ),
initialTimelineStart,
effectKeyframes,
fileName: nodePath.absolutePath,
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 f7e5aba726..bf5b1c7d2a 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
@@ -80,11 +80,13 @@ export const getTimelineSequenceTimingLimits = ({
tracks,
sequences,
timelineDurationInFrames,
+ movingSequenceIds,
}: {
readonly track: TimelineTrackData;
readonly tracks: readonly TimelineTrackData[];
readonly sequences: TSequence[];
readonly timelineDurationInFrames: number;
+ readonly movingSequenceIds: ReadonlySet<string> | null;
}) => {
const sequence = sequences.find((item) => item.id === track.sequence.id)!;
const runtimeValues = sequence.controls?.runtimeValues.getSnapshot() ?? {};
@@ -128,6 +130,7 @@ export const getTimelineSequenceTimingLimits = ({
const sibling = item.sequence;
if (
sibling.id === sequence.id ||
+ movingSequenceIds?.has(sibling.id) ||
sibling.timelineTrack?.role !== 'clip' ||
sibling.timelineTrack.id !== sequence.timelineTrack.id ||
(!sibling.showInTimeline && sibling.type === 'sequence') ||
diff --git a/packages/studio/src/components/Timeline/use-clamp-sequence-timing-value.ts b/packages/studio/src/components/Timeline/use-clamp-sequence-timing-value.ts
index bf92dcd809..1247cf743d 100644
--- a/packages/studio/src/components/Timeline/use-clamp-sequence-timing-value.ts
+++ b/packages/studio/src/components/Timeline/use-clamp-sequence-timing-value.ts
@@ -44,6 +44,7 @@ export const useClampSequenceTimingValue = () => {
);
for (const track of matching) {
const next = getTimelineSequenceTimingLimits({
+ movingSequenceIds: null,
track,
tracks,
sequences,
diff --git a/packages/studio/src/test/timeline-selection.test.ts b/packages/studio/src/test/timeline-selection.test.ts
index 3c9a0329ab..b666961f2d 100644
--- a/packages/studio/src/test/timeline-selection.test.ts
+++ b/packages/studio/src/test/timeline-selection.test.ts
@@ -3280,7 +3280,7 @@ test('Timeline from drag applies the same delta to selected sequences', () => {
expect(targets?.map((target) => target.initialFrom)).toEqual([0, 10]);
for (const [deltaFrames, expected] of [
- [-100, -0],
+ [-100, 0],
[100, 79],
]) {
expect(
@@ -3627,6 +3627,7 @@ test('Timeline from drag snaps a root sequence to frame 0', () => {
parentPlaybackRate: 1,
canSnapToTimelineStart: true,
minimumDeltaFrames: -100,
+ maximumDeltaFrames: Infinity,
initialTimelineStart: 8,
effectKeyframes: [],
fileName: nodePath.absolutePath,
@@ -3679,6 +3680,7 @@ test('Timeline from drag does not snap nested sequences to the timeline start',
parentPlaybackRate: 1,
canSnapToTimelineStart: false,
minimumDeltaFrames: -100,
+ maximumDeltaFrames: Infinity,
initialTimelineStart: 8,
effectKeyframes: [],
fileName: nodePath.absolutePath,
@@ -3788,6 +3790,7 @@ test('Timeline from drag removes the prop at the default value', () => {
parentPlaybackRate: 1,
canSnapToTimelineStart: true,
minimumDeltaFrames: -100,
+ maximumDeltaFrames: Infinity,
initialTimelineStart: 8,
effectKeyframes: [],
fileName: nodePathInfo.sequenceSubscriptionKey.absolutePath,