Skip to content

Warn if you tried to render right(left) title but not specified all params. #469

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 6, 2016
Merged

Warn if you tried to render right(left) title but not specified all params. #469

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
Warn if you tried to render right(left) title but not specified all p… 
…arams properly. Resolved conflict of backButton and leftTitle.
  • Loading branch information
@ugputu18
ugputu18 committed Apr 6, 2016
commit 72ce4e65af8bac29b4e6de2d7422ec11e973e6c3
60 changes: 28 additions & 32 deletions src/NavBar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,7 @@ export default class NavBar extends React.Component {
<Animated.View
style={[styles.header, state.navigationBarStyle, selected.navigationBarStyle]}>
{state.children.map(this._renderTitle, this)}
{this._renderBackButton()}
{this._renderLeftButton()}
{this._renderLeftButton() || this._renderBackButton()}
{this._renderRightButton()}
</Animated.View>
);
Expand Down Expand Up @@ -106,41 +105,38 @@ export default class NavBar extends React.Component {
}

_renderRightButton() {
const state = this.props.navigationState;
const childState = this.props.navigationState.children[this.props.navigationState.index];
if (childState.onRight && childState.rightTitle){
return (
<TouchableOpacity style={[styles.rightButton, childState.rightButtonStyle]} onPress={childState.onRight.bind(null, childState)}>
<Text style={[styles.barRightButtonText, childState.rightButtonTextStyle]}>{childState.rightTitle}</Text>
</TouchableOpacity>
);
}
if (state.onRight && state.rightTitle){
return (
<TouchableOpacity style={[styles.rightButton, state.rightButtonStyle]} onPress={state.onRight.bind(null, state)}>
<Text style={[styles.barRightButtonText, state.rightButtonTextStyle]}>{state.rightTitle}</Text>
</TouchableOpacity>
);
function tryRender(state) {
if (state.onRight && state.rightTitle) {
return (
<TouchableOpacity style={[styles.rightButton, state.rightButtonStyle]}
onPress={state.onRight.bind(null, state)}>
<Text style={[styles.barRightButtonText, state.rightButtonTextStyle]}>{state.rightTitle}</Text>
</TouchableOpacity>
);
}
if ((!!state.onRight ^ !!state.rightTitle)) {
console.warn('Both onRight and rightTitle must be specified for the scene: ' + state.name)
}
}
const state = this.props.navigationState;
return tryRender(state) || tryRender(state.children[state.index]);
}

_renderLeftButton() {
const state = this.props.navigationState;
const childState = this.props.navigationState.children[this.props.navigationState.index];
if (childState.onLeft && childState.leftTitle){
return (
<TouchableOpacity style={[styles.leftButton, childState.leftButtonStyle]} onPress={childState.onLeft.bind(null, childState)}>
<Text style={[styles.barLeftButtonText, childState.leftButtonTextStyle]}>{childState.leftTitle}</Text>
</TouchableOpacity>
);
}
if (state.onLeft && state.leftTitle){
return (
<TouchableOpacity style={[styles.leftButton, state.leftButtonStyle]} onPress={state.onLeft.bind(null, state)}>
<Text style={[styles.barLeftButtonText, state.leftButtonTextStyle]}>{state.leftTitle}</Text>
</TouchableOpacity>
);
function tryRender(state) {
if (state.onLeft && state.leftTitle){
return (
<TouchableOpacity style={[styles.leftButton, state.leftButtonStyle]} onPress={state.onLeft.bind(null, state)}>
<Text style={[styles.barLeftButtonText, state.leftButtonTextStyle]}>{state.leftTitle}</Text>
</TouchableOpacity>
);
}
if ((!!state.onLeft ^ !!state.leftTitle)) {
console.warn('Both onLeft and leftTitle must be specified for the scene: ' + state.name)
}
}
const state = this.props.navigationState;
return tryRender(state) || tryRender(state.children[state.index]);
}

_renderTitle(childState: NavigationState, index:number) {
Expand Down