kylefang/react-navigation
1
0
Fork 0
mirror of https://github.com/zhigang1992/react-navigation.git synced 2026-02-09 09:13:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: get rid of random red screen on iOS on opening drawer (#68)

Browse Source
This commit is contained in:
Michał Osadnik
2019-05-13 18:30:03 +02:00
parent be17729df6
commit e15ba96fb9
2 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
packages/drawer/jest-setup.js
View File

@@ -28,6 +28,7 @@ Object.assign(NativeModules, {
jest.mock('react-native-reanimated', () => ({
__esModule: true,
default: {
Code: () => null,
View: require('react-native').Animated.View,
Text: require('react-native').Animated.Text,
Clock: jest.fn(),

29
packages/drawer/src/views/Drawer.tsx
View File

@@ -243,7 +243,7 @@ export default class DrawerView extends React.PureComponent<Props> {
private isStatusBarHidden: boolean = false;
private isSpringManuallyTriggered = new Value<Binary>(FALSE);
private manuallyTriggerSpring = new Value<Binary>(FALSE);
private transitionTo = (isOpen: number | Animated.Node<number>) => {
const toValue = new Value(0);
@@ -349,7 +349,7 @@ export default class DrawerView extends React.PureComponent<Props> {
cond(
eq(this.gestureState, State.ACTIVE),
[
set(this.isSpringManuallyTriggered, FALSE),
set(this.manuallyTriggerSpring, FALSE),
cond(this.isSwiping, NOOP, [
// We weren't dragging before, set it to true
set(this.isSwiping, TRUE),
@@ -369,7 +369,7 @@ export default class DrawerView extends React.PureComponent<Props> {
set(this.touchX, 0),
this.transitionTo(
cond(
this.isSpringManuallyTriggered,
this.manuallyTriggerSpring,
this.isOpen,
cond(
or(
@@ -429,7 +429,7 @@ export default class DrawerView extends React.PureComponent<Props> {
nativeEvent,
}: TapGestureHandlerStateChangeEvent) => {
if (nativeEvent.oldState === State.ACTIVE && !this.props.locked) {
this.toggleDrawer(false);
this.manuallyTriggerSpring.setValue(TRUE);
}
};
@@ -447,12 +447,13 @@ export default class DrawerView extends React.PureComponent<Props> {
};
private toggleDrawer = (open: boolean) => {
this.nextIsOpen.setValue(open ? TRUE : FALSE);
this.isSpringManuallyTriggered.setValue(TRUE);
if (this.currentOpenValue !== open) {
this.nextIsOpen.setValue(open ? TRUE : FALSE);
// This value will also be set shortly after as changing this.nextIsOpen changes this.isOpen
// However, there's a race condition on Android, so we need to set a bit earlier
this.currentOpenValue = open;
// This value will also be set shortly after as changing this.nextIsOpen changes this.isOpen
// However, there's a race condition on Android, so we need to set a bit earlier
this.currentOpenValue = open;
}
};
private toggleStatusBar = (hidden: boolean) => {
@@ -546,6 +547,16 @@ export default class DrawerView extends React.PureComponent<Props> {
/>
</TapGestureHandler>
</Animated.View>
<Animated.Code
exec={block([
onChange(this.manuallyTriggerSpring, [
cond(eq(this.manuallyTriggerSpring, TRUE), [
set(this.nextIsOpen, FALSE),
call([], () => (this.currentOpenValue = false)),
]),
]),
])}
/>
<Animated.View
accessibilityViewIsModal={open}
removeClippedSubviews={Platform.OS !== 'ios'}