Allow connectToStores use without static methods

Author: goatslacker

src/utils/connectToStores.js

@@ -46,28 +46,27 @@
 import React from 'react'
 import { assign, isFunction } from './functions'
 
-function connectToStores(Component) {
+function connectToStores(Spec, Component = Spec) {
   // Check for required static methods.
-  if (!isFunction(Component.getStores)) {
+  if (!isFunction(Spec.getStores)) {
     throw new Error('connectToStores() expects the wrapped component to have a static getStores() method')
   }
-  if (!isFunction(Component.getPropsFromStores)) {
+  if (!isFunction(Spec.getPropsFromStores)) {
     throw new Error('connectToStores() expects the wrapped component to have a static getPropsFromStores() method')
   }
 
-  // Wrapper Component.
   const StoreConnection = React.createClass({
     getInitialState() {
-      return Component.getPropsFromStores(this.props, this.context)
+      return Spec.getPropsFromStores(this.props, this.context)
     },
 
     componentDidMount() {
-      const stores = Component.getStores(this.props, this.context)
+      const stores = Spec.getStores(this.props, this.context)
       this.storeListeners = stores.map((store) => {
         return store.listen(this.onChange)
       })
-      if (Component.componentDidConnect) {
-        Component.componentDidConnect(this.props, this.context)
+      if (Spec.componentDidConnect) {
+        Spec.componentDidConnect(this.props, this.context)
       }
     },
 
@@ -76,7 +75,7 @@ function connectToStores(Component) {
     },
 
     onChange() {
-      this.setState(Component.getPropsFromStores(this.props, this.context))
+      this.setState(Spec.getPropsFromStores(this.props, this.context))
     },
 
     render() {

test/connect-to-stores-test.js

@@ -132,18 +132,19 @@ export default {
 
     'ES6 class component responds to store events'() {
       class ClassComponent extends React.Component {
-        static getStores() {
-          return [testStore]
-        }
-        static getPropsFromStores(props) {
-          return testStore.getState()
-        }
         render() {
           return <span foo={this.props.foo} />
         }
       }
 
-      const WrappedComponent = connectToStores(ClassComponent)
+      const WrappedComponent = connectToStores({
+        getStores() {
+          return [testStore]
+        },
+        getPropsFromStores(props) {
+          return testStore.getState()
+        }
+      }, ClassComponent)
 
       const node = TestUtils.renderIntoDocument(
         <WrappedComponent />
@@ -159,25 +160,27 @@ export default {
     'componentDidConnect hook is called '() {
       let componentDidConnect = false
       class ClassComponent extends React.Component {
-        static getStores() {
-          return [testStore]
-        }
-        static getPropsFromStores(props) {
-          return testStore.getState()
-        }
-        static componentDidConnect() {
-          componentDidConnect = true
-        }
         render() {
           return <span foo={this.props.foo} />
         }
       }
-      const WrappedComponent = connectToStores(ClassComponent)
+      const WrappedComponent = connectToStores({
+        getStores() {
+          return [testStore]
+        },
+        getPropsFromStores(props) {
+          return testStore.getState()
+        },
+        componentDidConnect() {
+          componentDidConnect = true
+        }
+      }, ClassComponent)
       const node = TestUtils.renderIntoDocument(
         <WrappedComponent />
       )
       assert(componentDidConnect === true)
     },
+
     'Component receives all updates'(done) {
       let componentDidConnect = false
       class ClassComponent extends React.Component {