Skip to content

Commit cf9d976

Browse files
authored
Merge branch 'main' into @p-malecki/remove-banner-rotator-from-docs
2 parents 50d6467 + a423a6e commit cf9d976

1 file changed

Lines changed: 8 additions & 5 deletions

File tree

packages/react-native-gesture-handler/src/components/ReanimatedDrawerLayout.tsx

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,10 @@ import type {
4141
UserSelect,
4242
} from '../handlers/gestureHandlerCommon';
4343
import { MouseButton } from '../handlers/gestureHandlerCommon';
44-
import { GestureDetector } from '../v3/detectors';
44+
import {
45+
InterceptingGestureDetector,
46+
VirtualGestureDetector,
47+
} from '../v3/detectors';
4548
import type { PanGestureActiveEvent } from '../v3/hooks/gestures';
4649
import { usePanGesture, useTapGesture } from '../v3/hooks/gestures';
4750
import type { WithSharedValue } from '../v3/types';
@@ -657,12 +660,12 @@ const DrawerLayout = function DrawerLayout(
657660
);
658661

659662
return (
660-
<GestureDetector
663+
<InterceptingGestureDetector
661664
gesture={panGesture}
662665
userSelect={userSelect}
663666
enableContextMenu={enableContextMenu}>
664667
<Animated.View style={styles.main} onLayout={handleContainerLayout}>
665-
<GestureDetector
668+
<VirtualGestureDetector
666669
gesture={overlayDismissGesture}
667670
userSelect={userSelect}>
668671
<Animated.View
@@ -680,7 +683,7 @@ const DrawerLayout = function DrawerLayout(
680683
style={[styles.overlay, overlayAnimatedStyle]}
681684
/>
682685
</Animated.View>
683-
</GestureDetector>
686+
</VirtualGestureDetector>
684687
<Animated.View
685688
pointerEvents="box-none"
686689
animatedProps={drawerAnimatedProps}
@@ -694,7 +697,7 @@ const DrawerLayout = function DrawerLayout(
694697
</Animated.View>
695698
</Animated.View>
696699
</Animated.View>
697-
</GestureDetector>
700+
</InterceptingGestureDetector>
698701
);
699702
};
700703

0 commit comments

Comments
 (0)