🎥 Make videos programmatically with React
fix(studio): trim clipped layers at their visible edge
JonnyBurgere612bde04220
diff --git a/packages/studio/src/components/Timeline/TimelineSequence.tsx b/packages/studio/src/components/Timeline/TimelineSequence.tsxindex a0543a511a..4a27b624c0 100644--- a/packages/studio/src/components/Timeline/TimelineSequence.tsx+++ b/packages/studio/src/components/Timeline/TimelineSequence.tsx@@ -2367,7 +2367,6 @@ const TimelineSequenceLayoutInner: React.FC<{(s.timelineTrack?.role === 'transition' && rollingEnabled)) &&(s.timelineTrack?.role === 'transition' ||visibleLayout.media?.offset === 0) &&- (negativeStartWidth === 0 || activeTrimEdge === 'left') &&nodePathInfo &&validatedLocation,);@@ -2382,6 +2381,7 @@ const TimelineSequenceLayoutInner: React.FC<{nodePathInfo &&validatedLocation,);+ // The negative-time gutter is an indicator, not an editable clip boundary.const leftEdgeOffset =s.timelineTrack?.role === 'transition'? 0diff --git a/packages/studio/src/components/Timeline/TimelineSequenceRightEdgeDragHandle.tsx b/packages/studio/src/components/Timeline/TimelineSequenceRightEdgeDragHandle.tsxindex 30c078cc1d..0f80843f6c 100644--- a/packages/studio/src/components/Timeline/TimelineSequenceRightEdgeDragHandle.tsx+++ b/packages/studio/src/components/Timeline/TimelineSequenceRightEdgeDragHandle.tsx@@ -1381,6 +1381,31 @@ export const getTimelineSequenceLeftEdgeDragTargets = ({? (track.sequence.from - track.cascadedStart) *track.keyframePlaybackRate: 0;+ const timingLimits = getTimelineSequenceTimingLimits({+ propStatuses,+ movingSequenceIds: null,+ track,+ tracks,+ sequences,+ timelineDurationInFrames,+ });+ if (!trimBeforeOnly && positionField === 'from') {+ // This handle edits the visible edge, not the compressed negative-time+ // gutter. Moving clips may preserve authored clipping, but trimming+ // cannot extend the visible edge behind its parent's visible start.+ const minimumVisibleFrom =+ originalSequence.from ++ (track.parentVisibleStart - track.cascadedStart) *+ track.keyframePlaybackRate;+ if (minimumVisibleFrom > timingLimits.minimumFrom) {+ timingLimits.minimumFrom = minimumVisibleFrom;+ timingLimits.limitReasons.minimumFrom =+ originalSequence.parent === null+ ? 'Composition edge'+ : 'Parent edge';+ }+ }+targets.set(key, {parentPlaybackRate: getParentSequencePlaybackRate(originalSequence,@@ -1423,14 +1448,7 @@ export const getTimelineSequenceLeftEdgeDragTargets = ({positionField,ripplePrevious,rollingDuration: null,- timingLimits: getTimelineSequenceTimingLimits({- propStatuses,- movingSequenceIds: null,- track,- tracks,- sequences,- timelineDurationInFrames,- }),+ timingLimits,schema: controls.schema,});}