Merge pull request #57 from jacekk/issues/56/scroll-top-detection

Fix: Unable to get property 'scrollTop' of undefined or null reference
TylerBarnes · Mar 25, 2019 · 63890d6 · 63890d6
2 parents 3f7c664 + b3aad7b
commit 63890d6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/AniLink/Fade.js b/src/AniLink/Fade.js
@@ -6,7 +6,7 @@ const fade = ({ exit: { length }, node, direction }) => {
   const duration = direction === "out" ? length + length / 4 : length;
   const opacity = direction === "in" ? 1 : 0;
   const scrollTop =
-    document.scrollingElement.scrollTop ||
+    (document.scrollingElement && document.scrollingElement.scrollTop) ||
     document.body.scrollTop ||
     window.pageYOffset;
 

diff --git a/src/AniLink/Swipe.js b/src/AniLink/Swipe.js
@@ -38,7 +38,7 @@ const swipeBottomDirection = (direction, reverse = false, offset = 40) => {
 
 const swipe = ({ node, exit, direction, top, triggerName, entryOffset }) => {
   const scrollTop =
-    document.scrollingElement.scrollTop ||
+    (document.scrollingElement && document.scrollingElement.scrollTop) ||
     document.body.scrollTop ||
     window.pageYOffset;