Allow for changing container height.

seatgeek · Oct 30, 2014 · 9c6c39e · 9c6c39e
1 parent 3b5bf58
commit 9c6c39e
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 9 deletions.
diff --git a/dist/react-infinite.js b/dist/react-infinite.js
diff --git a/dist/react-infinite.min.js b/dist/react-infinite.min.js
diff --git a/src/react-infinite.jsx b/src/react-infinite.jsx
@@ -84,19 +84,22 @@
       },
 
       componentWillReceiveProps: function(nextProps) {
-        var newStateObject = {};
+        var that = this,
+            newStateObject = {};
 
         if (nextProps.isInfiniteLoading !== undefined) {
           newStateObject.isInfiniteLoading = nextProps.isInfiniteLoading;
         }
 
         var nextPBS = nextProps.preloadBatchSize;
-        newStateObject.preloadBatchSize = nextPBS ? nextPBS : this.props.containerHeight / 2;
+        newStateObject.preloadBatchSize = nextPBS ? nextPBS : nextProps.containerHeight / 2;
 
         var nextPAH = nextProps.preloadAdditionalHeight;
-        newStateObject.preloadAdditionalHeight = nextPAH ? nextPAH : this.props.containerHeight;
+        newStateObject.preloadAdditionalHeight = nextPAH ? nextPAH : nextProps.containerHeight;
 
-        this.setState(newStateObject);
+        this.setState(newStateObject, function() {
+          that.setStateFromScrollTop(that.getScrollTop());
+        });
       },
 
       componentDidUpdate: function(prevProps, prevState) {