Browse Source

Inherit from base navigation styles so nav bar updates properly on screen change

Jason Skuby 8 years ago
parent
commit
a37239d2a2
1 changed files with 2 additions and 2 deletions
  1. 2
    2
      src/platformSpecific.android.js

+ 2
- 2
src/platformSpecific.android.js View File

73
 function navigatorPopToRoot(navigator, params) {
73
 function navigatorPopToRoot(navigator, params) {
74
   RctActivity.navigatorPopToRoot({
74
   RctActivity.navigatorPopToRoot({
75
     navigatorID: navigator.navigatorID,
75
     navigatorID: navigator.navigatorID,
76
-    animated: !(params.animated !== false)
76
+    animated: !(params.animated === false)
77
   });
77
   });
78
 }
78
 }
79
 
79
 
157
 
157
 
158
 function addNavigationStyleParams(screen) {
158
 function addNavigationStyleParams(screen) {
159
   const Screen = Navigation.getRegisteredScreen(screen.screen);
159
   const Screen = Navigation.getRegisteredScreen(screen.screen);
160
-  screen.navigatorStyle = Screen.navigatorStyle;
160
+  screen.navigatorStyle = Object.assign({}, screen.navigatorStyle, Screen.navigatorStyle);
161
 }
161
 }
162
 
162
 
163
 export default {
163
 export default {