The open-source CapCut alternative
Merge pull request [#395](https://github.com/mazeincoding/AppCut/issues/395)
Maze Wintherab82db63465d
diff --git a/apps/web/src/components/editor/timeline/index.tsx b/apps/web/src/components/editor/timeline/index.tsxindex f9a6cb8c..987215fa 100644--- a/apps/web/src/components/editor/timeline/index.tsx+++ b/apps/web/src/components/editor/timeline/index.tsx@@ -878,7 +878,13 @@ export function Timeline() {{/* Timeline Ruler */}<divclassName="flex-1 relative overflow-hidden h-4"- onWheel={handleWheel}+ onWheel={(e) => {+ // Check if this is horizontal scrolling - if so, don't handle it here+ if (e.shiftKey || Math.abs(e.deltaX) > Math.abs(e.deltaY)) {+ return; // Let ScrollArea handle horizontal scrolling+ }+ handleWheel(e);+ }}onMouseDown={handleSelectionMouseDown}onClick={handleTimelineContentClick}data-ruler-area@@ -999,7 +1005,13 @@ export function Timeline() {{/* Timeline Tracks Content */}<divclassName="flex-1 relative overflow-hidden"- onWheel={handleWheel}+ onWheel={(e) => {+ // Check if this is horizontal scrolling - if so, don't handle it here+ if (e.shiftKey || Math.abs(e.deltaX) > Math.abs(e.deltaY)) {+ return; // Let ScrollArea handle horizontal scrolling+ }+ handleWheel(e);+ }}onMouseDown={(e) => {handleTimelineMouseDown(e);handleSelectionMouseDown(e);@@ -1013,7 +1025,12 @@ export function Timeline() {containerRef={tracksContainerRef}isActive={selectionBox?.isActive || false}/>- <ScrollArea className="w-full h-full" ref={tracksScrollRef}>+ <ScrollArea+ className="w-full h-full"+ ref={tracksScrollRef}+ type="scroll"+ showHorizontalScrollbar+ ><divclassName="relative flex-1"style={{diff --git a/apps/web/src/components/ui/scroll-area.tsx b/apps/web/src/components/ui/scroll-area.tsxindex 6b7c3c53..5c9db727 100644--- a/apps/web/src/components/ui/scroll-area.tsx+++ b/apps/web/src/components/ui/scroll-area.tsx@@ -7,17 +7,22 @@ import { cn } from "../../lib/utils";const ScrollArea = React.forwardRef<React.ElementRef<typeof ScrollAreaPrimitive.Root>,- React.ComponentPropsWithoutRef<typeof ScrollAreaPrimitive.Root>->(({ className, children, ...props }, ref) => (+ React.ComponentPropsWithoutRef<typeof ScrollAreaPrimitive.Root> & {+ type?: "auto" | "always" | "scroll" | "hover";+ showHorizontalScrollbar?: boolean;+ }+>(({ className, children, type, showHorizontalScrollbar, ...props }, ref) => (<ScrollAreaPrimitive.Rootref={ref}className={cn("relative overflow-hidden", className)}+ type={type}{...props}><ScrollAreaPrimitive.Viewport className="h-full w-full rounded-[inherit]">{children}</ScrollAreaPrimitive.Viewport><ScrollBar />+ {showHorizontalScrollbar && <ScrollBar orientation="horizontal" />}<ScrollAreaPrimitive.Corner /></ScrollAreaPrimitive.Root>));diff --git a/apps/web/src/hooks/use-timeline-zoom.ts b/apps/web/src/hooks/use-timeline-zoom.tsindex ce32c9f0..4f5e0af0 100644--- a/apps/web/src/hooks/use-timeline-zoom.ts+++ b/apps/web/src/hooks/use-timeline-zoom.ts@@ -24,6 +24,12 @@ export function useTimelineZoom({const delta = e.deltaY > 0 ? -0.15 : 0.15;setZoomLevel((prev) => Math.max(0.1, Math.min(10, prev + delta)));}+ // For horizontal scrolling (when shift is held or horizontal wheel movement),+ // let the event bubble up to allow ScrollArea to handle it+ else if (e.shiftKey || Math.abs(e.deltaX) > Math.abs(e.deltaY)) {+ // Don't prevent default - let ScrollArea handle horizontal scrolling+ return;+ }// Otherwise, allow normal scrolling}, []);