Fixed props merging for new names

Author: DeyLak

lib/connect.js

@@ -40,15 +40,10 @@ function getActions(component, mapActionsToProps) {
 function getProps(component) {
   var props = {};
   var attrs = getAttrs(component);
-  var stateNames = component.vuaReduxStateNames;
-  var actionNames = component.vuaReduxActionNames;
+  var propNames = component.vuaReduxPropNames;
 
-  for (var ii = 0; ii < stateNames.length; ii++) {
-    props[stateNames[ii]] = component[stateNames[ii]];
-  }
-
-  for (var _ii = 0; _ii < actionNames.length; _ii++) {
-    props[actionNames[_ii]] = component[actionNames[_ii]];
+  for (var ii = 0; ii < propNames.length; ii++) {
+    props[propNames[ii]] = component[propNames[ii]];
   }
 
   return _extends({}, props, attrs);
@@ -97,12 +92,11 @@ function connect(mapStateToProps, mapActionsToProps, mergeProps) {
       data: function data() {
         var state = getStates(this, mapStateToProps);
         var actions = getActions(this, mapActionsToProps);
-        var stateNames = Object.keys(state);
-        var actionNames = Object.keys(actions);
+        var merged = mergeProps(state, actions);
+        var propNames = Object.keys(merged);
 
         return _extends({}, mergeProps(state, actions), {
-          vuaReduxStateNames: stateNames,
-          vuaReduxActionNames: actionNames
+          vuaReduxPropNames: propNames
         });
       },
       created: function created() {
@@ -112,11 +106,13 @@ function connect(mapStateToProps, mapActionsToProps, mergeProps) {
 
         this.vuaReduxUnsubscribe = store.subscribe(function () {
           var state = getStates(_this, mapStateToProps);
-          var stateNames = Object.keys(state);
-          _this.vuaReduxStateNames = stateNames;
+          var actions = getActions(_this, mapActionsToProps);
+          var merged = mergeProps(state, actions);
+          var propNames = Object.keys(merged);
+          _this.vuaReduxPropNames = propNames;
 
-          for (var ii = 0; ii < stateNames.length; ii++) {
-            _this[stateNames[ii]] = state[stateNames[ii]];
+          for (var ii = 0; ii < propNames.length; ii++) {
+            _this[propNames[ii]] = state[propNames[ii]];
           }
         });
       },

src/connect.js

@@ -27,15 +27,10 @@ function getActions(component, mapActionsToProps) {
 function getProps(component) {
   let props = {};
   const attrs = getAttrs(component);
-  const stateNames = component.vuaReduxStateNames;
-  const actionNames = component.vuaReduxActionNames;
+  const propNames = component.vuaReduxPropNames;
 
-  for (let ii = 0; ii < stateNames.length; ii++) {
-    props[stateNames[ii]] = component[stateNames[ii]];
-  }
-
-  for (let ii = 0; ii < actionNames.length; ii++) {
-    props[actionNames[ii]] = component[actionNames[ii]];
+  for (let ii = 0; ii < propNames.length; ii++) {
+    props[propNames[ii]] = component[propNames[ii]];
   }
 
   return {
@@ -95,13 +90,12 @@ export default function connect(mapStateToProps, mapActionsToProps, mergeProps)
       data() {
         const state = getStates(this, mapStateToProps);
         const actions = getActions(this, mapActionsToProps);
-        const stateNames = Object.keys(state);
-        const actionNames = Object.keys(actions);
+        const merged = mergeProps(state, actions);
+        const propNames = Object.keys(merged);
 
         return {
           ...mergeProps(state, actions),
-          vuaReduxStateNames: stateNames,
-          vuaReduxActionNames: actionNames
+          vuaReduxPropNames: propNames,
         };
       },
 
@@ -110,11 +104,13 @@ export default function connect(mapStateToProps, mapActionsToProps, mergeProps)
 
         this.vuaReduxUnsubscribe = store.subscribe(() => {
           const state = getStates(this, mapStateToProps);
-          const stateNames = Object.keys(state);
-          this.vuaReduxStateNames = stateNames;
+          const actions = getActions(this, mapActionsToProps);
+          const merged = mergeProps(state, actions);
+          const propNames = Object.keys(merged);
+          this.vuaReduxPropNames = propNames;
 
-          for (let ii = 0; ii < stateNames.length; ii++) {
-            this[stateNames[ii]] = state[stateNames[ii]];
+          for (let ii = 0; ii < propNames.length; ii++) {
+            this[propNames[ii]] = state[propNames[ii]];
           }
         });
       },