Merge branch 'fix-transition-container-remounting'

1 files changed, 9 insertions, 3 deletions

diff --git a/app/components/TransitionContainer.js b/app/components/TransitionContainer.js
index c4a011a978..c4f6e459f3 100644
--- a/app/components/TransitionContainer.js
+++ b/app/components/TransitionContainer.js
@@ -16,6 +16,11 @@ type State = {
     dimensions: Types.Dimensions,
 };
 
+const transitionContainerStyle = Styles.createViewStyle({
+  flex: 1,
+  position: 'relative'
+});
+
 export default class TransitionContainer extends Component<TransitionContainerProps, State> {
 
   constructor(props: TransitionContainerProps) {
@@ -184,14 +189,15 @@ export default class TransitionContainer extends Component<TransitionContainerPr
     const { children } = this.props;
     const { previousChildren, childrenAnimation, previousChildrenAnimation } = this.state;
     return (
-      <View style={{flex:1}}>
+      <View style={[ transitionContainerStyle ]}>
 
         { previousChildren &&
-          (<Animated.View style={[this.state.animationStyles.style, previousChildrenAnimation]}>
+          (<Animated.View key={ previousChildren && previousChildren.key }
+            style={[this.state.animationStyles.style, previousChildrenAnimation]}>
             { previousChildren }
           </Animated.View>) }
 
-        <Animated.View style={[this.state.animationStyles.style, childrenAnimation]}>
+        <Animated.View key={ children.key } style={[this.state.animationStyles.style, childrenAnimation]}>
           { children }
         </Animated.View>