@atlaskit/primitives 3.1.0 → 4.0.0

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @atlaskit/primitives
 
+## 4.0.0
+
+### Major Changes
+
+- [#77148](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/77148) [`473df43e816b`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/473df43e816b) - Removed `ui` variant from Text component. The `body` variant should be used for all non-heading typography.
+
+### Patch Changes
+
+- Updated dependencies
+
+## 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

package/constellation/text/code.mdx

@@ -1,6 +1,6 @@
 ---
 title: Text
-description: Text is a token-backed typography component to display body and UI text.
+description: Text is a token-backed typography component to display body text.
 order: 1
 props:
   packageName: '@atlaskit/primitives'

package/constellation/text/examples.mdx

@@ -1,6 +1,6 @@
 ---
 title: Text
-description: Text is a token-backed typography component to display body and UI text.
+description: Text is a token-backed typography component to display body text.
 order: 0
 ---
 
@@ -11,7 +11,7 @@ import AsElement from '../../examples/constellation/text/as-element';
 
 ## Basic
 
-Implements the [Atlassian typography system](/foundations/typography/) as a component, scoped to body and UI text usages.
+Implements the [Atlassian typography system](/foundations/typography/) as a component, scoped to body text usages.
 
 The `variant` prop expresses the visual appearance of the text element.
 
@@ -25,7 +25,7 @@ Set `color` to change the text color, defaults to `text.color` if not nested in
 
 ## Weight
 
-Set `weight` to change the front weight.
+Set `weight` to change the font weight.
 
 <Example Component={Weight} pacckageName="@atlaskit/primitives" />
 

package/constellation/text/usage.mdx

@@ -1,11 +1,9 @@
 ---
 title: Text
-description: Text is a token-backed typography component to display body and UI text.
+description: Text is a token-backed typography component to display body text.
 order: 2
 ---
 
 ## Usage
 
-UI text variants should be used in cases where line height being equal to the font size is desired. This is likely to be in UI components such as buttons.
-
-Body text variants should be used for multi-line text. For each variant, we have coupled a line height which fits the variant's font size, ensuring that it is compliant with accessibility standards.
+Use body text for main content, such as detailed descriptions or for text in components. For each variant, we have coupled a line height which fits the variant's font size, ensuring that it is compliant with accessibility standards.

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.1.0",
+    packageVersion: "4.0.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.1.0",
+    packageVersion: "4.0.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

@@ -6,15 +6,13 @@ 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("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");
 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) { (0, _defineProperty2.default)(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 */
+/** @jsx jsx */
 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.
@@ -22,7 +20,6 @@ var asAllowlist = ['span', 'p', 'strong', 'em'];
 var resetStyles = (0, _react2.css)({
   margin: 0
 });
-var variantStyles = _objectSpread(_objectSpread({}, _styleMaps.bodyTextStylesMap), _styleMaps.uiTextStylesMap);
 var strongStyles = (0, _react2.css)({
   fontWeight: 'bold'
 });
@@ -108,7 +105,7 @@ var Text = function Text(_ref) {
   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],
+    css: [resetStyles, _styleMaps.fontStylesMap[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
     },

package/dist/cjs/xcss/style-maps.partial.js

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.uiTextStylesMap = exports.uiTextMap = exports.textColorStylesMap = exports.textColorMap = exports.surfaceColorStylesMap = exports.surfaceColorMap = exports.spaceStylesMap = exports.shadowMap = exports.positiveSpaceMap = exports.paddingStylesMap = exports.opacityMap = exports.negativeSpaceMap = exports.lineHeightStylesMap = exports.lineHeightMap = exports.layerMap = exports.isSurfaceColorToken = exports.inverseColorMap = exports.fontWeightStylesMap = exports.fontWeightMap = exports.fontSizeStylesMap = exports.fontSizeMap = exports.fontFamilyStylesMap = exports.fontFamilyMap = exports.fillMap = exports.dimensionMap = exports.borderWidthMap = exports.borderRadiusMap = exports.borderColorMap = exports.bodyTextStylesMap = exports.bodyTextMap = exports.backgroundColorStylesMap = exports.backgroundColorMap = exports.allSpaceMap = void 0;
+exports.textColorStylesMap = exports.textColorMap = exports.surfaceColorStylesMap = exports.surfaceColorMap = exports.spaceStylesMap = exports.shadowMap = exports.positiveSpaceMap = exports.paddingStylesMap = exports.opacityMap = exports.negativeSpaceMap = exports.layerMap = exports.isSurfaceColorToken = exports.inverseColorMap = exports.fontWeightStylesMap = exports.fontWeightMap = exports.fontStylesMap = exports.fontFamilyStylesMap = exports.fontFamilyMap = exports.fillMap = exports.dimensionMap = exports.borderWidthMap = exports.borderRadiusMap = exports.borderColorMap = exports.bodyFontMap = exports.backgroundColorStylesMap = exports.backgroundColorMap = exports.allSpaceMap = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = require("@emotion/react");
 var _tokens = require("@atlaskit/tokens");
@@ -496,22 +496,17 @@ var borderRadiusMap = exports.borderRadiusMap = {
 
 /**
  * THIS SECTION WAS CREATED VIA CODEGEN DO NOT MODIFY {@see http://go/af-codegen}
- * @codegen <<SignedSource::aa70005b608c537f3d255a4a7f631198>>
+ * @codegen <<SignedSource::76c411b57ce0b5e8faa09cb692065229>>
  * @codegenId typography
  * @codegenCommand yarn workspace @atlaskit/primitives codegen-styles
  * @codegenParams ["fontSize", "fontWeight", "fontFamily", "lineHeight", "body", "ui"]
  * @codegenDependency ../../scripts/codegen-file-templates/dimensions.tsx <<SignedSource::0cd422575c3f2a3784eeef767abe71f4>>
  * @codegenDependency ../../scripts/codegen-file-templates/layer.tsx <<SignedSource::79d24a1e558f12d671c06a7609f90dc1>>
  */
-var fontSizeMap = exports.fontSizeMap = {
-  'font.size.050': "var(--ds-font-size-050, 11px)",
-  'font.size.075': "var(--ds-font-size-075, 12px)",
-  'font.size.100': "var(--ds-font-size-100, 14px)",
-  'font.size.200': "var(--ds-font-size-200, 16px)",
-  'font.size.300': "var(--ds-font-size-300, 20px)",
-  'font.size.400': "var(--ds-font-size-400, 24px)",
-  'font.size.500': "var(--ds-font-size-500, 29px)",
-  'font.size.600': "var(--ds-font-size-600, 35px)"
+var bodyFontMap = exports.bodyFontMap = {
+  body: "var(--ds-font-body, normal 400 14px/20px ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif)",
+  'body.large': "var(--ds-font-body-large, normal 400 16px/24px ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif)",
+  'body.small': "var(--ds-font-body-small, normal 400 11px/16px ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif)"
 };
 var fontWeightMap = exports.fontWeightMap = {
   bold: "var(--ds-font-weight-bold, 700)",
@@ -520,31 +515,8 @@ var fontWeightMap = exports.fontWeightMap = {
   semibold: "var(--ds-font-weight-semibold, 600)"
 };
 var fontFamilyMap = exports.fontFamilyMap = {
-  'font.family.body': "var(--ds-font-family-body, ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif)",
   'font.family.brand.body': "var(--ds-font-family-brand-body, \"Charlie Text\", ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif)",
-  'font.family.brand.heading': "var(--ds-font-family-brand-heading, \"Charlie Display\", ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif)",
-  'font.family.code': "var(--ds-font-family-code, ui-monospace, Menlo, \"Segoe UI Mono\", \"Ubuntu Mono\", monospace)",
-  'font.family.heading': "var(--ds-font-family-heading, ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif)",
-  'font.family.monospace': "var(--ds-font-family-monospace, ui-monospace, Menlo, \"Segoe UI Mono\", \"Ubuntu Mono\", monospace)",
-  'font.family.sans': "var(--ds-font-family-sans, -apple-system, BlinkMacSystemFont, \"Segoe UI\", \"Roboto\", \"Oxygen\", \"Ubuntu\", \"Fira Sans\", \"Droid Sans\", \"Helvetica Neue\", sans-serif)"
-};
-var lineHeightMap = exports.lineHeightMap = {
-  'font.lineHeight.1': "var(--ds-font-lineHeight-1, 1)",
-  'font.lineHeight.100': "var(--ds-font-lineHeight-100, 16px)",
-  'font.lineHeight.200': "var(--ds-font-lineHeight-200, 20px)",
-  'font.lineHeight.300': "var(--ds-font-lineHeight-300, 24px)",
-  'font.lineHeight.400': "var(--ds-font-lineHeight-400, 28px)",
-  'font.lineHeight.500': "var(--ds-font-lineHeight-500, 32px)",
-  'font.lineHeight.600': "var(--ds-font-lineHeight-600, 40px)"
-};
-var bodyTextMap = exports.bodyTextMap = {
-  body: "var(--ds-font-body, normal 400 14px/20px ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif)",
-  'body.large': "var(--ds-font-body-large, normal 400 16px/24px ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif)",
-  'body.small': "var(--ds-font-body-small, normal 400 11px/16px ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif)"
-};
-var uiTextMap = exports.uiTextMap = {
-  ui: "var(--ds-font-ui, normal 500 14px/1 ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif)",
-  'ui.small': "var(--ds-font-ui-small, normal 400 11px/1 ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif)"
+  'font.family.brand.heading': "var(--ds-font-family-brand-heading, \"Charlie Display\", ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif)"
 };
 
 /**
@@ -573,12 +545,9 @@ var spaceStylesMap = exports.spaceStylesMap = spacingProperties.reduce(function
 }, {});
 var backgroundColorStylesMap = exports.backgroundColorStylesMap = getSerializedStylesMap('backgroundColor', backgroundColorMap);
 var textColorStylesMap = exports.textColorStylesMap = getSerializedStylesMap('color', textColorMap);
-var fontSizeStylesMap = exports.fontSizeStylesMap = getSerializedStylesMap('fontSize', fontSizeMap);
 var fontWeightStylesMap = exports.fontWeightStylesMap = getSerializedStylesMap('fontWeight', fontWeightMap);
 var fontFamilyStylesMap = exports.fontFamilyStylesMap = getSerializedStylesMap('fontFamily', fontFamilyMap);
-var lineHeightStylesMap = exports.lineHeightStylesMap = getSerializedStylesMap('lineHeight', lineHeightMap);
-var bodyTextStylesMap = exports.bodyTextStylesMap = getSerializedStylesMap('font', bodyTextMap);
-var uiTextStylesMap = exports.uiTextStylesMap = getSerializedStylesMap('font', uiTextMap);
+var fontStylesMap = exports.fontStylesMap = getSerializedStylesMap('font', bodyFontMap);
 var surfaceColorStylesMap = exports.surfaceColorStylesMap = getSerializedStylesMap(_tokens.CURRENT_SURFACE_CSS_VAR, surfaceColorMap);
 var isSurfaceColorToken = exports.isSurfaceColorToken = function isSurfaceColorToken(color) {
   return surfaceColorMap[color] !== undefined;

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.1.0",
+    packageVersion: "4.0.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);