@atlaskit/forge-react-types 0.47.2 → 0.49.0

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/forge-react-types",
-	"version": "0.47.2",
+	"version": "0.49.0",
 	"description": "Component types for Forge UI Kit React components",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -25,26 +25,26 @@
 		"@atlaskit/comment": "^13.1.0",
 		"@atlaskit/datetime-picker": "^17.1.0",
 		"@atlaskit/dynamic-table": "^18.3.0",
-		"@atlaskit/form": "^14.2.0",
+		"@atlaskit/form": "^14.3.0",
 		"@atlaskit/inline-edit": "^15.3.0",
-		"@atlaskit/modal-dialog": "^14.6.0",
-		"@atlaskit/navigation-system": "^5.3.0",
+		"@atlaskit/modal-dialog": "^14.7.0",
+		"@atlaskit/navigation-system": "^5.9.0",
 		"@atlaskit/popup": "^4.6.0",
-		"@atlaskit/primitives": "^16.1.0",
+		"@atlaskit/primitives": "^16.4.0",
 		"@atlaskit/progress-bar": "^4.0.0",
 		"@atlaskit/progress-tracker": "^10.3.0",
 		"@atlaskit/radio": "^8.3.0",
 		"@atlaskit/section-message": "^8.9.0",
-		"@atlaskit/select": "^21.3.0",
+		"@atlaskit/select": "^21.4.0",
 		"@atlaskit/spinner": "^19.0.0",
 		"@atlaskit/tabs": "^18.2.0",
 		"@atlaskit/tag": "^14.1.0",
 		"@atlaskit/tag-group": "^12.0.0",
-		"@atlaskit/textarea": "^8.0.0",
-		"@atlaskit/textfield": "^8.0.0",
+		"@atlaskit/textarea": "^8.1.0",
+		"@atlaskit/textfield": "^8.1.0",
 		"@atlaskit/toggle": "^15.1.0",
-		"@atlaskit/tokens": "^8.0.0",
-		"@atlaskit/tooltip": "^20.8.0",
+		"@atlaskit/tokens": "^8.3.0",
+		"@atlaskit/tooltip": "^20.10.0",
 		"@babel/runtime": "^7.0.0"
 	},
 	"peerDependencies": {
@@ -52,7 +52,7 @@
 	},
 	"devDependencies": {
 		"@atlassian/codegen": "^0.1.0",
-		"@atlassian/forge-ui": "^32.45.0",
+		"@atlassian/forge-ui": "^32.49.0",
 		"@types/node": "~22.17.1",
 		"lodash": "^4.17.21",
 		"react": "^18.2.0",

package/scripts/codegen/codeGenerator.ts

@@ -6,7 +6,9 @@ import {
 	type TypeAliasDeclaration,
 	type ImportDeclaration,
 	type TypeReferenceNode,
+	type VariableDeclaration,
 	SyntaxKind,
+	Node,
 } from 'ts-morph';
 // eslint-disable-next-line import/no-extraneous-dependencies
 import kebabCase from 'lodash/kebabCase';
@@ -193,6 +195,7 @@ class ImportDeclarationProxy implements IImportDeclaration {
 			.map((text) => text.trim());
 
 		if (isSharedUIKit2TypesImport(this.base)) {
+			// Map shared UIKit type imports to types.codegen
 			packageName = './types.codegen';
 		}
 
@@ -243,12 +246,11 @@ class SimpleImportDeclaration implements IImportDeclaration {
 
 // handles type imports from platform/packages/forge/forge-ui/src/components/UIKit/types.ts
 const isSharedUIKit2TypesImport = (importDeclaration: ImportDeclaration) => {
+	const fileName = importDeclaration.getModuleSpecifierValue().split('/').pop();
 	return (
 		importDeclaration.isTypeOnly() &&
-		// file is a relative import
 		importDeclaration.getModuleSpecifierValue().charAt(0) === '.' &&
-		// file is named types
-		importDeclaration.getModuleSpecifierValue().split('/').pop() === 'types'
+		fileName === 'types'
 	);
 };
 
@@ -772,6 +774,143 @@ const generateComponentPropTypeSourceCodeWithSerializedType = (
 	});
 };
 
+/**
+ * Extracts variable declarations that are referenced in the given variable declaration node.
+ * This recursively finds all variable references and extracts their declarations.
+ */
+const extractReferencedVariables = (
+	sourceFile: SourceFile,
+	variableDeclaration: VariableDeclaration,
+	visited: Set<string> = new Set(),
+): string[] => {
+	const variableDeclarations: string[] = [];
+	const identifiers = new Set<string>();
+
+	// Traverse the AST to find identifier references
+	const initializer = variableDeclaration.getInitializer();
+	if (initializer) {
+		initializer.forEachDescendant((node) => {
+			if (Node.isIdentifier(node)) {
+				// Only consider identifiers that are not part of property access
+				// (e.g., `obj.prop` - we want to skip `prop` but consider `obj` if it's a variable)
+				const parent = node.getParent();
+				const isPropertyAccess =
+					Node.isPropertyAccessExpression(parent) && parent.getNameNode() === node;
+				const isPropertyName = Node.isPropertyAssignment(parent) && parent.getNameNode() === node;
+
+				if (!isPropertyAccess && !isPropertyName) {
+					const identifier = node.getText();
+					// Skip keywords and already visited variables
+					if (
+						!visited.has(identifier) &&
+						![
+							'const',
+							'let',
+							'var',
+							'function',
+							'return',
+							'if',
+							'else',
+							'for',
+							'while',
+							'true',
+							'false',
+							'null',
+							'undefined',
+							'this',
+							'super',
+							'makeXCSSValidator',
+						].includes(identifier)
+					) {
+						identifiers.add(identifier);
+					}
+				}
+			}
+		});
+	}
+
+	// Try to find variable declarations for each identifier
+	for (const identifier of identifiers) {
+		try {
+			const referencedVar = sourceFile.getVariableDeclaration(identifier);
+			if (referencedVar && !visited.has(identifier)) {
+				visited.add(identifier);
+				const declarationText = referencedVar.getVariableStatement()?.getText();
+				if (declarationText) {
+					variableDeclarations.push(declarationText);
+					// Recursively extract variables referenced in this declaration
+					const nestedVariables = extractReferencedVariables(sourceFile, referencedVar, visited);
+					variableDeclarations.push(...nestedVariables);
+				}
+			}
+		} catch {
+			// Variable not found in this file, skip it
+		}
+	}
+
+	return variableDeclarations;
+};
+
+/**
+ * Extracts import declarations that are used by the given variable declarations.
+ */
+const extractImportsForVariables = (
+	sourceFile: SourceFile,
+	variableDeclarations: string[],
+): string[] => {
+	const importDeclarations: string[] = [];
+	const allVariableCode = variableDeclarations.join('\n');
+
+	// Get all import declarations from the source file
+	const imports = sourceFile.getImportDeclarations();
+
+	for (const importDecl of imports) {
+		const moduleSpecifier = importDecl.getModuleSpecifierValue();
+		// Only extract imports from @atlaskit packages (not local imports)
+		if (moduleSpecifier.startsWith('@atlaskit/')) {
+			const namedImports = importDecl.getNamedImports();
+			const isTypeOnlyImport = importDecl.isTypeOnly();
+
+			// Check if any of the imported names are used in the variable declarations
+			const usedNamedImports: string[] = [];
+			const usedTypeImports: string[] = [];
+
+			for (const namedImport of namedImports) {
+				const importName = namedImport.getAliasNode()?.getText() ?? namedImport.getName();
+				if (isTokenUsed(importName, [allVariableCode])) {
+					// Check if this specific import specifier is type-only
+					// by checking if the import declaration text contains "type" before this import
+					const importText = importDecl.getText();
+					const importNamePattern = new RegExp(`\\btype\\s+${importName}\\b`);
+					const isTypeOnly = isTypeOnlyImport || importNamePattern.test(importText);
+
+					if (isTypeOnly) {
+						usedTypeImports.push(importName);
+					} else {
+						usedNamedImports.push(importName);
+					}
+				}
+			}
+
+			// If any imports are used, create an import statement
+			if (usedNamedImports.length > 0 || usedTypeImports.length > 0) {
+				const importParts: string[] = [];
+				if (usedTypeImports.length > 0) {
+					importParts.push(`type { ${usedTypeImports.join(', ')} }`);
+				}
+				if (usedNamedImports.length > 0) {
+					importParts.push(`{ ${usedNamedImports.join(', ')} }`);
+				}
+				if (importParts.length > 0) {
+					importDeclarations.push(`import ${importParts.join(', ')} from '${moduleSpecifier}';`);
+				}
+			}
+		}
+	}
+
+	return importDeclarations;
+};
+
 const handleXCSSProp: CodeConsolidator = ({
 	sourceFile,
 	importCode,
@@ -783,12 +922,25 @@ const handleXCSSProp: CodeConsolidator = ({
 	const xcssValidatorfile = sourceFile
 		.getProject()
 		.addSourceFileAtPath(require.resolve('@atlassian/forge-ui/utils/xcssValidator'));
-	const xcssValidator = xcssValidatorfile.getVariableDeclarationOrThrow('xcssValidator').getText();
+	const xcssValidatorDeclaration = xcssValidatorfile.getVariableDeclarationOrThrow('xcssValidator');
+	const xcssValidator = xcssValidatorDeclaration.getText();
 	const XCSSPropType = xcssValidatorfile
 		.getTypeAliasOrThrow('XCSSProp')
 		.setIsExported(false)
 		.getText();
 
+	// Extract variables referenced in xcssValidator
+	const referencedVariables = extractReferencedVariables(
+		xcssValidatorfile,
+		xcssValidatorDeclaration,
+	);
+	// Reverse to maintain dependency order (dependencies first)
+	const referencedVariablesCode = referencedVariables.reverse().join('\n');
+
+	// Extract imports used by the extracted variables
+	const variableImports = extractImportsForVariables(xcssValidatorfile, referencedVariables);
+	const variableImportsCode = variableImports.join('\n');
+
 	const utilsFile = sourceFile
 		.getProject()
 		.addSourceFileAtPath(require.resolve('@atlassian/forge-ui/utils/xcssValidate'));
@@ -798,9 +950,13 @@ const handleXCSSProp: CodeConsolidator = ({
 		}).compilerObject.outputFiles[0].text;
 		const xcssValidatorVariableDeclarationCode = [
 			xcssValidatorDeclarationCode,
+			variableImportsCode,
+			referencedVariablesCode,
 			`const ${xcssValidator};`,
 			XCSSPropType,
-		].join('\n');
+		]
+			.filter((code) => !!code)
+			.join('\n');
 
 		return [
 			'/* eslint-disable @atlaskit/design-system/ensure-design-token-usage/preview */',

package/scripts/codegen/componentPropTypes.ts

@@ -147,21 +147,33 @@ const updatePackageJsonWithADSComponentDependencies = (componentOutputDir: strin
 	const packageJsonPath = resolve(__dirname, '..', '..', 'package.json');
 	const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf8'));
 
-	// remove all existing @atlaskit dependencies from packageJson
+	// Build updated dependencies: keep non-@atlaskit packages, and add/update @atlaskit packages
 	const updatedDependencies = Object.entries<string>(packageJson.dependencies)
 		.filter(([key]) => !key.startsWith('@atlaskit/'))
-		.concat(
-			Object.entries<string>(forgeUIPackageJson.dependencies).filter(([key]) =>
-				utilizedPackages.has(key),
-			),
-		)
-		.sort(([a], [b]) => a.localeCompare(b))
 		.reduce<Record<string, string>>((acc, [key, value]) => {
 			acc[key] = value;
 			return acc;
 		}, {});
 
-	packageJson.dependencies = updatedDependencies;
+	// Add @atlaskit packages that are being used
+	// Prefer version from forgeUIPackageJson if available, otherwise keep existing version
+	for (const packageName of utilizedPackages) {
+		if (forgeUIPackageJson.dependencies?.[packageName]) {
+			// Use version from forgeUIPackageJson
+			updatedDependencies[packageName] = forgeUIPackageJson.dependencies[packageName];
+		} else if (packageJson.dependencies?.[packageName]) {
+			// Keep existing version if not in forgeUIPackageJson
+			updatedDependencies[packageName] = packageJson.dependencies[packageName];
+		}
+		// If package is not in either, we skip it (shouldn't happen if codegen is working correctly)
+	}
+
+	// Sort dependencies alphabetically
+	const sortedDependencies = Object.entries(updatedDependencies).sort(([a], [b]) =>
+		a.localeCompare(b),
+	);
+
+	packageJson.dependencies = Object.fromEntries(sortedDependencies);
 	fs.writeFileSync(packageJsonPath, JSON.stringify(packageJson, null, '\t') + '\n');
 };
 /**
@@ -209,7 +221,7 @@ const generateComponentPropTypes = (componentNames?: string) => {
 			})
 			.sort((a, b) => a.getName().localeCompare(b.getName()));
 
-		// generate share types file first
+		// generate shared files first
 		generateSharedTypesFile(componentOutputDir);
 
 		generateComponentPropTypeSourceFiles(componentOutputDir, componentPropTypeSymbols);

package/src/components/__generated__/BoxProps.codegen.tsx

@@ -3,14 +3,14 @@
  *
  * Extract component prop types from UIKit 2 components - BoxProps
  *
- * @codegen <<SignedSource::97f15631a172af79bb692d529c0cfdd2>>
+ * @codegen <<SignedSource::2576658a875b738553fdb3ccfa41acd1>>
  * @codegenCommand yarn workspace @atlaskit/forge-react-types codegen
- * @codegenDependency ../../../../forge-ui/src/components/UIKit/box/__generated__/index.partial.tsx <<SignedSource::8e5857e8580db0dac17ebc42ab6115c9>>
+ * @codegenDependency ../../../../forge-ui/src/components/UIKit/box/index.tsx <<SignedSource::6b375bb57ecf19919f9e1b65e899fd96>>
  */
 /* eslint-disable @atlaskit/design-system/ensure-design-token-usage/preview */
 
 import React from 'react';
-import { Box as PlatformBox } from '@atlaskit/primitives';
+import type { Box as PlatformBox } from '@atlaskit/primitives';
 
 import type * as CSS from 'csstype';
 import type { MediaQuery } from '@atlaskit/primitives';
@@ -67,6 +67,17 @@ declare const makeXCSSValidator: <U extends XCSSValidatorParam>(supportedXCSSPro
 export { makeXCSSValidator };
 export type { SafeCSSObject };
 
+import type { BorderRadius } from '@atlaskit/primitives';
+const borderRadiusTokens: BorderRadius[] = [
+	'radius.xsmall',
+	'radius.small',
+	'radius.medium',
+	'radius.large',
+	'radius.xlarge',
+	'radius.full',
+	'radius.tile',
+];
+const borderRadiusSupportedValues = [...borderRadiusTokens, 'border.radius'];
 const xcssValidator = makeXCSSValidator({
 	// text related props
 	textAlign: {
@@ -150,26 +161,26 @@ const xcssValidator = makeXCSSValidator({
 	paddingTop: true,
 
 	// other box related props
-	borderRadius: { supportedValues: ['border.radius'] },
-	borderBottomLeftRadius: { supportedValues: ['border.radius'] },
-	borderBottomRightRadius: { supportedValues: ['border.radius'] },
-	borderTopLeftRadius: { supportedValues: ['border.radius'] },
-	borderTopRightRadius: { supportedValues: ['border.radius'] },
-	borderEndEndRadius: { supportedValues: ['border.radius'] },
-	borderEndStartRadius: { supportedValues: ['border.radius'] },
-	borderStartEndRadius: { supportedValues: ['border.radius'] },
-	borderStartStartRadius: { supportedValues: ['border.radius'] },
-	borderWidth: { supportedValues: ['border.width'] },
-	borderBlockWidth: { supportedValues: ['border.width'] },
-	borderBlockEndWidth: { supportedValues: ['border.width'] },
-	borderBlockStartWidth: { supportedValues: ['border.width'] },
-	borderBottomWidth: { supportedValues: ['border.width'] },
-	borderInlineWidth: { supportedValues: ['border.width'] },
-	borderInlineEndWidth: { supportedValues: ['border.width'] },
-	borderInlineStartWidth: { supportedValues: ['border.width'] },
-	borderLeftWidth: { supportedValues: ['border.width'] },
-	borderRightWidth: { supportedValues: ['border.width'] },
-	borderTopWidth: { supportedValues: ['border.width'] },
+	borderRadius: { supportedValues: borderRadiusSupportedValues },
+	borderBottomLeftRadius: { supportedValues: borderRadiusSupportedValues },
+	borderBottomRightRadius: { supportedValues: borderRadiusSupportedValues },
+	borderTopLeftRadius: { supportedValues: borderRadiusSupportedValues },
+	borderTopRightRadius: { supportedValues: borderRadiusSupportedValues },
+	borderEndEndRadius: { supportedValues: borderRadiusSupportedValues },
+	borderEndStartRadius: { supportedValues: borderRadiusSupportedValues },
+	borderStartEndRadius: { supportedValues: borderRadiusSupportedValues },
+	borderStartStartRadius: { supportedValues: borderRadiusSupportedValues },
+	borderWidth: true,
+	borderBlockWidth: true,
+	borderBlockEndWidth: true,
+	borderBlockStartWidth: true,
+	borderBottomWidth: true,
+	borderInlineWidth: true,
+	borderInlineEndWidth: true,
+	borderInlineStartWidth: true,
+	borderLeftWidth: true,
+	borderRightWidth: true,
+	borderTopWidth: true,
 
 	// other props not in tokens based props
 	borderTopStyle: {
@@ -196,6 +207,22 @@ type XCSSProp = ReturnType<typeof xcssValidator>;
 type PlatformBoxProps = React.ComponentProps<typeof PlatformBox>;
 
 export type BoxProps = Pick<PlatformBoxProps, 'children' | 'ref' | 'testId'> & {
+	/**
+	 * A token alias for background color. See: [Design tokens](https://atlassian.design/components/tokens/all-tokens)
+	 * for a list of available colors.
+	 *
+	 * When the background color is set to a surface token, the current surface CSS variable
+	 * will also be set to this value in the `Box` styles.
+	 *
+	 * @type [Background color tokens](https://atlassian.design/components/tokens/all-tokens#color-background)
+	 */
+	backgroundColor?: PlatformBoxProps['backgroundColor'];
+
+	/**
+	 * @type ForgeComponent
+	 */
+	children?: PlatformBoxProps['children'];
+
 	/**
 	 * A shorthand for `paddingBlock` and `paddingInline` together.
 	 *
@@ -211,18 +238,18 @@ export type BoxProps = Pick<PlatformBoxProps, 'children' | 'ref' | 'testId'> & {
 	paddingBlock?: PlatformBoxProps['paddingBlock'];
 
 	/**
-	 * The logical block start padding of an element.
+	 * The logical block end padding of an element.
 	 *
 	 * @type [Space tokens](https://atlassian.design/components/tokens/all-tokens#space)
 	 */
-	paddingBlockStart?: PlatformBoxProps['paddingBlockStart'];
+	paddingBlockEnd?: PlatformBoxProps['paddingBlockEnd'];
 
 	/**
-	 * The logical block end padding of an element.
+	 * The logical block start padding of an element.
 	 *
 	 * @type [Space tokens](https://atlassian.design/components/tokens/all-tokens#space)
 	 */
-	paddingBlockEnd?: PlatformBoxProps['paddingBlockEnd'];
+	paddingBlockStart?: PlatformBoxProps['paddingBlockStart'];
 
 	/**
 	 * The logical inline start and end padding of an element.
@@ -246,15 +273,11 @@ export type BoxProps = Pick<PlatformBoxProps, 'children' | 'ref' | 'testId'> & {
 	paddingInlineStart?: PlatformBoxProps['paddingInlineStart'];
 
 	/**
-	 * A token alias for background color. See: [Design tokens](https://atlassian.design/components/tokens/all-tokens)
-	 * for a list of available colors.
+	 * Accessible role.
 	 *
-	 * When the background color is set to a surface token, the current surface CSS variable
-	 * will also be set to this value in the `Box` styles.
-	 *
-	 * @type [Background color tokens](https://atlassian.design/components/tokens/all-tokens#color-background)
+	 * @type string
 	 */
-	backgroundColor?: PlatformBoxProps['backgroundColor'];
+	role?: PlatformBoxProps['role'];
 
 	/**
 	 * Apply a subset of permitted styles, powered by Atlassian Design System tokens.
@@ -263,16 +286,6 @@ export type BoxProps = Pick<PlatformBoxProps, 'children' | 'ref' | 'testId'> & {
 	 * @type XCSSProp
 	 */
 	xcss?: XCSSProp;
-
-	/**
-	 * @type string
-	 */
-	role?: PlatformBoxProps['role'];
-
-	/**
-	 * @type ForgeComponent
-	 */
-	children?: PlatformBoxProps['children'];
 };
 
 /**

package/src/components/__generated__/CodeBlockProps.codegen.tsx

@@ -3,9 +3,9 @@
  *
  * Extract component prop types from UIKit 2 components - CodeBlockProps
  *
- * @codegen <<SignedSource::b751350717245ec525ad68d203d493e7>>
+ * @codegen <<SignedSource::6c26b81b83c693ac6c0552fd53179c16>>
  * @codegenCommand yarn workspace @atlaskit/forge-react-types codegen
- * @codegenDependency ../../../../forge-ui/src/components/UIKit/code/__generated__/codeblock.partial.tsx <<SignedSource::748d14fc9d5d2f63dbab15d6599bbdc3>>
+ * @codegenDependency ../../../../forge-ui/src/components/UIKit/code/__generated__/codeblock.partial.tsx <<SignedSource::27a16c7d91cb7ca0b0cdaa2eb9314633>>
  */
 /* eslint @repo/internal/codegen/signed-source-integrity: "warn" */
 
@@ -37,7 +37,7 @@ type PlatformCodeBlockProps = {
 	 *
 	 * @default 'text'
 	 */
-	language?: 'text' | 'PHP' | 'php' | 'php3' | 'php4' | 'php5' | 'Java' | 'java' | 'CSharp' | 'csharp' | 'c#' | 'Python' | 'python' | 'py' | 'JavaScript' | 'javascript' | 'js' | 'Html' | 'html' | 'xml' | 'C++' | 'c++' | 'cpp' | 'clike' | 'Ruby' | 'ruby' | 'rb' | 'duby' | 'Objective-C' | 'objective-c' | 'objectivec' | 'obj-c' | 'objc' | 'C' | 'c' | 'Swift' | 'swift' | 'TeX' | 'tex' | 'latex' | 'Shell' | 'shell' | 'bash' | 'sh' | 'ksh' | 'zsh' | 'Scala' | 'scala' | 'Go' | 'go' | 'ActionScript' | 'actionscript' | 'actionscript3' | 'as' | 'ColdFusion' | 'coldfusion' | 'JavaFX' | 'javafx' | 'jfx' | 'VbNet' | 'vbnet' | 'vb.net' | 'vfp' | 'clipper' | 'xbase' | 'JSON' | 'json' | 'MATLAB' | 'matlab' | 'Groovy' | 'groovy' | 'SQL' | 'sql' | 'postgresql' | 'postgres' | 'plpgsql' | 'psql' | 'postgresql-console' | 'postgres-console' | 'tsql' | 't-sql' | 'mysql' | 'sqlite' | 'R' | 'r' | 'Perl' | 'perl' | 'pl' | 'Lua' | 'lua' | 'Pascal' | 'pas' | 'pascal' | 'objectpascal' | 'delphi' | 'XML' | 'TypeScript' | 'typescript' | 'ts' | 'CoffeeScript' | 'coffeescript' | 'coffee-script' | 'coffee' | 'Haskell' | 'haskell' | 'hs' | 'Puppet' | 'puppet' | 'Arduino' | 'arduino' | 'Fortran' | 'fortran' | 'Erlang' | 'erlang' | 'erl' | 'PowerShell' | 'powershell' | 'posh' | 'ps1' | 'psm1' | 'Haxe' | 'haxe' | 'hx' | 'hxsl' | 'Elixir' | 'elixir' | 'ex' | 'exs' | 'Verilog' | 'verilog' | 'v' | 'Rust' | 'rust' | 'VHDL' | 'vhdl' | 'Sass' | 'sass' | 'OCaml' | 'ocaml' | 'Dart' | 'dart' | 'CSS' | 'css' | 'reStructuredText' | 'restructuredtext' | 'rst' | 'rest' | 'Kotlin' | 'kotlin' | 'D' | 'd' | 'Octave' | 'octave' | 'QML' | 'qbs' | 'qml' | 'Prolog' | 'prolog' | 'FoxPro' | 'foxpro' | 'purebasic' | 'Scheme' | 'scheme' | 'scm' | 'CUDA' | 'cuda' | 'cu' | 'Julia' | 'julia' | 'jl' | 'Racket' | 'racket' | 'rkt' | 'Ada' | 'ada' | 'ada95' | 'ada2005' | 'Tcl' | 'tcl' | 'Mathematica' | 'mathematica' | 'mma' | 'nb' | 'Autoit' | 'autoit' | 'StandardML' | 'standardmL' | 'sml' | 'standardml' | 'Objective-J' | 'objective-j' | 'objectivej' | 'obj-j' | 'objj' | 'Smalltalk' | 'smalltalk' | 'squeak' | 'st' | 'Vala' | 'vala' | 'vapi' | 'LiveScript' | 'livescript' | 'live-script' | 'XQuery' | 'xquery' | 'xqy' | 'xq' | 'xql' | 'xqm' | 'PlainText' | 'plaintext' | 'Yaml' | 'yaml' | 'yml' | 'GraphQL' | 'graphql' | 'AppleScript' | 'applescript' | 'Clojure' | 'clojure' | 'Diff' | 'diff' | 'VisualBasic' | 'visualbasic' | 'JSX' | 'jsx' | 'TSX' | 'tsx' | 'SplunkSPL' | 'splunk-spl' | 'Dockerfile' | 'docker' | 'dockerfile' | 'HCL' | 'hcl' | 'terraform' | 'NGINX' | 'nginx' | 'Protocol Buffers' | 'protobuf' | 'proto' | 'TOML' | 'toml' | 'Handlebars' | 'handlebars' | 'mustache' | 'Gherkin' | 'gherkin' | 'cucumber' | 'ABAP' | 'abap';
+	language?: 'text' | 'PHP' | 'php' | 'php3' | 'php4' | 'php5' | 'Java' | 'java' | 'CSharp' | 'csharp' | 'c#' | 'Python' | 'python' | 'py' | 'JavaScript' | 'javascript' | 'js' | 'Html' | 'html' | 'xml' | 'C++' | 'c++' | 'cpp' | 'clike' | 'Ruby' | 'ruby' | 'rb' | 'duby' | 'Objective-C' | 'objective-c' | 'objectivec' | 'obj-c' | 'objc' | 'C' | 'c' | 'Swift' | 'swift' | 'TeX' | 'tex' | 'latex' | 'Shell' | 'shell' | 'bash' | 'sh' | 'ksh' | 'zsh' | 'Scala' | 'scala' | 'Go' | 'go' | 'ActionScript' | 'actionscript' | 'actionscript3' | 'as' | 'ColdFusion' | 'coldfusion' | 'JavaFX' | 'javafx' | 'jfx' | 'VbNet' | 'vbnet' | 'vb.net' | 'vfp' | 'clipper' | 'xbase' | 'JSON' | 'json' | 'MATLAB' | 'matlab' | 'Groovy' | 'groovy' | 'SQL' | 'sql' | 'postgresql' | 'postgres' | 'plpgsql' | 'psql' | 'postgresql-console' | 'postgres-console' | 'tsql' | 't-sql' | 'mysql' | 'sqlite' | 'R' | 'r' | 'Perl' | 'perl' | 'pl' | 'Lua' | 'lua' | 'Pascal' | 'pas' | 'pascal' | 'objectpascal' | 'delphi' | 'XML' | 'TypeScript' | 'typescript' | 'ts' | 'CoffeeScript' | 'coffeescript' | 'coffee-script' | 'coffee' | 'Haskell' | 'haskell' | 'hs' | 'Puppet' | 'puppet' | 'Arduino' | 'arduino' | 'Fortran' | 'fortran' | 'Erlang' | 'erlang' | 'erl' | 'PowerShell' | 'powershell' | 'posh' | 'ps1' | 'psm1' | 'Haxe' | 'haxe' | 'hx' | 'hxsl' | 'Elixir' | 'elixir' | 'ex' | 'exs' | 'Verilog' | 'verilog' | 'v' | 'Rust' | 'rust' | 'VHDL' | 'vhdl' | 'Sass' | 'sass' | 'OCaml' | 'ocaml' | 'Dart' | 'dart' | 'CSS' | 'css' | 'reStructuredText' | 'restructuredtext' | 'rst' | 'rest' | 'Kotlin' | 'kotlin' | 'D' | 'd' | 'Octave' | 'octave' | 'QML' | 'qbs' | 'qml' | 'Prolog' | 'prolog' | 'FoxPro' | 'foxpro' | 'purebasic' | 'Scheme' | 'scheme' | 'scm' | 'CUDA' | 'cuda' | 'cu' | 'Julia' | 'julia' | 'jl' | 'Racket' | 'racket' | 'rkt' | 'Ada' | 'ada' | 'ada95' | 'ada2005' | 'Tcl' | 'tcl' | 'Mathematica' | 'mathematica' | 'mma' | 'nb' | 'Autoit' | 'autoit' | 'StandardML' | 'standardmL' | 'sml' | 'standardml' | 'Objective-J' | 'objective-j' | 'objectivej' | 'obj-j' | 'objj' | 'Smalltalk' | 'smalltalk' | 'squeak' | 'st' | 'Vala' | 'vala' | 'vapi' | 'LiveScript' | 'livescript' | 'live-script' | 'XQuery' | 'xquery' | 'xqy' | 'xq' | 'xql' | 'xqm' | 'PlainText' | 'plaintext' | 'Yaml' | 'yaml' | 'yml' | 'GraphQL' | 'graphql' | 'AppleScript' | 'applescript' | 'Clojure' | 'clojure' | 'Diff' | 'diff' | 'VisualBasic' | 'visualbasic' | 'JSX' | 'jsx' | 'TSX' | 'tsx' | 'SplunkSPL' | 'splunk-spl' | 'Dockerfile' | 'docker' | 'dockerfile' | 'HCL' | 'hcl' | 'terraform' | 'NGINX' | 'nginx' | 'Protocol Buffers' | 'protobuf' | 'proto' | 'TOML' | 'toml' | 'Handlebars' | 'handlebars' | 'mustache' | 'Gherkin' | 'gherkin' | 'cucumber' | 'ABAP' | 'abap' | 'Markdown' | 'markdown';
   /**
 	 * Comma delimited lines to highlight.
 	 *

package/src/components/__generated__/PressableProps.codegen.tsx

@@ -3,7 +3,7 @@
  *
  * Extract component prop types from UIKit 2 components - PressableProps
  *
- * @codegen <<SignedSource::5ee0d1c46a3e208ce25e8281bd363c25>>
+ * @codegen <<SignedSource::7158030e15c00ca33456e783cffd4db2>>
  * @codegenCommand yarn workspace @atlaskit/forge-react-types codegen
  * @codegenDependency ../../../../forge-ui/src/components/UIKit/pressable/index.tsx <<SignedSource::e23b1db22ac327f82c64213c36751b27>>
  */
@@ -67,6 +67,17 @@ declare const makeXCSSValidator: <U extends XCSSValidatorParam>(supportedXCSSPro
 export { makeXCSSValidator };
 export type { SafeCSSObject };
 
+import type { BorderRadius } from '@atlaskit/primitives';
+const borderRadiusTokens: BorderRadius[] = [
+	'radius.xsmall',
+	'radius.small',
+	'radius.medium',
+	'radius.large',
+	'radius.xlarge',
+	'radius.full',
+	'radius.tile',
+];
+const borderRadiusSupportedValues = [...borderRadiusTokens, 'border.radius'];
 const xcssValidator = makeXCSSValidator({
 	// text related props
 	textAlign: {
@@ -150,26 +161,26 @@ const xcssValidator = makeXCSSValidator({
 	paddingTop: true,
 
 	// other box related props
-	borderRadius: { supportedValues: ['border.radius'] },
-	borderBottomLeftRadius: { supportedValues: ['border.radius'] },
-	borderBottomRightRadius: { supportedValues: ['border.radius'] },
-	borderTopLeftRadius: { supportedValues: ['border.radius'] },
-	borderTopRightRadius: { supportedValues: ['border.radius'] },
-	borderEndEndRadius: { supportedValues: ['border.radius'] },
-	borderEndStartRadius: { supportedValues: ['border.radius'] },
-	borderStartEndRadius: { supportedValues: ['border.radius'] },
-	borderStartStartRadius: { supportedValues: ['border.radius'] },
-	borderWidth: { supportedValues: ['border.width'] },
-	borderBlockWidth: { supportedValues: ['border.width'] },
-	borderBlockEndWidth: { supportedValues: ['border.width'] },
-	borderBlockStartWidth: { supportedValues: ['border.width'] },
-	borderBottomWidth: { supportedValues: ['border.width'] },
-	borderInlineWidth: { supportedValues: ['border.width'] },
-	borderInlineEndWidth: { supportedValues: ['border.width'] },
-	borderInlineStartWidth: { supportedValues: ['border.width'] },
-	borderLeftWidth: { supportedValues: ['border.width'] },
-	borderRightWidth: { supportedValues: ['border.width'] },
-	borderTopWidth: { supportedValues: ['border.width'] },
+	borderRadius: { supportedValues: borderRadiusSupportedValues },
+	borderBottomLeftRadius: { supportedValues: borderRadiusSupportedValues },
+	borderBottomRightRadius: { supportedValues: borderRadiusSupportedValues },
+	borderTopLeftRadius: { supportedValues: borderRadiusSupportedValues },
+	borderTopRightRadius: { supportedValues: borderRadiusSupportedValues },
+	borderEndEndRadius: { supportedValues: borderRadiusSupportedValues },
+	borderEndStartRadius: { supportedValues: borderRadiusSupportedValues },
+	borderStartEndRadius: { supportedValues: borderRadiusSupportedValues },
+	borderStartStartRadius: { supportedValues: borderRadiusSupportedValues },
+	borderWidth: true,
+	borderBlockWidth: true,
+	borderBlockEndWidth: true,
+	borderBlockStartWidth: true,
+	borderBottomWidth: true,
+	borderInlineWidth: true,
+	borderInlineEndWidth: true,
+	borderInlineStartWidth: true,
+	borderLeftWidth: true,
+	borderRightWidth: true,
+	borderTopWidth: true,
 
 	// other props not in tokens based props
 	borderTopStyle: {