Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/redux-remember/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ const rememberReducer = <S = any, A extends Action = UnknownAction, PreloadedSta
switch (action.type) {
case REMEMBER_REHYDRATED: {
const rehydratedState = {
...data.state,

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm 99% sure this one is something we don't want to do, since it would break the loading of the initial reducer values.

...state,
...(action?.payload || {})
};

Expand Down
22 changes: 12 additions & 10 deletions packages/redux-remember/src/rehydrate.ts
Original file line number Diff line number Diff line change
Expand Up @@ -68,30 +68,32 @@ export const rehydrate = async (
migrate
}: RehydrateOptions
) => {
let state = store.getState();
let loadedData: Record<string, any> = {};
let rehydrated = false;

try {
const load = persistWholeStore
? loadAll
: loadAllKeyed;

state = {
...state,
...await load({
rememberedKeys,
driver,
prefix,
unserialize
})
};
loadedData = await load({
rememberedKeys,
driver,
prefix,
unserialize
});

rehydrated = true;
} catch (err) {
errorHandler(new RehydrateError(err));
rehydrated = false;
}

let state = {
...store.getState(),
...loadedData
};

if (rehydrated) {
try {
state = await migrate(state);
Expand Down