From f52ad7483c4da6ad43dbd2da8e1a92887f218758 Mon Sep 17 00:00:00 2001 From: FatttSnake Date: Tue, 12 Sep 2023 00:01:53 +0800 Subject: [PATCH] Fixed the bug of being unable to use ctrl+scroll wheel to adjust zoom --- src/components/HideScrollbar.tsx | 4 +++- src/components/Home.tsx | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/components/HideScrollbar.tsx b/src/components/HideScrollbar.tsx index 76a3714..91dfd0f 100644 --- a/src/components/HideScrollbar.tsx +++ b/src/components/HideScrollbar.tsx @@ -45,7 +45,9 @@ const HideScrollbar = forwardRef((prop const { isPreventScroll, ..._props } = props const handleDefaultWheel = useCallback((event: WheelEvent) => { - event.preventDefault() + if (!event.altKey && !event.ctrlKey) { + event.preventDefault() + } }, []) const handleDefaultTouchmove = useCallback((event: TouchEvent) => { diff --git a/src/components/Home.tsx b/src/components/Home.tsx index afde976..9a47331 100644 --- a/src/components/Home.tsx +++ b/src/components/Home.tsx @@ -53,6 +53,10 @@ const Home: React.FC = () => { } const handleWheel = (event: React.WheelEvent) => { + if (event.altKey || event.ctrlKey) { + return + } + if (event.deltaY > 0) { handleScrollToDown() setNavbarHidden(false)