From 89f1c43984c8b0b7dfb67f16d6938687c9653778 Mon Sep 17 00:00:00 2001 From: Huang Xin Date: Sat, 8 Mar 2025 21:26:10 +0800 Subject: [PATCH] fix: don't hide horizontal scrollbar at the bottom, closes #515 (#533) --- apps/readest-app/src/app/reader/components/FooterBar.tsx | 1 + apps/readest-app/src/app/reader/hooks/useIframeEvents.ts | 9 ++++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/apps/readest-app/src/app/reader/components/FooterBar.tsx b/apps/readest-app/src/app/reader/components/FooterBar.tsx index 2a0de4ee..be4cbf8a 100644 --- a/apps/readest-app/src/app/reader/components/FooterBar.tsx +++ b/apps/readest-app/src/app/reader/components/FooterBar.tsx @@ -79,6 +79,7 @@ const FooterBar: React.FC = ({ appService?.hasRoundedWindow && 'rounded-window-bottom-right', !isSideBarVisible && appService?.hasRoundedWindow && 'rounded-window-bottom-left', isHoveredAnim && 'hover-bar-anim', + viewSettings?.vertical && viewSettings?.scrolled ? 'mb-3 !h-6' : '', hoveredBookKey === bookKey ? `opacity-100` : `opacity-0`, )} dir={viewSettings?.rtl ? 'rtl' : 'ltr'} diff --git a/apps/readest-app/src/app/reader/hooks/useIframeEvents.ts b/apps/readest-app/src/app/reader/hooks/useIframeEvents.ts index 2474dc21..c6d909c1 100644 --- a/apps/readest-app/src/app/reader/hooks/useIframeEvents.ts +++ b/apps/readest-app/src/app/reader/hooks/useIframeEvents.ts @@ -58,12 +58,15 @@ export const useClickEvent = ( } } } - } else if (msg.data.type === 'iframe-wheel' && !viewSettings.scrolled) { + } else if (msg.data.type === 'iframe-wheel') { const { deltaY } = msg.data; + const fontSize = viewSettings?.defaultFontSize ?? 16; + const lineHeight = viewSettings?.lineHeight ?? 1.6; + const distance = fontSize * lineHeight * 3; if (deltaY > 0) { - viewRef.current?.next(1); + viewRef.current?.next(viewSettings.scrolled ? distance : 1); } else if (deltaY < 0) { - viewRef.current?.prev(1); + viewRef.current?.prev(viewSettings.scrolled ? distance : 1); } } else if (msg.data.type === 'iframe-mouseup') { if (msg.data.button === 3) {