Skip to content

Commit 7d359cc

Browse files
authored
fix: do not set display: contents on button label part in base styles (#10264)
1 parent e4ae2aa commit 7d359cc

File tree

2 files changed

+14
-8
lines changed

2 files changed

+14
-8
lines changed

packages/button/src/styles/vaadin-button-base-styles.js

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,14 @@ export const buttonStyles = css`
4343
4444
.vaadin-button-container,
4545
[part='prefix'],
46-
[part='suffix'],
47-
[part='label'] {
46+
[part='suffix'] {
4847
display: contents;
4948
}
5049
50+
[part='label'] {
51+
display: inline-flex;
52+
}
53+
5154
:host(:is([focus-ring], :focus-visible)) {
5255
outline: var(--vaadin-focus-ring-width) solid var(--vaadin-focus-ring-color);
5356
outline-offset: 1px;

packages/button/test/visual/base/button.test.js

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,22 +54,25 @@ describe('button', () => {
5454
});
5555

5656
describe('icon', () => {
57-
const PREFIX_ICON = '<vaadin-icon icon="vaadin:reply" slot="prefix"></vaadin-icon>';
58-
const SUFFIX_ICON = '<vaadin-icon icon="vaadin:reply" slot="suffix"></vaadin-icon>';
57+
const getIcon = (slot) => `
58+
<vaadin-icon
59+
icon="vaadin:reply"
60+
${slot ? `slot="${slot}"` : ''}
61+
></vaadin-icon>
62+
`;
5963

6064
it('before text', async () => {
61-
element.insertAdjacentHTML('afterbegin', PREFIX_ICON);
65+
element.insertAdjacentHTML('afterbegin', getIcon('prefix'));
6266
await visualDiff(div, 'icon-before-text');
6367
});
6468

6569
it('after text', async () => {
66-
element.insertAdjacentHTML('beforeend', SUFFIX_ICON);
70+
element.insertAdjacentHTML('beforeend', getIcon('suffix'));
6771
await visualDiff(div, 'icon-after-text');
6872
});
6973

7074
it('without text', async () => {
71-
element.textContent = '';
72-
element.insertAdjacentHTML('afterbegin', PREFIX_ICON);
75+
element.innerHTML = getIcon('');
7376
await visualDiff(div, 'icon-without-text');
7477
});
7578
});

0 commit comments

Comments
 (0)