1.1.0: pass initialState to reducer (#2)

omnidan · Feb 20, 2016 · 14673c0 · 14673c0
1 parent 1028d85
commit 14673c0
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "redux-recycle",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "description": "higher-order reducer to reset the redux state on certain actions",
   "main": "lib/index.js",
   "scripts": {

diff --git a/src/index.js b/src/index.js
@@ -2,10 +2,7 @@
 export default function recycleState (reducer, actions = [], initialState) {
   return (state, action) => {
     if (actions.indexOf(action.type) >= 0) {
-      if (initialState === undefined) {
-        return reducer(undefined, { type: '@@redux-recycle/INIT' })
-      }
-      return initialState
+      return reducer(initialState, { type: '@@redux-recycle/INIT' })
     }
     return reducer(state, action)
   }

diff --git a/test/index.spec.js b/test/index.spec.js
@@ -19,7 +19,7 @@ describe('recycleState', () => {
 
   it('custom initial state', () => {
     let recycleableReducer = recycleState(reducer, ['RECYCLE'], 'CUSTOM_INITIAL_STATE')
-    expect(recycleableReducer('A', { type: 'RECYCLE' })).to.deep.equal('CUSTOM_INITIAL_STATE')
+    expect(recycleableReducer('A', { type: 'RECYCLE' })).to.deep.equal({ state: 'CUSTOM_INITIAL_STATE', type: '@@redux-recycle/INIT' })
   })
 
   it('a non-recycle action', () => {