styled-components 6.0.0-beta.2 → 6.0.0-beta.4

package/dist/styled-components.js

@@ -12,7 +12,7 @@
         'data-styled';
     var SC_ATTR_ACTIVE = 'active';
     var SC_ATTR_VERSION = 'data-styled-version';
-    var SC_VERSION = "6.0.0-beta.2";
+    var SC_VERSION = "6.0.0-beta.4";
     var SPLITTER = '/*!sc*/\n';
     var IS_BROWSER = typeof window !== 'undefined' && 'HTMLElement' in window;
     var DISABLE_SPEEDY = Boolean(typeof SC_DISABLE_SPEEDY === 'boolean'
@@ -924,8 +924,8 @@
      * inlined version of
      * https://github.com/facebook/fbjs/blob/master/packages/fbjs/src/core/hyphenateStyleName.js
      */
-    var uppercaseCheck = /([A-Z])/;
-    var uppercasePattern = /([A-Z])/g;
+    var uppercaseCheck = /[A-Z]/;
+    var uppercasePattern = /[A-Z]/g;
     var msPattern = /^ms-/;
     var prefixAndLowerCase = function (char) { return "-".concat(char.toLowerCase()); };
     /**
@@ -942,7 +942,7 @@
      * is converted to `-ms-`.
      */
     function hyphenateStyleName(string) {
-        return uppercaseCheck.test(string)
+        return uppercaseCheck.test(string) && !string.startsWith('--')
             ? string.replace(uppercasePattern, prefixAndLowerCase).replace(msPattern, '-ms-')
             : string;
     }
@@ -998,21 +998,18 @@
             var ruleSet = [];
             for (var i = 0, len = chunk.length, result = void 0; i < len; i += 1) {
                 result = flatten(chunk[i], executionContext, styleSheet, stylisInstance);
-                if (result === '')
+                if (result.length === 0)
                     continue;
-                else if (Array.isArray(result))
-                    ruleSet.push.apply(ruleSet, result);
-                else
-                    ruleSet.push(result);
+                ruleSet.push.apply(ruleSet, result);
             }
             return ruleSet;
         }
         if (isFalsish(chunk)) {
-            return '';
+            return [];
         }
         /* Handle other components */
         if (isStyledComponent(chunk)) {
-            return ".".concat(chunk.styledComponentId);
+            return [".".concat(chunk.styledComponentId)];
         }
         /* Either execute or defer the function */
         if (isFunction(chunk)) {
@@ -1028,26 +1025,27 @@
                 }
                 return flatten(result, executionContext, styleSheet, stylisInstance);
             }
-            else
-                return chunk;
+            else {
+                return [chunk];
+            }
         }
         if (chunk instanceof Keyframes) {
             if (styleSheet) {
                 chunk.inject(styleSheet, stylisInstance);
-                return chunk.getName(stylisInstance);
+                return [chunk.getName(stylisInstance)];
+            }
+            else {
+                return [chunk];
             }
-            else
-                return chunk;
         }
         /* Handle objects */
-        return isPlainObject(chunk) ? objToCssArray(chunk) : chunk.toString();
+        return isPlainObject(chunk) ? objToCssArray(chunk) : [chunk.toString()];
     }
 
     function isStaticRules(rules) {
         for (var i = 0; i < rules.length; i += 1) {
             var rule = rules[i];
-            if (isFunction(rule) &&
-                !isStyledComponent(rule)) {
+            if (isFunction(rule) && !isStyledComponent(rule)) {
                 // functions are allowed to be static if they're just being
                 // used to get the classname of a nested styled component
                 return false;
@@ -1209,11 +1207,7 @@
      * expand an array of styles.
      */
     var addTag = function (arg) {
-        if (Array.isArray(arg)) {
-            // eslint-disable-next-line no-param-reassign
-            arg.isCss = true;
-        }
-        return arg;
+        return Object.assign(arg, { isCss: true });
     };
     function css(styles) {
         var interpolations = [];
@@ -1230,7 +1224,7 @@
         if (interpolations.length === 0 &&
             styleStringArray.length === 1 &&
             typeof styleStringArray[0] === 'string') {
-            return styleStringArray;
+            return flatten(styleStringArray);
         }
         return addTag(flatten(interleave(styleStringArray, interpolations)));
     }
@@ -1724,8 +1718,12 @@
     /**
      * Convenience function for joining strings to form className chains
      */
-    function joinStrings(a, b) {
-        return a && b ? "".concat(a, " ").concat(b) : a || b;
+    function joinStrings() {
+        var args = [];
+        for (var _i = 0; _i < arguments.length; _i++) {
+            args[_i] = arguments[_i];
+        }
+        return args.filter(Boolean).join(' ');
     }
 
     function mixinRecursively(target, source, forceMerge) {
@@ -1753,7 +1751,6 @@
      * Source objects applied left to right.  Mutates & returns target.  Similar to lodash merge.
      */
     function mixinDeep(target) {
-        if (target === void 0) { target = {}; }
         var sources = [];
         for (var _i = 1; _i < arguments.length; _i++) {
             sources[_i - 1] = arguments[_i];
@@ -1855,35 +1852,10 @@
         SC_VERSION + name + identifiers[name]));
         return parentComponentId ? "".concat(parentComponentId, "-").concat(componentId) : componentId;
     }
-    function useResolvedAttrs(theme, props, attrs) {
-        if (theme === void 0) { theme = EMPTY_OBJECT; }
-        // NOTE: can't memoize this
-        // returns [context, resolvedAttrs]
-        // where resolvedAttrs is only the things injected by the attrs themselves
-        var context = __assign(__assign({}, props), { theme: theme });
-        attrs.forEach(function (attrDef) {
-            // @ts-expect-error narrowing isn't working properly for some reason
-            var resolvedAttrDef = typeof attrDef === 'function' ? attrDef(context) : attrDef;
-            var key;
-            /* eslint-disable guard-for-in */
-            for (key in resolvedAttrDef) {
-                // @ts-expect-error bad types
-                context[key] =
-                    key === 'className'
-                        ? joinStrings(context[key], resolvedAttrDef[key])
-                        : key === 'style'
-                            ? __assign(__assign({}, context[key]), resolvedAttrDef[key]) : resolvedAttrDef[key];
-            }
-            /* eslint-enable guard-for-in */
-        });
-        return context;
-    }
     function useInjectedStyle(componentStyle, isStatic, resolvedAttrs, warnTooManyClasses) {
         var styleSheet = useStyleSheet();
         var stylis = useStylis();
-        var className = isStatic
-            ? componentStyle.generateAndInjectStyles(EMPTY_OBJECT, styleSheet, stylis)
-            : componentStyle.generateAndInjectStyles(resolvedAttrs, styleSheet, stylis);
+        var className = componentStyle.generateAndInjectStyles(isStatic ? EMPTY_OBJECT : resolvedAttrs, styleSheet, stylis);
         // eslint-disable-next-line react-hooks/rules-of-hooks
         React.useDebugValue(className);
         if (!isStatic && warnTooManyClasses) {
@@ -1898,22 +1870,36 @@
         // NOTE: the non-hooks version only subscribes to this when !componentStyle.isStatic,
         // but that'd be against the rules-of-hooks. We could be naughty and do it anyway as it
         // should be an immutable value, but behave for now.
-        var theme = determineTheme(props, React.useContext(ThemeContext), defaultProps);
-        var context = useResolvedAttrs(theme || EMPTY_OBJECT, props, componentAttrs);
+        var theme = determineTheme(props, React.useContext(ThemeContext), defaultProps) || EMPTY_OBJECT;
+        var context = componentAttrs.reduce(function (p, attrDef) {
+            var resolvedAttrDef = typeof attrDef === 'function' ? attrDef(p) : attrDef;
+            /* eslint-disable guard-for-in */
+            for (var key in resolvedAttrDef) {
+                // @ts-expect-error bad types
+                p[key] =
+                    key === 'className'
+                        ? joinStrings(p[key], resolvedAttrDef[key])
+                        : key === 'style'
+                            ? __assign(__assign({}, p[key]), resolvedAttrDef[key]) : resolvedAttrDef[key];
+            }
+            /* eslint-enable guard-for-in */
+            return p;
+        }, __assign(__assign({}, props), { theme: theme }));
         var generatedClassName = useInjectedStyle(componentStyle, isStatic, context, forwardedComponent.warnTooManyClasses );
         var refToForward = forwardedRef;
-        var elementToBeCreated = context.$as || context.as || target;
+        var elementToBeCreated = context.as || target;
         var isTargetTag = isTag(elementToBeCreated);
         var propsForElement = {};
         // eslint-disable-next-line guard-for-in
         for (var key in context) {
-            if (key[0] === '$' || key === 'as' || key === 'theme')
-                continue;
+            // @ts-expect-error for..in iterates strings instead of keyof
+            if (context[key] === undefined) ;
+            else if (key[0] === '$' || key === 'as' || key === 'theme') ;
             else if (key === 'forwardedAs') {
-                propsForElement.as = context[key];
+                propsForElement.as = context.forwardedAs;
             }
-            else if (shouldForwardProp ? shouldForwardProp(key, elementToBeCreated) : true) {
-                // Don't pass through non HTML tags through to HTML elements
+            else if (!shouldForwardProp || shouldForwardProp(key, elementToBeCreated)) {
+                // @ts-expect-error for..in iterates strings instead of keyof
                 propsForElement[key] = context[key];
             }
         }
@@ -1923,7 +1909,7 @@
             domElements.indexOf(elementToBeCreated) === -1
             ? 'class'
             : 'className'] = foldedComponentIds
-            .concat(styledComponentId, (generatedClassName !== styledComponentId ? generatedClassName : null), context.className)
+            .concat(styledComponentId, generatedClassName !== styledComponentId ? generatedClassName : '', context.className || '')
             .filter(Boolean)
             .join(' ');
         propsForElement.ref = refToForward;
@@ -1939,7 +1925,9 @@
             : options.componentId || componentId;
         // fold the underlying StyledComponent attrs up (implicit extend)
         var finalAttrs = isTargetStyledComp && styledComponentTarget.attrs
-            ? styledComponentTarget.attrs.concat(attrs).filter(Boolean)
+            ? styledComponentTarget.attrs
+                .concat(attrs)
+                .filter(Boolean)
             : attrs;
         var shouldForwardProp = options.shouldForwardProp;
         if (isTargetStyledComp && styledComponentTarget.shouldForwardProp) {