[MM-59357] Migrate tooltips of "components/custom_status/custom_status_suggestion.tsx" to WithTooltip (#27637)
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
6e48961756
Коммит
29553008fa
@@ -9,10 +9,9 @@ import type {UserCustomStatus} from '@mattermost/types/users';
|
|||||||
import {CustomStatusDuration} from '@mattermost/types/users';
|
import {CustomStatusDuration} from '@mattermost/types/users';
|
||||||
|
|
||||||
import RenderEmoji from 'components/emoji/render_emoji';
|
import RenderEmoji from 'components/emoji/render_emoji';
|
||||||
import OverlayTrigger from 'components/overlay_trigger';
|
import WithTooltip from 'components/with_tooltip';
|
||||||
import Tooltip from 'components/tooltip';
|
|
||||||
|
|
||||||
import Constants, {durationValues} from 'utils/constants';
|
import {durationValues} from 'utils/constants';
|
||||||
|
|
||||||
import CustomStatusText from './custom_status_text';
|
import CustomStatusText from './custom_status_text';
|
||||||
|
|
||||||
@@ -42,17 +41,16 @@ const CustomStatusSuggestion: React.FC<Props> = (props: Props) => {
|
|||||||
};
|
};
|
||||||
|
|
||||||
const clearButton = handleClear ? (
|
const clearButton = handleClear ? (
|
||||||
<div
|
<div className='suggestion-clear'>
|
||||||
className='suggestion-clear'
|
<WithTooltip
|
||||||
>
|
|
||||||
<OverlayTrigger
|
|
||||||
delayShow={Constants.OVERLAY_TIME_DELAY}
|
|
||||||
placement='top'
|
placement='top'
|
||||||
overlay={
|
title={
|
||||||
<Tooltip id='clear-recent-custom-status'>
|
<FormattedMessage
|
||||||
{'Clear'}
|
id='custom_status.suggestions.clear'
|
||||||
</Tooltip>
|
defaultMessage='Clear'
|
||||||
|
/>
|
||||||
}
|
}
|
||||||
|
id='clear-recent-custom-status'
|
||||||
>
|
>
|
||||||
<button
|
<button
|
||||||
className='style--none input-clear-x'
|
className='style--none input-clear-x'
|
||||||
@@ -60,7 +58,7 @@ const CustomStatusSuggestion: React.FC<Props> = (props: Props) => {
|
|||||||
>
|
>
|
||||||
<i className='icon icon-close-circle'/>
|
<i className='icon icon-close-circle'/>
|
||||||
</button>
|
</button>
|
||||||
</OverlayTrigger>
|
</WithTooltip>
|
||||||
</div>
|
</div>
|
||||||
) : null;
|
) : null;
|
||||||
|
|
||||||
|
|||||||
@@ -3404,6 +3404,7 @@
|
|||||||
"custom_status.modal_cancel": "Clear Status",
|
"custom_status.modal_cancel": "Clear Status",
|
||||||
"custom_status.modal_confirm": "Set Status",
|
"custom_status.modal_confirm": "Set Status",
|
||||||
"custom_status.set_status": "Set a status",
|
"custom_status.set_status": "Set a status",
|
||||||
|
"custom_status.suggestions.clear": "Clear",
|
||||||
"custom_status.suggestions.in_a_meeting": "In a meeting",
|
"custom_status.suggestions.in_a_meeting": "In a meeting",
|
||||||
"custom_status.suggestions.on_a_vacation": "On a vacation",
|
"custom_status.suggestions.on_a_vacation": "On a vacation",
|
||||||
"custom_status.suggestions.out_for_lunch": "Out for lunch",
|
"custom_status.suggestions.out_for_lunch": "Out for lunch",
|
||||||
|
|||||||
Ссылка в новой задаче
Block a user