diff options
| author | dan <dan.abramov@gmail.com> | 2023-11-09 21:45:31 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-09 21:45:31 +0000 |
| commit | c627a766cd7491e12e31e6a37bf114e3ddb24f7e (patch) | |
| tree | f77bef674a9051b45c6cb124626b4a4b9855b7c1 /src/view | |
| parent | 7a55ca613347680cd94add01faa5dc3f216b9bd2 (diff) | |
| download | voidsky-c627a766cd7491e12e31e6a37bf114e3ddb24f7e.tar.zst | |
Show tabs when swiping feeds (#1856)
Diffstat (limited to 'src/view')
| -rw-r--r-- | src/view/com/pager/Pager.tsx | 11 | ||||
| -rw-r--r-- | src/view/screens/Home.tsx | 10 |
2 files changed, 18 insertions, 3 deletions
diff --git a/src/view/com/pager/Pager.tsx b/src/view/com/pager/Pager.tsx index 531a41ee2..d70087504 100644 --- a/src/view/com/pager/Pager.tsx +++ b/src/view/com/pager/Pager.tsx @@ -26,6 +26,9 @@ interface Props { renderTabBar: RenderTabBarFn onPageSelected?: (index: number) => void onPageSelecting?: (index: number) => void + onPageScrollStateChanged?: ( + scrollState: 'idle' | 'dragging' | 'settling', + ) => void testID?: string } export const Pager = forwardRef<PagerRef, React.PropsWithChildren<Props>>( @@ -35,6 +38,7 @@ export const Pager = forwardRef<PagerRef, React.PropsWithChildren<Props>>( tabBarPosition = 'top', initialPage = 0, renderTabBar, + onPageScrollStateChanged, onPageSelected, onPageSelecting, testID, @@ -97,11 +101,12 @@ export const Pager = forwardRef<PagerRef, React.PropsWithChildren<Props>>( [lastOffset, lastDirection, onPageSelecting], ) - const onPageScrollStateChanged = React.useCallback( + const handlePageScrollStateChanged = React.useCallback( (e: PageScrollStateChangedNativeEvent) => { scrollState.current = e.nativeEvent.pageScrollState + onPageScrollStateChanged?.(e.nativeEvent.pageScrollState) }, - [scrollState], + [scrollState, onPageScrollStateChanged], ) const onTabBarSelect = React.useCallback( @@ -123,7 +128,7 @@ export const Pager = forwardRef<PagerRef, React.PropsWithChildren<Props>>( ref={pagerView} style={s.flex1} initialPage={initialPage} - onPageScrollStateChanged={onPageScrollStateChanged} + onPageScrollStateChanged={handlePageScrollStateChanged} onPageSelected={onPageSelectedInner} onPageScroll={onPageScroll}> {children} diff --git a/src/view/screens/Home.tsx b/src/view/screens/Home.tsx index c58175327..d6603a936 100644 --- a/src/view/screens/Home.tsx +++ b/src/view/screens/Home.tsx @@ -85,6 +85,15 @@ export const HomeScreen = withAuthRequired( store.emitScreenSoftReset() }, [store]) + const onPageScrollStateChanged = React.useCallback( + (state: 'idle' | 'dragging' | 'settling') => { + if (state === 'dragging') { + setMinimalShellMode(false) + } + }, + [setMinimalShellMode], + ) + const renderTabBar = React.useCallback( (props: RenderTabBarFnProps) => { return ( @@ -113,6 +122,7 @@ export const HomeScreen = withAuthRequired( ref={pagerRef} testID="homeScreen" onPageSelected={onPageSelected} + onPageScrollStateChanged={onPageScrollStateChanged} renderTabBar={renderTabBar} tabBarPosition="top"> <FeedPage |