[MM-58511] Migrate tooltips of "components/global_header/center_controls/user_guide_dropdown/user_guide_dropdown.tsx" to WithTooltip (#27245)
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
082a4df0c2
Коммит
27cc50ae23
@@ -7,26 +7,14 @@ exports[`components/channel_header/components/UserGuideDropdown should match sna
|
|||||||
id="helpMenuPortal"
|
id="helpMenuPortal"
|
||||||
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"
|
||||||
]
|
/>
|
||||||
}
|
}
|
||||||
>
|
>
|
||||||
<ForwardRef
|
<ForwardRef
|
||||||
@@ -40,7 +28,7 @@ exports[`components/channel_header/components/UserGuideDropdown should match sna
|
|||||||
onClick={[Function]}
|
onClick={[Function]}
|
||||||
size="sm"
|
size="sm"
|
||||||
/>
|
/>
|
||||||
</OverlayTrigger>
|
</WithTooltip>
|
||||||
<Menu
|
<Menu
|
||||||
ariaLabel="Add Channel Dropdown"
|
ariaLabel="Add Channel Dropdown"
|
||||||
id="AddChannelDropdown"
|
id="AddChannelDropdown"
|
||||||
@@ -96,26 +84,14 @@ exports[`components/channel_header/components/UserGuideDropdown should match sna
|
|||||||
id="helpMenuPortal"
|
id="helpMenuPortal"
|
||||||
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"
|
||||||
]
|
/>
|
||||||
}
|
}
|
||||||
>
|
>
|
||||||
<ForwardRef
|
<ForwardRef
|
||||||
@@ -129,7 +105,7 @@ exports[`components/channel_header/components/UserGuideDropdown should match sna
|
|||||||
onClick={[Function]}
|
onClick={[Function]}
|
||||||
size="sm"
|
size="sm"
|
||||||
/>
|
/>
|
||||||
</OverlayTrigger>
|
</WithTooltip>
|
||||||
<Menu
|
<Menu
|
||||||
ariaLabel="Add Channel Dropdown"
|
ariaLabel="Add Channel Dropdown"
|
||||||
id="AddChannelDropdown"
|
id="AddChannelDropdown"
|
||||||
@@ -177,26 +153,14 @@ exports[`components/channel_header/components/UserGuideDropdown should match sna
|
|||||||
id="helpMenuPortal"
|
id="helpMenuPortal"
|
||||||
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"
|
||||||
]
|
/>
|
||||||
}
|
}
|
||||||
>
|
>
|
||||||
<ForwardRef
|
<ForwardRef
|
||||||
@@ -210,7 +174,7 @@ exports[`components/channel_header/components/UserGuideDropdown should match sna
|
|||||||
onClick={[Function]}
|
onClick={[Function]}
|
||||||
size="sm"
|
size="sm"
|
||||||
/>
|
/>
|
||||||
</OverlayTrigger>
|
</WithTooltip>
|
||||||
<Menu
|
<Menu
|
||||||
ariaLabel="Add Channel Dropdown"
|
ariaLabel="Add Channel Dropdown"
|
||||||
id="AddChannelDropdown"
|
id="AddChannelDropdown"
|
||||||
|
|||||||
@@ -10,10 +10,9 @@ import IconButton from '@mattermost/compass-components/components/icon-button';
|
|||||||
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 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';
|
||||||
|
|
||||||
@@ -123,16 +122,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 (
|
||||||
@@ -141,10 +135,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={tooltipText}
|
||||||
>
|
>
|
||||||
<IconButton
|
<IconButton
|
||||||
size={'sm'}
|
size={'sm'}
|
||||||
@@ -157,7 +151,7 @@ class UserGuideDropdown extends React.PureComponent<Props, State> {
|
|||||||
aria-expanded={this.state.buttonActive}
|
aria-expanded={this.state.buttonActive}
|
||||||
aria-label={intl.formatMessage({id: 'channel_header.userHelpGuide', defaultMessage: 'Help'})}
|
aria-label={intl.formatMessage({id: 'channel_header.userHelpGuide', defaultMessage: 'Help'})}
|
||||||
/>
|
/>
|
||||||
</OverlayTrigger>
|
</WithTooltip>
|
||||||
<Menu
|
<Menu
|
||||||
openLeft={false}
|
openLeft={false}
|
||||||
openUp={false}
|
openUp={false}
|
||||||
|
|||||||
Ссылка в новой задаче
Block a user