Merge branch 'master' of https://github.com/ankeetmaini/react-infinite-scroll-component into fix-UNSAFE_componentWillReceiveProps

Author: Newbie012

.all-contributorsrc

@@ -0,0 +1,36 @@
+{
+  "files": [
+    "README.md"
+  ],
+  "imageSize": 100,
+  "contributorsPerLine": 5,
+  "skipCi": true,
+  "contributors": [
+    {
+      "login": "ankeetmaini",
+      "name": "Ankeet Maini",
+      "avatar_url": "https://avatars.githubusercontent.com/u/6652823?v=4",
+      "profile": "https://ankeetmaini.dev/",
+      "contributions": [
+        "question",
+        "doc",
+        "code",
+        "review",
+        "maintenance"
+      ]
+    },
+    {
+      "login": "iamdarshshah",
+      "name": "Darsh Shah",
+      "avatar_url": "https://avatars.githubusercontent.com/u/25670841?v=4",
+      "profile": "https://github.com/iamdarshshah",
+      "contributions": [
+        "infra"
+      ]
+    }
+  ],
+  "projectName": "react-infinite-scroll-component",
+  "projectOwner": "ankeetmaini",
+  "repoType": "github",
+  "repoHost": "https://github.com"
+}

README.md

@@ -1,9 +1,12 @@
 # react-infinite-scroll-component [![npm](https://img.shields.io/npm/dt/react-infinite-scroll-component.svg?style=flat-square)](https://www.npmjs.com/package/react-infinite-scroll-component) [![npm](https://img.shields.io/npm/v/react-infinite-scroll-component.svg?style=flat-square)](https://www.npmjs.com/package/react-infinite-scroll-component)
+<!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
+[![All Contributors](https://img.shields.io/badge/all_contributors-1-orange.svg?style=flat-square)](#contributors-)
+<!-- ALL-CONTRIBUTORS-BADGE:END -->
 
 A component to make all your infinite scrolling woes go away with just 4.15 kB! `Pull Down to Refresh` feature
 added. An infinite-scroll that actually works and super-simple to integrate!
 
-# install
+## Install
 
 ```bash
   npm install --save react-infinite-scroll-component
@@ -18,7 +21,7 @@ added. An infinite-scroll that actually works and super-simple to integrate!
   var InfiniteScroll = require('react-infinite-scroll-component');
 ```
 
-# using
+## Using
 
 ```jsx
 <InfiniteScroll
@@ -46,7 +49,7 @@ added. An infinite-scroll that actually works and super-simple to integrate!
 </InfiniteScroll>
 ```
 
-# using scroll on top
+## Using scroll on top
 
 ```jsx
 <div
@@ -83,11 +86,11 @@ The `InfiniteScroll` component can be used in three ways.
 - If your **scrollable** content is being rendered within a parent element that is already providing overflow scrollbars, you can set the `scrollableTarget` prop to reference the DOM element and use it's scrollbars for fetching more data.
 - Without setting either the `height` or `scrollableTarget` props, the scroll will happen at `document.body` like _Facebook's_ timeline scroll.
 
-# docs version wise
+## docs version wise
 
 [3.0.2](docs/README-3.0.2.md)
 
-# live examples
+## live examples
 
 - infinite scroll (never ending) example using react (body/window scroll)
   - [![Edit yk7637p62z](https://codesandbox.io/static/img/play-codesandbox.svg)](https://codesandbox.io/s/yk7637p62z)
@@ -98,7 +101,7 @@ The `InfiniteScroll` component can be used in three ways.
 - infinite scroll with `scrollableTarget` (a parent element which is scrollable)
   - [![Edit r7rp40n0zm](https://codesandbox.io/static/img/play-codesandbox.svg)](https://codesandbox.io/s/r7rp40n0zm)
 
-# props
+## props
 
 | name                           | type                 | description                                                                                                                                                                                                                                                                                                                                   |
 | ------------------------------ | -------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
@@ -122,3 +125,28 @@ The `InfiniteScroll` component can be used in three ways.
 | **refreshFunction**            | function             | this function will be called, it should return the fresh data that you want to show the user                                                                                                                                                                                                                                                  |
 | **initialScrollY**             | number               | set a scroll y position for the component to render with.                                                                                                                                                                                                                                                                                     |
 | **inverse**                    | bool                 | set infinite scroll on top                                                                                                                                                                                                                                                                                                                    |
+
+## Contributors ✨
+
+Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/docs/en/emoji-key)):
+
+<!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section -->
+<!-- prettier-ignore-start -->
+<!-- markdownlint-disable -->
+<table>
+  <tr>
+    <td align="center"><a href="https://ankeetmaini.dev/"><img src="https://avatars.githubusercontent.com/u/6652823?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Ankeet Maini</b></sub></a><br /><a href="#question-ankeetmaini" title="Answering Questions">💬</a> <a href="https://github.com/ankeetmaini/react-infinite-scroll-component/commits?author=ankeetmaini" title="Documentation">📖</a> <a href="https://github.com/ankeetmaini/react-infinite-scroll-component/commits?author=ankeetmaini" title="Code">💻</a> <a href="https://github.com/ankeetmaini/react-infinite-scroll-component/pulls?q=is%3Apr+reviewed-by%3Aankeetmaini" title="Reviewed Pull Requests">👀</a> <a href="#maintenance-ankeetmaini" title="Maintenance">🚧</a></td>
+    <td align="center"><a href="https://github.com/iamdarshshah"><img src="https://avatars.githubusercontent.com/u/25670841?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Darsh Shah</b></sub></a><br /><a href="#infra-iamdarshshah" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a></td>
+  </tr>
+</table>
+
+<!-- markdownlint-restore -->
+<!-- prettier-ignore-end -->
+
+<!-- ALL-CONTRIBUTORS-LIST:END -->
+
+This project follows the [all-contributors](https://allcontributors.org) specification. Contributions of any kind are welcome!
+
+## LICENSE
+
+[MIT](LICENSE)

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-infinite-scroll-component",
-  "version": "5.1.0",
+  "version": "6.0.0",
   "description": "An Infinite Scroll component in react.",
   "source": "src/index.tsx",
   "main": "dist/index.js",

src/index.tsx

@@ -242,7 +242,7 @@ export default class InfiniteScroll extends Component<Props, State> {
       if (this._infScroll) {
         this._infScroll.style.overflow = 'auto';
         this._infScroll.style.transform = 'none';
-        this._infScroll.style.willChange = 'none';
+        this._infScroll.style.willChange = 'unset';
       }
     });
   };
@@ -258,15 +258,13 @@ export default class InfiniteScroll extends Component<Props, State> {
     if (threshold.unit === ThresholdUnits.Pixel) {
       return (
         target.scrollTop <=
-          threshold.value + clientHeight - target.scrollHeight + 1 ||
-        target.scrollTop === 0
+        threshold.value + clientHeight - target.scrollHeight + 1
       );
     }
 
     return (
       target.scrollTop <=
-        threshold.value / 100 + clientHeight - target.scrollHeight + 1 ||
-      target.scrollTop === 0
+      threshold.value / 100 + clientHeight - target.scrollHeight + 1
     );
   }
 

yarn.lock

@@ -5771,9 +5771,9 @@ [email protected]:
   integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
 
 ini@^1.3.5, ini@~1.3.0:
-  version "1.3.5"
-  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
-  integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==
+  version "1.3.8"
+  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c"
+  integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==
 
 [email protected]:
   version "6.5.0"
@@ -7440,9 +7440,9 @@ neo-async@^2.5.0, neo-async@^2.6.0, neo-async@^2.6.1:
   integrity sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw==
 
 nested-object-assign@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/nested-object-assign/-/nested-object-assign-1.0.3.tgz#5aca69390d9affe5a612152b5f0843ae399ac597"
-  integrity sha512-kgq1CuvLyUcbcIuTiCA93cQ2IJFSlRwXcN+hLcb2qLJwC2qrePHGZZa7IipyWqaWF6tQjdax2pQnVxdq19Zzwg==
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/nested-object-assign/-/nested-object-assign-1.0.4.tgz#c9db56078eb6043960fdb6ba918a5122a06ccac4"
+  integrity sha512-FlZ7oN9ICt+fbcJ4ag2IsALIcalfE/E16ttdSA8peBiHJI+oEKdOcafqDnUbeUe5NwWGn/m9zZGO9qrAGzfesg==
 
 next-tick@^1.0.0:
   version "1.0.0"