Skip to content

Commit 8e8df8b

Browse files
committed
fix(@clayui/core) LPD-50722 LanguagePicker should show tooltip when trigger text is hidden
1 parent 2a44bf2 commit 8e8df8b

File tree

1 file changed

+32
-28
lines changed

1 file changed

+32
-28
lines changed

packages/clay-core/src/language-picker/LanguagePicker.tsx

Lines changed: 32 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import ClayIcon from '@clayui/icon';
77
import ClayLabel from '@clayui/label';
88
import ClayLayout from '@clayui/layout';
99
import {InternalDispatch, sub} from '@clayui/shared';
10+
import {ClayTooltipProvider} from '@clayui/tooltip';
1011
import classNames from 'classnames';
1112
import React from 'react';
1213

@@ -136,7 +137,7 @@ const getTranslationLabel = ({
136137
if (translation) {
137138
const {total, translated} = translation;
138139

139-
if (total !== 0) {
140+
if (translated !== 0) {
140141
if (localeId === defaultLocaleId) {
141142
displayType = 'info';
142143
label = messages.default;
@@ -175,35 +176,38 @@ const Trigger = React.forwardRef<HTMLButtonElement>(
175176
);
176177

177178
return (
178-
<button
179-
{...otherProps}
180-
aria-label={sub(triggerMessage, [
181-
selectedItem?.name || selectedItem?.label,
182-
])}
183-
className={classNames(
184-
classNamesTrigger,
185-
'form-control form-control-select form-control-select-secondary',
186-
{
187-
'form-control-shrink': triggerShrink,
188-
'form-control-sm': small,
189-
'hidden-label': hideTriggerText,
190-
}
191-
)}
192-
ref={ref}
193-
>
194-
<span className="inline-item-before">
195-
<ClayIcon
196-
spritemap={spritemap}
197-
symbol={selectedItem.symbol}
198-
/>
199-
</span>
200-
201-
{!hideTriggerText ? (
179+
<ClayTooltipProvider>
180+
<button
181+
{...otherProps}
182+
aria-label={sub(triggerMessage, [
183+
selectedItem?.name || selectedItem?.label,
184+
])}
185+
className={classNames(
186+
classNamesTrigger,
187+
'form-control form-control-select form-control-select-secondary',
188+
{
189+
'form-control-shrink': triggerShrink,
190+
'form-control-sm': small,
191+
'hidden-label': hideTriggerText,
192+
}
193+
)}
194+
title={hideTriggerText ? selectedItem.label : null}
195+
ref={ref}
196+
>
202197
<span className="inline-item-before">
203-
{selectedItem.label}
198+
<ClayIcon
199+
spritemap={spritemap}
200+
symbol={selectedItem.symbol}
201+
/>
204202
</span>
205-
) : null}
206-
</button>
203+
204+
{!hideTriggerText ? (
205+
<span className="inline-item-before">
206+
{selectedItem.label}
207+
</span>
208+
) : null}
209+
</button>
210+
</ClayTooltipProvider>
207211
);
208212
}
209213
);

0 commit comments

Comments
 (0)