Merge pull request #791 from vpasquier/master

790: Avoid rightButtonImage or rightTitle warnings when set to null
aksonov · Jun 9, 2016 · 0a16782 · 0a16782
2 parents b43b714 + 31ad6f1
commit 0a16782
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/NavBar.js b/src/NavBar.js
@@ -264,7 +264,8 @@ class NavBar extends React.Component {
           </TouchableOpacity>
         );
       }
-      if ((!!state.onRight ^ !!(state.rightTitle || state.rightButtonImage))) {
+      if ((!!state.onRight ^ !!(typeof(state.rightTitle) !== 'undefined'
+        || typeof(state.rightButtonImage) !== 'undefined'))) {
         console.warn(
           `Both onRight and rightTitle/rightButtonImage
             must be specified for the scene: ${state.name}`