Merge pull request #32 from rohanorton/master

Fix no scrolling issue
souhe · Mar 11, 2016 · 1292ec1 · 1292ec1
2 parents e09593d + 4de27a9
commit 1292ec1
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/js/ScrollArea.jsx b/src/js/ScrollArea.jsx
@@ -246,7 +246,8 @@ export default class ScrollArea extends React.Component{
 
         let newState = this.composeNewState(-deltaX, -deltaY);
 
-        if(this.state.topPosition !== newState.topPosition || this.state.leftPosition !== newState.leftPosition){
+        if((newState.topPosition && this.state.topPosition !== newState.topPosition) ||
+           (newState.leftPosition && this.state.leftPosition !== newState.leftPosition)) {
             e.preventDefault();
         }