summaryrefslogtreecommitdiff
path: root/apps/web/src/hooks
diff options
context:
space:
mode:
authorMaze Winther <mazewinther@gmail.com>2025-07-21 21:42:44 +0200
committerMaze Winther <mazewinther@gmail.com>2025-07-21 21:42:44 +0200
commitab82db63465de33a6f482ef5007edb9ea544ad2f (patch)
treebaf88a426a608f0d9a4dc40132ef09a134b7c5f2 /apps/web/src/hooks
parent53d00b72740372f3e3c077dd75ffd1ee8c4a10fd (diff)
downloadopencut-ab82db63465de33a6f482ef5007edb9ea544ad2f.tar.gz
Merge pull request [#395](https://github.com/mazeincoding/AppCut/issues/395)
Diffstat (limited to 'apps/web/src/hooks')
-rw-r--r--apps/web/src/hooks/use-timeline-zoom.ts6
1 files changed, 6 insertions, 0 deletions
diff --git a/apps/web/src/hooks/use-timeline-zoom.ts b/apps/web/src/hooks/use-timeline-zoom.ts
index 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
}, []);