@atlaskit/primitives 3.0.0 → 3.2.0

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @atlaskit/primitives
 
+## 3.2.0
+
+### Minor Changes
+
+- [#77488](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/77488) [`9e119dcbfd60`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/9e119dcbfd60) - The `xcss` prop on select components have had its type expanded to support styles being passed from Compiled CSS-in-JS. This is still experimental and something we'll be iterating on.
+
+## 3.1.0
+
+### Minor Changes
+
+- [#76431](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/76431) [`c6819de73d02`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/c6819de73d02) - Default text color + allow color inheritance if explicitly defined
+
 ## 3.0.0
 
 ### Major Changes

package/constellation/text/examples.mdx

@@ -4,9 +4,10 @@ description: Text is a token-backed typography component to display body and UI
 order: 0
 ---
 
-import TextDefault from '../../examples/constellation/text/basic';
-import TextAsElement from '../../examples/constellation/text/as-element';
+import Basic from '../../examples/constellation/text/basic';
 import ColorInverse from '../../examples/constellation/text/color-inverse';
+import Weight from '../../examples/constellation/text/weight';
+import AsElement from '../../examples/constellation/text/as-element';
 
 ## Basic
 
@@ -14,16 +15,22 @@ Implements the [Atlassian typography system](/foundations/typography/) as a comp
 
 The `variant` prop expresses the visual appearance of the text element.
 
-<Example Component={TextDefault} pacckageName="@atlaskit/primitives" />
+<Example Component={Basic} pacckageName="@atlaskit/primitives" />
 
-## Rendered HTML tag
+## Color
 
-By default, `body` variants are rendered as `<p>` tags and `ui` variants are rendered as `<span>` tags. This can be ovrridden by the `as` prop.
+Set `color` to change the text color, defaults to `text.color` if not nested in other Text components. When used within a [box component](/components/primitives/box) that has a bold background color, the text color will automatically be inverted.
 
-<Example Component={TextAsElement} packageName="@atlaskit/primitives" />
+<Example Component={ColorInverse} pacckageName="@atlaskit/primitives" />
 
-## Color
+## Weight
 
-Set `color` to change the text color. When used within a [box component](/components/primitives/box) that has a background color set, the text color can be automatically inverted without setting the `color` prop depending on the background color of the box.
+Set `weight` to change the front weight.
 
-<Example Component={ColorInverse} pacckageName="@atlaskit/primitives" />
+<Example Component={Weight} pacckageName="@atlaskit/primitives" />
+
+## Rendered HTML tag
+
+Set `as` to change the rendered HTML element, defaults to `span`.
+
+<Example Component={AsElement} packageName="@atlaskit/primitives" />

package/dist/cjs/components/anchor.js

@@ -76,13 +76,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 = (0, _appProvider.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((0, _toConsumableArray2.default)(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/cjs/components/bleed.js

@@ -66,11 +66,12 @@ var Bleed = /*#__PURE__*/_react.default.memo(function (_ref) {
     block = _ref.block,
     all = _ref.all,
     xcss = _ref.xcss;
-  var xcssStyles = xcss && (0, _xcss.parseXcss)(xcss);
+  var resolvedStyles = (0, _xcss.parseXcss)(xcss);
   return (0, _react2.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/cjs/components/box.js

@@ -32,7 +32,7 @@ var _excluded = ["as", "children", "backgroundColor", "padding", "paddingBlock",
  */
 var Box = exports.Box = /*#__PURE__*/(0, _react.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,
@@ -46,24 +46,24 @@ var Box = exports.Box = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref)
     testId = _ref.testId,
     xcss = _ref.xcss,
     htmlAttributes = (0, _objectWithoutProperties2.default)(_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 = (0, _objectWithoutProperties2.default)(htmlAttributes, _excluded2);
-  var className = xcss && (0, _xcss.parseXcss)(xcss);
+  var resolvedStyles = (0, _xcss.parseXcss)(xcss);
   var node =
   // @ts-expect-error Expression produces a union type that is too complex to represent. I think this is unavoidable
   (0, _react2.jsx)(Component, (0, _extends2.default)({
     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 && _styleMaps.backgroundColorStylesMap[backgroundColor], (0, _styleMaps.isSurfaceColorToken)(backgroundColor) && _styleMaps.surfaceColorStylesMap[backgroundColor], padding && _styleMaps.paddingStylesMap.padding[padding], paddingBlock && _styleMaps.paddingStylesMap.paddingBlock[paddingBlock], paddingBlockStart && _styleMaps.paddingStylesMap.paddingBlockStart[paddingBlockStart], paddingBlockEnd && _styleMaps.paddingStylesMap.paddingBlockEnd[paddingBlockEnd], paddingInline && _styleMaps.paddingStylesMap.paddingInline[paddingInline], paddingInlineStart && _styleMaps.paddingStylesMap.paddingInlineStart[paddingInlineStart], paddingInlineEnd && _styleMaps.paddingStylesMap.paddingInlineEnd[paddingInlineEnd],
     // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage
-    className],
+    resolvedStyles.emotion],
     "data-testid": testId
   }), children);
   return backgroundColor ? (0, _react2.jsx)(_surfaceProvider.SurfaceContext.Provider, {

package/dist/cjs/components/flex.js

@@ -105,12 +105,13 @@ var Flex = /*#__PURE__*/(0, _react.memo)( /*#__PURE__*/(0, _react.forwardRef)(fu
     direction = _ref.direction,
     wrap = _ref.wrap,
     xcss = _ref.xcss;
-  var xcssClassName = xcss && (0, _xcss.parseXcss)(xcss);
+  var resolvedStyles = (0, _xcss.parseXcss)(xcss);
   return (0, _react2.jsx)(Component, {
     role: role,
+    className: resolvedStyles.static,
     css: [baseStyles, gap && _styleMaps.spaceStylesMap.gap[gap], columnGap && _styleMaps.spaceStylesMap.columnGap[columnGap], rowGap && _styleMaps.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/cjs/components/grid.js

@@ -152,7 +152,7 @@ var Grid = /*#__PURE__*/(0, _react.memo)( /*#__PURE__*/(0, _react.forwardRef)(fu
     gridTemplateColumns = _ref.templateColumns,
     xcss = _ref.xcss;
   var Component = as || 'div';
-  var xcssClassName = xcss && (0, _xcss.parseXcss)(xcss);
+  var resolvedStyles = (0, _xcss.parseXcss)(xcss);
 
   /**
    * We use CSS variables to allow for dynamic grid templates instead of dynamically setting to `props.style`
@@ -172,9 +172,10 @@ var Grid = /*#__PURE__*/(0, _react.memo)( /*#__PURE__*/(0, _react.forwardRef)(fu
     id: id,
     role: role,
     style: style,
+    className: resolvedStyles.static,
     css: [baseStyles, gap && _styleMaps.spaceStylesMap.gap[gap], columnGap && _styleMaps.spaceStylesMap.columnGap[columnGap], rowGap && _styleMaps.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/cjs/components/inline.js

@@ -73,6 +73,11 @@ var Inline = /*#__PURE__*/(0, _react.memo)( /*#__PURE__*/(0, _react.forwardRef)(
     }, 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((0, _toConsumableArray2.default)(Array.isArray(xcss) ? xcss : [xcss])) : xcss;
   return (0, _react2.jsx)(_flex.default, {
     as: as,
     role: role,
@@ -81,10 +86,10 @@ var Inline = /*#__PURE__*/(0, _react.memo)( /*#__PURE__*/(0, _react.forwardRef)(
     direction: "row",
     gap: space,
     rowGap: rowSpace,
-    wrap: shouldWrap ? 'wrap' : undefined,
-    xcss: grow ? [flexGrowMap[grow]].concat((0, _toConsumableArray2.default)(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/cjs/components/pressable.js

@@ -80,7 +80,7 @@ var UNSAFE_PRESSABLE = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref)
     action: 'clicked',
     componentName: componentName || 'Pressable',
     packageName: "@atlaskit/primitives",
-    packageVersion: "3.0.0",
+    packageVersion: "3.2.0",
     analyticsData: analyticsContext,
     actionSubject: 'button'
   });
@@ -89,6 +89,10 @@ var UNSAFE_PRESSABLE = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref)
   var styles = [(0, _xcss.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((0, _toConsumableArray2.default)(styles), (0, _toConsumableArray2.default)(xcssStyles)) : [].concat((0, _toConsumableArray2.default)(styles), [xcssStyles]);
   return /*#__PURE__*/_react.default.createElement(_box.default, (0, _extends2.default)({}, htmlAttributes, {
     as: "button",

package/dist/cjs/components/stack.js

@@ -50,16 +50,21 @@ var Stack = /*#__PURE__*/(0, _react.memo)( /*#__PURE__*/(0, _react.forwardRef)(f
     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((0, _toConsumableArray2.default)(Array.isArray(xcss) ? xcss : [xcss])) : xcss;
   return (0, _react2.jsx)(_flex.default, {
     as: as,
     role: role,
     gap: space,
     direction: "column",
     alignItems: alignItems,
-    justifyContent: justifyContent,
-    xcss: grow ? [flexGrowMap[grow]].concat((0, _toConsumableArray2.default)(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/cjs/components/text.js

@@ -7,7 +7,8 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _react = require("@emotion/react");
+var _react = require("react");
+var _react2 = require("@emotion/react");
 var _tinyInvariant = _interopRequireDefault(require("tiny-invariant"));
 var _styleMaps = require("../xcss/style-maps.partial");
 var _surfaceProvider = require("./internal/surface-provider");
@@ -18,50 +19,62 @@ var asAllowlist = ['span', 'p', 'strong', 'em'];
 // We're doing this because our CSS reset can add top margins to elements such as `p` which is totally insane.
 // Long term we should remove those instances from the reset - it should be a reset to 0.
 // For now, at least we know <Text> will be unaffected by this.
-var resetStyles = (0, _react.css)({
+var resetStyles = (0, _react2.css)({
   margin: 0
 });
 var variantStyles = _objectSpread(_objectSpread({}, _styleMaps.bodyTextStylesMap), _styleMaps.uiTextStylesMap);
-var strongStyles = (0, _react.css)({
+var strongStyles = (0, _react2.css)({
   fontWeight: 'bold'
 });
-var emStyles = (0, _react.css)({
+var emStyles = (0, _react2.css)({
   fontStyle: 'italic'
 });
 var textAlignMap = {
-  center: (0, _react.css)({
+  center: (0, _react2.css)({
     textAlign: 'center'
   }),
-  end: (0, _react.css)({
+  end: (0, _react2.css)({
     textAlign: 'end'
   }),
-  start: (0, _react.css)({
+  start: (0, _react2.css)({
     textAlign: 'start'
   })
 };
-var truncationStyles = (0, _react.css)({
+var truncationStyles = (0, _react2.css)({
   display: '-webkit-box',
   overflow: 'hidden',
   WebkitBoxOrient: 'vertical'
 });
 var wordBreakMap = {
-  breakAll: (0, _react.css)({
+  breakAll: (0, _react2.css)({
     wordBreak: 'break-all'
   })
 };
+var HasTextAncestorContext = /*#__PURE__*/(0, _react.createContext)(false);
+var useHasTextAncestor = function useHasTextAncestor() {
+  return (0, _react.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 = (0, _surfaceProvider.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 = _styleMaps.inverseColorMap.hasOwnProperty(surface) ? _styleMaps.inverseColorMap[surface] : colorProp;
-  return color;
+  if (_styleMaps.inverseColorMap.hasOwnProperty(surface)) {
+    return _styleMaps.inverseColorMap[surface];
+  }
+  if (colorProp === 'inherit') {
+    return undefined;
+  }
+  if (!colorProp && hasTextAncestor) {
+    return undefined;
+  }
+  return colorProp || 'color.text';
 };
 
 /**
@@ -76,7 +89,8 @@ var useColor = function useColor(colorProp) {
 var Text = function Text(_ref) {
   var children = _ref.children,
     props = (0, _objectWithoutProperties2.default)(_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,
@@ -84,10 +98,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');
   (0, _tinyInvariant.default)(asAllowlist.includes(Component), "@atlaskit/primitives: Text received an invalid \"as\" value of \"".concat(Component, "\""));
 
   // Remove the ability to bypass typescript errors for maxLines
@@ -95,14 +105,20 @@ var Text = function Text(_ref) {
   if ('maxLines' in props && variant.includes('body')) {
     maxLines = props.maxLines;
   }
-  var color = useColor(colorProp);
-  return (0, _react.jsx)(Component, {
-    css: [resetStyles, variant && variantStyles[variant], color && _styleMaps.textColorStylesMap[color], maxLines && truncationStyles, maxLines === 1 && wordBreakMap.breakAll, textAlign && textAlignMap[textAlign], weight && _styleMaps.fontWeightStylesMap[weight], asElement === 'em' && emStyles, asElement === 'strong' && strongStyles],
+  var hasTextAncestor = useHasTextAncestor();
+  var color = useColor(colorProp, hasTextAncestor);
+  var component = (0, _react2.jsx)(Component, {
+    css: [resetStyles, variantStyles[variant], color && _styleMaps.textColorStylesMap[color], maxLines && truncationStyles, maxLines === 1 && wordBreakMap.breakAll, textAlign && textAlignMap[textAlign], weight && _styleMaps.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 : (0, _react2.jsx)(HasTextAncestorContext.Provider, {
+    value: true
+  }, component);
 };
 var _default = exports.default = Text;

package/dist/cjs/xcss/xcss.js

@@ -6,15 +6,15 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.tokensMap = exports.parseXcss = void 0;
 exports.xcss = xcss;
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 var _react = require("@emotion/react");
 var _styleMaps = require("./style-maps.partial");
-/* eslint-disable @atlaskit/design-system/ensure-design-token-usage */
-
-// eslint-disable-next-line import/no-extraneous-dependencies
-
+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 */ // eslint-disable-next-line import/no-extraneous-dependencies
 var tokensMap = exports.tokensMap = {
   backgroundColor: _styleMaps.backgroundColorMap,
   blockSize: _styleMaps.dimensionMap,
@@ -155,21 +155,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
  */
-
 var parseXcss = exports.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, (0, _toConsumableArray2.default)(result.emotion));
+        }
+        if (result.static) {
+          staticArr.push(result.static);
+        }
+      }
+    } catch (err) {
+      _iterator.e(err);
+    } finally {
+      _iterator.f();
+    }
+    return {
+      emotion: emotion,
+      static: staticArr.join(' ')
+    };
   }
-  var styles = args[uniqueSymbol];
-  if ((typeof process === "undefined" ? "undefined" : (0, _typeof2.default)(process)) && process.env.NODE_ENV === 'development' && typeof styles === 'undefined') {
-    throw new Error('Styles generated from unsafe source, use the `xcss` export from `@atlaskit/primitives`.');
+  var objArgs = args;
+  var _ref4 = objArgs || {},
+    styles = _ref4[uniqueSymbol];
+  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.
+    var stringifiedArgs = "".concat(args);
+    if (stringifiedArgs) {
+      return {
+        static: stringifiedArgs
+      };
+    }
   }
-  return styles;
+  return {};
 };
 
 // Media queries should not contain nested media queries

package/dist/es2019/components/anchor.js

@@ -62,13 +62,15 @@ const Anchor = ({
     action: 'clicked',
     componentName: componentName || 'Anchor',
     packageName: "@atlaskit/primitives",
-    packageVersion: "3.0.0",
+    packageVersion: "3.2.0",
     analyticsData: analyticsContext,
     actionSubject: 'link'
   });
   const 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.
   const styles = Array.isArray(xcssStyles) ? [defaultStyles, focusRingStyles, ...xcssStyles] : [defaultStyles, focusRingStyles, xcssStyles];
   const isExternal = typeof href === 'string' && IS_EXTERNAL_LINK_REGEX.test(href);
   const isNonHttpBased = typeof href === 'string' && IS_NON_HTTP_BASED.test(href);

package/dist/es2019/components/bleed.js

@@ -59,11 +59,12 @@ const Bleed = /*#__PURE__*/React.memo(({
   all,
   xcss
 }) => {
-  const xcssStyles = xcss && parseXcss(xcss);
+  const 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/es2019/components/box.js

@@ -21,7 +21,7 @@ import { SurfaceContext } from './internal/surface-provider';
  * - [Usage](https://atlassian.design/components/primitives/box/usage)
  */
 export const Box = /*#__PURE__*/forwardRef(({
-  as = 'div',
+  as: Component = 'div',
   children,
   backgroundColor,
   padding,
@@ -36,26 +36,26 @@ export const Box = /*#__PURE__*/forwardRef(({
   xcss,
   ...htmlAttributes
 }, ref) => {
-  const 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
   const {
     className: _spreadClass,
     ...safeHtmlAttributes
   } = htmlAttributes;
-  const className = xcss && parseXcss(xcss);
+  const resolvedStyles = parseXcss(xcss);
   const 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/es2019/components/flex.js

@@ -98,12 +98,13 @@ const Flex = /*#__PURE__*/memo( /*#__PURE__*/forwardRef(({
   wrap,
   xcss
 }, ref) => {
-  const xcssClassName = xcss && parseXcss(xcss);
+  const 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/es2019/components/grid.js

@@ -144,7 +144,7 @@ const Grid = /*#__PURE__*/memo( /*#__PURE__*/forwardRef(({
   xcss
 }, ref) => {
   const Component = as || 'div';
-  const xcssClassName = xcss && parseXcss(xcss);
+  const resolvedStyles = parseXcss(xcss);
 
   /**
    * We use CSS variables to allow for dynamic grid templates instead of dynamically setting to `props.style`
@@ -163,9 +163,10 @@ const Grid = /*#__PURE__*/memo( /*#__PURE__*/forwardRef(({
     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/es2019/components/inline.js

@@ -62,6 +62,11 @@ const Inline = /*#__PURE__*/memo( /*#__PURE__*/forwardRef(({
     }, separator && index > 0 ? separatorComponent : null, child);
   }) : rawChildren;
   const 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.
+  const styles = grow ? [flexGrowMap[grow], ...(Array.isArray(xcss) ? xcss : [xcss])] : xcss;
   return jsx(Flex, {
     as: as,
     role: role,
@@ -70,10 +75,10 @@ const Inline = /*#__PURE__*/memo( /*#__PURE__*/forwardRef(({
     direction: "row",
     gap: space,
     rowGap: rowSpace,
-    wrap: shouldWrap ? 'wrap' : undefined,
-    xcss: grow ? [flexGrowMap[grow], ...(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/es2019/components/pressable.js

@@ -66,7 +66,7 @@ const UNSAFE_PRESSABLE = /*#__PURE__*/forwardRef(({
     action: 'clicked',
     componentName: componentName || 'Pressable',
     packageName: "@atlaskit/primitives",
-    packageVersion: "3.0.0",
+    packageVersion: "3.2.0",
     analyticsData: analyticsContext,
     actionSubject: 'button'
   });
@@ -75,6 +75,10 @@ const UNSAFE_PRESSABLE = /*#__PURE__*/forwardRef(({
   let 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) ? [...styles, ...xcssStyles] : [...styles, xcssStyles];
   return /*#__PURE__*/React.createElement(Box, _extends({}, htmlAttributes, {
     as: "button",