CSF: Story ComponentAnnotations['subcomponents'] to correctly use its own type for subcomponents rather than attempt to inherit from the component

[mihkeleidast]

Closes #23170

What I did

Brings in ComponentDriven/csf#103 to core. This annotation broke with Storybook 9 upgrade again, as I guess the csf module was also brought into core without the fixes.

Checklist for Contributors

Testing

The changes in this PR are covered in the following automated tests:

• stories
• unit tests
• integration tests
• end-to-end tests

Manual testing

This section is mandatory for all contributions. If you believe no manual test is necessary, please state so explicitly. Thanks!

Documentation

• Add or update documentation reflecting your changes
• If you are deprecating/removing a feature, make sure to update
  MIGRATION.MD

Checklist for Maintainers

• When this PR is ready for testing, make sure to add ci:normal, ci:merged or ci:daily GH label to it to run a specific set of sandboxes. The particular set of sandboxes can be found in code/lib/cli-storybook/src/sandbox-templates.ts

• Make sure this PR contains one of the labels below:

  Available labels

  • bug: Internal changes that fixes incorrect behavior.
  • maintenance: User-facing maintenance tasks.
  • dependencies: Upgrading (sometimes downgrading) dependencies.
  • build: Internal-facing build tooling & test updates. Will not show up in release changelog.
  • cleanup: Minor cleanup style change. Will not show up in release changelog.
  • documentation: Documentation only changes. Will not show up in release changelog.
  • feature request: Introducing a new feature.
  • BREAKING CHANGE: Changes that break compatibility in some way with current major version.
  • other: Changes that don't fit in the above categories.

🦋 Canary release

This pull request has been released as version 0.0.0-pr-31723-sha-fc6b24f9. Try it out in a new sandbox by running npx [email protected] sandbox or in an existing project with npx [email protected] upgrade.

More information

Published version	0.0.0-pr-31723-sha-fc6b24f9
Triggered by	@kasperpeulen
Repository	mihkeleidast/storybook
Branch	feature/fix-csf-subcomponents
Commit	fc6b24f9
Datetime	Wed Jun 11 08:48:04 UTC 2025 (1749631684)
Workflow run	15580337232

To request a new release of this pull request, mention the @storybookjs/core team.

core team members can create a new canary release here or locally with gh workflow run --repo storybookjs/storybook canary-release-pr.yml --field pr=31723

Greptile Summary

Fixed TypeScript typing for subcomponents property in Component Story Format (CSF) to allow subcomponents to use their own independent type definitions rather than inheriting from the parent component.

• Modified ComponentAnnotations interface in code/core/src/csf/story.ts to correctly handle component types with their own generic arguments
• Added test case in code/core/src/csf/story.test.ts demonstrating ButtonIcon component with { icon: string } props working as Button subcomponent
• Resolves TypeScript strict mode errors reported in issue [Bug]: subcomponents meta property always invalid with TypeScript Strict mode for React #23170
• Brings in fixes from fix: story ComponentAnnotations['subcomponents'] to correctly use its own type for subcomponents rather than attempt to inherit from the component ComponentDriven/csf#103 that were missing after Storybook 9 upgrade

[greptile-apps]

LGTM

_{2 files reviewed, no comments
Edit PR Review Bot Settings | Greptile}

[nx-cloud]

View your CI Pipeline Execution ↗ for commit fc6b24f.

Command	Status	Duration	Result
nx run-many -t build --parallel=3	✅ Succeeded	1m 30s	View ↗

---

☁️ Nx Cloud last updated this comment at 2025-06-11 08:53:27 UTC

[storybook-app-bot]

Package Benchmarks

^{Commit: fc6b24f, ran on 12 June 2025 at 07:26:11 UTC}

The following packages have significant changes to their size or dependencies:

@storybook/angular

	Before	After	Difference
Dependency count	199	209	🚨 +10 🚨
Self size	189 KB	607 KB	🚨 +418 KB 🚨
Dependency size	29.70 MB	29.79 MB	🚨 +94 KB 🚨
Bundle Size Analyzer	Link	Link

@storybook/cli

	Before	After	Difference
Dependency count	216	324	🚨 +108 🚨
Self size	582 KB	235 KB	🎉 -347 KB 🎉
Dependency size	94.67 MB	99.89 MB	🚨 +5.22 MB 🚨
Bundle Size Analyzer	Link	Link

@storybook/codemod

	Before	After	Difference
Dependency count	185	267	🚨 +82 🚨
Self size	31 KB	31 KB	🚨 +361 B 🚨
Dependency size	78.74 MB	82.77 MB	🚨 +4.03 MB 🚨
Bundle Size Analyzer	Link	Link