A simpler fix for trending swipe issue (#7424)
This commit is contained in:
@@ -1,6 +1,7 @@
|
||||
import React, {useContext} from 'react'
|
||||
import {ScrollView, View} from 'react-native'
|
||||
import {GestureDetector} from 'react-native-gesture-handler'
|
||||
import {DrawerGestureContext} from 'react-native-drawer-layout'
|
||||
import {Gesture, GestureDetector} from 'react-native-gesture-handler'
|
||||
import {msg} from '@lingui/macro'
|
||||
import {useLingui} from '@lingui/react'
|
||||
|
||||
@@ -12,7 +13,6 @@ import {
|
||||
import {useTrendingTopics} from '#/state/queries/trending/useTrendingTopics'
|
||||
import {useTrendingConfig} from '#/state/trending-config'
|
||||
import {LoadingPlaceholder} from '#/view/com/util/LoadingPlaceholder'
|
||||
import {TrendingGestureContext} from '#/view/shell/TrendingGestureContext'
|
||||
import {atoms as a, useGutters, useTheme} from '#/alf'
|
||||
import {Button, ButtonIcon} from '#/components/Button'
|
||||
import {TimesLarge_Stroke2_Corner0_Rounded as X} from '#/components/icons/Times'
|
||||
@@ -41,8 +41,9 @@ export function Inner() {
|
||||
setTrendingDisabled(true)
|
||||
}, [setTrendingDisabled])
|
||||
|
||||
// This is coordinated to take precedence over the drawer pan gesture.
|
||||
const trendingScrollGesture = useContext(TrendingGestureContext)
|
||||
const drawerGesture = useContext(DrawerGestureContext)!
|
||||
const trendingScrollGesture =
|
||||
Gesture.Native().blocksExternalGesture(drawerGesture)
|
||||
|
||||
return error || noTopics ? null : (
|
||||
<View style={[t.atoms.border_contrast_low, a.border_t]}>
|
||||
|
||||
@@ -1,7 +0,0 @@
|
||||
import {createContext} from 'react'
|
||||
import {Gesture} from 'react-native-gesture-handler'
|
||||
|
||||
// Not really used but serves as a fallback for types.
|
||||
const noopGesture = Gesture.Native()
|
||||
|
||||
export const TrendingGestureContext = createContext(noopGesture)
|
||||
@@ -34,7 +34,6 @@ import {BottomSheetOutlet} from '../../../modules/bottom-sheet'
|
||||
import {updateActiveViewAsync} from '../../../modules/expo-bluesky-swiss-army/src/VisibilityView'
|
||||
import {Composer} from './Composer'
|
||||
import {DrawerContent} from './Drawer'
|
||||
import {TrendingGestureContext} from './TrendingGestureContext'
|
||||
|
||||
function ShellInner() {
|
||||
const t = useTheme()
|
||||
@@ -145,9 +144,7 @@ function ShellInner() {
|
||||
dim: 'rgba(10, 13, 16, 0.8)',
|
||||
}),
|
||||
}}>
|
||||
<TrendingGestureContext.Provider value={trendingScrollGesture}>
|
||||
<TabsNavigator />
|
||||
</TrendingGestureContext.Provider>
|
||||
<TabsNavigator />
|
||||
</Drawer>
|
||||
</ErrorBoundary>
|
||||
</View>
|
||||
|
||||
Reference in New Issue
Block a user