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

fix #16867

Browse Source
This commit is contained in:
Mario Cadenas 2022-02-15 00:04:21 +01:00
parent a963bca60d
commit 5858452523
2 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
addons/actions/src/preset/addArgsHelpers.test.ts
View File

@ -38,13 +38,22 @@ describe('actions parameter enhancers', () => {
it('should override pre-existing args, if undefined', () => {
const args = inferActionsFromArgTypesRegex({
initialArgs: { onClick: undefined },
initialArgs: {},
argTypes,
parameters,
} as unknown as StoryContext);
expect(args).toEqual({ onClick: expect.any(Function), onFocus: expect.any(Function) });
});
it('should NOT override pre-existing args, if set undefined on purpose', () => {
const args = inferActionsFromArgTypesRegex({
initialArgs: { onClick: undefined },
argTypes,
parameters,
} as unknown as StoryContext);
expect(args).toEqual({ onClick: undefined, onFocus: expect.any(Function) });
});
it('should do nothing if actions are disabled', () => {
const args = inferActionsFromArgTypesRegex({
initialArgs: {},
@ -100,12 +109,22 @@ describe('actions parameter enhancers', () => {
expect(
addActionsFromArgTypes({
argTypes: { onClick: { action: 'clicked!' } },
initialArgs: { onClick: undefined },
initialArgs: {},
parameters: {},
} as unknown as StoryContext)
).toEqual({ onClick: expect.any(Function) });
});
it('should NOT override pre-existing args, if set undefined on purpose', () => {
expect(
addActionsFromArgTypes({
argTypes: { onClick: { action: 'clicked!' } },
initialArgs: { onClick: undefined },
parameters: {},
} as unknown as StoryContext)
).toEqual({ onClick: undefined });
});
it('should do nothing if actions are disabled', () => {
expect(
addActionsFromArgTypes({

4
addons/actions/src/preset/addArgsHelpers.ts
View File

@ -28,7 +28,7 @@ export const inferActionsFromArgTypesRegex: ArgsEnhancer<AnyFramework> = (contex
);
return argTypesMatchingRegex.reduce((acc, [name, argType]) => {
if (typeof initialArgs[name] === 'undefined') {
if (typeof initialArgs[name] === 'undefined' && !(name in initialArgs)) {
acc[name] = action(name);
}
return acc;
@ -51,7 +51,7 @@ export const addActionsFromArgTypes: ArgsEnhancer<AnyFramework> = (context) => {
const argTypesWithAction = Object.entries(argTypes).filter(([name, argType]) => !!argType.action);
return argTypesWithAction.reduce((acc, [name, argType]) => {
if (typeof initialArgs[name] === 'undefined') {
if (typeof initialArgs[name] === 'undefined' && !(name in initialArgs)) {
acc[name] = action(typeof argType.action === 'string' ? argType.action : name);
}
return acc;