Hotfix 1.1.1: Handle SSR

YieldbirdDev · Mar 4, 2021 · 3507e06 · 3507e06
1 parent 69dae40
commit 3507e06
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,13 @@ In addition to above spec use `Action` group to gather all needed actions requir
 
 ## Unreleased
 
+## [1.1.0] - 2021-01-12 Production
+
+### Added
+- Lazy load feature
+
+## [1.0.0] - 2021-01-12 Production
+
 ### Added
 - AdManagerProvider component
 - AdManagerSlot component

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "yieldbird_gpt_components",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "Made with create-react-library",
   "author": "YieldbirdDev",
   "license": "MIT",

diff --git a/src/Context/AdManagerProvider.tsx b/src/Context/AdManagerProvider.tsx
@@ -33,11 +33,11 @@ export const AdManagerProvider: React.FC<Props> = ({
       const actionEntries = entries.filter((entry) => entry.isIntersecting)
 
       if (actionEntries.length > 0) {
-        window &&
+        typeof window !== 'undefined' &&
           window.googletag.cmd.push(() => {
             const displayEntries = actionEntries.map((entry) => ({
               slot:
-                window &&
+                typeof window !== 'undefined' &&
                 window.googletag
                   .pubads()
                   .getSlots()
@@ -48,7 +48,11 @@ export const AdManagerProvider: React.FC<Props> = ({
             }))
 
             displayEntries.forEach((element) => {
-              if (window && window.googletag && element.slot) {
+              if (
+                typeof window !== 'undefined' &&
+                window.googletag &&
+                element.slot
+              ) {
                 window.googletag.display(element.slot.getSlotElementId())
                 window.googletag.pubads().refresh([element.slot])
               }

diff --git a/src/Utils/intersectionObserver.ts b/src/Utils/intersectionObserver.ts
@@ -1,3 +1,3 @@
 export function isIntersectionObserverAvailable() {
-  return window && 'IntersectionObserver' in window
+  return typeof window !== 'undefined' && 'IntersectionObserver' in window
 }