Merge 4386311 into ea96cfa

modules/__tests__/resolve-styles-test.js

@@ -719,7 +719,7 @@ describe('resolveStyles', function () {
   });
 
   describe('React.Children.only', function () {
-    it.only('doesn\'t break React.Children.only', function () {
+    it('doesn\'t break React.Children.only', function () {
       var component = genComponent();
       var renderedElement = <div><span /></div>;
 
@@ -728,7 +728,7 @@ describe('resolveStyles', function () {
       expect(React.Children.only(result.props.children)).toBeTruthy();
     });
 
-    it.only('doesn\'t break when only child isn\'t ReactElement', function () {
+    it('doesn\'t break when only child isn\'t ReactElement', function () {
       var component = genComponent();
       var renderedElement = <div>Foo</div>;
 

modules/__tests__/wrap-test.js

@@ -4,6 +4,7 @@
 'use strict';
 
 jest.dontMock('../wrap.js');
+jest.dontMock('../wrap-utils.js');
 
 var resolveStyles = require('../resolve-styles.js');
 var wrap = require('../wrap.js');

modules/enhancer.js

@@ -0,0 +1,43 @@
+'use strict';
+
+var resolveStyles = require('./resolve-styles.js');
+var wrapUtils = require('./wrap-utils.js');
+
+var enhanceWithRadium = function (ComposedComponent) {
+  var RadiumEnhancer = function () {
+    ComposedComponent.prototype.constructor.call(this);
+
+    if (!this.state) {
+      this.state = {};
+    }
+
+    var radiumInitialState = wrapUtils.getInitialState();
+    Object.keys(radiumInitialState).forEach(function (key) {
+      this.state[key] = radiumInitialState[key];
+    }, this);
+  };
+
+  RadiumEnhancer.prototype = new ComposedComponent();
+  RadiumEnhancer.prototype.constructor = RadiumEnhancer;
+
+  RadiumEnhancer.prototype.render = function () {
+    var renderedElement = ComposedComponent.prototype.render.call(this);
+    return resolveStyles(this, renderedElement);
+  };
+
+  RadiumEnhancer.prototype.componentWillUnmount = function () {
+    if (ComposedComponent.prototype.componentWillUnmount) {
+      ComposedComponent.prototype.componentWillUnmount.call(this);
+    }
+
+    wrapUtils.componentWillUnmount(this);
+  };
+
+  RadiumEnhancer.defaultProps = ComposedComponent.defaultProps;
+  RadiumEnhancer.propTypes = ComposedComponent.propTypes;
+  RadiumEnhancer.contextTypes = ComposedComponent.contextTypes;
+
+  return RadiumEnhancer;
+};
+
+module.exports = enhanceWithRadium;

modules/index.js

@@ -1,5 +1,6 @@
 'use strict';
 
+exports.Enhancer = require('./enhancer');
 exports.Style = require('./components/style');
 exports.getState = require('./get-state');
 exports.keyframes = require('./keyframes');

modules/wrap-utils.js

@@ -0,0 +1,22 @@
+'use strict';
+
+module.exports = {
+  getInitialState: function () {
+    return {_radiumStyleState: {}};
+  },
+
+  componentWillUnmount: function (component) {
+    if (component._radiumMouseUpListener) {
+      component._radiumMouseUpListener.remove();
+    }
+
+    if (component._radiumMediaQueryListenersByQuery) {
+      Object.keys(component._radiumMediaQueryListenersByQuery).forEach(
+        function (query) {
+          component._radiumMediaQueryListenersByQuery[query].remove();
+        },
+        component
+      );
+    }
+  }
+};

modules/wrap.js

@@ -1,6 +1,7 @@
 'use strict';
 
 var resolveStyles = require('./resolve-styles.js');
+var wrapUtils = require('./wrap-utils.js');
 
 var merge = require('lodash/object/merge');
 
@@ -10,24 +11,13 @@ var wrap = function (config) {
       var existingInitialState = config.getInitialState ?
         config.getInitialState.call(this) :
         {};
-      return merge({}, existingInitialState, {_radiumStyleState: {}});
+      var radiumInitialState = wrapUtils.getInitialState();
+      return merge({}, existingInitialState, radiumInitialState);
     },
 
     componentWillUnmount: function () {
       config.componentWillUnmount && config.componentWillUnmount.call(this);
-
-      if (this._radiumMouseUpListener) {
-        this._radiumMouseUpListener.remove();
-      }
-
-      if (this._radiumMediaQueryListenersByQuery) {
-        Object.keys(this._radiumMediaQueryListenersByQuery).forEach(
-          function (query) {
-            this._radiumMediaQueryListenersByQuery[query].remove();
-          },
-          this
-        );
-      }
+      wrapUtils.componentWillUnmount(this);
     },
 
     render: function () {