Merge branch 'belsberry-on-scroll-event'

souhe · Feb 2, 2016 · f356c16 · f356c16
2 parents 9cbb2a1 + a373297
commit f356c16
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/examples/basic/js/app.jsx b/examples/basic/js/app.jsx
@@ -13,6 +13,10 @@ class App extends React.Component{
         this.setState({itemsCount: this.state.itemsCount + 10});
     }
 
+    handleScroll(scrollData){
+      console.log(scrollData);
+    }
+
     render() {
         var itemElements = [];
 
@@ -31,6 +35,7 @@ class App extends React.Component{
                   verticalContainerStyle={scrollBarStyles}
                   horizontalScrollbarStyle={scrollBarStyles}
                   horizontalContainerStyle={scrollBarStyles}
+                  onScroll={this.handleScroll}
                   >
 
                     {itemElements}

diff --git a/src/js/scrollArea.jsx b/src/js/scrollArea.jsx
@@ -148,6 +148,11 @@ export default class ScrollArea extends React.Component{
         if(this.canScrollX(newState)){
             newState.leftPosition = this.computeLeftPosition(deltaX, newState);
         }
+
+        if(this.props.onScroll){
+            this.props.onScroll(newState);
+        }
+
         this.setState(newState);
     }
 
@@ -182,6 +187,10 @@ export default class ScrollArea extends React.Component{
             e.preventDefault();
         }
 
+        if(this.props.onScroll){
+            this.props.onScroll(newState);
+        }
+
         this.setState(newState);
     }
 
@@ -309,6 +318,7 @@ ScrollArea.propTypes = {
     horizontal: React.PropTypes.bool,
     horizontalContainerStyle: React.PropTypes.object,
     horizontalScrollbarStyle: React.PropTypes.object,
+    onScroll: React.PropTypes.func,
     contentWindow: React.PropTypes.any,
     ownerDocument: React.PropTypes.any
 };