From c8eeb6ba1cd74abafc2475a1aaa097a51092fb82 Mon Sep 17 00:00:00 2001 From: Paul Frazee Date: Mon, 3 Jul 2023 18:36:49 -0500 Subject: [PATCH] Fix: re-add the scroll boundary to avoid minimal shell at top of screen (#956) --- src/lib/hooks/useOnMainScroll.ts | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/lib/hooks/useOnMainScroll.ts b/src/lib/hooks/useOnMainScroll.ts index c47da754..507a28ce 100644 --- a/src/lib/hooks/useOnMainScroll.ts +++ b/src/lib/hooks/useOnMainScroll.ts @@ -6,6 +6,7 @@ import {isDesktopWeb} from 'platform/detection' const DY_LIMIT_UP = isDesktopWeb ? 30 : 10 const DY_LIMIT_DOWN = isDesktopWeb ? 150 : 10 +const Y_LIMIT = 10 export type OnScrollCb = ( event: NativeSyntheticEvent, @@ -24,9 +25,16 @@ export function useOnMainScroll( const dy = y - (lastY.current || 0) lastY.current = y - if (!store.shell.minimalShellMode && dy > DY_LIMIT_DOWN) { + if ( + !store.shell.minimalShellMode && + dy > DY_LIMIT_DOWN && + y > Y_LIMIT + ) { store.shell.setMinimalShellMode(true) - } else if (store.shell.minimalShellMode && dy < DY_LIMIT_UP * -1) { + } else if ( + store.shell.minimalShellMode && + (dy < DY_LIMIT_UP * -1 || y <= Y_LIMIT) + ) { store.shell.setMinimalShellMode(false) }