Skip to content
This repository was archived by the owner on Mar 25, 2025. It is now read-only.

Commit 850bb3e

Browse files
boilundTigge
authored andcommitted
fix(tooltip): place title vertically in the middle when using only title
Also make the title optional for usage without title.
1 parent cc8bf7a commit 850bb3e

File tree

1 file changed

+18
-15
lines changed

1 file changed

+18
-15
lines changed

packages/core/src/Tooltip/index.tsx

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ const TooltipWrapper = styled(BaseTooltipWrapper)`
4646
const ExpandedTooltipWrapper = styled(BaseTooltipWrapper)`
4747
flex-direction: column;
4848
align-items: flex-start;
49+
gap: ${spacing.medium};
4950
5051
margin: ${spacing.medium} ${spacing.small};
5152
padding: ${spacing.medium};
@@ -77,20 +78,18 @@ const ExpandedTooltipTop = styled.div`
7778
justify-content: space-between;
7879
width: 100%;
7980
white-space: nowrap;
81+
gap: ${spacing.medium};
8082
`
8183

8284
const ExpandedTooltipTitle = styled(Typography).attrs({
8385
variant: 'chip-tag-text',
8486
})`
8587
font-weight: ${font.fontWeight.semibold};
86-
margin-bottom: ${spacing.medium};
8788
`
8889

8990
const ExpandedTooltipExtraInfo = styled(Typography).attrs({
9091
variant: 'compact-label',
91-
})`
92-
margin-bottom: ${spacing.medium};
93-
`
92+
})``
9493

9594
const StyledExpandedTooltipTypography = styled(Typography).attrs({
9695
variant: 'chip-tag-text',
@@ -139,9 +138,9 @@ interface ExpandedTooltipProps extends Omit<PopOverProps, 'anchorEl'> {
139138
*/
140139
readonly variant: 'expanded'
141140
/**
142-
* semibold title text inside the tooltip.
141+
* Optional semibold title text inside the tooltip.
143142
*/
144-
readonly tipTitle: string
143+
readonly tipTitle?: string
145144
/**
146145
* Optional extra info shown in the right corner.
147146
*/
@@ -249,16 +248,20 @@ export const Tooltip: React.FC<TooltipProps | ExpandedTooltipProps> = ({
249248
{...props}
250249
>
251250
<ExpandedTooltipWrapper ref={setTooltipEl}>
252-
{props.extraInfo !== undefined ? (
253-
<ExpandedTooltipTop>
251+
{props.tipTitle !== undefined || props.extraInfo !== undefined ? (
252+
props.extraInfo !== undefined ? (
253+
<ExpandedTooltipTop>
254+
<ExpandedTooltipTitle>
255+
{props.tipTitle}
256+
</ExpandedTooltipTitle>
257+
<ExpandedTooltipExtraInfo>
258+
{props.extraInfo}
259+
</ExpandedTooltipExtraInfo>
260+
</ExpandedTooltipTop>
261+
) : (
254262
<ExpandedTooltipTitle>{props.tipTitle}</ExpandedTooltipTitle>
255-
<ExpandedTooltipExtraInfo>
256-
{props.extraInfo}
257-
</ExpandedTooltipExtraInfo>
258-
</ExpandedTooltipTop>
259-
) : (
260-
<ExpandedTooltipTitle>{props.tipTitle}</ExpandedTooltipTitle>
261-
)}
263+
)
264+
) : null}
262265
{props.contents}
263266
</ExpandedTooltipWrapper>
264267
</PopOver>

0 commit comments

Comments
 (0)