Skip to content

Commit ac086c8

Browse files
author
Davide Curletti
committed
Fixes Loader popping animation
1 parent a7ea653 commit ac086c8

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

lib/ReduxInfiniteScroll.js

+3-2
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ var ReduxInfiniteScroll = function (_Component) {
111111
value: function _renderOptions() {
112112
var allItems = this.props.children.concat(this.props.items);
113113

114-
return [allItems, this.renderLoader()];
114+
return allItems;
115115
}
116116
}, {
117117
key: '_totalItemsSize',
@@ -147,7 +147,8 @@ var ReduxInfiniteScroll = function (_Component) {
147147
return _react2.default.createElement(
148148
Holder,
149149
{ className: this._assignHolderClass(), style: { height: this.props.containerHeight } },
150-
this._renderOptions()
150+
this._renderOptions(),
151+
this.renderLoader()
151152
);
152153
}
153154
}]);

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "redux-infinite-scroll",
3-
"version": "1.0.6",
3+
"version": "1.0.7",
44
"description": "React infinite scroll component designed for a Redux data-flow.",
55
"main": "lib/ReduxInfiniteScroll.js",
66
"scripts": {

src/ReduxInfiniteScroll.jsx

+2-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ export default class ReduxInfiniteScroll extends Component {
7373
_renderOptions() {
7474
const allItems = this.props.children.concat(this.props.items);
7575

76-
return [allItems, this.renderLoader()];
76+
return allItems;
7777
}
7878

7979
_totalItemsSize() {
@@ -104,6 +104,7 @@ export default class ReduxInfiniteScroll extends Component {
104104
return (
105105
<Holder className={ this._assignHolderClass() } style={{height: this.props.containerHeight}}>
106106
{this._renderOptions()}
107+
{this.renderLoader()}
107108
</Holder>
108109
)
109110
}

0 commit comments

Comments
 (0)