Skip to content

🎥 Make videos programmatically with React

Keep explicit overlong media durations editable

JonnyBurger1166de305e95
diff --git a/packages/studio/src/components/Timeline/TimelineSequenceRightEdgeDragHandle.tsx b/packages/studio/src/components/Timeline/TimelineSequenceRightEdgeDragHandle.tsx
index e13a9b210a..bf1056ae4a 100644
--- a/packages/studio/src/components/Timeline/TimelineSequenceRightEdgeDragHandle.tsx
+++ b/packages/studio/src/components/Timeline/TimelineSequenceRightEdgeDragHandle.tsx
@@ -173,7 +173,6 @@ export type TimelineSequenceDurationDragTarget = {
readonly maximumDuration: number;
readonly minimumDuration: number;
readonly nodePath: SequencePropsSubscriptionKey;
- readonly onlyCommitDurationWithinMaximum: boolean;
readonly schema: InteractivitySchema;
};
@@ -492,32 +491,6 @@ export const getTimelineSequenceDurationDragValue = ({
Math.max(minimumDuration, initialDuration + deltaFrames),
);
-const getTimelineSequenceDurationDragValueForTarget = ({
- target,
- deltaFrames,
-}: {
- readonly target: TimelineSequenceDurationDragTarget;
- readonly deltaFrames: number;
-}) => {
- const unclampedValue = Math.max(
- target.minimumDuration,
- target.initialDuration + deltaFrames,
- );
- if (
- target.onlyCommitDurationWithinMaximum &&
- unclampedValue > target.maximumDuration
- ) {
- return null;
- }
-
- return getTimelineSequenceDurationDragValue({
- initialDuration: target.initialDuration,
- deltaFrames,
- maximumDuration: target.maximumDuration,
- minimumDuration: target.minimumDuration,
- });
-};
-
export const getTimelineSequenceLeftEdgeDragDelta = ({
initialDuration,
initialTrimBefore,
@@ -633,13 +606,12 @@ export const getTimelineSequenceDurationDragChanges = ({
readonly deltaFrames: number;
}): SaveSequencePropChange[] => {
return targets.flatMap((target) => {
- const nextValue = getTimelineSequenceDurationDragValueForTarget({
- target,
+ const nextValue = getTimelineSequenceDurationDragValue({
+ initialDuration: target.initialDuration,
deltaFrames,
+ maximumDuration: target.maximumDuration,
+ minimumDuration: target.minimumDuration,
});
- if (nextValue === null) {
- return [];
- }
if (nextValue === target.initialDuration) {
return [];
@@ -911,10 +883,6 @@ export const getTimelineSequenceDurationDragTargets = ({
const selectionKey = getTimelineSequenceSelectionKey(nodePathInfo);
const isMedia =
originalSequence.type === 'audio' || originalSequence.type === 'video';
- const hasImplicitMediaDuration =
- isMedia &&
- durationStatus?.status === 'static' &&
- durationStatus.codeValue === undefined;
const isDraggedSequence = selectionKey === draggedSelectionKey;
const mediaDurationDragLimits = isMedia
? isDraggedSequence
@@ -935,12 +903,8 @@ export const getTimelineSequenceDurationDragTargets = ({
mediaDurationDragLimits?.maximumDuration ?? Infinity,
timelineDurationInFrames - track.cascadedStart,
);
- if (isMedia && constrainedMaximumDuration < minimumDuration) {
- return null;
- }
-
const maximumDuration = isMedia
- ? constrainedMaximumDuration
+ ? Math.max(minimumDuration, initialDuration, constrainedMaximumDuration)
: Math.max(minimumDuration, constrainedMaximumDuration);
targets.set(key, {
@@ -950,8 +914,6 @@ export const getTimelineSequenceDurationDragTargets = ({
// A negative start needs enough duration to retain one visible frame.
minimumDuration,
nodePath,
- onlyCommitDurationWithinMaximum:
- hasImplicitMediaDuration || initialDuration > maximumDuration,
schema: controls.schema,
});
}
@@ -2088,19 +2050,12 @@ const TimelineSequenceRightEdgeDragHandleInner: React.FC<{
}
for (const target of dragState.targets) {
- const committableValue =
- getTimelineSequenceDurationDragValueForTarget({
- target,
- deltaFrames,
- });
- const previewValue =
- committableValue ??
- getTimelineSequenceDurationDragValue({
- initialDuration: target.initialDuration,
- deltaFrames,
- maximumDuration: target.initialDuration,
- minimumDuration: target.minimumDuration,
- });
+ const previewValue = getTimelineSequenceDurationDragValue({
+ initialDuration: target.initialDuration,
+ deltaFrames,
+ maximumDuration: target.maximumDuration,
+ minimumDuration: target.minimumDuration,
+ });
latestRef.current.setDragOverrides(
target.nodePath,
diff --git a/packages/studio/src/test/timeline-selection.test.ts b/packages/studio/src/test/timeline-selection.test.ts
index 0b7d0905c6..291fce8bf8 100644
--- a/packages/studio/src/test/timeline-selection.test.ts
+++ b/packages/studio/src/test/timeline-selection.test.ts
@@ -1998,7 +1998,6 @@ test('Timeline duration drag supports interactive video clips', () => {
maximumDuration: 1000,
minimumDuration: 1,
nodePath: nodePathInfo.sequenceSubscriptionKey,
- onlyCommitDurationWithinMaximum: false,
schema: Internals.baseSchema,
},
]);
@@ -2093,7 +2092,7 @@ test('Timeline duration drag clamps explicit audio and video to the asset end',
}
});
-test('An overlong explicit Video is only saved once it reaches the asset end', () => {
+test('An overlong explicit Video can be shortened without snapping', () => {
const nodePathInfo = makeNodePathInfo(['body', 0], []);
const nodePath = nodePathInfo.sequenceSubscriptionKey;
const targets = getTimelineSequenceDurationDragTargets({
@@ -2117,18 +2116,19 @@ test('An overlong explicit Video is only saved once it reaches the asset end', (
timelineDurationInFrames: 1000,
});
+ expect(targets?.[0].maximumDuration).toBe(300);
expect(
getTimelineSequenceDurationDragChanges({
targets: targets ?? [],
- deltaFrames: -74,
+ deltaFrames: 1,
}),
).toEqual([]);
expect(
getTimelineSequenceDurationDragChanges({
targets: targets ?? [],
- deltaFrames: -75,
+ deltaFrames: -1,
})[0].value,
- ).toBe(225);
+ ).toBe(299);
});
test('Timeline duration drag trims audio and video without an explicit duration', () => {
@@ -2143,7 +2143,7 @@ test('Timeline duration drag trims audio and video without an explicit duration'
const targets = getTimelineSequenceDurationDragTargets({
draggedNodePathInfo: nodePathInfo,
draggedSequenceMediaDurationDragLimits: {
- initialDuration: 78,
+ initialDuration: 70,
maximumDuration: 77,
},
selectedSequenceMediaDurationDragLimits: null,
@@ -2169,14 +2169,14 @@ test('Timeline duration drag trims audio and video without an explicit duration'
});
expect(isTimelineSequenceDurationDraggable(media)).toBe(true);
- expect(targets?.[0].initialDuration).toBe(78);
+ expect(targets?.[0].initialDuration).toBe(70);
expect(targets?.[0].maximumDuration).toBe(77);
expect(
getTimelineSequenceDurationDragChanges({
targets: targets ?? [],
deltaFrames: 10,
- }),
- ).toEqual([]);
+ })[0].value,
+ ).toBe(77);
expect(
getTimelineSequenceDurationDragChanges({
targets: targets ?? [],
@@ -2187,7 +2187,7 @@ test('Timeline duration drag trims audio and video without an explicit duration'
fileName: nodePath.absolutePath,
nodePath,
fieldKey: 'durationInFrames',
- value: 68,
+ value: 60,
defaultValue: null,
schema: Internals.baseSchema,
},
@@ -2230,56 +2230,6 @@ test('Timeline duration drag waits for an effective implicit media duration', ()
).toBe(null);
});
-test('Implicit Video duration is only inserted below the media end', () => {
- const nodePathInfo = makeNodePathInfo(['body', 0], []);
- const nodePath = nodePathInfo.sequenceSubscriptionKey;
- const targets = getTimelineSequenceDurationDragTargets({
- draggedNodePathInfo: nodePathInfo,
- draggedSequenceMediaDurationDragLimits: {
- // <Video> holds its last frame and can therefore reach the composition end.
- initialDuration: 300,
- maximumDuration: 99,
- },
- selectedSequenceMediaDurationDragLimits: null,
- selectedItems: [{type: 'sequence', nodePathInfo}],
- sequences: [
- makeTimelineSequence({
- schema: Internals.baseSchema,
- type: 'video',
- duration: Infinity,
- }),
- ],
- overrideIdsToNodePaths: {override: nodePath},
- propStatuses: {
- [Internals.makeSequencePropsSubscriptionKey(nodePath)]: {
- canUpdate: true,
- props: {
- durationInFrames: {
- status: 'static',
- keyframeDisplayOffsetAdjustment: null,
- codeValue: undefined,
- },
- },
- effects: [],
- },
- },
- timelineDurationInFrames: 300,
- });
-
- expect(
- getTimelineSequenceDurationDragChanges({
- targets: targets ?? [],
- deltaFrames: -200,
- }),
- ).toEqual([]);
- expect(
- getTimelineSequenceDurationDragChanges({
- targets: targets ?? [],
- deltaFrames: -201,
- })[0].value,
- ).toBe(99);
-});
-
test('Timeline duration drag supports interactive cascading sequence rows', () => {
const baseSequence = makeTimelineSequence({
schema: Internals.baseSchema,