Merge pull request #187 from brigade/body-with-overflow

trotzig · web-flow · commit 585ea6cd5a58 · 2017-05-05T11:54:33.000+02:00
Assume `window` as scrollableAncestor for &lt;body&gt;
diff --git a/spec/waypoint_spec.js b/spec/waypoint_spec.js
@@ -1138,11 +1138,19 @@ describe('<Waypoint>', function() {
       this.parentStyle.height = 'auto';
       this.parentStyle.overflow = 'visible';
 
+      // This is only here to try and confuse the _findScrollableAncestor code.
+      document.body.style.overflow = 'auto';
+
       // Make the spacers large enough to make the Waypoint render off-screen
       this.topSpacerHeight = window.innerHeight + 1000;
       this.bottomSpacerHeight = 1000;
     });
 
+    afterEach(() => {
+      // Reset body style
+      document.body.style.overflow = '';
+    });
+
     it('does not fire the onEnter handler on mount', () => {
       this.subject();
       expect(this.props.onEnter).not.toHaveBeenCalled();
diff --git a/src/waypoint.jsx b/src/waypoint.jsx
@@ -121,14 +121,9 @@ export default class Waypoint extends React.Component {
     while (node.parentNode) {
       node = node.parentNode;
 
-      if (node === document) {
-        // This particular node does not have a computed style.
-        continue;
-      }
-
-      if (node === document.documentElement) {
-        // This particular node does not have a scroll bar, it uses the window.
-        continue;
+      if (node === document.body) {
+        // We've reached all the way to the root node.
+        return window;
       }
 
       const style = window.getComputedStyle(node);
