Unsubscribe only if there is a subscription. Fixes #28

Author: gaearon

Diff for: src/components/createConnect.js

@@ -54,7 +54,7 @@ export default function createConnect(React) {
 
       shouldComponentUpdate(nextProps, nextState) {
         return (
-          this.subscribed &&
+          this.isSubscribed() &&
           !areStatePropsEqual(this.state.stateProps, nextState.stateProps)
         ) || !shallowEqualScalar(this.props, nextProps);
       }
@@ -68,15 +68,18 @@ export default function createConnect(React) {
         };
       }
 
+      isSubscribed() {
+        return typeof this.unsubscribe === 'function';
+      }
+
       componentDidMount() {
         if (shouldSubscribe) {
-          this.subscribed = true;
           this.unsubscribe = this.context.store.subscribe(::this.handleChange);
         }
       }
 
       componentWillUnmount() {
-        if (shouldSubscribe) {
+        if (this.isSubscribed()) {
           this.unsubscribe();
         }
       }

Diff for: test/components/connect.spec.js

@@ -241,7 +241,7 @@ describe('React', () => {
         TestUtils.findRenderedComponentWithType(container, Container)
       ).toNotThrow();
       const decorated = TestUtils.findRenderedComponentWithType(container, Container);
-      expect(decorated.subscribed).toBe(true);
+      expect(decorated.isSubscribed()).toBe(true);
     });
 
     it('should not subscribe to stores if mapState argument is falsy', () => {
@@ -268,7 +268,7 @@ describe('React', () => {
         TestUtils.findRenderedComponentWithType(container, Container)
       ).toNotThrow();
       const decorated = TestUtils.findRenderedComponentWithType(container, Container);
-      expect(decorated.subscribed).toNotBe(true);
+      expect(decorated.isSubscribed()).toNotBe(true);
     });
 
     it('should unsubscribe before unmounting', () => {