Revert "Revert "refactor IntersectionObserver to observe viewport in single-column mode (mastodon#12735)""

panarom · umonaca · commit 3175365f4805 · 2020-05-15T22:23:42.000-04:00
This reverts commit 99ac41f.
diff --git a/app/javascript/mastodon/components/scrollable_list.js b/app/javascript/mastodon/components/scrollable_list.js
@@ -212,10 +212,13 @@ export default class ScrollableList extends PureComponent {
   }
 
   attachIntersectionObserver () {
-    this.intersectionObserverWrapper.connect({
+    let nodeOptions = {
       root: this.node,
       rootMargin: '300% 0px',
-    });
+    };
+
+    this.intersectionObserverWrapper
+      .connect(this.props.bindToDocument ? {} : nodeOptions);
   }
 
   detachIntersectionObserver () {

Original file line number	Diff line number	Diff line change
`@@ -212,10 +212,13 @@ export default class ScrollableList extends PureComponent {`
`212`	`212`	`}`
`213`	`213`
`214`	`214`	`attachIntersectionObserver () {`
`215`		`- this.intersectionObserverWrapper.connect({`
	`215`	`+ let nodeOptions = {`
`216`	`216`	`root: this.node,`
`217`	`217`	`rootMargin: '300% 0px',`
`218`		`- });`
	`218`	`+ };`
	`219`	`+`
	`220`	`+ this.intersectionObserverWrapper`
	`221`	`+ .connect(this.props.bindToDocument ? {} : nodeOptions);`
`219`	`222`	`}`
`220`	`223`
`221`	`224`	`detachIntersectionObserver () {`