Merge pull request #30 from social-native/fix/rehydrate-flag

Fix: rehydrate flag
social-native · Mar 12, 2020 · 121cbf5 · 121cbf5
2 parents 3ca5c66 + 3322956
commit 121cbf5
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@social-native/snpkg-client-elasticsearch",
-    "version": "3.6.0",
+    "version": "3.6.1",
     "description": "",
     "main": "dist/index.cjs.js",
     "module": "dist/index.es.js",

diff --git a/src/history.ts b/src/history.ts
@@ -143,27 +143,37 @@ class History {
      * Rehydrates state from current state store (URL) or persistent storage (localStorage)
      */
     public rehydrate = () => {
+        // tslint:disable-next-line
         runInAction(() => {
             if (this.historyPersister) {
                 const persistedHistory = this.historyPersister.getHistory();
                 this.history = persistedHistory;
                 if (persistedHistory.length > 0) {
-                    this.hasRehydratedLocation = true;
                     const existingStateFromUrl = this.currentLocationStore.getState();
                     if (!existingStateFromUrl) {
                         const newHistoryLocation = this._deepCopy(
                             persistedHistory[0] as HistoryLocation
                         );
+                        // if only suggestions are present then we should
+                        // act as if no location was rehydrated
+                        if (newHistoryLocation.filters) {
+                            this.hasRehydratedLocation = true;
+                        }
                         this.currentLocationStore.setState(newHistoryLocation);
 
                         this._rehydrateFromLocation(newHistoryLocation);
                     } else {
+                        if (existingStateFromUrl.filters) {
+                            this.hasRehydratedLocation = true;
+                        }
                         this._rehydrateFromLocation(existingStateFromUrl);
                     }
                 } else {
                     const existingStateFromUrl = this.currentLocationStore.getState();
                     if (existingStateFromUrl) {
-                        this.hasRehydratedLocation = true;
+                        if (existingStateFromUrl.filters) {
+                            this.hasRehydratedLocation = true;
+                        }
                         this._rehydrateFromLocation(existingStateFromUrl);
                     }
                 }