🎥 Make videos programmatically with React
fix(studio): show complete trim outlines on pointer down
JonnyBurger97a87b5d9168
diff --git a/packages/studio/src/components/Timeline/TimelineSequence.tsx b/packages/studio/src/components/Timeline/TimelineSequence.tsxindex 8546b337be..64e9f936b6 100644--- a/packages/studio/src/components/Timeline/TimelineSequence.tsx+++ b/packages/studio/src/components/Timeline/TimelineSequence.tsx@@ -2267,6 +2267,7 @@ const TimelineSequenceLayoutInner: React.FC<{);return shape === null ? [] : [{key, shape}];});+ const outlineBorder = outlineShapes.length > 0 ? 0 : `2px solid ${WHITE}`;return (<>@@ -2285,10 +2286,10 @@ const TimelineSequenceLayoutInner: React.FC<{width: outlineWidth,height: layerHeight,zIndex: s.timelineTrack ? 1 : undefined,- border:- outlineShapes.length > 0 ? undefined : `2px solid ${WHITE}`,- borderLeft: edge === 'right' ? 0 : undefined,- borderRight: edge === 'left' ? 0 : undefined,+ borderTop: outlineBorder,+ borderBottom: outlineBorder,+ borderLeft: edge === 'left' ? outlineBorder : 0,+ borderRight: edge === 'right' ? outlineBorder : 0,borderRadius: edge === 'left' ? '2px 0 0 2px' : '0 2px 2px 0',overflow: 'hidden',pointerEvents: 'none',diff --git a/packages/studio/src/components/Timeline/TimelineSequenceRightEdgeDragHandle.tsx b/packages/studio/src/components/Timeline/TimelineSequenceRightEdgeDragHandle.tsxindex a9348b76c1..d44fb4f220 100644--- a/packages/studio/src/components/Timeline/TimelineSequenceRightEdgeDragHandle.tsx+++ b/packages/studio/src/components/Timeline/TimelineSequenceRightEdgeDragHandle.tsx@@ -2083,6 +2083,7 @@ const TimelineSequenceLeftEdgeDragHandleInner: React.FC<{if (!commit ||+ !dragState.didMove ||latestServerState.type !== 'connected' ||changes.length === 0) {@@ -2227,9 +2228,7 @@ const TimelineSequenceLeftEdgeDragHandleInner: React.FC<{stopPointerSessionRef.current = startThresholdPointerSession({event: downEvent,captureTarget,- minimumMovement: isTransitionSeries- ? timelineSequenceEdgeDragThresholdPx- : null,+ minimumMovement: null,onCancel: () => {stopPointerSessionRef.current = null;finishDrag(false);@@ -2258,13 +2257,11 @@ const TimelineSequenceLeftEdgeDragHandleInner: React.FC<{stringifySequenceSubscriptionKey(target.nodePath) ===draggedKey,) ?? (fillTarget ? targets[0] : undefined);- if (!isTransitionSeries) {- onDragStart(- mode,- true,- targets.map((target) => target.nodePath),- );- }+ onDragStart(+ mode,+ true,+ targets.map((target) => target.nodePath),+ );dragStateRef.current = {initialClientX: downEvent.clientX,@@ -2293,16 +2290,12 @@ const TimelineSequenceLeftEdgeDragHandleInner: React.FC<{}const dx = pointerEvent.clientX - dragState.initialClientX;- if (isTransitionSeries && !dragState.didMove) {- if (Math.abs(dx) < timelineSequenceEdgeDragThresholdPx) {- return;- }-- onDragStart(- dragState.mode,- true,- dragState.targets.map((target) => target.nodePath),- );+ if (+ isTransitionSeries &&+ !dragState.didMove &&+ Math.abs(dx) < timelineSequenceEdgeDragThresholdPx+ ) {+ return;}const pointerDeltaFrames = Math.round(dx / dragState.pxPerFrame);@@ -3341,6 +3334,7 @@ const TimelineSequenceRightEdgeDragHandleInner: React.FC<{if (!commit ||+ !dragState.didMove ||latestServerState.type !== 'connected' ||changes.length === 0) {@@ -3445,9 +3439,7 @@ const TimelineSequenceRightEdgeDragHandleInner: React.FC<{stopPointerSessionRef.current = startThresholdPointerSession({event: downEvent,captureTarget,- minimumMovement: isTransitionSeries- ? timelineSequenceEdgeDragThresholdPx- : null,+ minimumMovement: null,onCancel: () => {stopPointerSessionRef.current = null;finishDrag(false);@@ -3499,6 +3491,14 @@ const TimelineSequenceRightEdgeDragHandleInner: React.FC<{}const dx = pointerEvent.clientX - dragState.initialClientX;+ if (+ isTransitionSeries &&+ !dragState.didMove &&+ Math.abs(dx) < timelineSequenceEdgeDragThresholdPx+ ) {+ return;+ }+const deltaFrames = Math.round(dx / dragState.pxPerFrame);dragState.latestDeltaFrames = deltaFrames;if (