@atlaskit/css 0.10.7 → 0.12.0

package/CHANGELOG.md

@@ -1,5 +1,29 @@
 # @atlaskit/css
 
+## 0.12.0
+
+### Minor Changes
+
+- [#177956](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/177956)
+  [`124aac4a851f1`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/124aac4a851f1) -
+  Added metric typography tokens which can be used via the CSS `font` shorthand.
+
+### Patch Changes
+
+- Updated dependencies
+
+## 0.11.0
+
+### Minor Changes
+
+- [#172429](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/172429)
+  [`efcc283cecdfe`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/efcc283cecdfe) -
+  Added metric typography tokens which can be used via the CSS `font` shorthand.
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 0.10.7
 
 ### Patch Changes

package/codemods/0.5.2-primitives-emotion-to-compiled/index.tsx

@@ -96,7 +96,15 @@ function replaceXcssWithCssMap(
 	let firstUsagePath: ASTPath<core.Node> | null = null;
 	const styleVariables = new Set<string>();
 	const variableDependencies = new Map<string, Set<string>>();
-
+	const inlineXcssUsages: Array<{
+		path: ASTPath<core.CallExpression>;
+		keyName: string;
+		jsxAttribute: ASTPath<core.JSXAttribute>;
+		componentName: string;
+		variableName: string;
+	}> = [];
+
+	// First pass: collect all xcss variable declarations
 	source
 		.find(j.CallExpression, {
 			// get all xcss calls
@@ -137,11 +145,49 @@ function replaceXcssWithCssMap(
 							variableDependencies.set(variableName, dependencies);
 						}
 					}
+				} else {
+					// This is an inline xcss call - check if it's inside a JSX attribute
+					let current = path.parentPath;
+					let jsxElement: ASTPath<core.JSXElement> | null = null;
+
+					while (current) {
+						if (
+							current.node.type === 'JSXAttribute' &&
+							current.node.name.type === 'JSXIdentifier' &&
+							current.node.name.name === 'xcss'
+						) {
+							// Found inline xcss usage - now find the JSX element
+							let elementCurrent = current.parentPath;
+							while (elementCurrent) {
+								if (elementCurrent.node.type === 'JSXElement') {
+									jsxElement = elementCurrent as ASTPath<core.JSXElement>;
+									break;
+								}
+								elementCurrent = elementCurrent.parentPath;
+							}
+
+							if (jsxElement && jsxElement.node.openingElement.name.type === 'JSXIdentifier') {
+								const componentName = jsxElement.node.openingElement.name.name;
+								const variableName = `${componentName.toLowerCase()}Styles`;
+								const keyName = 'root';
+
+								inlineXcssUsages.push({
+									path,
+									keyName,
+									jsxAttribute: current as ASTPath<core.JSXAttribute>,
+									componentName,
+									variableName,
+								});
+							}
+							break;
+						}
+						current = current.parentPath;
+					}
 				}
 			}
 		});
 
-	// find the first usage of any style variable
+	// find the first usage of any style variable or inline xcss
 	source.find(j.Identifier).forEach((path) => {
 		if (
 			styleVariables.has(path.node.name) &&
@@ -156,7 +202,15 @@ function replaceXcssWithCssMap(
 		}
 	});
 
-	// find all xcss function calls
+	// Check for inline xcss usage as well for first usage
+	if (
+		inlineXcssUsages.length > 0 &&
+		(!firstUsagePath || inlineXcssUsages[0].path.node.loc?.start)
+	) {
+		firstUsagePath = inlineXcssUsages[0].path;
+	}
+
+	// Process variable xcss declarations
 	source
 		.find(j.CallExpression, {
 			callee: {
@@ -202,7 +256,40 @@ function replaceXcssWithCssMap(
 			}
 		});
 
-	// create new cssMap with the combined xcss object properties
+	// Process inline xcss usages - create separate cssMap for each
+	const cssMapDeclarations: core.VariableDeclaration[] = [];
+
+	inlineXcssUsages.forEach(({ path, keyName, jsxAttribute, componentName, variableName }) => {
+		const args = path.node.arguments;
+		if (args.length === 1 && args[0].type === 'ObjectExpression') {
+			// Create separate cssMap declaration for each inline xcss
+			const cssMapObject = j.objectProperty(
+				j.identifier(keyName),
+				ensureSelectorAmpersand(j, args[0]),
+			);
+
+			const cssMapVariableDeclaration = j.variableDeclaration('const', [
+				j.variableDeclarator(
+					j.identifier(variableName),
+					j.callExpression(j.identifier('cssMap'), [j.objectExpression([cssMapObject])]),
+				),
+			]);
+
+			cssMapDeclarations.push(cssMapVariableDeclaration);
+
+			// Update the JSX attribute to use the cssMap reference
+			jsxAttribute.node.value = j.jsxExpressionContainer(
+				j.memberExpression(j.identifier(variableName), j.identifier(keyName)),
+			);
+
+			// Track first xcss call if not already set
+			if (!firstXcssPath) {
+				firstXcssPath = path;
+			}
+		}
+	});
+
+	// create new cssMap with the combined xcss object properties (for variable declarations)
 	if (cssMapProperties.length > 0) {
 		const cssMapObject = j.objectExpression(cssMapProperties);
 		const cssMapVariableDeclaration = j.variableDeclaration('const', [
@@ -212,44 +299,46 @@ function replaceXcssWithCssMap(
 			),
 		]);
 
-		// insert the cssMap declaration before its first usage
-		if (firstUsagePath) {
-			const programBody = source.get().node.program.body;
-			let insertIndex = 0;
-
-			// find the last variable declaration that any style depends on
-			let lastDependencyIndex = -1;
-			for (let i = 0; i < programBody.length; i++) {
-				const node = programBody[i];
-				if (node.type === 'VariableDeclaration') {
-					const varName = node.declarations[0]?.id.name;
-					if (varName) {
-						// check if this variable is a dependency of any style
-						for (const [, deps] of variableDependencies.entries()) {
-							if (deps.has(varName)) {
-								lastDependencyIndex = i;
-								break;
-							}
+		cssMapDeclarations.unshift(cssMapVariableDeclaration);
+	}
+
+	// Insert all cssMap declarations
+	if (cssMapDeclarations.length > 0 && firstUsagePath) {
+		const programBody = source.get().node.program.body;
+		let insertIndex = 0;
+
+		// find the last variable declaration that any style depends on
+		let lastDependencyIndex = -1;
+		for (let i = 0; i < programBody.length; i++) {
+			const node = programBody[i];
+			if (node.type === 'VariableDeclaration') {
+				const varName = node.declarations[0]?.id.name;
+				if (varName) {
+					// check if this variable is a dependency of any style
+					for (const [, deps] of variableDependencies.entries()) {
+						if (deps.has(varName)) {
+							lastDependencyIndex = i;
+							break;
 						}
 					}
 				}
 			}
+		}
 
-			// insert after the last dependency
-			if (lastDependencyIndex !== -1) {
-				insertIndex = lastDependencyIndex + 1;
-			} else {
-				// if no dependencies, find the first non-import/type declaration
-				insertIndex = programBody.findIndex(
-					(node: { type: string }) =>
-						node.type !== 'ImportDeclaration' &&
-						node.type !== 'TypeAlias' &&
-						node.type !== 'InterfaceDeclaration',
-				);
-			}
-
-			programBody.splice(insertIndex, 0, cssMapVariableDeclaration);
+		// insert after the last dependency
+		if (lastDependencyIndex !== -1) {
+			insertIndex = lastDependencyIndex + 1;
+		} else {
+			// if no dependencies, find the first non-import/type declaration
+			insertIndex = programBody.findIndex(
+				(node: { type: string }) =>
+					node.type !== 'ImportDeclaration' &&
+					node.type !== 'TypeAlias' &&
+					node.type !== 'InterfaceDeclaration',
+			);
 		}
+
+		programBody.splice(insertIndex, 0, ...cssMapDeclarations);
 	}
 
 	// First handle backgroundColor transformation for Box components
@@ -387,19 +476,35 @@ function replaceXcssWithCssMap(
 			if (value && value.type === 'JSXExpressionContainer') {
 				const expression = value.expression;
 				if (expression.type === 'Identifier') {
-					// <Box xcss={buttonStyles} /> -> <Box xcss={styles.button} />
-					expression.name = `styles.${getCssMapKey(expression.name)}`;
+					if (styleVariables.has(expression.name)) {
+						// <Box xcss={buttonStyles} /> => <Box xcss={styles.button} />
+						path.node.value = j.jsxExpressionContainer(
+							j.memberExpression(
+								j.identifier('styles'),
+								j.identifier(getCssMapKey(expression.name)),
+							),
+						);
+					}
 				} else if (expression.type === 'ArrayExpression') {
-					// <Box xcss={[baseStyles, otherStyles]} /> -> <Box xcss={[styles.base, styles.other]} />
+					// <Box xcss={[baseStyles, otherStyles]} /> => <Box xcss={[styles.base, styles.other]} />
 					expression.elements.forEach((element) => {
-						if (element?.type === 'Identifier') {
-							element.name = `styles.${getCssMapKey(element.name)}`;
+						if (element?.type === 'Identifier' && styleVariables.has(element.name)) {
+							const memberExpression = j.memberExpression(
+								j.identifier('styles'),
+								j.identifier(getCssMapKey(element.name)),
+							);
+							// Replace the identifier with the member expression
+							Object.assign(element, memberExpression);
 						} else if (
-							// <Box xcss={condition && styles} /> -> <Box xcss={condition && styles.root} />
+							// <Box xcss={condition && styles} /> => <Box xcss={condition && styles.root} />
 							element?.type === 'LogicalExpression' &&
-							element.right.type === 'Identifier'
+							element.right.type === 'Identifier' &&
+							styleVariables.has(element.right.name)
 						) {
-							element.right.name = `styles.${getCssMapKey(element.right.name)}`;
+							element.right = j.memberExpression(
+								j.identifier('styles'),
+								j.identifier(getCssMapKey(element.right.name)),
+							);
 						}
 					});
 				}

package/codemods/0.5.2-primitives-emotion-to-compiled/style-maps.partial.tsx

@@ -908,7 +908,7 @@ export type BorderRadius = keyof typeof borderRadiusMap;
 
 /**
  * THIS SECTION WAS CREATED VIA CODEGEN DO NOT MODIFY {@see http://go/af-codegen}
- * @codegen <<SignedSource::b2a06338babbfbea48ed2205e34084fc>>
+ * @codegen <<SignedSource::2c0cffbebdab4e28fe2b45925623e523>>
  * @codegenId typography
  * @codegenCommand yarn workspace @atlaskit/primitives codegen-styles
  * @codegenParams ["fontSize", "fontWeight", "fontFamily", "lineHeight", "body", "ui"]
@@ -964,6 +964,18 @@ export const fontMap = {
 		'font.heading.xxsmall',
 		'normal 600 12px/16px ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, "Helvetica Neue", sans-serif',
 	),
+	'font.metric.large': token(
+		'font.metric.large',
+		'normal 653 28px/32px ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, "Helvetica Neue", sans-serif',
+	),
+	'font.metric.medium': token(
+		'font.metric.medium',
+		'normal 653 24px/28px ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, "Helvetica Neue", sans-serif',
+	),
+	'font.metric.small': token(
+		'font.metric.small',
+		'normal 653 16px/20px ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, "Helvetica Neue", sans-serif',
+	),
 };
 
 export type Font = keyof typeof fontMap;
@@ -1008,7 +1020,7 @@ export type FontFamily = keyof typeof fontFamilyMap;
 
 /**
  * THIS SECTION WAS CREATED VIA CODEGEN DO NOT MODIFY {@see http://go/af-codegen}
- * @codegen <<SignedSource::159df661d29a2805a17ab6f52e842350>>
+ * @codegen <<SignedSource::c207cc4caf0794de5f13707a9c28451f>>
  * @codegenId text
  * @codegenCommand yarn workspace @atlaskit/primitives codegen-styles
  * @codegenDependency ../../../primitives/scripts/codegen-file-templates/dimensions.tsx <<SignedSource::cc9b3f12104c6ede803da6a42daac0b0>>
@@ -1044,6 +1056,23 @@ export const textWeightMap = {
 
 export type TextWeight = keyof typeof textWeightMap;
 
+export const metricTextSizeMap = {
+	large: token(
+		'font.metric.large',
+		'normal 653 28px/32px ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, "Helvetica Neue", sans-serif',
+	),
+	medium: token(
+		'font.metric.medium',
+		'normal 653 24px/28px ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, "Helvetica Neue", sans-serif',
+	),
+	small: token(
+		'font.metric.small',
+		'normal 653 16px/20px ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, "Helvetica Neue", sans-serif',
+	),
+};
+
+export type MetricTextSize = keyof typeof metricTextSizeMap;
+
 /**
  * @codegenEnd
  */
@@ -1211,6 +1240,7 @@ type FontFamilyToken = keyof typeof fontFamilyMap;
 type FontToken = keyof typeof fontMap;
 type TextWeightToken = keyof typeof textWeightMap;
 type TextSizeToken = keyof typeof textSizeMap;
+type MetricTextSizeToken = keyof typeof metricTextSizeMap;
 type SpacingStyleMap = Record<SpacingProperty, Record<SpacingToken, SerializedStyles>>;
 type BackgroundColorStyleMap = Record<BackgroundColorToken, SerializedStyles>;
 type SurfaceColorStyleMap = Record<SurfaceColorToken, SerializedStyles>;
@@ -1220,6 +1250,7 @@ type FontFamilyStyleMap = Record<FontFamilyToken, SerializedStyles>;
 type FontStyleMap = Record<FontToken, SerializedStyles>;
 type TextWeightStyleMap = Record<TextWeightToken, SerializedStyles>;
 type TextStyleMap = Record<TextSizeToken, SerializedStyles>;
+type MetricTextStyleMap = Record<MetricTextSizeToken, SerializedStyles>;
 
 export const paddingStylesMap: SpacingStyleMap = spacingProperties.reduce(
 	(styleMap, spacingProperty: SpacingProperty) => {
@@ -1269,3 +1300,8 @@ export const surfaceColorStylesMap: SurfaceColorStyleMap = getSerializedStylesMa
 
 export const isSurfaceColorToken = (color: unknown): color is SurfaceColorToken =>
 	surfaceColorMap[color as SurfaceColorToken] !== undefined;
+
+export const metricTextSizeStylesMap: MetricTextStyleMap = getSerializedStylesMap(
+	'font',
+	metricTextSizeMap,
+);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/css",
-	"version": "0.10.7",
+	"version": "0.12.0",
 	"description": "Style components backed by Atlassian Design System design tokens powered by Compiled CSS-in-JS.",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -49,7 +49,7 @@
 		"./test-utils": "./src/test-utils/index.tsx"
 	},
 	"dependencies": {
-		"@atlaskit/tokens": "^5.0.0",
+		"@atlaskit/tokens": "^5.4.0",
 		"@babel/runtime": "^7.0.0",
 		"@compiled/react": "^0.18.3"
 	},
@@ -60,7 +60,7 @@
 		"@af/visual-regression": "workspace:^",
 		"@atlaskit/button": "^23.2.0",
 		"@atlaskit/ds-lib": "^4.0.0",
-		"@atlaskit/primitives": "^14.8.0",
+		"@atlaskit/primitives": "^14.10.0",
 		"@emotion/react": "^11.7.1",
 		"@testing-library/react": "^13.4.0",
 		"@types/jscodeshift": "^0.11.0",