diff --git a/src/components/FeedInterstitials.tsx b/src/components/FeedInterstitials.tsx index ec224eeae0..268a5ff5b8 100644 --- a/src/components/FeedInterstitials.tsx +++ b/src/components/FeedInterstitials.tsx @@ -1,6 +1,5 @@ import React from 'react' -import {View} from 'react-native' -import {ScrollView} from 'react-native-gesture-handler' +import {ScrollView, View} from 'react-native' import {AppBskyActorDefs, AppBskyFeedDefs, AtUri} from '@atproto/api' import {msg, Trans} from '@lingui/macro' import {useLingui} from '@lingui/react' @@ -17,6 +16,7 @@ import {useSuggestedFollowsByActorQuery} from '#/state/queries/suggested-follows import {useSession} from '#/state/session' import * as userActionHistory from '#/state/userActionHistory' import {SeenPost} from '#/state/userActionHistory' +import {BlockDrawerGesture} from '#/view/shell/BlockDrawerGesture' import {atoms as a, useBreakpoints, useTheme, ViewStyleProp, web} from '#/alf' import {Button} from '#/components/Button' import * as FeedCard from '#/components/FeedCard' @@ -336,33 +336,37 @@ export function ProfileGrid({ ) : ( - - - {content} - - - - + + + + + )} ) @@ -469,34 +473,38 @@ export function SuggestedFeeds() { ) : ( - - - {content} - - - - + + + + + )} ) diff --git a/src/components/interstitials/Trending.tsx b/src/components/interstitials/Trending.tsx index a9d7778a98..7412c6f0ac 100644 --- a/src/components/interstitials/Trending.tsx +++ b/src/components/interstitials/Trending.tsx @@ -1,7 +1,5 @@ -import React, {useContext} from 'react' +import React from 'react' import {ScrollView, View} from 'react-native' -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' @@ -13,6 +11,7 @@ import { import {useTrendingTopics} from '#/state/queries/trending/useTrendingTopics' import {useTrendingConfig} from '#/state/trending-config' import {LoadingPlaceholder} from '#/view/com/util/LoadingPlaceholder' +import {BlockDrawerGesture} from '#/view/shell/BlockDrawerGesture' 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,13 +40,9 @@ export function Inner() { setTrendingDisabled(true) }, [setTrendingDisabled]) - const drawerGesture = useContext(DrawerGestureContext) ?? Gesture.Native() // noop for web - const trendingScrollGesture = - Gesture.Native().blocksExternalGesture(drawerGesture) - return error || noTopics ? null : ( - + - + {children} +}