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

Do not merge p if not provided, if provided, no conditional is needed

Browse Source
This commit is contained in:
Norbert de Langen 2019-07-08 21:34:09 +02:00
parent 06c57aec43
commit e87c329e90
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/vue/src/client/preview/index.js
View File

@ -52,7 +52,7 @@ function decorateStory(getStory, decorators) {
...p,
parameters: {
...context.parameters,
...(p && p.parameters),
...p.parameters,
},
}
: context

14
lib/client-api/src/client_api.ts
View File

@ -44,11 +44,15 @@ export const defaultDecorateStory = (storyFn: StoryFn, decorators: DecoratorFunc
(decorated, decorator) => (context: StoryContext = defaultContext) =>
decorator(
p =>
decorated({
...context,
...p,
parameters: { ...context.parameters, ...(p && p.parameters) },
}),
decorated(
p
? {
...context,
...p,
parameters: { ...context.parameters, ...p.parameters },
}
: context
),
context
),
storyFn