copy child context types in storeconnection

goatslacker · Aug 21, 2015 · 74f033a · 74f033a
1 parent 9f66b24
commit 74f033a
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 0 deletions.
diff --git a/src/utils/connectToStores.js b/src/utils/connectToStores.js
@@ -89,6 +89,9 @@ function connectToStores(Spec, Component = Spec) {
       )
     }
   })
+  if (Component.contextTypes) {
+    StoreConnection.contextTypes = Component.contextTypes
+  }
 
   return StoreConnection
 }

diff --git a/test/connect-to-stores-test.js b/test/connect-to-stores-test.js
@@ -152,6 +152,40 @@ export default {
       assert.include(output, 'Foo: Bar')
     },
 
+    'component statics can see context properties'() {
+      const Child = connectToStores(React.createClass({
+        statics: {
+          getStores(props, context) {
+            return [context.store]
+          },
+          getPropsFromStores(props, context) {
+            return context.store.getState()
+          }
+        },
+        contextTypes: {
+          store: React.PropTypes.object
+        },
+        render() {
+          return <span>Foo: {this.props.foo}</span>
+        }
+      }))
+
+      const ContextComponent = React.createClass({
+        getChildContext() {
+          return { store: testStore }
+        },
+        childContextTypes: {
+          store: React.PropTypes.object
+        },
+        render() {
+          return <Child/>
+        }
+      })
+      const element = React.createElement(ContextComponent)
+      const output = React.renderToStaticMarkup(element)
+      assert.include(output, 'Foo: Bar')
+    },
+
     'component can get use stores from props'() {
       const LegacyComponent = React.createClass({
         statics: {