Fix tabbar swipe conflicting with drawer (#7501)
This commit is contained in:
@@ -13,6 +13,7 @@ import Animated, {
|
|||||||
} from 'react-native-reanimated'
|
} from 'react-native-reanimated'
|
||||||
|
|
||||||
import {PressableWithHover} from '#/view/com/util/PressableWithHover'
|
import {PressableWithHover} from '#/view/com/util/PressableWithHover'
|
||||||
|
import {BlockDrawerGesture} from '#/view/shell/BlockDrawerGesture'
|
||||||
import {atoms as a, useTheme} from '#/alf'
|
import {atoms as a, useTheme} from '#/alf'
|
||||||
import {Text} from '#/components/Typography'
|
import {Text} from '#/components/Typography'
|
||||||
|
|
||||||
@@ -297,6 +298,7 @@ export function TabBar({
|
|||||||
testID={testID}
|
testID={testID}
|
||||||
style={[t.atoms.bg, a.flex_row]}
|
style={[t.atoms.bg, a.flex_row]}
|
||||||
accessibilityRole="tablist">
|
accessibilityRole="tablist">
|
||||||
|
<BlockDrawerGesture>
|
||||||
<ScrollView
|
<ScrollView
|
||||||
testID={`${testID}-selector`}
|
testID={`${testID}-selector`}
|
||||||
horizontal={true}
|
horizontal={true}
|
||||||
@@ -348,6 +350,7 @@ export function TabBar({
|
|||||||
/>
|
/>
|
||||||
</Animated.View>
|
</Animated.View>
|
||||||
</ScrollView>
|
</ScrollView>
|
||||||
|
</BlockDrawerGesture>
|
||||||
<View style={[t.atoms.border_contrast_low, styles.outerBottomBorder]} />
|
<View style={[t.atoms.border_contrast_low, styles.outerBottomBorder]} />
|
||||||
</View>
|
</View>
|
||||||
)
|
)
|
||||||
|
|||||||
Reference in New Issue
Block a user