Merge pull request #68 from bestguy/improveSSR

Improve SSR Support
bestguy · Oct 13, 2019 · 5b2a585 · 5b2a585
2 parents 71ca606 + 30ff436
commit 5b2a585
Show file tree

Hide file tree

Showing 15 changed files with 18 additions and 18 deletions.
diff --git a/docs/iframe.html b/docs/iframe.html
@@ -80,4 +80,4 @@
   }</style><style>#root[hidden],
       #docs-root[hidden] {
         display: none !important;
-      }</style></head><body><div class="sb-nopreview sb-wrapper"><div class="sb-nopreview_main"><h1 class="sb-nopreview_heading sb-heading">No Preview</h1><p>Sorry, but you either have no stories or none are selected somehow.</p><ul><li>Please check the Storybook config.</li><li>Try reloading the page.</li></ul><p>If the problem persists, check the browser console, or the terminal you've run Storybook from.</p></div></div><div class="sb-errordisplay sb-wrapper"><pre id="error-message" class="sb-heading"></pre><pre class="sb-errordisplay_code"><code id="error-stack"></code></pre></div><div id="root"></div><div id="docs-root"></div><script src="runtime~main.7762ee4bc6f59b445be1.bundle.js"></script><script src="vendors~main.7762ee4bc6f59b445be1.bundle.js"></script><script src="main.7762ee4bc6f59b445be1.bundle.js"></script></body></html>
+      }</style></head><body><div class="sb-nopreview sb-wrapper"><div class="sb-nopreview_main"><h1 class="sb-nopreview_heading sb-heading">No Preview</h1><p>Sorry, but you either have no stories or none are selected somehow.</p><ul><li>Please check the Storybook config.</li><li>Try reloading the page.</li></ul><p>If the problem persists, check the browser console, or the terminal you've run Storybook from.</p></div></div><div class="sb-errordisplay sb-wrapper"><pre id="error-message" class="sb-heading"></pre><pre class="sb-errordisplay_code"><code id="error-stack"></code></pre></div><div id="root"></div><div id="docs-root"></div><script src="runtime~main.683d91b2c7d5e7bd26b8.bundle.js"></script><script src="vendors~main.683d91b2c7d5e7bd26b8.bundle.js"></script><script src="main.683d91b2c7d5e7bd26b8.bundle.js"></script></body></html>
diff --git a/docs/main.683d91b2c7d5e7bd26b8.bundle.js b/docs/main.683d91b2c7d5e7bd26b8.bundle.js
diff --git a/docs/main.683d91b2c7d5e7bd26b8.bundle.js.map b/docs/main.683d91b2c7d5e7bd26b8.bundle.js.map
diff --git a/docs/main.7762ee4bc6f59b445be1.bundle.js b/docs/main.7762ee4bc6f59b445be1.bundle.js
diff --git a/docs/main.7762ee4bc6f59b445be1.bundle.js.map b/docs/main.7762ee4bc6f59b445be1.bundle.js.map
diff --git a/...ntime~main.7762ee4bc6f59b445be1.bundle.js → ...ntime~main.683d91b2c7d5e7bd26b8.bundle.js b/...ntime~main.7762ee4bc6f59b445be1.bundle.js → ...ntime~main.683d91b2c7d5e7bd26b8.bundle.js
diff --git a/...e~main.7762ee4bc6f59b445be1.bundle.js.map → ...e~main.683d91b2c7d5e7bd26b8.bundle.js.map b/...e~main.7762ee4bc6f59b445be1.bundle.js.map → ...e~main.683d91b2c7d5e7bd26b8.bundle.js.map
diff --git a/...ndors~main.7762ee4bc6f59b445be1.bundle.js → ...ndors~main.683d91b2c7d5e7bd26b8.bundle.js b/...ndors~main.7762ee4bc6f59b445be1.bundle.js → ...ndors~main.683d91b2c7d5e7bd26b8.bundle.js
diff --git a/...s~main.7762ee4bc6f59b445be1.bundle.js.map → ...s~main.683d91b2c7d5e7bd26b8.bundle.js.map b/...s~main.7762ee4bc6f59b445be1.bundle.js.map → ...s~main.683d91b2c7d5e7bd26b8.bundle.js.map
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "sveltestrap",
-  "version": "3.2.5",
+  "version": "3.2.6-0",
   "main": "dist/sveltestrap.js",
   "module": "dist/sveltestrap.es.js",
   "jsnext:main": "dist/sveltestrap.es.js",

diff --git a/src/Collapse.svelte b/src/Collapse.svelte
@@ -24,7 +24,7 @@
     navbar && 'navbar-collapse',
   );
 
-  let windowWidth = window.innerWidth;
+  let windowWidth = 0;
   let _wasMaximazed = false;
 
   const minWidth = {};

diff --git a/src/UncontrolledCollapse.svelte b/src/UncontrolledCollapse.svelte
@@ -32,8 +32,8 @@
     if (
       typeof toggler === 'string' &&
       typeof window !== 'undefined' &&
-      window.document &&
-      window.document.createElement
+      document &&
+      document.createElement
     ) {
       let selection = document.querySelectorAll(toggler);
       if (!selection.length) {

diff --git a/src/UncontrolledFade.svelte b/src/UncontrolledFade.svelte
@@ -32,8 +32,8 @@
     if (
       typeof toggler === 'string' &&
       typeof window !== 'undefined' &&
-      window.document &&
-      window.document.createElement
+      document &&
+      document.createElement
     ) {
       let selection = document.querySelectorAll(toggler);
       if (!selection.length) {

diff --git a/src/utils.js b/src/utils.js
@@ -1,5 +1,5 @@
 export function getOriginalBodyPadding() {
-  const style = window.getComputedStyle(document.body, null);
+  const style = window ? window.getComputedStyle(document.body, null) : {};
 
   return parseInt((style && style.getPropertyValue('padding-right')) || 0, 10);
 }
@@ -23,7 +23,7 @@ export function setScrollbarWidth(padding) {
 }
 
 export function isBodyOverflowing() {
-  return document.body.clientWidth < window.innerWidth;
+  return window ? document.body.clientWidth < window.innerWidth : false;
 }
 
 export function isObject(value) {