|
@@ -166,19 +166,29 @@ function showModal(params) {
|
166
|
166
|
console.error('showModal(params): params.screen is required');
|
167
|
167
|
return;
|
168
|
168
|
}
|
169
|
|
- const { navigatorStyle } = _mergeScreenSpecificSettings(params.screen, params);
|
170
|
169
|
const controllerID = utils.getRandomId();
|
171
|
170
|
const Controller = Controllers.createClass({
|
172
|
171
|
render: function() {
|
173
|
172
|
const navigatorID = controllerID + '_nav';
|
174
|
|
- const { navigatorStyle } = _mergeScreenSpecificSettings(params.screen, params);
|
|
173
|
+ const screenInstanceID = utils.getRandomId();
|
|
174
|
+ const {
|
|
175
|
+ navigatorStyle,
|
|
176
|
+ navigatorButtons,
|
|
177
|
+ navigatorEventID
|
|
178
|
+ } = _mergeScreenSpecificSettings(params.screen, screenInstanceID, params);
|
175
|
179
|
return (
|
176
|
180
|
<NavigationControllerIOS
|
177
|
181
|
id={navigatorID}
|
178
|
182
|
title={params.title}
|
179
|
183
|
component={params.screen}
|
180
|
|
- passProps={{navigatorID: navigatorID}}
|
|
184
|
+ passProps={{
|
|
185
|
+ navigatorID: navigatorID,
|
|
186
|
+ screenInstanceID: screenInstanceID,
|
|
187
|
+ navigatorEventID: navigatorEventID
|
|
188
|
+ }}
|
181
|
189
|
style={navigatorStyle}
|
|
190
|
+ leftButtons={navigatorButtons.leftButtons}
|
|
191
|
+ rightButtons={navigatorButtons.rightButtons}
|
182
|
192
|
/>
|
183
|
193
|
);
|
184
|
194
|
}
|