🎥 Make videos programmatically with React
Improve timeline trim cursors and remove track dividers
JonnyBurgere93e08bfcd5c
diff --git a/packages/studio/src/components/Timeline/TimelineExpandedKeyframeRow.tsx b/packages/studio/src/components/Timeline/TimelineExpandedKeyframeRow.tsxindex a89386e2f4..088c7a7b70 100644--- a/packages/studio/src/components/Timeline/TimelineExpandedKeyframeRow.tsx+++ b/packages/studio/src/components/Timeline/TimelineExpandedKeyframeRow.tsx@@ -1,10 +1,7 @@import React, {useContext} from 'react';import {areSequenceNodePathInfosEqual} from '../../helpers/are-sequence-node-path-infos-equal';import type {SequenceNodePathInfo} from '../../helpers/get-timeline-sequence-sort-key';-import {- TIMELINE_ITEM_BORDER_BOTTOM,- TIMELINE_PADDING,-} from '../../helpers/timeline-layout';+import {TIMELINE_PADDING} from '../../helpers/timeline-layout';import {getTimelineEasingSegments} from './get-timeline-easing-segments';import type {getTimelineKeyframes} from './get-timeline-keyframes';import {TimelineKeyframeDiamond} from './TimelineKeyframeDiamond';@@ -30,21 +27,16 @@ const row: React.CSSProperties = {position: 'relative',};-const rowSeparator: React.CSSProperties = {- height: TIMELINE_ITEM_BORDER_BOTTOM,-};-type TimelineExpandedKeyframeRowProps = {readonly height: number;readonly keyframes: ReturnType<typeof getTimelineKeyframes>;readonly canEditEasing: boolean;readonly nodePathInfo: SequenceNodePathInfo;- readonly showSeparator: boolean;};const TimelineExpandedKeyframeRowUnmemoized: React.FC<TimelineExpandedKeyframeRowProps-> = ({height, keyframes, canEditEasing, nodePathInfo, showSeparator}) => {+> = ({height, keyframes, canEditEasing, nodePathInfo}) => {const timelineWidth = useContext(TimelineWidthContext);const rowHighlightBackground = useTimelineRowHighlightBackground(nodePathInfo,@@ -58,39 +50,36 @@ const TimelineExpandedKeyframeRowUnmemoized: React.FC<: [];return (- <>- {showSeparator ? <div style={rowSeparator} /> : null}- <div style={{...rowClipper, height, width: timelineWidth ?? undefined}}>- <div style={{...row, height}}>- {rowHighlightBackground && timelineWidth !== null ? (- <div- style={getTimelineSelectedTrackHighlightStyle(- timelineWidth,- rowHighlightBackground,- )}- />- ) : null}- {easingSegments.map((segment) => (- <TimelineKeyframeEasingLine- key={`${segment.segmentIndex}-${segment.fromFrame}-${segment.toFrame}`}- fromFrame={segment.fromFrame}- toFrame={segment.toFrame}- rowHeight={height}- nodePathInfo={nodePathInfo}- segmentIndex={segment.segmentIndex}- />- ))}- {keyframes.map((keyframe) => (- <TimelineKeyframeDiamond- key={keyframe.frame}- frame={keyframe.frame}- rowHeight={height}- nodePathInfo={nodePathInfo}- />- ))}- </div>+ <div style={{...rowClipper, height, width: timelineWidth ?? undefined}}>+ <div style={{...row, height}}>+ {rowHighlightBackground && timelineWidth !== null ? (+ <div+ style={getTimelineSelectedTrackHighlightStyle(+ timelineWidth,+ rowHighlightBackground,+ )}+ />+ ) : null}+ {easingSegments.map((segment) => (+ <TimelineKeyframeEasingLine+ key={`${segment.segmentIndex}-${segment.fromFrame}-${segment.toFrame}`}+ fromFrame={segment.fromFrame}+ toFrame={segment.toFrame}+ rowHeight={height}+ nodePathInfo={nodePathInfo}+ segmentIndex={segment.segmentIndex}+ />+ ))}+ {keyframes.map((keyframe) => (+ <TimelineKeyframeDiamond+ key={keyframe.frame}+ frame={keyframe.frame}+ rowHeight={height}+ nodePathInfo={nodePathInfo}+ />+ ))}</div>- </>+ </div>);};@@ -101,7 +90,6 @@ const areTimelineExpandedKeyframeRowPropsEqual = (if (prevProps.height !== nextProps.height ||prevProps.canEditEasing !== nextProps.canEditEasing ||- prevProps.showSeparator !== nextProps.showSeparator ||prevProps.keyframes.length !== nextProps.keyframes.length ||!areSequenceNodePathInfosEqual(prevProps.nodePathInfo,diff --git a/packages/studio/src/components/Timeline/TimelineExpandedSection.tsx b/packages/studio/src/components/Timeline/TimelineExpandedSection.tsxindex 847ed13430..f8510522f1 100644--- a/packages/studio/src/components/Timeline/TimelineExpandedSection.tsx+++ b/packages/studio/src/components/Timeline/TimelineExpandedSection.tsx@@ -1,12 +1,11 @@import React, {useMemo} from 'react';import type {TSequence} from 'remotion';import type {CodePosition} from '../../error-overlay/react-overlay/utils/get-source-map';-import {TIMELINE_TRACK_SEPARATOR, WHITE} from '../../helpers/colors';+import {WHITE} from '../../helpers/colors';import type {SequenceNodePathInfo} from '../../helpers/get-timeline-sequence-sort-key';import {flattenVisibleTreeNodes,getTreeRowHeight,- TIMELINE_ITEM_BORDER_BOTTOM,} from '../../helpers/timeline-layout';import {TimelineExpandedRow} from './TimelineExpandedRow';import {TimelineRowSelectedBackgroundContext} from './TimelineRowChrome';@@ -23,12 +22,6 @@ const expandedSectionBase: React.CSSProperties = {fontSize: 12,display: 'flex',flexDirection: 'column',- borderBottom: `1px solid ${TIMELINE_TRACK_SEPARATOR}`,-};--const separator: React.CSSProperties = {- height: 0,- borderBottom: `1px solid ${TIMELINE_TRACK_SEPARATOR}`,};export const TimelineExpandedSection: React.FC<{@@ -63,14 +56,13 @@ export const TimelineExpandedSection: React.FC<{(sum, {node}) => sum + getTreeRowHeight(node),0,);- const separators = Math.max(0, flat.length - 1);- return totalRowsHeight + separators;+ return totalRowsHeight;}, [flat]);const style = useMemo(() => {return {...expandedSectionBase,- height: expandedHeight + TIMELINE_ITEM_BORDER_BOTTOM,+ height: expandedHeight,};}, [expandedHeight]);@@ -85,24 +77,22 @@ export const TimelineExpandedSection: React.FC<{value={TIMELINE_EXPANDED_SELECTED_BACKGROUND}><div style={style}>- {flat.map(({node, depth}, i) => {+ {flat.map(({node, depth}) => {return (- <React.Fragment key={JSON.stringify(node.nodePathInfo)}>- {i > 0 ? <div style={separator} /> : null}- <TimelineExpandedRow- node={node}- depth={depth}- nestedDepth={nestedDepth}- getIsExpanded={getIsExpanded}- toggleTrack={toggleTrack}- validatedLocation={validatedLocation}- nodePath={nodePathInfo.sequenceSubscriptionKey}- schema={schema}- keyframeDisplayOffset={keyframeDisplayOffset}- keyframePlaybackRate={keyframePlaybackRate}- keyframeControlsMode="timeline"- />- </React.Fragment>+ <TimelineExpandedRow+ key={JSON.stringify(node.nodePathInfo)}+ node={node}+ depth={depth}+ nestedDepth={nestedDepth}+ getIsExpanded={getIsExpanded}+ toggleTrack={toggleTrack}+ validatedLocation={validatedLocation}+ nodePath={nodePathInfo.sequenceSubscriptionKey}+ schema={schema}+ keyframeDisplayOffset={keyframeDisplayOffset}+ keyframePlaybackRate={keyframePlaybackRate}+ keyframeControlsMode="timeline"+ />);})}</div>diff --git a/packages/studio/src/components/Timeline/TimelineExpandedTrackKeyframes.tsx b/packages/studio/src/components/Timeline/TimelineExpandedTrackKeyframes.tsxindex b3f3cbd8d0..ac335d8b4f 100644--- a/packages/studio/src/components/Timeline/TimelineExpandedTrackKeyframes.tsx+++ b/packages/studio/src/components/Timeline/TimelineExpandedTrackKeyframes.tsx@@ -24,14 +24,13 @@ const TimelineExpandedTrackKeyframesInner: React.FC<return (<div style={{height: expandedHeight}}>- {rows.map((row, index) => (+ {rows.map((row) => (<TimelineExpandedKeyframeRowkey={row.rowKey}height={row.height}keyframes={row.keyframes}canEditEasing={row.canEditEasing}nodePathInfo={row.nodePathInfo}- showSeparator={index > 0}/>))}</div>diff --git a/packages/studio/src/components/Timeline/TimelineRowChrome.tsx b/packages/studio/src/components/Timeline/TimelineRowChrome.tsxindex f2aae9b593..4ecb3c7dfb 100644--- a/packages/studio/src/components/Timeline/TimelineRowChrome.tsx+++ b/packages/studio/src/components/Timeline/TimelineRowChrome.tsx@@ -1,5 +1,4 @@import React, {useCallback, useContext, useMemo} from 'react';-import {TIMELINE_TRACK_SEPARATOR} from '../../helpers/colors';import {createDragAwareDoubleClickTracker} from '../../helpers/drag-aware-double-click';import {Padder} from './Padder';import {@@ -73,9 +72,8 @@ export const TimelineRowChrome: React.FC<{readonly showSelectedBackground: boolean;readonly containsSelection: boolean;readonly hovered?: boolean;- // When set, the chrome is wrapped in an outer container of this height with a- // bottom track separator. The background highlight and click target span the- // outer (used by sequence rows whose layer is taller than the chrome row).+ // When set, the chrome is wrapped in an outer container of this height. The+ // highlight and click target span the full layer, including taller media rows.readonly outerHeight: number | null;readonly onDragLeave?: (e: React.DragEvent<HTMLDivElement>) => void;readonly onDragOver?: (e: React.DragEvent<HTMLDivElement>) => void;@@ -210,7 +208,6 @@ export const TimelineRowChrome: React.FC<{return {height: outerHeight,- borderBottom: `1px solid ${TIMELINE_TRACK_SEPARATOR}`,display: 'flex',flexDirection: 'column',justifyContent: 'center',diff --git a/packages/studio/src/components/Timeline/TimelineSequence.tsx b/packages/studio/src/components/Timeline/TimelineSequence.tsxindex 43c12b708c..98b7fc544e 100644--- a/packages/studio/src/components/Timeline/TimelineSequence.tsx+++ b/packages/studio/src/components/Timeline/TimelineSequence.tsx@@ -6,6 +6,7 @@ import React, {useEffect,useMemo,useRef,+ useState,} from 'react';import type {_InternalTypes, TSequence} from 'remotion';import {Internals, useCurrentFrame} from 'remotion';@@ -60,6 +61,9 @@ import {getCurrentFrame} from './imperative-state';import {LoopedTimelineIndicator} from './LoopedTimelineIndicators';import {splitSelectedTimelineItems} from './split-selected-timeline-item';import {getTimelineAssetLinkInfo} from './timeline-asset-link';+import {timelineLeftEdgeCursor} from './timeline-left-edge-cursor';+import {timelineRightEdgeCursor} from './timeline-right-edge-cursor';+import {timelineRippleEdgeCursor} from './timeline-ripple-edge-cursor';import {TimelineImageInfo} from './TimelineImageInfo';import {getTimelineSequenceSelectionKey,@@ -91,6 +95,8 @@ import {useOpenSequenceInApps} from './use-open-sequence-in-apps';import {getSequenceFreezeFrameMenuItem} from './use-sequence-freeze-frame-menu-item';const {getTimelineVisibleDuration, getTimelineVisibleStart} = CanvasInternals;+const TIMELINE_SEQUENCE_BORDER_COLOR = '#151515';+const EDGE_DRAG_HIGHLIGHT_WIDTH = 12;const TimelineSequenceFn: React.FC<{readonly s: TimelineTrackData['sequence'];@@ -183,6 +189,7 @@ const TimelineSequenceNegativeStart = React.memo(const TimelineSequenceCurrentFrame: React.FC<{readonly s: TSequence;+ readonly activeTrimEdge: 'left' | 'right' | null;readonly displayDurationInFrames: number;readonly premount: {readonly left: number; readonly width: number} | null;readonly postmount: {readonly left: number; readonly width: number} | null;@@ -206,6 +213,7 @@ const TimelineSequenceCurrentFrame: React.FC<{readonly onClick: React.MouseEventHandler<HTMLDivElement> | null;}> = ({s,+ activeTrimEdge,displayDurationInFrames,premount,postmount,@@ -278,15 +286,31 @@ const TimelineSequenceCurrentFrame: React.FC<{const negativeStartEnd = negativeStart? negativeStart.left + negativeStart.width: 0;+ // Back the antialiased rounded edge so the layer color does not show through the glow.+ const sequenceBackground =+ activeTrimEdge === null+ ? style.background+ : `linear-gradient(to ${activeTrimEdge === 'left' ? 'right' : 'left'}, #00E500 0 2px, #00E50000 2px), ${style.background ?? TRANSPARENT}`;const actualStyle: React.CSSProperties = useMemo(() => {return {...style,- background: negativeStart ? TRANSPARENT : style.background,+ background: negativeStart ? TRANSPARENT : sequenceBackground,border: negativeStart ? 'none' : style.border,- opacity: selected || containsSelection || isAsset ? 1 : 0.75,+ opacity:+ activeTrimEdge !== null || selected || containsSelection || isAsset+ ? 1+ : 0.75,};- }, [containsSelection, isAsset, negativeStart, selected, style]);+ }, [+ activeTrimEdge,+ containsSelection,+ isAsset,+ negativeStart,+ selected,+ sequenceBackground,+ style,+ ]);const content = (<>@@ -349,6 +373,22 @@ const TimelineSequenceCurrentFrame: React.FC<{/></div>) : null}++ {activeTrimEdge === null ? null : (+ <div+ aria-hidden="true"+ style={{+ position: 'absolute',+ top: 0,+ bottom: 0,+ left: activeTrimEdge === 'left' ? 0 : undefined,+ right: activeTrimEdge === 'right' ? 0 : undefined,+ width: `min(${EDGE_DRAG_HIGHLIGHT_WIDTH}px, 100%)`,+ pointerEvents: 'none',+ background: `linear-gradient(to ${activeTrimEdge === 'left' ? 'right' : 'left'}, #00E500, #00E50000)`,+ }}+ />+ )}</>);@@ -373,7 +413,7 @@ const TimelineSequenceCurrentFrame: React.FC<{/><divstyle={{- background: style.background,+ background: sequenceBackground,border: style.border,borderBottomLeftRadius: 0,borderBottomRightRadius: style.borderBottomRightRadius,@@ -454,6 +494,18 @@ const TimelineSequenceInner: React.FC<{() => createDragAwareDoubleClickTracker(),[],);+ const [activeTrimEdge, setActiveTrimEdge] = useState<'left' | 'right' | null>(+ null,+ );+ const startLeftEdgeDrag = useCallback(() => setActiveTrimEdge('left'), []);+ const startRightEdgeDrag = useCallback(() => setActiveTrimEdge('right'), []);+ const endEdgeDrag = useCallback(+ (wasDragged: boolean) => {+ setActiveTrimEdge(null);+ dragAwareDoubleClick.endPointerGesture(wasDragged);+ },+ [dragAwareDoubleClick],+ );const mediaMetadata = useMediaMetadata(s.type === 'audio' || s.type === 'video' ? s.src : null,@@ -1031,13 +1083,13 @@ const TimelineSequenceInner: React.FC<{: s.type === 'video'? TIMELINE_VIDEO_GRADIENT: BLUE,- border: `${SEQUENCE_BORDER_WIDTH}px solid ${WHITE_ALPHA_20}`,+ border: `${SEQUENCE_BORDER_WIDTH}px solid ${TIMELINE_SEQUENCE_BORDER_COLOR}`,borderLeftColor:visibleLayout?.leftEdgeVisible && !negativeStartClipped- ? WHITE_ALPHA_20+ ? TIMELINE_SEQUENCE_BORDER_COLOR: TRANSPARENT,borderRightColor: visibleLayout?.rightEdgeVisible- ? WHITE_ALPHA_20+ ? TIMELINE_SEQUENCE_BORDER_COLOR: TRANSPARENT,borderTopLeftRadius: showLeftBorderRadius ? 2 : 0,borderBottomLeftRadius: showLeftBorderRadius ? 2 : 0,@@ -1089,6 +1141,7 @@ const TimelineSequenceInner: React.FC<{const sequence = (<TimelineSequenceCurrentFrames={s}+ activeTrimEdge={activeTrimEdge}displayDurationInFrames={displayDurationInFrames}premount={visibleLayout.premount}postmount={visibleLayout.postmount}@@ -1111,13 +1164,14 @@ const TimelineSequenceInner: React.FC<{nodePathInfo &&validatedLocation ? (<TimelineSequenceLeftEdgeDragHandle- cursor={isCascadingSequence(s) ? 'ew-resize' : 'e-resize'}+ cursor={`${timelineLeftEdgeCursor}, e-resize`}nodePathInfo={nodePathInfo}windowWidth={windowWidth}timelineDurationInFrames={video.durationInFrames ?? 1}initialEdgeFrame={s.from}fps={video.fps}- onDragEnd={dragAwareDoubleClick.endPointerGesture}+ onDragStart={startLeftEdgeDrag}+ onDragEnd={endEdgeDrag}onSelect={onSelect}selected={selected}/>@@ -1127,7 +1181,11 @@ const TimelineSequenceInner: React.FC<{nodePathInfo &&validatedLocation ? (<TimelineSequenceRightEdgeDragHandle- cursor={isCascadingSequence(s) ? 'ew-resize' : 'w-resize'}+ cursor={+ isCascadingSequence(s)+ ? `${timelineRippleEdgeCursor}, ew-resize`+ : `${timelineRightEdgeCursor}, w-resize`+ }nodePathInfo={nodePathInfo}mediaDurationDragLimits={mediaDurationDragLimits}windowWidth={windowWidth}@@ -1144,7 +1202,8 @@ const TimelineSequenceInner: React.FC<{)}fps={video.fps}- onDragEnd={dragAwareDoubleClick.endPointerGesture}+ onDragStart={startRightEdgeDrag}+ onDragEnd={endEdgeDrag}onSelect={onSelect}selected={selected}/>diff --git a/packages/studio/src/components/Timeline/TimelineSequenceItem.tsx b/packages/studio/src/components/Timeline/TimelineSequenceItem.tsxindex 70f2e3f0b7..e229f99f57 100644--- a/packages/studio/src/components/Timeline/TimelineSequenceItem.tsx+++ b/packages/studio/src/components/Timeline/TimelineSequenceItem.tsx@@ -39,7 +39,6 @@ import {import {getStudioKeyboardShortcutsEnabled} from '../../helpers/studio-runtime-config';import {getTimelineLayerHeight,- TIMELINE_ITEM_BORDER_BOTTOM,TIMELINE_LIST_ITEM_ROW_HEIGHT,} from '../../helpers/timeline-layout';import {useKeybinding} from '../../helpers/use-keybinding';@@ -985,7 +984,7 @@ const TimelineSequenceItemInner: React.FC<{);const outerHeight = useMemo(- () => getTimelineLayerHeight(sequence.type) + TIMELINE_ITEM_BORDER_BOTTOM,+ () => getTimelineLayerHeight(sequence.type),[sequence.type],);diff --git a/packages/studio/src/components/Timeline/TimelineSequenceRightEdgeDragHandle.tsx b/packages/studio/src/components/Timeline/TimelineSequenceRightEdgeDragHandle.tsxindex 10ed7746ba..771c21abd2 100644--- a/packages/studio/src/components/Timeline/TimelineSequenceRightEdgeDragHandle.tsx+++ b/packages/studio/src/components/Timeline/TimelineSequenceRightEdgeDragHandle.tsx@@ -1192,12 +1192,13 @@ const clearFromDragOverrides = ({};const TimelineSequenceLeftEdgeDragHandleInner: React.FC<{- readonly cursor: 'e-resize' | 'ew-resize';+ readonly cursor: string;readonly nodePathInfo: SequenceNodePathInfo;readonly windowWidth: number;readonly timelineDurationInFrames: number;readonly initialEdgeFrame: number;readonly fps: number;+ readonly onDragStart: () => void;readonly onDragEnd: (wasDragged: boolean) => void;readonly onSelect: (interaction?: TimelineSelectionInteraction) => void;readonly selected: boolean;@@ -1208,6 +1209,7 @@ const TimelineSequenceLeftEdgeDragHandleInner: React.FC<{timelineDurationInFrames,initialEdgeFrame,fps,+ onDragStart,onDragEnd,onSelect,selected,@@ -1384,6 +1386,7 @@ const TimelineSequenceLeftEdgeDragHandleInner: React.FC<{const initialTimelineEdge = latestRef.current.initialEdgeFrame;stopPointerSessionRef.current?.();+ onDragStart();dragStateRef.current = {initialClientX: e.clientX,latestDeltaFrames: 0,@@ -1506,6 +1509,7 @@ const TimelineSequenceLeftEdgeDragHandleInner: React.FC<{currentSelection,cursor,finishDrag,+ onDragStart,propStatusesRef,selected,sequencesRef,@@ -1834,13 +1838,14 @@ export const useTimelineSequenceFromDrag = ({};const TimelineSequenceRightEdgeDragHandleInner: React.FC<{- readonly cursor: 'w-resize' | 'ew-resize';+ readonly cursor: string;readonly nodePathInfo: SequenceNodePathInfo;readonly mediaDurationDragLimits: TimelineSequenceMediaDurationDragLimits | null;readonly windowWidth: number;readonly timelineDurationInFrames: number;readonly initialEdgeFrame: number;readonly fps: number;+ readonly onDragStart: () => void;readonly onDragEnd: (wasDragged: boolean) => void;readonly onSelect: (interaction?: TimelineSelectionInteraction) => void;readonly selected: boolean;@@ -1852,6 +1857,7 @@ const TimelineSequenceRightEdgeDragHandleInner: React.FC<{timelineDurationInFrames,initialEdgeFrame,fps,+ onDragStart,onDragEnd,onSelect,selected,@@ -2038,6 +2044,7 @@ const TimelineSequenceRightEdgeDragHandleInner: React.FC<{const initialTimelineEdge = latestRef.current.initialEdgeFrame;stopPointerSessionRef.current?.();+ onDragStart();dragStateRef.current = {initialClientX: e.clientX,latestDeltaFrames: 0,@@ -2143,6 +2150,7 @@ const TimelineSequenceRightEdgeDragHandleInner: React.FC<{cursor,finishDrag,mediaDurationDragLimitsRegistry,+ onDragStart,propStatusesRef,selected,sequencesRef,diff --git a/packages/studio/src/components/Timeline/TimelineTimeIndicators.tsx b/packages/studio/src/components/Timeline/TimelineTimeIndicators.tsxindex 949d640309..c86775be4c 100644--- a/packages/studio/src/components/Timeline/TimelineTimeIndicators.tsx+++ b/packages/studio/src/components/Timeline/TimelineTimeIndicators.tsx@@ -8,10 +8,7 @@ import {} from '../../helpers/colors';import {resolveStudioColor} from '../../helpers/resolve-studio-color';import {getStudioPixelRatio} from '../../helpers/studio-pixel-ratio';-import {- TIMELINE_ITEM_BORDER_BOTTOM,- TIMELINE_PADDING,-} from '../../helpers/timeline-layout';+import {TIMELINE_PADDING} from '../../helpers/timeline-layout';import {renderFrame} from '../../state/render-frame';import {TimeValue} from '../TimeValue';import {scrollableRef} from './timeline-refs';@@ -27,7 +24,7 @@ const container: React.CSSProperties = {position: 'absolute',backgroundColor: TIMELINE_TICKS_BACKGROUND,top: 0,- borderBottom: `${TIMELINE_ITEM_BORDER_BOTTOM}px solid ${TIMELINE_TRACK_SEPARATOR}`,+ borderBottom: `1px solid ${TIMELINE_TRACK_SEPARATOR}`,};const TICK_LABEL_FONT_SIZE = 12;@@ -47,7 +44,7 @@ const timeValue: React.CSSProperties = {display: 'flex',alignItems: 'center',backgroundColor: BACKGROUND,- borderBottom: `${TIMELINE_ITEM_BORDER_BOTTOM}px solid ${TIMELINE_TRACK_SEPARATOR}`,+ borderBottom: `1px solid ${TIMELINE_TRACK_SEPARATOR}`,};export const TimelineTimePlaceholders: React.FC = () => {diff --git a/packages/studio/src/components/Timeline/TimelineTrack.tsx b/packages/studio/src/components/Timeline/TimelineTrack.tsxindex 24d8401ccd..3c80f0726f 100644--- a/packages/studio/src/components/Timeline/TimelineTrack.tsx+++ b/packages/studio/src/components/Timeline/TimelineTrack.tsx@@ -1,10 +1,7 @@import React, {useContext, useMemo} from 'react';import {StudioServerConnectionCtx} from '../../helpers/client-id';import type {TimelineTrackData} from '../../helpers/get-timeline-sequence-sort-key';-import {- getTimelineLayerHeight,- TIMELINE_ITEM_BORDER_BOTTOM,-} from '../../helpers/timeline-layout';+import {getTimelineLayerHeight} from '../../helpers/timeline-layout';import {useTimelineSequenceHover} from '../../state/timeline-sequence-hover';import {ExpandedTracksGetterContext} from '../ExpandedTracksProvider';import {TimelineExpandedTrackKeyframes} from './TimelineExpandedTrackKeyframes';@@ -39,7 +36,6 @@ const TimelineTrackUnmemoized: React.FC<{const layerStyle = useMemo((): React.CSSProperties => ({height: getTimelineLayerHeight(track.sequence.type),- marginBottom: TIMELINE_ITEM_BORDER_BOTTOM,position: 'relative',}),[track.sequence.type],diff --git a/packages/studio/src/components/Timeline/TimelineVirtualization.tsx b/packages/studio/src/components/Timeline/TimelineVirtualization.tsxindex 5f4e4941eb..24b49ffad5 100644--- a/packages/studio/src/components/Timeline/TimelineVirtualization.tsx+++ b/packages/studio/src/components/Timeline/TimelineVirtualization.tsx@@ -13,7 +13,6 @@ import React, {useMemo,useRef,} from 'react';-import {TIMELINE_ITEM_BORDER_BOTTOM} from '../../helpers/timeline-layout';import {MAX_TIMELINE_TRACKS_NOTICE_HEIGHT} from './MaxTimelineTracks';import type {TimelineTrackWithDisplayGroup} from './timeline-display-groups';import {timelineVerticalScroll} from './timeline-refs';@@ -58,9 +57,7 @@ export const TimelineVirtualizationProvider: React.FC<{const trackHeights = useTimelineTrackHeights({timeline});const {revealRequest, selectedItems} = useTimelineSelection();const paddingStart = isStill ? 0 : TIMELINE_TIME_INDICATOR_HEIGHT;- const paddingEnd =- TIMELINE_ITEM_BORDER_BOTTOM +- (hasBeenCut ? MAX_TIMELINE_TRACKS_NOTICE_HEIGHT : 0);+ const paddingEnd = hasBeenCut ? MAX_TIMELINE_TRACKS_NOTICE_HEIGHT : 0;const layout = useMemo(() => {const siblingIndexes = new Array<number>(timeline.length);diff --git a/packages/studio/src/components/Timeline/timeline-left-edge-cursor.ts b/packages/studio/src/components/Timeline/timeline-left-edge-cursor.tsnew file mode 100644index 0000000000..1222b0b429--- /dev/null+++ b/packages/studio/src/components/Timeline/timeline-left-edge-cursor.ts@@ -0,0 +1,7 @@+// Rendered from ../left-edge-cursor.svg at both display densities to preserve the shadow.+const cursor1x =+ 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABmJLR0QA/wD/AP+gvaeTAAACvUlEQVRIibVVTUsbURQ9b2YSkzRTi2gUmpAWSyEFKwloUbprNxWKdCP4E7pTkS66cuMiERVpUYRuBHEhFpuFpV0VxMYWW6G4SyFBjcEPGL9mSDNvZl4XyYQYnZqE9MBb3XvP4R7Oew/4zyCVNDPGOAA9AAIA+KJSFsACIeSgagHGmAvA55WVlcexWAy6rhdqjY2NGBgY+C0IQoAQoluz/AOU0sjY2BgDcOXZ3t5msiy3lM4JZfJzAHpmZmYAAHNzc3A6nYWi3+9HfX39d7fbfVo6WK5FHKV0r6GhoQUAJEk6XV1dfWsWz8/P5cHBwVgymfwKoDKLGGPc7OysjVK6L4oiE0WRqap6AKAVwF0AdwB4AbgqIs6Th2RZjuu6PlosQCndB1CHnMUCLibqAjgLYns2mx3VNO3b4eHhPUVRvIyxUju1omNpyyUBxthDRVF+7ezsDHV3d9ui0SgxDKPcMFgLMMZslNLXlNIf09PT90OhkGNjY8MsV3QhiyHkyW9nMpkvu7u7vv7+ftvm5ma1fJfAAUAqlXJSSh35p6Cm4ADA5/Pt9/X1veR5fml9fV2PRCKGKIo1F7oJoH1xcXFIkqRUPB7PdnR0sMnJSXZycrKgqupBSUwto2kFgly2vb29vc+TyeR7VVW1RCJh1ErABJ/fJrS8vPxKkqT00dHRu1oKmNs4APja2tqedXV1BasVsLpADMAfAOmtra1jAAYhhBXUCamjlD4FYACAIAjHAH4W91wnYEIHIAPgNU07a2pqak4kEpifn7/lcrk+mU1+vx+dnZ0fALwoZ6urwKfT6YXx8fHrPpzmSjcwwSYmJt6MjIy0BwKBB2tra5e+TI/HsxcOh5XSwUreGHcwGHw0NTX1xOv1ttrtdodZyGQyZ9Fo9OPw8PASAFqtAAFwA4AHuRgXb58FsAfgGDnLCvgLRWFgIJdLy6MAAAAASUVORK5CYII=';+const cursor2x =+ 'data:image/png;base64,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';++export const timelineLeftEdgeCursor = `image-set(url("${cursor1x}") 1x, url("${cursor2x}") 2x) 12 12, url("${cursor1x}") 12 12`;diff --git a/packages/studio/src/components/Timeline/timeline-right-edge-cursor.ts b/packages/studio/src/components/Timeline/timeline-right-edge-cursor.tsnew file mode 100644index 0000000000..6d5a66b647--- /dev/null+++ b/packages/studio/src/components/Timeline/timeline-right-edge-cursor.ts@@ -0,0 +1,7 @@+// Rendered from ../right-edge-cursor.svg at both display densities to preserve the shadow.+const cursor1x =+ 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABmJLR0QA/wD/AP+gvaeTAAACsElEQVRIibVWv0tbURg91+erSclr1cVCDDRpO4mWtoFqo5nbDCGunVwcCi4dig4OgrQVjCR08w9othYcJJN0KCR0EsQo6Y+okEgMYoO+95K+e5OvQ2J41hiTaA98yxnuuee7348L/GeweiQR9QF4CaDLRJcAbAGIMsbKbQsQkSSE2A6Hww8ODw9rvCRJ8Hg88Pl8XwE8Z4zpzYqcgaqqd/b29ghA3VhaWiLO+fu2HQCw5vP5L4lE4mkmk6mRuq5jYmICLpcLyWRyU5blhwAuTVU9AcnpdHpCodAzRVFsp6TX653q7e29DQBHR0dZWZbtzQhchJsA+gHcBeAEcM8wjANFUUhRFOKcZ5eXl2Ui6mhXAAAkAJ3V6OKcZ80CpVLpraqq34nocaNDGt2gBECYogYiYpqm9edyufuc82+FQuEdEd1oVaAhyuVy58rKCnO73Z2pVOq1ruvbROS+NgFUC2RjYwMDAwOW+fl5J+c8ViwWg0RUa9ArPZIZCwsLbHh4WN7d3Z1SVXWTiOzXKnAKIuoQQljS6bT1WgVmZmYoHo+XLBZLdHJy8pXD4cgClRK8EoaGhhCJRAy73f47Go2GAoHAGoAfAFqaVZK5DwzDOMjn85FUKlU2DEPs7Ox88vv9fgAOABaYJkTbDjjnend3d3Z1dTU8Pj6+BuAnABWV/mkZ5xyMjIw8GhwcfFHv1mbUdUBEDMATIURPlepgjNVqmzFG8Xg8iUquC41ufVGKPsdisYB5XGuahpOTE7hcLgghjgH8aXTwhVBVta/RwgmFQrS/v/8RlWF4Kc45CAaD2vT0dGZxcdH+78ocHR3F2NjY1uzs7IeqYOsCc3Nzf2w225tAIOCzWq23TnnDMIrpdPqX1+tdW19fT6DJZVPv5RmAHgB2nP1VCADHAHIAtGYd/AVwFE7pFBuf8AAAAABJRU5ErkJggg==';+const cursor2x =+ 'data:image/png;base64,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';++export const timelineRightEdgeCursor = `image-set(url("${cursor1x}") 1x, url("${cursor2x}") 2x) 12 12, url("${cursor1x}") 12 12`;diff --git a/packages/studio/src/components/Timeline/timeline-ripple-edge-cursor.ts b/packages/studio/src/components/Timeline/timeline-ripple-edge-cursor.tsnew file mode 100644index 0000000000..9e87de6054--- /dev/null+++ b/packages/studio/src/components/Timeline/timeline-ripple-edge-cursor.ts@@ -0,0 +1,7 @@+// Rendered from ../ripple-edge-cursor.svg at both display densities to preserve the shadow.+const cursor1x =+ 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABmJLR0QA/wD/AP+gvaeTAAACu0lEQVRIie2WQUhTcRzHP/9NVtPIBjOYOKKYBFayi1BDLwUVWtBDBh3qMojIPHToKDt42MGDp/CiO0jddnCY3ixvmxCir9aDQOqg4pCliT3X9vbev4ObPTdnh+jmD97l+/v+vt//7/15v9+D/xyiGpBS3geu2KA8kBJCfKjidQEhwG2DPwsh3tp5DVVFjxYXF18nEokDzO12oyiKNE1z1Ol0vgQwTXNUVdUXyWRS5PP5A244HEZK+VgI8ebIbnRdn4xEIhKoedLptDQM47ZhGHdTqdSRnEgkInVdn7S/GXsHQtO0uZGRkYe9vb0uy7IAWF5eJhaLMTExQTAYfACIeDwOwNDQEJ2dnQC4XC66u7uLmqbNlQ1ktYHs6uqaGx4efhoKhS4JIRwej6e5vb19MBaLkcvlKJVKrYDI5XIA9Pf3I6V8tb29vSOltMbGxr5Go9G5iniNAbAZjUZngDOAmJ2dDbS2tg5WCJZlHbozgI2Njem+vr6Vcv1PYLueAYAJfAd+AAQCgbN7e3vVmociEAhsAqu2emnP15yoTCgBOJ1O81j1P5xSvbzjbwL/GicGJwYnBkd8yVLK86VS6RrgKBaLF3Z3d48V8Pl81w3D8AFWQ0PDJyHEZl0DKeWNra2td/Pz8+7KuF5aWgLA6/ViGMaOEEJ4vV4AEokEwWBwHPbHdU9PT15KeUsIkT7yNIVCIV5v4SwsLEhVVZ9lMpnn6XS67sIpFArxeh04stnsysDAAC0tLQdgY2MjiqJIj8cz7ff7ZwCxvr5+R1XVe8lkUtinbTgcJpvNrrB/txYcXvoCuJhKpZ60tbVddjgcTgBd13c0TcsoivIe+Fjmdk5NTd3s6Oi42tTU1AxgWZa5trb2JRQKjQPfyl3V/FW4AD9wzpYrsL9EcsCvMnYa8AIe4FQZk+zvkVWgWBH8DZ3SN1jbDEODAAAAAElFTkSuQmCC';+const cursor2x =+ 'data:image/png;base64,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';++export const timelineRippleEdgeCursor = `image-set(url("${cursor1x}") 1x, url("${cursor2x}") 2x) 12 12, url("${cursor1x}") 12 12`;diff --git a/packages/studio/src/components/Timeline/use-expanded-track-keyframe-rows.ts b/packages/studio/src/components/Timeline/use-expanded-track-keyframe-rows.tsindex 52a8bcca5a..6ba83a172b 100644--- a/packages/studio/src/components/Timeline/use-expanded-track-keyframe-rows.ts+++ b/packages/studio/src/components/Timeline/use-expanded-track-keyframe-rows.ts@@ -205,8 +205,7 @@ export const useExpandedTrackKeyframeRows = ({(sum, {node}) => sum + getTreeRowHeight(node),0,);- const separators = Math.max(0, flat.length - 1);- return totalRowsHeight + separators;+ return totalRowsHeight;}, [flat]);const nodeKeyframes = useMemo(diff --git a/packages/studio/src/components/Timeline/use-timeline-height.ts b/packages/studio/src/components/Timeline/use-timeline-height.tsindex e7c93556a8..c49e799b8a 100644--- a/packages/studio/src/components/Timeline/use-timeline-height.ts+++ b/packages/studio/src/components/Timeline/use-timeline-height.ts@@ -7,7 +7,6 @@ import {flattenVisibleTreeNodes,getTimelineLayerHeight,getTreeRowHeight,- TIMELINE_ITEM_BORDER_BOTTOM,} from '../../helpers/timeline-layout';import {useRuntimeValueSnapshots} from '../../helpers/use-runtime-values';import {ExpandedTracksGetterContext} from '../ExpandedTracksProvider';@@ -71,9 +70,7 @@ export const useTimelineTrackHeights = ({previewServerConnected &&track.nodePathInfo !== null &&getIsExpanded(track.nodePathInfo);- const layerHeight =- getTimelineLayerHeight(track.sequence.type) +- TIMELINE_ITEM_BORDER_BOTTOM;+ const layerHeight = getTimelineLayerHeight(track.sequence.type);const expandedHeight = (() => {if (!isExpanded || track.nodePathInfo === null) {return 0;@@ -122,8 +119,7 @@ export const useTimelineTrackHeights = ({(sum, {node}) => sum + getTreeRowHeight(node),0,);- const separators = Math.max(0, flat.length - 1);- return totalRowsHeight + separators + TIMELINE_ITEM_BORDER_BOTTOM;+ return totalRowsHeight;})();return layerHeight + expandedHeight;});diff --git a/packages/studio/src/components/left-edge-cursor.svg b/packages/studio/src/components/left-edge-cursor.svgnew file mode 100644index 0000000000..1b8b7ba1e5--- /dev/null+++ b/packages/studio/src/components/left-edge-cursor.svg@@ -0,0 +1,12 @@+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32" fill="none">+ <g filter="url(#shadow)">+ <path d="M3 16L12 10V22L3 16Z" fill="black" stroke="white" stroke-width="1.5" stroke-linejoin="round"/>+ <path d="M23 4.5H18C16.9 4.5 16 5.4 16 6.5V25.5C16 26.6 16.9 27.5 18 27.5H23" stroke="white" stroke-width="5" stroke-linecap="round" stroke-linejoin="round"/>+ <path d="M23 4.5H18C16.9 4.5 16 5.4 16 6.5V25.5C16 26.6 16.9 27.5 18 27.5H23" stroke="black" stroke-width="2.5" stroke-linecap="round" stroke-linejoin="round"/>+ </g>+ <defs>+ <filter id="shadow" x="-25%" y="-25%" width="150%" height="150%">+ <feDropShadow dx="0" dy="1.5" stdDeviation="1" flood-color="black" flood-opacity="0.35"/>+ </filter>+ </defs>+</svg>diff --git a/packages/studio/src/components/right-edge-cursor.svg b/packages/studio/src/components/right-edge-cursor.svgnew file mode 100644index 0000000000..560dd6a288--- /dev/null+++ b/packages/studio/src/components/right-edge-cursor.svg@@ -0,0 +1,12 @@+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32" fill="none">+ <g transform="translate(32 0) scale(-1 1)" filter="url(#shadow)">+ <path d="M3 16L12 10V22L3 16Z" fill="black" stroke="white" stroke-width="1.5" stroke-linejoin="round"/>+ <path d="M23 4.5H18C16.9 4.5 16 5.4 16 6.5V25.5C16 26.6 16.9 27.5 18 27.5H23" stroke="white" stroke-width="5" stroke-linecap="round" stroke-linejoin="round"/>+ <path d="M23 4.5H18C16.9 4.5 16 5.4 16 6.5V25.5C16 26.6 16.9 27.5 18 27.5H23" stroke="black" stroke-width="2.5" stroke-linecap="round" stroke-linejoin="round"/>+ </g>+ <defs>+ <filter id="shadow" x="-25%" y="-25%" width="150%" height="150%">+ <feDropShadow dx="0" dy="1.5" stdDeviation="1" flood-color="black" flood-opacity="0.35"/>+ </filter>+ </defs>+</svg>diff --git a/packages/studio/src/components/ripple-edge-cursor.svg b/packages/studio/src/components/ripple-edge-cursor.svgnew file mode 100644index 0000000000..4b1a41e7c1--- /dev/null+++ b/packages/studio/src/components/ripple-edge-cursor.svg@@ -0,0 +1,11 @@+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32" fill="none">+ <g filter="url(#shadow)">+ <path d="M7 4.5H11C12.1 4.5 13 5.4 13 6.5V25.5C13 26.6 12.1 27.5 11 27.5H7M25 4.5H21C19.9 4.5 19 5.4 19 6.5V25.5C19 26.6 19.9 27.5 21 27.5H25" stroke="white" stroke-width="5" stroke-linecap="round" stroke-linejoin="round"/>+ <path d="M7 4.5H11C12.1 4.5 13 5.4 13 6.5V25.5C13 26.6 12.1 27.5 11 27.5H7M25 4.5H21C19.9 4.5 19 5.4 19 6.5V25.5C19 26.6 19.9 27.5 21 27.5H25" stroke="black" stroke-width="2.5" stroke-linecap="round" stroke-linejoin="round"/>+ </g>+ <defs>+ <filter id="shadow" x="-25%" y="-25%" width="150%" height="150%">+ <feDropShadow dx="0" dy="1.5" stdDeviation="1" flood-color="black" flood-opacity="0.35"/>+ </filter>+ </defs>+</svg>diff --git a/packages/studio/src/helpers/timeline-layout.ts b/packages/studio/src/helpers/timeline-layout.tsindex 8e7afe46cb..44ac4e0286 100644--- a/packages/studio/src/helpers/timeline-layout.ts+++ b/packages/studio/src/helpers/timeline-layout.ts@@ -43,7 +43,6 @@ export type {export const TIMELINE_PADDING = 16;export const TIMELINE_BORDER = 1;-export const TIMELINE_ITEM_BORDER_BOTTOM = 1;export const TIMELINE_TRACK_EXPANDED_HEIGHT = 100;@@ -279,8 +278,7 @@ export const getExpandedTrackHeight = ({(sum, {node}) => sum + getTreeRowHeight(node),0,);- const separators = Math.max(0, flat.length - 1);- return totalRowsHeight + separators;+ return totalRowsHeight;};export const TIMELINE_LAYER_FILMSTRIP_HEIGHT = 26;