Merge pull request #50 from Nicwalle/develop

Added View instead of ScrollView functionality

Author: colbymillerdev

README.md

@@ -169,6 +169,8 @@ render() {
 | previousBtnTextStyle | Style object to provide to the previous button text | { color: '#007aff', fontSize: 18 } | Object |
 | previousBtnDisabled | Value to disable/enable previous button | false | Boolean |
 | scrollViewProps | Object to provide props to ScrollView component | {} | Object |
+| scrollable | The content of the Progress Step should be scrollable | true | Boolean |
+| viewProps | Object to provide props to view component if scrollable is false | {} | Object |
 | errors | Used to assist with current step validation. If true, the next step won't be rendered | false | Boolean |
 | removeBtnRow | Used to render the progress step without the button row | false | Boolean |
 

src/ProgressSteps/ProgressStep.js

@@ -88,6 +88,8 @@ class ProgressStep extends Component {
 
   render() {
     const scrollViewProps = this.props.scrollViewProps || {};
+    const viewProps = this.props.viewProps || {};
+    const isScrollable = this.props.scrollable;
     const buttonRow = this.props.removeBtnRow ? null : (
       <ProgressButtons 
         renderNextButton={this.renderNextButton} 
@@ -97,7 +99,9 @@ class ProgressStep extends Component {
 
     return (
       <View style={{ flex: 1 }}>
-        <ScrollView {...scrollViewProps}>{this.props.children}</ScrollView>
+        {isScrollable
+          ? <ScrollView {...scrollViewProps}>{this.props.children}</ScrollView>
+          : <View {...viewProps}>{this.props.children}</View>}
 
         {buttonRow}
       </View>
@@ -122,8 +126,10 @@ ProgressStep.propTypes = {
   previousBtnTextStyle: PropTypes.object,
   previousBtnDisabled: PropTypes.bool,
   scrollViewProps: PropTypes.object,
+  viewProps: PropTypes.object,
   errors: PropTypes.bool,
-  removeBtnRow: PropTypes.bool
+  removeBtnRow: PropTypes.bool,
+  scrollable: PropTypes.bool
 };
 
 ProgressStep.defaultProps = {
@@ -133,7 +139,8 @@ ProgressStep.defaultProps = {
   nextBtnDisabled: false,
   previousBtnDisabled: false,
   errors: false,
-  removeBtnRow: false
+  removeBtnRow: false,
+  scrollable: true
 };
 
 export default ProgressStep;