Merge pull request #9 from summer88123/patch-2

Fix: Android back button handler.
gxsshallot · Feb 4, 2019 · 9528b13 · 9528b13
2 parents 3113391 + 9a7ef00
commit 9528b13
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/navibar.js b/src/navibar.js
@@ -32,15 +32,19 @@ export class InnerNaviBar extends React.PureComponent {
             left: null,
             right: null,
         };
+        this._didFocusSubscription = props.navigation.addListener('didFocus',
+            () => BackHandler.addEventListener('hardwareBackPress', this._clickBack));
     }
 
     componentDidMount() {
-        BackHandler.addEventListener('hardwareBackPress', this._clickBack);
+        this._willBlurSubscription = this.props.navigation.addListener('willBlur',
+            () => BackHandler.removeEventListener('hardwareBackPress', this._clickBack));
         Dimensions.addEventListener('change', this._onWindowChanged);
     }
 
     componentWillUnmount() {
-        BackHandler.removeEventListener('hardwareBackPress', this._clickBack);
+        this._didFocusSubscription && this._didFocusSubscription.remove();
+        this._willBlurSubscription && this._willBlurSubscription.remove();
         Dimensions.removeEventListener('change', this._onWindowChanged);
     }