From 399fa61f40eaaaa5765a1a1e6719d13d35b2c813 Mon Sep 17 00:00:00 2001
From: Gustaf Dalemar <gustaf.dalemar@gmail.com>
Date: Fri, 26 Aug 2016 10:45:26 +0200
Subject: [PATCH] Makes sure the state in the store matches the state in
 history

This solves some problems where they would be out of sync on the first render when using server side rendering. The location would be the same for both of them but the key would be different resulting in some strange behaviour.

The application will now always dispatch a LOCATION_CHANGE on initial render. This was already done when not using server side rendering, meaning that the behaviour is similar between using server side rendering and not.
---
 src/sync.js             | 7 ++++---
 test/_createSyncTest.js | 7 +++++++
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/sync.js b/src/sync.js
index ee68f79..ce98560 100644
--- a/src/sync.js
+++ b/src/sync.js
@@ -34,6 +34,7 @@ export default function syncHistoryWithStore(history, store, {
   let isTimeTraveling
   let unsubscribeFromStore
   let unsubscribeFromHistory
+  let currentLocation
 
   // What does the store say about current location?
   const getLocationInStore = (useInitialIfEmpty) => {
@@ -42,14 +43,14 @@ export default function syncHistoryWithStore(history, store, {
       (useInitialIfEmpty ? initialLocation : undefined)
   }
 
-  // Init currentLocation with potential location in store
-  let currentLocation = getLocationInStore()
+  // Init initialLocation with potential location in store
+  initialLocation = getLocationInStore()
 
   // If the store is replayed, update the URL in the browser to match.
   if (adjustUrlOnReplay) {
     const handleStoreChange = () => {
       const locationInStore = getLocationInStore(true)
-      if (currentLocation === locationInStore) {
+      if (currentLocation === locationInStore || initialLocation === locationInStore) {
         return
       }
 
diff --git a/test/_createSyncTest.js b/test/_createSyncTest.js
index 34aa7b3..ee4268a 100644
--- a/test/_createSyncTest.js
+++ b/test/_createSyncTest.js
@@ -186,6 +186,13 @@ export default function createTests(createHistory, name, reset = defaultReset) {
         // We expect that we get a single call to history
         expect(historyListen.calls.length).toBe(1)
 
+        clientStore.dispatch({
+          type: 'non-router'
+        })
+
+        // We expect that we still get only a single call to history after a non-router action is dispatched
+        expect(historyListen.calls.length).toBe(1)
+
         historyUnsubscribe()
       })
     })