mirrors/mostlymatter
1
0
Форкнуть 0
Код Задачи Запросы на слияние Действия Пакеты Проекты Релизы Вики Активность

[MM-59909] Migrate tooltips of 'components/user_group_popover/group_member_list/group_member_list.tsx' to WithTooltip (#27809)

Просмотр исходного кода
Этот коммит содержится в:
Angel Mendez
2024-08-07 02:24:17 -06:00
коммит произвёл GitHub
родитель 7f35be584d
Коммит 08e4215c23
3 изменённых файлов: 95 добавлений и 204 удалений
Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

145
webapp/channels/src/components/user_group_popover/__snapshots__/user_group_popover.test.tsx.snap
Просмотреть файл

@@ -1060,22 +1060,16 @@ exports[`component/user_group_popover should match snapshot 1`] = `
<div <div
className="DMContainer-ilPVMc Cnskx group-member-list_dm-button" className="DMContainer-ilPVMc Cnskx group-member-list_dm-button"
> >
<SimpleTooltip <WithTooltip
content="Send message"
id="name-id0" id="name-id0"
placement="top"
title="Send message"
> >
<OverlayTrigger <OverlayTrigger
defaultOverlayShown={false} defaultOverlayShown={false}
delayShow={100} delay={400}
overlay={ disabled={false}
<Tooltip overlay={<Unknown />}
className="hidden-xs"
id="name-id0"
placement="top"
>
Send message
</Tooltip>
}
placement="top" placement="top"
trigger={ trigger={
Array [ Array [
@@ -1086,11 +1080,9 @@ exports[`component/user_group_popover should match snapshot 1`] = `
> >
<OverlayTrigger <OverlayTrigger
defaultOverlayShown={false} defaultOverlayShown={false}
delayShow={100} delay={400}
overlay={ overlay={
<OverlayWrapper <OverlayWrapper
className="hidden-xs"
id="name-id0"
intl={ intl={
Object { Object {
"$t": [Function], "$t": [Function],
@@ -1130,10 +1122,7 @@ exports[`component/user_group_popover should match snapshot 1`] = `
"wrapRichTextChunksInFragment": undefined, "wrapRichTextChunksInFragment": undefined,
} }
} }
placement="top" />
>
Send message
</OverlayWrapper>
} }
placement="top" placement="top"
trigger={ trigger={
@@ -1168,7 +1157,7 @@ exports[`component/user_group_popover should match snapshot 1`] = `
</DMButton> </DMButton>
</OverlayTrigger> </OverlayTrigger>
</OverlayTrigger> </OverlayTrigger>
</SimpleTooltip> </WithTooltip>
</div> </div>
</DMContainer> </DMContainer>
</div> </div>
@@ -1279,22 +1268,16 @@ exports[`component/user_group_popover should match snapshot 1`] = `
<div <div
className="DMContainer-ilPVMc Cnskx group-member-list_dm-button" className="DMContainer-ilPVMc Cnskx group-member-list_dm-button"
> >
<SimpleTooltip <WithTooltip
content="Send message"
id="name-id1" id="name-id1"
placement="top"
title="Send message"
> >
<OverlayTrigger <OverlayTrigger
defaultOverlayShown={false} defaultOverlayShown={false}
delayShow={100} delay={400}
overlay={ disabled={false}
<Tooltip overlay={<Unknown />}
className="hidden-xs"
id="name-id1"
placement="top"
>
Send message
</Tooltip>
}
placement="top" placement="top"
trigger={ trigger={
Array [ Array [
@@ -1305,11 +1288,9 @@ exports[`component/user_group_popover should match snapshot 1`] = `
> >
<OverlayTrigger <OverlayTrigger
defaultOverlayShown={false} defaultOverlayShown={false}
delayShow={100} delay={400}
overlay={ overlay={
<OverlayWrapper <OverlayWrapper
className="hidden-xs"
id="name-id1"
intl={ intl={
Object { Object {
"$t": [Function], "$t": [Function],
@@ -1349,10 +1330,7 @@ exports[`component/user_group_popover should match snapshot 1`] = `
"wrapRichTextChunksInFragment": undefined, "wrapRichTextChunksInFragment": undefined,
} }
} }
placement="top" />
>
Send message
</OverlayWrapper>
} }
placement="top" placement="top"
trigger={ trigger={
@@ -1387,7 +1365,7 @@ exports[`component/user_group_popover should match snapshot 1`] = `
</DMButton> </DMButton>
</OverlayTrigger> </OverlayTrigger>
</OverlayTrigger> </OverlayTrigger>
</SimpleTooltip> </WithTooltip>
</div> </div>
</DMContainer> </DMContainer>
</div> </div>
@@ -1498,22 +1476,16 @@ exports[`component/user_group_popover should match snapshot 1`] = `
<div <div
className="DMContainer-ilPVMc Cnskx group-member-list_dm-button" className="DMContainer-ilPVMc Cnskx group-member-list_dm-button"
> >
<SimpleTooltip <WithTooltip
content="Send message"
id="name-id10" id="name-id10"
placement="top"
title="Send message"
> >
<OverlayTrigger <OverlayTrigger
defaultOverlayShown={false} defaultOverlayShown={false}
delayShow={100} delay={400}
overlay={ disabled={false}
<Tooltip overlay={<Unknown />}
className="hidden-xs"
id="name-id10"
placement="top"
>
Send message
</Tooltip>
}
placement="top" placement="top"
trigger={ trigger={
Array [ Array [
@@ -1524,11 +1496,9 @@ exports[`component/user_group_popover should match snapshot 1`] = `
> >
<OverlayTrigger <OverlayTrigger
defaultOverlayShown={false} defaultOverlayShown={false}
delayShow={100} delay={400}
overlay={ overlay={
<OverlayWrapper <OverlayWrapper
className="hidden-xs"
id="name-id10"
intl={ intl={
Object { Object {
"$t": [Function], "$t": [Function],
@@ -1568,10 +1538,7 @@ exports[`component/user_group_popover should match snapshot 1`] = `
"wrapRichTextChunksInFragment": undefined, "wrapRichTextChunksInFragment": undefined,
} }
} }
placement="top" />
>
Send message
</OverlayWrapper>
} }
placement="top" placement="top"
trigger={ trigger={
@@ -1606,7 +1573,7 @@ exports[`component/user_group_popover should match snapshot 1`] = `
</DMButton> </DMButton>
</OverlayTrigger> </OverlayTrigger>
</OverlayTrigger> </OverlayTrigger>
</SimpleTooltip> </WithTooltip>
</div> </div>
</DMContainer> </DMContainer>
</div> </div>
@@ -1717,22 +1684,16 @@ exports[`component/user_group_popover should match snapshot 1`] = `
<div <div
className="DMContainer-ilPVMc Cnskx group-member-list_dm-button" className="DMContainer-ilPVMc Cnskx group-member-list_dm-button"
> >
<SimpleTooltip <WithTooltip
content="Send message"
id="name-id11" id="name-id11"
placement="top"
title="Send message"
> >
<OverlayTrigger <OverlayTrigger
defaultOverlayShown={false} defaultOverlayShown={false}
delayShow={100} delay={400}
overlay={ disabled={false}
<Tooltip overlay={<Unknown />}
className="hidden-xs"
id="name-id11"
placement="top"
>
Send message
</Tooltip>
}
placement="top" placement="top"
trigger={ trigger={
Array [ Array [
@@ -1743,11 +1704,9 @@ exports[`component/user_group_popover should match snapshot 1`] = `
> >
<OverlayTrigger <OverlayTrigger
defaultOverlayShown={false} defaultOverlayShown={false}
delayShow={100} delay={400}
overlay={ overlay={
<OverlayWrapper <OverlayWrapper
className="hidden-xs"
id="name-id11"
intl={ intl={
Object { Object {
"$t": [Function], "$t": [Function],
@@ -1787,10 +1746,7 @@ exports[`component/user_group_popover should match snapshot 1`] = `
"wrapRichTextChunksInFragment": undefined, "wrapRichTextChunksInFragment": undefined,
} }
} }
placement="top" />
>
Send message
</OverlayWrapper>
} }
placement="top" placement="top"
trigger={ trigger={
@@ -1825,7 +1781,7 @@ exports[`component/user_group_popover should match snapshot 1`] = `
</DMButton> </DMButton>
</OverlayTrigger> </OverlayTrigger>
</OverlayTrigger> </OverlayTrigger>
</SimpleTooltip> </WithTooltip>
</div> </div>
</DMContainer> </DMContainer>
</div> </div>
@@ -1936,22 +1892,16 @@ exports[`component/user_group_popover should match snapshot 1`] = `
<div <div
className="DMContainer-ilPVMc Cnskx group-member-list_dm-button" className="DMContainer-ilPVMc Cnskx group-member-list_dm-button"
> >
<SimpleTooltip <WithTooltip
content="Send message"
id="name-id12" id="name-id12"
placement="top"
title="Send message"
> >
<OverlayTrigger <OverlayTrigger
defaultOverlayShown={false} defaultOverlayShown={false}
delayShow={100} delay={400}
overlay={ disabled={false}
<Tooltip overlay={<Unknown />}
className="hidden-xs"
id="name-id12"
placement="top"
>
Send message
</Tooltip>
}
placement="top" placement="top"
trigger={ trigger={
Array [ Array [
@@ -1962,11 +1912,9 @@ exports[`component/user_group_popover should match snapshot 1`] = `
> >
<OverlayTrigger <OverlayTrigger
defaultOverlayShown={false} defaultOverlayShown={false}
delayShow={100} delay={400}
overlay={ overlay={
<OverlayWrapper <OverlayWrapper
className="hidden-xs"
id="name-id12"
intl={ intl={
Object { Object {
"$t": [Function], "$t": [Function],
@@ -2006,10 +1954,7 @@ exports[`component/user_group_popover should match snapshot 1`] = `
"wrapRichTextChunksInFragment": undefined, "wrapRichTextChunksInFragment": undefined,
} }
} }
placement="top" />
>
Send message
</OverlayWrapper>
} }
placement="top" placement="top"
trigger={ trigger={
@@ -2044,7 +1989,7 @@ exports[`component/user_group_popover should match snapshot 1`] = `
</DMButton> </DMButton>
</OverlayTrigger> </OverlayTrigger>
</OverlayTrigger> </OverlayTrigger>
</SimpleTooltip> </WithTooltip>
</div> </div>
</DMContainer> </DMContainer>
</div> </div>

145
webapp/channels/src/components/user_group_popover/group_member_list/__snapshots__/group_member_list.test.tsx.snap
Просмотреть файл

@@ -445,22 +445,16 @@ exports[`component/user_group_popover/group_member_list should match snapshot 1`
<div <div
className="DMContainer-ilPVMc Cnskx group-member-list_dm-button" className="DMContainer-ilPVMc Cnskx group-member-list_dm-button"
> >
<SimpleTooltip <WithTooltip
content="Send message"
id="name-id0" id="name-id0"
placement="top"
title="Send message"
> >
<OverlayTrigger <OverlayTrigger
defaultOverlayShown={false} defaultOverlayShown={false}
delayShow={100} delay={400}
overlay={ disabled={false}
<Tooltip overlay={<Unknown />}
className="hidden-xs"
id="name-id0"
placement="top"
>
Send message
</Tooltip>
}
placement="top" placement="top"
trigger={ trigger={
Array [ Array [
@@ -471,11 +465,9 @@ exports[`component/user_group_popover/group_member_list should match snapshot 1`
> >
<OverlayTrigger <OverlayTrigger
defaultOverlayShown={false} defaultOverlayShown={false}
delayShow={100} delay={400}
overlay={ overlay={
<OverlayWrapper <OverlayWrapper
className="hidden-xs"
id="name-id0"
intl={ intl={
Object { Object {
"$t": [Function], "$t": [Function],
@@ -515,10 +507,7 @@ exports[`component/user_group_popover/group_member_list should match snapshot 1`
"wrapRichTextChunksInFragment": undefined, "wrapRichTextChunksInFragment": undefined,
} }
} }
placement="top" />
>
Send message
</OverlayWrapper>
} }
placement="top" placement="top"
trigger={ trigger={
@@ -553,7 +542,7 @@ exports[`component/user_group_popover/group_member_list should match snapshot 1`
</DMButton> </DMButton>
</OverlayTrigger> </OverlayTrigger>
</OverlayTrigger> </OverlayTrigger>
</SimpleTooltip> </WithTooltip>
</div> </div>
</DMContainer> </DMContainer>
</div> </div>
@@ -664,22 +653,16 @@ exports[`component/user_group_popover/group_member_list should match snapshot 1`
<div <div
className="DMContainer-ilPVMc Cnskx group-member-list_dm-button" className="DMContainer-ilPVMc Cnskx group-member-list_dm-button"
> >
<SimpleTooltip <WithTooltip
content="Send message"
id="name-id1" id="name-id1"
placement="top"
title="Send message"
> >
<OverlayTrigger <OverlayTrigger
defaultOverlayShown={false} defaultOverlayShown={false}
delayShow={100} delay={400}
overlay={ disabled={false}
<Tooltip overlay={<Unknown />}
className="hidden-xs"
id="name-id1"
placement="top"
>
Send message
</Tooltip>
}
placement="top" placement="top"
trigger={ trigger={
Array [ Array [
@@ -690,11 +673,9 @@ exports[`component/user_group_popover/group_member_list should match snapshot 1`
> >
<OverlayTrigger <OverlayTrigger
defaultOverlayShown={false} defaultOverlayShown={false}
delayShow={100} delay={400}
overlay={ overlay={
<OverlayWrapper <OverlayWrapper
className="hidden-xs"
id="name-id1"
intl={ intl={
Object { Object {
"$t": [Function], "$t": [Function],
@@ -734,10 +715,7 @@ exports[`component/user_group_popover/group_member_list should match snapshot 1`
"wrapRichTextChunksInFragment": undefined, "wrapRichTextChunksInFragment": undefined,
} }
} }
placement="top" />
>
Send message
</OverlayWrapper>
} }
placement="top" placement="top"
trigger={ trigger={
@@ -772,7 +750,7 @@ exports[`component/user_group_popover/group_member_list should match snapshot 1`
</DMButton> </DMButton>
</OverlayTrigger> </OverlayTrigger>
</OverlayTrigger> </OverlayTrigger>
</SimpleTooltip> </WithTooltip>
</div> </div>
</DMContainer> </DMContainer>
</div> </div>
@@ -883,22 +861,16 @@ exports[`component/user_group_popover/group_member_list should match snapshot 1`
<div <div
className="DMContainer-ilPVMc Cnskx group-member-list_dm-button" className="DMContainer-ilPVMc Cnskx group-member-list_dm-button"
> >
<SimpleTooltip <WithTooltip
content="Send message"
id="name-id2" id="name-id2"
placement="top"
title="Send message"
> >
<OverlayTrigger <OverlayTrigger
defaultOverlayShown={false} defaultOverlayShown={false}
delayShow={100} delay={400}
overlay={ disabled={false}
<Tooltip overlay={<Unknown />}
className="hidden-xs"
id="name-id2"
placement="top"
>
Send message
</Tooltip>
}
placement="top" placement="top"
trigger={ trigger={
Array [ Array [
@@ -909,11 +881,9 @@ exports[`component/user_group_popover/group_member_list should match snapshot 1`
> >
<OverlayTrigger <OverlayTrigger
defaultOverlayShown={false} defaultOverlayShown={false}
delayShow={100} delay={400}
overlay={ overlay={
<OverlayWrapper <OverlayWrapper
className="hidden-xs"
id="name-id2"
intl={ intl={
Object { Object {
"$t": [Function], "$t": [Function],
@@ -953,10 +923,7 @@ exports[`component/user_group_popover/group_member_list should match snapshot 1`
"wrapRichTextChunksInFragment": undefined, "wrapRichTextChunksInFragment": undefined,
} }
} }
placement="top" />
>
Send message
</OverlayWrapper>
} }
placement="top" placement="top"
trigger={ trigger={
@@ -991,7 +958,7 @@ exports[`component/user_group_popover/group_member_list should match snapshot 1`
</DMButton> </DMButton>
</OverlayTrigger> </OverlayTrigger>
</OverlayTrigger> </OverlayTrigger>
</SimpleTooltip> </WithTooltip>
</div> </div>
</DMContainer> </DMContainer>
</div> </div>
@@ -1102,22 +1069,16 @@ exports[`component/user_group_popover/group_member_list should match snapshot 1`
<div <div
className="DMContainer-ilPVMc Cnskx group-member-list_dm-button" className="DMContainer-ilPVMc Cnskx group-member-list_dm-button"
> >
<SimpleTooltip <WithTooltip
content="Send message"
id="name-id3" id="name-id3"
placement="top"
title="Send message"
> >
<OverlayTrigger <OverlayTrigger
defaultOverlayShown={false} defaultOverlayShown={false}
delayShow={100} delay={400}
overlay={ disabled={false}
<Tooltip overlay={<Unknown />}
className="hidden-xs"
id="name-id3"
placement="top"
>
Send message
</Tooltip>
}
placement="top" placement="top"
trigger={ trigger={
Array [ Array [
@@ -1128,11 +1089,9 @@ exports[`component/user_group_popover/group_member_list should match snapshot 1`
> >
<OverlayTrigger <OverlayTrigger
defaultOverlayShown={false} defaultOverlayShown={false}
delayShow={100} delay={400}
overlay={ overlay={
<OverlayWrapper <OverlayWrapper
className="hidden-xs"
id="name-id3"
intl={ intl={
Object { Object {
"$t": [Function], "$t": [Function],
@@ -1172,10 +1131,7 @@ exports[`component/user_group_popover/group_member_list should match snapshot 1`
"wrapRichTextChunksInFragment": undefined, "wrapRichTextChunksInFragment": undefined,
} }
} }
placement="top" />
>
Send message
</OverlayWrapper>
} }
placement="top" placement="top"
trigger={ trigger={
@@ -1210,7 +1166,7 @@ exports[`component/user_group_popover/group_member_list should match snapshot 1`
</DMButton> </DMButton>
</OverlayTrigger> </OverlayTrigger>
</OverlayTrigger> </OverlayTrigger>
</SimpleTooltip> </WithTooltip>
</div> </div>
</DMContainer> </DMContainer>
</div> </div>
@@ -1321,22 +1277,16 @@ exports[`component/user_group_popover/group_member_list should match snapshot 1`
<div <div
className="DMContainer-ilPVMc Cnskx group-member-list_dm-button" className="DMContainer-ilPVMc Cnskx group-member-list_dm-button"
> >
<SimpleTooltip <WithTooltip
content="Send message"
id="name-id4" id="name-id4"
placement="top"
title="Send message"
> >
<OverlayTrigger <OverlayTrigger
defaultOverlayShown={false} defaultOverlayShown={false}
delayShow={100} delay={400}
overlay={ disabled={false}
<Tooltip overlay={<Unknown />}
className="hidden-xs"
id="name-id4"
placement="top"
>
Send message
</Tooltip>
}
placement="top" placement="top"
trigger={ trigger={
Array [ Array [
@@ -1347,11 +1297,9 @@ exports[`component/user_group_popover/group_member_list should match snapshot 1`
> >
<OverlayTrigger <OverlayTrigger
defaultOverlayShown={false} defaultOverlayShown={false}
delayShow={100} delay={400}
overlay={ overlay={
<OverlayWrapper <OverlayWrapper
className="hidden-xs"
id="name-id4"
intl={ intl={
Object { Object {
"$t": [Function], "$t": [Function],
@@ -1391,10 +1339,7 @@ exports[`component/user_group_popover/group_member_list should match snapshot 1`
"wrapRichTextChunksInFragment": undefined, "wrapRichTextChunksInFragment": undefined,
} }
} }
placement="top" />
>
Send message
</OverlayWrapper>
} }
placement="top" placement="top"
trigger={ trigger={
@@ -1429,7 +1374,7 @@ exports[`component/user_group_popover/group_member_list should match snapshot 1`
</DMButton> </DMButton>
</OverlayTrigger> </OverlayTrigger>
</OverlayTrigger> </OverlayTrigger>
</SimpleTooltip> </WithTooltip>
</div> </div>
</DMContainer> </DMContainer>
</div> </div>

9
webapp/channels/src/components/user_group_popover/group_member_list/group_member_list.tsx
Просмотреть файл

@@ -19,8 +19,8 @@ import NoResultsIndicator from 'components/no_results_indicator';
import {NoResultsVariant} from 'components/no_results_indicator/types'; import {NoResultsVariant} from 'components/no_results_indicator/types';
import ProfilePopover from 'components/profile_popover'; import ProfilePopover from 'components/profile_popover';
import LoadingSpinner from 'components/widgets/loading/loading_spinner'; import LoadingSpinner from 'components/widgets/loading/loading_spinner';
import SimpleTooltip from 'components/widgets/simple_tooltip';
import Avatar from 'components/widgets/users/avatar'; import Avatar from 'components/widgets/users/avatar';
import WithTooltip from 'components/with_tooltip';
import * as Utils from 'utils/utils'; import * as Utils from 'utils/utils';
@@ -183,9 +183,10 @@ const GroupMemberList = (props: Props) => {
</UserButton> </UserButton>
</ProfilePopover> </ProfilePopover>
<DMContainer className='group-member-list_dm-button'> <DMContainer className='group-member-list_dm-button'>
<SimpleTooltip <WithTooltip
id={`name-${user.id}`} id={`name-${user.id}`}
content={formatMessage({id: 'group_member_list.sendMessageTooltip', defaultMessage: 'Send message'})} title={formatMessage({id: 'group_member_list.sendMessageTooltip', defaultMessage: 'Send message'})}
placement='top'
> >
<DMButton <DMButton
className='btn btn-icon btn-xs' className='btn btn-icon btn-xs'
@@ -198,7 +199,7 @@ const GroupMemberList = (props: Props) => {
className='icon icon-send' className='icon icon-send'
/> />
</DMButton> </DMButton>
</SimpleTooltip> </WithTooltip>
</DMContainer> </DMContainer>
</UserListItem> </UserListItem>
); );