From 3d4b173735fb5694b1fbbe8bcd2075c1ea806d2f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Osadnik?= <micosa97@gmail.com>
Date: Tue, 22 Oct 2019 16:46:36 +0200
Subject: [PATCH] fix: send events even is stack animation is vain (#270)

---
 example/src/ModalStack.tsx |  35 ++++++-
 src/views/Stack/Card.tsx   | 206 +++++++++++++++++++++----------------
 2 files changed, 152 insertions(+), 89 deletions(-)

diff --git a/example/src/ModalStack.tsx b/example/src/ModalStack.tsx
index eeb49f4c0..4d8f02f76 100644
--- a/example/src/ModalStack.tsx
+++ b/example/src/ModalStack.tsx
@@ -1,5 +1,12 @@
 import * as React from 'react';
-import { Button, View, Text, Dimensions, Switch } from 'react-native';
+import {
+  Button,
+  View,
+  Text,
+  Dimensions,
+  Switch,
+  TextInput,
+} from 'react-native';
 import {
   createStackNavigator,
   CardStyleInterpolators,
@@ -127,6 +134,10 @@ class DetailsScreen extends React.Component<NavigationStackScreenProps> {
           title="Go to Details... again"
           onPress={() => this.props.navigation.push('Details')}
         />
+        <Button
+          title="Go to inputs..."
+          onPress={() => this.props.navigation.push('Inputs')}
+        />
         <Button
           title="Go to List"
           onPress={() => this.props.navigation.navigate('List')}
@@ -143,12 +154,34 @@ class DetailsScreen extends React.Component<NavigationStackScreenProps> {
     );
   }
 }
+function InputsScreen({ navigation }: NavigationStackScreenProps) {
+  return (
+    <View style={{ flex: 1, alignItems: 'center', justifyContent: 'center' }}>
+      <Text>Inputs Screen</Text>
+      <TextInput
+        defaultValue="sample"
+        autoFocus
+        style={{ backgroundColor: 'blue' }}
+      />
+      <TextInput defaultValue="sample" style={{ backgroundColor: 'red' }} />
+      <TextInput defaultValue="sample" style={{ backgroundColor: 'green' }} />
+      <Button
+        title="Go to inputs... again"
+        onPress={() => navigation.push('Inputs')}
+      />
+    </View>
+  );
+}
 
 export default createStackNavigator(
   {
     List: ListScreen,
     Details: DetailsScreen,
     Modal: Modal,
+    Inputs: {
+      screen: InputsScreen,
+      navigationOptions: { gestureDirection: 'vertical' },
+    },
   },
   {
     initialRouteName: 'List',
diff --git a/src/views/Stack/Card.tsx b/src/views/Stack/Card.tsx
index 10dd3aff5..c07a1d41c 100755
--- a/src/views/Stack/Card.tsx
+++ b/src/views/Stack/Card.tsx
@@ -351,6 +351,7 @@ export default class Card extends React.Component<Props> {
   private offset = new Value(0);
   private velocityUntraversed = new Value(0);
   private velocity = new Value(0);
+  private didMovementHappen = new Value(0);
 
   private gestureState = new Value(0);
 
@@ -404,98 +405,126 @@ export default class Card extends React.Component<Props> {
   private runTransition = (isVisible: Binary | Animated.Node<number>) => {
     const { open: openingSpec, close: closingSpec } = this.props.transitionSpec;
 
-    return cond(eq(this.props.current, isVisible), NOOP_NODE, [
-      cond(clockRunning(this.clock), NOOP_NODE, [
-        // Animation wasn't running before
-        // Set the initial values and start the clock
-        set(this.toValue, isVisible),
-        // The velocity value is ideal for translating the whole screen
-        // But since we have 0-1 scale, we need to adjust the velocity
-        set(
-          this.transitionVelocity,
-          multiply(
-            cond(
-              this.distance,
-              divide(this.velocity, this.distance),
-              FALSE_NODE
-            ),
-            -1
-          )
-        ),
-        set(this.frameTime, FALSE_NODE),
-        set(this.transitionState.time, FALSE_NODE),
-        set(this.transitionState.finished, FALSE_NODE),
-        set(this.isVisible, isVisible),
-        startClock(this.clock),
-        call([this.isVisible], ([value]: ReadonlyArray<Binary>) => {
-          this.handleStartInteraction();
-
-          const { onTransitionStart } = this.props;
-          this.noAnimationStartedSoFar = false;
-          this.isRunningAnimation = true;
-          onTransitionStart && onTransitionStart({ closing: !value });
-        }),
-      ]),
+    return [
       cond(
-        eq(isVisible, TRUE_NODE),
-        openingSpec.animation === 'spring'
-          ? memoizedSpring(
-              this.clock,
-              { ...this.transitionState, velocity: this.transitionVelocity },
-              // @ts-ignore
-              {
-                ...(this.openingSpecConfig as AnimatedSpringConfig),
-                toValue: this.toValue,
-              }
-            )
-          : timing(
-              this.clock,
-              { ...this.transitionState, frameTime: this.frameTime },
-              {
-                ...(this.openingSpecConfig as AnimatedTimingConfig),
-                toValue: this.toValue,
-              }
+        eq(this.props.current, isVisible),
+        call(
+          [this.didMovementHappen, this.isVisible],
+          ([didMovementHappen]: ReadonlyArray<Binary>) => {
+            if (didMovementHappen) {
+              // if we go back to the same position,
+              // let's pretend that whole animation happen
+              // for making the logic consistent
+              // It's especially vital for having inputs properly focused.
+              this.handleStartInteraction();
+              const { onTransitionStart } = this.props;
+              onTransitionStart && onTransitionStart({ closing: true });
+              this.handleTransitionEnd();
+              this.props.onOpen(true);
+            }
+          }
+        ),
+        [
+          cond(clockRunning(this.clock), NOOP_NODE, [
+            // Animation wasn't running before
+            // Set the initial values and start the clock
+            set(this.toValue, isVisible),
+            // The velocity value is ideal for translating the whole screen
+            // But since we have 0-1 scale, we need to adjust the velocity
+            set(
+              this.transitionVelocity,
+              multiply(
+                cond(
+                  this.distance,
+                  divide(this.velocity, this.distance),
+                  FALSE_NODE
+                ),
+                -1
+              )
             ),
-        closingSpec.animation === 'spring'
-          ? memoizedSpring(
-              this.clock,
-              { ...this.transitionState, velocity: this.transitionVelocity },
-              // @ts-ignore
-              {
-                ...(this.closingSpecConfig as AnimatedSpringConfig),
-                toValue: this.toValue,
-              }
-            )
-          : timing(
-              this.clock,
-              { ...this.transitionState, frameTime: this.frameTime },
-              {
-                ...(this.closingSpecConfig as AnimatedTimingConfig),
-                toValue: this.toValue,
+            set(this.frameTime, FALSE_NODE),
+            set(this.transitionState.time, FALSE_NODE),
+            set(this.transitionState.finished, FALSE_NODE),
+            set(this.isVisible, isVisible),
+            startClock(this.clock),
+            call([this.isVisible], ([value]: ReadonlyArray<Binary>) => {
+              this.handleStartInteraction();
+
+              const { onTransitionStart } = this.props;
+              this.noAnimationStartedSoFar = false;
+              this.isRunningAnimation = true;
+              onTransitionStart && onTransitionStart({ closing: !value });
+            }),
+          ]),
+          cond(
+            eq(isVisible, TRUE_NODE),
+            openingSpec.animation === 'spring'
+              ? memoizedSpring(
+                  this.clock,
+                  {
+                    ...this.transitionState,
+                    velocity: this.transitionVelocity,
+                  },
+                  // @ts-ignore
+                  {
+                    ...(this.openingSpecConfig as AnimatedSpringConfig),
+                    toValue: this.toValue,
+                  }
+                )
+              : timing(
+                  this.clock,
+                  { ...this.transitionState, frameTime: this.frameTime },
+                  {
+                    ...(this.openingSpecConfig as AnimatedTimingConfig),
+                    toValue: this.toValue,
+                  }
+                ),
+            closingSpec.animation === 'spring'
+              ? memoizedSpring(
+                  this.clock,
+                  {
+                    ...this.transitionState,
+                    velocity: this.transitionVelocity,
+                  },
+                  // @ts-ignore
+                  {
+                    ...(this.closingSpecConfig as AnimatedSpringConfig),
+                    toValue: this.toValue,
+                  }
+                )
+              : timing(
+                  this.clock,
+                  { ...this.transitionState, frameTime: this.frameTime },
+                  {
+                    ...(this.closingSpecConfig as AnimatedTimingConfig),
+                    toValue: this.toValue,
+                  }
+                )
+          ),
+          cond(this.transitionState.finished, [
+            // Reset values
+            set(this.isSwipeGesture, FALSE_NODE),
+            set(this.gesture, FALSE_NODE),
+            set(this.velocity, FALSE_NODE),
+            // When the animation finishes, stop the clock
+            stopClock(this.clock),
+            call([this.isVisible], ([value]: ReadonlyArray<Binary>) => {
+              const isOpen = Boolean(value);
+              const { onOpen, onClose } = this.props;
+
+              this.handleTransitionEnd();
+
+              if (isOpen) {
+                onOpen(true);
+              } else {
+                onClose(true);
               }
-            )
+            }),
+          ]),
+        ]
       ),
-      cond(this.transitionState.finished, [
-        // Reset values
-        set(this.isSwipeGesture, FALSE_NODE),
-        set(this.gesture, FALSE_NODE),
-        set(this.velocity, FALSE_NODE),
-        // When the animation finishes, stop the clock
-        stopClock(this.clock),
-        call([this.isVisible], ([value]: ReadonlyArray<Binary>) => {
-          const isOpen = Boolean(value);
-          const { onOpen, onClose } = this.props;
-
-          this.handleTransitionEnd();
-
-          if (isOpen) {
-            onOpen(true);
-          } else {
-            onClose(true);
-          }
-        }),
-      ]),
-    ]);
+      set(this.didMovementHappen, 0),
+    ];
   };
 
   private extrapolatedPosition = add(
@@ -576,6 +605,7 @@ export default class Card extends React.Component<Props> {
         }
       )
     ),
+    onChange(this.gestureUntraversed, set(this.didMovementHappen, 1)),
     cond(
       eq(this.gestureState, GestureState.ACTIVE),
       [