fix: navigation drawer sometimes not closing when pressed outside

react-navigation · Oct 21, 2019 · 0d8cdc8 · 0d8cdc8
1 parent 2680b46
commit 0d8cdc8
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/packages/drawer/src/views/Drawer.tsx b/packages/drawer/src/views/Drawer.tsx
@@ -428,7 +428,14 @@ export default class DrawerView extends React.PureComponent<Props> {
         x: this.touchX,
         translationX: this.gestureX,
         velocityX: this.velocityX,
-        state: this.gestureState,
+      },
+    },
+  ]);
+
+  private handleGestureStateChange = event([
+    {
+      nativeEvent: {
+        state: (s: Animated.Value<number>) => set(this.gestureState, s),
       },
     },
   ]);
@@ -519,7 +526,7 @@ export default class DrawerView extends React.PureComponent<Props> {
         activeOffsetX={[-SWIPE_DISTANCE_MINIMUM, SWIPE_DISTANCE_MINIMUM]}
         failOffsetY={[-SWIPE_DISTANCE_MINIMUM, SWIPE_DISTANCE_MINIMUM]}
         onGestureEvent={this.handleGestureEvent}
-        onHandlerStateChange={this.handleGestureEvent}
+        onHandlerStateChange={this.handleGestureStateChange}
         hitSlop={hitSlop}
         enabled={!locked}
         {...gestureHandlerProps}

diff --git a/packages/material-bottom-tabs/src/views/MaterialBottomTabView.tsx b/packages/material-bottom-tabs/src/views/MaterialBottomTabView.tsx
@@ -113,7 +113,7 @@ export default class MaterialBottomTabView extends React.PureComponent<Props> {
             target: state.key,
           })
         }
-        renderScene={({ route }) => descriptors[route.key].render()}
+        renderScene={({ route }: Scene) => descriptors[route.key].render()}
         renderIcon={this.renderIcon}
         getLabelText={this.getLabelText}
         getColor={this.getColor}