Skip to content
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

[EuiBetaBadge] fix beta badge placement when no tooltip content is specified #6326

Merged
merged 4 commits into from
Oct 26, 2022
Merged

[EuiBetaBadge] fix beta badge placement when no tooltip content is specified #6326

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4b3debe
Fix the styling of EuiCard when betaBageProps is present but lacks to…
chandlerprall Oct 26, 2022
e1ca632
REVERT ME
chandlerprall Oct 26, 2022
552eb33
changelog
chandlerprall Oct 26, 2022
ca7029c
Revert "REVERT ME"
chandlerprall Oct 26, 2022
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
108 changes: 62 additions & 46 deletions src/components/badge/beta_badge/__snapshots__/beta_badge.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,81 +1,97 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP

exports[`EuiBetaBadge is rendered 1`] = `
<span
aria-label="aria-label"
class="euiBetaBadge testClass1 testClass2 emotion-euiBetaBadge-hollow-m"
data-test-subj="test subject string"
title="Beta"
>
Beta
<span>
<span
aria-label="aria-label"
class="euiBetaBadge testClass1 testClass2 emotion-euiBetaBadge-hollow-m"
data-test-subj="test subject string"
title="Beta"
>
Beta
</span>
</span>
`;

exports[`EuiBetaBadge props color accent is rendered 1`] = `
<span
class="euiBetaBadge emotion-euiBetaBadge-accent-m"
title="Beta"
>
Beta
<span>
<span
class="euiBetaBadge emotion-euiBetaBadge-accent-m"
title="Beta"
>
Beta
</span>
</span>
`;

exports[`EuiBetaBadge props color hollow is rendered 1`] = `
<span
class="euiBetaBadge emotion-euiBetaBadge-hollow-m"
title="Beta"
>
Beta
<span>
<span
class="euiBetaBadge emotion-euiBetaBadge-hollow-m"
title="Beta"
>
Beta
</span>
</span>
`;

exports[`EuiBetaBadge props color subdued is rendered 1`] = `
<span
class="euiBetaBadge emotion-euiBetaBadge-subdued-m"
title="Beta"
>
Beta
<span>
<span
class="euiBetaBadge emotion-euiBetaBadge-subdued-m"
title="Beta"
>
Beta
</span>
</span>
`;

exports[`EuiBetaBadge props iconType 1`] = `
<span
class="euiBetaBadge emotion-euiBetaBadge-hollow-m"
title="Beta"
>
<span>
<span
aria-hidden="true"
class="euiBetaBadge__icon emotion-euiBetaBadge__icon"
color="inherit"
data-euiicon-type="beta"
/>
class="euiBetaBadge emotion-euiBetaBadge-hollow-m"
title="Beta"
>
<span
aria-hidden="true"
class="euiBetaBadge__icon emotion-euiBetaBadge__icon"
color="inherit"
data-euiicon-type="beta"
/>
</span>
</span>
`;

exports[`EuiBetaBadge props single letter 1`] = `
<span
class="euiBetaBadge emotion-euiBetaBadge-hollow-m"
title="B"
>
B
<span>
<span
class="euiBetaBadge emotion-euiBetaBadge-hollow-m"
title="B"
>
B
</span>
</span>
`;

exports[`EuiBetaBadge props size m is rendered 1`] = `
<span
class="euiBetaBadge emotion-euiBetaBadge-hollow-m"
title="Beta"
>
Beta
<span>
<span
class="euiBetaBadge emotion-euiBetaBadge-hollow-m"
title="Beta"
>
Beta
</span>
</span>
`;

exports[`EuiBetaBadge props size s is rendered 1`] = `
<span
class="euiBetaBadge emotion-euiBetaBadge-hollow-s"
title="Beta"
>
Beta
<span>
<span
class="euiBetaBadge emotion-euiBetaBadge-hollow-s"
title="Beta"
>
Beta
</span>
</span>
`;

Expand Down
19 changes: 10 additions & 9 deletions src/components/badge/beta_badge/beta_badge.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@

import React, {
AriaAttributes,
Fragment,
FunctionComponent,
HTMLAttributes,
MouseEventHandler,
Expand Down Expand Up @@ -215,7 +214,7 @@ export const EuiBetaBadge: FunctionComponent<EuiBetaBadgeProps> = ({
</EuiToolTip>
);
} else {
return <Fragment>{content}</Fragment>;
return <span {...anchorProps}>{content}</span>;
}
} else {
if (tooltipContent) {
Expand Down Expand Up @@ -245,13 +244,15 @@ export const EuiBetaBadge: FunctionComponent<EuiBetaBadgeProps> = ({
);
}
return (
<span
css={cssStyles}
className={classes}
title={spanTitle as string}
{...rest}
>
{icon || label}
<span {...anchorProps}>
<span
className={classes}
title={spanTitle as string}
css={cssStyles}
{...rest}
>
{icon || label}
</span>
</span>
);
}
Expand Down
20 changes: 12 additions & 8 deletions src/components/card/__snapshots__/card.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,19 @@ exports[`EuiCard betaBadgeProps renders href 1`] = `
</p>
</div>
</div>
<a
class="euiBetaBadge emotion-euiBetaBadge-hollow-m-euiCard__betaBadge"
href="http://www.elastic.co/"
id="generated-idBetaBadge"
rel=""
title="Link"
<span
class="emotion-euiCard__betaBadgeAnchor"
>
Link
</a>
<a
class="euiBetaBadge emotion-euiBetaBadge-hollow-m-euiCard__betaBadge"
href="http://www.elastic.co/"
id="generated-idBetaBadge"
rel=""
title="Link"
>
Link
</a>
</span>
</div>
`;

Expand Down
62 changes: 35 additions & 27 deletions src/components/key_pad_menu/__snapshots__/key_pad_menu_item.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,12 +104,14 @@ exports[`EuiKeyPadMenuItem props betaBadge renders 1`] = `
<span
class="euiKeyPadMenuItem__inner"
>
<span
aria-hidden="true"
class="euiBetaBadge euiKeyPadMenuItem__betaBadge emotion-euiBetaBadge-subdued-s"
title="B"
>
B
<span>
<span
aria-hidden="true"
class="euiBetaBadge euiKeyPadMenuItem__betaBadge emotion-euiBetaBadge-subdued-s"
title="B"
>
B
</span>
</span>
<span
class="euiKeyPadMenuItem__icon"
Expand Down Expand Up @@ -137,12 +139,14 @@ exports[`EuiKeyPadMenuItem props betaBadge renders extra betaBadgeTooltipProps 1
<span
class="euiKeyPadMenuItem__inner"
>
<span
aria-hidden="true"
class="euiBetaBadge euiKeyPadMenuItem__betaBadge emotion-euiBetaBadge-subdued-s"
title="B"
>
B
<span>
<span
aria-hidden="true"
class="euiBetaBadge euiKeyPadMenuItem__betaBadge emotion-euiBetaBadge-subdued-s"
title="B"
>
B
</span>
</span>
<span
class="euiKeyPadMenuItem__icon"
Expand Down Expand Up @@ -170,17 +174,19 @@ exports[`EuiKeyPadMenuItem props betaBadge renders with betaBadgeIconType 1`] =
<span
class="euiKeyPadMenuItem__inner"
>
<span
aria-hidden="true"
class="euiBetaBadge euiKeyPadMenuItem__betaBadge emotion-euiBetaBadge-subdued-s"
title="B"
>
<span>
<span
aria-hidden="true"
class="euiBetaBadge__icon emotion-euiBetaBadge__icon"
color="inherit"
data-euiicon-type="bolt"
/>
class="euiBetaBadge euiKeyPadMenuItem__betaBadge emotion-euiBetaBadge-subdued-s"
title="B"
>
<span
aria-hidden="true"
class="euiBetaBadge__icon emotion-euiBetaBadge__icon"
color="inherit"
data-euiicon-type="bolt"
/>
</span>
</span>
<span
class="euiKeyPadMenuItem__icon"
Expand Down Expand Up @@ -208,12 +214,14 @@ exports[`EuiKeyPadMenuItem props betaBadge renders with betaBadgeTooltipContent
<span
class="euiKeyPadMenuItem__inner"
>
<span
aria-hidden="true"
class="euiBetaBadge euiKeyPadMenuItem__betaBadge emotion-euiBetaBadge-subdued-s"
title="B"
>
B
<span>
<span
aria-hidden="true"
class="euiBetaBadge euiKeyPadMenuItem__betaBadge emotion-euiBetaBadge-subdued-s"
title="B"
>
B
</span>
</span>
<span
class="euiKeyPadMenuItem__icon"
Expand Down
3 changes: 3 additions & 0 deletions upcoming_changelogs/6326.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
**Bug fixes**

- Fixed `EuiBetaBadge` to always respect its `anchorProps` values, including when there is no tooltip content