Merge pull request #10 from summer88123/master

Fix: Check navigation props in InnerNaviBar.
gxsshallot · Feb 13, 2019 · 745a701 · 745a701
2 parents 55bf97f + 0ab5636
commit 745a701
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/navibar.js b/src/navibar.js
@@ -32,12 +32,12 @@ export class InnerNaviBar extends React.PureComponent {
             left: null,
             right: null,
         };
-        this._didFocusSubscription = props.navigation.addListener('didFocus',
+        this._didFocusSubscription = props.navigation && props.navigation.addListener('didFocus',
             () => BackHandler.addEventListener('hardwareBackPress', this._clickBack));
     }
 
     componentDidMount() {
-        this._willBlurSubscription = this.props.navigation.addListener('willBlur',
+        this._willBlurSubscription = this.props.navigation && this.props.navigation.addListener('willBlur',
             () => BackHandler.removeEventListener('hardwareBackPress', this._clickBack));
         Dimensions.addEventListener('change', this._onWindowChanged);
     }