Improve rehydration logic, merge state instead of replacing it.

zewish · Nov 16, 2023 · 3d9b0ee · 3d9b0ee · psychedelicious · Nov 17, 2023
1 parent 991ceeb
commit 3d9b0ee
Showing 1 changed file with 10 additions and 7 deletions.
diff --git a/src/rehydrate.ts b/src/rehydrate.ts
@@ -64,19 +64,22 @@ export const rehydrate = async (
     unserialize
   }: RehydrateOptions
 ) => {
-  let state = {};
+  let state = store.getState();
 
   try {
     const load = persistWholeStore
       ? loadAll
       : loadAllKeyed;
 
-    state = await load({
-      rememberedKeys,
-      driver,
-      prefix,
-      unserialize
-    });
+    state = {
+      ...state,
+      ...await load({
+        rememberedKeys,
+        driver,
+        prefix,
+        unserialize
+      })
+    };
   } catch (err) {
     console.warn(
       'redux-remember: rehydrate error',