Skip to content

🎥 Make videos programmatically with React

fix(studio): show source-only trim outlines outside scene masks

JonnyBurger278acfd1cef2
diff --git a/packages/studio/src/components/Timeline/TimelineSequence.tsx b/packages/studio/src/components/Timeline/TimelineSequence.tsx
index a356b2a094..cdd6499c30 100644
--- a/packages/studio/src/components/Timeline/TimelineSequence.tsx
+++ b/packages/studio/src/components/Timeline/TimelineSequence.tsx
@@ -129,6 +129,7 @@ import {
TimelineSequenceRightEdgeDragHandle,
useTimelineSequenceFromDrag,
} from './TimelineSequenceRightEdgeDragHandle';
+import {TimelineUnclippedTrimOutline} from './TimelineTrimOutline';
import {TimelineVideoInfo} from './TimelineVideoInfo';
import {TimelineViewportContext} from './TimelineViewport';
import {TimelineWidthContext} from './TimelineWidthProvider';
@@ -1150,7 +1151,7 @@ const useTimelineSequenceState = (props: TimelineSequenceProps) => {
}, [edgeHighlightController, nodePath]);
const naturalSequenceDuration = useTimelineSequenceNaturalDuration({
sequenceId: s.id,
- enabled: isEdgeDragging && activeEdgeHighlight !== 'source-only',
+ enabled: isEdgeDragging,
});
const previousCascadingOverrideId =
registryEntry?.previousOverrideId ??
@@ -2147,7 +2148,6 @@ const TimelineSequenceLayoutInner: React.FC<{
!isEdgeDragging ||
!showTrimOutline ||
activeEdgeHighlight === null ||
- activeEdgeHighlight === 'source-only' ||
s.loopDisplay ||
s.frozenFrame !== null ||
!Number.isFinite(frameIncrement) ||
@@ -2188,9 +2188,15 @@ const TimelineSequenceLayoutInner: React.FC<{
return null;
}
- const start = Math.max(parentStart, 0, s.from - trimmedBefore);
+ // Source-only edits can use footage outside the parent's visible interval.
+ const isSourceOnly = activeEdgeHighlight === 'source-only';
+ const start = Math.max(
+ isSourceOnly ? 0 : parentStart,
+ 0,
+ s.from - trimmedBefore,
+ );
const end = Math.min(
- parentEnd,
+ isSourceOnly ? video.durationInFrames : parentEnd,
video.durationInFrames,
s.from + displayDurationInFrames + trimmedAfter,
);
@@ -2212,6 +2218,7 @@ const TimelineSequenceLayoutInner: React.FC<{
},
].flatMap(({key, range, packed}) => {
if (
+ isSourceOnly ||
range === null ||
(range.transitionInEnd === null && range.transitionOutStart === null)
) {
@@ -2258,7 +2265,7 @@ const TimelineSequenceLayoutInner: React.FC<{
});
const outlineBorder = outlineShapes.length > 0 ? 0 : `2px solid ${WHITE}`;
- return (
+ const outline = (
<>
{[
{edge: 'left', from: start, width: leftWidth},
@@ -2322,6 +2329,11 @@ const TimelineSequenceLayoutInner: React.FC<{
)}
</>
);
+ return isSourceOnly ? (
+ <TimelineUnclippedTrimOutline>{outline}</TimelineUnclippedTrimOutline>
+ ) : (
+ outline
+ );
})();
const endsAtContainerBoundary =
Math.ceil(s.from + displayDurationInFrames) >=
diff --git a/packages/studio/src/components/Timeline/TimelineTracks.tsx b/packages/studio/src/components/Timeline/TimelineTracks.tsx
index a4db4455d7..0bdcbfe627 100644
--- a/packages/studio/src/components/Timeline/TimelineTracks.tsx
+++ b/packages/studio/src/components/Timeline/TimelineTracks.tsx
@@ -15,6 +15,7 @@ import {
TimelineSceneRangeContext,
} from './TimelineSceneRangeContext';
import {TimelineTrack} from './TimelineTrack';
+import {TimelineTrimOutlineContainer} from './TimelineTrimOutline';
import {TimelineViewportContext} from './TimelineViewport';
import {useTimelineVirtualization} from './TimelineVirtualization';
import {TimelineWidthContext} from './TimelineWidthProvider';
@@ -123,7 +124,7 @@ const TimelineTracksInner: React.FC<{
);
return (
- <div
+ <TimelineTrimOutlineContainer
key={virtualItem.key}
style={{
height: virtualItem.size,
@@ -137,22 +138,23 @@ const TimelineTracksInner: React.FC<{
? windowWidth - TIMELINE_PADDING * 2
: undefined,
top: virtualItem.start,
- clipPath:
- video && windowWidth !== null
- ? getTimelineSceneClipPath({
- sceneRange,
- durationInFrames: video.durationInFrames,
- offsetInFrames: 0,
- pixelsPerFrame:
- (windowWidth - TIMELINE_PADDING * 2) /
- video.durationInFrames,
- height: virtualItem.size,
- seamY: TIMELINE_CHILD_TRANSITION_SEAM_Y,
- transitionCutout: null,
- cropHeight: null,
- })
- : undefined,
}}
+ clipPath={
+ video && windowWidth !== null
+ ? (getTimelineSceneClipPath({
+ sceneRange,
+ durationInFrames: video.durationInFrames,
+ offsetInFrames: 0,
+ pixelsPerFrame:
+ (windowWidth - TIMELINE_PADDING * 2) /
+ video.durationInFrames,
+ height: virtualItem.size,
+ seamY: TIMELINE_CHILD_TRANSITION_SEAM_Y,
+ transitionCutout: null,
+ cropHeight: null,
+ }) ?? null)
+ : null
+ }
>
{sceneRange === null ? (
trackContent
@@ -164,7 +166,7 @@ const TimelineTracksInner: React.FC<{
{trackContent}
</TimelineSceneTrackContent>
)}
- </div>
+ </TimelineTrimOutlineContainer>
);
})}
</div>
diff --git a/packages/studio/src/components/Timeline/TimelineTrimOutline.tsx b/packages/studio/src/components/Timeline/TimelineTrimOutline.tsx
new file mode 100644
index 0000000000..9861c7021f
--- /dev/null
+++ b/packages/studio/src/components/Timeline/TimelineTrimOutline.tsx
@@ -0,0 +1,91 @@
+import React, {
+ createContext,
+ useContext,
+ useLayoutEffect,
+ useRef,
+ useState,
+} from 'react';
+import {createPortal} from 'react-dom';
+
+const TimelineTrimOutlineTarget =
+ createContext<React.RefObject<HTMLDivElement | null> | null>(null);
+
+export const TimelineTrimOutlineContainer: React.FC<{
+ readonly children: React.ReactNode;
+ readonly style: React.CSSProperties;
+ readonly clipPath: string | null;
+}> = ({children, style, clipPath}) => {
+ const ref = useRef<HTMLDivElement>(null);
+
+ return (
+ // Only the masked content may receive pointer events in overlapping rows.
+ <div ref={ref} style={{...style, pointerEvents: 'none'}}>
+ <TimelineTrimOutlineTarget.Provider value={ref}>
+ <div
+ style={{
+ clipPath: clipPath ?? undefined,
+ height: '100%',
+ pointerEvents: 'auto',
+ }}
+ >
+ {children}
+ </div>
+ </TimelineTrimOutlineTarget.Provider>
+ </div>
+ );
+};
+
+export const TimelineUnclippedTrimOutline: React.FC<{
+ readonly children: React.ReactNode;
+}> = ({children}) => {
+ const targetRef = useContext(TimelineTrimOutlineTarget);
+ const originRef = useRef<HTMLDivElement>(null);
+ const [placement, setPlacement] = useState<{
+ readonly target: HTMLDivElement;
+ readonly left: number;
+ readonly top: number;
+ } | null>(null);
+
+ useLayoutEffect(() => {
+ const target = targetRef?.current;
+ const origin = originRef.current;
+ if (!target || !origin) {
+ return;
+ }
+
+ // Preserve the local row offset when drawing outside its scene's clip path.
+ const targetBounds = target.getBoundingClientRect();
+ const originBounds = origin.getBoundingClientRect();
+ setPlacement({
+ target,
+ left: originBounds.left - targetBounds.left,
+ top: originBounds.top - targetBounds.top,
+ });
+ }, [targetRef]);
+
+ if (targetRef === null) {
+ return children;
+ }
+
+ return (
+ <>
+ <div ref={originRef} style={{position: 'absolute', left: 0, top: 0}} />
+ {placement === null
+ ? null
+ : createPortal(
+ <div
+ style={{
+ position: 'absolute',
+ left: placement.left,
+ top: placement.top,
+ pointerEvents: 'none',
+ zIndex: 2,
+ }}
+ >
+ {children}
+ </div>,
+ placement.target,
+ )}
+ </>
+ );
+};