From a12185e66d1de6e61390968044b0b95efca00895 Mon Sep 17 00:00:00 2001 From: Brent Vatne Date: Fri, 16 Feb 2018 17:26:01 -0800 Subject: [PATCH] Properly thread through childNavigation --- .../react-navigation/src/views/ResourceSavingSceneView.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/packages/react-navigation/src/views/ResourceSavingSceneView.js b/packages/react-navigation/src/views/ResourceSavingSceneView.js index b354d904..8ab32d27 100644 --- a/packages/react-navigation/src/views/ResourceSavingSceneView.js +++ b/packages/react-navigation/src/views/ResourceSavingSceneView.js @@ -14,10 +14,12 @@ export default class ResourceSavingSceneView extends React.PureComponent { const focusedIndex = props.navigation.state.index; const focusedKey = props.navigation.state.routes[focusedIndex].key; const isFocused = key === focusedKey; + const isNavigator = !!props.childNavigation.state.routes; + const awake = !isNavigator && props.lazy ? isFocused : true; this.state = { - awake: props.lazy ? isFocused : true, - visible: isFocused, + awake: true, + visible: true, // isFocused, }; } @@ -53,7 +55,7 @@ export default class ResourceSavingSceneView extends React.PureComponent { } > - {awake ? : null} + {awake ? : null} );