[MM-59896] Migrate tooltips of 'components/channel_members_dropdown/channel_members_dropdown.tsx' to WithTooltip (#27806)
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
08e4215c23
Коммит
35077ddd5d
@@ -84,25 +84,14 @@ exports[`components/channel_members_dropdown should match snapshot for dropdown
|
|||||||
<div
|
<div
|
||||||
className="more-modal__shared-actions"
|
className="more-modal__shared-actions"
|
||||||
>
|
>
|
||||||
<OverlayTrigger
|
<WithTooltip
|
||||||
defaultOverlayShown={false}
|
id="sharedTooltip"
|
||||||
delayShow={400}
|
|
||||||
overlay={
|
|
||||||
<Tooltip
|
|
||||||
id="sharedTooltip"
|
|
||||||
>
|
|
||||||
<Memo(MemoizedFormattedMessage)
|
|
||||||
defaultMessage="From trusted organizations"
|
|
||||||
id="shared_user_indicator.tooltip"
|
|
||||||
/>
|
|
||||||
</Tooltip>
|
|
||||||
}
|
|
||||||
placement="bottom"
|
placement="bottom"
|
||||||
trigger={
|
title={
|
||||||
Array [
|
<Memo(MemoizedFormattedMessage)
|
||||||
"hover",
|
defaultMessage="From trusted organizations"
|
||||||
"focus",
|
id="shared_user_indicator.tooltip"
|
||||||
]
|
/>
|
||||||
}
|
}
|
||||||
>
|
>
|
||||||
<span>
|
<span>
|
||||||
@@ -114,7 +103,7 @@ exports[`components/channel_members_dropdown should match snapshot for dropdown
|
|||||||
className="shared-user-icon icon-circle-multiple-outline"
|
className="shared-user-icon icon-circle-multiple-outline"
|
||||||
/>
|
/>
|
||||||
</span>
|
</span>
|
||||||
</OverlayTrigger>
|
</WithTooltip>
|
||||||
</div>
|
</div>
|
||||||
`;
|
`;
|
||||||
|
|
||||||
|
|||||||
@@ -12,11 +12,10 @@ import type {ActionResult} from 'mattermost-redux/types/actions';
|
|||||||
import * as UserUtils from 'mattermost-redux/utils/user_utils';
|
import * as UserUtils from 'mattermost-redux/utils/user_utils';
|
||||||
|
|
||||||
import LeaveChannelModal from 'components/leave_channel_modal';
|
import LeaveChannelModal from 'components/leave_channel_modal';
|
||||||
import OverlayTrigger from 'components/overlay_trigger';
|
|
||||||
import Tooltip from 'components/tooltip';
|
|
||||||
import DropdownIcon from 'components/widgets/icons/fa_dropdown_icon';
|
import DropdownIcon from 'components/widgets/icons/fa_dropdown_icon';
|
||||||
import Menu from 'components/widgets/menu/menu';
|
import Menu from 'components/widgets/menu/menu';
|
||||||
import MenuWrapper from 'components/widgets/menu/menu_wrapper';
|
import MenuWrapper from 'components/widgets/menu/menu_wrapper';
|
||||||
|
import WithTooltip from 'components/with_tooltip';
|
||||||
|
|
||||||
import {Constants, ModalIdentifiers} from 'utils/constants';
|
import {Constants, ModalIdentifiers} from 'utils/constants';
|
||||||
import * as Utils from 'utils/utils';
|
import * as Utils from 'utils/utils';
|
||||||
@@ -155,21 +154,17 @@ export default function ChannelMembersDropdown({
|
|||||||
const currentRole = renderRole(isChannelAdmin, isGuest);
|
const currentRole = renderRole(isChannelAdmin, isGuest);
|
||||||
|
|
||||||
if (user.remote_id) {
|
if (user.remote_id) {
|
||||||
const sharedTooltip = (
|
|
||||||
<Tooltip id='sharedTooltip'>
|
|
||||||
<FormattedMessage
|
|
||||||
id='shared_user_indicator.tooltip'
|
|
||||||
defaultMessage='From trusted organizations'
|
|
||||||
/>
|
|
||||||
</Tooltip>
|
|
||||||
);
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className='more-modal__shared-actions'>
|
<div className='more-modal__shared-actions'>
|
||||||
<OverlayTrigger
|
<WithTooltip
|
||||||
delayShow={Constants.OVERLAY_TIME_DELAY}
|
id='sharedTooltip'
|
||||||
placement='bottom'
|
placement='bottom'
|
||||||
overlay={sharedTooltip}
|
title={
|
||||||
|
<FormattedMessage
|
||||||
|
id='shared_user_indicator.tooltip'
|
||||||
|
defaultMessage='From trusted organizations'
|
||||||
|
/>
|
||||||
|
}
|
||||||
>
|
>
|
||||||
<span>
|
<span>
|
||||||
<FormattedMessage
|
<FormattedMessage
|
||||||
@@ -178,7 +173,7 @@ export default function ChannelMembersDropdown({
|
|||||||
/>
|
/>
|
||||||
<i className='shared-user-icon icon-circle-multiple-outline'/>
|
<i className='shared-user-icon icon-circle-multiple-outline'/>
|
||||||
</span>
|
</span>
|
||||||
</OverlayTrigger>
|
</WithTooltip>
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
Ссылка в новой задаче
Block a user