Revert deprecation in favor of real PR

Author: gaearon

src/components/createAll.js

@@ -1,12 +1,17 @@
 import createProvider from './createProvider';
+import createProvideDecorator from './createProvideDecorator';
 
 import createConnector from './createConnector';
 import createConnectDecorator from './createConnectDecorator';
 
 export default function createAll(React) {
+  // Wrapper components
   const Provider = createProvider(React);
-  const connect = createConnectDecorator(React, createConnector(React));
+  const Connector = createConnector(React);
 
-  // provider and Connector are deprecated and removed from public API
-  return { Provider, connect };
+  // Higher-order components (decorators)
+  const provide = createProvideDecorator(React, Provider);
+  const connect = createConnectDecorator(React, Connector);
+
+  return { Provider, Connector, provide, connect };
 }

src/components/createConnector.js

@@ -3,7 +3,6 @@ import shallowEqual from '../utils/shallowEqual';
 import isPlainObject from '../utils/isPlainObject';
 import invariant from 'invariant';
 
-// Connector is deprecated and removed from public API
 export default function createConnector(React) {
   const { Component, PropTypes } = React;
   const storeShape = createStoreShape(PropTypes);

src/components/createProvideDecorator.js

@@ -0,0 +1,20 @@
+import getDisplayName from '../utils/getDisplayName';
+
+export default function createProvideDecorator(React, Provider) {
+  const { Component } = React;
+
+  return function provide(store) {
+    return DecoratedComponent => class ProviderDecorator extends Component {
+      static displayName = `Provider(${getDisplayName(DecoratedComponent)})`;
+      static DecoratedComponent = DecoratedComponent;
+
+      render() {
+        return (
+          <Provider store={store}>
+            {() => <DecoratedComponent {...this.props} />}
+          </Provider>
+        );
+      }
+    };
+  };
+}

src/index.js

@@ -1,5 +1,4 @@
 import React from 'react';
 import createAll from './components/createAll';
 
-// provide and Connector are deprecated and removed from public API
-export const { Provider, connect } = createAll(React);
+export const { Provider, Connector, provide, connect } = createAll(React);

src/native.js

@@ -1,5 +1,4 @@
 import React from 'react-native';
 import createAll from './components/createAll';
 
-// provide and Connector are deprecated and removed from public API
-export const { Provider, connect } = createAll(React);
+export const { Provider, Connector, provide, connect } = createAll(React);

test/components/Connector.spec.js

@@ -2,9 +2,8 @@ import expect from 'expect';
 import jsdomReact from './jsdomReact';
 import React, { PropTypes, Component } from 'react/addons';
 import { createStore } from 'redux';
-import createConnector from '../../src/components/createConnector';
+import { Connector } from '../../src/index';
 
-const Connector = createConnector(React);
 const { TestUtils } = React.addons;
 
 describe('React', () => {

test/components/connect.spec.js

@@ -2,7 +2,7 @@ import expect from 'expect';
 import jsdomReact from './jsdomReact';
 import React, { PropTypes, Component } from 'react/addons';
 import { createStore } from 'redux';
-import { connect } from '../../src/index';
+import { connect, Connector } from '../../src/index';
 
 const { TestUtils } = React.addons;
 
@@ -45,11 +45,9 @@ describe('React', () => {
       const div = TestUtils.findRenderedDOMComponentWithTag(container, 'div');
       expect(div.props.pass).toEqual('through');
       expect(div.props.foo).toEqual('bar');
-
-      // Connector is deprecated and removed from public API
-      // expect(() =>
-      //   TestUtils.findRenderedComponentWithType(container, Connector)
-      // ).toNotThrow();
+      expect(() =>
+        TestUtils.findRenderedComponentWithType(container, Connector)
+      ).toNotThrow();
     });
 
     it('should handle additional prop changes in addition to slice', () => {
@@ -120,15 +118,13 @@ describe('React', () => {
           {() => <Container pass='through' />}
         </Provider>
       );
-
-      // Connector is deprecated and removed from public API
-      // const connector = TestUtils.findRenderedComponentWithType(container, Connector);
-      // expect(connector.props.select({
-      //   foo: 5,
-      //   bar: 7
-      // })).toEqual({
-      //   foo: 5
-      // });
+      const connector = TestUtils.findRenderedComponentWithType(container, Connector);
+      expect(connector.props.select({
+        foo: 5,
+        bar: 7
+      })).toEqual({
+        foo: 5
+      });
     });
 
     it('should set the displayName correctly', () => {

test/components/provide.spec.js

@@ -0,0 +1,68 @@
+import expect from 'expect';
+import jsdomReact from './jsdomReact';
+import React, { PropTypes, Component } from 'react/addons';
+import { createStore } from 'redux';
+import { provide, Provider } from '../../src/index';
+
+const { TestUtils } = React.addons;
+
+describe('React', () => {
+  describe('provide', () => {
+    jsdomReact();
+
+    class Child extends Component {
+      static contextTypes = {
+        store: PropTypes.object.isRequired
+      }
+
+      render() {
+        return <div />;
+      }
+    }
+
+    it('should wrap the component into Provider', () => {
+      const store = createStore({});
+
+      @provide(store)
+      class Container extends Component {
+        render() {
+          return <Child {...this.props} />;
+        }
+      }
+
+      const container = TestUtils.renderIntoDocument(
+        <Container pass='through' />
+      );
+      const child = TestUtils.findRenderedComponentWithType(container, Child);
+      expect(child.props.pass).toEqual('through');
+      expect(() =>
+        TestUtils.findRenderedComponentWithType(container, Provider)
+      ).toNotThrow();
+      expect(child.context.store).toBe(store);
+    });
+
+    it('sets the displayName correctly', () => {
+      @provide(createStore({}))
+      class Container extends Component {
+        render() {
+          return <div />;
+        }
+      }
+
+      expect(Container.displayName).toBe('Provider(Container)');
+    });
+
+    it('should expose the wrapped component as DecoratedComponent', () => {
+      class Container extends Component {
+        render() {
+          return <div />;
+        }
+      }
+
+      const decorator = provide(state => state);
+      const decorated = decorator(Container);
+
+      expect(decorated.DecoratedComponent).toBe(Container);
+    });
+  });
+});