Merge pull request #143 from guidobouman/develop

Release 2019-07-03
guidobouman · Jul 4, 2019 · bbb7494 · bbb7494
2 parents 0b08823 + 9f15780
commit bbb7494
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 11 deletions.
diff --git a/docs/panelsnap.js b/docs/panelsnap.js
diff --git a/src/utilities.js b/src/utilities.js
@@ -20,14 +20,19 @@ export function getScrollEventContainer(container) {
 }
 
 function getContainerRect(container) {
-  return container === document.body ? {
-    top: 0,
-    left: 0,
-    bottom: window.innerHeight,
-    right: window.innerWidth,
-    height: window.innerHeight,
-    width: window.innerWidth,
-  } : container.getBoundingClientRect();
+  if (container === document.body) {
+    const htmlElement = document.documentElement;
+    return {
+      top: 0,
+      left: 0,
+      bottom: htmlElement.clientHeight,
+      right: htmlElement.clientWidth,
+      height: htmlElement.clientHeight,
+      width: htmlElement.clientWidth,
+    };
+  }
+
+  return container.getBoundingClientRect();
 }
 
 export function getTargetScrollOffset(container, element, toBottom = false, toRight = false) {

diff --git a/src/utilities.test.js b/src/utilities.test.js
@@ -9,8 +9,8 @@ import {
 const SCREEN_WIDTH = 800;
 const SCREEN_HEIGHT = 600;
 
-window.innerWidth = SCREEN_WIDTH;
-window.innerHeight = SCREEN_HEIGHT;
+Object.defineProperty(document.documentElement, 'clientWidth', { value: SCREEN_WIDTH });
+Object.defineProperty(document.documentElement, 'clientHeight', { value: SCREEN_HEIGHT });
 
 describe('getScrolllingElement', () => {
   test('returns same element when container is not body', () => {