Skip to content
Draft
Changes from all commits
Commits
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
58 changes: 33 additions & 25 deletions packages/lib/src/chip/Chip.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ const Chip = styled.div<{
display: inline-flex;
align-items: center;
justify-content: center;
gap: var(--spacing-gap-xs);
background-color: var(--color-bg-primary-lightest);
border-radius: var(--border-radius-xl);
padding: ${({ size }) =>
Expand All @@ -36,6 +35,13 @@ const Chip = styled.div<{
props.margin && typeof props.margin === "object" && props.margin.left ? spaces[props.margin.left] : ""};
`;

const LeftContainer = styled.div`
display: flex;
align-items: center;
gap: var(--spacing-gap-xxs);
overflow: hidden;
`;

const LabelContainer = styled.span<{ disabled: ChipPropsType["disabled"] }>`
font-size: var(--typography-label-s);
font-family: var(--typography-font-family);
Expand Down Expand Up @@ -85,31 +91,33 @@ const DxcChip = ({ action, disabled = false, label, margin, prefix, size = "medi

return (
<Chip margin={margin} size={size}>
{prefix &&
(typeof prefix === "string" ? (
<IconContainer disabled={disabled}>
<DxcIcon icon={prefix} />
</IconContainer>
) : isAvatarType(prefix) && size !== "small" ? (
<DxcAvatar
color={prefix.color}
label={prefix.profileName}
icon={prefix.icon}
imageSrc={prefix.imageSrc}
size="xsmall"
disabled={disabled}
/>
) : (
isValidElement(prefix) && <IconContainer disabled={disabled}>{prefix}</IconContainer>
))}
<LeftContainer>
{prefix &&
(typeof prefix === "string" ? (
<IconContainer disabled={disabled}>
<DxcIcon icon={prefix} />
</IconContainer>
) : isAvatarType(prefix) && size !== "small" ? (
<DxcAvatar
color={prefix.color}
label={prefix.profileName}
icon={prefix.icon}
imageSrc={prefix.imageSrc}
size="xsmall"
disabled={disabled}
/>
) : (
isValidElement(prefix) && <IconContainer disabled={disabled}>{prefix}</IconContainer>
))}

{label && (
<Tooltip label={isTruncated ? label : undefined}>
<LabelContainer disabled={disabled} ref={labelRef}>
{label}
</LabelContainer>
</Tooltip>
)}
{label && (
<Tooltip label={isTruncated ? label : undefined}>
<LabelContainer disabled={disabled} ref={labelRef}>
{label}
</LabelContainer>
</Tooltip>
)}
</LeftContainer>

{action && (
<DxcActionIcon
Expand Down