|
@@ -73,7 +73,7 @@ function navigatorPop(navigator, params) {
|
73
|
73
|
function navigatorPopToRoot(navigator, params) {
|
74
|
74
|
RctActivity.navigatorPopToRoot({
|
75
|
75
|
navigatorID: navigator.navigatorID,
|
76
|
|
- animated: !(params.animated !== false)
|
|
76
|
+ animated: !(params.animated === false)
|
77
|
77
|
});
|
78
|
78
|
}
|
79
|
79
|
|
|
@@ -157,7 +157,7 @@ function addNavigatorButtons(screen) {
|
157
|
157
|
|
158
|
158
|
function addNavigationStyleParams(screen) {
|
159
|
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
|
163
|
export default {
|