Skip to content
Merged
Changes from all commits
Commits
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
6 changes: 5 additions & 1 deletion src/SortableList.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ export default class SortableList extends Component {
autoscrollAreaSize: PropTypes.number,
rowActivationTime: PropTypes.number,
manuallyActivateRows: PropTypes.bool,
nestedScrollEnabled: PropTypes.bool,
disableIntervalMomentum: PropTypes.bool,

renderRow: PropTypes.func.isRequired,
renderHeader: PropTypes.func,
Expand Down Expand Up @@ -192,7 +194,7 @@ export default class SortableList extends Component {
}

render() {
let {contentContainerStyle, innerContainerStyle, horizontal, style, showsVerticalScrollIndicator, showsHorizontalScrollIndicator} = this.props;
let {contentContainerStyle, innerContainerStyle, horizontal, style, showsVerticalScrollIndicator, showsHorizontalScrollIndicator, nestedScrollEnabled, disableIntervalMomentum} = this.props;
const {animated, contentHeight, contentWidth, scrollEnabled} = this.state;
const containerStyle = StyleSheet.flatten([style, {opacity: Number(animated)}])
innerContainerStyle = [
Expand All @@ -211,6 +213,8 @@ export default class SortableList extends Component {
return (
<View style={containerStyle} ref={this._onRefContainer}>
<ScrollView
nestedScrollEnabled={nestedScrollEnabled}
disableIntervalMomentum={disableIntervalMomentum}
refreshControl={refreshControl}
ref={this._onRefScrollView}
horizontal={horizontal}
Expand Down