[MM-58516] Migrate tooltips of "components/search/user_guide_dropdown/user_guide_dropdown.tsx" to WithTooltip (#27248)
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
18e81bd623
Коммит
a768df7e7c
@@ -6,26 +6,14 @@ exports[`UserGuideDropdown should match snapshot 1`] = `
|
|||||||
className="userGuideHelp"
|
className="userGuideHelp"
|
||||||
onToggle={[Function]}
|
onToggle={[Function]}
|
||||||
>
|
>
|
||||||
<OverlayTrigger
|
<WithTooltip
|
||||||
defaultOverlayShown={false}
|
id="userGuideHelpTooltip"
|
||||||
delayShow={500}
|
|
||||||
overlay={
|
|
||||||
<Tooltip
|
|
||||||
className="hidden-xs"
|
|
||||||
id="userGuideHelpTooltip"
|
|
||||||
>
|
|
||||||
<Memo(MemoizedFormattedMessage)
|
|
||||||
defaultMessage="Help"
|
|
||||||
id="channel_header.userHelpGuide"
|
|
||||||
/>
|
|
||||||
</Tooltip>
|
|
||||||
}
|
|
||||||
placement="bottom"
|
placement="bottom"
|
||||||
trigger={
|
title={
|
||||||
Array [
|
<Memo(MemoizedFormattedMessage)
|
||||||
"hover",
|
defaultMessage="Help"
|
||||||
"focus",
|
id="channel_header.userHelpGuide"
|
||||||
]
|
/>
|
||||||
}
|
}
|
||||||
>
|
>
|
||||||
<button
|
<button
|
||||||
@@ -38,7 +26,7 @@ exports[`UserGuideDropdown should match snapshot 1`] = `
|
|||||||
className="icon"
|
className="icon"
|
||||||
/>
|
/>
|
||||||
</button>
|
</button>
|
||||||
</OverlayTrigger>
|
</WithTooltip>
|
||||||
<Menu
|
<Menu
|
||||||
ariaLabel="Add Channel Dropdown"
|
ariaLabel="Add Channel Dropdown"
|
||||||
id="AddChannelDropdown"
|
id="AddChannelDropdown"
|
||||||
@@ -82,26 +70,14 @@ exports[`UserGuideDropdown should match snapshot for false of enableAskCommunity
|
|||||||
className="userGuideHelp"
|
className="userGuideHelp"
|
||||||
onToggle={[Function]}
|
onToggle={[Function]}
|
||||||
>
|
>
|
||||||
<OverlayTrigger
|
<WithTooltip
|
||||||
defaultOverlayShown={false}
|
id="userGuideHelpTooltip"
|
||||||
delayShow={500}
|
|
||||||
overlay={
|
|
||||||
<Tooltip
|
|
||||||
className="hidden-xs"
|
|
||||||
id="userGuideHelpTooltip"
|
|
||||||
>
|
|
||||||
<Memo(MemoizedFormattedMessage)
|
|
||||||
defaultMessage="Help"
|
|
||||||
id="channel_header.userHelpGuide"
|
|
||||||
/>
|
|
||||||
</Tooltip>
|
|
||||||
}
|
|
||||||
placement="bottom"
|
placement="bottom"
|
||||||
trigger={
|
title={
|
||||||
Array [
|
<Memo(MemoizedFormattedMessage)
|
||||||
"hover",
|
defaultMessage="Help"
|
||||||
"focus",
|
id="channel_header.userHelpGuide"
|
||||||
]
|
/>
|
||||||
}
|
}
|
||||||
>
|
>
|
||||||
<button
|
<button
|
||||||
@@ -114,7 +90,7 @@ exports[`UserGuideDropdown should match snapshot for false of enableAskCommunity
|
|||||||
className="icon"
|
className="icon"
|
||||||
/>
|
/>
|
||||||
</button>
|
</button>
|
||||||
</OverlayTrigger>
|
</WithTooltip>
|
||||||
<Menu
|
<Menu
|
||||||
ariaLabel="Add Channel Dropdown"
|
ariaLabel="Add Channel Dropdown"
|
||||||
id="AddChannelDropdown"
|
id="AddChannelDropdown"
|
||||||
|
|||||||
@@ -9,11 +9,10 @@ import type {WrappedComponentProps} from 'react-intl';
|
|||||||
import {trackEvent} from 'actions/telemetry_actions';
|
import {trackEvent} from 'actions/telemetry_actions';
|
||||||
|
|
||||||
import KeyboardShortcutsModal from 'components/keyboard_shortcuts/keyboard_shortcuts_modal/keyboard_shortcuts_modal';
|
import KeyboardShortcutsModal from 'components/keyboard_shortcuts/keyboard_shortcuts_modal/keyboard_shortcuts_modal';
|
||||||
import OverlayTrigger from 'components/overlay_trigger';
|
|
||||||
import Tooltip from 'components/tooltip';
|
|
||||||
import UserGuideIcon from 'components/widgets/icons/user_guide_icon';
|
import UserGuideIcon from 'components/widgets/icons/user_guide_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 {ModalIdentifiers} from 'utils/constants';
|
import {ModalIdentifiers} from 'utils/constants';
|
||||||
|
|
||||||
@@ -87,16 +86,11 @@ class UserGuideDropdown extends React.PureComponent<Props, State> {
|
|||||||
|
|
||||||
render() {
|
render() {
|
||||||
const {intl} = this.props;
|
const {intl} = this.props;
|
||||||
const tooltip = (
|
const tooltipText = (
|
||||||
<Tooltip
|
<FormattedMessage
|
||||||
id='userGuideHelpTooltip'
|
id={'channel_header.userHelpGuide'}
|
||||||
className='hidden-xs'
|
defaultMessage='Help'
|
||||||
>
|
/>
|
||||||
<FormattedMessage
|
|
||||||
id={'channel_header.userHelpGuide'}
|
|
||||||
defaultMessage='Help'
|
|
||||||
/>
|
|
||||||
</Tooltip>
|
|
||||||
);
|
);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
@@ -104,10 +98,10 @@ class UserGuideDropdown extends React.PureComponent<Props, State> {
|
|||||||
className='userGuideHelp'
|
className='userGuideHelp'
|
||||||
onToggle={this.buttonToggleState}
|
onToggle={this.buttonToggleState}
|
||||||
>
|
>
|
||||||
<OverlayTrigger
|
<WithTooltip
|
||||||
delayShow={500}
|
id='userGuideHelpTooltip'
|
||||||
placement='bottom'
|
placement='bottom'
|
||||||
overlay={this.state.buttonActive ? <></> : tooltip}
|
title={this.state.buttonActive ? '' : tooltipText}
|
||||||
>
|
>
|
||||||
<button
|
<button
|
||||||
id='channelHeaderUserGuideButton'
|
id='channelHeaderUserGuideButton'
|
||||||
@@ -117,7 +111,7 @@ class UserGuideDropdown extends React.PureComponent<Props, State> {
|
|||||||
>
|
>
|
||||||
<UserGuideIcon className='icon'/>
|
<UserGuideIcon className='icon'/>
|
||||||
</button>
|
</button>
|
||||||
</OverlayTrigger>
|
</WithTooltip>
|
||||||
<Menu
|
<Menu
|
||||||
openLeft={true}
|
openLeft={true}
|
||||||
openUp={false}
|
openUp={false}
|
||||||
|
|||||||
Ссылка в новой задаче
Block a user