fix: take parentNode scrollHeight into account when using non-window scroller

ajoslin · ajoslin · commit 0a17028ddb5b · 2017-06-11T09:43:06.000-06:00
diff --git a/dist/InfiniteScroll.js b/dist/InfiniteScroll.js
@@ -107,7 +107,7 @@ var InfiniteScroll = function (_Component) {
       } else if (this.props.isReverse) {
         offset = el.parentNode.scrollTop;
       } else {
-        offset = el.scrollHeight - el.parentNode.scrollTop - el.parentNode.clientHeight;
+        offset = el.parentNode.clientHeight - el.parentNode.scrollHeight - el.parentNode.scrollTop;
       }
 
       if (offset < Number(this.props.threshold)) {
diff --git a/src/InfiniteScroll.js b/src/InfiniteScroll.js
@@ -105,7 +105,7 @@ export default class InfiniteScroll extends Component {
     } else if (this.props.isReverse) {
       offset = el.parentNode.scrollTop;
     } else {
-      offset = el.scrollHeight - el.parentNode.scrollTop - el.parentNode.clientHeight;
+      offset = el.parentNode.scrollHeight - el.parentNode.clientHeight - el.parentNode.scrollTop;
     }
 
     if (offset < Number(this.props.threshold)) {

Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,7 @@ var InfiniteScroll = function (_Component) {`
`107`	`107`	`} else if (this.props.isReverse) {`
`108`	`108`	`offset = el.parentNode.scrollTop;`
`109`	`109`	`} else {`
`110`		`- offset = el.scrollHeight - el.parentNode.scrollTop - el.parentNode.clientHeight;`
	`110`	`+ offset = el.parentNode.clientHeight - el.parentNode.scrollHeight - el.parentNode.scrollTop;`
`111`	`111`	`}`
`112`	`112`
`113`	`113`	`if (offset < Number(this.props.threshold)) {`
Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,7 @@ export default class InfiniteScroll extends Component {`
`105`	`105`	`} else if (this.props.isReverse) {`
`106`	`106`	`offset = el.parentNode.scrollTop;`
`107`	`107`	`} else {`
`108`		`- offset = el.scrollHeight - el.parentNode.scrollTop - el.parentNode.clientHeight;`
	`108`	`+ offset = el.parentNode.scrollHeight - el.parentNode.clientHeight - el.parentNode.scrollTop;`
`109`	`109`	`}`
`110`	`110`
`111`	`111`	`if (offset < Number(this.props.threshold)) {`