🎥 Make videos programmatically with React
fix(studio): make Series trims consistent
JonnyBurger688be389a91d
diff --git a/packages/studio/src/components/Timeline/TimelineSequence.tsx b/packages/studio/src/components/Timeline/TimelineSequence.tsxindex 624225c5ad..a0543a511a 100644--- a/packages/studio/src/components/Timeline/TimelineSequence.tsx+++ b/packages/studio/src/components/Timeline/TimelineSequence.tsx@@ -1152,7 +1152,6 @@ const useTimelineSequenceState = (props: TimelineSequenceProps) => {sequenceId: s.id,enabled: isEdgeDragging && activeEdgeHighlight !== 'source-only',});- const previousCascadingSequenceId = registryEntry?.previousSequenceId ?? null;const previousCascadingOverrideId =registryEntry?.previousOverrideId ??transitionNeighbors?.previous.controls?.overrideId ??@@ -1249,12 +1248,12 @@ const useTimelineSequenceState = (props: TimelineSequenceProps) => {) =>startEdgeDrag({edge: 'right',- highlightAdjacent: !isTransitionSeriesSequence(s),+ highlightAdjacent: false,isDragging,showTrimOutline: true,targetNodePaths,}),- [startEdgeDrag, s],+ [startEdgeDrag],);const clearEdgeHighlight = useCallback(() => {edgeHighlightController?.setHighlights([]);@@ -1811,18 +1810,13 @@ const useTimelineSequenceState = (props: TimelineSequenceProps) => {validatedLocation !== null &&durationCanResize &&(!isMedia || Boolean(s.loopDisplay) || mediaDurationDragLimits !== null);- const isFirstCascadingSequence =- isCascadingSequence(s) && previousCascadingSequenceId === null;const showLeftEdgeDragHandle =isTimelineSequenceLeftEdgeDraggable(s) &&nodePath !== null &&validatedLocation !== null &&- (isTransitionSeriesSequence(s) ||- (isCascadingSequence(s) && !isFirstCascadingSequence)+ (isCascadingSequence(s)? durationCanUpdate && trimBeforeCanUpdate- : isFirstCascadingSequence- ? trimBeforeCanUpdate- : fromCanUpdate && durationCanUpdate && trimBeforeCanUpdate);+ : fromCanUpdate && durationCanUpdate && trimBeforeCanUpdate);const canRoll = (previous: TSequence | null, next: TSequence | null) => {if (!previewInteractive || !previous || !next) return false;return [previous, next].every((sequence) => {@@ -1896,7 +1890,6 @@ const useTimelineSequenceState = (props: TimelineSequenceProps) => {hasCaptionsSchema,showRightEdgeDragHandle,showLeftEdgeDragHandle,- isFirstCascadingSequence,onPointerEnter,};};@@ -1978,7 +1971,6 @@ const TimelineSequenceLayoutInner: React.FC<{hasCaptionsSchema,showRightEdgeDragHandle,showLeftEdgeDragHandle,- isFirstCascadingSequence,onPointerEnter,} = state;const sceneRange = useContext(TimelineSceneRangeContext);@@ -2504,11 +2496,7 @@ const TimelineSequenceLayoutInner: React.FC<{handleLayout={trimHandleLayout}edgeOffset={leftEdgeOffset}edgeMode={- isTransitionSeriesSequence(s)- ? 'head-trim'- : isFirstCascadingSequence- ? 'source-only'- : 'self-trim'+ isTransitionSeriesSequence(s) ? 'head-trim' : 'self-trim'}rollingEnabled={rollingEnabled}fillTarget={s.timelineTrack?.role === 'transition'}diff --git a/packages/studio/src/components/Timeline/TimelineSequenceRightEdgeDragHandle.tsx b/packages/studio/src/components/Timeline/TimelineSequenceRightEdgeDragHandle.tsxindex de71ba46a8..30c078cc1d 100644--- a/packages/studio/src/components/Timeline/TimelineSequenceRightEdgeDragHandle.tsx+++ b/packages/studio/src/components/Timeline/TimelineSequenceRightEdgeDragHandle.tsx@@ -1393,8 +1393,7 @@ export const getTimelineSequenceLeftEdgeDragTargets = ({track.sequence.duration -track.cascadedStart) *track.keyframePlaybackRate- : isSeriesSequence(originalSequence) ||- typeof runtimeDuration !== 'number' ||+ : typeof runtimeDuration !== 'number' ||!Number.isFinite(runtimeDuration)? originalSequence.duration: runtimeDuration / playbackRate) - hiddenStartInParentFrames,@@ -2298,12 +2297,7 @@ const TimelineSequenceLeftEdgeDragHandleInner: React.FC<{return;}- const pointerDeltaFrames = Math.round(dx / dragState.pxPerFrame);- const deltaFrames =- dragState.mode === 'self-trim' &&- draggedTarget?.positionField === null- ? -pointerDeltaFrames- : pointerDeltaFrames;+ const deltaFrames = Math.round(dx / dragState.pxPerFrame);dragState.latestDeltaFrames = deltaFrames;if (Math.abs(dx) >= timelineSequenceEdgeDragThresholdPx ||