The open-source CapCut alternative
Merge branch 'main' into main
Pulkit Gargf0e305cfe6e0
diff --cc apps/web/src/components/editor/timeline.tsxindex e97b9cec,41e842bb..ce81f9e3--- a/apps/web/src/components/editor/timeline.tsx+++ b/apps/web/src/components/editor/timeline.tsx@@@ -303,46 -336,15 +340,50 @@@ export function Timeline()};const handleWheel = (e: React.WheelEvent) => {- e.preventDefault();- const delta = e.deltaY > 0 ? -0.05 : 0.05;- setZoomLevel((prev) => Math.max(0.1, Math.min(10, prev + delta)));+ // Only zoom if user is using pinch gesture (ctrlKey or metaKey is true)+ if (e.ctrlKey || e.metaKey) {+ e.preventDefault();+ const delta = e.deltaY > 0 ? -0.05 : 0.05;+ setZoomLevel((prev) => Math.max(0.1, Math.min(10, prev + delta)));+ }+ // Otherwise, allow normal scrolling};+ // --- Playhead Scrubbing Handlers ---+ const handlePlayheadMouseDown = useCallback((e: React.MouseEvent) => {+ e.preventDefault();+ setIsScrubbing(true);+ handleScrub(e);+ }, [duration, zoomLevel]);++ const handleScrub = useCallback((e: MouseEvent | React.MouseEvent) => {+ const timeline = timelineRef.current;+ if (!timeline) return;+ const rect = timeline.getBoundingClientRect();+ const x = e.clientX - rect.left;+ const time = Math.max(0, Math.min(duration, x / (50 * zoomLevel)));+ setScrubTime(time);+ seek(time); // update video preview in real time+ }, [duration, zoomLevel, seek]);++ useEffect(() => {+ if (!isScrubbing) return;+ const onMouseMove = (e: MouseEvent) => handleScrub(e);+ const onMouseUp = (e: MouseEvent) => {+ setIsScrubbing(false);+ if (scrubTime !== null) seek(scrubTime); // finalize seek+ setScrubTime(null);+ };+ window.addEventListener("mousemove", onMouseMove);+ window.addEventListener("mouseup", onMouseUp);+ return () => {+ window.removeEventListener("mousemove", onMouseMove);+ window.removeEventListener("mouseup", onMouseUp);+ };+ }, [isScrubbing, scrubTime, seek, handleScrub]);++ const playheadPosition = isScrubbing && scrubTime !== null ? scrubTime : currentTime;+const dragProps = {onDragEnter: handleDragEnter,onDragOver: handleDragOver,