Skip to content

Added custom tooltip to Badge #1979

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
merged 5 commits into from
Jul 15, 2024
Merged

Added custom tooltip to Badge #1979

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
53fb690
Added DxcTooltip to badge component
Mil4n0r May 8, 2024
8c3d4e0
Merge branch 'master' into Mil4n0r/tooltip-badge
Mil4n0r May 9, 2024
76a45b6
Merge branch 'master' of github.com:dxc-technology/halstack-react int…
Mil4n0r Jul 11, 2024
75f70ae
Merge branch 'Mil4n0r/tooltip-badge' of github.com:dxc-technology/hal…
Mil4n0r Jul 11, 2024
ca9f68d
Merge branch 'master' into Mil4n0r/tooltip-badge
Mil4n0r Jul 11, 2024
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
36 changes: 19 additions & 17 deletions packages/lib/src/badge/Badge.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import BadgePropsType from "./types";
import DxcFlex from "../flex/Flex";
import CoreTokens from "../common/coreTokens";
import DxcIcon from "../icon/Icon";
import DxcTooltip from "../tooltip/Tooltip";

const contextualColorMap = {
grey: {
Expand Down Expand Up @@ -92,23 +93,24 @@ const DxcBadge = ({
size = "medium",
}: BadgePropsType): JSX.Element => {
return (
<BadgeContainer
label={label}
mode={mode}
color={(mode === "contextual" && color) || undefined}
size={size}
title={title}
aria-label={title}
>
{(mode === "contextual" && (
<DxcFlex gap="0.125rem" alignItems="center">
{icon && (
<IconContainer size={size}>{typeof icon === "string" ? <DxcIcon icon={icon} /> : icon}</IconContainer>
)}
<Label label={label} notificationLimit={notificationLimit} size={size} />
</DxcFlex>
)) || <Label label={label} notificationLimit={notificationLimit} size={size} />}
</BadgeContainer>
<DxcTooltip label={title}>
<BadgeContainer
label={label}
mode={mode}
color={(mode === "contextual" && color) || undefined}
size={size}
aria-label={title}
>
{(mode === "contextual" && (
<DxcFlex gap="0.125rem" alignItems="center">
{icon && (
<IconContainer size={size}>{typeof icon === "string" ? <DxcIcon icon={icon} /> : icon}</IconContainer>
)}
<Label label={label} notificationLimit={notificationLimit} size={size} />
</DxcFlex>
)) || <Label label={label} notificationLimit={notificationLimit} size={size} />}
</BadgeContainer>
</DxcTooltip>
);
};

Expand Down