glamorous - npm Package Compare versions

Comparing version 3.23.0 to 3.23.1

dist/glamorous.cjs.js

@@ -630,11 +630,10 @@ 'use strict';
 
-function getGlamorClassName$1(styles, props, cssOverrides, theme, context) {
-  var _handleStyles = handleStyles(styles, props, theme, context),
-      mappedArgs = _handleStyles.mappedArgs,
-      nonGlamorClassNames = _handleStyles.nonGlamorClassNames;
+function getGlamorClassName$1(_ref) {
+  var styles = _ref.styles,
+      props = _ref.props,
+      cssOverrides = _ref.cssOverrides,
+      cssProp = _ref.cssProp,
+      theme = _ref.theme,
+      context = _ref.context;
 
-  var _handleStyles2 = handleStyles([cssOverrides], props, theme, context),
-      cssOverridesArgs = _handleStyles2.mappedArgs,
-      cssOverridesClassNames = _handleStyles2.nonGlamorClassNames;
-
   var _extractGlamorStyles = extractGlamorStyles(props.className),
@@ -644,7 +643,14 @@ parentGlamorStyles = _extractGlamorStyles.glamorStyles,
 
-  var glamorClassName = glamor.css.apply(undefined, toConsumableArray(mappedArgs).concat(toConsumableArray(parentGlamorStyles), toConsumableArray(cssOverridesArgs))).toString();
-  var extras = nonGlamorClassNames.concat(cssOverridesClassNames).join(' ');
-  return (glamorlessClassName + ' ' + glamorClassName + ' ' + extras).trim();
+  var _handleStyles = handleStyles([].concat(toConsumableArray(styles), [parentGlamorStyles, cssOverrides, cssProp]), props, theme, context),
+      mappedArgs = _handleStyles.mappedArgs,
+      nonGlamorClassNames = _handleStyles.nonGlamorClassNames;
+
+  var glamorClassName = glamor.css.apply(undefined, toConsumableArray(mappedArgs)).toString();
+  var extras = [].concat(toConsumableArray(nonGlamorClassNames), [glamorlessClassName]).join(' ').trim();
+  return (glamorClassName + ' ' + extras).trim();
 }
 
+// this next function is on a "hot" code-path
+// so it's pretty complex to make sure it's fast.
+// eslint-disable-next-line complexity
 function handleStyles(styles, props, theme, context) {
@@ -665,2 +671,6 @@ var current = void 0;
       processStringClass(current, mappedArgs, nonGlamorClassNames);
+    } else if (Array.isArray(current)) {
+      var recursed = handleStyles(current, props, theme, context);
+      mappedArgs.push.apply(mappedArgs, toConsumableArray(recursed.mappedArgs));
+      nonGlamorClassNames.push.apply(nonGlamorClassNames, toConsumableArray(recursed.nonGlamorClassNames));
     } else {
@@ -804,3 +814,4 @@ mappedArgs.push(current);
                 toForward = _splitProps.toForward,
-                cssOverrides = _splitProps.cssOverrides;
+                cssOverrides = _splitProps.cssOverrides,
+                cssProp = _splitProps.cssProp;
 
@@ -813,3 +824,10 @@ // freeze the theme object in dev mode
             // create className to apply
-            var fullClassName = getGlamorClassName$1(GlamorousComponent.styles, props, cssOverrides, theme, this.context);
+            var fullClassName = getGlamorClassName$1({
+              styles: GlamorousComponent.styles,
+              props: props,
+              cssOverrides: cssOverrides,
+              cssProp: cssProp,
+              theme: theme,
+              context: this.context
+            });
             var debugClassName = glamorous.config.useDisplayNameInClassName ? cleanClassname(GlamorousComponent.displayName) : '';
@@ -1309,4 +1327,3 @@ var className = (fullClassName + ' ' + debugClassName).trim();
       forwardProps = _ref2.forwardProps;
-  var _ref$css = _ref.css,
-      cssOverrides = _ref$css === undefined ? {} : _ref$css,
+  var cssProp = _ref.css,
       theme = _ref.theme,
@@ -1318,3 +1335,3 @@ className = _ref.className,
 
-  var returnValue = { toForward: {}, cssOverrides: cssOverrides };
+  var returnValue = { toForward: {}, cssProp: cssProp, cssOverrides: {} };
   if (!propsAreCssOverrides) {
@@ -1321,0 +1338,0 @@ if (typeof rootEl !== 'string') {

dist/glamorous.cjs.tiny.js

@@ -192,11 +192,10 @@ 'use strict';
 
-function getGlamorClassName$1(styles, props, cssOverrides, theme, context) {
-  var _handleStyles = handleStyles(styles, props, theme, context),
-      mappedArgs = _handleStyles.mappedArgs,
-      nonGlamorClassNames = _handleStyles.nonGlamorClassNames;
+function getGlamorClassName$1(_ref) {
+  var styles = _ref.styles,
+      props = _ref.props,
+      cssOverrides = _ref.cssOverrides,
+      cssProp = _ref.cssProp,
+      theme = _ref.theme,
+      context = _ref.context;
 
-  var _handleStyles2 = handleStyles([cssOverrides], props, theme, context),
-      cssOverridesArgs = _handleStyles2.mappedArgs,
-      cssOverridesClassNames = _handleStyles2.nonGlamorClassNames;
-
   var _extractGlamorStyles = extractGlamorStyles(props.className),
@@ -206,7 +205,14 @@ parentGlamorStyles = _extractGlamorStyles.glamorStyles,
 
-  var glamorClassName = glamor.css.apply(undefined, toConsumableArray(mappedArgs).concat(toConsumableArray(parentGlamorStyles), toConsumableArray(cssOverridesArgs))).toString();
-  var extras = nonGlamorClassNames.concat(cssOverridesClassNames).join(' ');
-  return (glamorlessClassName + ' ' + glamorClassName + ' ' + extras).trim();
+  var _handleStyles = handleStyles([].concat(toConsumableArray(styles), [parentGlamorStyles, cssOverrides, cssProp]), props, theme, context),
+      mappedArgs = _handleStyles.mappedArgs,
+      nonGlamorClassNames = _handleStyles.nonGlamorClassNames;
+
+  var glamorClassName = glamor.css.apply(undefined, toConsumableArray(mappedArgs)).toString();
+  var extras = [].concat(toConsumableArray(nonGlamorClassNames), [glamorlessClassName]).join(' ').trim();
+  return (glamorClassName + ' ' + extras).trim();
 }
 
+// this next function is on a "hot" code-path
+// so it's pretty complex to make sure it's fast.
+// eslint-disable-next-line complexity
 function handleStyles(styles, props, theme, context) {
@@ -227,2 +233,6 @@ var current = void 0;
       processStringClass(current, mappedArgs, nonGlamorClassNames);
+    } else if (Array.isArray(current)) {
+      var recursed = handleStyles(current, props, theme, context);
+      mappedArgs.push.apply(mappedArgs, toConsumableArray(recursed.mappedArgs));
+      nonGlamorClassNames.push.apply(nonGlamorClassNames, toConsumableArray(recursed.nonGlamorClassNames));
     } else {
@@ -366,3 +376,4 @@ mappedArgs.push(current);
                 toForward = _splitProps.toForward,
-                cssOverrides = _splitProps.cssOverrides;
+                cssOverrides = _splitProps.cssOverrides,
+                cssProp = _splitProps.cssProp;
 
@@ -375,3 +386,10 @@ // freeze the theme object in dev mode
             // create className to apply
-            var fullClassName = getGlamorClassName$1(GlamorousComponent.styles, props, cssOverrides, theme, this.context);
+            var fullClassName = getGlamorClassName$1({
+              styles: GlamorousComponent.styles,
+              props: props,
+              cssOverrides: cssOverrides,
+              cssProp: cssProp,
+              theme: theme,
+              context: this.context
+            });
             var debugClassName = glamorous.config.useDisplayNameInClassName ? cleanClassname(GlamorousComponent.displayName) : '';
@@ -479,4 +497,3 @@ var className = (fullClassName + ' ' + debugClassName).trim();
 function splitProps(_ref) {
-  var _ref$css = _ref.css,
-      cssOverrides = _ref$css === undefined ? {} : _ref$css,
+  var cssProp = _ref.css,
       theme = _ref.theme,
@@ -488,3 +505,3 @@ className = _ref.className,
 
-  return { toForward: rest, cssOverrides: cssOverrides };
+  return { toForward: rest, cssProp: cssProp };
 }
@@ -491,0 +508,0 @@

dist/glamorous.es.js

@@ -625,11 +625,10 @@ import React, { Component } from 'react';
 
-function getGlamorClassName$1(styles, props, cssOverrides, theme, context) {
-  var _handleStyles = handleStyles(styles, props, theme, context),
-      mappedArgs = _handleStyles.mappedArgs,
-      nonGlamorClassNames = _handleStyles.nonGlamorClassNames;
+function getGlamorClassName$1(_ref) {
+  var styles = _ref.styles,
+      props = _ref.props,
+      cssOverrides = _ref.cssOverrides,
+      cssProp = _ref.cssProp,
+      theme = _ref.theme,
+      context = _ref.context;
 
-  var _handleStyles2 = handleStyles([cssOverrides], props, theme, context),
-      cssOverridesArgs = _handleStyles2.mappedArgs,
-      cssOverridesClassNames = _handleStyles2.nonGlamorClassNames;
-
   var _extractGlamorStyles = extractGlamorStyles(props.className),
@@ -639,7 +638,14 @@ parentGlamorStyles = _extractGlamorStyles.glamorStyles,
 
-  var glamorClassName = css.apply(undefined, toConsumableArray(mappedArgs).concat(toConsumableArray(parentGlamorStyles), toConsumableArray(cssOverridesArgs))).toString();
-  var extras = nonGlamorClassNames.concat(cssOverridesClassNames).join(' ');
-  return (glamorlessClassName + ' ' + glamorClassName + ' ' + extras).trim();
+  var _handleStyles = handleStyles([].concat(toConsumableArray(styles), [parentGlamorStyles, cssOverrides, cssProp]), props, theme, context),
+      mappedArgs = _handleStyles.mappedArgs,
+      nonGlamorClassNames = _handleStyles.nonGlamorClassNames;
+
+  var glamorClassName = css.apply(undefined, toConsumableArray(mappedArgs)).toString();
+  var extras = [].concat(toConsumableArray(nonGlamorClassNames), [glamorlessClassName]).join(' ').trim();
+  return (glamorClassName + ' ' + extras).trim();
 }
 
+// this next function is on a "hot" code-path
+// so it's pretty complex to make sure it's fast.
+// eslint-disable-next-line complexity
 function handleStyles(styles, props, theme, context) {
@@ -660,2 +666,6 @@ var current = void 0;
       processStringClass(current, mappedArgs, nonGlamorClassNames);
+    } else if (Array.isArray(current)) {
+      var recursed = handleStyles(current, props, theme, context);
+      mappedArgs.push.apply(mappedArgs, toConsumableArray(recursed.mappedArgs));
+      nonGlamorClassNames.push.apply(nonGlamorClassNames, toConsumableArray(recursed.nonGlamorClassNames));
     } else {
@@ -799,3 +809,4 @@ mappedArgs.push(current);
                 toForward = _splitProps.toForward,
-                cssOverrides = _splitProps.cssOverrides;
+                cssOverrides = _splitProps.cssOverrides,
+                cssProp = _splitProps.cssProp;
 
@@ -808,3 +819,10 @@ // freeze the theme object in dev mode
             // create className to apply
-            var fullClassName = getGlamorClassName$1(GlamorousComponent.styles, props, cssOverrides, theme, this.context);
+            var fullClassName = getGlamorClassName$1({
+              styles: GlamorousComponent.styles,
+              props: props,
+              cssOverrides: cssOverrides,
+              cssProp: cssProp,
+              theme: theme,
+              context: this.context
+            });
             var debugClassName = glamorous.config.useDisplayNameInClassName ? cleanClassname(GlamorousComponent.displayName) : '';
@@ -1304,4 +1322,3 @@ var className = (fullClassName + ' ' + debugClassName).trim();
       forwardProps = _ref2.forwardProps;
-  var _ref$css = _ref.css,
-      cssOverrides = _ref$css === undefined ? {} : _ref$css,
+  var cssProp = _ref.css,
       theme = _ref.theme,
@@ -1313,3 +1330,3 @@ className = _ref.className,
 
-  var returnValue = { toForward: {}, cssOverrides: cssOverrides };
+  var returnValue = { toForward: {}, cssProp: cssProp, cssOverrides: {} };
   if (!propsAreCssOverrides) {
@@ -1316,0 +1333,0 @@ if (typeof rootEl !== 'string') {

dist/glamorous.es.tiny.js

@@ -187,11 +187,10 @@ import React, { Component } from 'react';
 
-function getGlamorClassName$1(styles, props, cssOverrides, theme, context) {
-  var _handleStyles = handleStyles(styles, props, theme, context),
-      mappedArgs = _handleStyles.mappedArgs,
-      nonGlamorClassNames = _handleStyles.nonGlamorClassNames;
+function getGlamorClassName$1(_ref) {
+  var styles = _ref.styles,
+      props = _ref.props,
+      cssOverrides = _ref.cssOverrides,
+      cssProp = _ref.cssProp,
+      theme = _ref.theme,
+      context = _ref.context;
 
-  var _handleStyles2 = handleStyles([cssOverrides], props, theme, context),
-      cssOverridesArgs = _handleStyles2.mappedArgs,
-      cssOverridesClassNames = _handleStyles2.nonGlamorClassNames;
-
   var _extractGlamorStyles = extractGlamorStyles(props.className),
@@ -201,7 +200,14 @@ parentGlamorStyles = _extractGlamorStyles.glamorStyles,
 
-  var glamorClassName = css.apply(undefined, toConsumableArray(mappedArgs).concat(toConsumableArray(parentGlamorStyles), toConsumableArray(cssOverridesArgs))).toString();
-  var extras = nonGlamorClassNames.concat(cssOverridesClassNames).join(' ');
-  return (glamorlessClassName + ' ' + glamorClassName + ' ' + extras).trim();
+  var _handleStyles = handleStyles([].concat(toConsumableArray(styles), [parentGlamorStyles, cssOverrides, cssProp]), props, theme, context),
+      mappedArgs = _handleStyles.mappedArgs,
+      nonGlamorClassNames = _handleStyles.nonGlamorClassNames;
+
+  var glamorClassName = css.apply(undefined, toConsumableArray(mappedArgs)).toString();
+  var extras = [].concat(toConsumableArray(nonGlamorClassNames), [glamorlessClassName]).join(' ').trim();
+  return (glamorClassName + ' ' + extras).trim();
 }
 
+// this next function is on a "hot" code-path
+// so it's pretty complex to make sure it's fast.
+// eslint-disable-next-line complexity
 function handleStyles(styles, props, theme, context) {
@@ -222,2 +228,6 @@ var current = void 0;
       processStringClass(current, mappedArgs, nonGlamorClassNames);
+    } else if (Array.isArray(current)) {
+      var recursed = handleStyles(current, props, theme, context);
+      mappedArgs.push.apply(mappedArgs, toConsumableArray(recursed.mappedArgs));
+      nonGlamorClassNames.push.apply(nonGlamorClassNames, toConsumableArray(recursed.nonGlamorClassNames));
     } else {
@@ -361,3 +371,4 @@ mappedArgs.push(current);
                 toForward = _splitProps.toForward,
-                cssOverrides = _splitProps.cssOverrides;
+                cssOverrides = _splitProps.cssOverrides,
+                cssProp = _splitProps.cssProp;
 
@@ -370,3 +381,10 @@ // freeze the theme object in dev mode
             // create className to apply
-            var fullClassName = getGlamorClassName$1(GlamorousComponent.styles, props, cssOverrides, theme, this.context);
+            var fullClassName = getGlamorClassName$1({
+              styles: GlamorousComponent.styles,
+              props: props,
+              cssOverrides: cssOverrides,
+              cssProp: cssProp,
+              theme: theme,
+              context: this.context
+            });
             var debugClassName = glamorous.config.useDisplayNameInClassName ? cleanClassname(GlamorousComponent.displayName) : '';
@@ -474,4 +492,3 @@ var className = (fullClassName + ' ' + debugClassName).trim();
 function splitProps(_ref) {
-  var _ref$css = _ref.css,
-      cssOverrides = _ref$css === undefined ? {} : _ref$css,
+  var cssProp = _ref.css,
       theme = _ref.theme,
@@ -483,3 +500,3 @@ className = _ref.className,
 
-  return { toForward: rest, cssOverrides: cssOverrides };
+  return { toForward: rest, cssProp: cssProp };
 }
@@ -486,0 +503,0 @@

dist/glamorous.umd.js

@@ -630,11 +630,10 @@ (function (global, factory) {
 
-function getGlamorClassName$1(styles, props, cssOverrides, theme, context) {
-  var _handleStyles = handleStyles(styles, props, theme, context),
-      mappedArgs = _handleStyles.mappedArgs,
-      nonGlamorClassNames = _handleStyles.nonGlamorClassNames;
+function getGlamorClassName$1(_ref) {
+  var styles = _ref.styles,
+      props = _ref.props,
+      cssOverrides = _ref.cssOverrides,
+      cssProp = _ref.cssProp,
+      theme = _ref.theme,
+      context = _ref.context;
 
-  var _handleStyles2 = handleStyles([cssOverrides], props, theme, context),
-      cssOverridesArgs = _handleStyles2.mappedArgs,
-      cssOverridesClassNames = _handleStyles2.nonGlamorClassNames;
-
   var _extractGlamorStyles = extractGlamorStyles(props.className),
@@ -644,7 +643,14 @@ parentGlamorStyles = _extractGlamorStyles.glamorStyles,
 
-  var glamorClassName = glamor.css.apply(undefined, toConsumableArray(mappedArgs).concat(toConsumableArray(parentGlamorStyles), toConsumableArray(cssOverridesArgs))).toString();
-  var extras = nonGlamorClassNames.concat(cssOverridesClassNames).join(' ');
-  return (glamorlessClassName + ' ' + glamorClassName + ' ' + extras).trim();
+  var _handleStyles = handleStyles([].concat(toConsumableArray(styles), [parentGlamorStyles, cssOverrides, cssProp]), props, theme, context),
+      mappedArgs = _handleStyles.mappedArgs,
+      nonGlamorClassNames = _handleStyles.nonGlamorClassNames;
+
+  var glamorClassName = glamor.css.apply(undefined, toConsumableArray(mappedArgs)).toString();
+  var extras = [].concat(toConsumableArray(nonGlamorClassNames), [glamorlessClassName]).join(' ').trim();
+  return (glamorClassName + ' ' + extras).trim();
 }
 
+// this next function is on a "hot" code-path
+// so it's pretty complex to make sure it's fast.
+// eslint-disable-next-line complexity
 function handleStyles(styles, props, theme, context) {
@@ -665,2 +671,6 @@ var current = void 0;
       processStringClass(current, mappedArgs, nonGlamorClassNames);
+    } else if (Array.isArray(current)) {
+      var recursed = handleStyles(current, props, theme, context);
+      mappedArgs.push.apply(mappedArgs, toConsumableArray(recursed.mappedArgs));
+      nonGlamorClassNames.push.apply(nonGlamorClassNames, toConsumableArray(recursed.nonGlamorClassNames));
     } else {
@@ -804,3 +814,4 @@ mappedArgs.push(current);
                 toForward = _splitProps.toForward,
-                cssOverrides = _splitProps.cssOverrides;
+                cssOverrides = _splitProps.cssOverrides,
+                cssProp = _splitProps.cssProp;
 
@@ -813,3 +824,10 @@ // freeze the theme object in dev mode
             // create className to apply
-            var fullClassName = getGlamorClassName$1(GlamorousComponent.styles, props, cssOverrides, theme, this.context);
+            var fullClassName = getGlamorClassName$1({
+              styles: GlamorousComponent.styles,
+              props: props,
+              cssOverrides: cssOverrides,
+              cssProp: cssProp,
+              theme: theme,
+              context: this.context
+            });
             var debugClassName = glamorous.config.useDisplayNameInClassName ? cleanClassname(GlamorousComponent.displayName) : '';
@@ -1309,4 +1327,3 @@ var className = (fullClassName + ' ' + debugClassName).trim();
       forwardProps = _ref2.forwardProps;
-  var _ref$css = _ref.css,
-      cssOverrides = _ref$css === undefined ? {} : _ref$css,
+  var cssProp = _ref.css,
       theme = _ref.theme,
@@ -1318,3 +1335,3 @@ className = _ref.className,
 
-  var returnValue = { toForward: {}, cssOverrides: cssOverrides };
+  var returnValue = { toForward: {}, cssProp: cssProp, cssOverrides: {} };
   if (!propsAreCssOverrides) {
@@ -1321,0 +1338,0 @@ if (typeof rootEl !== 'string') {

dist/glamorous.umd.min.js

@@ -1,2 +0,2 @@
-!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?module.exports=t(require("react"),require("glamor")):"function"==typeof define&&define.amd?define(["react","glamor"],t):e.glamorous=t(e.React,e.Glamor)}(this,function(e,t){"use strict";function n(t){var n=function(e){function n(){var e,t,r,o;w(this,n);for(var a=arguments.length,i=Array(a),s=0;s<a;s++)i[s]=arguments[s];return t=r=M(this,(e=n.__proto__||Object.getPrototypeOf(n)).call.apply(e,[this].concat(i))),r.state={theme:{}},r.setTheme=function(e){return r.setState({theme:e})},o=t,M(r,o)}return P(n,e),S(n,[{key:"componentWillMount",value:function(){this.context[k]&&this.setState({theme:this.context[k].getState()})}},{key:"componentDidMount",value:function(){this.context[k]&&(this.unsubscribe=this.context[k].subscribe(this.setTheme))}},{key:"componentWillUnmount",value:function(){this.unsubscribe&&this.unsubscribe()}},{key:"render",value:function(){return b.createElement(t,T({},this.props,this.state))}}]),n}(e.Component);return n.contextTypes=O({},k,x.object),n}function r(e){var t=[],n=e;return{getState:function(){return n},setState:function(e){n=e,t.forEach(function(e){return e(n)})},subscribe:function(e){return t.push(e),function(){t=t.filter(function(t){return t!==e})}}}}function o(){return(arguments.length>0&&void 0!==arguments[0]?arguments[0]:"").toString().split(" ").reduce(function(e,t){if(0===t.indexOf("css-")){var n=l(t);e.glamorStyles.push(n)}else e.glamorlessClassName=(e.glamorlessClassName+" "+t).trim();return e},{glamorlessClassName:"",glamorStyles:[]})}function a(e,n,r,a,s){var l=i(e,n,a,s),u=l.mappedArgs,c=l.nonGlamorClassNames,p=i([r],n,a,s),d=p.mappedArgs,h=p.nonGlamorClassNames,m=o(n.className),f=m.glamorStyles;return(m.glamorlessClassName+" "+t.css.apply(void 0,E(u).concat(E(f),E(d))).toString()+" "+c.concat(h).join(" ")).trim()}function i(e,t,n,r){for(var o=void 0,a=[],i=[],l=0;l<e.length;l++)if("function"==typeof(o=e[l])){var u=o(t,n,r);"string"==typeof u?s(u,a,i):a.push(u)}else"string"==typeof o?s(o,a,i):a.push(o);return{mappedArgs:a,nonGlamorClassNames:i}}function s(e,t,n){var r=l(e);r?t.push(r):n.push(e)}function l(e){var n=e.slice("css-".length);return t.styleSheet.registered[n]?t.styleSheet.registered[n].style:null}function u(e){return e.replace(/ /g,"-").replace(/[^A-Za-z0-9\-_]/g,"_")}function c(e){return null==e||"function"!=typeof e&&"object"!=typeof e}function p(e,t,n,r){var o=c(r)?r:n(r);if(!t.has(o)){var a=e.call(this,r);return t.set(o,a),a}return t.get(o)}function d(e,t,n){var r=Array.prototype.slice.call(arguments,3),o=n(r);if(!t.has(o)){var a=e.apply(this,r);return t.set(o,a),a}return t.get(o)}function h(e,t){var n=1===e.length?p:d;return n=n.bind(this,e,t.cache.create(),t.serializer)}function m(){return JSON.stringify(arguments)}function f(){this.cache=Object.create(null)}function g(e,t){var n=t.propsAreCssOverrides,r=t.rootEl,o=t.forwardProps,a=e.css,i=void 0===a?{}:a,s=(e.theme,e.className,e.innerRef,e.glam,D(e,["css","theme","className","innerRef","glam"])),l={toForward:{},cssOverrides:i};return n||"string"==typeof r?Object.keys(s).reduce(function(e,t){return-1!==o.indexOf(t)||tt(r,t)?e.toForward[t]=s[t]:n&&(e.cssOverrides[t]=s[t]),e},l):(l.toForward=s,l)}function y(e){return e.slice(0,1).toUpperCase()+e.slice(1)}var b="default"in e?e.default:e,v=["a","altGlyph","altGlyphDef","altGlyphItem","animate","animateColor","animateMotion","animateTransform","animation","audio","canvas","circle","clipPath","color-profile","cursor","defs","desc","discard","ellipse","feBlend","feColorMatrix","feComponentTransfer","feComposite","feConvolveMatrix","feDiffuseLighting","feDisplacementMap","feDistantLight","feDropShadow","feFlood","feFuncA","feFuncB","feFuncG","feFuncR","feGaussianBlur","feImage","feMerge","feMergeNode","feMorphology","feOffset","fePointLight","feSpecularLighting","feSpotLight","feTile","feTurbulence","filter","font","font-face","font-face-format","font-face-name","font-face-src","font-face-uri","foreignObject","g","glyph","glyphRef","handler","hatch","hatchpath","hkern","iframe","image","line","linearGradient","listener","marker","mask","mesh","meshgradient","meshpatch","meshrow","metadata","missing-glyph","mpath","path","pattern","polygon","polyline","prefetch","radialGradient","rect","script","set","solidColor","solidcolor","stop","style","svg","switch","symbol","tbreak","text","textArea","textPath","title","tref","tspan","unknown","use","video","view","vkern"],C=["a","abbr","acronym","address","applet","area","article","aside","audio","b","base","basefont","bdi","bdo","bgsound","big","blink","blockquote","body","br","button","canvas","caption","center","cite","code","col","colgroup","command","content","data","datalist","dd","del","details","dfn","dialog","dir","div","dl","dt","element","em","embed","fieldset","figcaption","figure","font","footer","form","frame","frameset","h1","h2","h3","h4","h5","h6","head","header","hgroup","hr","html","i","iframe","image","img","input","ins","isindex","kbd","keygen","label","legend","li","link","listing","main","map","mark","marquee","math","menu","menuitem","meta","meter","multicol","nav","nextid","nobr","noembed","noframes","noscript","object","ol","optgroup","option","output","p","param","picture","plaintext","pre","progress","q","rb","rbc","rp","rt","rtc","ruby","s","samp","script","section","select","shadow","slot","small","source","spacer","span","strike","strong","style","sub","summary","sup","svg","table","tbody","td","template","textarea","tfoot","th","thead","time","title","tr","track","tt","u","ul","var","video","wbr","xmp"].concat(v).filter(function(e,t,n){return n.indexOf(e)===t}),k="__glamorous__",x=void 0;if("15.5"===b.version.slice(0,4))try{x=require("prop-types")}catch(e){}x=x||b.PropTypes;var w=function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")},S=function(){function e(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}return function(t,n,r){return n&&e(t.prototype,n),r&&e(t,r),t}}(),O=function(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e},T=Object.assign||function(e){for(var t=1;t<arguments.length;t++){var n=arguments[t];for(var r in n)Object.prototype.hasOwnProperty.call(n,r)&&(e[r]=n[r])}return e},P=function(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)},D=function(e,t){var n={};for(var r in e)t.indexOf(r)>=0||Object.prototype.hasOwnProperty.call(e,r)&&(n[r]=e[r]);return n},M=function(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t},E=function(e){if(Array.isArray(e)){for(var t=0,n=Array(e.length);t<e.length;t++)n[t]=e[t];return n}return Array.from(e)},F=function(e){function t(){var e,n,o,a;w(this,t);for(var i=arguments.length,s=Array(i),l=0;l<i;l++)s[l]=arguments[l];return n=o=M(this,(e=t.__proto__||Object.getPrototypeOf(t)).call.apply(e,[this].concat(s))),o.broadcast=r(o.props.theme),o.setOuterTheme=function(e){o.outerTheme=e},a=n,M(o,a)}return P(t,e),S(t,[{key:"getTheme",value:function(e){var t=e||this.props.theme;return T({},this.outerTheme,t)}},{key:"getChildContext",value:function(){return O({},k,this.broadcast)}},{key:"componentDidMount",value:function(){this.context[k]&&(this.unsubscribe=this.context[k].subscribe(this.setOuterTheme))}},{key:"componentWillMount",value:function(){this.context[k]&&(this.setOuterTheme(this.context[k].getState()),this.broadcast.setState(this.getTheme()))}},{key:"componentWillReceiveProps",value:function(e){this.props.theme!==e.theme&&this.broadcast.setState(this.getTheme(e.theme))}},{key:"componentWillUnmount",value:function(){this.unsubscribe&&this.unsubscribe()}},{key:"render",value:function(){return this.props.children?b.Children.only(this.props.children):null}}]),t}(e.Component);F.childContextTypes=O({},k,x.object.isRequired),F.contextTypes=O({},k,x.object),F.propTypes={theme:x.object.isRequired,children:x.node};f.prototype.has=function(e){return e in this.cache},f.prototype.get=function(e){return this.cache[e]},f.prototype.set=function(e,t){this.cache[e]=t};var j={create:function(){return new f}},A=["coords","download","href","name","rel","shape","target","type"],L=["title"],R=["alt","height","name","width"],N=["alt","coords","download","href","rel","shape","target","type"],_=["controls","loop","muted","preload","src"],z=["href","target"],q=["size"],U=["dir"],I=["cite"],W=["disabled","form","name","type","value"],G=["height","width"],B=["span","width"],H=["span","width"],V=["value"],K=["cite"],X=["open"],Y=["title"],Z=["open"],J=["height","src","type","width"],$=["disabled","form","name"],Q=["size"],ee=["accept","action","method","name","target"],te=["name","scrolling","src"],ne=["cols","rows"],re=["profile"],oe=["size","width"],ae=["manifest"],ie=["height","name","sandbox","scrolling","src","width"],se=["alt","height","name","sizes","src","width"],le=["accept","alt","autoCapitalize","autoCorrect","autoSave","checked","defaultChecked","defaultValue","disabled","form","height","list","max","min","multiple","name","onChange","pattern","placeholder","required","results","size","src","step","title","type","value","width"],ue=["cite"],ce=["challenge","disabled","form","name"],pe=["form"],de=["type","value"],he=["color","href","integrity","media","nonce","rel","scope","sizes","target","title","type"],me=["name"],fe=["label","type"],ge=["checked","default","disabled","icon","label","title","type"],ye=["content","name"],be=["high","low","max","min","optimum","value"],ve=["data","form","height","name","type","width"],Ce=["reversed","start","type"],ke=["disabled","label"],xe=["disabled","label","selected","value"],we=["form","name"],Se=["name","type","value"],Oe=["width"],Te=["max","value"],Pe=["cite"],De=["async","defer","integrity","nonce","src","type"],Me=["defaultValue","disabled","form","multiple","name","onChange","required","size","value"],Ee=["name"],Fe=["media","sizes","src","type"],je=["media","nonce","title","type"],Ae=["summary","width"],Le=["headers","height","scope","width"],Re=["autoCapitalize","autoCorrect","cols","defaultValue","disabled","form","name","onChange","placeholder","required","rows","value","wrap"],Ne=["headers","height","scope","width"],_e=["default","kind","label","src"],ze=["type"],qe=["controls","height","loop","muted","poster","preload","src","width"],Ue=["accentHeight","accumulate","additive","alignmentBaseline","allowReorder","alphabetic","amplitude","arabicForm","ascent","attributeName","attributeType","autoReverse","azimuth","baseFrequency","baseProfile","baselineShift","bbox","begin","bias","by","calcMode","capHeight","clip","clipPath","clipPathUnits","clipRule","color","colorInterpolation","colorInterpolationFilters","colorProfile","colorRendering","contentScriptType","contentStyleType","cursor","cx","cy","d","decelerate","descent","diffuseConstant","direction","display","divisor","dominantBaseline","dur","dx","dy","edgeMode","elevation","enableBackground","end","exponent","externalResourcesRequired","fill","fillOpacity","fillRule","filter","filterRes","filterUnits","floodColor","floodOpacity","focusable","fontFamily","fontSize","fontSizeAdjust","fontStretch","fontStyle","fontVariant","fontWeight","format","from","fx","fy","g1","g2","glyphName","glyphOrientationHorizontal","glyphOrientationVertical","glyphRef","gradientTransform","gradientUnits","hanging","height","horizAdvX","horizOriginX","ideographic","imageRendering","in","in2","intercept","k","k1","k2","k3","k4","kernelMatrix","kernelUnitLength","kerning","keyPoints","keySplines","keyTimes","lengthAdjust","letterSpacing","lightingColor","limitingConeAngle","local","markerEnd","markerHeight","markerMid","markerStart","markerUnits","markerWidth","mask","maskContentUnits","maskUnits","mathematical","mode","numOctaves","offset","opacity","operator","order","orient","orientation","origin","overflow","overlinePosition","overlineThickness","paintOrder","panose1","pathLength","patternContentUnits","patternTransform","patternUnits","pointerEvents","points","pointsAtX","pointsAtY","pointsAtZ","preserveAlpha","preserveAspectRatio","primitiveUnits","r","radius","refX","refY","renderingIntent","repeatCount","repeatDur","requiredExtensions","requiredFeatures","restart","result","rotate","rx","ry","scale","seed","shapeRendering","slope","spacing","specularConstant","specularExponent","speed","spreadMethod","startOffset","stdDeviation","stemh","stemv","stitchTiles","stopColor","stopOpacity","strikethroughPosition","strikethroughThickness","string","stroke","strokeDasharray","strokeDashoffset","strokeLinecap","strokeLinejoin","strokeMiterlimit","strokeOpacity","strokeWidth","surfaceScale","systemLanguage","tableValues","targetX","targetY","textAnchor","textDecoration","textLength","textRendering","to","transform","u1","u2","underlinePosition","underlineThickness","unicode","unicodeBidi","unicodeRange","unitsPerEm","vAlphabetic","vHanging","vIdeographic","vMathematical","values","vectorEffect","version","vertAdvY","vertOriginX","vertOriginY","viewBox","viewTarget","visibility","width","widths","wordSpacing","writingMode","x","x1","x2","xChannelSelector","xHeight","xlinkActuate","xlinkArcrole","xlinkHref","xlinkRole","xlinkShow","xlinkTitle","xlinkType","xmlBase","xmlLang","xmlSpace","y","y1","y2","yChannelSelector","z","zoomAndPan"],Ie={html:["a","abbr","address","area","article","aside","audio","b","base","bdi","bdo","big","blockquote","body","br","button","canvas","caption","cite","code","col","colgroup","data","datalist","dd","del","details","dfn","dialog","div","dl","dt","em","embed","fieldset","figcaption","figure","footer","form","h1","h2","h3","h4","h5","h6","head","header","hgroup","hr","html","i","iframe","img","input","ins","kbd","keygen","label","legend","li","link","main","map","mark","menu","menuitem","meta","meter","nav","noscript","object","ol","optgroup","option","output","p","param","picture","pre","progress","q","rp","rt","ruby","s","samp","script","section","select","small","source","span","strong","style","sub","summary","sup","table","tbody","td","textarea","tfoot","th","thead","time","title","tr","track","u","ul","var","video","wbr"],svg:["circle","clipPath","defs","ellipse","g","image","line","linearGradient","mask","path","pattern","polygon","polyline","radialGradient","rect","stop","svg","text","tspan"]},We={a:A,abbr:L,applet:R,area:N,audio:_,base:z,basefont:q,bdo:U,blockquote:I,button:W,canvas:G,col:B,colgroup:H,data:V,del:K,details:X,dfn:Y,dialog:Z,embed:J,fieldset:$,font:Q,form:ee,frame:te,frameset:ne,head:re,hr:oe,html:ae,iframe:ie,img:se,input:le,ins:ue,keygen:ce,label:pe,li:de,link:he,map:me,menu:fe,menuitem:ge,meta:ye,meter:be,object:ve,ol:Ce,optgroup:ke,option:xe,output:we,param:Se,pre:Oe,progress:Te,q:Pe,script:De,select:Me,slot:Ee,source:Fe,style:je,table:Ae,td:Le,textarea:Re,th:Ne,track:_e,ul:ze,video:qe,svg:Ue,elements:Ie,"*":["about","acceptCharset","accessKey","allowFullScreen","allowTransparency","autoComplete","autoFocus","autoPlay","capture","cellPadding","cellSpacing","charSet","classID","className","colSpan","contentEditable","contextMenu","crossOrigin","dangerouslySetInnerHTML","datatype","dateTime","dir","draggable","encType","formAction","formEncType","formMethod","formNoValidate","formTarget","frameBorder","hidden","hrefLang","htmlFor","httpEquiv","id","inlist","inputMode","is","itemID","itemProp","itemRef","itemScope","itemType","keyParams","keyType","lang","marginHeight","marginWidth","maxLength","mediaGroup","minLength","noValidate","prefix","property","radioGroup","readOnly","resource","role","rowSpan","scoped","seamless","security","spellCheck","srcDoc","srcLang","srcSet","style","suppressContentEditableWarning","tabIndex","title","typeof","unselectable","useMap","vocab","wmode"]},Ge=Object.freeze({a:A,abbr:L,applet:R,area:N,audio:_,base:z,basefont:q,bdo:U,blockquote:I,button:W,canvas:G,col:B,colgroup:H,data:V,del:K,details:X,dfn:Y,dialog:Z,embed:J,fieldset:$,font:Q,form:ee,frame:te,frameset:ne,head:re,hr:oe,html:ae,iframe:ie,img:se,input:le,ins:ue,keygen:ce,label:pe,li:de,link:he,map:me,menu:fe,menuitem:ge,meta:ye,meter:be,object:ve,ol:Ce,optgroup:ke,option:xe,output:we,param:Se,pre:Oe,progress:Te,q:Pe,script:De,select:Me,slot:Ee,source:Fe,style:je,table:Ae,td:Le,textarea:Re,th:Ne,track:_e,ul:ze,video:qe,svg:Ue,elements:Ie,default:We}),Be=Ge&&We||Ge,He=function(e){return e&&e.__esModule?e.default:e}(function(e,t){return t={exports:{}},e(t,t.exports),t.exports}(function(e,t){Object.defineProperty(t,"__esModule",{value:!0}),t.default=Be,e.exports=Be})),Ve=["children","dangerouslySetInnerHTML","key","ref","autoFocus","defaultValue","valueLink","defaultChecked","checkedLink","innerHTML","suppressContentEditableWarning","onFocusIn","onFocusOut","className","onCopy","onCut","onPaste","onCompositionEnd","onCompositionStart","onCompositionUpdate","onKeyDown","onKeyPress","onKeyUp","onFocus","onBlur","onChange","onInput","onSubmit","onClick","onContextMenu","onDoubleClick","onDrag","onDragEnd","onDragEnter","onDragExit","onDragLeave","onDragOver","onDragStart","onDrop","onMouseDown","onMouseEnter","onMouseLeave","onMouseMove","onMouseOut","onMouseOver","onMouseUp","onSelect","onTouchCancel","onTouchEnd","onTouchMove","onTouchStart","onScroll","onWheel","onAbort","onCanPlay","onCanPlayThrough","onDurationChange","onEmptied","onEncrypted","onEnded","onError","onLoadedData","onLoadedMetadata","onLoadStart","onPause","onPlay","onPlaying","onProgress","onRateChange","onSeeked","onSeeking","onStalled","onSuspend","onTimeUpdate","onVolumeChange","onWaiting","onLoad","onAnimationStart","onAnimationEnd","onAnimationIteration","onTransitionEnd","onCopyCapture","onCutCapture","onPasteCapture","onCompositionEndCapture","onCompositionStartCapture","onCompositionUpdateCapture","onKeyDownCapture","onKeyPressCapture","onKeyUpCapture","onFocusCapture","onBlurCapture","onChangeCapture","onInputCapture","onSubmitCapture","onClickCapture","onContextMenuCapture","onDoubleClickCapture","onDragCapture","onDragEndCapture","onDragEnterCapture","onDragExitCapture","onDragLeaveCapture","onDragOverCapture","onDragStartCapture","onDropCapture","onMouseDownCapture","onMouseEnterCapture","onMouseLeaveCapture","onMouseMoveCapture","onMouseOutCapture","onMouseOverCapture","onMouseUpCapture","onSelectCapture","onTouchCancelCapture","onTouchEndCapture","onTouchMoveCapture","onTouchStartCapture","onScrollCapture","onWheelCapture","onAbortCapture","onCanPlayCapture","onCanPlayThroughCapture","onDurationChangeCapture","onEmptiedCapture","onEncryptedCapture","onEndedCapture","onErrorCapture","onLoadedDataCapture","onLoadedMetadataCapture","onLoadStartCapture","onPauseCapture","onPlayCapture","onPlayingCapture","onProgressCapture","onRateChangeCapture","onSeekedCapture","onSeekingCapture","onStalledCapture","onSuspendCapture","onTimeUpdateCapture","onVolumeChangeCapture","onWaitingCapture","onLoadCapture","onAnimationStartCapture","onAnimationEndCapture","onAnimationIterationCapture","onTransitionEndCapture"],Ke=He["*"],Xe=He.elements.svg,Ye=["color","height","width"],Ze=RegExp.prototype.test.bind(new RegExp("^(data|aria)-[:A-Z_a-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$")),Je=function(e){return-1!==Xe.indexOf(e)},$e=function(e,t){var n=void 0;return n=Je(t)?He.svg:He[t]||[],-1!==Ke.indexOf(e)||-1!==n.indexOf(e)},Qe=function(e){return-1!==Ye.indexOf(e)},et=function(e){return-1!==Ve.indexOf(e)},tt=function(e,t){var n=t&&t.cache?t.cache:j,r=t&&t.serializer?t.serializer:m;return(t&&t.strategy?t.strategy:h)(e,{cache:n,serializer:r})}(function(e,t){return"string"!=typeof e||($e(t,e)||et(t)||Ze(t.toLowerCase()))&&(!Qe(t)||Je(e))}),nt=function(t){function n(o){function i(){function i(e){var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{};return n(e,T({forwardProps:m.forwardProps},t))(m.styles)}for(var s=arguments.length,p=Array(s),h=0;h<s;h++)p[h]=arguments[h];var m=function(e){function r(){var e,t,n,o;w(this,r);for(var a=arguments.length,i=Array(a),s=0;s<a;s++)i[s]=arguments[s];return t=n=M(this,(e=r.__proto__||Object.getPrototypeOf(r)).call.apply(e,[this].concat(i))),n.state={theme:null},n.setTheme=function(e){return n.setState({theme:e})},o=t,M(n,o)}return P(r,e),S(r,[{key:"componentWillMount",value:function(){var e=this.props.theme;this.context[k]?this.setTheme(e||this.context[k].getState()):this.setTheme(e||{})}},{key:"componentWillReceiveProps",value:function(e){this.props.theme!==e.theme&&this.setTheme(e.theme)}},{key:"componentDidMount",value:function(){this.context[k]&&!this.props.theme&&(this.unsubscribe=this.context[k].subscribe(this.setTheme))}},{key:"componentWillUnmount",value:function(){this.unsubscribe&&this.unsubscribe()}},{key:"render",value:function(){var e=this.props,o=t(e,r),i=o.toForward,s=o.cssOverrides,l=this.state.theme,c=(a(r.styles,e,s,l,this.context)+" "+(n.config.useDisplayNameInClassName?u(r.displayName):"")).trim();return b.createElement(r.comp,T({ref:e.innerRef},i,{className:c}))}}]),r}(e.Component);m.propTypes={className:x.string,cssOverrides:x.object,theme:x.object,innerRef:x.func,glam:x.object};var f=O({},k,x.object),g=null;return Object.defineProperty(m,"contextTypes",{enumerable:!0,configurable:!0,set:function(e){g=e},get:function(){return g?T({},f,g):f}}),Object.assign(m,r({comp:o,styles:p,rootEl:l,forwardProps:d,displayName:c}),{withComponent:i}),m}var s=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{},l=s.rootEl,c=s.displayName,p=s.forwardProps,d=void 0===p?[]:p;return i}function r(e){var t=e.comp,n=e.styles,r=e.rootEl,a=e.forwardProps,s=e.displayName,l=t.comp?t.comp:t;return{styles:o(t.styles,n),comp:l,rootEl:r||l,forwardProps:o(t.forwardProps,a),displayName:s||"glamorous("+i(t)+")"}}function o(e,t){return e?e.concat(t):t}function i(e){return"string"==typeof e?e:e.displayName||e.name||"unknown"}return n.config={useDisplayNameInClassName:!1},n}(g);Object.assign(nt,C.reduce(function(e,t){return e[t]=nt(t),e},{})),Object.assign(nt,C.reduce(function(e,t){var n=y(t);return e[n]=nt[t](),e[n].displayName="glamorous."+n,e[n].propsAreCssOverrides=!0,e},{})),nt.default=nt;var rt=Object.freeze({default:nt,ThemeProvider:F,withTheme:n}),ot=nt;return Object.assign(ot,Object.keys(rt).reduce(function(e,t){return"default"!==t&&(e[t]=rt[t]),e},{})),ot});
+!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?module.exports=t(require("react"),require("glamor")):"function"==typeof define&&define.amd?define(["react","glamor"],t):e.glamorous=t(e.React,e.Glamor)}(this,function(e,t){"use strict";function n(t){var n=function(e){function n(){var e,t,r,o;w(this,n);for(var a=arguments.length,i=Array(a),s=0;s<a;s++)i[s]=arguments[s];return t=r=M(this,(e=n.__proto__||Object.getPrototypeOf(n)).call.apply(e,[this].concat(i))),r.state={theme:{}},r.setTheme=function(e){return r.setState({theme:e})},o=t,M(r,o)}return P(n,e),O(n,[{key:"componentWillMount",value:function(){this.context[k]&&this.setState({theme:this.context[k].getState()})}},{key:"componentDidMount",value:function(){this.context[k]&&(this.unsubscribe=this.context[k].subscribe(this.setTheme))}},{key:"componentWillUnmount",value:function(){this.unsubscribe&&this.unsubscribe()}},{key:"render",value:function(){return b.createElement(t,T({},this.props,this.state))}}]),n}(e.Component);return n.contextTypes=S({},k,x.object),n}function r(e){var t=[],n=e;return{getState:function(){return n},setState:function(e){n=e,t.forEach(function(e){return e(n)})},subscribe:function(e){return t.push(e),function(){t=t.filter(function(t){return t!==e})}}}}function o(){return(arguments.length>0&&void 0!==arguments[0]?arguments[0]:"").toString().split(" ").reduce(function(e,t){if(0===t.indexOf("css-")){var n=l(t);e.glamorStyles.push(n)}else e.glamorlessClassName=(e.glamorlessClassName+" "+t).trim();return e},{glamorlessClassName:"",glamorStyles:[]})}function a(e){var n=e.styles,r=e.props,a=e.cssOverrides,s=e.cssProp,l=e.theme,u=e.context,c=o(r.className),p=c.glamorStyles,d=c.glamorlessClassName,h=i([].concat(E(n),[p,a,s]),r,l,u),m=h.mappedArgs,f=h.nonGlamorClassNames;return(t.css.apply(void 0,E(m)).toString()+" "+[].concat(E(f),[d]).join(" ").trim()).trim()}function i(e,t,n,r){for(var o=void 0,a=[],l=[],u=0;u<e.length;u++)if("function"==typeof(o=e[u])){var c=o(t,n,r);"string"==typeof c?s(c,a,l):a.push(c)}else if("string"==typeof o)s(o,a,l);else if(Array.isArray(o)){var p=i(o,t,n,r);a.push.apply(a,E(p.mappedArgs)),l.push.apply(l,E(p.nonGlamorClassNames))}else a.push(o);return{mappedArgs:a,nonGlamorClassNames:l}}function s(e,t,n){var r=l(e);r?t.push(r):n.push(e)}function l(e){var n=e.slice("css-".length);return t.styleSheet.registered[n]?t.styleSheet.registered[n].style:null}function u(e){return e.replace(/ /g,"-").replace(/[^A-Za-z0-9\-_]/g,"_")}function c(e){return null==e||"function"!=typeof e&&"object"!=typeof e}function p(e,t,n,r){var o=c(r)?r:n(r);if(!t.has(o)){var a=e.call(this,r);return t.set(o,a),a}return t.get(o)}function d(e,t,n){var r=Array.prototype.slice.call(arguments,3),o=n(r);if(!t.has(o)){var a=e.apply(this,r);return t.set(o,a),a}return t.get(o)}function h(e,t){var n=1===e.length?p:d;return n=n.bind(this,e,t.cache.create(),t.serializer)}function m(){return JSON.stringify(arguments)}function f(){this.cache=Object.create(null)}function g(e,t){var n=t.propsAreCssOverrides,r=t.rootEl,o=t.forwardProps,a=e.css,i=(e.theme,e.className,e.innerRef,e.glam,D(e,["css","theme","className","innerRef","glam"])),s={toForward:{},cssProp:a,cssOverrides:{}};return n||"string"==typeof r?Object.keys(i).reduce(function(e,t){return-1!==o.indexOf(t)||tt(r,t)?e.toForward[t]=i[t]:n&&(e.cssOverrides[t]=i[t]),e},s):(s.toForward=i,s)}function y(e){return e.slice(0,1).toUpperCase()+e.slice(1)}var b="default"in e?e.default:e,v=["a","altGlyph","altGlyphDef","altGlyphItem","animate","animateColor","animateMotion","animateTransform","animation","audio","canvas","circle","clipPath","color-profile","cursor","defs","desc","discard","ellipse","feBlend","feColorMatrix","feComponentTransfer","feComposite","feConvolveMatrix","feDiffuseLighting","feDisplacementMap","feDistantLight","feDropShadow","feFlood","feFuncA","feFuncB","feFuncG","feFuncR","feGaussianBlur","feImage","feMerge","feMergeNode","feMorphology","feOffset","fePointLight","feSpecularLighting","feSpotLight","feTile","feTurbulence","filter","font","font-face","font-face-format","font-face-name","font-face-src","font-face-uri","foreignObject","g","glyph","glyphRef","handler","hatch","hatchpath","hkern","iframe","image","line","linearGradient","listener","marker","mask","mesh","meshgradient","meshpatch","meshrow","metadata","missing-glyph","mpath","path","pattern","polygon","polyline","prefetch","radialGradient","rect","script","set","solidColor","solidcolor","stop","style","svg","switch","symbol","tbreak","text","textArea","textPath","title","tref","tspan","unknown","use","video","view","vkern"],C=["a","abbr","acronym","address","applet","area","article","aside","audio","b","base","basefont","bdi","bdo","bgsound","big","blink","blockquote","body","br","button","canvas","caption","center","cite","code","col","colgroup","command","content","data","datalist","dd","del","details","dfn","dialog","dir","div","dl","dt","element","em","embed","fieldset","figcaption","figure","font","footer","form","frame","frameset","h1","h2","h3","h4","h5","h6","head","header","hgroup","hr","html","i","iframe","image","img","input","ins","isindex","kbd","keygen","label","legend","li","link","listing","main","map","mark","marquee","math","menu","menuitem","meta","meter","multicol","nav","nextid","nobr","noembed","noframes","noscript","object","ol","optgroup","option","output","p","param","picture","plaintext","pre","progress","q","rb","rbc","rp","rt","rtc","ruby","s","samp","script","section","select","shadow","slot","small","source","spacer","span","strike","strong","style","sub","summary","sup","svg","table","tbody","td","template","textarea","tfoot","th","thead","time","title","tr","track","tt","u","ul","var","video","wbr","xmp"].concat(v).filter(function(e,t,n){return n.indexOf(e)===t}),k="__glamorous__",x=void 0;if("15.5"===b.version.slice(0,4))try{x=require("prop-types")}catch(e){}x=x||b.PropTypes;var w=function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")},O=function(){function e(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}return function(t,n,r){return n&&e(t.prototype,n),r&&e(t,r),t}}(),S=function(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e},T=Object.assign||function(e){for(var t=1;t<arguments.length;t++){var n=arguments[t];for(var r in n)Object.prototype.hasOwnProperty.call(n,r)&&(e[r]=n[r])}return e},P=function(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)},D=function(e,t){var n={};for(var r in e)t.indexOf(r)>=0||Object.prototype.hasOwnProperty.call(e,r)&&(n[r]=e[r]);return n},M=function(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t},E=function(e){if(Array.isArray(e)){for(var t=0,n=Array(e.length);t<e.length;t++)n[t]=e[t];return n}return Array.from(e)},F=function(e){function t(){var e,n,o,a;w(this,t);for(var i=arguments.length,s=Array(i),l=0;l<i;l++)s[l]=arguments[l];return n=o=M(this,(e=t.__proto__||Object.getPrototypeOf(t)).call.apply(e,[this].concat(s))),o.broadcast=r(o.props.theme),o.setOuterTheme=function(e){o.outerTheme=e},a=n,M(o,a)}return P(t,e),O(t,[{key:"getTheme",value:function(e){var t=e||this.props.theme;return T({},this.outerTheme,t)}},{key:"getChildContext",value:function(){return S({},k,this.broadcast)}},{key:"componentDidMount",value:function(){this.context[k]&&(this.unsubscribe=this.context[k].subscribe(this.setOuterTheme))}},{key:"componentWillMount",value:function(){this.context[k]&&(this.setOuterTheme(this.context[k].getState()),this.broadcast.setState(this.getTheme()))}},{key:"componentWillReceiveProps",value:function(e){this.props.theme!==e.theme&&this.broadcast.setState(this.getTheme(e.theme))}},{key:"componentWillUnmount",value:function(){this.unsubscribe&&this.unsubscribe()}},{key:"render",value:function(){return this.props.children?b.Children.only(this.props.children):null}}]),t}(e.Component);F.childContextTypes=S({},k,x.object.isRequired),F.contextTypes=S({},k,x.object),F.propTypes={theme:x.object.isRequired,children:x.node};f.prototype.has=function(e){return e in this.cache},f.prototype.get=function(e){return this.cache[e]},f.prototype.set=function(e,t){this.cache[e]=t};var A={create:function(){return new f}},j=["coords","download","href","name","rel","shape","target","type"],L=["title"],R=["alt","height","name","width"],N=["alt","coords","download","href","rel","shape","target","type"],_=["controls","loop","muted","preload","src"],z=["href","target"],q=["size"],U=["dir"],I=["cite"],W=["disabled","form","name","type","value"],G=["height","width"],B=["span","width"],H=["span","width"],V=["value"],K=["cite"],X=["open"],Y=["title"],Z=["open"],J=["height","src","type","width"],$=["disabled","form","name"],Q=["size"],ee=["accept","action","method","name","target"],te=["name","scrolling","src"],ne=["cols","rows"],re=["profile"],oe=["size","width"],ae=["manifest"],ie=["height","name","sandbox","scrolling","src","width"],se=["alt","height","name","sizes","src","width"],le=["accept","alt","autoCapitalize","autoCorrect","autoSave","checked","defaultChecked","defaultValue","disabled","form","height","list","max","min","multiple","name","onChange","pattern","placeholder","required","results","size","src","step","title","type","value","width"],ue=["cite"],ce=["challenge","disabled","form","name"],pe=["form"],de=["type","value"],he=["color","href","integrity","media","nonce","rel","scope","sizes","target","title","type"],me=["name"],fe=["label","type"],ge=["checked","default","disabled","icon","label","title","type"],ye=["content","name"],be=["high","low","max","min","optimum","value"],ve=["data","form","height","name","type","width"],Ce=["reversed","start","type"],ke=["disabled","label"],xe=["disabled","label","selected","value"],we=["form","name"],Oe=["name","type","value"],Se=["width"],Te=["max","value"],Pe=["cite"],De=["async","defer","integrity","nonce","src","type"],Me=["defaultValue","disabled","form","multiple","name","onChange","required","size","value"],Ee=["name"],Fe=["media","sizes","src","type"],Ae=["media","nonce","title","type"],je=["summary","width"],Le=["headers","height","scope","width"],Re=["autoCapitalize","autoCorrect","cols","defaultValue","disabled","form","name","onChange","placeholder","required","rows","value","wrap"],Ne=["headers","height","scope","width"],_e=["default","kind","label","src"],ze=["type"],qe=["controls","height","loop","muted","poster","preload","src","width"],Ue=["accentHeight","accumulate","additive","alignmentBaseline","allowReorder","alphabetic","amplitude","arabicForm","ascent","attributeName","attributeType","autoReverse","azimuth","baseFrequency","baseProfile","baselineShift","bbox","begin","bias","by","calcMode","capHeight","clip","clipPath","clipPathUnits","clipRule","color","colorInterpolation","colorInterpolationFilters","colorProfile","colorRendering","contentScriptType","contentStyleType","cursor","cx","cy","d","decelerate","descent","diffuseConstant","direction","display","divisor","dominantBaseline","dur","dx","dy","edgeMode","elevation","enableBackground","end","exponent","externalResourcesRequired","fill","fillOpacity","fillRule","filter","filterRes","filterUnits","floodColor","floodOpacity","focusable","fontFamily","fontSize","fontSizeAdjust","fontStretch","fontStyle","fontVariant","fontWeight","format","from","fx","fy","g1","g2","glyphName","glyphOrientationHorizontal","glyphOrientationVertical","glyphRef","gradientTransform","gradientUnits","hanging","height","horizAdvX","horizOriginX","ideographic","imageRendering","in","in2","intercept","k","k1","k2","k3","k4","kernelMatrix","kernelUnitLength","kerning","keyPoints","keySplines","keyTimes","lengthAdjust","letterSpacing","lightingColor","limitingConeAngle","local","markerEnd","markerHeight","markerMid","markerStart","markerUnits","markerWidth","mask","maskContentUnits","maskUnits","mathematical","mode","numOctaves","offset","opacity","operator","order","orient","orientation","origin","overflow","overlinePosition","overlineThickness","paintOrder","panose1","pathLength","patternContentUnits","patternTransform","patternUnits","pointerEvents","points","pointsAtX","pointsAtY","pointsAtZ","preserveAlpha","preserveAspectRatio","primitiveUnits","r","radius","refX","refY","renderingIntent","repeatCount","repeatDur","requiredExtensions","requiredFeatures","restart","result","rotate","rx","ry","scale","seed","shapeRendering","slope","spacing","specularConstant","specularExponent","speed","spreadMethod","startOffset","stdDeviation","stemh","stemv","stitchTiles","stopColor","stopOpacity","strikethroughPosition","strikethroughThickness","string","stroke","strokeDasharray","strokeDashoffset","strokeLinecap","strokeLinejoin","strokeMiterlimit","strokeOpacity","strokeWidth","surfaceScale","systemLanguage","tableValues","targetX","targetY","textAnchor","textDecoration","textLength","textRendering","to","transform","u1","u2","underlinePosition","underlineThickness","unicode","unicodeBidi","unicodeRange","unitsPerEm","vAlphabetic","vHanging","vIdeographic","vMathematical","values","vectorEffect","version","vertAdvY","vertOriginX","vertOriginY","viewBox","viewTarget","visibility","width","widths","wordSpacing","writingMode","x","x1","x2","xChannelSelector","xHeight","xlinkActuate","xlinkArcrole","xlinkHref","xlinkRole","xlinkShow","xlinkTitle","xlinkType","xmlBase","xmlLang","xmlSpace","y","y1","y2","yChannelSelector","z","zoomAndPan"],Ie={html:["a","abbr","address","area","article","aside","audio","b","base","bdi","bdo","big","blockquote","body","br","button","canvas","caption","cite","code","col","colgroup","data","datalist","dd","del","details","dfn","dialog","div","dl","dt","em","embed","fieldset","figcaption","figure","footer","form","h1","h2","h3","h4","h5","h6","head","header","hgroup","hr","html","i","iframe","img","input","ins","kbd","keygen","label","legend","li","link","main","map","mark","menu","menuitem","meta","meter","nav","noscript","object","ol","optgroup","option","output","p","param","picture","pre","progress","q","rp","rt","ruby","s","samp","script","section","select","small","source","span","strong","style","sub","summary","sup","table","tbody","td","textarea","tfoot","th","thead","time","title","tr","track","u","ul","var","video","wbr"],svg:["circle","clipPath","defs","ellipse","g","image","line","linearGradient","mask","path","pattern","polygon","polyline","radialGradient","rect","stop","svg","text","tspan"]},We={a:j,abbr:L,applet:R,area:N,audio:_,base:z,basefont:q,bdo:U,blockquote:I,button:W,canvas:G,col:B,colgroup:H,data:V,del:K,details:X,dfn:Y,dialog:Z,embed:J,fieldset:$,font:Q,form:ee,frame:te,frameset:ne,head:re,hr:oe,html:ae,iframe:ie,img:se,input:le,ins:ue,keygen:ce,label:pe,li:de,link:he,map:me,menu:fe,menuitem:ge,meta:ye,meter:be,object:ve,ol:Ce,optgroup:ke,option:xe,output:we,param:Oe,pre:Se,progress:Te,q:Pe,script:De,select:Me,slot:Ee,source:Fe,style:Ae,table:je,td:Le,textarea:Re,th:Ne,track:_e,ul:ze,video:qe,svg:Ue,elements:Ie,"*":["about","acceptCharset","accessKey","allowFullScreen","allowTransparency","autoComplete","autoFocus","autoPlay","capture","cellPadding","cellSpacing","charSet","classID","className","colSpan","contentEditable","contextMenu","crossOrigin","dangerouslySetInnerHTML","datatype","dateTime","dir","draggable","encType","formAction","formEncType","formMethod","formNoValidate","formTarget","frameBorder","hidden","hrefLang","htmlFor","httpEquiv","id","inlist","inputMode","is","itemID","itemProp","itemRef","itemScope","itemType","keyParams","keyType","lang","marginHeight","marginWidth","maxLength","mediaGroup","minLength","noValidate","prefix","property","radioGroup","readOnly","resource","role","rowSpan","scoped","seamless","security","spellCheck","srcDoc","srcLang","srcSet","style","suppressContentEditableWarning","tabIndex","title","typeof","unselectable","useMap","vocab","wmode"]},Ge=Object.freeze({a:j,abbr:L,applet:R,area:N,audio:_,base:z,basefont:q,bdo:U,blockquote:I,button:W,canvas:G,col:B,colgroup:H,data:V,del:K,details:X,dfn:Y,dialog:Z,embed:J,fieldset:$,font:Q,form:ee,frame:te,frameset:ne,head:re,hr:oe,html:ae,iframe:ie,img:se,input:le,ins:ue,keygen:ce,label:pe,li:de,link:he,map:me,menu:fe,menuitem:ge,meta:ye,meter:be,object:ve,ol:Ce,optgroup:ke,option:xe,output:we,param:Oe,pre:Se,progress:Te,q:Pe,script:De,select:Me,slot:Ee,source:Fe,style:Ae,table:je,td:Le,textarea:Re,th:Ne,track:_e,ul:ze,video:qe,svg:Ue,elements:Ie,default:We}),Be=Ge&&We||Ge,He=function(e){return e&&e.__esModule?e.default:e}(function(e,t){return t={exports:{}},e(t,t.exports),t.exports}(function(e,t){Object.defineProperty(t,"__esModule",{value:!0}),t.default=Be,e.exports=Be})),Ve=["children","dangerouslySetInnerHTML","key","ref","autoFocus","defaultValue","valueLink","defaultChecked","checkedLink","innerHTML","suppressContentEditableWarning","onFocusIn","onFocusOut","className","onCopy","onCut","onPaste","onCompositionEnd","onCompositionStart","onCompositionUpdate","onKeyDown","onKeyPress","onKeyUp","onFocus","onBlur","onChange","onInput","onSubmit","onClick","onContextMenu","onDoubleClick","onDrag","onDragEnd","onDragEnter","onDragExit","onDragLeave","onDragOver","onDragStart","onDrop","onMouseDown","onMouseEnter","onMouseLeave","onMouseMove","onMouseOut","onMouseOver","onMouseUp","onSelect","onTouchCancel","onTouchEnd","onTouchMove","onTouchStart","onScroll","onWheel","onAbort","onCanPlay","onCanPlayThrough","onDurationChange","onEmptied","onEncrypted","onEnded","onError","onLoadedData","onLoadedMetadata","onLoadStart","onPause","onPlay","onPlaying","onProgress","onRateChange","onSeeked","onSeeking","onStalled","onSuspend","onTimeUpdate","onVolumeChange","onWaiting","onLoad","onAnimationStart","onAnimationEnd","onAnimationIteration","onTransitionEnd","onCopyCapture","onCutCapture","onPasteCapture","onCompositionEndCapture","onCompositionStartCapture","onCompositionUpdateCapture","onKeyDownCapture","onKeyPressCapture","onKeyUpCapture","onFocusCapture","onBlurCapture","onChangeCapture","onInputCapture","onSubmitCapture","onClickCapture","onContextMenuCapture","onDoubleClickCapture","onDragCapture","onDragEndCapture","onDragEnterCapture","onDragExitCapture","onDragLeaveCapture","onDragOverCapture","onDragStartCapture","onDropCapture","onMouseDownCapture","onMouseEnterCapture","onMouseLeaveCapture","onMouseMoveCapture","onMouseOutCapture","onMouseOverCapture","onMouseUpCapture","onSelectCapture","onTouchCancelCapture","onTouchEndCapture","onTouchMoveCapture","onTouchStartCapture","onScrollCapture","onWheelCapture","onAbortCapture","onCanPlayCapture","onCanPlayThroughCapture","onDurationChangeCapture","onEmptiedCapture","onEncryptedCapture","onEndedCapture","onErrorCapture","onLoadedDataCapture","onLoadedMetadataCapture","onLoadStartCapture","onPauseCapture","onPlayCapture","onPlayingCapture","onProgressCapture","onRateChangeCapture","onSeekedCapture","onSeekingCapture","onStalledCapture","onSuspendCapture","onTimeUpdateCapture","onVolumeChangeCapture","onWaitingCapture","onLoadCapture","onAnimationStartCapture","onAnimationEndCapture","onAnimationIterationCapture","onTransitionEndCapture"],Ke=He["*"],Xe=He.elements.svg,Ye=["color","height","width"],Ze=RegExp.prototype.test.bind(new RegExp("^(data|aria)-[:A-Z_a-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$")),Je=function(e){return-1!==Xe.indexOf(e)},$e=function(e,t){var n=void 0;return n=Je(t)?He.svg:He[t]||[],-1!==Ke.indexOf(e)||-1!==n.indexOf(e)},Qe=function(e){return-1!==Ye.indexOf(e)},et=function(e){return-1!==Ve.indexOf(e)},tt=function(e,t){var n=t&&t.cache?t.cache:A,r=t&&t.serializer?t.serializer:m;return(t&&t.strategy?t.strategy:h)(e,{cache:n,serializer:r})}(function(e,t){return"string"!=typeof e||($e(t,e)||et(t)||Ze(t.toLowerCase()))&&(!Qe(t)||Je(e))}),nt=function(t){function n(o){function i(){function i(e){var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{};return n(e,T({forwardProps:m.forwardProps},t))(m.styles)}for(var s=arguments.length,p=Array(s),h=0;h<s;h++)p[h]=arguments[h];var m=function(e){function r(){var e,t,n,o;w(this,r);for(var a=arguments.length,i=Array(a),s=0;s<a;s++)i[s]=arguments[s];return t=n=M(this,(e=r.__proto__||Object.getPrototypeOf(r)).call.apply(e,[this].concat(i))),n.state={theme:null},n.setTheme=function(e){return n.setState({theme:e})},o=t,M(n,o)}return P(r,e),O(r,[{key:"componentWillMount",value:function(){var e=this.props.theme;this.context[k]?this.setTheme(e||this.context[k].getState()):this.setTheme(e||{})}},{key:"componentWillReceiveProps",value:function(e){this.props.theme!==e.theme&&this.setTheme(e.theme)}},{key:"componentDidMount",value:function(){this.context[k]&&!this.props.theme&&(this.unsubscribe=this.context[k].subscribe(this.setTheme))}},{key:"componentWillUnmount",value:function(){this.unsubscribe&&this.unsubscribe()}},{key:"render",value:function(){var e=this.props,o=t(e,r),i=o.toForward,s=o.cssOverrides,l=o.cssProp,c=this.state.theme,p=(a({styles:r.styles,props:e,cssOverrides:s,cssProp:l,theme:c,context:this.context})+" "+(n.config.useDisplayNameInClassName?u(r.displayName):"")).trim();return b.createElement(r.comp,T({ref:e.innerRef},i,{className:p}))}}]),r}(e.Component);m.propTypes={className:x.string,cssOverrides:x.object,theme:x.object,innerRef:x.func,glam:x.object};var f=S({},k,x.object),g=null;return Object.defineProperty(m,"contextTypes",{enumerable:!0,configurable:!0,set:function(e){g=e},get:function(){return g?T({},f,g):f}}),Object.assign(m,r({comp:o,styles:p,rootEl:l,forwardProps:d,displayName:c}),{withComponent:i}),m}var s=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{},l=s.rootEl,c=s.displayName,p=s.forwardProps,d=void 0===p?[]:p;return i}function r(e){var t=e.comp,n=e.styles,r=e.rootEl,a=e.forwardProps,s=e.displayName,l=t.comp?t.comp:t;return{styles:o(t.styles,n),comp:l,rootEl:r||l,forwardProps:o(t.forwardProps,a),displayName:s||"glamorous("+i(t)+")"}}function o(e,t){return e?e.concat(t):t}function i(e){return"string"==typeof e?e:e.displayName||e.name||"unknown"}return n.config={useDisplayNameInClassName:!1},n}(g);Object.assign(nt,C.reduce(function(e,t){return e[t]=nt(t),e},{})),Object.assign(nt,C.reduce(function(e,t){var n=y(t);return e[n]=nt[t](),e[n].displayName="glamorous."+n,e[n].propsAreCssOverrides=!0,e},{})),nt.default=nt;var rt=Object.freeze({default:nt,ThemeProvider:F,withTheme:n}),ot=nt;return Object.assign(ot,Object.keys(rt).reduce(function(e,t){return"default"!==t&&(e[t]=rt[t]),e},{})),ot});
 //# sourceMappingURL=glamorous.umd.min.js.map

dist/glamorous.umd.tiny.js

@@ -192,11 +192,10 @@ (function (global, factory) {
 
-function getGlamorClassName$1(styles, props, cssOverrides, theme, context) {
-  var _handleStyles = handleStyles(styles, props, theme, context),
-      mappedArgs = _handleStyles.mappedArgs,
-      nonGlamorClassNames = _handleStyles.nonGlamorClassNames;
+function getGlamorClassName$1(_ref) {
+  var styles = _ref.styles,
+      props = _ref.props,
+      cssOverrides = _ref.cssOverrides,
+      cssProp = _ref.cssProp,
+      theme = _ref.theme,
+      context = _ref.context;
 
-  var _handleStyles2 = handleStyles([cssOverrides], props, theme, context),
-      cssOverridesArgs = _handleStyles2.mappedArgs,
-      cssOverridesClassNames = _handleStyles2.nonGlamorClassNames;
-
   var _extractGlamorStyles = extractGlamorStyles(props.className),
@@ -206,7 +205,14 @@ parentGlamorStyles = _extractGlamorStyles.glamorStyles,
 
-  var glamorClassName = glamor.css.apply(undefined, toConsumableArray(mappedArgs).concat(toConsumableArray(parentGlamorStyles), toConsumableArray(cssOverridesArgs))).toString();
-  var extras = nonGlamorClassNames.concat(cssOverridesClassNames).join(' ');
-  return (glamorlessClassName + ' ' + glamorClassName + ' ' + extras).trim();
+  var _handleStyles = handleStyles([].concat(toConsumableArray(styles), [parentGlamorStyles, cssOverrides, cssProp]), props, theme, context),
+      mappedArgs = _handleStyles.mappedArgs,
+      nonGlamorClassNames = _handleStyles.nonGlamorClassNames;
+
+  var glamorClassName = glamor.css.apply(undefined, toConsumableArray(mappedArgs)).toString();
+  var extras = [].concat(toConsumableArray(nonGlamorClassNames), [glamorlessClassName]).join(' ').trim();
+  return (glamorClassName + ' ' + extras).trim();
 }
 
+// this next function is on a "hot" code-path
+// so it's pretty complex to make sure it's fast.
+// eslint-disable-next-line complexity
 function handleStyles(styles, props, theme, context) {
@@ -227,2 +233,6 @@ var current = void 0;
       processStringClass(current, mappedArgs, nonGlamorClassNames);
+    } else if (Array.isArray(current)) {
+      var recursed = handleStyles(current, props, theme, context);
+      mappedArgs.push.apply(mappedArgs, toConsumableArray(recursed.mappedArgs));
+      nonGlamorClassNames.push.apply(nonGlamorClassNames, toConsumableArray(recursed.nonGlamorClassNames));
     } else {
@@ -366,3 +376,4 @@ mappedArgs.push(current);
                 toForward = _splitProps.toForward,
-                cssOverrides = _splitProps.cssOverrides;
+                cssOverrides = _splitProps.cssOverrides,
+                cssProp = _splitProps.cssProp;
 
@@ -375,3 +386,10 @@ // freeze the theme object in dev mode
             // create className to apply
-            var fullClassName = getGlamorClassName$1(GlamorousComponent.styles, props, cssOverrides, theme, this.context);
+            var fullClassName = getGlamorClassName$1({
+              styles: GlamorousComponent.styles,
+              props: props,
+              cssOverrides: cssOverrides,
+              cssProp: cssProp,
+              theme: theme,
+              context: this.context
+            });
             var debugClassName = glamorous.config.useDisplayNameInClassName ? cleanClassname(GlamorousComponent.displayName) : '';
@@ -479,4 +497,3 @@ var className = (fullClassName + ' ' + debugClassName).trim();
 function splitProps(_ref) {
-  var _ref$css = _ref.css,
-      cssOverrides = _ref$css === undefined ? {} : _ref$css,
+  var cssProp = _ref.css,
       theme = _ref.theme,
@@ -488,3 +505,3 @@ className = _ref.className,
 
-  return { toForward: rest, cssOverrides: cssOverrides };
+  return { toForward: rest, cssProp: cssProp };
 }
@@ -491,0 +508,0 @@

dist/glamorous.umd.tiny.min.js

@@ -1,2 +0,2 @@
-!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?module.exports=t(require("react"),require("glamor")):"function"==typeof define&&define.amd?define(["react","glamor"],t):e.glamorous=t(e.React,e.Glamor)}(this,function(e,t){"use strict";function r(){return(arguments.length>0&&void 0!==arguments[0]?arguments[0]:"").toString().split(" ").reduce(function(e,t){if(0===t.indexOf("css-")){var r=a(t);e.glamorStyles.push(r)}else e.glamorlessClassName=(e.glamorlessClassName+" "+t).trim();return e},{glamorlessClassName:"",glamorStyles:[]})}function n(e,n,s,a,i){var l=o(e,n,a,i),c=l.mappedArgs,u=l.nonGlamorClassNames,f=o([s],n,a,i),p=f.mappedArgs,m=f.nonGlamorClassNames,h=r(n.className),y=h.glamorStyles;return(h.glamorlessClassName+" "+t.css.apply(void 0,b(c).concat(b(y),b(p))).toString()+" "+u.concat(m).join(" ")).trim()}function o(e,t,r,n){for(var o=void 0,a=[],i=[],l=0;l<e.length;l++)if("function"==typeof(o=e[l])){var c=o(t,r,n);"string"==typeof c?s(c,a,i):a.push(c)}else"string"==typeof o?s(o,a,i):a.push(o);return{mappedArgs:a,nonGlamorClassNames:i}}function s(e,t,r){var n=a(e);n?t.push(n):r.push(e)}function a(e){var r=e.slice("css-".length);return t.styleSheet.registered[r]?t.styleSheet.registered[r].style:null}function i(e){return e.replace(/ /g,"-").replace(/[^A-Za-z0-9\-_]/g,"_")}function l(e){var t=e.css,r=void 0===t?{}:t;e.theme,e.className,e.innerRef,e.glam;return{toForward:g(e,["css","theme","className","innerRef","glam"]),cssOverrides:r}}var c="default"in e?e.default:e,u=void 0;if("15.5"===c.version.slice(0,4))try{u=require("prop-types")}catch(e){}u=u||c.PropTypes;var f="__glamorous__",p=function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")},m=function(){function e(e,t){for(var r=0;r<t.length;r++){var n=t[r];n.enumerable=n.enumerable||!1,n.configurable=!0,"value"in n&&(n.writable=!0),Object.defineProperty(e,n.key,n)}}return function(t,r,n){return r&&e(t.prototype,r),n&&e(t,n),t}}(),h=function(e,t,r){return t in e?Object.defineProperty(e,t,{value:r,enumerable:!0,configurable:!0,writable:!0}):e[t]=r,e},y=Object.assign||function(e){for(var t=1;t<arguments.length;t++){var r=arguments[t];for(var n in r)Object.prototype.hasOwnProperty.call(r,n)&&(e[n]=r[n])}return e},d=function(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)},g=function(e,t){var r={};for(var n in e)t.indexOf(n)>=0||Object.prototype.hasOwnProperty.call(e,n)&&(r[n]=e[n]);return r},v=function(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t},b=function(e){if(Array.isArray(e)){for(var t=0,r=Array(e.length);t<e.length;t++)r[t]=e[t];return r}return Array.from(e)};return function(t){function r(s){function a(){function a(e){var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{};return r(e,y({forwardProps:j.forwardProps},t))(j.styles)}for(var l=arguments.length,w=Array(l),O=0;O<l;O++)w[O]=arguments[O];var j=function(e){function o(){var e,t,r,n;p(this,o);for(var s=arguments.length,a=Array(s),i=0;i<s;i++)a[i]=arguments[i];return t=r=v(this,(e=o.__proto__||Object.getPrototypeOf(o)).call.apply(e,[this].concat(a))),r.state={theme:null},r.setTheme=function(e){return r.setState({theme:e})},n=t,v(r,n)}return d(o,e),m(o,[{key:"componentWillMount",value:function(){var e=this.props.theme;this.context[f]?this.setTheme(e||this.context[f].getState()):this.setTheme(e||{})}},{key:"componentWillReceiveProps",value:function(e){this.props.theme!==e.theme&&this.setTheme(e.theme)}},{key:"componentDidMount",value:function(){this.context[f]&&!this.props.theme&&(this.unsubscribe=this.context[f].subscribe(this.setTheme))}},{key:"componentWillUnmount",value:function(){this.unsubscribe&&this.unsubscribe()}},{key:"render",value:function(){var e=this.props,s=t(e,o),a=s.toForward,l=s.cssOverrides,u=this.state.theme,f=(n(o.styles,e,l,u,this.context)+" "+(r.config.useDisplayNameInClassName?i(o.displayName):"")).trim();return c.createElement(o.comp,y({ref:e.innerRef},a,{className:f}))}}]),o}(e.Component);j.propTypes={className:u.string,cssOverrides:u.object,theme:u.object,innerRef:u.func,glam:u.object};var P=h({},f,u.object),_=null;return Object.defineProperty(j,"contextTypes",{enumerable:!0,configurable:!0,set:function(e){_=e},get:function(){return _?y({},P,_):P}}),Object.assign(j,o({comp:s,styles:w,rootEl:g,forwardProps:N,displayName:b}),{withComponent:a}),j}var l=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{},g=l.rootEl,b=l.displayName,w=l.forwardProps,N=void 0===w?[]:w;return a}function o(e){var t=e.comp,r=e.styles,n=e.rootEl,o=e.forwardProps,i=e.displayName,l=t.comp?t.comp:t;return{styles:s(t.styles,r),comp:l,rootEl:n||l,forwardProps:s(t.forwardProps,o),displayName:i||"glamorous("+a(t)+")"}}function s(e,t){return e?e.concat(t):t}function a(e){return"string"==typeof e?e:e.displayName||e.name||"unknown"}return r.config={useDisplayNameInClassName:!1},r}(l)});
+!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?module.exports=t(require("react"),require("glamor")):"function"==typeof define&&define.amd?define(["react","glamor"],t):e.glamorous=t(e.React,e.Glamor)}(this,function(e,t){"use strict";function r(){return(arguments.length>0&&void 0!==arguments[0]?arguments[0]:"").toString().split(" ").reduce(function(e,t){if(0===t.indexOf("css-")){var r=a(t);e.glamorStyles.push(r)}else e.glamorlessClassName=(e.glamorlessClassName+" "+t).trim();return e},{glamorlessClassName:"",glamorStyles:[]})}function n(e){var n=e.styles,s=e.props,a=e.cssOverrides,i=e.cssProp,l=e.theme,c=e.context,u=r(s.className),p=u.glamorStyles,f=u.glamorlessClassName,m=o([].concat(b(n),[p,a,i]),s,l,c),y=m.mappedArgs,h=m.nonGlamorClassNames;return(t.css.apply(void 0,b(y)).toString()+" "+[].concat(b(h),[f]).join(" ").trim()).trim()}function o(e,t,r,n){for(var a=void 0,i=[],l=[],c=0;c<e.length;c++)if("function"==typeof(a=e[c])){var u=a(t,r,n);"string"==typeof u?s(u,i,l):i.push(u)}else if("string"==typeof a)s(a,i,l);else if(Array.isArray(a)){var p=o(a,t,r,n);i.push.apply(i,b(p.mappedArgs)),l.push.apply(l,b(p.nonGlamorClassNames))}else i.push(a);return{mappedArgs:i,nonGlamorClassNames:l}}function s(e,t,r){var n=a(e);n?t.push(n):r.push(e)}function a(e){var r=e.slice("css-".length);return t.styleSheet.registered[r]?t.styleSheet.registered[r].style:null}function i(e){return e.replace(/ /g,"-").replace(/[^A-Za-z0-9\-_]/g,"_")}function l(e){var t=e.css;e.theme,e.className,e.innerRef,e.glam;return{toForward:g(e,["css","theme","className","innerRef","glam"]),cssProp:t}}var c="default"in e?e.default:e,u=void 0;if("15.5"===c.version.slice(0,4))try{u=require("prop-types")}catch(e){}u=u||c.PropTypes;var p="__glamorous__",f=function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")},m=function(){function e(e,t){for(var r=0;r<t.length;r++){var n=t[r];n.enumerable=n.enumerable||!1,n.configurable=!0,"value"in n&&(n.writable=!0),Object.defineProperty(e,n.key,n)}}return function(t,r,n){return r&&e(t.prototype,r),n&&e(t,n),t}}(),y=function(e,t,r){return t in e?Object.defineProperty(e,t,{value:r,enumerable:!0,configurable:!0,writable:!0}):e[t]=r,e},h=Object.assign||function(e){for(var t=1;t<arguments.length;t++){var r=arguments[t];for(var n in r)Object.prototype.hasOwnProperty.call(r,n)&&(e[n]=r[n])}return e},d=function(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)},g=function(e,t){var r={};for(var n in e)t.indexOf(n)>=0||Object.prototype.hasOwnProperty.call(e,n)&&(r[n]=e[n]);return r},v=function(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t},b=function(e){if(Array.isArray(e)){for(var t=0,r=Array(e.length);t<e.length;t++)r[t]=e[t];return r}return Array.from(e)};return function(t){function r(s){function a(){function a(e){var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{};return r(e,h({forwardProps:P.forwardProps},t))(P.styles)}for(var l=arguments.length,w=Array(l),O=0;O<l;O++)w[O]=arguments[O];var P=function(e){function o(){var e,t,r,n;f(this,o);for(var s=arguments.length,a=Array(s),i=0;i<s;i++)a[i]=arguments[i];return t=r=v(this,(e=o.__proto__||Object.getPrototypeOf(o)).call.apply(e,[this].concat(a))),r.state={theme:null},r.setTheme=function(e){return r.setState({theme:e})},n=t,v(r,n)}return d(o,e),m(o,[{key:"componentWillMount",value:function(){var e=this.props.theme;this.context[p]?this.setTheme(e||this.context[p].getState()):this.setTheme(e||{})}},{key:"componentWillReceiveProps",value:function(e){this.props.theme!==e.theme&&this.setTheme(e.theme)}},{key:"componentDidMount",value:function(){this.context[p]&&!this.props.theme&&(this.unsubscribe=this.context[p].subscribe(this.setTheme))}},{key:"componentWillUnmount",value:function(){this.unsubscribe&&this.unsubscribe()}},{key:"render",value:function(){var e=this.props,s=t(e,o),a=s.toForward,l=s.cssOverrides,u=s.cssProp,p=this.state.theme,f=(n({styles:o.styles,props:e,cssOverrides:l,cssProp:u,theme:p,context:this.context})+" "+(r.config.useDisplayNameInClassName?i(o.displayName):"")).trim();return c.createElement(o.comp,h({ref:e.innerRef},a,{className:f}))}}]),o}(e.Component);P.propTypes={className:u.string,cssOverrides:u.object,theme:u.object,innerRef:u.func,glam:u.object};var j=y({},p,u.object),_=null;return Object.defineProperty(P,"contextTypes",{enumerable:!0,configurable:!0,set:function(e){_=e},get:function(){return _?h({},j,_):j}}),Object.assign(P,o({comp:s,styles:w,rootEl:g,forwardProps:N,displayName:b}),{withComponent:a}),P}var l=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{},g=l.rootEl,b=l.displayName,w=l.forwardProps,N=void 0===w?[]:w;return a}function o(e){var t=e.comp,r=e.styles,n=e.rootEl,o=e.forwardProps,i=e.displayName,l=t.comp?t.comp:t;return{styles:s(t.styles,r),comp:l,rootEl:n||l,forwardProps:s(t.forwardProps,o),displayName:i||"glamorous("+a(t)+")"}}function s(e,t){return e?e.concat(t):t}function a(e){return"string"==typeof e?e:e.displayName||e.name||"unknown"}return r.config={useDisplayNameInClassName:!1},r}(l)});
 //# sourceMappingURL=glamorous.umd.tiny.min.js.map

package.json

 {
   "name": "glamorous",
-  "version": "3.23.0",
+  "version": "3.23.1",
   "description": "React component styling solved",
@@ -5,0 +5,0 @@ "main": "dist/glamorous.cjs.js",

typings/glamorous.d.ts

@@ -34,2 +34,6 @@ // Type definitions for Glamorous v3.2.0
 
+export interface Config {
+  useDisplayNameInClassName: boolean
+}
+
 export interface GlamorousInterface extends HTMLGlamorousInterface, SVGGlamorousInterface {
@@ -43,2 +47,4 @@ <P>(
   Svg: React.StatelessComponent<React.SVGAttributes<any> & ExtraGlamorousProps>
+
+  config: Config
 }
@@ -45,0 +51,0 @@

No alert changes

Improved metrics

Total package byte prevSize

473448

increased by1.07%

Lines of code

6917

increased by1.59%

No dependency changes