Fixed buf and updated docs

DeyLak · DeyLak · commit 97436ce01835 · 2017-11-11T04:03:42.000+03:00
diff --git a/README.md b/README.md
@@ -105,14 +105,7 @@ function mapActionToProps(dispatch) {
 	};
 }
 
-function mergeProps(stateProps, actionsProps) {
-  return {
-    ...stateProps,
-    ...actionsProps,
-  };
-}
-
-export default connect(mapStateToProps, mapActionToProps, mergeProps)(App);
+export default connect(mapStateToProps, mapActionToProps)(App);
 
 ```
 
@@ -148,3 +141,10 @@ const mapDispatchToProps = (dispatch) => ({})
 
 export default connect(mapStateToProps, mapDispatchToProps)(Comp)
 ```
+
+## connect([mapStateToProps], [mapDispatchToProps], [mergeProps])
+Connects a Vue component to a Redux store.
+### Arguments
+* [mapStateToProps(state, [ownAttrs]): stateProps] (__Function__) Subscribes component to Redux store updates. This means that any time the store is updated, mapStateToProps will be called. The results of `mapStateToProps` must be a plain object, which will be merged into the component’s props.
+* [mapDispatchToProps(dispatch): dispatchProps] (__Function__) Result must be a plain object
+* [mergeProps(stateProps, dispatchProps): props] (__Function__) If specified, it is passed the result of `mapStateToProps()` and `mapDispatchToProps()`. The plain object you return from it will be passed as props to the wrapped component.
diff --git a/lib/connect.js b/lib/connect.js
@@ -92,7 +92,7 @@ function connect(mapStateToProps, mapActionsToProps, mergeProps) {
       data: function data() {
         var state = getStates(this, mapStateToProps);
         var actions = getActions(this, mapActionsToProps);
-        var merged = mergeProps(state, actions);
+        var merged = mergeProps(state, actions, {});
         var propNames = Object.keys(merged);
 
         return _extends({}, mergeProps(state, actions), {
@@ -107,12 +107,12 @@ function connect(mapStateToProps, mapActionsToProps, mergeProps) {
         this.vuaReduxUnsubscribe = store.subscribe(function () {
           var state = getStates(_this, mapStateToProps);
           var actions = getActions(_this, mapActionsToProps);
-          var merged = mergeProps(state, actions);
+          var merged = mergeProps(state, actions, getAttrs(_this));
           var propNames = Object.keys(merged);
           _this.vuaReduxPropNames = propNames;
 
           for (var ii = 0; ii < propNames.length; ii++) {
-            _this[propNames[ii]] = state[propNames[ii]];
+            _this[propNames[ii]] = merged[propNames[ii]];
           }
         });
       },
diff --git a/src/connect.js b/src/connect.js
@@ -90,7 +90,7 @@ export default function connect(mapStateToProps, mapActionsToProps, mergeProps)
       data() {
         const state = getStates(this, mapStateToProps);
         const actions = getActions(this, mapActionsToProps);
-        const merged = mergeProps(state, actions);
+        const merged = mergeProps(state, actions, {});
         const propNames = Object.keys(merged);
 
         return {
@@ -110,7 +110,7 @@ export default function connect(mapStateToProps, mapActionsToProps, mergeProps)
           this.vuaReduxPropNames = propNames;
 
           for (let ii = 0; ii < propNames.length; ii++) {
-            this[propNames[ii]] = state[propNames[ii]];
+            this[propNames[ii]] = merged[propNames[ii]];
           }
         });
       },
