Fixes Loader popping animation

dcurletti · Apr 6, 2016 · ac086c8 · ac086c8
1 parent a7ea653
commit ac086c8
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/lib/ReduxInfiniteScroll.js b/lib/ReduxInfiniteScroll.js
@@ -111,7 +111,7 @@ var ReduxInfiniteScroll = function (_Component) {
     value: function _renderOptions() {
       var allItems = this.props.children.concat(this.props.items);
 
-      return [allItems, this.renderLoader()];
+      return allItems;
     }
   }, {
     key: '_totalItemsSize',
@@ -147,7 +147,8 @@ var ReduxInfiniteScroll = function (_Component) {
       return _react2.default.createElement(
         Holder,
         { className: this._assignHolderClass(), style: { height: this.props.containerHeight } },
-        this._renderOptions()
+        this._renderOptions(),
+        this.renderLoader()
       );
     }
   }]);

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "redux-infinite-scroll",
-  "version": "1.0.6",
+  "version": "1.0.7",
   "description": "React infinite scroll component designed for a Redux data-flow.",
   "main": "lib/ReduxInfiniteScroll.js",
   "scripts": {

diff --git a/src/ReduxInfiniteScroll.jsx b/src/ReduxInfiniteScroll.jsx
@@ -73,7 +73,7 @@ export default class ReduxInfiniteScroll extends Component {
   _renderOptions() {
     const allItems = this.props.children.concat(this.props.items);
 
-    return [allItems, this.renderLoader()];
+    return allItems;
   }
 
   _totalItemsSize() {
@@ -104,6 +104,7 @@ export default class ReduxInfiniteScroll extends Component {
     return (
       <Holder className={ this._assignHolderClass() } style={{height: this.props.containerHeight}}>
         {this._renderOptions()}
+        {this.renderLoader()}
       </Holder>
     )
   }