Merge branch 'master' into feature/passive-event-listeners

Author: danbovey

.eslintrc

@@ -0,0 +1,28 @@
+const fs = require('fs');
+
+const prettierOptions = JSON.parse(fs.readFileSync('./.prettierrc', 'utf8'));
+
+module.exports = {
+  extends: ['last', 'prettier', 'prettier/react', 'plugin:react/recommended'],
+  plugins: ['react', 'prettier'],
+  globals: {
+    document: true,
+    window: true,
+    describe: true,
+    it: true,
+    module: true,
+    exports: true,
+    require: true
+  },
+  rules: {
+    'prettier/prettier': ['error', prettierOptions],
+    'no-unused-vars': [
+      'off',
+      {
+        vars: 'all',
+        args: 'after-used',
+        ignoreRestSiblings: false
+      }
+    ]
+  }
+};

.eslintrc.js

@@ -0,0 +1,7 @@
+{
+  "printWidth": 80,
+  "tabWidth": 2,
+  "useTabs": false,
+  "semi": true,
+  "singleQuote": true
+}

.prettierrc

@@ -1,7 +1,7 @@
 'use strict';
 
 Object.defineProperty(exports, '__esModule', {
-  value: true,
+  value: true
 });
 
 var _createClass = (function() {
@@ -52,7 +52,7 @@ function _classCallCheck(instance, Constructor) {
 function _possibleConstructorReturn(self, call) {
   if (!self) {
     throw new ReferenceError(
-      "this hasn't been initialised - super() hasn't been called",
+      "this hasn't been initialised - super() hasn't been called"
     );
   }
   return call && (typeof call === 'object' || typeof call === 'function')
@@ -64,16 +64,16 @@ function _inherits(subClass, superClass) {
   if (typeof superClass !== 'function' && superClass !== null) {
     throw new TypeError(
       'Super expression must either be null or a function, not ' +
-        typeof superClass,
+        typeof superClass
     );
   }
   subClass.prototype = Object.create(superClass && superClass.prototype, {
     constructor: {
       value: subClass,
       enumerable: false,
       writable: true,
-      configurable: true,
-    },
+      configurable: true
+    }
   });
   if (superClass)
     Object.setPrototypeOf
@@ -91,8 +91,8 @@ var InfiniteScroll = (function(_Component) {
       this,
       (InfiniteScroll.__proto__ || Object.getPrototypeOf(InfiniteScroll)).call(
         this,
-        props,
-      ),
+        props
+      )
     );
 
     _this.scrollListener = _this.scrollListener.bind(_this);
@@ -108,13 +108,21 @@ var InfiniteScroll = (function(_Component) {
         this.pageLoaded = this.props.pageStart;
         this.options = this.eventListenerOptions();
         this.attachScrollListener();
-      },
+      }
     },
     {
       key: 'componentDidUpdate',
       value: function componentDidUpdate() {
+        if (this.props.isReverse && this.loadMore) {
+          var parentElement = this.getParentElement(this.scrollComponent);
+          parentElement.scrollTop =
+            parentElement.scrollHeight -
+            this.beforeScrollHeight +
+            this.beforeScrollTop;
+          this.loadMore = false;
+        }
         this.attachScrollListener();
-      },
+      }
     },
     {
       key: 'componentWillUnmount',
@@ -154,15 +162,14 @@ var InfiniteScroll = (function(_Component) {
           };
         }
         return options;
-      },
-
+      }
       // Set a defaut loader for all your `InfiniteScroll` components
     },
     {
       key: 'setDefaultLoader',
       value: function setDefaultLoader(loader) {
         this.defaultLoader = loader;
-      },
+      }
     },
     {
       key: 'detachMousewheelListener',
@@ -175,9 +182,9 @@ var InfiniteScroll = (function(_Component) {
         scrollEl.removeEventListener(
           'mousewheel',
           this.mousewheelListener,
-          this.options ? this.options : this.props.useCapture,
+          this.options ? this.options : this.props.useCapture
         );
-      },
+      }
     },
     {
       key: 'detachScrollListener',
@@ -190,14 +197,14 @@ var InfiniteScroll = (function(_Component) {
         scrollEl.removeEventListener(
           'scroll',
           this.scrollListener,
-          this.options ? this.options : this.props.useCapture,
+          this.options ? this.options : this.props.useCapture
         );
         scrollEl.removeEventListener(
           'resize',
           this.scrollListener,
-          this.options ? this.options : this.props.useCapture,
+          this.options ? this.options : this.props.useCapture
         );
-      },
+      }
     },
     {
       key: 'getParentElement',
@@ -208,13 +215,13 @@ var InfiniteScroll = (function(_Component) {
           return scrollParent;
         }
         return el && el.parentNode;
-      },
+      }
     },
     {
       key: 'filterProps',
       value: function filterProps(props) {
         return props;
-      },
+      }
     },
     {
       key: 'attachScrollListener',
@@ -243,13 +250,13 @@ var InfiniteScroll = (function(_Component) {
         scrollEl.addEventListener(
           'resize',
           this.scrollListener,
-          this.options ? this.options : this.props.useCapture,
+          this.options ? this.options : this.props.useCapture
         );
 
         if (this.props.initialLoad) {
           this.scrollListener();
         }
-      },
+      }
     },
     {
       key: 'mousewheelListener',
@@ -262,7 +269,7 @@ var InfiniteScroll = (function(_Component) {
         ) {
           e.preventDefault();
         }
-      },
+      }
     },
     {
       key: 'scrollListener',
@@ -300,12 +307,15 @@ var InfiniteScroll = (function(_Component) {
           el.offsetParent !== null
         ) {
           this.detachScrollListener();
+          this.beforeScrollHeight = parentNode.scrollHeight;
+          this.beforeScrollTop = parentNode.scrollTop;
           // Call loadMore after detachScrollListener to allow for non-async loadMore functions
           if (typeof this.props.loadMore === 'function') {
             this.props.loadMore((this.pageLoaded += 1));
+            this.loadMore = true;
           }
         }
-      },
+      }
     },
     {
       key: 'calculateOffset',
@@ -318,7 +328,7 @@ var InfiniteScroll = (function(_Component) {
           this.calculateTopPosition(el) +
           (el.offsetHeight - scrollTop - window.innerHeight)
         );
-      },
+      }
     },
     {
       key: 'calculateTopPosition',
@@ -327,7 +337,7 @@ var InfiniteScroll = (function(_Component) {
           return 0;
         }
         return el.offsetTop + this.calculateTopPosition(el.offsetParent);
-      },
+      }
     },
     {
       key: 'render',
@@ -362,7 +372,7 @@ var InfiniteScroll = (function(_Component) {
             'threshold',
             'useCapture',
             'useWindow',
-            'getScrollParent',
+            'getScrollParent'
           ]);
 
         props.ref = function(node) {
@@ -385,8 +395,8 @@ var InfiniteScroll = (function(_Component) {
           }
         }
         return _react2.default.createElement(element, props, childrenArray);
-      },
-    },
+      }
+    }
   ]);
 
   return InfiniteScroll;
@@ -405,8 +415,7 @@ InfiniteScroll.propTypes = {
   getScrollParent: _propTypes2.default.func,
   threshold: _propTypes2.default.number,
   useCapture: _propTypes2.default.bool,
-  useWindow: _propTypes2.default.bool,
-  passive: _propTypes2.default.bool,
+  useWindow: _propTypes2.default.bool
 };
 InfiniteScroll.defaultProps = {
   element: 'div',
@@ -419,8 +428,7 @@ InfiniteScroll.defaultProps = {
   isReverse: false,
   useCapture: false,
   loader: null,
-  getScrollParent: null,
-  passive: false,
+  getScrollParent: null
 };
 exports.default = InfiniteScroll;
 module.exports = exports['default'];

dist/InfiniteScroll.js

@@ -1,6 +1,6 @@
 {
   "name": "react-infinite-scroller",
-  "version": "1.2.2",
+  "version": "1.2.3",
   "description": "Infinite scroll component for React in ES6",
   "main": "index.js",
   "jsnext:main": "src/InfiniteScroll.js",