Skip to content

Commit f4ce608

Browse files
docs(button): add button with icon example to storybook (#18851)
* docs(button): add button with icon example to storybook * docs: update button stories * chore: spacing * chore(test): update button tests --------- Co-authored-by: Kenny Lam <909118+kennylam@users.noreply.github.com>
1 parent 673cc38 commit f4ce608

File tree

2 files changed

+41
-18
lines changed

2 files changed

+41
-18
lines changed

e2e/components/Button/Button-test.avt.e2e.js

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ test.describe('@avt Button', () => {
122122
},
123123
});
124124

125-
await expect(page.getByRole('button')).toBeDisabled();
125+
await expect(page.getByRole('button').first()).toBeDisabled();
126126
await expect(page).toHaveNoACViolations('Button-disabled');
127127
});
128128

@@ -134,9 +134,9 @@ test.describe('@avt Button', () => {
134134
theme: 'white',
135135
},
136136
});
137-
await expect(page.getByRole('button')).toBeVisible();
137+
await expect(page.getByRole('button').first()).toBeVisible();
138138
await page.keyboard.press('Tab');
139-
await expect(page.getByRole('button')).toBeFocused();
139+
await expect(page.getByRole('button').first()).toBeFocused();
140140
});
141141

142142
test('@avt-advanced-states mouse interaction', async ({ page }) => {
@@ -147,9 +147,9 @@ test.describe('@avt Button', () => {
147147
theme: 'white',
148148
},
149149
});
150-
await expect(page.getByRole('button')).toBeVisible();
151-
await page.getByRole('button').click();
152-
await expect(page.getByRole('button')).toBeFocused();
150+
await expect(page.getByRole('button').first()).toBeVisible();
151+
await page.getByRole('button').first().click();
152+
await expect(page.getByRole('button').first()).toBeFocused();
153153
});
154154

155155
test('@avt-advanced-states hover state', async ({ page }) => {
@@ -160,8 +160,8 @@ test.describe('@avt Button', () => {
160160
theme: 'white',
161161
},
162162
});
163-
await expect(page.getByRole('button')).toBeVisible();
164-
await page.getByRole('button').hover();
163+
await expect(page.getByRole('button').first()).toBeVisible();
164+
await page.getByRole('button').first().hover();
165165

166166
await expect(page).toHaveNoACViolations('Button-hover');
167167
});

packages/react/src/components/Button/Button.stories.js

Lines changed: 33 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import { action } from '@storybook/addon-actions';
1010
import { Add, Notification } from '@carbon/icons-react';
1111
import { default as Button, ButtonSkeleton } from '../Button';
1212
import ButtonSet from '../ButtonSet';
13+
import { Stack } from '../Stack';
1314
import mdx from './Button.mdx';
1415
import './button-story.scss';
1516

@@ -60,22 +61,39 @@ export default {
6061
};
6162

6263
export const Default = (args) => {
63-
return <Button {...args}>Button</Button>;
64+
return (
65+
<Stack gap={7}>
66+
<Button {...args}>Button</Button>
67+
<Button renderIcon={Add} {...args}>
68+
Button
69+
</Button>
70+
</Stack>
71+
);
6472
};
6573

6674
export const Secondary = (args) => {
6775
return (
68-
<Button kind="secondary" {...args}>
69-
Button
70-
</Button>
76+
<Stack gap={7}>
77+
<Button kind="secondary" {...args}>
78+
Button
79+
</Button>
80+
<Button kind="secondary" renderIcon={Add} {...args}>
81+
Button
82+
</Button>
83+
</Stack>
7184
);
7285
};
7386

7487
export const Tertiary = (args) => {
7588
return (
76-
<Button kind="tertiary" {...args}>
77-
Button
78-
</Button>
89+
<Stack gap={7}>
90+
<Button kind="tertiary" {...args}>
91+
Button
92+
</Button>
93+
<Button kind="tertiary" renderIcon={Add} {...args}>
94+
Button
95+
</Button>
96+
</Stack>
7997
);
8098
};
8199

@@ -99,9 +117,14 @@ export const Danger = (args) => {
99117

100118
export const Ghost = (args) => {
101119
return (
102-
<Button kind="ghost" {...args}>
103-
Button
104-
</Button>
120+
<Stack gap={7}>
121+
<Button kind="ghost" {...args}>
122+
Button
123+
</Button>
124+
<Button kind="ghost" renderIcon={Add} {...args}>
125+
Button
126+
</Button>
127+
</Stack>
105128
);
106129
};
107130

0 commit comments

Comments
 (0)