Merge branch 'master' into prettier

danbovey · web-flow · commit 6bd5a81dee64 · 2017-11-07T10:18:44.000Z
diff --git a/README.md b/README.md
@@ -3,7 +3,7 @@ React Infinite Scroller
 
 [![Travis](https://img.shields.io/travis/CassetteRocks/react-infinite-scroller.svg?style=flat-square)](https://travis-ci.org/CassetteRocks/react-infinite-scroller)
 [![npm](https://img.shields.io/npm/dt/react-infinite-scroller.svg?style=flat-square)](https://www.npmjs.com/package/react-infinite-scroller)
-[![React Version](https://img.shields.io/badge/React-%5E0.14.9%20%7C%7C%20%5E15.3.0-blue.svg?style=flat-square)](https://www.npmjs.com/package/react)
+[![React Version](https://img.shields.io/badge/React-%5E0.14.9%20%7C%7C%20%5E15.3.0%20%7C%7C%20%5E16.0.0-blue.svg?style=flat-square)](https://www.npmjs.com/package/react)
 [![npm](https://img.shields.io/npm/v/react-infinite-scroller.svg?style=flat-square)](https://www.npmjs.com/package/react-infinite-scroller)
 [![npm](https://img.shields.io/npm/l/react-infinite-scroller.svg?style=flat-square)](https://github.com/CassetteRocks/react-infinite-scroller/blob/master/LICENSE)
 
@@ -64,7 +64,8 @@ import InfiniteScroll from 'react-infinite-scroller';
 | `hasMore`        | `Boolean`     | `false`    | Whether there are more items to be loaded. Event listeners are removed if `false`.|
 | `initialLoad`    | `Boolean`     | `true`     | Whether the component should load the first set of items.|
 | `isReverse`      | `Boolean`     | `false`    | Whether new items should be loaded when user scrolls to the top of the scrollable area.|
-| `loadMore`       | `Function`    |            | A callback when more items are requested by the user.|
+| `loadMore`       | `Function`    |            | A callback when more items are requested by the user. Receives a single parameter specifying the page to load e.g. `function handleLoadMore(page) { /* load more items here */ }` }|
+| `loader`         | `Component`   |            | A React component to render while more items are loading.|
 | `pageStart`      | `Number`      | `0`        | The number of the first page to load, With the default of `0`, the first page is `1`.|
 | `threshold`      | `Number`     | `250`      | The distance in pixels before the end of the items that will trigger a call to `loadMore`.|
 | `useCapture`     | `Boolean`     | `false`     | Proxy to the `useCapture` option of the added event listeners.|
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-infinite-scroller",
-  "version": "1.0.16",
+  "version": "1.1.0",
   "description": "Infinite scroll component for React in ES6",
   "main": "index.js",
   "jsnext:main": "src/InfiniteScroll.js",
@@ -65,9 +65,9 @@
     "mocha": "^3.3.0",
     "nyc": "^10.2.0",
     "prettier": "^1.7.4",
-    "react": "^15.5.4",
-    "react-dom": "^15.5.4",
-    "react-test-renderer": "^15.5.4",
+    "react": "^16.0.0",
+    "react-dom": "^16.0.0",
+    "react-test-renderer": "^16.0.0",
     "sinon": "^2.1.0",
     "webpack": "^2.5.1"
   }
diff --git a/test/test_helper.js b/test/test_helper.js
@@ -2,9 +2,12 @@
 require('babel-register')();
 var chai = require('chai');
 var JSDOM = require('jsdom').JSDOM;
-var chaiEnzyme = require('chai-enzyme');
+var Enzyme = require('enzyme');
+var Adapter = require('enzyme-adapter-react-16');
 var exposedProperties = ['window', 'navigator', 'document'];
 
+Enzyme.configure({ adapter: new Adapter() });
+
 global.dom = new JSDOM('<body></body>');
 global.window = dom.window.document.defaultView;
 
@@ -18,5 +21,3 @@ Object.keys(dom.window.document.defaultView).forEach((property) => {
 global.navigator = {
   userAgent: 'node.js',
 };
-
-chai.use(chaiEnzyme());
