🎥 Make videos programmatically with React
Fix first timeline seek after browser-back navigation
Igor Samokhovets39ecaaa2e08b
diff --git a/packages/studio/src/components/Timeline/TimelineDragHandler.tsx b/packages/studio/src/components/Timeline/TimelineDragHandler.tsxindex 4fd658835e..07bb1133ca 100644--- a/packages/studio/src/components/Timeline/TimelineDragHandler.tsx+++ b/packages/studio/src/components/Timeline/TimelineDragHandler.tsx@@ -137,7 +137,6 @@ const TimelineDragHandlerInner: React.FC = () => {const {isHighestContext} = useZIndex();const seekFrame = Internals.Timeline.useTimelineSeekFrame();- const width = getTimelineContentWidth();const left = size?.left ?? 0;const [dragging, setDragging] = useState<@@ -180,7 +179,9 @@ const TimelineDragHandlerInner: React.FC = () => {const frame = getFrameFromX({clientX: getClientXWithScroll(e.clientX) - left,durationInFrames: videoConfig.durationInFrames,- width,+ // Composition switches render before the new timeline width is+ // committed. Read the live width when seeking, not during render.+ width: getTimelineContentWidth(),extrapolate: 'clamp',});seek(frame);@@ -194,7 +195,7 @@ const TimelineDragHandlerInner: React.FC = () => {e.currentTarget.setPointerCapture?.(e.pointerId);pause();},- [isHighestContext, videoConfig, left, width, seek, isPlaying, pause],+ [isHighestContext, videoConfig, left, seek, isPlaying, pause],);const onEdgeScrollTick = useCallback(@@ -203,6 +204,7 @@ const TimelineDragHandlerInner: React.FC = () => {return;}+ const width = getTimelineContentWidth();const nextFrame =directions.x === 'left'? getFrameWhileScrollingLeft({@@ -234,7 +236,7 @@ const TimelineDragHandlerInner: React.FC = () => {redrawTimelineSliderFast.current?.draw(nextFrame);seek(nextFrame);},- [videoConfig, width, seek],+ [videoConfig, seek],);const onPointerMoveScrubbing = useCallback(@@ -260,13 +262,13 @@ const TimelineDragHandlerInner: React.FC = () => {const frame = getFrameFromX({clientX: getClientXWithScroll(e.clientX) - left,durationInFrames: videoConfig.durationInFrames,- width,+ width: getTimelineContentWidth(),extrapolate: 'clamp',});seek(frame);},- [videoConfig, dragging.dragging, left, width, seek],+ [videoConfig, dragging.dragging, left, seek],);const onPointerUpScrubbing = useCallback(@@ -290,7 +292,7 @@ const TimelineDragHandlerInner: React.FC = () => {const frame = getFrameFromX({clientX: getClientXWithScroll(e.clientX) - left,durationInFrames: videoConfig.durationInFrames,- width,+ width: getTimelineContentWidth(),extrapolate: 'clamp',});@@ -308,7 +310,7 @@ const TimelineDragHandlerInner: React.FC = () => {play();}},- [dragging, left, play, videoConfig, seekFrame, width],+ [dragging, left, play, videoConfig, seekFrame],);const onPointerCancelScrubbing = useCallback(() => {