Merge pull request #1329 from rackt/bind-action-creators-1

Object returned from bindActionCreators() should only include functions

Author: gaearon

src/bindActionCreators.js

@@ -1,5 +1,3 @@
-import mapValues from './utils/mapValues'
-
 function bindActionCreator(actionCreator, dispatch) {
   return (...args) => dispatch(actionCreator(...args))
 }
@@ -30,14 +28,21 @@ export default function bindActionCreators(actionCreators, dispatch) {
     return bindActionCreator(actionCreators, dispatch)
   }
 
-  if (typeof actionCreators !== 'object' || actionCreators === null || actionCreators === undefined) {
+  if (typeof actionCreators !== 'object' || actionCreators === null) {
     throw new Error(
       `bindActionCreators expected an object or a function, instead received ${actionCreators === null ? 'null' : typeof actionCreators}. ` +
       `Did you write "import ActionCreators from" instead of "import * as ActionCreators from"?`
     )
   }
 
-  return mapValues(actionCreators, actionCreator =>
-    bindActionCreator(actionCreator, dispatch)
-  )
+  var keys = Object.keys(actionCreators)
+  var boundActionCreators = {}
+  for (var i = 0; i < keys.length; i++) {
+    var key = keys[i]
+    var actionCreator = actionCreators[key]
+    if (typeof actionCreator === 'function') {
+      boundActionCreators[key] = bindActionCreator(actionCreator, dispatch)
+    }
+  }
+  return boundActionCreators
 }

src/combineReducers.js

@@ -1,7 +1,5 @@
 import { ActionTypes } from './createStore'
 import isPlainObject from './utils/isPlainObject'
-import mapValues from './utils/mapValues'
-import pick from './utils/pick'
 import warning from './utils/warning'
 
 function getUndefinedStateErrorMessage(key, action) {
@@ -92,11 +90,18 @@ function assertReducerSanity(reducers) {
  * @returns {Function} A reducer function that invokes every reducer inside the
  * passed object, and builds a state object with the same shape.
  */
-
 export default function combineReducers(reducers) {
-  var finalReducers = pick(reducers, (val) => typeof val === 'function')
-  var sanityError
+  var reducerKeys = Object.keys(reducers)
+  var finalReducers = {}
+  for (var i = 0; i < reducerKeys.length; i++) {
+    var key = reducerKeys[i]
+    if (typeof reducers[key] === 'function') {
+      finalReducers[key] = reducers[key]
+    }
+  }
+  var finalReducerKeys = Object.keys(finalReducers)
 
+  var sanityError
   try {
     assertReducerSanity(finalReducers)
   } catch (e) {
@@ -116,17 +121,19 @@ export default function combineReducers(reducers) {
     }
 
     var hasChanged = false
-    var finalState = mapValues(finalReducers, (reducer, key) => {
+    var nextState = {}
+    for (var i = 0; i < finalReducerKeys.length; i++) {
+      var key = finalReducerKeys[i]
+      var reducer = finalReducers[key]
       var previousStateForKey = state[key]
       var nextStateForKey = reducer(previousStateForKey, action)
       if (typeof nextStateForKey === 'undefined') {
         var errorMessage = getUndefinedStateErrorMessage(key, action)
         throw new Error(errorMessage)
       }
+      nextState[key] = nextStateForKey
       hasChanged = hasChanged || nextStateForKey !== previousStateForKey
-      return nextStateForKey
-    })
-
-    return hasChanged ? finalState : state
+    }
+    return hasChanged ? nextState : state
   }
 }

src/utils/mapValues.js

@@ -5,17 +5,24 @@ import * as actionCreators from './helpers/actionCreators'
 
 describe('bindActionCreators', () => {
   let store
+  let actionCreatorFunctions
 
   beforeEach(() => {
     store = createStore(todos)
+    actionCreatorFunctions = { ...actionCreators }
+    Object.keys(actionCreatorFunctions).forEach(key => {
+      if (typeof actionCreatorFunctions[key] !== 'function') {
+        delete actionCreatorFunctions[key]
+      }
+    })
   })
 
   it('wraps the action creators with the dispatch function', () => {
     const boundActionCreators = bindActionCreators(actionCreators, store.dispatch)
     expect(
       Object.keys(boundActionCreators)
     ).toEqual(
-      Object.keys(actionCreators)
+      Object.keys(actionCreatorFunctions)
     )
 
     const action = boundActionCreators.addTodo('Hello')
@@ -27,6 +34,22 @@ describe('bindActionCreators', () => {
     ])
   })
 
+  it('skips non-function values in the passed object', () => {
+    const boundActionCreators = bindActionCreators({
+      ...actionCreators,
+      foo: 42,
+      bar: 'baz',
+      wow: undefined,
+      much: {},
+      test: null
+    }, store.dispatch)
+    expect(
+      Object.keys(boundActionCreators)
+    ).toEqual(
+      Object.keys(actionCreatorFunctions)
+    )
+  })
+
   it('supports wrapping a single function only', () => {
     const actionCreator = actionCreators.addTodo
     const boundActionCreator = bindActionCreators(actionCreator, store.dispatch)