Fix SSR load. (patch)

vasco3 · Sep 22, 2018 · 71160a3 · 71160a3
1 parent f171aed
commit 71160a3
Showing 1 changed file with 26 additions and 3 deletions.
diff --git a/src/Layout.js b/src/Layout.js
@@ -17,8 +17,8 @@ import { calculateDayMenu, calculateSettings, prioritizeAndSort } from './util';
 import { convertMacroGramToCalories } from './calculator/utils';
 import demoRecipes from '../data/recipes';
 
-function loadLocalValues() {
-  if (typeof window === 'undefined') {
+function loadLocalValues(isSSR) {
+  if (isSSR) {
     return {
       isWorkoutDay: false,
       macrosRest: {},
@@ -90,7 +90,7 @@ class Layout extends Component {
       recipesFavoriteKeys,
       settings,
       tracker,
-    } = loadLocalValues();
+    } = loadLocalValues(true);
 
     this.state = {
       drawerIsOpen: false,
@@ -113,6 +113,29 @@ class Layout extends Component {
     };
   }
 
+  componentDidMount() {
+    const {
+      macrosRest,
+      macrosWorkout,
+      menu,
+      recipes,
+      recipesFavoriteKeys,
+      settings,
+      tracker,
+    } = loadLocalValues();
+
+    this.setState({
+      isWorkoutDay: shouldWorkout(settings),
+      macrosRest,
+      macrosWorkout,
+      menu,
+      recipes,
+      recipesFavoriteKeys,
+      settings,
+      tracker,
+    });
+  }
+
   handleTracker({ action, macro, value }) {
     const macroCalories = convertMacroGramToCalories({ macro, value });