mirror of
https://github.com/zhigang1992/react-native.git
synced 2026-05-03 07:14:59 +08:00
Updates from Mon 30 Mar
- [ReactNative] Clean up no longer needed reference to NavigationBarClass | Philipp von Weitershausen - [TextInput] returnKeyType, enablesReturnKeyAutomatically, secureTextEntry, more keyboardTypes | Tadeu Zagallo - [ReactNative] PropTypes for NavigationBars | Philipp von Weitershausen - Changed LayoutAnimation to use ms instead of seconds for consistency | Nick Lockwood - Better date support | Nick Lockwood - Renamed throttleScrollCallbackMS to scrollEventThrottle | Nick Lockwood - Fixed threading issues in RCTImageDownloader | Nick Lockwood - [iOS][Assets]: Cleaning up more 1x png from Libraries | Radu Marin - [ReactNative][docs] LinkingIOS | Tadeu Zagallo - Fixing TouchableOpacity and TouchableHighlight documentation | Ben Alpert - [react-native] Add React.addons.createFragment | Ben Alpert
This commit is contained in:
@@ -46,15 +46,12 @@ var TITLE_PROPS = Interpolators.map(() => {return {style: {}};});
|
||||
var RIGHT_BUTTON_PROPS = Interpolators.map(() => {return {style: {}};});
|
||||
|
||||
|
||||
/**
|
||||
* TODO: Rename `observedTopOfStack` to `presentedIndex` in `NavigationStack`.
|
||||
*/
|
||||
var navStatePresentedIndex = function(navState) {
|
||||
if (navState.presentedIndex !== undefined) {
|
||||
return navState.presentedIndex;
|
||||
} else {
|
||||
return navState.observedTopOfStack;
|
||||
}
|
||||
// TODO: rename `observedTopOfStack` to `presentedIndex` in `NavigatorIOS`
|
||||
return navState.observedTopOfStack;
|
||||
};
|
||||
|
||||
|
||||
@@ -85,7 +82,12 @@ var NavigatorBreadcrumbNavigationBar = React.createClass({
|
||||
titleContentForRoute: PropTypes.func,
|
||||
iconForRoute: PropTypes.func,
|
||||
}),
|
||||
navigationBarStyles: PropTypes.number,
|
||||
navState: React.PropTypes.shape({
|
||||
routeStack: React.PropTypes.arrayOf(React.PropTypes.object),
|
||||
idStack: React.PropTypes.arrayOf(React.PropTypes.number),
|
||||
presentedIndex: React.PropTypes.number,
|
||||
}),
|
||||
navigationBarStyles: View.propTypes.style,
|
||||
},
|
||||
|
||||
statics: {
|
||||
|
||||
Reference in New Issue
Block a user