fix: spring was not triggered sometimes on tap (facebook#67)

Co-Authored-By: Satyajit Sahoo <satyajit.happy@gmail.com>
react-one · Aug 18, 2019 · 8bbddb2 · 8bbddb2
1 parent 3f64539
commit 8bbddb2
Showing 1 changed file with 27 additions and 19 deletions.
diff --git a/packages/drawer/src/views/Drawer.tsx b/packages/drawer/src/views/Drawer.tsx
@@ -243,6 +243,8 @@ export default class DrawerView extends React.PureComponent<Props> {
 
   private isStatusBarHidden: boolean = false;
 
+  private isSpringManuallyTriggered = new Value<Binary>(FALSE);
+
   private transitionTo = (isOpen: number | Animated.Node<number>) => {
     const toValue = new Value(0);
     const frameTime = new Value(0);
@@ -347,6 +349,7 @@ export default class DrawerView extends React.PureComponent<Props> {
     cond(
       eq(this.gestureState, State.ACTIVE),
       [
+        set(this.isSpringManuallyTriggered, FALSE),
         cond(this.isSwiping, NOOP, [
           // We weren't dragging before, set it to true
           set(this.isSwiping, TRUE),
@@ -366,27 +369,31 @@ export default class DrawerView extends React.PureComponent<Props> {
         set(this.touchX, 0),
         this.transitionTo(
           cond(
-            or(
-              and(
-                greaterThan(abs(this.gestureX), SWIPE_DISTANCE_MINIMUM),
-                greaterThan(abs(this.velocityX), this.swipeVelocityThreshold)
-              ),
-              greaterThan(abs(this.gestureX), this.swipeDistanceThreshold)
-            ),
+            this.isSpringManuallyTriggered,
+            this.isOpen,
             cond(
-              eq(this.drawerPosition, DIRECTION_LEFT),
-              // If swiped to right, open the drawer, otherwise close it
-              greaterThan(
-                cond(eq(this.velocityX, 0), this.gestureX, this.velocityX),
-                0
+              or(
+                and(
+                  greaterThan(abs(this.gestureX), SWIPE_DISTANCE_MINIMUM),
+                  greaterThan(abs(this.velocityX), this.swipeVelocityThreshold)
+                ),
+                greaterThan(abs(this.gestureX), this.swipeDistanceThreshold)
+              ),
+              cond(
+                eq(this.drawerPosition, DIRECTION_LEFT),
+                // If swiped to right, open the drawer, otherwise close it
+                greaterThan(
+                  cond(eq(this.velocityX, 0), this.gestureX, this.velocityX),
+                  0
+                ),
+                // If swiped to left, open the drawer, otherwise close it
+                lessThan(
+                  cond(eq(this.velocityX, 0), this.gestureX, this.velocityX),
+                  0
+                )
               ),
-              // If swiped to left, open the drawer, otherwise close it
-              lessThan(
-                cond(eq(this.velocityX, 0), this.gestureX, this.velocityX),
-                0
-              )
-            ),
-            this.isOpen
+              this.isOpen
+            )
           )
         ),
       ]
@@ -441,6 +448,7 @@ export default class DrawerView extends React.PureComponent<Props> {
 
   private toggleDrawer = (open: boolean) => {
     this.nextIsOpen.setValue(open ? TRUE : FALSE);
+    this.isSpringManuallyTriggered.setValue(TRUE);
 
     // 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