@atlaskit/primitives 3.1.0 → 4.0.0

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

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

@@ -2,7 +2,7 @@
 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';
+import { fontStylesMap, fontWeightStylesMap, inverseColorMap, textColorStylesMap } from '../xcss/style-maps.partial';
 import { useSurface } from './internal/surface-provider';
 const 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.
@@ -11,10 +11,6 @@ const asAllowlist = ['span', 'p', 'strong', 'em'];
 const resetStyles = css({
   margin: 0
 });
-const variantStyles = {
-  ...bodyTextStylesMap,
-  ...uiTextStylesMap
-};
 const strongStyles = css({
   fontWeight: 'bold'
 });
@@ -99,7 +95,7 @@ const Text = ({
   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],
+    css: [resetStyles, fontStylesMap[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
     },

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

@@ -484,22 +484,17 @@ export const 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>>
  */
-export const 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)"
+export const 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)"
 };
 export const fontWeightMap = {
   bold: "var(--ds-font-weight-bold, 700)",
@@ -508,31 +503,8 @@ export const fontWeightMap = {
   semibold: "var(--ds-font-weight-semibold, 600)"
 };
 export const 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)"
-};
-export const 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)"
-};
-export const 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)"
-};
-export const 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)"
 };
 
 /**
@@ -563,11 +535,8 @@ export const spaceStylesMap = spacingProperties.reduce((styleMap, spacingPropert
 }, {});
 export const backgroundColorStylesMap = getSerializedStylesMap('backgroundColor', backgroundColorMap);
 export const textColorStylesMap = getSerializedStylesMap('color', textColorMap);
-export const fontSizeStylesMap = getSerializedStylesMap('fontSize', fontSizeMap);
 export const fontWeightStylesMap = getSerializedStylesMap('fontWeight', fontWeightMap);
 export const fontFamilyStylesMap = getSerializedStylesMap('fontFamily', fontFamilyMap);
-export const lineHeightStylesMap = getSerializedStylesMap('lineHeight', lineHeightMap);
-export const bodyTextStylesMap = getSerializedStylesMap('font', bodyTextMap);
-export const uiTextStylesMap = getSerializedStylesMap('font', uiTextMap);
+export const fontStylesMap = getSerializedStylesMap('font', bodyFontMap);
 export const surfaceColorStylesMap = getSerializedStylesMap(CURRENT_SURFACE_CSS_VAR, surfaceColorMap);
 export const isSurfaceColorToken = color => surfaceColorMap[color] !== undefined;

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

@@ -1,13 +1,10 @@
 import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
-import _defineProperty from "@babel/runtime/helpers/defineProperty";
 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';
+import { fontStylesMap, fontWeightStylesMap, inverseColorMap, textColorStylesMap } from '../xcss/style-maps.partial';
 import { useSurface } from './internal/surface-provider';
 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.
@@ -16,7 +13,6 @@ var asAllowlist = ['span', 'p', 'strong', 'em'];
 var resetStyles = css({
   margin: 0
 });
-var variantStyles = _objectSpread(_objectSpread({}, bodyTextStylesMap), uiTextStylesMap);
 var strongStyles = css({
   fontWeight: 'bold'
 });
@@ -102,7 +98,7 @@ var Text = function Text(_ref) {
   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],
+    css: [resetStyles, fontStylesMap[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
     },

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

@@ -484,22 +484,17 @@ export var 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>>
  */
-export var 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)"
+export var 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)"
 };
 export var fontWeightMap = {
   bold: "var(--ds-font-weight-bold, 700)",
@@ -508,31 +503,8 @@ export var fontWeightMap = {
   semibold: "var(--ds-font-weight-semibold, 600)"
 };
 export var 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)"
-};
-export var 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)"
-};
-export var 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)"
-};
-export var 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)"
 };
 
 /**
@@ -561,12 +533,9 @@ export var spaceStylesMap = spacingProperties.reduce(function (styleMap, spacing
 }, {});
 export var backgroundColorStylesMap = getSerializedStylesMap('backgroundColor', backgroundColorMap);
 export var textColorStylesMap = getSerializedStylesMap('color', textColorMap);
-export var fontSizeStylesMap = getSerializedStylesMap('fontSize', fontSizeMap);
 export var fontWeightStylesMap = getSerializedStylesMap('fontWeight', fontWeightMap);
 export var fontFamilyStylesMap = getSerializedStylesMap('fontFamily', fontFamilyMap);
-export var lineHeightStylesMap = getSerializedStylesMap('lineHeight', lineHeightMap);
-export var bodyTextStylesMap = getSerializedStylesMap('font', bodyTextMap);
-export var uiTextStylesMap = getSerializedStylesMap('font', uiTextMap);
+export var fontStylesMap = getSerializedStylesMap('font', bodyFontMap);
 export var surfaceColorStylesMap = getSerializedStylesMap(CURRENT_SURFACE_CSS_VAR, surfaceColorMap);
 export var isSurfaceColorToken = function isSurfaceColorToken(color) {
   return surfaceColorMap[color] !== undefined;

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.
      */