diff --git a/Examples/UIExplorer/Navigator/BreadcrumbNavSample.js b/Examples/UIExplorer/Navigator/BreadcrumbNavSample.js index f26a6e051..5abdcd11f 100644 --- a/Examples/UIExplorer/Navigator/BreadcrumbNavSample.js +++ b/Examples/UIExplorer/Navigator/BreadcrumbNavSample.js @@ -115,7 +115,7 @@ var BreadcrumbNavSample = React.createClass({ renderScene={this._renderScene} navigationBar={ } /> diff --git a/Examples/UIExplorer/Navigator/NavigationBarSample.js b/Examples/UIExplorer/Navigator/NavigationBarSample.js index ce0809436..2b3f8e250 100644 --- a/Examples/UIExplorer/Navigator/NavigationBarSample.js +++ b/Examples/UIExplorer/Navigator/NavigationBarSample.js @@ -121,8 +121,8 @@ var NavigationBarSample = React.createClass({ )} navigationBar={ } /> diff --git a/Libraries/CustomComponents/Navigator/NavigatorBreadcrumbNavigationBar.js b/Libraries/CustomComponents/Navigator/NavigatorBreadcrumbNavigationBar.js index 3986064b1..b4bad9982 100644 --- a/Libraries/CustomComponents/Navigator/NavigatorBreadcrumbNavigationBar.js +++ b/Libraries/CustomComponents/Navigator/NavigatorBreadcrumbNavigationBar.js @@ -77,7 +77,7 @@ var NavigatorBreadcrumbNavigationBar = React.createClass({ popToRoute: PropTypes.func, popToTop: PropTypes.func, }), - navigationBarRouteMapper: PropTypes.shape({ + routeMapper: PropTypes.shape({ rightContentForRoute: PropTypes.func, titleContentForRoute: PropTypes.func, iconForRoute: PropTypes.func, @@ -87,7 +87,7 @@ var NavigatorBreadcrumbNavigationBar = React.createClass({ idStack: React.PropTypes.arrayOf(React.PropTypes.number), presentedIndex: React.PropTypes.number, }), - navigationBarStyles: View.propTypes.style, + style: View.propTypes.style, }, statics: { @@ -144,7 +144,7 @@ var NavigatorBreadcrumbNavigationBar = React.createClass({ var titles = navState.routeStack.map(this._renderOrReturnTitle); var buttons = navState.routeStack.map(this._renderOrReturnRightButton); return ( - + {titles} {icons} {buttons} @@ -154,7 +154,7 @@ var NavigatorBreadcrumbNavigationBar = React.createClass({ _renderOrReturnBreadcrumb: function(route, index) { var uid = this.props.navState.idStack[index]; - var navBarRouteMapper = this.props.navigationBarRouteMapper; + var navBarRouteMapper = this.props.routeMapper; var navOps = this.props.navigator; var alreadyRendered = this.refs['crumbContainer' + uid]; if (alreadyRendered) { @@ -199,7 +199,7 @@ var NavigatorBreadcrumbNavigationBar = React.createClass({ /> ); } - var navBarRouteMapper = this.props.navigationBarRouteMapper; + var navBarRouteMapper = this.props.routeMapper; var titleContent = navBarRouteMapper.titleContentForRoute( navState.routeStack[index], this.props.navigator @@ -219,7 +219,7 @@ var NavigatorBreadcrumbNavigationBar = React.createClass({ _renderOrReturnRightButton: function(route, index) { var navState = this.props.navState; - var navBarRouteMapper = this.props.navigationBarRouteMapper; + var navBarRouteMapper = this.props.routeMapper; var uid = navState.idStack[index]; var alreadyRendered = this.refs['rightContainer' + uid]; if (alreadyRendered) { diff --git a/Libraries/CustomComponents/Navigator/NavigatorNavigationBar.js b/Libraries/CustomComponents/Navigator/NavigatorNavigationBar.js index d88204950..20c43a94a 100644 --- a/Libraries/CustomComponents/Navigator/NavigatorNavigationBar.js +++ b/Libraries/CustomComponents/Navigator/NavigatorNavigationBar.js @@ -46,7 +46,7 @@ var NavigatorNavigationBar = React.createClass({ propTypes: { navigator: React.PropTypes.object, - navigationBarRouteMapper: React.PropTypes.shape({ + routeMapper: React.PropTypes.shape({ Title: React.PropTypes.func.isRequired, LeftButton: React.PropTypes.func.isRequired, RightButton: React.PropTypes.func.isRequired, @@ -56,7 +56,7 @@ var NavigatorNavigationBar = React.createClass({ idStack: React.PropTypes.arrayOf(React.PropTypes.number), presentedIndex: React.PropTypes.number, }), - navigationBarStyles: View.propTypes.style, + style: View.propTypes.style, }, statics: { @@ -133,7 +133,7 @@ var NavigatorNavigationBar = React.createClass({ }, this); return ( - + {components} ); @@ -145,7 +145,6 @@ var NavigatorNavigationBar = React.createClass({ /*number*/index ) /*object*/ { var navState = this.props.navState; - var navBarRouteMapper = this.props.navigationBarRouteMapper; var uid = navState.idStack[index]; var containerRef = componentName + 'Container' + uid; var alreadyRendered = this.refs[containerRef]; @@ -160,7 +159,7 @@ var NavigatorNavigationBar = React.createClass({ ); } - var content = navBarRouteMapper[componentName]( + var content = this.props.routeMapper[componentName]( navState.routeStack[index], this.props.navigator, index,