Skip to content

[EuiFormControlButton] Fix alignment for icons when no label is passed #9588

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mgadewoll merged 6 commits into from
Apr 13, 2026
Merged

[EuiFormControlButton] Fix alignment for icons when no label is passed #9588

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3c4301d
fix: ensure correct right alignment of icons when there is no value p…
mgadewoll Apr 10, 2026
6039f77
docs(storybook): add more cases to kitchensink story
mgadewoll Apr 10, 2026
e97c5e1
test(vrt): update reference images
mgadewoll Apr 10, 2026
db22591
chore: add changelog
mgadewoll Apr 10, 2026
f5339b7
refactor: use central iconSide value; update css order
mgadewoll Apr 10, 2026
6bf87b5
test: add tests for single icon alignment
mgadewoll Apr 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified ...i/reference/chrome_desktop_Forms_EuiForm_EuiFormControlButton_High_Contrast.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ...e/chrome_desktop_Forms_EuiForm_EuiFormControlButton_High_Contrast_Dark_Mode.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ...oki/reference/chrome_desktop_Forms_EuiForm_EuiFormControlButton_Kitchensink.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ...nce/chrome_desktop_Forms_EuiForm_EuiFormControlButton_Kitchensink_Dark_Mode.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ...ki/reference/chrome_mobile_Forms_EuiForm_EuiFormControlButton_High_Contrast.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ...ce/chrome_mobile_Forms_EuiForm_EuiFormControlButton_High_Contrast_Dark_Mode.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ...loki/reference/chrome_mobile_Forms_EuiForm_EuiFormControlButton_Kitchensink.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ...ence/chrome_mobile_Forms_EuiForm_EuiFormControlButton_Kitchensink_Dark_Mode.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions packages/eui/changelogs/upcoming/9588.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
**Bug fixes**

- Fixed the visual alignment of right aligned icons in `EuiFormControlButton` when `value` is not passed
94 changes: 66 additions & 28 deletions packages/eui/src/components/form/form_control_button/form_control_button.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,60 +57,98 @@ export const Playground: Story = {
export const Kitchensink: Story = {
tags: ['vrt-only'],
render: () => {
return (
<EuiFlexGroup gutterSize="s" direction="column">
<EuiFormControlButton placeholder="Placeholder" />
<EuiFormControlButton value="Button value" />
<EuiFormControlButton autoFocus>Button content</EuiFormControlButton>
<EuiFormControlButton value="Button value">
const renderItems = ({
compressed,
autoFocus,
}: {
compressed?: boolean;
autoFocus?: boolean;
}) => (
<>
<EuiFormControlButton
placeholder="Placeholder"
compressed={compressed}
/>
<EuiFormControlButton value="Button value" compressed={compressed} />
<EuiFormControlButton autoFocus={autoFocus} compressed={compressed}>
Button content
</EuiFormControlButton>
<EuiFormControlButton value="Button value" compressed={compressed}>
Button content
</EuiFormControlButton>
<EuiFormControlButton compressed={compressed}>
Button content
</EuiFormControlButton>
<EuiFormControlButton value="Button value" isDisabled />
<EuiFormControlButton value="Button value" isInvalid />
<EuiFormControlButton value="Button value" iconType="faceHappy" />
<EuiFormControlButton
value="Button value"
iconType="faceHappy"
iconSide="right"
/>
iconSide="left"
compressed={compressed}
>
Button content
</EuiFormControlButton>
<EuiFormControlButton
value="Button value"
iconType="faceHappy"
iconSide="right"
compressed={compressed}
>
Button content
</EuiFormControlButton>

<EuiSpacer size="s" />

{/* compressed */}
<EuiFormControlButton placeholder="Placeholder" compressed />
<EuiFormControlButton value="Button value" compressed />
<EuiFormControlButton compressed>Button content</EuiFormControlButton>
<EuiFormControlButton value="Button value" compressed>
Button content
</EuiFormControlButton>
<EuiFormControlButton value="Button value" isDisabled compressed />
<EuiFormControlButton value="Button value" isInvalid compressed />
<EuiFormControlButton
value="Button value"
isDisabled
compressed={compressed}
/>
<EuiFormControlButton
value="Button value"
isInvalid
compressed={compressed}
/>
<EuiFormControlButton
iconType="faceHappy"
iconSide="left"
compressed={compressed}
/>
<EuiFormControlButton
iconType="faceHappy"
iconSide="right"
Comment thread
mgadewoll marked this conversation as resolved.
compressed={compressed}
Comment thread
mgadewoll marked this conversation as resolved.
/>
<EuiFormControlButton
value="Button value"
iconType="faceHappy"
compressed
compressed={compressed}
/>
<EuiFormControlButton
value="Button value"
iconType="faceHappy"
compressed={compressed}
>
Button content
</EuiFormControlButton>
<EuiFormControlButton
value="Button value"
iconType="faceHappy"
iconSide="right"
compressed
compressed={compressed}
/>
<EuiFormControlButton
value="Button value"
iconType="faceHappy"
iconSide="right"
compressed
compressed={compressed}
>
Button content
</EuiFormControlButton>
</>
);
return (
<EuiFlexGroup gutterSize="s" direction="column">
{renderItems({ compressed: false, autoFocus: true })}

<EuiSpacer size="s" />

{/* compressed */}
{renderItems({ compressed: true })}
</EuiFlexGroup>
);
},
Expand Down
3 changes: 3 additions & 0 deletions packages/eui/src/components/form/form_control_button/form_control_button.styles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,9 @@ export const euiFormControlButtonStyles = (euiThemeContext: UseEuiTheme) => {
justify-content: flex-start;
${logicalCSS('width', '100%')}
`,
alignEnd: css`
justify-content: flex-end;
`,
textContent: css`
flex: 1;
text-align: start;
Expand Down
32 changes: 32 additions & 0 deletions packages/eui/src/components/form/form_control_button/form_control_button.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,4 +235,36 @@ describe('EuiButtonEmpty', () => {
});
});
});

describe('icon alignment', () => {
it('renders icons with `iconSide="right"` right aligned when no `value` is passed', () => {
const { baseElement } = render(
<EuiFormControlButton
{...defaultProps}
value={undefined}
iconType="user"
iconSide="right"
/>
);

expect(
baseElement.querySelector('.euiButtonEmpty__content')
).toHaveStyleRule('justify-content', 'flex-end');
});

it('renders icons with `iconSide="left"` left aligned when no `value` is passed', () => {
const { baseElement } = render(
<EuiFormControlButton
{...defaultProps}
value={undefined}
iconType="user"
iconSide="left"
/>
);

expect(
baseElement.querySelector('.euiButtonEmpty__content')
).toHaveStyleRule('justify-content', 'flex-start');
});
});
});
11 changes: 8 additions & 3 deletions packages/eui/src/components/form/form_control_button/form_control_button.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ export const EuiFormControlButton: FunctionComponent<
isDisabled: _isDisabled,
isInvalid: _isInvalid,
fullWidth = true,
iconSide,
iconSide: _iconSide,
isLoading: _isLoading,
href,
rel, // required by our local href-with-rel eslint rule
Expand All @@ -89,6 +89,8 @@ export const EuiFormControlButton: FunctionComponent<
const isInvalid = _isInvalid ?? formLayoutIsInvalid;
const isLoading = formLayoutIsLoading === true ? false : _isLoading;
const compressed = _compressed ?? formLayoutCompressed;
const hasText = value || placeholder;
const iconSide = isLoading ? 'right' : _iconSide;

const styles = useEuiMemoizedStyles(euiFormControlButtonStyles);
const classes = classNames('euiFormControlButton', className);
Expand All @@ -104,7 +106,11 @@ export const EuiFormControlButton: FunctionComponent<

const contentProps = {
..._contentProps,
css: [styles.euiFormControlButton__content, _contentProps?.css],
css: [
styles.euiFormControlButton__content,
!hasText && iconSide === 'right' && styles.alignEnd,
_contentProps?.css,
],
Comment thread
mgadewoll marked this conversation as resolved.
Comment thread
mgadewoll marked this conversation as resolved.
};

const customTextProps = {
Expand All @@ -127,7 +133,6 @@ export const EuiFormControlButton: FunctionComponent<
<span>{children}</span>
)
) : null;
const hasText = value || placeholder;

const linkProps = {
href,
Expand Down