Rename DecoratedComponent => WrappedComponent, getUnderlyingRef() => …

…getWrappedInstance()
reduxjs · Aug 9, 2015 · b7ef178 · b7ef178
1 parent 6178a0a
commit b7ef178
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 17 deletions.
diff --git a/src/components/createConnect.js b/src/components/createConnect.js
@@ -66,10 +66,10 @@ export default function createConnect(React) {
       return mergedProps;
     }
 
-    return function wrapWithConnect(DecoratedComponent) {
+    return function wrapWithConnect(WrappedComponent) {
       class Connect extends Component {
-        static displayName = `Connect(${getDisplayName(DecoratedComponent)})`;
-        static DecoratedComponent = DecoratedComponent;
+        static displayName = `Connect(${getDisplayName(WrappedComponent)})`;
+        static WrappedComponent = WrappedComponent;
 
         static contextTypes = {
           store: storeShape.isRequired
@@ -82,8 +82,6 @@ export default function createConnect(React) {
         constructor(props, context) {
           super(props, context);
           this.version = version;
-          this.setUnderlyingRef = ::this.setUnderlyingRef;
-
           this.stateProps = computeStateProps(context);
           this.dispatchProps = computeDispatchProps(context);
           this.state = this.computeNextState();
@@ -179,18 +177,14 @@ export default function createConnect(React) {
           }
         }
 
-        getUnderlyingRef() {
-          return this.underlyingRef;
-        }
-
-        setUnderlyingRef(instance) {
-          this.underlyingRef = instance;
+        getWrappedInstance() {
+          return this.refs.wrappedInstance;
         }
 
         render() {
           return (
-            <DecoratedComponent ref={this.setUnderlyingRef}
-                                {...this.state} />
+            <WrappedComponent ref='wrappedInstance'
+                              {...this.state} />
           );
         }
       }

diff --git a/test/components/connect.spec.js b/test/components/connect.spec.js
@@ -285,7 +285,7 @@ describe('React', () => {
       expect(div.props.stateThing).toBe('HELLO azbzcZ');
     });
 
-    it('should merge actionProps into DecoratedComponent', () => {
+    it('should merge actionProps into WrappedComponent', () => {
       const store = createStore(() => ({
         foo: 'bar'
       }));
@@ -700,7 +700,7 @@ describe('React', () => {
       ).displayName).toBe('Connect(Component)');
     });
 
-    it('should expose the wrapped component as DecoratedComponent', () => {
+    it('should expose the wrapped component as WrappedComponent', () => {
       class Container extends Component {
         render() {
           return <div />;
@@ -710,7 +710,7 @@ describe('React', () => {
       const decorator = connect(state => state);
       const decorated = decorator(Container);
 
-      expect(decorated.DecoratedComponent).toBe(Container);
+      expect(decorated.WrappedComponent).toBe(Container);
     });
 
     it('should return the instance of the wrapped component for use in calling child methods', () => {
@@ -744,7 +744,8 @@ describe('React', () => {
       const decorated = TestUtils.findRenderedComponentWithType(tree, Decorated);
 
       expect(() => decorated.someInstanceMethod()).toThrow();
-      expect(decorated.getUnderlyingRef().someInstanceMethod()).toBe(someData);
+      expect(decorated.getWrappedInstance().someInstanceMethod()).toBe(someData);
+      expect(decorated.refs.wrappedInstance.someInstanceMethod()).toBe(someData);
     });
   });
 });