@atlaskit/primitives 3.0.0 → 3.2.0

package/dist/es2019/components/stack.js

@@ -41,16 +41,21 @@ const Stack = /*#__PURE__*/memo( /*#__PURE__*/forwardRef(({
   role
 }, ref) => {
   const justifyContent = spread || alignBlock;
+
+  // We're type coercing this as Compiled styles in an array isn't supported by the types
+  // But the runtime accepts it none-the-wiser. We can remove this entire block and replace
+  // it with cx(defaultStyles, focusRingStyles, xcssStyles) when we've moved away from Emotion.
+  const styles = grow ? [flexGrowMap[grow], ...(Array.isArray(xcss) ? xcss : [xcss])] : xcss;
   return jsx(Flex, {
     as: as,
     role: role,
     gap: space,
     direction: "column",
     alignItems: alignItems,
-    justifyContent: justifyContent,
-    xcss: grow ? [flexGrowMap[grow], ...(Array.isArray(xcss) ? xcss : [xcss])] :
+    justifyContent: justifyContent
     // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage
-    xcss,
+    ,
+    xcss: styles,
     testId: testId,
     ref: ref
   }, children);

package/dist/es2019/components/text.js

@@ -1,5 +1,5 @@
 /** @jsx jsx */
-
+import { createContext, useContext } from 'react';
 import { css, jsx } from '@emotion/react';
 import invariant from 'tiny-invariant';
 import { bodyTextStylesMap, fontWeightStylesMap, inverseColorMap, textColorStylesMap, uiTextStylesMap } from '../xcss/style-maps.partial';
@@ -42,19 +42,29 @@ const wordBreakMap = {
     wordBreak: 'break-all'
   })
 };
+const HasTextAncestorContext = /*#__PURE__*/createContext(false);
+const useHasTextAncestor = () => useContext(HasTextAncestorContext);
 
 /**
  * Custom hook designed to abstract the parsing of the color props and make it clearer in the future how color is reconciled between themes and tokens.
  */
-const useColor = colorProp => {
+const useColor = (colorProp, hasTextAncestor) => {
   const surface = useSurface();
 
   /**
-   * Where the color of the surface is inverted we override the user choice
+   * Where the color of the surface is inverted we always override the color
    * as there is no valid choice that is not covered by the override.
    */
-  const color = inverseColorMap.hasOwnProperty(surface) ? inverseColorMap[surface] : colorProp;
-  return color;
+  if (inverseColorMap.hasOwnProperty(surface)) {
+    return inverseColorMap[surface];
+  }
+  if (colorProp === 'inherit') {
+    return undefined;
+  }
+  if (!colorProp && hasTextAncestor) {
+    return undefined;
+  }
+  return colorProp || 'color.text';
 };
 
 /**
@@ -71,7 +81,7 @@ const Text = ({
   ...props
 }) => {
   const {
-    as: asElement,
+    as: Component = 'span',
     color: colorProp,
     textAlign,
     testId,
@@ -79,10 +89,6 @@ const Text = ({
     variant = 'body',
     weight
   } = props;
-
-  // body variants -> p
-  // ui variants -> span
-  const Component = asElement || (variant.includes('body') ? 'p' : 'span');
   invariant(asAllowlist.includes(Component), `@atlaskit/primitives: Text received an invalid "as" value of "${Component}"`);
 
   // Remove the ability to bypass typescript errors for maxLines
@@ -90,14 +96,20 @@ const Text = ({
   if ('maxLines' in props && variant.includes('body')) {
     maxLines = props.maxLines;
   }
-  const color = useColor(colorProp);
-  return jsx(Component, {
-    css: [resetStyles, variant && variantStyles[variant], color && textColorStylesMap[color], maxLines && truncationStyles, maxLines === 1 && wordBreakMap.breakAll, textAlign && textAlignMap[textAlign], weight && fontWeightStylesMap[weight], asElement === 'em' && emStyles, asElement === 'strong' && strongStyles],
+  const hasTextAncestor = useHasTextAncestor();
+  const color = useColor(colorProp, hasTextAncestor);
+  const component = jsx(Component, {
+    css: [resetStyles, variantStyles[variant], color && textColorStylesMap[color], maxLines && truncationStyles, maxLines === 1 && wordBreakMap.breakAll, textAlign && textAlignMap[textAlign], weight && fontWeightStylesMap[weight], Component === 'em' && emStyles, Component === 'strong' && strongStyles],
     style: {
       WebkitLineClamp: maxLines
     },
     "data-testid": testId,
     id: id
   }, children);
+  return hasTextAncestor ?
+  // no need to re-apply context if the text is already wrapped
+  component : jsx(HasTextAncestorContext.Provider, {
+    value: true
+  }, component);
 };
 export default Text;

package/dist/es2019/xcss/xcss.js

@@ -141,21 +141,51 @@ const baseXcss = style => {
 };
 
 /**
- * @internal used in primitives
- * @returns a collection of styles that can be applied to the respective primitive
+ * Picks out runtime XCSS objects and build-time XCSS strings. This is needed
+ * to supported both Emotion and Compiled styles until we've fully migrated
+ * to Compiled.
+ *
+ * @private
+ * @deprecated
  */
-
 export const parseXcss = args => {
   if (Array.isArray(args)) {
-    return args.map(x => x && parseXcss(x)).filter(Boolean);
+    const emotion = [];
+    const staticArr = [];
+    for (const arg of args) {
+      const result = parseXcss(arg);
+      if (result.emotion) {
+        emotion.push(...result.emotion);
+      }
+      if (result.static) {
+        staticArr.push(result.static);
+      }
+    }
+    return {
+      emotion,
+      static: staticArr.join(' ')
+    };
   }
+  const objArgs = args;
   const {
     [uniqueSymbol]: styles
-  } = args;
-  if (typeof process && process.env.NODE_ENV === 'development' && typeof styles === 'undefined') {
-    throw new Error('Styles generated from unsafe source, use the `xcss` export from `@atlaskit/primitives`.');
+  } = objArgs || {};
+  if (styles) {
+    return {
+      emotion: [styles]
+    };
+  }
+  if (args) {
+    // We use string interpolation here instead of .toString() just
+    // in case the resulting object doesn't have the method available.
+    const stringifiedArgs = `${args}`;
+    if (stringifiedArgs) {
+      return {
+        static: stringifiedArgs
+      };
+    }
   }
-  return styles;
+  return {};
 };
 
 // Media queries should not contain nested media queries

package/dist/esm/components/anchor.js

@@ -66,13 +66,15 @@ var Anchor = function Anchor(_ref, ref) {
     action: 'clicked',
     componentName: componentName || 'Anchor',
     packageName: "@atlaskit/primitives",
-    packageVersion: "3.0.0",
+    packageVersion: "3.2.0",
     analyticsData: analyticsContext,
     actionSubject: 'link'
   });
   var RouterLink = useRouterLink();
 
-  // Combine default styles with supplied styles. XCSS does not support deep nested arrays
+  // We're type coercing this as Compiled styles in an array isn't supported by the types
+  // But the runtime accepts it none-the-wiser. We can remove this entire block and replace
+  // it with cx(defaultStyles, focusRingStyles, xcssStyles) when we've moved away from Emotion.
   var styles = Array.isArray(xcssStyles) ? [defaultStyles, focusRingStyles].concat(_toConsumableArray(xcssStyles)) : [defaultStyles, focusRingStyles, xcssStyles];
   var isExternal = typeof href === 'string' && IS_EXTERNAL_LINK_REGEX.test(href);
   var isNonHttpBased = typeof href === 'string' && IS_NON_HTTP_BASED.test(href);

package/dist/esm/components/bleed.js

@@ -58,11 +58,12 @@ var Bleed = /*#__PURE__*/React.memo(function (_ref) {
     block = _ref.block,
     all = _ref.all,
     xcss = _ref.xcss;
-  var xcssStyles = xcss && parseXcss(xcss);
+  var resolvedStyles = parseXcss(xcss);
   return jsx("div", {
+    className: resolvedStyles.static,
     css: [baseStyles, (inline || all) && inlineBleedMap[inline || all], (block || all) && blockBleedMap[block || all],
     // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage
-    xcssStyles],
+    resolvedStyles.emotion],
     "data-testid": testId
   }, children);
 });

package/dist/esm/components/box.js

@@ -25,7 +25,7 @@ import { SurfaceContext } from './internal/surface-provider';
  */
 export var Box = /*#__PURE__*/forwardRef(function (_ref, ref) {
   var _ref$as = _ref.as,
-    as = _ref$as === void 0 ? 'div' : _ref$as,
+    Component = _ref$as === void 0 ? 'div' : _ref$as,
     children = _ref.children,
     backgroundColor = _ref.backgroundColor,
     padding = _ref.padding,
@@ -39,24 +39,24 @@ export var Box = /*#__PURE__*/forwardRef(function (_ref, ref) {
     testId = _ref.testId,
     xcss = _ref.xcss,
     htmlAttributes = _objectWithoutProperties(_ref, _excluded);
-  var Component = as;
   // This is to remove className from safeHtmlAttributes
   // @ts-expect-error className doesn't exist in the prop definition but we want to ensure it cannot be applied even if types are bypassed
   var _spreadClass = htmlAttributes.className,
     safeHtmlAttributes = _objectWithoutProperties(htmlAttributes, _excluded2);
-  var className = xcss && parseXcss(xcss);
+  var resolvedStyles = parseXcss(xcss);
   var node =
   // @ts-expect-error Expression produces a union type that is too complex to represent. I think this is unavoidable
   jsx(Component, _extends({
     style: style
     // @ts-expect-error Expression produces a union type that is too complex to represent. We may be able to narrow the type here but unsure.
     ,
-    ref: ref
+    ref: ref,
+    className: resolvedStyles.static
     // eslint-disable-next-line @repo/internal/react/no-unsafe-spread-props
   }, safeHtmlAttributes, {
     css: [baseStyles, backgroundColor && backgroundColorStylesMap[backgroundColor], isSurfaceColorToken(backgroundColor) && surfaceColorStylesMap[backgroundColor], padding && paddingStylesMap.padding[padding], paddingBlock && paddingStylesMap.paddingBlock[paddingBlock], paddingBlockStart && paddingStylesMap.paddingBlockStart[paddingBlockStart], paddingBlockEnd && paddingStylesMap.paddingBlockEnd[paddingBlockEnd], paddingInline && paddingStylesMap.paddingInline[paddingInline], paddingInlineStart && paddingStylesMap.paddingInlineStart[paddingInlineStart], paddingInlineEnd && paddingStylesMap.paddingInlineEnd[paddingInlineEnd],
     // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage
-    className],
+    resolvedStyles.emotion],
     "data-testid": testId
   }), children);
   return backgroundColor ? jsx(SurfaceContext.Provider, {

package/dist/esm/components/flex.js

@@ -98,12 +98,13 @@ var Flex = /*#__PURE__*/memo( /*#__PURE__*/forwardRef(function (_ref, ref) {
     direction = _ref.direction,
     wrap = _ref.wrap,
     xcss = _ref.xcss;
-  var xcssClassName = xcss && parseXcss(xcss);
+  var resolvedStyles = parseXcss(xcss);
   return jsx(Component, {
     role: role,
+    className: resolvedStyles.static,
     css: [baseStyles, gap && spaceStylesMap.gap[gap], columnGap && spaceStylesMap.columnGap[columnGap], rowGap && spaceStylesMap.rowGap[rowGap], alignItems && alignItemsMap[alignItems], direction && flexDirectionMap[direction], justifyContent && justifyContentMap[justifyContent], wrap && flexWrapMap[wrap],
     // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage
-    xcssClassName && xcssClassName],
+    resolvedStyles.emotion],
     "data-testid": testId,
     ref: ref
   }, children);

package/dist/esm/components/grid.js

@@ -144,7 +144,7 @@ var Grid = /*#__PURE__*/memo( /*#__PURE__*/forwardRef(function (_ref, ref) {
     gridTemplateColumns = _ref.templateColumns,
     xcss = _ref.xcss;
   var Component = as || 'div';
-  var xcssClassName = xcss && parseXcss(xcss);
+  var resolvedStyles = parseXcss(xcss);
 
   /**
    * We use CSS variables to allow for dynamic grid templates instead of dynamically setting to `props.style`
@@ -164,9 +164,10 @@ var Grid = /*#__PURE__*/memo( /*#__PURE__*/forwardRef(function (_ref, ref) {
     id: id,
     role: role,
     style: style,
+    className: resolvedStyles.static,
     css: [baseStyles, gap && spaceStylesMap.gap[gap], columnGap && spaceStylesMap.columnGap[columnGap], rowGap && spaceStylesMap.rowGap[rowGap], alignItems && alignItemsMap[alignItems], alignContent && alignContentMap[alignContent], justifyContent && justifyContentMap[justifyContent], autoFlow && gridAutoFlowMap[autoFlow],
     // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage
-    xcssClassName],
+    resolvedStyles.emotion],
     "data-testid": testId,
     ref: ref
   }, children);

package/dist/esm/components/inline.js

@@ -65,6 +65,11 @@ var Inline = /*#__PURE__*/memo( /*#__PURE__*/forwardRef(function (_ref2, ref) {
     }, separator && index > 0 ? separatorComponent : null, child);
   }) : rawChildren;
   var justifyContent = spread || alignInline;
+
+  // We're type coercing this as Compiled styles in an array isn't supported by the types
+  // But the runtime accepts it none-the-wiser. We can remove this entire block and replace
+  // it with cx(defaultStyles, focusRingStyles, xcssStyles) when we've moved away from Emotion.
+  var styles = grow ? [flexGrowMap[grow]].concat(_toConsumableArray(Array.isArray(xcss) ? xcss : [xcss])) : xcss;
   return jsx(Flex, {
     as: as,
     role: role,
@@ -73,10 +78,10 @@ var Inline = /*#__PURE__*/memo( /*#__PURE__*/forwardRef(function (_ref2, ref) {
     direction: "row",
     gap: space,
     rowGap: rowSpace,
-    wrap: shouldWrap ? 'wrap' : undefined,
-    xcss: grow ? [flexGrowMap[grow]].concat(_toConsumableArray(Array.isArray(xcss) ? xcss : [xcss])) :
+    wrap: shouldWrap ? 'wrap' : undefined
     // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage
-    xcss,
+    ,
+    xcss: styles,
     testId: testId,
     ref: ref
   }, children);

package/dist/esm/components/pressable.js

@@ -70,7 +70,7 @@ var UNSAFE_PRESSABLE = /*#__PURE__*/forwardRef(function (_ref, ref) {
     action: 'clicked',
     componentName: componentName || 'Pressable',
     packageName: "@atlaskit/primitives",
-    packageVersion: "3.0.0",
+    packageVersion: "3.2.0",
     analyticsData: analyticsContext,
     actionSubject: 'button'
   });
@@ -79,6 +79,10 @@ var UNSAFE_PRESSABLE = /*#__PURE__*/forwardRef(function (_ref, ref) {
   var styles = [xcss({
     cursor: isDisabled ? 'not-allowed' : 'pointer'
   }), focusRingStyles];
+
+  // We're type coercing this as Compiled styles in an array isn't supported by the types
+  // But the runtime accepts it none-the-wiser. We can remove this entire block and replace
+  // it with cx(defaultStyles, focusRingStyles, xcssStyles) when we've moved away from Emotion.
   styles = Array.isArray(xcssStyles) ? [].concat(_toConsumableArray(styles), _toConsumableArray(xcssStyles)) : [].concat(_toConsumableArray(styles), [xcssStyles]);
   return /*#__PURE__*/React.createElement(Box, _extends({}, htmlAttributes, {
     as: "button",

package/dist/esm/components/stack.js

@@ -42,16 +42,21 @@ var Stack = /*#__PURE__*/memo( /*#__PURE__*/forwardRef(function (_ref, ref) {
     xcss = _ref.xcss,
     role = _ref.role;
   var justifyContent = spread || alignBlock;
+
+  // We're type coercing this as Compiled styles in an array isn't supported by the types
+  // But the runtime accepts it none-the-wiser. We can remove this entire block and replace
+  // it with cx(defaultStyles, focusRingStyles, xcssStyles) when we've moved away from Emotion.
+  var styles = grow ? [flexGrowMap[grow]].concat(_toConsumableArray(Array.isArray(xcss) ? xcss : [xcss])) : xcss;
   return jsx(Flex, {
     as: as,
     role: role,
     gap: space,
     direction: "column",
     alignItems: alignItems,
-    justifyContent: justifyContent,
-    xcss: grow ? [flexGrowMap[grow]].concat(_toConsumableArray(Array.isArray(xcss) ? xcss : [xcss])) :
+    justifyContent: justifyContent
     // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage
-    xcss,
+    ,
+    xcss: styles,
     testId: testId,
     ref: ref
   }, children);

package/dist/esm/components/text.js

@@ -4,7 +4,7 @@ var _excluded = ["children"];
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 /** @jsx jsx */
-
+import { createContext, useContext } from 'react';
 import { css, jsx } from '@emotion/react';
 import invariant from 'tiny-invariant';
 import { bodyTextStylesMap, fontWeightStylesMap, inverseColorMap, textColorStylesMap, uiTextStylesMap } from '../xcss/style-maps.partial';
@@ -44,19 +44,31 @@ var wordBreakMap = {
     wordBreak: 'break-all'
   })
 };
+var HasTextAncestorContext = /*#__PURE__*/createContext(false);
+var useHasTextAncestor = function useHasTextAncestor() {
+  return useContext(HasTextAncestorContext);
+};
 
 /**
  * Custom hook designed to abstract the parsing of the color props and make it clearer in the future how color is reconciled between themes and tokens.
  */
-var useColor = function useColor(colorProp) {
+var useColor = function useColor(colorProp, hasTextAncestor) {
   var surface = useSurface();
 
   /**
-   * Where the color of the surface is inverted we override the user choice
+   * Where the color of the surface is inverted we always override the color
    * as there is no valid choice that is not covered by the override.
    */
-  var color = inverseColorMap.hasOwnProperty(surface) ? inverseColorMap[surface] : colorProp;
-  return color;
+  if (inverseColorMap.hasOwnProperty(surface)) {
+    return inverseColorMap[surface];
+  }
+  if (colorProp === 'inherit') {
+    return undefined;
+  }
+  if (!colorProp && hasTextAncestor) {
+    return undefined;
+  }
+  return colorProp || 'color.text';
 };
 
 /**
@@ -71,7 +83,8 @@ var useColor = function useColor(colorProp) {
 var Text = function Text(_ref) {
   var children = _ref.children,
     props = _objectWithoutProperties(_ref, _excluded);
-  var asElement = props.as,
+  var _props$as = props.as,
+    Component = _props$as === void 0 ? 'span' : _props$as,
     colorProp = props.color,
     textAlign = props.textAlign,
     testId = props.testId,
@@ -79,10 +92,6 @@ var Text = function Text(_ref) {
     _props$variant = props.variant,
     variant = _props$variant === void 0 ? 'body' : _props$variant,
     weight = props.weight;
-
-  // body variants -> p
-  // ui variants -> span
-  var Component = asElement || (variant.includes('body') ? 'p' : 'span');
   invariant(asAllowlist.includes(Component), "@atlaskit/primitives: Text received an invalid \"as\" value of \"".concat(Component, "\""));
 
   // Remove the ability to bypass typescript errors for maxLines
@@ -90,14 +99,20 @@ var Text = function Text(_ref) {
   if ('maxLines' in props && variant.includes('body')) {
     maxLines = props.maxLines;
   }
-  var color = useColor(colorProp);
-  return jsx(Component, {
-    css: [resetStyles, variant && variantStyles[variant], color && textColorStylesMap[color], maxLines && truncationStyles, maxLines === 1 && wordBreakMap.breakAll, textAlign && textAlignMap[textAlign], weight && fontWeightStylesMap[weight], asElement === 'em' && emStyles, asElement === 'strong' && strongStyles],
+  var hasTextAncestor = useHasTextAncestor();
+  var color = useColor(colorProp, hasTextAncestor);
+  var component = jsx(Component, {
+    css: [resetStyles, variantStyles[variant], color && textColorStylesMap[color], maxLines && truncationStyles, maxLines === 1 && wordBreakMap.breakAll, textAlign && textAlignMap[textAlign], weight && fontWeightStylesMap[weight], Component === 'em' && emStyles, Component === 'strong' && strongStyles],
     style: {
       WebkitLineClamp: maxLines
     },
     "data-testid": testId,
     id: id
   }, children);
+  return hasTextAncestor ?
+  // no need to re-apply context if the text is already wrapped
+  component : jsx(HasTextAncestorContext.Provider, {
+    value: true
+  }, component);
 };
 export default Text;

package/dist/esm/xcss/xcss.js

@@ -1,6 +1,10 @@
+import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import _typeof from "@babel/runtime/helpers/typeof";
+function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 /* eslint-disable @atlaskit/design-system/ensure-design-token-usage */
 import { css as cssEmotion } from '@emotion/react';
 
@@ -147,21 +151,59 @@ var baseXcss = function baseXcss(style) {
 };
 
 /**
- * @internal used in primitives
- * @returns a collection of styles that can be applied to the respective primitive
+ * Picks out runtime XCSS objects and build-time XCSS strings. This is needed
+ * to supported both Emotion and Compiled styles until we've fully migrated
+ * to Compiled.
+ *
+ * @private
+ * @deprecated
  */
-
 export var parseXcss = function parseXcss(args) {
   if (Array.isArray(args)) {
-    return args.map(function (x) {
-      return x && parseXcss(x);
-    }).filter(Boolean);
+    var emotion = [];
+    var staticArr = [];
+    var _iterator = _createForOfIteratorHelper(args),
+      _step;
+    try {
+      for (_iterator.s(); !(_step = _iterator.n()).done;) {
+        var arg = _step.value;
+        var result = parseXcss(arg);
+        if (result.emotion) {
+          emotion.push.apply(emotion, _toConsumableArray(result.emotion));
+        }
+        if (result.static) {
+          staticArr.push(result.static);
+        }
+      }
+    } catch (err) {
+      _iterator.e(err);
+    } finally {
+      _iterator.f();
+    }
+    return {
+      emotion: emotion,
+      static: staticArr.join(' ')
+    };
+  }
+  var objArgs = args;
+  var _ref4 = objArgs || {},
+    styles = _ref4[uniqueSymbol];
+  if (styles) {
+    return {
+      emotion: [styles]
+    };
   }
-  var styles = args[uniqueSymbol];
-  if ((typeof process === "undefined" ? "undefined" : _typeof(process)) && process.env.NODE_ENV === 'development' && typeof styles === 'undefined') {
-    throw new Error('Styles generated from unsafe source, use the `xcss` export from `@atlaskit/primitives`.');
+  if (args) {
+    // We use string interpolation here instead of .toString() just
+    // in case the resulting object doesn't have the method available.
+    var stringifiedArgs = "".concat(args);
+    if (stringifiedArgs) {
+      return {
+        static: stringifiedArgs
+      };
+    }
   }
-  return styles;
+  return {};
 };
 
 // Media queries should not contain nested media queries

package/dist/types/components/flex.d.ts

@@ -100,11 +100,11 @@ declare const Flex: import("react").MemoExoticComponent<import("react").ForwardR
     /**
      * Used to align children along the main axis.
      */
-    justifyContent?: "space-around" | "space-between" | "space-evenly" | "stretch" | "center" | "end" | "start" | undefined;
+    justifyContent?: "center" | "space-around" | "space-between" | "space-evenly" | "stretch" | "end" | "start" | undefined;
     /**
      * Used to align children along the cross axis.
      */
-    alignItems?: "stretch" | "center" | "end" | "start" | "baseline" | undefined;
+    alignItems?: "center" | "stretch" | "end" | "start" | "baseline" | undefined;
     /**
      * Represents the space between each child.
      */

package/dist/types/components/grid.d.ts

@@ -136,11 +136,11 @@ declare const Grid: import("react").MemoExoticComponent<import("react").ForwardR
     /**
      * Used to align children along the inline axis.
      */
-    justifyContent?: "space-around" | "space-between" | "space-evenly" | "stretch" | "center" | "end" | "start" | undefined;
+    justifyContent?: "center" | "space-around" | "space-between" | "space-evenly" | "stretch" | "end" | "start" | undefined;
     /**
      * Used to align the grid along the inline axis.
      */
-    justifyItems?: "stretch" | "center" | "end" | "start" | undefined;
+    justifyItems?: "center" | "stretch" | "end" | "start" | undefined;
     /**
      * Used to align children along the block axis.
      */
@@ -148,7 +148,7 @@ declare const Grid: import("react").MemoExoticComponent<import("react").ForwardR
     /**
      * Used to align the grid along the block axis.
      */
-    alignContent?: "space-around" | "space-between" | "space-evenly" | "stretch" | "center" | "end" | "start" | undefined;
+    alignContent?: "center" | "space-around" | "space-between" | "space-evenly" | "stretch" | "end" | "start" | undefined;
     /**
      * Represents the space between each column.
      */

package/dist/types/components/pressable.d.ts

@@ -63,5 +63,5 @@ declare const UNSAFE_PRESSABLE: React.ForwardRefExoticComponent<Pick<Omit<BoxPro
      * Additional information to be included in the `context` of analytics events that come from pressable.
      */
     analyticsContext?: Record<string, any> | undefined;
-}, "padding" | "paddingBlock" | "paddingBlockStart" | "paddingBlockEnd" | "paddingInline" | "paddingInlineStart" | "paddingInlineEnd" | "backgroundColor" | "color" | "translate" | "key" | "value" | "hidden" | "children" | "form" | "slot" | "title" | "name" | "type" | "defaultChecked" | "defaultValue" | "suppressContentEditableWarning" | "suppressHydrationWarning" | "accessKey" | "contentEditable" | "contextMenu" | "dir" | "draggable" | "id" | "lang" | "placeholder" | "spellCheck" | "tabIndex" | "radioGroup" | "about" | "datatype" | "inlist" | "prefix" | "property" | "resource" | "typeof" | "vocab" | "autoCapitalize" | "autoCorrect" | "autoSave" | "itemProp" | "itemScope" | "itemType" | "itemID" | "itemRef" | "results" | "security" | "unselectable" | "inputMode" | "is" | "aria-activedescendant" | "aria-atomic" | "aria-autocomplete" | "aria-busy" | "aria-checked" | "aria-colcount" | "aria-colindex" | "aria-colspan" | "aria-controls" | "aria-current" | "aria-describedby" | "aria-details" | "aria-disabled" | "aria-dropeffect" | "aria-errormessage" | "aria-expanded" | "aria-flowto" | "aria-grabbed" | "aria-haspopup" | "aria-hidden" | "aria-invalid" | "aria-keyshortcuts" | "aria-label" | "aria-labelledby" | "aria-level" | "aria-live" | "aria-modal" | "aria-multiline" | "aria-multiselectable" | "aria-orientation" | "aria-owns" | "aria-placeholder" | "aria-posinset" | "aria-pressed" | "aria-readonly" | "aria-relevant" | "aria-required" | "aria-roledescription" | "aria-rowcount" | "aria-rowindex" | "aria-rowspan" | "aria-selected" | "aria-setsize" | "aria-sort" | "aria-valuemax" | "aria-valuemin" | "aria-valuenow" | "aria-valuetext" | "dangerouslySetInnerHTML" | "onCopy" | "onCopyCapture" | "onCut" | "onCutCapture" | "onPaste" | "onPasteCapture" | "onCompositionEnd" | "onCompositionEndCapture" | "onCompositionStart" | "onCompositionStartCapture" | "onCompositionUpdate" | "onCompositionUpdateCapture" | "onFocus" | "onFocusCapture" | "onBlur" | "onBlurCapture" | "onChange" | "onChangeCapture" | "onBeforeInput" | "onBeforeInputCapture" | "onInput" | "onInputCapture" | "onReset" | "onResetCapture" | "onSubmit" | "onSubmitCapture" | "onInvalid" | "onInvalidCapture" | "onLoad" | "onLoadCapture" | "onError" | "onErrorCapture" | "onKeyDown" | "onKeyDownCapture" | "onKeyPress" | "onKeyPressCapture" | "onKeyUp" | "onKeyUpCapture" | "onAbort" | "onAbortCapture" | "onCanPlay" | "onCanPlayCapture" | "onCanPlayThrough" | "onCanPlayThroughCapture" | "onDurationChange" | "onDurationChangeCapture" | "onEmptied" | "onEmptiedCapture" | "onEncrypted" | "onEncryptedCapture" | "onEnded" | "onEndedCapture" | "onLoadedData" | "onLoadedDataCapture" | "onLoadedMetadata" | "onLoadedMetadataCapture" | "onLoadStart" | "onLoadStartCapture" | "onPause" | "onPauseCapture" | "onPlay" | "onPlayCapture" | "onPlaying" | "onPlayingCapture" | "onProgress" | "onProgressCapture" | "onRateChange" | "onRateChangeCapture" | "onSeeked" | "onSeekedCapture" | "onSeeking" | "onSeekingCapture" | "onStalled" | "onStalledCapture" | "onSuspend" | "onSuspendCapture" | "onTimeUpdate" | "onTimeUpdateCapture" | "onVolumeChange" | "onVolumeChangeCapture" | "onWaiting" | "onWaitingCapture" | "onAuxClick" | "onAuxClickCapture" | "onClick" | "onClickCapture" | "onContextMenu" | "onContextMenuCapture" | "onDoubleClick" | "onDoubleClickCapture" | "onDrag" | "onDragCapture" | "onDragEnd" | "onDragEndCapture" | "onDragEnter" | "onDragEnterCapture" | "onDragExit" | "onDragExitCapture" | "onDragLeave" | "onDragLeaveCapture" | "onDragOver" | "onDragOverCapture" | "onDragStart" | "onDragStartCapture" | "onDrop" | "onDropCapture" | "onMouseDown" | "onMouseDownCapture" | "onMouseEnter" | "onMouseLeave" | "onMouseMove" | "onMouseMoveCapture" | "onMouseOut" | "onMouseOutCapture" | "onMouseOver" | "onMouseOverCapture" | "onMouseUp" | "onMouseUpCapture" | "onSelect" | "onSelectCapture" | "onTouchCancel" | "onTouchCancelCapture" | "onTouchEnd" | "onTouchEndCapture" | "onTouchMove" | "onTouchMoveCapture" | "onTouchStart" | "onTouchStartCapture" | "onPointerDown" | "onPointerDownCapture" | "onPointerMove" | "onPointerMoveCapture" | "onPointerUp" | "onPointerUpCapture" | "onPointerCancel" | "onPointerCancelCapture" | "onPointerEnter" | "onPointerEnterCapture" | "onPointerLeave" | "onPointerLeaveCapture" | "onPointerOver" | "onPointerOverCapture" | "onPointerOut" | "onPointerOutCapture" | "onGotPointerCapture" | "onGotPointerCaptureCapture" | "onLostPointerCapture" | "onLostPointerCaptureCapture" | "onScroll" | "onScrollCapture" | "onWheel" | "onWheelCapture" | "onAnimationStart" | "onAnimationStartCapture" | "onAnimationEnd" | "onAnimationEndCapture" | "onAnimationIteration" | "onAnimationIterationCapture" | "onTransitionEnd" | "onTransitionEndCapture" | "autoFocus" | "formAction" | "formEncType" | "formMethod" | "formNoValidate" | "formTarget" | "testId" | "xcss" | "data-testid" | "isDisabled" | "interactionName" | "componentName" | "analyticsContext"> & React.RefAttributes<HTMLButtonElement>>;
+}, "padding" | "paddingBlock" | "paddingBlockStart" | "paddingBlockEnd" | "paddingInline" | "paddingInlineStart" | "paddingInlineEnd" | "backgroundColor" | "color" | "translate" | "hidden" | "key" | "value" | "children" | "form" | "slot" | "title" | "name" | "type" | "defaultChecked" | "defaultValue" | "suppressContentEditableWarning" | "suppressHydrationWarning" | "accessKey" | "contentEditable" | "contextMenu" | "dir" | "draggable" | "id" | "lang" | "placeholder" | "spellCheck" | "tabIndex" | "radioGroup" | "about" | "datatype" | "inlist" | "prefix" | "property" | "resource" | "typeof" | "vocab" | "autoCapitalize" | "autoCorrect" | "autoSave" | "itemProp" | "itemScope" | "itemType" | "itemID" | "itemRef" | "results" | "security" | "unselectable" | "inputMode" | "is" | "aria-activedescendant" | "aria-atomic" | "aria-autocomplete" | "aria-busy" | "aria-checked" | "aria-colcount" | "aria-colindex" | "aria-colspan" | "aria-controls" | "aria-current" | "aria-describedby" | "aria-details" | "aria-disabled" | "aria-dropeffect" | "aria-errormessage" | "aria-expanded" | "aria-flowto" | "aria-grabbed" | "aria-haspopup" | "aria-hidden" | "aria-invalid" | "aria-keyshortcuts" | "aria-label" | "aria-labelledby" | "aria-level" | "aria-live" | "aria-modal" | "aria-multiline" | "aria-multiselectable" | "aria-orientation" | "aria-owns" | "aria-placeholder" | "aria-posinset" | "aria-pressed" | "aria-readonly" | "aria-relevant" | "aria-required" | "aria-roledescription" | "aria-rowcount" | "aria-rowindex" | "aria-rowspan" | "aria-selected" | "aria-setsize" | "aria-sort" | "aria-valuemax" | "aria-valuemin" | "aria-valuenow" | "aria-valuetext" | "dangerouslySetInnerHTML" | "onCopy" | "onCopyCapture" | "onCut" | "onCutCapture" | "onPaste" | "onPasteCapture" | "onCompositionEnd" | "onCompositionEndCapture" | "onCompositionStart" | "onCompositionStartCapture" | "onCompositionUpdate" | "onCompositionUpdateCapture" | "onFocus" | "onFocusCapture" | "onBlur" | "onBlurCapture" | "onChange" | "onChangeCapture" | "onBeforeInput" | "onBeforeInputCapture" | "onInput" | "onInputCapture" | "onReset" | "onResetCapture" | "onSubmit" | "onSubmitCapture" | "onInvalid" | "onInvalidCapture" | "onLoad" | "onLoadCapture" | "onError" | "onErrorCapture" | "onKeyDown" | "onKeyDownCapture" | "onKeyPress" | "onKeyPressCapture" | "onKeyUp" | "onKeyUpCapture" | "onAbort" | "onAbortCapture" | "onCanPlay" | "onCanPlayCapture" | "onCanPlayThrough" | "onCanPlayThroughCapture" | "onDurationChange" | "onDurationChangeCapture" | "onEmptied" | "onEmptiedCapture" | "onEncrypted" | "onEncryptedCapture" | "onEnded" | "onEndedCapture" | "onLoadedData" | "onLoadedDataCapture" | "onLoadedMetadata" | "onLoadedMetadataCapture" | "onLoadStart" | "onLoadStartCapture" | "onPause" | "onPauseCapture" | "onPlay" | "onPlayCapture" | "onPlaying" | "onPlayingCapture" | "onProgress" | "onProgressCapture" | "onRateChange" | "onRateChangeCapture" | "onSeeked" | "onSeekedCapture" | "onSeeking" | "onSeekingCapture" | "onStalled" | "onStalledCapture" | "onSuspend" | "onSuspendCapture" | "onTimeUpdate" | "onTimeUpdateCapture" | "onVolumeChange" | "onVolumeChangeCapture" | "onWaiting" | "onWaitingCapture" | "onAuxClick" | "onAuxClickCapture" | "onClick" | "onClickCapture" | "onContextMenu" | "onContextMenuCapture" | "onDoubleClick" | "onDoubleClickCapture" | "onDrag" | "onDragCapture" | "onDragEnd" | "onDragEndCapture" | "onDragEnter" | "onDragEnterCapture" | "onDragExit" | "onDragExitCapture" | "onDragLeave" | "onDragLeaveCapture" | "onDragOver" | "onDragOverCapture" | "onDragStart" | "onDragStartCapture" | "onDrop" | "onDropCapture" | "onMouseDown" | "onMouseDownCapture" | "onMouseEnter" | "onMouseLeave" | "onMouseMove" | "onMouseMoveCapture" | "onMouseOut" | "onMouseOutCapture" | "onMouseOver" | "onMouseOverCapture" | "onMouseUp" | "onMouseUpCapture" | "onSelect" | "onSelectCapture" | "onTouchCancel" | "onTouchCancelCapture" | "onTouchEnd" | "onTouchEndCapture" | "onTouchMove" | "onTouchMoveCapture" | "onTouchStart" | "onTouchStartCapture" | "onPointerDown" | "onPointerDownCapture" | "onPointerMove" | "onPointerMoveCapture" | "onPointerUp" | "onPointerUpCapture" | "onPointerCancel" | "onPointerCancelCapture" | "onPointerEnter" | "onPointerEnterCapture" | "onPointerLeave" | "onPointerLeaveCapture" | "onPointerOver" | "onPointerOverCapture" | "onPointerOut" | "onPointerOutCapture" | "onGotPointerCapture" | "onGotPointerCaptureCapture" | "onLostPointerCapture" | "onLostPointerCaptureCapture" | "onScroll" | "onScrollCapture" | "onWheel" | "onWheelCapture" | "onAnimationStart" | "onAnimationStartCapture" | "onAnimationEnd" | "onAnimationEndCapture" | "onAnimationIteration" | "onAnimationIterationCapture" | "onTransitionEnd" | "onTransitionEndCapture" | "autoFocus" | "formAction" | "formEncType" | "formMethod" | "formNoValidate" | "formTarget" | "testId" | "xcss" | "data-testid" | "isDisabled" | "interactionName" | "componentName" | "analyticsContext"> & React.RefAttributes<HTMLButtonElement>>;
 export default UNSAFE_PRESSABLE;

package/dist/types/components/stack.d.ts

@@ -58,7 +58,7 @@ declare const Stack: import("react").MemoExoticComponent<import("react").Forward
     /**
      * Used to align children along the block axis (typically vertical).
      */
-    alignBlock?: "stretch" | "center" | "end" | "start" | undefined;
+    alignBlock?: "center" | "stretch" | "end" | "start" | undefined;
     /**
      * Used to align children along the inline axis (typically horizontal).
      */

package/dist/types/components/text.d.ts

@@ -36,10 +36,10 @@ type TextPropsBase = {
     children: ReactNode;
     /**
      * Token representing text color with a built-in fallback value.
-     * Will apply inverse text color automatically if placed within a Box with backgroundColor.
-     *
+     * Will apply inverse text color automatically if placed within a Box with bold background color.
+     * Defaults to `text.color` if not nested in other Text components.
      */
-    color?: TextColor;
+    color?: TextColor | 'inherit';
     /**
      * The [HTML `id` attribute](https://developer.mozilla.org/en-US/docs/Web/HTML/Global_attributes/id).
      */