[MM-59898] Migrate tooltips of 'components/search_results/files_filter_menu.tsx' to WithTooltip (#27848)

Этот коммит содержится в:
Michael
2024-08-07 16:47:55 +01:00
коммит произвёл GitHub
родитель 1ad39b9da5
Коммит 64cbdba3d7
2 изменённых файлов: 74 добавлений и 195 удалений

Просмотреть файл

@@ -8,28 +8,14 @@ exports[`components/search_results/FilesFilterMenu should match snapshot, on all
animationComponent={[Function]} animationComponent={[Function]}
className="" className=""
> >
<OverlayTrigger <WithTooltip
className="hidden-xs" id="files-filter-tooltip"
defaultOverlayShown={false}
delayShow={500}
overlay={
<Tooltip
className="hidden-xs"
id="files-filter-tooltip"
>
<Memo(MemoizedFormattedMessage)
defaultMessage="Filter"
id="channel_info_rhs.menu.files.filter"
/>
</Tooltip>
}
placement="top" placement="top"
rootClose={true} title={
trigger={ <Memo(MemoizedFormattedMessage)
Array [ defaultMessage="Filter"
"hover", id="channel_info_rhs.menu.files.filter"
"focus", />
]
} }
> >
<IconContainer <IconContainer
@@ -42,7 +28,7 @@ exports[`components/search_results/FilesFilterMenu should match snapshot, on all
size={18} size={18}
/> />
</IconContainer> </IconContainer>
</OverlayTrigger> </WithTooltip>
<Menu <Menu
ariaLabel="file menu" ariaLabel="file menu"
openLeft={true} openLeft={true}
@@ -120,28 +106,14 @@ exports[`components/search_results/FilesFilterMenu should match snapshot, on aud
animationComponent={[Function]} animationComponent={[Function]}
className="" className=""
> >
<OverlayTrigger <WithTooltip
className="hidden-xs" id="files-filter-tooltip"
defaultOverlayShown={false}
delayShow={500}
overlay={
<Tooltip
className="hidden-xs"
id="files-filter-tooltip"
>
<Memo(MemoizedFormattedMessage)
defaultMessage="Filter"
id="channel_info_rhs.menu.files.filter"
/>
</Tooltip>
}
placement="top" placement="top"
rootClose={true} title={
trigger={ <Memo(MemoizedFormattedMessage)
Array [ defaultMessage="Filter"
"hover", id="channel_info_rhs.menu.files.filter"
"focus", />
]
} }
> >
<IconContainer <IconContainer
@@ -157,7 +129,7 @@ exports[`components/search_results/FilesFilterMenu should match snapshot, on aud
size={18} size={18}
/> />
</IconContainer> </IconContainer>
</OverlayTrigger> </WithTooltip>
<Menu <Menu
ariaLabel="file menu" ariaLabel="file menu"
openLeft={true} openLeft={true}
@@ -235,28 +207,14 @@ exports[`components/search_results/FilesFilterMenu should match snapshot, on cod
animationComponent={[Function]} animationComponent={[Function]}
className="" className=""
> >
<OverlayTrigger <WithTooltip
className="hidden-xs" id="files-filter-tooltip"
defaultOverlayShown={false}
delayShow={500}
overlay={
<Tooltip
className="hidden-xs"
id="files-filter-tooltip"
>
<Memo(MemoizedFormattedMessage)
defaultMessage="Filter"
id="channel_info_rhs.menu.files.filter"
/>
</Tooltip>
}
placement="top" placement="top"
rootClose={true} title={
trigger={ <Memo(MemoizedFormattedMessage)
Array [ defaultMessage="Filter"
"hover", id="channel_info_rhs.menu.files.filter"
"focus", />
]
} }
> >
<IconContainer <IconContainer
@@ -272,7 +230,7 @@ exports[`components/search_results/FilesFilterMenu should match snapshot, on cod
size={18} size={18}
/> />
</IconContainer> </IconContainer>
</OverlayTrigger> </WithTooltip>
<Menu <Menu
ariaLabel="file menu" ariaLabel="file menu"
openLeft={true} openLeft={true}
@@ -350,28 +308,14 @@ exports[`components/search_results/FilesFilterMenu should match snapshot, on doc
animationComponent={[Function]} animationComponent={[Function]}
className="" className=""
> >
<OverlayTrigger <WithTooltip
className="hidden-xs" id="files-filter-tooltip"
defaultOverlayShown={false}
delayShow={500}
overlay={
<Tooltip
className="hidden-xs"
id="files-filter-tooltip"
>
<Memo(MemoizedFormattedMessage)
defaultMessage="Filter"
id="channel_info_rhs.menu.files.filter"
/>
</Tooltip>
}
placement="top" placement="top"
rootClose={true} title={
trigger={ <Memo(MemoizedFormattedMessage)
Array [ defaultMessage="Filter"
"hover", id="channel_info_rhs.menu.files.filter"
"focus", />
]
} }
> >
<IconContainer <IconContainer
@@ -387,7 +331,7 @@ exports[`components/search_results/FilesFilterMenu should match snapshot, on doc
size={18} size={18}
/> />
</IconContainer> </IconContainer>
</OverlayTrigger> </WithTooltip>
<Menu <Menu
ariaLabel="file menu" ariaLabel="file menu"
openLeft={true} openLeft={true}
@@ -465,28 +409,14 @@ exports[`components/search_results/FilesFilterMenu should match snapshot, on ima
animationComponent={[Function]} animationComponent={[Function]}
className="" className=""
> >
<OverlayTrigger <WithTooltip
className="hidden-xs" id="files-filter-tooltip"
defaultOverlayShown={false}
delayShow={500}
overlay={
<Tooltip
className="hidden-xs"
id="files-filter-tooltip"
>
<Memo(MemoizedFormattedMessage)
defaultMessage="Filter"
id="channel_info_rhs.menu.files.filter"
/>
</Tooltip>
}
placement="top" placement="top"
rootClose={true} title={
trigger={ <Memo(MemoizedFormattedMessage)
Array [ defaultMessage="Filter"
"hover", id="channel_info_rhs.menu.files.filter"
"focus", />
]
} }
> >
<IconContainer <IconContainer
@@ -502,7 +432,7 @@ exports[`components/search_results/FilesFilterMenu should match snapshot, on ima
size={18} size={18}
/> />
</IconContainer> </IconContainer>
</OverlayTrigger> </WithTooltip>
<Menu <Menu
ariaLabel="file menu" ariaLabel="file menu"
openLeft={true} openLeft={true}
@@ -580,28 +510,14 @@ exports[`components/search_results/FilesFilterMenu should match snapshot, on pre
animationComponent={[Function]} animationComponent={[Function]}
className="" className=""
> >
<OverlayTrigger <WithTooltip
className="hidden-xs" id="files-filter-tooltip"
defaultOverlayShown={false}
delayShow={500}
overlay={
<Tooltip
className="hidden-xs"
id="files-filter-tooltip"
>
<Memo(MemoizedFormattedMessage)
defaultMessage="Filter"
id="channel_info_rhs.menu.files.filter"
/>
</Tooltip>
}
placement="top" placement="top"
rootClose={true} title={
trigger={ <Memo(MemoizedFormattedMessage)
Array [ defaultMessage="Filter"
"hover", id="channel_info_rhs.menu.files.filter"
"focus", />
]
} }
> >
<IconContainer <IconContainer
@@ -617,7 +533,7 @@ exports[`components/search_results/FilesFilterMenu should match snapshot, on pre
size={18} size={18}
/> />
</IconContainer> </IconContainer>
</OverlayTrigger> </WithTooltip>
<Menu <Menu
ariaLabel="file menu" ariaLabel="file menu"
openLeft={true} openLeft={true}
@@ -695,28 +611,14 @@ exports[`components/search_results/FilesFilterMenu should match snapshot, on spr
animationComponent={[Function]} animationComponent={[Function]}
className="" className=""
> >
<OverlayTrigger <WithTooltip
className="hidden-xs" id="files-filter-tooltip"
defaultOverlayShown={false}
delayShow={500}
overlay={
<Tooltip
className="hidden-xs"
id="files-filter-tooltip"
>
<Memo(MemoizedFormattedMessage)
defaultMessage="Filter"
id="channel_info_rhs.menu.files.filter"
/>
</Tooltip>
}
placement="top" placement="top"
rootClose={true} title={
trigger={ <Memo(MemoizedFormattedMessage)
Array [ defaultMessage="Filter"
"hover", id="channel_info_rhs.menu.files.filter"
"focus", />
]
} }
> >
<IconContainer <IconContainer
@@ -732,7 +634,7 @@ exports[`components/search_results/FilesFilterMenu should match snapshot, on spr
size={18} size={18}
/> />
</IconContainer> </IconContainer>
</OverlayTrigger> </WithTooltip>
<Menu <Menu
ariaLabel="file menu" ariaLabel="file menu"
openLeft={true} openLeft={true}
@@ -810,28 +712,14 @@ exports[`components/search_results/FilesFilterMenu should match snapshot, on vid
animationComponent={[Function]} animationComponent={[Function]}
className="" className=""
> >
<OverlayTrigger <WithTooltip
className="hidden-xs" id="files-filter-tooltip"
defaultOverlayShown={false}
delayShow={500}
overlay={
<Tooltip
className="hidden-xs"
id="files-filter-tooltip"
>
<Memo(MemoizedFormattedMessage)
defaultMessage="Filter"
id="channel_info_rhs.menu.files.filter"
/>
</Tooltip>
}
placement="top" placement="top"
rootClose={true} title={
trigger={ <Memo(MemoizedFormattedMessage)
Array [ defaultMessage="Filter"
"hover", id="channel_info_rhs.menu.files.filter"
"focus", />
]
} }
> >
<IconContainer <IconContainer
@@ -847,7 +735,7 @@ exports[`components/search_results/FilesFilterMenu should match snapshot, on vid
size={18} size={18}
/> />
</IconContainer> </IconContainer>
</OverlayTrigger> </WithTooltip>
<Menu <Menu
ariaLabel="file menu" ariaLabel="file menu"
openLeft={true} openLeft={true}

Просмотреть файл

@@ -7,11 +7,10 @@ import {FormattedMessage} from 'react-intl';
import {FilterVariantIcon} from '@mattermost/compass-icons/components'; import {FilterVariantIcon} from '@mattermost/compass-icons/components';
import {IconContainer} from 'components/advanced_text_editor/formatting_bar/formatting_icon'; import {IconContainer} from 'components/advanced_text_editor/formatting_bar/formatting_icon';
import OverlayTrigger from 'components/overlay_trigger';
import type {SearchFilterType} from 'components/search/types'; import type {SearchFilterType} from 'components/search/types';
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 './files_filter_menu.scss'; import './files_filter_menu.scss';
@@ -21,26 +20,17 @@ type Props = {
}; };
export default function FilesFilterMenu(props: Props): JSX.Element { export default function FilesFilterMenu(props: Props): JSX.Element {
const toolTip = (
<Tooltip
id='files-filter-tooltip'
className='hidden-xs'
>
<FormattedMessage
id='channel_info_rhs.menu.files.filter'
defaultMessage='Filter'
/>
</Tooltip>
);
return ( return (
<div className='FilesFilterMenu'> <div className='FilesFilterMenu'>
<MenuWrapper> <MenuWrapper>
<OverlayTrigger <WithTooltip
className='hidden-xs' id='files-filter-tooltip'
delayShow={500} title={
<FormattedMessage
id='channel_info_rhs.menu.files.filter'
defaultMessage='Filter'
/>}
placement='top' placement='top'
overlay={toolTip}
rootClose={true}
> >
<IconContainer <IconContainer
id='filesFilterButton' id='filesFilterButton'
@@ -53,7 +43,8 @@ export default function FilesFilterMenu(props: Props): JSX.Element {
color='currentColor' color='currentColor'
/> />
</IconContainer> </IconContainer>
</OverlayTrigger> </WithTooltip>
<Menu <Menu
ariaLabel={'file menu'} ariaLabel={'file menu'}
openLeft={true} openLeft={true}