From 22826414d93d1385e6354d3796766916af56691b Mon Sep 17 00:00:00 2001 From: Kacper Golinski Date: Tue, 17 Feb 2026 19:53:05 +0100 Subject: [PATCH] Fix rehydration race condition that overwrites state changes during async load Move store.getState() after the async driver load in rehydrate() so the snapshot reflects state changes (e.g. RTK Query fulfillments) that occurred while IndexedDB was loading. Also use current reducer state instead of initial state as the merge base in REMEMBER_REHYDRATED handler. --- packages/redux-remember/src/index.ts | 2 +- packages/redux-remember/src/rehydrate.ts | 22 ++++++++++++---------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/packages/redux-remember/src/index.ts b/packages/redux-remember/src/index.ts index 8508b1e..eb27c04 100644 --- a/packages/redux-remember/src/index.ts +++ b/packages/redux-remember/src/index.ts @@ -37,7 +37,7 @@ const rememberReducer = { - let state = store.getState(); + let loadedData: Record = {}; let rehydrated = false; try { @@ -76,15 +76,12 @@ export const rehydrate = async ( ? loadAll : loadAllKeyed; - state = { - ...state, - ...await load({ - rememberedKeys, - driver, - prefix, - unserialize - }) - }; + loadedData = await load({ + rememberedKeys, + driver, + prefix, + unserialize + }); rehydrated = true; } catch (err) { @@ -92,6 +89,11 @@ export const rehydrate = async ( rehydrated = false; } + let state = { + ...store.getState(), + ...loadedData + }; + if (rehydrated) { try { state = await migrate(state);