#33 hide back button if onBack is undefined

halilb · Apr 18, 2017 · 6409f1e · 6409f1e
1 parent 5030c2a
commit 6409f1e
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 13 deletions.
diff --git a/lib/bar/TopBar.js b/lib/bar/TopBar.js
@@ -24,18 +24,33 @@ export default class TopBar extends React.Component {
  displayed: false,
  title: '',
  backTitle: 'Back',
+ backImage: require('../../Assets/angle-left.png'),
  };
 
- constructor(props) {
- super(props);
+ renderBackButton() {
+ const { onBack, backImage } = this.props;
+
+ // do not display back button if there isn't a press handler
+ if (onBack) {
+ return (
+ <TouchableOpacity style={styles.backContainer} onPress={onBack}>
+ <Image source={backImage} />
+ {Platform.OS === 'ios' &&
+ <Text style={[styles.text, styles.backText]}>
+ {this.props.backTitle}
+ </Text>}
+ </TouchableOpacity>
+ );
+ }
+
+ return null;
  }
 
  render() {
  const {
  displayed,
  title,
  height,
- onBack,
  } = this.props;
 
  return (
@@ -44,13 +59,7 @@ export default class TopBar extends React.Component {
  displayed={displayed}
  height={height}
  >
- <TouchableOpacity style={styles.backContainer} onPress={onBack}>
- <Image source={this.props.backImage || require('../../Assets/angle-left.png')} />
- {
- Platform.OS === 'ios' &&
- <Text style={[styles.text, styles.backText]}>{this.props.backTitle}</Text>
- }
- </TouchableOpacity>
+ {this.renderBackButton()}
  <Text style={styles.text}>{title}</Text>
  </BarContainer>
  );

diff --git a/lib/index.js b/lib/index.js
@@ -76,7 +76,8 @@ export default class PhotoBrowser extends React.Component {
  useCircleProgress: PropTypes.bool,
 
  /*
- * Called when done or back button is tapped
+ * Called when done or back button is tapped.
+ * Back button will not be displayed if this is null.
  */
  onBack: PropTypes.func,
 
@@ -108,7 +109,6 @@ export default class PhotoBrowser extends React.Component {
  displaySelectionButtons: false,
  useCircleProgress: false,
  onSelectionChanged: () => {},
- onBack: () => {},
  displayTopBar: true,
  onPhotoLongPress: () => {},
  delayPhotoLongPress: 1000,
@@ -273,7 +273,7 @@ export default class PhotoBrowser extends React.Component {
  />
  );
  }
- 
+
  const TopBarComponent = this.props.topBarComponent || TopBar;
 
  return (