From ab82db63465de33a6f482ef5007edb9ea544ad2f Mon Sep 17 00:00:00 2001
From: Maze Winther <mazewinther@gmail.com>
Date: Mon, 21 Jul 2025 21:42:44 +0200
Subject: Merge pull request
 [#395](https://github.com/mazeincoding/AppCut/issues/395)

---
 apps/web/src/hooks/use-timeline-zoom.ts | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'apps/web/src/hooks')

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
   }, []);
 
-- 
cgit v1.3.1