From 36e2081df4644eafe440684af0eec6fbca2446aa Mon Sep 17 00:00:00 2001
From: Michal Osadnik <micosa97@gmail.com>
Date: Sun, 22 Sep 2019 01:32:45 +0200
Subject: [PATCH] fix: change order of attaching nodes in card exec

---
 packages/stack/src/views/Stack/Card.tsx | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/packages/stack/src/views/Stack/Card.tsx b/packages/stack/src/views/Stack/Card.tsx
index 6ee4fb9d..e0dc16d9 100755
--- a/packages/stack/src/views/Stack/Card.tsx
+++ b/packages/stack/src/views/Stack/Card.tsx
@@ -464,7 +464,7 @@ export default class Card extends React.Component<Props> {
     multiply(this.velocity, SWIPE_VELOCITY_IMPACT)
   );
 
-  private exec = block([
+  private exec = [
     set(
       this.gesture,
       multiply(
@@ -501,11 +501,25 @@ export default class Card extends React.Component<Props> {
       this.isVisible,
       call([this.isVisible], ([isVisible]) => (this.isVisibleValue = isVisible))
     ),
+  ];
+
+  private changeVisiblityExec = onChange(
+    this.isVisible,
+    call([this.isVisible], ([isVisible]) => (this.isVisibleValue = isVisible))
+  );
+
+  private execNoGesture = block([
+    ...this.exec,
+    this.runTransition(this.isVisible),
+    onChange(
+      this.isVisible,
+      call([this.isVisible], ([isVisible]) => (this.isVisibleValue = isVisible))
+    ),
+    this.changeVisiblityExec,
   ]);
 
-  private execNoGesture = this.runTransition(this.isVisible);
-
   private execWithGesture = block([
+    ...this.exec,
     onChange(
       this.isSwiping,
       call(
@@ -602,6 +616,7 @@ export default class Card extends React.Component<Props> {
         ),
       ]
     ),
+    this.changeVisiblityExec,
   ]);
 
   private handleGestureEventHorizontal = Animated.event([
@@ -757,7 +772,6 @@ export default class Card extends React.Component<Props> {
     return (
       <StackGestureContext.Provider value={this.gestureRef}>
         <View pointerEvents="box-none" {...rest}>
-          <Animated.Code exec={this.exec} />
           <Animated.Code
             key={gestureEnabled ? 'gesture-code' : 'no-gesture-code'}
             exec={gestureEnabled ? this.execWithGesture : this.execNoGesture}