Merge pull request #33 from ComponentDriven/16843-relax-TArgs-to-only…

…-apply-to-args

Only make `TArgs` parameterize `args` and `argTypes` in our default annotations

src/story.ts

@@ -144,7 +144,7 @@ export type BaseAnnotations<TFramework extends AnyFramework = AnyFramework, TArg
    * Decorators defined in Meta will be applied to every story variation.
    * @see [Decorators](https://storybook.js.org/docs/addons/introduction/#1-decorators)
    */
-  decorators?: DecoratorFunction<TFramework, TArgs>[];
+  decorators?: DecoratorFunction<TFramework, Args>[];
 
   /**
    * Custom metadata for a story.
@@ -168,28 +168,23 @@ export type BaseAnnotations<TFramework extends AnyFramework = AnyFramework, TArg
    * Asynchronous functions which provide data for a story.
    * @see [Loaders](https://storybook.js.org/docs/react/writing-stories/loaders)
    */
-  loaders?: LoaderFunction<TFramework, TArgs>[];
+  loaders?: LoaderFunction<TFramework, Args>[];
 
   /**
    * Define a custom render function for the story(ies). If not passed, a default render function by the framework will be used.
    */
-  render?: ArgsStoryFn<TFramework, TArgs>;
-
-  /**
-   * Function that is executed after the story is rendered.
-   */
-  play?: PlayFunction<TFramework, TArgs>;
+  render?: ArgsStoryFn<TFramework, Args>;
 };
 
 export type ProjectAnnotations<
   TFramework extends AnyFramework = AnyFramework,
   TArgs = Args
 > = BaseAnnotations<TFramework, TArgs> & {
-  argsEnhancers?: ArgsEnhancer<TFramework, TArgs>[];
-  argTypesEnhancers?: ArgTypesEnhancer<TFramework, TArgs>[];
+  argsEnhancers?: ArgsEnhancer<TFramework, Args>[];
+  argTypesEnhancers?: ArgTypesEnhancer<TFramework, Args>[];
   globals?: Globals;
   globalTypes?: GlobalTypes;
-  applyDecorators?: DecoratorApplicator<TFramework, TArgs>;
+  applyDecorators?: DecoratorApplicator<TFramework, Args>;
 };
 
 type StoryDescriptor = string[] | RegExp;
@@ -265,7 +260,7 @@ export type ComponentAnnotations<
    *
    * By defining them each component will have its tab in the args table.
    */
-  subcomponents?: Record<string, TFramework['component']>;
+    subcomponents?: Record<string, TFramework['component']>;
 };
 
 export type StoryAnnotations<
@@ -281,6 +276,11 @@ export type StoryAnnotations<
    * Override the display name in the UI (CSF v2)
    */
   storyName?: StoryName;
+
+  /**
+   * Function that is executed after the story is rendered.
+   */
+  play?: PlayFunction<TFramework, TArgs>;
 
   /** @deprecated */
   story?: Omit<StoryAnnotations<TFramework, TArgs>, 'story'>;