🎥 Make videos programmatically with React
Defer transition editing work until interaction
JonnyBurgerd20de558d84e
diff --git a/packages/studio/src/components/Timeline/TimelineSequence.tsx b/packages/studio/src/components/Timeline/TimelineSequence.tsxindex b846e50eaa..44e68372dc 100644--- a/packages/studio/src/components/Timeline/TimelineSequence.tsx+++ b/packages/studio/src/components/Timeline/TimelineSequence.tsx@@ -139,6 +139,7 @@ import {getSequenceFreezeFrameMenuItem} from './use-sequence-freeze-frame-menu-iimport {useTimelineSequenceNaturalDuration,useTimelineSequenceRegistry,+ useTimelineTransitionNeighbors,} from './use-timeline-sequence-registry';const NEGATIVE_START_BORDER_WIDTH = 1;@@ -406,6 +407,8 @@ const TimelineSequenceBar: React.FC<{e: React.PointerEvent<HTMLDivElement>,) => void;readonly onPointerDownCapture: React.PointerEventHandler<HTMLDivElement>;+ readonly onPointerEnter: () => void;+ readonly onPointerLeave: () => void;readonly onClick: React.MouseEventHandler<HTMLDivElement> | null;}> = ({s,@@ -435,6 +438,8 @@ const TimelineSequenceBar: React.FC<{frozenFrame,onMoveDragPointerDown,onPointerDownCapture,+ onPointerEnter,+ onPointerLeave,onClick,}) => {const ref = useRef<HTMLDivElement>(null);@@ -595,28 +600,31 @@ const TimelineSequenceBar: React.FC<{return [];}- const shape = getTimelineSceneShape({- sceneRange: range,- offsetInFrames:- (Number(style.marginLeft) + selectionLeft) / frameIncrement,- durationInFrames: selectionWidth / frameIncrement,- pixelsPerFrame: frameIncrement,- height: packed- ? Number(style.height)- : (sceneClipHeight ?? Number(style.height)),- seamY: packed- ? Number(style.height) / 2- : TIMELINE_CHILD_TRANSITION_SEAM_Y,- transitionCutout: packed- ? {- top: transitionVerticalInset,- height: transitionHeight,- radius: 4,- minWidth: minTransitionAreaWidth,- }- : null,- cropHeight: Number(style.height),- });+ const shape = getTimelineSceneShape(+ {+ sceneRange: range,+ offsetInFrames:+ (Number(style.marginLeft) + selectionLeft) / frameIncrement,+ durationInFrames: selectionWidth / frameIncrement,+ pixelsPerFrame: frameIncrement,+ height: packed+ ? Number(style.height)+ : (sceneClipHeight ?? Number(style.height)),+ seamY: packed+ ? Number(style.height) / 2+ : TIMELINE_CHILD_TRANSITION_SEAM_Y,+ transitionCutout: packed+ ? {+ top: transitionVerticalInset,+ height: transitionHeight,+ radius: 4,+ minWidth: minTransitionAreaWidth,+ }+ : null,+ cropHeight: Number(style.height),+ },+ true,+ );return shape === null ? [] : [{key, shape}];});}, [@@ -638,20 +646,23 @@ const TimelineSequenceBar: React.FC<{return null;}- return getTimelineSceneShape({- sceneRange,- offsetInFrames: Number(style.marginLeft) / frameIncrement,- durationInFrames: Number(style.width) / frameIncrement,- pixelsPerFrame: frameIncrement,- height: isPackedClip- ? Number(style.height)- : (sceneClipHeight ?? Number(style.height)),- seamY: isPackedClip- ? Number(style.height) / 2- : TIMELINE_CHILD_TRANSITION_SEAM_Y,- transitionCutout: null,- cropHeight: Number(style.height),- });+ return getTimelineSceneShape(+ {+ sceneRange,+ offsetInFrames: Number(style.marginLeft) / frameIncrement,+ durationInFrames: Number(style.width) / frameIncrement,+ pixelsPerFrame: frameIncrement,+ height: isPackedClip+ ? Number(style.height)+ : (sceneClipHeight ?? Number(style.height)),+ seamY: isPackedClip+ ? Number(style.height) / 2+ : TIMELINE_CHILD_TRANSITION_SEAM_Y,+ transitionCutout: null,+ cropHeight: Number(style.height),+ },+ true,+ );}, [activeTrimEdge,isTransition,@@ -879,6 +890,8 @@ const TimelineSequenceBar: React.FC<{aria-label={isTransition ? undefined : s.displayName}data-track-item={s.timelineTrack?.role}onPointerDownCapture={onPointerDownCapture}+ onPointerEnter={onPointerEnter}+ onPointerLeave={onPointerLeave}onPointerDown={selectable ? onPointerDown : undefined}onClick={onClick ?? undefined}>@@ -1064,6 +1077,17 @@ const useTimelineSequenceState = (props: TimelineSequenceProps) => {const video = Internals.useVideo();const sequencesRef = useContext(Internals.SequenceManagerRefContext);const registryEntry = useTimelineSequenceRegistry(s.id);+ const isTransitionInteraction =+ isTransitionSeriesSequence(s) || s.timelineTrack?.role === 'transition';+ const [transitionHovered, setTransitionHovered] = useState(false);+ const transitionNeighbors = useTimelineTransitionNeighbors({+ sequenceId: s.id,+ enabled: transitionHovered && isTransitionInteraction,+ });+ const onPointerEnter = useCallback(() => {+ if (isTransitionInteraction) setTransitionHovered(true);+ }, [isTransitionInteraction]);+ const onPointerLeave = useCallback(() => setTransitionHovered(false), []);const originalSequence = registryEntry?.sequence ?? null;const overrideIdToNodePathMappingsRef = useContext(OverrideIdToNodePathMappingsRefContext,@@ -1106,11 +1130,11 @@ const useTimelineSequenceState = (props: TimelineSequenceProps) => {const previousCascadingSequenceId = registryEntry?.previousSequenceId ?? null;const previousCascadingOverrideId =registryEntry?.previousOverrideId ??- registryEntry?.transitionPreviousSequence?.controls?.overrideId ??+ transitionNeighbors?.previous.controls?.overrideId ??null;const nextCascadingOverrideId =registryEntry?.nextOverrideId ??- registryEntry?.transitionNextSequence?.controls?.overrideId ??+ transitionNeighbors?.next.controls?.overrideId ??null;const previousTouchingSequence =registryEntry?.previousTouchingSequence ?? null;@@ -1817,25 +1841,26 @@ const useTimelineSequenceState = (props: TimelineSequenceProps) => {const transitionRollingEnabled =(s.timelineTrack?.role === 'transition' || isTransitionSeriesSequence(s)) &&previewInteractive &&- [- registryEntry?.transitionPreviousSequence,- registryEntry?.transitionNextSequence,- ].every((sequence) => {- const path = sequence?.controls?.overrideId- ? overrideIdToNodePathMappingsRef.current[sequence.controls.overrideId]- : null;- return (- sequence &&- path &&- isTimelineSequenceDurationDraggable(sequence) &&- sequence.frozenFrame === null &&- Internals.getPropStatusesCtx(propStatuses, path)?.durationInFrames- ?.status === 'static' &&- (sequence !== registryEntry?.transitionNextSequence ||- Internals.getPropStatusesCtx(propStatuses, path)?.trimBefore- ?.status === 'static')- );- });+ [transitionNeighbors?.previous, transitionNeighbors?.next].every(+ (sequence) => {+ const path = sequence?.controls?.overrideId+ ? overrideIdToNodePathMappingsRef.current[+ sequence.controls.overrideId+ ]+ : null;+ return (+ sequence &&+ path &&+ isTimelineSequenceDurationDraggable(sequence) &&+ sequence.frozenFrame === null &&+ Internals.getPropStatusesCtx(propStatuses, path)?.durationInFrames+ ?.status === 'static' &&+ (sequence !== transitionNeighbors?.next ||+ Internals.getPropStatusesCtx(propStatuses, path)?.trimBefore+ ?.status === 'static')+ );+ },+ );const rollingEnabled =transitionRollingEnabled ||Boolean(@@ -1898,6 +1923,8 @@ const useTimelineSequenceState = (props: TimelineSequenceProps) => {showRightEdgeDragHandle,showLeftEdgeDragHandle,isFirstCascadingSequence,+ onPointerEnter,+ onPointerLeave,};};@@ -1980,6 +2007,8 @@ const TimelineSequenceLayoutInner: React.FC<{showRightEdgeDragHandle,showLeftEdgeDragHandle,isFirstCascadingSequence,+ onPointerEnter,+ onPointerLeave,} = state;const sceneRange = useContext(TimelineSceneRangeContext);const inheritedSceneRange = useContext(TimelineInheritedSceneRangeContext);@@ -2206,39 +2235,42 @@ const TimelineSequenceLayoutInner: React.FC<{return [];}- const shape = getTimelineSceneShape({- // A packed clip can extend to its trim limits, while a parent's- // transition continues to constrain the shape of its children.- sceneRange: packed- ? {- ...range,- from: start,- end,- transitionInEnd:- range.transitionInEnd === null- ? null- : start + (range.transitionInEnd - range.from),- transitionOutStart:- range.transitionOutStart === null- ? null- : end - (range.end - range.transitionOutStart),- }- : range,- offsetInFrames: start,- durationInFrames: end - start,- pixelsPerFrame: frameIncrement,- height: packed ? layerHeight : (sceneClipHeight ?? layerHeight),- seamY: packed ? layerHeight / 2 : TIMELINE_CHILD_TRANSITION_SEAM_Y,- transitionCutout: packed- ? {- top: transitionVerticalInset,- height: transitionHeight,- radius: 4,- minWidth: minTransitionAreaWidth,- }- : null,- cropHeight: layerHeight,- });+ const shape = getTimelineSceneShape(+ {+ // A packed clip can extend to its trim limits, while a parent's+ // transition continues to constrain the shape of its children.+ sceneRange: packed+ ? {+ ...range,+ from: start,+ end,+ transitionInEnd:+ range.transitionInEnd === null+ ? null+ : start + (range.transitionInEnd - range.from),+ transitionOutStart:+ range.transitionOutStart === null+ ? null+ : end - (range.end - range.transitionOutStart),+ }+ : range,+ offsetInFrames: start,+ durationInFrames: end - start,+ pixelsPerFrame: frameIncrement,+ height: packed ? layerHeight : (sceneClipHeight ?? layerHeight),+ seamY: packed ? layerHeight / 2 : TIMELINE_CHILD_TRANSITION_SEAM_Y,+ transitionCutout: packed+ ? {+ top: transitionVerticalInset,+ height: transitionHeight,+ radius: 4,+ minWidth: minTransitionAreaWidth,+ }+ : null,+ cropHeight: layerHeight,+ },+ true,+ );return shape === null ? [] : [{key, shape}];});@@ -2438,6 +2470,8 @@ const TimelineSequenceLayoutInner: React.FC<{frozenFrame={frozenFrame}onMoveDragPointerDown={onMoveDragPointerDown}onPointerDownCapture={dragAwareDoubleClick.beginPointerGesture}+ onPointerEnter={onPointerEnter}+ onPointerLeave={onPointerLeave}onClick={onSequenceClick}edgeDragHandles={<>diff --git a/packages/studio/src/components/Timeline/TimelineSequenceRightEdgeDragHandle.tsx b/packages/studio/src/components/Timeline/TimelineSequenceRightEdgeDragHandle.tsxindex f12fc1f013..c0be9b4ac4 100644--- a/packages/studio/src/components/Timeline/TimelineSequenceRightEdgeDragHandle.tsx+++ b/packages/studio/src/components/Timeline/TimelineSequenceRightEdgeDragHandle.tsx@@ -2004,8 +2004,9 @@ const TimelineSequenceLeftEdgeDragHandleInner: React.FC<{const [trimTooltip, setTrimTooltip] =useState<TimelineTrimTooltipState | null>(null);const [altKey, setAltKey] = useState(false);+ const [hovered, setHovered] = useState(false);useEffect(() => {- if (edgeMode !== 'rolling') return;+ if (edgeMode !== 'rolling' || !hovered) return;const onKey = (event: KeyboardEvent) => setAltKey(event.altKey);const onBlur = () => setAltKey(false);window.addEventListener('keydown', onKey);@@ -2016,7 +2017,7 @@ const TimelineSequenceLeftEdgeDragHandleInner: React.FC<{window.removeEventListener('keyup', onKey);window.removeEventListener('blur', onBlur);};- }, [edgeMode]);+ }, [edgeMode, hovered]);const stopPointerSessionRef = useRef<(() => void) | null>(null);const dragStateRef = useRef<{@@ -2231,18 +2232,19 @@ const TimelineSequenceLeftEdgeDragHandleInner: React.FC<{rippleEdit: mode === 'ripple',})) ?? []): [];- const initialTargets = getTargets(propStatuses);-stopPointerSessionRef.current?.();stopPointerSessionRef.current = startPreparedPointerSession({event: downEvent,captureTarget,+ minimumMovement: isTransitionSeries+ ? timelineSequenceEdgeDragThresholdPx+ : null,prepare: () =>loadKeyframeTrimConstraints({propStatuses,overrideIdsToNodePaths,sequences,- affectedNodePaths: initialTargets.flatMap((target) =>+ affectedNodePaths: getTargets(propStatuses).flatMap((target) =>target.ripplePrevious? target.positionField === null &&target.rollingDuration === null@@ -2704,6 +2706,8 @@ const TimelineSequenceLeftEdgeDragHandleInner: React.FC<{};const onLeave = () => {+ setHovered(false);+ setAltKey(false);if (dragStateRef.current === null) {onHoverEnd();}@@ -2754,7 +2758,11 @@ const TimelineSequenceLeftEdgeDragHandleInner: React.FC<{}style={edgeStyle}onPointerEnter={(event) => {- if (edgeMode === 'rolling') setAltKey(event.altKey);+ if (edgeMode === 'rolling') {+ setHovered(true);+ setAltKey(event.altKey);+ }+onHover(edgeMode === 'rolling' && event.altKey ? 'head-trim' : edgeMode,);@@ -3398,6 +3406,10 @@ const TimelineSequenceRightEdgeDragHandleInner: React.FC<{metaKey: e.metaKey,ctrlKey: e.ctrlKey,});+ if (isTransitionSeries && selectionInteraction !== null) {+ latestRef.current.onSelect(selectionInteraction);+ }+const pxPerFrame =timelineDurationInFrames > 0? (windowWidth - TIMELINE_PADDING * 2) / timelineDurationInFrames@@ -3438,18 +3450,21 @@ const TimelineSequenceRightEdgeDragHandleInner: React.FC<{timelineDurationInFrames,}) ?? []): [];- const initialTargets = getTargets(propStatuses);-stopPointerSessionRef.current?.();stopPointerSessionRef.current = startPreparedPointerSession({event: downEvent,captureTarget,+ minimumMovement: isTransitionSeries+ ? timelineSequenceEdgeDragThresholdPx+ : null,prepare: () =>loadKeyframeTrimConstraints({propStatuses,overrideIdsToNodePaths,sequences,- affectedNodePaths: initialTargets.map((target) => target.nodePath),+ affectedNodePaths: getTargets(propStatuses).map(+ (target) => target.nodePath,+ ),}),onCancel: () => {stopPointerSessionRef.current = null;@@ -3483,7 +3498,9 @@ const TimelineSequenceRightEdgeDragHandleInner: React.FC<{didMove: false,pxPerFrame: canCalculateDelta ? pxPerFrame : 1,pointerId: downEvent.pointerId,- selectionInteraction,+ selectionInteraction: isTransitionSeries+ ? null+ : selectionInteraction,targets,};document.body.style.userSelect = 'none';@@ -3654,6 +3671,7 @@ const TimelineSequenceRightEdgeDragHandleInner: React.FC<{timelineDurationInFrames,windowWidth,transitionStartOffset,+ isTransitionSeries,updateSnapFrameRef,],);diff --git a/packages/studio/src/components/Timeline/get-timeline-scene-clip-path.ts b/packages/studio/src/components/Timeline/get-timeline-scene-clip-path.tsindex 9419639d4f..ea6bee30b1 100644--- a/packages/studio/src/components/Timeline/get-timeline-scene-clip-path.ts+++ b/packages/studio/src/components/Timeline/get-timeline-scene-clip-path.ts@@ -19,16 +19,19 @@ type TimelineSceneClipOptions = {readonly cropHeight: number | null;};-export const getTimelineSceneShape = ({- sceneRange,- durationInFrames,- offsetInFrames,- pixelsPerFrame,- height,- seamY,- transitionCutout,- cropHeight,-}: TimelineSceneClipOptions): {+export const getTimelineSceneShape = (+ {+ sceneRange,+ durationInFrames,+ offsetInFrames,+ pixelsPerFrame,+ height,+ seamY,+ transitionCutout,+ cropHeight,+ }: TimelineSceneClipOptions,+ includeOutline: boolean,+): {readonly clipPath: string;readonly path: string;readonly edges: {readonly left: string | null; readonly right: string | null};@@ -153,30 +156,31 @@ export const getTimelineSceneShape = ({left: null,right: null,};- for (const [edge, contour, transition] of [- ['left', incoming, sceneRange.transitionInEnd],- ['right', outgoing, sceneRange.transitionOutStart],- ] as const) {- if (- transition !== null &&- contour.some((point, index) => {- const next = contour[index + 1];- return (- next &&- Math.max(point.x, next.x) >= offsetInFrames &&- Math.min(point.x, next.x) <= offsetInFrames + durationInFrames &&- Math.min(point.y, next.y) < (visibleHeight / height) * 100- );- })- ) {- edges[edge] = contour- .map(- ({x, y}, index) =>- `${index === 0 ? 'M' : 'L'}${(x - offsetInFrames) * pixelsPerFrame},${(y / 100) * height}`,- )- .join('');+ if (includeOutline)+ for (const [edge, contour, transition] of [+ ['left', incoming, sceneRange.transitionInEnd],+ ['right', outgoing, sceneRange.transitionOutStart],+ ] as const) {+ if (+ transition !== null &&+ contour.some((point, index) => {+ const next = contour[index + 1];+ return (+ next &&+ Math.max(point.x, next.x) >= offsetInFrames &&+ Math.min(point.x, next.x) <= offsetInFrames + durationInFrames &&+ Math.min(point.y, next.y) < (visibleHeight / height) * 100+ );+ })+ ) {+ edges[edge] = contour+ .map(+ ({x, y}, index) =>+ `${index === 0 ? 'M' : 'L'}${(x - offsetInFrames) * pixelsPerFrame},${(y / 100) * height}`,+ )+ .join('');+ }}- }// Intersect with the rendered bar without changing the parent row's contour.// Expanded rows can be taller than the child bar whose outline is visible.@@ -251,17 +255,19 @@ export const getTimelineSceneShape = ({};}- let path = clippedPolygons- .map(- (polygon) =>- polygon- .map(- ({x, y}, index) =>- `${index === 0 ? 'M' : 'L'}${(x - offsetInFrames) * pixelsPerFrame},${(y / 100) * height}`,- )- .join(' ') + ' Z',- )- .join(' ');+ let path = includeOutline+ ? clippedPolygons+ .map(+ (polygon) =>+ polygon+ .map(+ ({x, y}, index) =>+ `${index === 0 ? 'M' : 'L'}${(x - offsetInFrames) * pixelsPerFrame},${(y / 100) * height}`,+ )+ .join(' ') + ' Z',+ )+ .join(' ')+ : '';let clipPath = `polygon(${points.map(({x, y}) =>@@ -305,4 +311,4 @@ export const getTimelineSceneShape = ({export const getTimelineSceneClipPath = (options: TimelineSceneClipOptions,-): string | undefined => getTimelineSceneShape(options)?.clipPath;+): string | undefined => getTimelineSceneShape(options, false)?.clipPath;diff --git a/packages/studio/src/components/Timeline/use-timeline-sequence-registry.ts b/packages/studio/src/components/Timeline/use-timeline-sequence-registry.tsindex 80e3b86998..47d2b19005 100644--- a/packages/studio/src/components/Timeline/use-timeline-sequence-registry.ts+++ b/packages/studio/src/components/Timeline/use-timeline-sequence-registry.ts@@ -1,5 +1,5 @@import {CanvasInternals} from '@remotion/sdk';-import {useCallback, useContext, type ContextType} from 'react';+import {useCallback, useContext, useRef, type ContextType} from 'react';import type {TSequence} from 'remotion';import {Internals} from 'remotion';import {useSyncExternalStore} from '../../helpers/use-sync-external-store';@@ -17,8 +17,6 @@ type TimelineSequenceRegistryEntry = {readonly nextOverrideId: string | null;readonly previousTouchingSequence: TSequence | null;readonly nextTouchingSequence: TSequence | null;- readonly transitionPreviousSequence: TSequence | null;- readonly transitionNextSequence: TSequence | null;};const indexedRegistries = new WeakMap<@@ -93,20 +91,7 @@ export const useTimelineSequenceRegistry = (sequenceId: string) => {.map((sequence) => sequence.timelineTrack!.id),);const clipsByTrack = new Map<string, TSequence[]>();- const transitionItemsByTrack = new Map<string, TSequence[]>();for (const sequence of sequences) {- if (- sequence.timelineTrack &&- (sequence.timelineTrack.role === 'transition' ||- sequence.controls?.componentIdentity ===- 'dev.remotion.transitions.TransitionSeries.Sequence')- ) {- const items =- transitionItemsByTrack.get(sequence.timelineTrack.id) ?? [];- items.push(sequence);- transitionItemsByTrack.set(sequence.timelineTrack.id, items);- }-if (sequence.timelineTrack?.role !== 'clip' ||!normalTrackIds.has(sequence.timelineTrack.id) ||@@ -143,34 +128,6 @@ export const useTimelineSequenceRegistry = (sequenceId: string) => {}}- const transitionNeighbors = new Map<- string,- {previous: TSequence; next: TSequence}- >();- for (const items of transitionItemsByTrack.values()) {- const sorted = CanvasInternals.sortItemsByCommitOrder(- items,- (item) => item.timelineOrder,- );- for (let index = 1; index < sorted.length - 1; index++) {- const item = sorted[index];- const previousItem = sorted[index - 1];- const nextItem = sorted[index + 1];- if (- item.timelineTrack?.role === 'transition' &&- previousItem.timelineTrack?.role === 'clip' &&- nextItem.timelineTrack?.role === 'clip' &&- previousItem.parent === item.parent &&- nextItem.parent === item.parent- ) {- const neighbors = {previous: previousItem, next: nextItem};- // Both the transition marker and the incoming edge edit this join.- transitionNeighbors.set(item.id, neighbors);- transitionNeighbors.set(nextItem.id, neighbors);- }- }- }-const entries = new Map<string, TimelineSequenceRegistryEntry>();for (const sequence of sequences) {const adjacent = adjacentById.get(sequence.id);@@ -181,10 +138,6 @@ export const useTimelineSequenceRegistry = (sequenceId: string) => {const previousTouchingSequence =touchingById.get(sequence.id)?.previous ?? null;const nextTouchingSequence = touchingById.get(sequence.id)?.next ?? null;- const transitionPreviousSequence =- transitionNeighbors.get(sequence.id)?.previous ?? null;- const transitionNextSequence =- transitionNeighbors.get(sequence.id)?.next ?? null;const previousEntry = previous?.entries.get(sequence.id);entries.set(sequence.id,@@ -193,10 +146,7 @@ export const useTimelineSequenceRegistry = (sequenceId: string) => {previousEntry.previousOverrideId === previousOverrideId &&previousEntry.nextOverrideId === nextOverrideId &&previousEntry.previousTouchingSequence === previousTouchingSequence &&- previousEntry.nextTouchingSequence === nextTouchingSequence &&- previousEntry.transitionPreviousSequence ===- transitionPreviousSequence &&- previousEntry.transitionNextSequence === transitionNextSequence+ previousEntry.nextTouchingSequence === nextTouchingSequence? previousEntry: {sequence,@@ -205,8 +155,6 @@ export const useTimelineSequenceRegistry = (sequenceId: string) => {nextOverrideId,previousTouchingSequence,nextTouchingSequence,- transitionPreviousSequence,- transitionNextSequence,},);}@@ -248,3 +196,75 @@ export const useTimelineSequenceNaturalDuration = ({getSnapshot,);};++type TransitionNeighbors = {+ readonly previous: TSequence;+ readonly next: TSequence;+};+const transitionNeighborsCache = new WeakMap<+ SequenceRegistry,+ {+ readonly sequences: TSequence[];+ readonly entries: Map<string, TransitionNeighbors | null>;+ }+>();++// Resolve edit-only relationships on hover, without indexing every transition+// whenever an unrelated sequence registers or changes.+export const useTimelineTransitionNeighbors = ({+ sequenceId,+ enabled,+}: {+ readonly sequenceId: string;+ readonly enabled: boolean;+}) => {+ const registry = useContext(Internals.SequenceRegistryContext);+ const previousValue = useRef<TransitionNeighbors | null>(null);+ const getSnapshot = useCallback(() => {+ // Keep an existing handle mounted if the pointer leaves during a drag.+ if (!enabled || registry === null) return previousValue.current;+ const sequences = registry.getSnapshot();+ let cache = transitionNeighborsCache.get(registry);+ if (cache?.sequences !== sequences) {+ cache = {sequences, entries: new Map()};+ transitionNeighborsCache.set(registry, cache);+ }++ if (!cache.entries.has(sequenceId)) {+ const sequence = sequences.find((item) => item.id === sequenceId);+ const siblings = sequence?.timelineTrack+ ? CanvasInternals.sortItemsByCommitOrder(+ sequences.filter(+ (item) =>+ item.parent === sequence.parent &&+ item.timelineTrack?.id === sequence.timelineTrack?.id &&+ (item.timelineTrack?.role === 'clip' ||+ item.timelineTrack?.role === 'transition'),+ ),+ (item) => item.timelineOrder,+ )+ : [];+ const index = siblings.findIndex((item) => item.id === sequenceId);+ const transitionIndex =+ sequence?.timelineTrack?.role === 'transition' ? index : index - 1;+ const previous = siblings[transitionIndex - 1];+ const next = siblings[transitionIndex + 1];+ cache.entries.set(+ sequenceId,+ siblings[transitionIndex]?.timelineTrack?.role === 'transition' &&+ previous?.timelineTrack?.role === 'clip' &&+ next?.timelineTrack?.role === 'clip'+ ? {previous, next}+ : null,+ );+ }++ previousValue.current = cache.entries.get(sequenceId) ?? null;+ return previousValue.current;+ }, [enabled, registry, sequenceId]);+ return useSyncExternalStore(+ enabled && registry !== null ? registry.subscribe : subscribeToNoRegistry,+ getSnapshot,+ getSnapshot,+ );+};diff --git a/packages/studio/src/helpers/start-prepared-pointer-session.ts b/packages/studio/src/helpers/start-prepared-pointer-session.tsindex fdc5d645b2..0c8064a4b5 100644--- a/packages/studio/src/helpers/start-prepared-pointer-session.ts+++ b/packages/studio/src/helpers/start-prepared-pointer-session.ts@@ -12,6 +12,7 @@ type PreparedPointerHandlers = {export const startPreparedPointerSession = <T>({event,captureTarget,+ minimumMovement,prepare,onReady,onCancel,@@ -19,21 +20,47 @@ export const startPreparedPointerSession = <T>({}: {event: PointerEvent;captureTarget: Element;+ minimumMovement: number | null;prepare: () => Promise<T>;onReady: (prepared: T) => PreparedPointerHandlers;onCancel: () => void;onError: (error: unknown) => void;}): (() => void) => {let active = true;+ let preparing = false;let handlers: PreparedPointerHandlers | null = null;let latestMove: PointerEvent | null = null;let release: {reason: PointerSessionEndReason; event: PointerEvent} | null =null;+ const movedEnough = (move: PointerEvent) =>+ minimumMovement === null ||+ Math.abs(move.clientX - event.clientX) >= minimumMovement;+ const beginPreparation = () => {+ preparing = true;+ prepare()+ .then((prepared) => {+ if (!active) return;+ handlers = onReady(prepared);+ if (release) {+ active = false;+ handlers.onEnd(release.reason, release.event);+ } else if (latestMove) {+ handlers.onMove(latestMove);+ }+ })+ .catch((error) => {+ if (!active) return;+ cancel();+ onError(error);+ });+ };+const stopCapture = startCapturedPointerSession({event,captureTarget,onMove: (move) => {latestMove = move;+ if (!preparing && movedEnough(move)) beginPreparation();handlers?.onMove(move);},onEnd: (reason, endEvent) => {@@ -41,10 +68,14 @@ export const startPreparedPointerSession = <T>({if (handlers) {active = false;handlers.onEnd(reason, endEvent);- } else if (isPointerSessionRelease(reason, endEvent)) {+ } else if (+ isPointerSessionRelease(reason, endEvent) &&+ (preparing || movedEnough(endEvent))+ ) {// A quick drag can finish before preparation. Apply its final position// only once the bounds are known; a new gesture/unmount can cancel it.release = {reason, event: endEvent};+ if (!preparing) beginPreparation();} else {active = false;onCancel();@@ -59,21 +90,6 @@ export const startPreparedPointerSession = <T>({onCancel();};- prepare()- .then((prepared) => {- if (!active) return;- handlers = onReady(prepared);- if (release) {- active = false;- handlers.onEnd(release.reason, release.event);- } else if (latestMove) {- handlers.onMove(latestMove);- }- })- .catch((error) => {- if (!active) return;- cancel();- onError(error);- });+ if (minimumMovement === null) beginPreparation();return cancel;};diff --git a/packages/studio/src/test/prepared-pointer-session.test.ts b/packages/studio/src/test/prepared-pointer-session.test.tsindex 5d60474750..fe8f024552 100644--- a/packages/studio/src/test/prepared-pointer-session.test.ts+++ b/packages/studio/src/test/prepared-pointer-session.test.ts@@ -11,6 +11,7 @@ test.each(['held', 'released'] as const)(ready = resolve;});const events: string[] = [];+ let preparationStarted = false;const stop = startPreparedPointerSession({event: new PointerEvent('pointerdown', {pointerId: 1,@@ -18,7 +19,11 @@ test.each(['held', 'released'] as const)(buttons: 1,}),captureTarget: target,- prepare: () => preparation,+ minimumMovement: 4,+ prepare: () => {+ preparationStarted = true;+ return preparation;+ },onReady: (minimum) => {events.push(`ready:${minimum}`);return {@@ -30,10 +35,20 @@ test.each(['held', 'released'] as const)(onError: () => events.push('error'),});try {+ expect(preparationStarted).toBe(false);+ window.dispatchEvent(+ new PointerEvent('pointermove', {+ pointerId: 1,+ buttons: 1,+ clientX: 3,+ }),+ );+ expect(preparationStarted).toBe(false);for (const clientX of [10, 20])window.dispatchEvent(new PointerEvent('pointermove', {pointerId: 1, buttons: 1, clientX}),);+ expect(preparationStarted).toBe(true);if (releaseEarly)window.dispatchEvent(new PointerEvent('pointerup', {@@ -77,6 +92,7 @@ test('cancelling pending preparation cannot restart a completed gesture', asyncbuttons: 1,}),captureTarget: document.createElement('div'),+ minimumMovement: null,prepare: () => preparation,onReady: () => {events.push('ready');@@ -113,6 +129,7 @@ test('failed preparation cancels once and reports the error after an early releabuttons: 1,}),captureTarget: document.createElement('div'),+ minimumMovement: null,prepare: () => preparation,onReady: () => {throw new Error('Must not begin a failed drag');diff --git a/packages/transitions/src/presentations/clock-wipe.tsx b/packages/transitions/src/presentations/clock-wipe.tsxindex ba21dfcffe..a569d1f537 100644--- a/packages/transitions/src/presentations/clock-wipe.tsx+++ b/packages/transitions/src/presentations/clock-wipe.tsx@@ -25,28 +25,36 @@ const ClockWipePresentation: React.FC<passedProps,_remotionInternalIsActive = true,}) => {- const finishedRadius =- Math.sqrt(passedProps.width ** 2 + passedProps.height ** 2) / 2;+ const translatedPath = useMemo(() => {+ if (!_remotionInternalIsActive || presentationDirection === 'exiting') {+ return null;+ }- const {path} = makePie({- radius: finishedRadius,- progress: presentationProgress,- });-- const translatedPath = translatePath(- path,- -(finishedRadius * 2 - passedProps.width) / 2,- -(finishedRadius * 2 - passedProps.height) / 2,- );+ const finishedRadius =+ Math.sqrt(passedProps.width ** 2 + passedProps.height ** 2) / 2;+ const {path} = makePie({+ radius: finishedRadius,+ progress: presentationProgress,+ });+ return translatePath(+ path,+ -(finishedRadius * 2 - passedProps.width) / 2,+ -(finishedRadius * 2 - passedProps.height) / 2,+ );+ }, [+ _remotionInternalIsActive,+ presentationDirection,+ presentationProgress,+ passedProps.width,+ passedProps.height,+ ]);const style: React.CSSProperties = useMemo(() => {return {width: '100%',height: '100%',clipPath:- presentationDirection === 'exiting'- ? undefined- : `path("${translatedPath}")`,+ translatedPath === null ? undefined : `path("${translatedPath}")`,...(presentationDirection === 'entering'? passedProps.innerEnterStyle: passedProps.innerExitStyle),