From 65def371659c3b64481199b2585a40a1affd9ec2 Mon Sep 17 00:00:00 2001 From: dan Date: Fri, 10 Nov 2023 19:00:46 +0000 Subject: Push useAnimatedScrollHandler down everywhere to work around bugs (#1866) * Move useOnMainScroll handlers to leaves * Force Feed to always take handlers * Pass handlers from the pager --- src/lib/hooks/useOnMainScroll.ts | 44 ++++++++++++++++++++++++++++++++-------- 1 file changed, 35 insertions(+), 9 deletions(-) (limited to 'src/lib/hooks/useOnMainScroll.ts') diff --git a/src/lib/hooks/useOnMainScroll.ts b/src/lib/hooks/useOnMainScroll.ts index 4cad34f40..2e7a79913 100644 --- a/src/lib/hooks/useOnMainScroll.ts +++ b/src/lib/hooks/useOnMainScroll.ts @@ -1,11 +1,15 @@ -import {useState, useCallback} from 'react' +import {useState, useCallback, useMemo} from 'react' import {NativeSyntheticEvent, NativeScrollEvent} from 'react-native' import {useSetMinimalShellMode, useMinimalShellMode} from '#/state/shell' import {useShellLayout} from '#/state/shell/shell-layout' import {s} from 'lib/styles' import {isWeb} from 'platform/detection' -import {useSharedValue, interpolate, runOnJS} from 'react-native-reanimated' -import {useAnimatedScrollHandler} from './useAnimatedScrollHandler_FIXED' +import { + useSharedValue, + interpolate, + runOnJS, + ScrollHandlers, +} from 'react-native-reanimated' function clamp(num: number, min: number, max: number) { 'worklet' @@ -15,9 +19,10 @@ function clamp(num: number, min: number, max: number) { export type OnScrollCb = ( event: NativeSyntheticEvent, ) => void +export type OnScrollHandler = ScrollHandlers export type ResetCb = () => void -export function useOnMainScroll(): [OnScrollCb, boolean, ResetCb] { +export function useOnMainScroll(): [OnScrollHandler, boolean, ResetCb] { const {headerHeight} = useShellLayout() const [isScrolledDown, setIsScrolledDown] = useState(false) const mode = useMinimalShellMode() @@ -25,12 +30,18 @@ export function useOnMainScroll(): [OnScrollCb, boolean, ResetCb] { const startDragOffset = useSharedValue(null) const startMode = useSharedValue(null) - const scrollHandler = useAnimatedScrollHandler({ - onBeginDrag(e) { + const onBeginDrag = useCallback( + (e: NativeScrollEvent) => { + 'worklet' startDragOffset.value = e.contentOffset.y startMode.value = mode.value }, - onEndDrag(e) { + [mode, startDragOffset, startMode], + ) + + const onEndDrag = useCallback( + (e: NativeScrollEvent) => { + 'worklet' startDragOffset.value = null startMode.value = null if (e.contentOffset.y < headerHeight.value / 2) { @@ -41,7 +52,12 @@ export function useOnMainScroll(): [OnScrollCb, boolean, ResetCb] { setMode(Math.round(mode.value) === 1) } }, - onScroll(e) { + [startDragOffset, startMode, setMode, mode, headerHeight], + ) + + const onScroll = useCallback( + (e: NativeScrollEvent) => { + 'worklet' // Keep track of whether we want to show "scroll to top". if (!isScrolledDown && e.contentOffset.y > s.window.height) { runOnJS(setIsScrolledDown)(true) @@ -86,7 +102,17 @@ export function useOnMainScroll(): [OnScrollCb, boolean, ResetCb] { startMode.value = mode.value } }, - }) + [headerHeight, mode, setMode, isScrolledDown, startDragOffset, startMode], + ) + + const scrollHandler: ScrollHandlers = useMemo( + () => ({ + onBeginDrag, + onEndDrag, + onScroll, + }), + [onBeginDrag, onEndDrag, onScroll], + ) return [ scrollHandler, -- cgit 1.4.1