merging master

Author: gnoff

src/components/createAll.js

@@ -1,19 +1,15 @@
 import createProvider from './createProvider';
 import createProvideDecorator from './createProvideDecorator';
 
-import createConnector from './createConnector';
-import createConnectDecoratorDeprecated from './createConnectDecoratorDeprecated';
 import createConnectDecorator from './createConnectDecorator';
 
 export default function createAll(React) {
   // Wrapper components
   const Provider = createProvider(React);
-  const Connector = createConnector(React);
 
   // Higher-order components (decorators)
   const provide = createProvideDecorator(React, Provider);
-  const connectDeprecated = createConnectDecoratorDeprecated(React, Connector);
   const connect = createConnectDecorator(React);
 
-  return { Provider, Connector, provide, connect, connectDeprecated };
+  return { Provider, provide, connect };
 }

src/components/createConnectDecorator.js

@@ -10,7 +10,7 @@ const emptySelector = () => ({});
 
 const emptyBinder = () => ({});
 
-const identityMerge = (slice, actionsCreators, props) => ({...slice, ...actionsCreators, ...props});
+const identityMerge = (slice, actionsCreators, props) => ({ ...props, ...slice, ...actionsCreators});
 
 
 export default function createConnectDecorator(React) {
@@ -119,7 +119,7 @@ export default function createConnectDecorator(React) {
       }
 
       render() {
-        return <DecoratedComponent ref={component => (this.underlyingRef = component)} {...this.props} {...this.merge()} />;
+        return <DecoratedComponent ref={component => (this.underlyingRef = component)} {...this.merge()} />;
       }
     };
   };