From 28e6e993c6c536a198eb2d841aae21cda4f1df08 Mon Sep 17 00:00:00 2001
From: Eric Vicenti <evv@fb.com>
Date: Fri, 1 May 2015 17:50:20 -0700
Subject: [PATCH] [ReactNative] Navigator focus handler context fix

---
 Libraries/CustomComponents/Navigator/Navigator.js | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/Libraries/CustomComponents/Navigator/Navigator.js b/Libraries/CustomComponents/Navigator/Navigator.js
index 280d8c4dd..f6fd60888 100644
--- a/Libraries/CustomComponents/Navigator/Navigator.js
+++ b/Libraries/CustomComponents/Navigator/Navigator.js
@@ -231,16 +231,13 @@ var Navigator = React.createClass({
     initialRouteStack: PropTypes.arrayOf(PropTypes.object),
 
     /**
-     * Will emit the target route upon mounting and before each nav transition,
-     * overriding the handler in this.props.navigator. This overrides the onDidFocus
-     * handler that would be found in this.props.navigator
+     * Will emit the target route upon mounting and before each nav transition
      */
     onWillFocus: PropTypes.func,
 
     /**
      * Will be called with the new route of each scene after the transition is
-     * complete or after the initial mounting. This overrides the onDidFocus
-     * handler that would be found in this.props.navigator
+     * complete or after the initial mounting
      */
     onDidFocus: PropTypes.func,
 
@@ -601,7 +598,8 @@ var Navigator = React.createClass({
     this._lastDidFocus = route;
     if (this.props.onDidFocus) {
       this.props.onDidFocus(route);
-    } else if (this.parentNavigator && this.parentNavigator.onDidFocus) {
+    }
+    if (this.parentNavigator && this.parentNavigator.onDidFocus) {
       this.parentNavigator.onDidFocus(route);
     }
   },
@@ -617,7 +615,8 @@ var Navigator = React.createClass({
     }
     if (this.props.onWillFocus) {
       this.props.onWillFocus(route);
-    } else if (this.parentNavigator && this.parentNavigator.onWillFocus) {
+    }
+    if (this.parentNavigator && this.parentNavigator.onWillFocus) {
       this.parentNavigator.onWillFocus(route);
     }
   },