fixes

mozilla · Jun 20, 2018 · 6a70457 · 6a70457
1 parent aafb848
commit 6a70457
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 9 deletions.
diff --git a/src/amo/components/ScreenShots.js b/src/amo/components/ScreenShots.js
@@ -14,6 +14,11 @@ type ThumbBounds = false | {|
   y: number,
 |};
 
+type GetThumbBoundsExtraParams = {|
+  _document: typeof document | null,
+  _window: typeof window | null,
+|};
+
 export const PHOTO_SWIPE_OPTIONS = {
   closeEl: true,
   captionEl: true,
@@ -25,11 +30,14 @@ export const PHOTO_SWIPE_OPTIONS = {
   preloaderEl: true,
   // Overload getThumbBoundsFn as workaround to
   // https://github.com/minhtranite/react-photoswipe/issues/23
-  getThumbBoundsFn: (
-    index: number,
-    _document: typeof document = document,
-    _window: typeof window = window
-  ): ThumbBounds => {
+  getThumbBoundsFn: (index: number, {
+    _document = typeof document !== 'undefined' ? document : null,
+    _window = typeof window !== 'undefined' ? window : null,
+  }: GetThumbBoundsExtraParams = {}): ThumbBounds => {
+    if (!_document || !_window) {
+      return false;
+    }
+
     const thumbnail = _document.querySelectorAll('.pswp-thumbnails')[index];
 
     if (thumbnail && thumbnail.getElementsByTagName) {

diff --git a/tests/unit/amo/components/TestScreenShots.js b/tests/unit/amo/components/TestScreenShots.js
@@ -133,16 +133,30 @@ describe(__filename, () => {
       expect(bounds).toEqual(false);
     });
 
+    it('returns false if _document is null', () => {
+      const bounds = getThumbBoundsFn(0, { _document: null });
+
+      expect(bounds).toEqual(false);
+    });
+
+    it('returns false if _window is null', () => {
+      const bounds = getThumbBoundsFn(0, {
+        _document: getFakeDocument({ left: 1, top: 2, width: 3 }),
+        _window: null,
+      });
+
+      expect(bounds).toEqual(false);
+    });
+
     it('returns an object with x, y and w values', () => {
       const left = 123;
       const top = 124;
       const width = 100;
 
       const fakeDocument = getFakeDocument({ left, top, width });
 
-      const bounds = getThumbBoundsFn(0, fakeDocument);
+      const bounds = getThumbBoundsFn(0, { _document: fakeDocument });
 
-      expect(bounds).toBeInstanceOf(Object);
       expect(bounds).toEqual({
         w: width,
         x: left,
@@ -161,7 +175,10 @@ describe(__filename, () => {
         pageYOffset: 20,
       };
 
-      const bounds = getThumbBoundsFn(0, fakeDocument, fakeWindow);
+      const bounds = getThumbBoundsFn(0, {
+        _document: fakeDocument,
+        _window: fakeWindow,
+      });
 
       expect(bounds).toEqual({
         w: width,
@@ -181,7 +198,7 @@ describe(__filename, () => {
         scrollTop,
       };
 
-      const bounds = getThumbBoundsFn(0, fakeDocument);
+      const bounds = getThumbBoundsFn(0, { _document: fakeDocument });
 
       expect(bounds).toEqual({
         w: width,