Update prototypes and added client

.gitignore

@@ -3,5 +3,6 @@ node_modules
 resolve.js
 Resolver.js
 index.js
+client.js
 
 !src/*

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-esc-resolver",
-  "version": "1.0.0",
+  "version": "1.1.1",
   "description": "Easy to use Client and Server Resolver",
   "homepage": "https://github.com/TriPSs/react-esc-resolver",
   "bugs": {
@@ -29,7 +29,8 @@
     "react-dom": "^15.0.0"
   },
   "peerDependencies": {
-    "react": "^0.14.6 || ^15.0.0-0",
-    "react-dom": "^0.14.6 || ^15.0.0-0"
+    "react": "^15.0.0-0",
+    "react-dom": "^15.0.0-0",
+    "prop-types": "^15.5.10"
   }
 }

src/Resolver.js

@@ -1,4 +1,5 @@
 import React from 'react'
+import PropTypes from 'prop-types'
 import ReactDOM from 'react-dom'
 import { renderToStaticMarkup } from 'react-dom/server'
 
@@ -8,11 +9,11 @@ const IS_CLIENT    = 'ReactResolver.IS_CLIENT'
 export default class Resolver extends React.Component {
 
   static childContextTypes = {
-    resolver: React.PropTypes.object
+    resolver: PropTypes.object
   }
 
   static contextTypes = {
-    resolver: React.PropTypes.object
+    resolver: PropTypes.object
   }
 
   static defaultProps = {
@@ -23,9 +24,9 @@ export default class Resolver extends React.Component {
   static displayName = 'Resolver'
 
   static propTypes = {
-    children: React.PropTypes.func.isRequired,
-    props   : React.PropTypes.object,
-    resolve : React.PropTypes.object
+    children: PropTypes.func.isRequired,
+    props   : PropTypes.object,
+    resolve : PropTypes.object
   }
 
   static renderClient = function (render, node) {

src/client.js

@@ -0,0 +1,64 @@
+import React from 'react'
+import PropTypes from 'prop-types'
+
+import Resolver from './Resolver'
+
+export default function client(Loader) {
+  return function clientDecorator(Component) {
+    return class ClientResolver extends React.Component {
+
+      static displayName = 'ClientResolver'
+
+      static childContextTypes = {
+        resolver: PropTypes.instanceOf(Resolver),
+      }
+
+      static contextTypes = {
+        resolver: PropTypes.instanceOf(Resolver),
+      }
+
+      constructor(props, context) {
+        super(props, context)
+
+        this.queue = []
+        this.state = {
+          bypass: process.env.NODE_ENV === 'test',
+          loaded: false,
+          server: isServer,
+        }
+      }
+
+      componentDidMount() {
+        this.setState({ server: false }, () => Promise.all(this.queue).then(() => this.setState({ loaded: true })))
+      }
+
+      enqueue = (promise) => {
+        this.queue.push(promise)
+
+        return promise
+      }
+
+      render() {
+        const { bypass, loaded, server } = this.state
+
+        const loader = Loader ? <Loader /> : null
+
+        if (bypass || loaded || server) {
+          return <Component {...this.props} />
+        }
+
+        return (
+          <div>
+            {loader}
+
+            <div style={{ display: 'none' }}>
+              <Resolver onResolve={this.enqueue}>
+                {(resolved) => <Component {...this.props} {...resolved} />}
+              </Resolver>
+            </div>
+          </div>
+        )
+      }
+    }
+  }
+}

src/index.js

@@ -1,2 +1,3 @@
 export { default as resolve } from './resolve'
+export { default as client } from './client'
 export { default as Resolver } from './Resolver'