@storybook/react 7.0.0-alpha.34 → 7.0.0-alpha.37

package/dist/config.d.ts

@@ -1,13 +1,13 @@
 import * as lib_docs_tools_dist_types from 'lib/docs-tools/dist/types';
-import * as lib_addons_dist_types from 'lib/addons/dist/types';
+import * as lib_addons_dist from 'lib/addons/dist';
 import * as _storybook_csf from '@storybook/csf';
 import { ArgsStoryFn } from '@storybook/csf';
-import { R as ReactFramework, S as StoryFnReactReturnType } from './types-9f8d440a.js';
+import { R as ReactFramework, S as StoryFnReactReturnType } from './types-cd314162.js';
 import { RenderContext } from '@storybook/store';
 import 'react';
 
 declare const decorators: ((storyFn: _storybook_csf.PartialStoryFn<ReactFramework, _storybook_csf.Args>, context: _storybook_csf.StoryContext<ReactFramework, _storybook_csf.Args>) => StoryFnReactReturnType)[];
-declare const argTypesEnhancers: (<TFramework extends _storybook_csf.AnyFramework>(context: _storybook_csf.StoryContextForEnhancers<TFramework, _storybook_csf.Args>) => _storybook_csf.StrictArgTypes<_storybook_csf.Args> | lib_addons_dist_types.Parameters)[];
+declare const argTypesEnhancers: (<TFramework extends _storybook_csf.AnyFramework>(context: _storybook_csf.StoryContextForEnhancers<TFramework, _storybook_csf.Args>) => _storybook_csf.StrictArgTypes<_storybook_csf.Args> | lib_addons_dist.Parameters)[];
 
 declare const render: ArgsStoryFn<ReactFramework>;
 declare function renderToDOM({ storyContext, unboundStoryFn, showMain, showException, forceRemount, }: RenderContext<ReactFramework>, domElement: Element): Promise<() => void>;

package/dist/index.d.ts

@@ -1,8 +1,9 @@
 import { ClientStoryApi, Loadable } from '@storybook/addons';
-import { R as ReactFramework, I as IStorybookSection, S as StoryFnReactReturnType } from './types-9f8d440a.js';
 import * as _storybook_csf from '@storybook/csf';
-import { Args, ComponentAnnotations, AnnotatedStoryFn, StoryAnnotations, ProjectAnnotations } from '@storybook/csf';
-import { ComponentProps, JSXElementConstructor } from 'react';
+import { Args, DecoratorFunction, ComponentAnnotations, AnnotatedStoryFn, ArgsStoryFn, StoryAnnotations, LoaderFunction, ProjectAnnotations } from '@storybook/csf';
+import { R as ReactFramework, I as IStorybookSection, S as StoryFnReactReturnType } from './types-cd314162.js';
+import { Simplify, SetOptional, UnionToIntersection } from 'type-fest';
+import { ComponentType, ComponentProps, JSXElementConstructor } from 'react';
 import * as _storybook_store from '@storybook/store';
 import { ComposedStory, CSFExports, StoriesWithPartialProps } from '@storybook/store';
 
@@ -17,7 +18,7 @@ interface ClientApi extends ClientStoryApi<ReactFramework['storyResult']> {
 declare const storiesOf: ClientApi['storiesOf'];
 declare const configure: ClientApi['configure'];
 declare const addDecorator: ClientApi['addDecorator'];
-declare type DecoratorFn = Parameters<typeof addDecorator>[0];
+declare type DecoratorFn<TArgs = Args> = DecoratorFunction<ReactFramework, TArgs>;
 declare const addParameters: ClientApi['addParameters'];
 declare const clearDecorators: ClientApi['clearDecorators'];
 declare const setAddon: ClientApi['setAddon'];
@@ -31,7 +32,7 @@ declare type JSXElement = keyof JSX.IntrinsicElements | JSXElementConstructor<an
  *
  * @see [Default export](https://storybook.js.org/docs/formats/component-story-format/#default-export)
  */
-declare type Meta<TArgs = Args> = ComponentAnnotations<ReactFramework, TArgs>;
+declare type Meta<CmpOrArgs = Args> = CmpOrArgs extends ComponentType<infer CmpArgs> ? ComponentAnnotations<ReactFramework, CmpArgs> : ComponentAnnotations<ReactFramework, CmpOrArgs>;
 /**
  * Story function that represents a CSFv2 component example.
  *
@@ -43,8 +44,20 @@ declare type StoryFn<TArgs = Args> = AnnotatedStoryFn<ReactFramework, TArgs>;
  *
  * @see [Named Story exports](https://storybook.js.org/docs/formats/component-story-format/#named-story-exports)
  */
-declare type StoryObj<TArgs = Args> = StoryAnnotations<ReactFramework, TArgs>;
+declare type StoryObj<MetaOrArgs = Args> = MetaOrArgs extends {
+    render?: ArgsStoryFn<ReactFramework, infer RArgs>;
+    component?: ComponentType<infer CmpArgs>;
+    loaders?: (infer Loaders)[];
+    args?: infer DefaultArgs;
+    decorators?: (infer Decorators)[];
+} ? Simplify<CmpArgs & RArgs & DecoratorsArgs<Decorators> & LoaderArgs<Loaders>> extends infer TArgs ? StoryAnnotations<ReactFramework, TArgs, SetOptional<TArgs, Extract<keyof TArgs, keyof (DefaultArgs & ActionArgs<TArgs>)>>> : never : StoryAnnotations<ReactFramework, MetaOrArgs>;
+declare type DecoratorsArgs<Decorators> = UnionToIntersection<Decorators extends DecoratorFn<infer Args> ? Args : unknown>;
+declare type LoaderArgs<Loaders> = UnionToIntersection<Loaders extends LoaderFunction<ReactFramework, infer Args> ? Args : unknown>;
+declare type ActionArgs<Args> = {
+    [P in keyof Args as ((...args: any[]) => void) extends Args[P] ? P : never]: Args[P];
+};
 /**
+ * @deprecated Use `Meta` instead.
  * For the common case where a component's stories are simple components that receives args as props:
  *
  * ```tsx
@@ -61,6 +74,8 @@ declare type ComponentMeta<T extends JSXElement> = Meta<ComponentProps<T>>;
  */
 declare type ComponentStoryFn<T extends JSXElement> = StoryFn<ComponentProps<T>>;
 /**
+ * @deprecated Use `StoryObj` instead.
+ *
  * For the common case where a (CSFv3) story is a simple component that receives args as props:
  *
  * ```tsx
@@ -72,13 +87,17 @@ declare type ComponentStoryFn<T extends JSXElement> = StoryFn<ComponentProps<T>>
 declare type ComponentStoryObj<T extends JSXElement> = StoryObj<ComponentProps<T>>;
 /**
 
-/**
+ /**
+ * @deprecated Use `StoryObj` instead.
+ *
  * Story function that represents a CSFv3 component example.
  *
  * @see [Named Story exports](https://storybook.js.org/docs/formats/component-story-format/#named-story-exports)
  */
-declare type Story<TArgs = Args> = StoryObj<TArgs>;
+declare type Story<TArgs = Args> = StoryFn<TArgs>;
 /**
+ * @deprecated Use StoryObj instead.
+ *
  * For the common case where a (CSFv3) story is a simple component that receives args as props:
  *
  * ```tsx
@@ -86,7 +105,8 @@ declare type Story<TArgs = Args> = StoryObj<TArgs>;
  *   args: { buttonArg1: 'val' },
  * }
  * ```
- */ declare type ComponentStory<T extends JSXElement> = ComponentStoryObj<T>;
+ */
+declare type ComponentStory<T extends JSXElement> = ComponentStoryObj<T>;
 
 /** Function that sets the globalConfig of your storybook. The global config is the preview module of your .storybook folder.
  *

package/dist/index.js

@@ -1 +1 @@
-"use strict";var v=Object.create;var d=Object.defineProperty;var T=Object.getOwnPropertyDescriptor;var W=Object.getOwnPropertyNames;var U=Object.getPrototypeOf,L=Object.prototype.hasOwnProperty;var N=(o,t)=>{for(var e in t)d(o,e,{get:t[e],enumerable:!0})},R=(o,t,e,r)=>{if(t&&typeof t=="object"||typeof t=="function")for(let a of W(t))!L.call(o,a)&&a!==e&&d(o,a,{get:()=>t[a],enumerable:!(r=T(t,a))||r.enumerable});return o};var m=(o,t,e)=>(e=o!=null?v(U(o)):{},R(t||!o||!o.__esModule?d(e,"default",{value:o,enumerable:!0}):e,o)),O=o=>R(d({},"__esModule",{value:!0}),o);var eo={};N(eo,{addDecorator:()=>H,addParameters:()=>J,clearDecorators:()=>Q,composeStories:()=>to,composeStory:()=>D,configure:()=>z,forceReRender:()=>Z,getStorybook:()=>I,raw:()=>K,setAddon:()=>X,setGlobalConfig:()=>_,setProjectAnnotations:()=>b,storiesOf:()=>q});module.exports=O(eo);var C=m(require("global")),{window:w}=C.default;w&&(w.STORYBOOK_ENV="react");var F=require("@storybook/core-client");var S=m(require("global")),n=m(require("react")),i=m(require("react-dom")),{FRAMEWORK_OPTIONS:c}=S.default,l=new Map,f=(o,t)=>{let{id:e,component:r}=t;if(!r)throw new Error(`Unable to render story ${e} as the component annotation is missing from the default export`);return n.default.createElement(r,{...o})},G=({callback:o,children:t})=>{let e=(0,n.useRef)();return(0,n.useLayoutEffect)(()=>{e.current!==o&&(e.current=o,o())},[o]),t},V=async(o,t)=>{let e=await $(t);return new Promise(r=>{e?e.render(n.default.createElement(G,{callback:()=>r(null)},o)):i.default.render(o,t,()=>r(null))})},B=i.version&&(i.version.startsWith("18")||i.version.startsWith("0.0.0")),Y=(c==null?void 0:c.legacyRootApi)!==!0,k=Y&&B,g=o=>{let t=l.get(o);t&&k?(t.unmount(),l.delete(o)):i.default.unmountComponentAtNode(o)},$=async o=>{if(!k)return null;let t=l.get(o);return t||(t=(await import("react-dom/client")).default.createRoot(o),l.set(o,t)),t},A=class extends n.Component{constructor(){super(...arguments);this.state={hasError:!1}}static getDerivedStateFromError(){return{hasError:!0}}componentDidMount(){let{hasError:e}=this.state,{showMain:r}=this.props;e||r()}componentDidCatch(e){let{showException:r}=this.props;r(e)}render(){let{hasError:e}=this.state,{children:r}=this.props;return e?null:r}},x=c!=null&&c.strictMode?n.StrictMode:n.Fragment;async function h({storyContext:o,unboundStoryFn:t,showMain:e,showException:r,forceRemount:a},u){let y=n.default.createElement(A,{showMain:e,showException:r},n.default.createElement(t,{...o})),j=x?n.default.createElement(x,null,y):y;return a&&g(u),await V(j,u),()=>g(u)}var E="react",s=(0,F.start)(h,{render:f}),q=(o,t)=>s.clientApi.storiesOf(o,t).addParameters({framework:E}),z=(...o)=>s.configure(E,...o),H=s.clientApi.addDecorator,J=s.clientApi.addParameters,Q=s.clientApi.clearDecorators,X=s.clientApi.setAddon,Z=s.forceReRender,I=s.clientApi.getStorybook,K=s.clientApi.raw;var p=require("@storybook/store"),P=require("@storybook/client-logger");function b(o){(0,p.setProjectAnnotations)(o)}function _(o){P.once.warn("setGlobalConfig is deprecated. Use setProjectAnnotations instead."),b(o)}var oo={render:f};function D(o,t,e,r){return(0,p.composeStory)(o,t,e,oo,r)}function to(o,t){return(0,p.composeStories)(o,t,D)}var M;(M=module==null?void 0:module.hot)==null||M.decline();0&&(module.exports={addDecorator,addParameters,clearDecorators,composeStories,composeStory,configure,forceReRender,getStorybook,raw,setAddon,setGlobalConfig,setProjectAnnotations,storiesOf});
+"use strict";var T=Object.create;var d=Object.defineProperty;var v=Object.getOwnPropertyDescriptor;var W=Object.getOwnPropertyNames;var U=Object.getPrototypeOf,L=Object.prototype.hasOwnProperty;var N=(o,t)=>{for(var e in t)d(o,e,{get:t[e],enumerable:!0})},R=(o,t,e,r)=>{if(t&&typeof t=="object"||typeof t=="function")for(let a of W(t))!L.call(o,a)&&a!==e&&d(o,a,{get:()=>t[a],enumerable:!(r=v(t,a))||r.enumerable});return o};var m=(o,t,e)=>(e=o!=null?T(U(o)):{},R(t||!o||!o.__esModule?d(e,"default",{value:o,enumerable:!0}):e,o)),O=o=>R(d({},"__esModule",{value:!0}),o);var eo={};N(eo,{addDecorator:()=>H,addParameters:()=>J,clearDecorators:()=>Q,composeStories:()=>to,composeStory:()=>D,configure:()=>z,forceReRender:()=>Z,getStorybook:()=>I,raw:()=>K,setAddon:()=>X,setGlobalConfig:()=>_,setProjectAnnotations:()=>b,storiesOf:()=>q});module.exports=O(eo);var C=m(require("global")),{window:w}=C.default;w&&(w.STORYBOOK_ENV="react");var h=require("@storybook/core-client");var x=m(require("global")),n=m(require("react")),i=m(require("react-dom")),{FRAMEWORK_OPTIONS:c}=x.default,l=new Map,f=(o,t)=>{let{id:e,component:r}=t;if(!r)throw new Error(`Unable to render story ${e} as the component annotation is missing from the default export`);return n.default.createElement(r,{...o})},G=({callback:o,children:t})=>{let e=(0,n.useRef)();return(0,n.useLayoutEffect)(()=>{e.current!==o&&(e.current=o,o())},[o]),t},V=async(o,t)=>{let e=await $(t);return new Promise(r=>{e?e.render(n.default.createElement(G,{callback:()=>r(null)},o)):i.default.render(o,t,()=>r(null))})},B=i.version&&(i.version.startsWith("18")||i.version.startsWith("0.0.0")),Y=(c==null?void 0:c.legacyRootApi)!==!0,S=Y&&B,g=o=>{let t=l.get(o);t&&S?(t.unmount(),l.delete(o)):i.default.unmountComponentAtNode(o)},$=async o=>{if(!S)return null;let t=l.get(o);return t||(t=(await import("react-dom/client")).default.createRoot(o),l.set(o,t)),t},A=class extends n.Component{constructor(){super(...arguments);this.state={hasError:!1}}static getDerivedStateFromError(){return{hasError:!0}}componentDidMount(){let{hasError:e}=this.state,{showMain:r}=this.props;e||r()}componentDidCatch(e){let{showException:r}=this.props;r(e)}render(){let{hasError:e}=this.state,{children:r}=this.props;return e?null:r}},k=c!=null&&c.strictMode?n.StrictMode:n.Fragment;async function F({storyContext:o,unboundStoryFn:t,showMain:e,showException:r,forceRemount:a},u){let y=n.default.createElement(A,{showMain:e,showException:r},n.default.createElement(t,{...o})),j=k?n.default.createElement(k,null,y):y;return a&&g(u),await V(j,u),()=>g(u)}var E="react",s=(0,h.start)(F,{render:f}),q=(o,t)=>s.clientApi.storiesOf(o,t).addParameters({framework:E}),z=(...o)=>s.configure(E,...o),H=s.clientApi.addDecorator,J=s.clientApi.addParameters,Q=s.clientApi.clearDecorators,X=s.clientApi.setAddon,Z=s.forceReRender,I=s.clientApi.getStorybook,K=s.clientApi.raw;var p=require("@storybook/store"),P=require("@storybook/client-logger");function b(o){(0,p.setProjectAnnotations)(o)}function _(o){P.once.warn("setGlobalConfig is deprecated. Use setProjectAnnotations instead."),b(o)}var oo={render:f};function D(o,t,e,r){return(0,p.composeStory)(o,t,e,oo,r)}function to(o,t){return(0,p.composeStories)(o,t,D)}var M;(M=module==null?void 0:module.hot)==null||M.decline();0&&(module.exports={addDecorator,addParameters,clearDecorators,composeStories,composeStory,configure,forceReRender,getStorybook,raw,setAddon,setGlobalConfig,setProjectAnnotations,storiesOf});

package/dist/index.mjs

@@ -1 +1 @@
-import{a as r,b as s}from"./chunk-WO7CMEGS.mjs";import m from"global";var{window:i}=m;i&&(i.STORYBOOK_ENV="react");import{start as d}from"@storybook/core-client";var p="react",t=d(s,{render:r}),w=(o,e)=>t.clientApi.storiesOf(o,e).addParameters({framework:p}),F=(...o)=>t.configure(p,...o),P=t.clientApi.addDecorator,T=t.clientApi.addParameters,u=t.clientApi.clearDecorators,b=t.clientApi.setAddon,j=t.forceReRender,O=t.clientApi.getStorybook,E=t.clientApi.raw;import{composeStory as A,composeStories as l,setProjectAnnotations as y}from"@storybook/store";import{once as S}from"@storybook/client-logger";function f(o){y(o)}function v(o){S.warn("setGlobalConfig is deprecated. Use setProjectAnnotations instead."),f(o)}var C={render:r};function g(o,e,a,c){return A(o,e,a,C,c)}function W(o,e){return l(o,e,g)}module?.hot?.decline();export{P as addDecorator,T as addParameters,u as clearDecorators,W as composeStories,g as composeStory,F as configure,j as forceReRender,O as getStorybook,E as raw,b as setAddon,v as setGlobalConfig,f as setProjectAnnotations,w as storiesOf};
+import{a as t,b as a}from"./chunk-WO7CMEGS.mjs";import m from"global";var{window:i}=m;i&&(i.STORYBOOK_ENV="react");import{start as A}from"@storybook/core-client";var p="react",r=A(a,{render:t}),R=(o,e)=>r.clientApi.storiesOf(o,e).addParameters({framework:p}),w=(...o)=>r.configure(p,...o),T=r.clientApi.addDecorator,u=r.clientApi.addParameters,P=r.clientApi.clearDecorators,D=r.clientApi.setAddon,O=r.forceReRender,b=r.clientApi.getStorybook,j=r.clientApi.raw;import{composeStory as d,composeStories as y,setProjectAnnotations as g}from"@storybook/store";import{once as l}from"@storybook/client-logger";function f(o){g(o)}function X(o){l.warn("setGlobalConfig is deprecated. Use setProjectAnnotations instead."),f(o)}var S={render:t};function C(o,e,s,c){return d(o,e,s,S,c)}function v(o,e){return y(o,e,C)}module?.hot?.decline();export{T as addDecorator,u as addParameters,P as clearDecorators,v as composeStories,C as composeStory,w as configure,O as forceReRender,b as getStorybook,j as raw,D as setAddon,X as setGlobalConfig,f as setProjectAnnotations,R as storiesOf};

package/dist/{types-9f8d440a.d.ts → types-cd314162.d.ts}

@@ -1,9 +1,10 @@
 import { ComponentType, ReactElement } from 'react';
+import { AnyFramework } from '@storybook/csf';
 
-declare type ReactFramework = {
-    component: ComponentType<any>;
+interface ReactFramework extends AnyFramework {
+    component: ComponentType<this['T']>;
     storyResult: StoryFnReactReturnType;
-};
+}
 declare type StoryFnReactReturnType = ReactElement<unknown>;
 interface IStorybookStory {
     name: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/react",
-  "version": "7.0.0-alpha.34",
+  "version": "7.0.0-alpha.37",
   "description": "Storybook React renderer",
   "keywords": [
     "storybook"
@@ -51,12 +51,12 @@
     "prep": "../../../scripts/prepare/bundle.ts"
   },
   "dependencies": {
-    "@storybook/addons": "7.0.0-alpha.34",
-    "@storybook/client-logger": "7.0.0-alpha.34",
-    "@storybook/core-client": "7.0.0-alpha.34",
-    "@storybook/csf": "0.0.2--canary.0899bb7.0",
-    "@storybook/docs-tools": "7.0.0-alpha.34",
-    "@storybook/store": "7.0.0-alpha.34",
+    "@storybook/addons": "7.0.0-alpha.37",
+    "@storybook/client-logger": "7.0.0-alpha.37",
+    "@storybook/core-client": "7.0.0-alpha.37",
+    "@storybook/csf": "0.0.2--canary.49.258942b.0",
+    "@storybook/docs-tools": "7.0.0-alpha.37",
+    "@storybook/store": "7.0.0-alpha.37",
     "@types/estree": "^0.0.51",
     "@types/node": "^14.14.20 || ^16.0.0",
     "acorn": "^7.4.1",
@@ -69,11 +69,14 @@
     "prop-types": "^15.7.2",
     "react-element-to-jsx-string": "^15.0.0",
     "ts-dedent": "^2.0.0",
+    "type-fest": "^2.19.0",
     "util-deprecate": "^1.0.2"
   },
   "devDependencies": {
     "@babel/core": "^7.11.5",
+    "@jest/globals": "^26.6.2",
     "@types/util-deprecate": "^1.0.0",
+    "expect-type": "^0.14.2",
     "jest-specific-snapshot": "^4.0.0",
     "require-from-string": "^2.0.2",
     "typescript": "~4.6.3"
@@ -100,5 +103,5 @@
     ],
     "platform": "browser"
   },
-  "gitHead": "fc90fc875462421c1faa35862ac4bc436de8e75f"
+  "gitHead": "82667a655108283aafc828427f00bb3590a334e5"
 }