Trim CSS modules declared in styleNames.

Author: gajus

dist/index.js

@@ -1,30 +1,18 @@
 'use strict';
 
-var _lodashLangIsObject2 = require('lodash/lang/isObject');
-
-var _lodashLangIsObject3 = _interopRequireDefault(_lodashLangIsObject2);
-
 Object.defineProperty(exports, '__esModule', {
     value: true
 });
 
-var _createClass = (function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ('value' in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; })();
-
-var _get = function get(_x, _x2, _x3) { var _again = true; _function: while (_again) { var object = _x, property = _x2, receiver = _x3; desc = parent = getter = undefined; _again = false; if (object === null) object = Function.prototype; var desc = Object.getOwnPropertyDescriptor(object, property); if (desc === undefined) { var parent = Object.getPrototypeOf(object); if (parent === null) { return undefined; } else { _x = parent; _x2 = property; _x3 = receiver; _again = true; continue _function; } } else if ('value' in desc) { return desc.value; } else { var getter = desc.get; if (getter === undefined) { return undefined; } return getter.call(receiver); } } };
-
-function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError('Cannot call a class as a function'); } }
-
-function _inherits(subClass, superClass) { if (typeof superClass !== 'function' && superClass !== null) { throw new TypeError('Super expression must either be null or a function, not ' + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
-
-var _linkClass = require('./linkClass');
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
 
-var _linkClass2 = _interopRequireDefault(_linkClass);
+var _extendReactClass = require('./extendReactClass');
 
-var _react = require('react');
+var _extendReactClass2 = _interopRequireDefault(_extendReactClass);
 
-var _react2 = _interopRequireDefault(_react);
+var _wrapStatelessFunction = require('./wrapStatelessFunction');
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
+var _wrapStatelessFunction2 = _interopRequireDefault(_wrapStatelessFunction);
 
 var decoratorConstructor = undefined,
     functionConstructor = undefined;
@@ -40,41 +28,7 @@ var decoratorConstructor = undefined,
 functionConstructor = function (Component, defaultStyles, options) {
     var decoratedClass = undefined;
 
-    decoratedClass = (function (_Component) {
-        _inherits(_class, _Component);
-
-        function _class() {
-            _classCallCheck(this, _class);
-
-            _get(Object.getPrototypeOf(_class.prototype), 'constructor', this).apply(this, arguments);
-        }
-
-        _createClass(_class, [{
-            key: 'render',
-            value: function render() {
-                var renderResult = undefined,
-                    styles = undefined;
-
-                if (this.props.styles) {
-                    styles = this.props.styles;
-                } else if ((0, _lodashLangIsObject3['default'])(defaultStyles)) {
-                    styles = defaultStyles;
-                } else {
-                    styles = {};
-                }
-
-                renderResult = _get(Object.getPrototypeOf(_class.prototype), 'render', this).call(this);
-
-                if (renderResult) {
-                    return (0, _linkClass2['default'])(renderResult, styles, options);
-                }
-
-                return _react2['default'].createElement('noscript');
-            }
-        }]);
-
-        return _class;
-    })(Component);
+    decoratedClass = Component.isReactClass ? (0, _extendReactClass2['default'])(Component, defaultStyles, options) : (0, _wrapStatelessFunction2['default'])(Component, defaultStyles, options);
 
     if (Component.displayName) {
         decoratedClass.displayName = Component.displayName;

dist/linkClass.js

@@ -1,5 +1,9 @@
 'use strict';
 
+var _lodashCollectionFilter2 = require('lodash/collection/filter');
+
+var _lodashCollectionFilter3 = _interopRequireDefault(_lodashCollectionFilter2);
+
 var _lodashLangIsArray2 = require('lodash/lang/isArray');
 
 var _lodashLangIsArray3 = _interopRequireDefault(_lodashLangIsArray2);
@@ -42,6 +46,7 @@ linkClass = function (element, styles, userConfiguration) {
 
     if (styleNames) {
         styleNames = styleNames.split(' ');
+        styleNames = (0, _lodashCollectionFilter3['default'])(styleNames);
 
         if (configuration.allowMultiple === false && styleNames.length > 1) {
             throw new Error('ReactElement styleName property defines multiple module names ("' + element.props.styleName + '").');

src/linkClass.js

@@ -24,6 +24,7 @@ linkClass = (element, styles = {}, userConfiguration) => {
 
     if (styleNames) {
         styleNames = styleNames.split(' ');
+        styleNames = _.filter(styleNames);
 
         if (configuration.allowMultiple === false && styleNames.length > 1) {
             throw new Error(`ReactElement styleName property defines multiple module names ("${element.props.styleName}").`);

test/linkClass.js

@@ -10,7 +10,7 @@ import jsdom from 'jsdom';
 import linkClass from './../src/linkClass';
 
 describe('linkClass', () => {
-    context('when ReactElement does not define styleName', () => {
+    context('ReactElement does not define styleName', () => {
         it('does not affect element properties', () => {
             expect(linkClass(<div></div>)).to.deep.equal(<div></div>);
         });
@@ -64,7 +64,7 @@ describe('linkClass', () => {
         });
     });
 
-    context('when styleName matches an existing CSS module', () => {
+    context('styleName matches an existing CSS module', () => {
         context('when a descendant element has styleName', () => {
             it('assigns a generated className', () => {
                 let subject;
@@ -126,6 +126,25 @@ describe('linkClass', () => {
         });
     });
 
+    context('styleName includes multiple whitespace characters', () => {
+        it('resolves CSS modules', () => {
+            let subject;
+
+            subject = <div>
+                <p styleName=' foo   bar '></p>
+            </div>;
+
+            subject = linkClass(subject, {
+                foo: 'foo-1',
+                bar: 'bar-1'
+            }, {
+                allowMultiple: true
+            });
+
+            expect(subject.props.children.props.className).to.equal('foo-1 bar-1');
+        });
+    });
+
     describe('options.allowMultiple', () => {
         context('when multiple module names are used', () => {
             context('when false', () => {