feat: disable gesture logic when no gesture stack

react-navigation · Aug 28, 2019 · 38336b0 · 38336b0
1 parent fc37e93
commit 38336b0
Showing 1 changed file with 18 additions and 7 deletions.
diff --git a/packages/stack/src/views/Stack/Card.tsx b/packages/stack/src/views/Stack/Card.tsx
@@ -366,6 +366,15 @@ export default class Card extends React.Component<Props> {
         set(this.nextIsVisible, UNSET),
       ])
     ),
+    onChange(
+      this.isVisible,
+      call([this.isVisible], ([isVisible]) => (this.isVisibleValue = isVisible))
+    ),
+  ]);
+
+  private execNoGesture = this.runTransition(this.isVisible);
+
+  private execWithGesture = block([
     onChange(
       this.isSwiping,
       call(
@@ -454,10 +463,6 @@ export default class Card extends React.Component<Props> {
         ),
       ]
     ),
-    onChange(
-      this.isVisible,
-      call([this.isVisible], ([isVisible]) => (this.isVisibleValue = isVisible))
-    ),
   ]);
 
   private handleGestureEventHorizontal = Animated.event([
@@ -576,15 +581,21 @@ export default class Card extends React.Component<Props> {
       layout
     );
 
-    const handleGestureEvent =
-      gestureDirection === 'vertical'
+    const handleGestureEvent = gestureEnabled
+      ? gestureDirection === 'vertical'
         ? this.handleGestureEventVertical
-        : this.handleGestureEventHorizontal;
+        : this.handleGestureEventHorizontal
+      : undefined;
 
     return (
       <StackGestureContext.Provider value={this.gestureRef}>
         <View pointerEvents="box-none" {...rest}>
           <Animated.Code exec={this.exec} />
+          {this.props.gestureEnabled ? (
+            <Animated.Code exec={this.execNoGesture} />
+          ) : (
+            <Animated.Code exec={this.execWithGesture} />
+          )}
           {overlayEnabled && overlayStyle ? (
             <Animated.View
               pointerEvents="none"