Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
6f9d133
WIP: handle multipop better
JackWink Feb 25, 2016
c062355
rollback navbar customization changes
Feb 29, 2016
662001d
publish new version
Feb 29, 2016
36ffa9a
add customization of navbar
Feb 29, 2016
738e97d
use hideNavBar in example. close #262
zxcpoiu Mar 1, 2016
7d25ed2
more flexible navbar customization
Mar 1, 2016
e9fa562
Merge pull request #249 from JackWink/master
Mar 1, 2016
42d1918
Merge pull request #270 from zxcpoiu/master
Mar 1, 2016
f122c90
Merge pull request #259 from lrettig/master
Mar 1, 2016
efb791b
publish new version
Mar 1, 2016
8fbb903
use hideNavBar in README example
zxcpoiu Mar 1, 2016
9f43911
Merge pull request #271 from zxcpoiu/master
Mar 1, 2016
19cd525
typo in README
Emilios1995 Mar 2, 2016
a3ccd7b
NoTransition scene config causes blank scenes
keeth Mar 3, 2016
9105507
Merge pull request #273 from Emilios1995/patch-1
Mar 3, 2016
bb8b010
Merge pull request #275 from sprightco/master
Mar 3, 2016
4903563
Check if current router exists
jasonals Mar 4, 2016
f90067f
ExRouter add onTransitionToTop , like ExNavigator transitionToTop , …
virtoolswebplayer Mar 4, 2016
f8e67eb
Added missing defaultRoute action to tabbar
Nikamura Mar 4, 2016
c442445
Merge pull request #280 from virtoolswebplayer/master
Mar 4, 2016
0367b46
Merge pull request #282 from Nikamura/master
Mar 4, 2016
9c8a47d
Merge pull request #278 from jasonals/patch-1
Mar 4, 2016
a790262
Use route props first when determining route title
Mar 5, 2016
adb8e07
Merge pull request #284 from sprightco/refresh-navigationbar-title
Mar 5, 2016
c2146fc
fix hideTabBar
Mar 7, 2016
e3a844f
upgrade examples to React Native 0.20.0
peterp Mar 7, 2016
d99f96e
Merge pull request #290 from peterp/master
Mar 7, 2016
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
rollback navbar customization changes
  • Loading branch information
Pavlo Aksonov committed Feb 29, 2016
commit c062355e659701481c7c2c652dcc7f7525ecd536
18 changes: 17 additions & 1 deletion ExRouter.js
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,22 @@ export class ExRouteAdapter {
}
}
}
class ExNavigationBar extends Navigator.NavigationBar {
constructor(props){
super(props);
this.state = {};
}
render(){
const route = this.props.router.nextRoute || this.props.router.currentRoute;
if (route.props.hideNavBar === false){
return super.render();
}
if (this.props.router.props.hideNavBar || route.props.hideNavBar){
return null;
}
return super.render();
}
}
class ExNavigatorBar extends React.Component {
render(){
const route = this.props.router.nextRoute || this.props.router.currentRoute;
Expand Down Expand Up @@ -327,8 +343,8 @@ export default class ExRouter extends React.Component {
})}
style={styles.transparent}
sceneStyle={{ paddingTop: 0, backgroundColor:'transparent' }}
renderNavigationBar={props=><ExNavigationBar {...this.props} {...props} {...this.state} router={router}/>}
{...this.props}
renderNavigationBar={props=><ExNavigatorBar {...this.props} {...props} {...this.state} router={router}/>}
/>
{footer}
{this.state.modal}
Expand Down
2 changes: 1 addition & 1 deletion Example/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"dependencies": {
"react-native": "^0.20.0",
"react-native-button": "^1.2.1",
"react-native-router-flux": "^2.3.5",
"react-native-router-flux": "^2.3.6",
"react-native-modalbox": "^1.3.0",
"react-redux": "^4.4.0",
"redux": "^3.3.1"
Expand Down