Fixed window scroll position for IE

ryank109 · Mar 7, 2018 · f961ba0 · f961ba0
1 parent 5dfb647
commit f961ba0
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 31 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-redux-popup",
-  "version": "3.0.2",
+  "version": "3.0.3",
   "description": "React redux popup",
   "license": "MIT",
   "main": "lib/react-redux-popup",

diff --git a/src/__tests__/utils.js b/src/__tests__/utils.js
@@ -467,8 +467,8 @@ describe('utils', () => {
     });
 
     it('should anchor to bottom when enough space below and window has scrolled', () => {
-        window.scrollX = 20;
-        window.scrollY = 30;
+        window.pageXOffset = 20;
+        window.pageYOffset = 30;
 
         const anchor = 'bottom';
         const rect = { bottom: 50, left: 10, right: 50, top: 10 };
@@ -493,8 +493,8 @@ describe('utils', () => {
     });
 
     it('should anchor to top when enough space above and window has scrolled', () => {
-        window.scrollX = 20;
-        window.scrollY = 30;
+        window.pageXOffset = 20;
+        window.pageYOffset = 30;
 
         const anchor = 'top';
         const rect = { bottom: 290, left: 10, right: 50, top: 250 };
@@ -519,8 +519,8 @@ describe('utils', () => {
     });
 
     it('should anchor to right when enough space on the right and window has scrolled', () => {
-        window.scrollX = 20;
-        window.scrollY = 30;
+        window.pageXOffset = 20;
+        window.pageYOffset = 30;
 
         const anchor = 'right';
         const rect = { bottom: 50, left: 10, right: 50, top: 10 };
@@ -545,8 +545,8 @@ describe('utils', () => {
     });
 
     it('should anchor to left when enough space on the left and window has scrolled', () => {
-        window.scrollX = 20;
-        window.scrollY = 30;
+        window.pageXOffset = 20;
+        window.pageYOffset = 30;
 
         const anchor = 'left';
         const rect = { bottom: 50, left: 250, right: 290, top: 10 };

diff --git a/src/utils.js b/src/utils.js
@@ -47,14 +47,14 @@ export function getPopupPosition(
                 windowWidth,
                 popupWidth,
                 rect.left,
-                rect.right) + window.scrollX,
+                rect.right) + window.pageXOffset,
             top: calculatePosition(
                 windowHeight,
                 popupHeight,
                 rect.top,
                 rect.bottom,
                 offset,
-                anchor === 'bottom') + window.scrollY,
+                anchor === 'bottom') + window.pageYOffset,
         };
     default: // left and right
         return {
@@ -64,12 +64,12 @@ export function getPopupPosition(
                 rect.left,
                 rect.right,
                 offset,
-                anchor === 'right') + window.scrollX,
+                anchor === 'right') + window.pageXOffset,
             top: adjustPosition(
                 windowHeight,
                 popupHeight,
                 rect.top,
-                rect.bottom) + window.scrollY,
+                rect.bottom) + window.pageYOffset,
         };
     }
 }