GitHub/storybook
1
0
Fork 0
mirror of https://github.com/storybookjs/storybook.git synced 2025-04-04 10:11:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix globals

Browse Source
This commit is contained in:
Tom Coleman 2021-09-08 15:10:00 +10:00
parent 23254408d1
commit abbd38f69c
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/client-api/src/ClientApi.ts
View File

@ -196,10 +196,16 @@ export class ClientApi<TFramework extends AnyFramework> {
parameters
);
if (globals) {
this.facade.projectAnnotations.globals = globals;
this.facade.projectAnnotations.globals = {
...this.facade.projectAnnotations.globals,
...globals,
};
}
if (globalTypes) {
this.facade.projectAnnotations.globalTypes = normalizeInputTypes(globalTypes);
this.facade.projectAnnotations.globalTypes = {
...this.facade.projectAnnotations.globalTypes,
...normalizeInputTypes(globalTypes),
};
}
};

1
lib/store/src/prepareStory.ts
View File

@ -150,6 +150,7 @@ export function prepareStory<TFramework extends AnyFramework>(
contextForEnhancers.parameters = {
...contextForEnhancers.parameters,
__id: id,
globals: projectAnnotations.globals,
globalTypes: projectAnnotations.globalTypes,
args: contextForEnhancers.initialArgs,
argTypes: contextForEnhancers.argTypes,