@atlaskit/forge-react-types 0.60.0 → 0.62.0

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @atlaskit/forge-react-types
 
+## 0.62.0
+
+### Minor Changes
+
+- [`4e53247402873`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/4e53247402873) -
+  Update global component props
+
+### Patch Changes
+
+- Updated dependencies
+
+## 0.61.0
+
+### Minor Changes
+
+- [`50d654b213b1b`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/50d654b213b1b) -
+  Export types for Global, GlobalMain, GlobalSidebar
+
 ## 0.60.0
 
 ### Minor Changes

package/dist/cjs/components/global/__generated__/GlobalExpandableMenuItemProps.codegen.js

@@ -1 +1,5 @@
-"use strict";
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});

package/dist/cjs/components/global/__generated__/GlobalMainProps.codegen.js

@@ -0,0 +1,5 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});

package/dist/cjs/components/global/__generated__/GlobalProps.codegen.js

@@ -0,0 +1,5 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});

package/dist/cjs/components/global/__generated__/GlobalSidebarProps.codegen.js

@@ -1 +1,5 @@
-"use strict";
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});

package/dist/es2019/components/global/__generated__/GlobalExpandableMenuItemProps.codegen.js

@@ -0,0 +1 @@
+export {};

package/dist/es2019/components/global/__generated__/GlobalMainProps.codegen.js

@@ -0,0 +1 @@
+export {};

package/dist/es2019/components/global/__generated__/GlobalProps.codegen.js

@@ -0,0 +1 @@
+export {};

package/dist/es2019/components/global/__generated__/GlobalSidebarProps.codegen.js

@@ -0,0 +1 @@
+export {};

package/dist/esm/components/global/__generated__/GlobalExpandableMenuItemProps.codegen.js

@@ -0,0 +1 @@
+export {};

package/dist/esm/components/global/__generated__/GlobalMainProps.codegen.js

@@ -0,0 +1 @@
+export {};

package/dist/esm/components/global/__generated__/GlobalProps.codegen.js

@@ -0,0 +1 @@
+export {};

package/dist/esm/components/global/__generated__/GlobalSidebarProps.codegen.js

@@ -0,0 +1 @@
+export {};

package/dist/types/components/global/__generated__/GlobalExpandableMenuItemProps.codegen.d.ts

@@ -3,15 +3,20 @@
  *
  * Generated prop types for Global component - GlobalExpandableMenuItem
  *
- * @codegen <<SignedSource::5cc168904578780ba265e1ad2fc3cfec>>
+ * @codegen <<SignedSource::8780871b323d0ecd390c334b279f4c5c>>
  * @codegenCommand yarn workspace @atlaskit/forge-react-types codegen-global
- * @codegenDependency ../../../../../../../services/forge-common-app-gateway/src/types/global-component-props.ts <<SignedSource::f24c6db68c9118776491952640ba616f>>
- * @codegenDependency ../../../../../../../services/forge-common-app-gateway/src/components/global/Global-ExpandableMenuItem.tsx <<SignedSource::79df02babb605094ae73bdd0c00c7156>>
+ * @codegenDependency ../../../../../../../services/forge-common-app-gateway/src/types/global-component-props.ts <<SignedSource::ad330a446ee260180d5b510c18b5e1c8>>
+ * @codegenDependency ../../../../../../../services/forge-common-app-gateway/src/components/global/Global-ExpandableMenuItem.tsx <<SignedSource::70ca291a86897077f42eb7af58f709b1>>
  */
+import type React from 'react';
 export type GlobalExpandableMenuItemProps = {
     /**
      * The display label for the expandable menu item.
      */
     label: string;
+    /**
+     * Accepts LinkMenuItem components.
+     */
+    children: React.ReactElement | React.ReactElement[];
 };
 export type TGlobalExpandableMenuItem<T> = (props: GlobalExpandableMenuItemProps) => T;

package/dist/types/components/global/__generated__/GlobalLinkMenuItemProps.codegen.d.ts

@@ -3,10 +3,10 @@
  *
  * Generated prop types for Global component - GlobalLinkMenuItem
  *
- * @codegen <<SignedSource::1c930740db9038f51b3e7b99771b253c>>
+ * @codegen <<SignedSource::ec42467e1d5bf99efc2748fb4387c7db>>
  * @codegenCommand yarn workspace @atlaskit/forge-react-types codegen-global
- * @codegenDependency ../../../../../../../services/forge-common-app-gateway/src/types/global-component-props.ts <<SignedSource::f24c6db68c9118776491952640ba616f>>
- * @codegenDependency ../../../../../../../services/forge-common-app-gateway/src/components/global/Global-LinkMenuItem.tsx <<SignedSource::e70effe0d4e0620246252b35abddb112>>
+ * @codegenDependency ../../../../../../../services/forge-common-app-gateway/src/types/global-component-props.ts <<SignedSource::ad330a446ee260180d5b510c18b5e1c8>>
+ * @codegenDependency ../../../../../../../services/forge-common-app-gateway/src/components/global/Global-LinkMenuItem.tsx <<SignedSource::714aeaa577c5b83035e8db86a0791f12>>
  */
 export type GlobalLinkMenuItemProps = {
     /**

package/dist/types/components/global/__generated__/GlobalMainProps.codegen.d.ts

@@ -0,0 +1,15 @@
+/**
+ * THIS FILE WAS CREATED VIA CODEGEN DO NOT MODIFY {@see http://go/af-codegen}
+ *
+ * Generated prop types for Global component - GlobalMain
+ *
+ * @codegen <<SignedSource::77dc12c1b869c10e64b714e1f60669f9>>
+ * @codegenCommand yarn workspace @atlaskit/forge-react-types codegen-global
+ * @codegenDependency ../../../../../../../services/forge-common-app-gateway/src/types/global-component-props.ts <<SignedSource::ad330a446ee260180d5b510c18b5e1c8>>
+ * @codegenDependency ../../../../../../../services/forge-common-app-gateway/src/components/global/Global-Main.tsx <<SignedSource::082e248420c3447666672693808d6a2f>>
+ */
+import type React from 'react';
+export type GlobalMainProps = {
+    children?: React.ReactNode;
+};
+export type TGlobalMain<T> = (props: GlobalMainProps) => T;

package/dist/types/components/global/__generated__/GlobalProps.codegen.d.ts

@@ -0,0 +1,18 @@
+/**
+ * THIS FILE WAS CREATED VIA CODEGEN DO NOT MODIFY {@see http://go/af-codegen}
+ *
+ * Generated prop types for Global component - Global
+ *
+ * @codegen <<SignedSource::01c434a8e1088249f55e97bba99aa916>>
+ * @codegenCommand yarn workspace @atlaskit/forge-react-types codegen-global
+ * @codegenDependency ../../../../../../../services/forge-common-app-gateway/src/types/global-component-props.ts <<SignedSource::ad330a446ee260180d5b510c18b5e1c8>>
+ * @codegenDependency ../../../../../../../services/forge-common-app-gateway/src/components/global/Global.tsx <<SignedSource::54502ae221b976e3c4f4849cff6be726>>
+ */
+import type React from 'react';
+export type GlobalProps = {
+    /**
+     * Accepts Global.Sidebar and Global.Main components as children.
+     */
+    children?: React.ReactElement | React.ReactElement[];
+};
+export type TGlobal<T> = (props: GlobalProps) => T;

package/dist/types/components/global/__generated__/GlobalSidebarProps.codegen.d.ts

@@ -3,16 +3,21 @@
  *
  * Generated prop types for Global component - GlobalSidebar
  *
- * @codegen <<SignedSource::2e9345246b57199aa34c90c2d697b45c>>
+ * @codegen <<SignedSource::99a3fc631d768e6e6e1355970e07eb99>>
  * @codegenCommand yarn workspace @atlaskit/forge-react-types codegen-global
- * @codegenDependency ../../../../../../../services/forge-common-app-gateway/src/types/global-component-props.ts <<SignedSource::f24c6db68c9118776491952640ba616f>>
- * @codegenDependency ../../../../../../../services/forge-common-app-gateway/src/components/global/Global-Sidebar.tsx <<SignedSource::79c613be77297a86b70005750a4b0220>>
+ * @codegenDependency ../../../../../../../services/forge-common-app-gateway/src/types/global-component-props.ts <<SignedSource::ad330a446ee260180d5b510c18b5e1c8>>
+ * @codegenDependency ../../../../../../../services/forge-common-app-gateway/src/components/global/Global-Sidebar.tsx <<SignedSource::13411f0525b0468463282baeeb342f2b>>
  */
+import type React from 'react';
 export type GlobalSidebarProps = {
     /**
      * URL path for the "For You" section in the sidebar.
      * When provided, enables the "For You" navigation item.
      */
-    forYouUrl?: string | undefined;
+    forYouUrl?: string;
+    /**
+     * Accepts Global.LinkMenuItem and Global.ExpandMenuItem components.
+     */
+    children?: React.ReactElement | React.ReactElement[];
 };
 export type TGlobalSidebar<T> = (props: GlobalSidebarProps) => T;

package/dist/types/components/global/__generated__/index.d.ts

@@ -3,10 +3,12 @@
  *
  * Index file for generated Global component prop types
  *
- * @codegen <<SignedSource::94d4d04a65ea9019214cd455fcb4c585>>
+ * @codegen <<SignedSource::275df2eb411df5669a05d8e4573e519b>>
  * @codegenCommand yarn workspace @atlaskit/forge-react-types codegen-global
- * @codegenDependency ../../../../../../../services/forge-common-app-gateway/src/types/global-component-props.ts <<SignedSource::f24c6db68c9118776491952640ba616f>>
+ * @codegenDependency ../../../../../../../services/forge-common-app-gateway/src/types/global-component-props.ts <<SignedSource::ad330a446ee260180d5b510c18b5e1c8>>
  */
+export type { GlobalProps, TGlobal } from './GlobalProps.codegen';
+export type { GlobalMainProps, TGlobalMain } from './GlobalMainProps.codegen';
 export type { GlobalSidebarProps, TGlobalSidebar } from './GlobalSidebarProps.codegen';
 export type { GlobalLinkMenuItemProps, TGlobalLinkMenuItem } from './GlobalLinkMenuItemProps.codegen';
 export type { GlobalExpandableMenuItemProps, TGlobalExpandableMenuItem } from './GlobalExpandableMenuItemProps.codegen';

package/dist/types/index.d.ts

@@ -3,4 +3,4 @@ export type { BarChartProps, StackBarChartProps, HorizontalStackBarChartProps, H
 export type { ChromelessEditorProps, CommentEditorProps, TChromelessEditor, TCommentEditor, } from './components/editor';
 export type { ChartColorTokens } from './types';
 export type { FrameProps } from './components/frame';
-export type { GlobalSidebarProps, TGlobalSidebar, GlobalLinkMenuItemProps, TGlobalLinkMenuItem, GlobalExpandableMenuItemProps, TGlobalExpandableMenuItem, } from './components/global/__generated__';
+export type { GlobalSidebarProps, TGlobalSidebar, GlobalLinkMenuItemProps, TGlobalLinkMenuItem, GlobalExpandableMenuItemProps, TGlobalExpandableMenuItem, GlobalProps, TGlobal, GlobalMainProps, TGlobalMain, } from './components/global/__generated__';

package/dist/types-ts4.5/components/global/__generated__/GlobalExpandableMenuItemProps.codegen.d.ts

@@ -3,15 +3,20 @@
  *
  * Generated prop types for Global component - GlobalExpandableMenuItem
  *
- * @codegen <<SignedSource::5cc168904578780ba265e1ad2fc3cfec>>
+ * @codegen <<SignedSource::8780871b323d0ecd390c334b279f4c5c>>
  * @codegenCommand yarn workspace @atlaskit/forge-react-types codegen-global
- * @codegenDependency ../../../../../../../services/forge-common-app-gateway/src/types/global-component-props.ts <<SignedSource::f24c6db68c9118776491952640ba616f>>
- * @codegenDependency ../../../../../../../services/forge-common-app-gateway/src/components/global/Global-ExpandableMenuItem.tsx <<SignedSource::79df02babb605094ae73bdd0c00c7156>>
+ * @codegenDependency ../../../../../../../services/forge-common-app-gateway/src/types/global-component-props.ts <<SignedSource::ad330a446ee260180d5b510c18b5e1c8>>
+ * @codegenDependency ../../../../../../../services/forge-common-app-gateway/src/components/global/Global-ExpandableMenuItem.tsx <<SignedSource::70ca291a86897077f42eb7af58f709b1>>
  */
+import type React from 'react';
 export type GlobalExpandableMenuItemProps = {
     /**
      * The display label for the expandable menu item.
      */
     label: string;
+    /**
+     * Accepts LinkMenuItem components.
+     */
+    children: React.ReactElement | React.ReactElement[];
 };
 export type TGlobalExpandableMenuItem<T> = (props: GlobalExpandableMenuItemProps) => T;

package/dist/types-ts4.5/components/global/__generated__/GlobalLinkMenuItemProps.codegen.d.ts

@@ -3,10 +3,10 @@
  *
  * Generated prop types for Global component - GlobalLinkMenuItem
  *
- * @codegen <<SignedSource::1c930740db9038f51b3e7b99771b253c>>
+ * @codegen <<SignedSource::ec42467e1d5bf99efc2748fb4387c7db>>
  * @codegenCommand yarn workspace @atlaskit/forge-react-types codegen-global
- * @codegenDependency ../../../../../../../services/forge-common-app-gateway/src/types/global-component-props.ts <<SignedSource::f24c6db68c9118776491952640ba616f>>
- * @codegenDependency ../../../../../../../services/forge-common-app-gateway/src/components/global/Global-LinkMenuItem.tsx <<SignedSource::e70effe0d4e0620246252b35abddb112>>
+ * @codegenDependency ../../../../../../../services/forge-common-app-gateway/src/types/global-component-props.ts <<SignedSource::ad330a446ee260180d5b510c18b5e1c8>>
+ * @codegenDependency ../../../../../../../services/forge-common-app-gateway/src/components/global/Global-LinkMenuItem.tsx <<SignedSource::714aeaa577c5b83035e8db86a0791f12>>
  */
 export type GlobalLinkMenuItemProps = {
     /**

package/dist/types-ts4.5/components/global/__generated__/GlobalMainProps.codegen.d.ts

@@ -0,0 +1,15 @@
+/**
+ * THIS FILE WAS CREATED VIA CODEGEN DO NOT MODIFY {@see http://go/af-codegen}
+ *
+ * Generated prop types for Global component - GlobalMain
+ *
+ * @codegen <<SignedSource::77dc12c1b869c10e64b714e1f60669f9>>
+ * @codegenCommand yarn workspace @atlaskit/forge-react-types codegen-global
+ * @codegenDependency ../../../../../../../services/forge-common-app-gateway/src/types/global-component-props.ts <<SignedSource::ad330a446ee260180d5b510c18b5e1c8>>
+ * @codegenDependency ../../../../../../../services/forge-common-app-gateway/src/components/global/Global-Main.tsx <<SignedSource::082e248420c3447666672693808d6a2f>>
+ */
+import type React from 'react';
+export type GlobalMainProps = {
+    children?: React.ReactNode;
+};
+export type TGlobalMain<T> = (props: GlobalMainProps) => T;

package/dist/types-ts4.5/components/global/__generated__/GlobalProps.codegen.d.ts

@@ -0,0 +1,18 @@
+/**
+ * THIS FILE WAS CREATED VIA CODEGEN DO NOT MODIFY {@see http://go/af-codegen}
+ *
+ * Generated prop types for Global component - Global
+ *
+ * @codegen <<SignedSource::01c434a8e1088249f55e97bba99aa916>>
+ * @codegenCommand yarn workspace @atlaskit/forge-react-types codegen-global
+ * @codegenDependency ../../../../../../../services/forge-common-app-gateway/src/types/global-component-props.ts <<SignedSource::ad330a446ee260180d5b510c18b5e1c8>>
+ * @codegenDependency ../../../../../../../services/forge-common-app-gateway/src/components/global/Global.tsx <<SignedSource::54502ae221b976e3c4f4849cff6be726>>
+ */
+import type React from 'react';
+export type GlobalProps = {
+    /**
+     * Accepts Global.Sidebar and Global.Main components as children.
+     */
+    children?: React.ReactElement | React.ReactElement[];
+};
+export type TGlobal<T> = (props: GlobalProps) => T;

package/dist/types-ts4.5/components/global/__generated__/GlobalSidebarProps.codegen.d.ts

@@ -3,16 +3,21 @@
  *
  * Generated prop types for Global component - GlobalSidebar
  *
- * @codegen <<SignedSource::2e9345246b57199aa34c90c2d697b45c>>
+ * @codegen <<SignedSource::99a3fc631d768e6e6e1355970e07eb99>>
  * @codegenCommand yarn workspace @atlaskit/forge-react-types codegen-global
- * @codegenDependency ../../../../../../../services/forge-common-app-gateway/src/types/global-component-props.ts <<SignedSource::f24c6db68c9118776491952640ba616f>>
- * @codegenDependency ../../../../../../../services/forge-common-app-gateway/src/components/global/Global-Sidebar.tsx <<SignedSource::79c613be77297a86b70005750a4b0220>>
+ * @codegenDependency ../../../../../../../services/forge-common-app-gateway/src/types/global-component-props.ts <<SignedSource::ad330a446ee260180d5b510c18b5e1c8>>
+ * @codegenDependency ../../../../../../../services/forge-common-app-gateway/src/components/global/Global-Sidebar.tsx <<SignedSource::13411f0525b0468463282baeeb342f2b>>
  */
+import type React from 'react';
 export type GlobalSidebarProps = {
     /**
      * URL path for the "For You" section in the sidebar.
      * When provided, enables the "For You" navigation item.
      */
-    forYouUrl?: string | undefined;
+    forYouUrl?: string;
+    /**
+     * Accepts Global.LinkMenuItem and Global.ExpandMenuItem components.
+     */
+    children?: React.ReactElement | React.ReactElement[];
 };
 export type TGlobalSidebar<T> = (props: GlobalSidebarProps) => T;

package/dist/types-ts4.5/components/global/__generated__/index.d.ts

@@ -3,10 +3,12 @@
  *
  * Index file for generated Global component prop types
  *
- * @codegen <<SignedSource::94d4d04a65ea9019214cd455fcb4c585>>
+ * @codegen <<SignedSource::275df2eb411df5669a05d8e4573e519b>>
  * @codegenCommand yarn workspace @atlaskit/forge-react-types codegen-global
- * @codegenDependency ../../../../../../../services/forge-common-app-gateway/src/types/global-component-props.ts <<SignedSource::f24c6db68c9118776491952640ba616f>>
+ * @codegenDependency ../../../../../../../services/forge-common-app-gateway/src/types/global-component-props.ts <<SignedSource::ad330a446ee260180d5b510c18b5e1c8>>
  */
+export type { GlobalProps, TGlobal } from './GlobalProps.codegen';
+export type { GlobalMainProps, TGlobalMain } from './GlobalMainProps.codegen';
 export type { GlobalSidebarProps, TGlobalSidebar } from './GlobalSidebarProps.codegen';
 export type { GlobalLinkMenuItemProps, TGlobalLinkMenuItem } from './GlobalLinkMenuItemProps.codegen';
 export type { GlobalExpandableMenuItemProps, TGlobalExpandableMenuItem } from './GlobalExpandableMenuItemProps.codegen';

package/dist/types-ts4.5/index.d.ts

@@ -3,4 +3,4 @@ export type { BarChartProps, StackBarChartProps, HorizontalStackBarChartProps, H
 export type { ChromelessEditorProps, CommentEditorProps, TChromelessEditor, TCommentEditor, } from './components/editor';
 export type { ChartColorTokens } from './types';
 export type { FrameProps } from './components/frame';
-export type { GlobalSidebarProps, TGlobalSidebar, GlobalLinkMenuItemProps, TGlobalLinkMenuItem, GlobalExpandableMenuItemProps, TGlobalExpandableMenuItem, } from './components/global/__generated__';
+export type { GlobalSidebarProps, TGlobalSidebar, GlobalLinkMenuItemProps, TGlobalLinkMenuItem, GlobalExpandableMenuItemProps, TGlobalExpandableMenuItem, GlobalProps, TGlobal, GlobalMainProps, TGlobalMain, } from './components/global/__generated__';

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/forge-react-types",
-	"version": "0.60.0",
+	"version": "0.62.0",
 	"description": "Component types for Forge UI Kit React components",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -28,18 +28,18 @@
 		"@atlaskit/form": "^15.3.0",
 		"@atlaskit/inline-edit": "^15.6.0",
 		"@atlaskit/modal-dialog": "^14.10.0",
-		"@atlaskit/navigation-system": "^5.33.0",
+		"@atlaskit/navigation-system": "^5.34.0",
 		"@atlaskit/object": "^1.0.0",
 		"@atlaskit/popup": "^4.13.0",
 		"@atlaskit/primitives": "^18.0.0",
 		"@atlaskit/progress-bar": "^4.1.0",
-		"@atlaskit/progress-tracker": "^10.4.0",
+		"@atlaskit/progress-tracker": "^10.5.0",
 		"@atlaskit/radio": "^8.4.0",
 		"@atlaskit/section-message": "^8.12.0",
 		"@atlaskit/select": "^21.7.0",
 		"@atlaskit/spinner": "^19.0.0",
 		"@atlaskit/tabs": "^18.3.0",
-		"@atlaskit/tag": "^14.4.0",
+		"@atlaskit/tag": "^14.5.0",
 		"@atlaskit/tag-group": "^12.0.0",
 		"@atlaskit/textarea": "^8.2.0",
 		"@atlaskit/textfield": "^8.2.0",
@@ -56,7 +56,7 @@
 	},
 	"devDependencies": {
 		"@atlassian/codegen": "^0.1.0",
-		"@atlassian/forge-ui": "^32.81.0",
+		"@atlassian/forge-ui": "^32.82.0",
 		"@types/node": "^24.0.0",
 		"lodash": "^4.17.21",
 		"react": "^18.2.0",

package/scripts/codegen/globalComponentPropTypes.ts

@@ -73,9 +73,12 @@ const resolveToPrimitive = (typeText: string): string => {
 		return typeText;
 	}
 
-	// Handle optional types (e.g., "string | undefined")
+	// Handle union types (e.g., "string | undefined")
 	if (typeText.includes('|')) {
-		const parts = typeText.split('|').map((p) => p.trim());
+		const parts = typeText
+			.split('|')
+			.map((p) => p.trim())
+			.filter((p) => p.length > 0);
 		const resolvedParts = parts.map((part) => resolveToPrimitive(part));
 		return resolvedParts.join(' | ');
 	}
@@ -147,7 +150,10 @@ const resolveToInterfaceDeclaration = (
 /**
  * Generates the source code for a single component's prop types.
  */
-const generateComponentPropTypeCode = (interfaceDecl: InterfaceDeclaration): string => {
+const generateComponentPropTypeCode = (
+	interfaceDecl: InterfaceDeclaration,
+	allPropsNames: string[],
+): string => {
 	const interfaceName = interfaceDecl.getName();
 	const componentName = interfaceName.replace('Props', '');
 
@@ -174,7 +180,31 @@ const generateComponentPropTypeCode = (interfaceDecl: InterfaceDeclaration): str
 
 		properties.forEach((prop: PropertySignature) => {
 			const propName = prop.getName();
-			const propType = prop.getType().getText();
+			// Prefer the source-level type annotation (getTypeNode) over the resolved type (getType).
+			// getType().getText() can produce degenerate types (any/never/undefined) when the
+			// ts-morph Project lacks type definitions, or overly verbose types that expand
+			// generic defaults (e.g., ReactElement<X> → ReactElement<X, string | JSXElementConstructor<any>>).
+			// The source annotation preserves the developer's intended type expression.
+			const resolvedTypeText = prop.getType().getText();
+			const sourceTypeText = prop.getTypeNode()?.getText();
+			let propType = sourceTypeText ?? resolvedTypeText;
+
+			// Normalize bare React type references (e.g., ReactElement → React.ReactElement)
+			// so the generated file only needs a single React namespace import.
+			const reactTypeNames = [
+				'ReactElement',
+				'ReactNode',
+				'ReactFragment',
+				'ReactPortal',
+				'JSXElementConstructor',
+			];
+			for (const typeName of reactTypeNames) {
+				propType = propType.replace(
+					new RegExp(`(?<![\\w.])${typeName}\\b`, 'g'),
+					`React.${typeName}`,
+				);
+			}
+
 			const isOptional = prop.hasQuestionToken();
 			const resolvedType = resolveToPrimitive(propType);
 
@@ -204,6 +234,25 @@ const generateComponentPropTypeCode = (interfaceDecl: InterfaceDeclaration): str
 	}
 	lines.push(`export type T${componentName}<T> = (props: ${interfaceName}) => T;`);
 
+	// Detect needed imports based on type references in the generated code
+	const generatedCode = lines.slice(2).join('\n'); // skip eslint directive and blank line
+	const importLines: string[] = [];
+
+	if (/\bReact\./.test(generatedCode)) {
+		importLines.push("import type React from 'react';");
+	}
+
+	for (const propsName of allPropsNames) {
+		if (propsName !== interfaceName && generatedCode.includes(propsName)) {
+			importLines.push(`import type { ${propsName} } from './${propsName}.codegen';`);
+		}
+	}
+
+	if (importLines.length > 0) {
+		// Insert imports after the eslint directive and blank line (index 2)
+		lines.splice(2, 0, ...importLines, '');
+	}
+
 	return lines.join('\n');
 };
 
@@ -236,6 +285,7 @@ const generateGlobalComponentPropTypes = () => {
 	const exportedSymbols = sourceFile.getExportSymbols();
 	const propsSymbols = exportedSymbols.filter((symbol) => symbol.getName().endsWith('Props'));
 
+	const allPropsNames = propsSymbols.map((s) => s.getName());
 	const generatedFiles: string[] = [];
 
 	propsSymbols.forEach((symbol) => {
@@ -251,7 +301,7 @@ const generateGlobalComponentPropTypes = () => {
 		}
 
 		const { interfaceDecl, sourceFilePath } = resolved;
-		const sourceCode = generateComponentPropTypeCode(interfaceDecl);
+		const sourceCode = generateComponentPropTypeCode(interfaceDecl, allPropsNames);
 		const outputPath = resolve(GLOBAL_OUTPUT_DIR, `${symbolName}.codegen.tsx`);
 
 		const signedSourceCode = createSignedArtifact(

package/scripts/typechecker.ts

@@ -11,7 +11,7 @@ import {
 	type LozengeProps,
 	type RangeProps,
 	type IconProps,
-} from '@atlassian/forge-ui/src/components/UIKit';
+} from '@atlassian/forge-ui/UIKit';
 import { type BadgeProps as GeneratedBadgeProps } from '../src/components/__generated__/BadgeProps.codegen';
 import { type CalendarProps as GeneratedCalendarProps } from '../src/components/__generated__/CalendarProps.codegen';
 import { type CheckboxProps as GeneratedCheckboxProps } from '../src/components/__generated__/CheckboxProps.codegen';

package/src/components/global/__generated__/GlobalExpandableMenuItemProps.codegen.tsx

@@ -3,18 +3,24 @@
  *
  * Generated prop types for Global component - GlobalExpandableMenuItem
  *
- * @codegen <<SignedSource::5cc168904578780ba265e1ad2fc3cfec>>
+ * @codegen <<SignedSource::8780871b323d0ecd390c334b279f4c5c>>
  * @codegenCommand yarn workspace @atlaskit/forge-react-types codegen-global
- * @codegenDependency ../../../../../../../services/forge-common-app-gateway/src/types/global-component-props.ts <<SignedSource::f24c6db68c9118776491952640ba616f>>
- * @codegenDependency ../../../../../../../services/forge-common-app-gateway/src/components/global/Global-ExpandableMenuItem.tsx <<SignedSource::79df02babb605094ae73bdd0c00c7156>>
+ * @codegenDependency ../../../../../../../services/forge-common-app-gateway/src/types/global-component-props.ts <<SignedSource::ad330a446ee260180d5b510c18b5e1c8>>
+ * @codegenDependency ../../../../../../../services/forge-common-app-gateway/src/components/global/Global-ExpandableMenuItem.tsx <<SignedSource::70ca291a86897077f42eb7af58f709b1>>
  */
 /* eslint @repo/internal/codegen/signed-source-integrity: "warn" */
 
+import type React from 'react';
+
 export type GlobalExpandableMenuItemProps = {
 	/**
 	 * The display label for the expandable menu item.
 	 */
 	label: string;
+	/**
+	 * Accepts LinkMenuItem components.
+	 */
+	children: React.ReactElement | React.ReactElement[];
 };
 
 export type TGlobalExpandableMenuItem<T> = (props: GlobalExpandableMenuItemProps) => T;

package/src/components/global/__generated__/GlobalLinkMenuItemProps.codegen.tsx

@@ -3,10 +3,10 @@
  *
  * Generated prop types for Global component - GlobalLinkMenuItem
  *
- * @codegen <<SignedSource::1c930740db9038f51b3e7b99771b253c>>
+ * @codegen <<SignedSource::ec42467e1d5bf99efc2748fb4387c7db>>
  * @codegenCommand yarn workspace @atlaskit/forge-react-types codegen-global
- * @codegenDependency ../../../../../../../services/forge-common-app-gateway/src/types/global-component-props.ts <<SignedSource::f24c6db68c9118776491952640ba616f>>
- * @codegenDependency ../../../../../../../services/forge-common-app-gateway/src/components/global/Global-LinkMenuItem.tsx <<SignedSource::e70effe0d4e0620246252b35abddb112>>
+ * @codegenDependency ../../../../../../../services/forge-common-app-gateway/src/types/global-component-props.ts <<SignedSource::ad330a446ee260180d5b510c18b5e1c8>>
+ * @codegenDependency ../../../../../../../services/forge-common-app-gateway/src/components/global/Global-LinkMenuItem.tsx <<SignedSource::714aeaa577c5b83035e8db86a0791f12>>
  */
 /* eslint @repo/internal/codegen/signed-source-integrity: "warn" */
 

package/src/components/global/__generated__/GlobalMainProps.codegen.tsx

@@ -0,0 +1,19 @@
+/**
+ * THIS FILE WAS CREATED VIA CODEGEN DO NOT MODIFY {@see http://go/af-codegen}
+ *
+ * Generated prop types for Global component - GlobalMain
+ *
+ * @codegen <<SignedSource::77dc12c1b869c10e64b714e1f60669f9>>
+ * @codegenCommand yarn workspace @atlaskit/forge-react-types codegen-global
+ * @codegenDependency ../../../../../../../services/forge-common-app-gateway/src/types/global-component-props.ts <<SignedSource::ad330a446ee260180d5b510c18b5e1c8>>
+ * @codegenDependency ../../../../../../../services/forge-common-app-gateway/src/components/global/Global-Main.tsx <<SignedSource::082e248420c3447666672693808d6a2f>>
+ */
+/* eslint @repo/internal/codegen/signed-source-integrity: "warn" */
+
+import type React from 'react';
+
+export type GlobalMainProps = {
+	children?: React.ReactNode;
+};
+
+export type TGlobalMain<T> = (props: GlobalMainProps) => T;

package/src/components/global/__generated__/GlobalProps.codegen.tsx

@@ -0,0 +1,22 @@
+/**
+ * THIS FILE WAS CREATED VIA CODEGEN DO NOT MODIFY {@see http://go/af-codegen}
+ *
+ * Generated prop types for Global component - Global
+ *
+ * @codegen <<SignedSource::01c434a8e1088249f55e97bba99aa916>>
+ * @codegenCommand yarn workspace @atlaskit/forge-react-types codegen-global
+ * @codegenDependency ../../../../../../../services/forge-common-app-gateway/src/types/global-component-props.ts <<SignedSource::ad330a446ee260180d5b510c18b5e1c8>>
+ * @codegenDependency ../../../../../../../services/forge-common-app-gateway/src/components/global/Global.tsx <<SignedSource::54502ae221b976e3c4f4849cff6be726>>
+ */
+/* eslint @repo/internal/codegen/signed-source-integrity: "warn" */
+
+import type React from 'react';
+
+export type GlobalProps = {
+	/**
+	 * Accepts Global.Sidebar and Global.Main components as children.
+	 */
+	children?: React.ReactElement | React.ReactElement[];
+};
+
+export type TGlobal<T> = (props: GlobalProps) => T;

package/src/components/global/__generated__/GlobalSidebarProps.codegen.tsx

@@ -3,19 +3,25 @@
  *
  * Generated prop types for Global component - GlobalSidebar
  *
- * @codegen <<SignedSource::2e9345246b57199aa34c90c2d697b45c>>
+ * @codegen <<SignedSource::99a3fc631d768e6e6e1355970e07eb99>>
  * @codegenCommand yarn workspace @atlaskit/forge-react-types codegen-global
- * @codegenDependency ../../../../../../../services/forge-common-app-gateway/src/types/global-component-props.ts <<SignedSource::f24c6db68c9118776491952640ba616f>>
- * @codegenDependency ../../../../../../../services/forge-common-app-gateway/src/components/global/Global-Sidebar.tsx <<SignedSource::79c613be77297a86b70005750a4b0220>>
+ * @codegenDependency ../../../../../../../services/forge-common-app-gateway/src/types/global-component-props.ts <<SignedSource::ad330a446ee260180d5b510c18b5e1c8>>
+ * @codegenDependency ../../../../../../../services/forge-common-app-gateway/src/components/global/Global-Sidebar.tsx <<SignedSource::13411f0525b0468463282baeeb342f2b>>
  */
 /* eslint @repo/internal/codegen/signed-source-integrity: "warn" */
 
+import type React from 'react';
+
 export type GlobalSidebarProps = {
 	/**
 	 * URL path for the "For You" section in the sidebar.
 	 * When provided, enables the "For You" navigation item.
 	 */
-	forYouUrl?: string | undefined;
+	forYouUrl?: string;
+	/**
+	 * Accepts Global.LinkMenuItem and Global.ExpandMenuItem components.
+	 */
+	children?: React.ReactElement | React.ReactElement[];
 };
 
 export type TGlobalSidebar<T> = (props: GlobalSidebarProps) => T;

package/src/components/global/__generated__/index.ts

@@ -3,12 +3,14 @@
  *
  * Index file for generated Global component prop types
  *
- * @codegen <<SignedSource::94d4d04a65ea9019214cd455fcb4c585>>
+ * @codegen <<SignedSource::275df2eb411df5669a05d8e4573e519b>>
  * @codegenCommand yarn workspace @atlaskit/forge-react-types codegen-global
- * @codegenDependency ../../../../../../../services/forge-common-app-gateway/src/types/global-component-props.ts <<SignedSource::f24c6db68c9118776491952640ba616f>>
+ * @codegenDependency ../../../../../../../services/forge-common-app-gateway/src/types/global-component-props.ts <<SignedSource::ad330a446ee260180d5b510c18b5e1c8>>
  */
 /* eslint @repo/internal/codegen/signed-source-integrity: "warn" */
 
+export type { GlobalProps, TGlobal } from './GlobalProps.codegen';
+export type { GlobalMainProps, TGlobalMain } from './GlobalMainProps.codegen';
 export type { GlobalSidebarProps, TGlobalSidebar } from './GlobalSidebarProps.codegen';
 export type { GlobalLinkMenuItemProps, TGlobalLinkMenuItem } from './GlobalLinkMenuItemProps.codegen';
 export type { GlobalExpandableMenuItemProps, TGlobalExpandableMenuItem } from './GlobalExpandableMenuItemProps.codegen';

package/src/index.ts

@@ -170,4 +170,8 @@ export type {
 	TGlobalLinkMenuItem,
 	GlobalExpandableMenuItemProps,
 	TGlobalExpandableMenuItem,
+	GlobalProps,
+	TGlobal,
+	GlobalMainProps,
+	TGlobalMain,
 } from './components/global/__generated__';