Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

(persistReducer): update persistoid on rehydrate #688

Merged
merged 2 commits into from
Feb 1, 2018
Merged

(persistReducer): update persistoid on rehydrate #688

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
33b9978
(persistReducer): update persistoid on rehydrate
rt2zz Feb 1, 2018
0a591fe
Update persistReducer.js
rt2zz Feb 1, 2018
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
16 changes: 10 additions & 6 deletions src/persistReducer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,13 @@ export default function persistReducer<State: Object, Action: Object>(
let _persistoid = null
let _purge = false
let _paused = true
const conditionalUpdate = state => {
state._persist.rehydrated &&
_persistoid &&
!_paused &&
_persistoid.update(state)
return state
}

return (state: State, action: Action) => {
let { _persist, ...rest } = state || {}
Expand Down Expand Up @@ -129,10 +136,11 @@ export default function persistReducer<State: Object, Action: Object>(
? stateReconciler(inboundState, state, reducedState, config)
: reducedState

return {
let newState = {
...reconciledRest,
_persist: { ..._persist, rehydrated: true },
}
return conditionalUpdate(newState)
}
}

Expand All @@ -146,10 +154,6 @@ export default function persistReducer<State: Object, Action: Object>(
_persist,
}
// update the persistoid only if we are already rehydrated and are not paused
_persist.rehydrated &&
_persistoid &&
!_paused &&
_persistoid.update(newState)
return newState
return conditionalUpdate(newState)
}
}