🎥 Make videos programmatically with React
Disable implicit media resizing past asset end
JonnyBurger7ba311c50744
diff --git a/packages/studio/src/components/Timeline/TimelineSequenceRightEdgeDragHandle.tsx b/packages/studio/src/components/Timeline/TimelineSequenceRightEdgeDragHandle.tsxindex aa6b272b26..4b5cbfb82c 100644--- a/packages/studio/src/components/Timeline/TimelineSequenceRightEdgeDragHandle.tsx+++ b/packages/studio/src/components/Timeline/TimelineSequenceRightEdgeDragHandle.tsx@@ -82,27 +82,31 @@ export const getTimelineSequenceMediaDurationDragLimits = ({return null;}- return {- initialDuration:- explicitDurationInFrames ??- Math.ceil(- displayStart +- Math.max(- 0,- Math.min(- displayDurationInFrames,- timelineDurationInFrames - displayStart,- effectiveMaxMediaDuration ?? Infinity,- ),- ) -- cascadedStart,- ),- maximumDuration:- // 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 initialDuration =+ explicitDurationInFrames ??+ Math.ceil(+ displayStart ++ Math.max(+ 0,+ Math.min(+ displayDurationInFrames,+ timelineDurationInFrames - displayStart,+ effectiveMaxMediaDuration ?? Infinity,+ ),+ ) -+ cascadedStart,+ );+ const maximumDuration =+ // 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);++ if (hasImplicitDuration && initialDuration > maximumDuration) {+ return null;+ }++ return {initialDuration, maximumDuration};};const getTimelineSequenceEdgeSelectionInteraction = ({diff --git a/packages/studio/src/test/timeline-selection.test.ts b/packages/studio/src/test/timeline-selection.test.tsindex adc76f262d..3c30cfbfed 100644--- a/packages/studio/src/test/timeline-selection.test.ts+++ b/packages/studio/src/test/timeline-selection.test.ts@@ -1955,6 +1955,33 @@ test('Media duration drag limits account for a negative from', () => {).toEqual({initialDuration: 300, maximumDuration: 225});});+test('Implicit media cannot be resized once its edge reaches the asset end', () => {+ const common = {+ cascadedStart: -34,+ displayDurationInFrames: 266,+ displayStart: 0,+ effectiveMaxMediaDuration: null,+ explicitDurationInFrames: null,+ hasImplicitDuration: true,+ timelineDurationInFrames: 300,+ };++ expect(+ getTimelineSequenceMediaDurationDragLimits({+ ...common,+ // The video holds its last frame until the composition ends.+ naturalMediaDuration: 220,+ }),+ ).toBe(null);+ expect(+ getTimelineSequenceMediaDurationDragLimits({+ ...common,+ // The composition ends before the source video does.+ naturalMediaDuration: 400,+ }),+ ).toEqual({initialDuration: 300, maximumDuration: 433});+});+test('Timeline duration drag clamps explicit audio and video to the asset end', () => {for (const type of ['audio', 'video'] as const) {const nodePathInfo = makeNodePathInfo(['body', type], []);