Merge branch 'moduv5-improve-mapDispatchToProps'

Author: bartonhammond

package.json

@@ -1,6 +1,6 @@
 {
   "name": "snowflake",
-  "version": "0.1.6",
+  "version": "0.1.7",
   "private": true,
   "jest": {
     "preset": "jest-react-native",

src/components/LoginRender.js

@@ -102,20 +102,10 @@ var styles = StyleSheet.create({
 /**
  * ## Redux boilerplate
  */
-const actions = [
-  authActions,
-  globalActions
-];
 
 function mapDispatchToProps(dispatch) {
-  const creators = Map()
-          .merge(...actions)
-          .filter(value => typeof value === 'function')
-          .toObject();
-
   return {
-    actions: bindActionCreators(creators, dispatch),
-    dispatch
+    actions: bindActionCreators({ ...authActions, ...globalActions }, dispatch),
   };
 }
 /**

src/containers/App.js

@@ -44,16 +44,6 @@ from 'react-native';
  */
 import Header from '../components/Header';
 
-/**
- * ## Actions
- * 3 of our actions will be available as ```actions```
- */
-const actions = [
-  authActions,
-  deviceActions,
-  globalActions
-];
-
 /**
  *  Save that state
  */
@@ -73,19 +63,11 @@ function mapStateToProps(state) {
 };
 
 /**
- * Bind all the functions from the ```actions``` and bind them with
- * ```dispatch```
+ * Bind all the actions from authActions, deviceActions and globalActions
  */
 function mapDispatchToProps(dispatch) {
-
-  const creators = Map()
-          .merge(...actions)
-          .filter(value => typeof value === 'function')
-          .toObject();
-
   return {
-    actions: bindActionCreators(creators, dispatch),
-    dispatch
+    actions: bindActionCreators({ ...authActions, ...deviceActions, ...globalActions }, dispatch),
   };
 }
 

src/containers/ForgotPassword.js

@@ -40,9 +40,6 @@ const {
 /**
   * ## Redux boilerplate
   */
-const actions = [
-  authActions
-];
 
 function mapStateToProps(state) {
   return {
@@ -52,14 +49,8 @@ function mapStateToProps(state) {
 }
 
 function mapDispatchToProps(dispatch) {
-  const creators = Map()
-          .merge(...actions)
-          .filter(value => typeof value === 'function')
-          .toObject();
-
   return {
-    actions: bindActionCreators(creators, dispatch),
-    dispatch
+    actions: bindActionCreators(authActions, dispatch),
   };
 }
 

src/containers/Login.js

@@ -54,14 +54,8 @@ function mapStateToProps(state) {
 }
 
 function mapDispatchToProps(dispatch) {
-  const creators = Map()
-          .merge(...actions)
-          .filter(value => typeof value === 'function')
-          .toObject();
-
   return {
-    actions: bindActionCreators(creators, dispatch),
-    dispatch
+    actions: bindActionCreators(authActions, dispatch),
   };
 }
 

src/containers/Logout.js

@@ -57,10 +57,6 @@ var styles = StyleSheet.create({
 /**
  * ## Redux boilerplate
  */
-const actions = [
-  authActions,
-  globalActions
-];
 
 function mapStateToProps(state) {
     return {
@@ -78,14 +74,8 @@ function mapStateToProps(state) {
 };
 
 function mapDispatchToProps(dispatch) {
-  const creators = Map()
-          .merge(...actions)
-          .filter(value => typeof value === 'function')
-          .toObject();
-
   return {
-    actions: bindActionCreators(creators, dispatch),
-    dispatch
+    actions: bindActionCreators({ ...authActions, ...globalActions }, dispatch),
   };
 }
 /**

src/containers/Main.js

@@ -49,16 +49,6 @@ from 'react-native';
  */
 const  Button = require('apsl-react-native-button');
 
-
-/**
- * Support for Hot reload
- *
- */
-const actions = [
-  authActions,
-  globalActions
-];
-
 /**
  *  Instead of including all app states via ...state
  *  One could explicitly enumerate only those which Main.js will depend on.
@@ -79,20 +69,11 @@ function mapStateToProps(state) {
 };
 
 /*
- * Bind all the functions from the ```actions``` and bind them with
- * ```dispatch```
-
+ * Bind all the actions
  */
 function mapDispatchToProps(dispatch) {
-
-  const creators = Map()
-          .merge(...actions)
-          .filter(value => typeof value === 'function')
-          .toObject();
-
   return {
-    actions: bindActionCreators(creators, dispatch),
-    dispatch
+    actions: bindActionCreators({ ...authActions, ...globalActions }, dispatch),
   };
 }
 

src/containers/Profile.js

@@ -81,10 +81,6 @@ var styles = StyleSheet.create({
 /**
 * ## Redux boilerplate
 */
-const actions = [
-  profileActions,
-  globalActions
-];
 
 function mapStateToProps(state) {
     return {
@@ -98,14 +94,8 @@ function mapStateToProps(state) {
 }
 
 function mapDispatchToProps(dispatch) {
-  const creators = Map()
-          .merge(...actions)
-          .filter(value => typeof value === 'function')
-          .toObject();
-
   return {
-    actions: bindActionCreators(creators, dispatch),
-    dispatch
+    actions: bindActionCreators({ ...profileActions, ...globalActions }, dispatch),
   };
 }
 /**

src/containers/Register.js

@@ -41,9 +41,6 @@ const {
 /**
  * ## Redux boilerplate
  */
-const actions = [
-  authActions
-];
 
 function mapStateToProps(state) {
   return {
@@ -53,14 +50,8 @@ function mapStateToProps(state) {
 }
 
 function mapDispatchToProps(dispatch) {
-  const creators = Map()
-          .merge(...actions)
-          .filter(value => typeof value === 'function')
-          .toObject();
-
   return {
-    actions: bindActionCreators(creators, dispatch),
-    dispatch
+    actions: bindActionCreators(authActions, dispatch),
   };
 }
 

src/containers/Subview.js

@@ -49,9 +49,6 @@ import * as deviceActions from '../reducers/device/deviceActions';
 /**
 * ## Redux boilerplate
 */
-const actions = [
-  deviceActions
-];
 
 /**
  *  Instead of including all app states via ...state
@@ -65,20 +62,11 @@ function mapStateToProps(state) {
 };
 
 /*
- * Bind all the functions from the ```actions``` and bind them with
- * ```dispatch```
-
+ * Bind all the actions in deviceActions
  */
 function mapDispatchToProps(dispatch) {
-
-  const creators = Map()
-          .merge(...actions)
-          .filter(value => typeof value === 'function')
-          .toObject();
-
   return {
-    actions: bindActionCreators(creators, dispatch),
-    dispatch
+    actions: bindActionCreators(deviceActions, dispatch),
   };
 }