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

[MM-59904] Migrate tooltips of 'components/channel_invite_modal/team_warning_banner/team_warning_banner.tsx' to WithTooltip (#27852)

Просмотр исходного кода
Этот коммит содержится в:
Ivy Gesare
2024-08-07 18:44:13 +03:00
коммит произвёл GitHub
родитель edd45c50ce
Коммит 1bb8298756
2 изменённых файлов: 37 добавлений и 55 удалений
Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

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

@@ -459,9 +459,10 @@ exports[`components/channel_invite_modal/team_warning_banner should match snapsh
mentionName="user-0" mentionName="user-0"
/>, />,
" and ", " and ",
<SimpleTooltip <WithTooltip
content="@user-1, @user-2, @user-3, @user-4, @user-5, @user-6, @user-7, @user-8, @user-9, @user-10"
id="usernames-overflow" id="usernames-overflow"
placement="top"
title="@user-1, @user-2, @user-3, @user-4, @user-5, @user-6, @user-7, @user-8, @user-9, @user-10"
> >
<span <span
className="add-others-link" className="add-others-link"
@@ -476,7 +477,7 @@ exports[`components/channel_invite_modal/team_warning_banner should match snapsh
} }
/> />
</span> </span>
</SimpleTooltip>, </WithTooltip>,
" are guest users and need to first be invited to the team before you can add them to the channel. Once they've joined the team, you can add them to this channel.", " are guest users and need to first be invited to the team before you can add them to the channel. Once they've joined the team, you can add them to this channel.",
] ]
} }
@@ -560,23 +561,17 @@ exports[`components/channel_invite_modal/team_warning_banner should match snapsh
/> />
</Connect(Component)> </Connect(Component)>
and and
<SimpleTooltip <WithTooltip
content="@user-1, @user-2, @user-3, @user-4, @user-5, @user-6, @user-7, @user-8, @user-9, @user-10"
id="usernames-overflow" id="usernames-overflow"
key=".2" key=".2"
placement="top"
title="@user-1, @user-2, @user-3, @user-4, @user-5, @user-6, @user-7, @user-8, @user-9, @user-10"
> >
<OverlayTrigger <OverlayTrigger
defaultOverlayShown={false} defaultOverlayShown={false}
delayShow={100} delay={400}
overlay={ disabled={false}
<Tooltip overlay={<Unknown />}
className="hidden-xs"
id="usernames-overflow"
placement="top"
>
@user-1, @user-2, @user-3, @user-4, @user-5, @user-6, @user-7, @user-8, @user-9, @user-10
</Tooltip>
}
placement="top" placement="top"
trigger={ trigger={
Array [ Array [
@@ -587,11 +582,9 @@ exports[`components/channel_invite_modal/team_warning_banner should match snapsh
> >
<OverlayTrigger <OverlayTrigger
defaultOverlayShown={false} defaultOverlayShown={false}
delayShow={100} delay={400}
overlay={ overlay={
<OverlayWrapper <OverlayWrapper
className="hidden-xs"
id="usernames-overflow"
intl={ intl={
Object { Object {
"$t": [Function], "$t": [Function],
@@ -631,10 +624,7 @@ exports[`components/channel_invite_modal/team_warning_banner should match snapsh
"wrapRichTextChunksInFragment": undefined, "wrapRichTextChunksInFragment": undefined,
} }
} }
placement="top" />
>
@user-1, @user-2, @user-3, @user-4, @user-5, @user-6, @user-7, @user-8, @user-9, @user-10
</OverlayWrapper>
} }
placement="top" placement="top"
trigger={ trigger={
@@ -668,7 +658,7 @@ exports[`components/channel_invite_modal/team_warning_banner should match snapsh
</span> </span>
</OverlayTrigger> </OverlayTrigger>
</OverlayTrigger> </OverlayTrigger>
</SimpleTooltip> </WithTooltip>
are guest users and need to first be invited to the team before you can add them to the channel. Once they've joined the team, you can add them to this channel. are guest users and need to first be invited to the team before you can add them to the channel. Once they've joined the team, you can add them to this channel.
</div> </div>
</div> </div>
@@ -786,9 +776,10 @@ exports[`components/channel_invite_modal/team_warning_banner should match snapsh
mentionName="user-0" mentionName="user-0"
/>, />,
" and ", " and ",
<SimpleTooltip <WithTooltip
content="@user-1, @user-2, @user-3, @user-4, @user-5, @user-6, @user-7, @user-8, @user-9, @user-10"
id="usernames-overflow" id="usernames-overflow"
placement="top"
title="@user-1, @user-2, @user-3, @user-4, @user-5, @user-6, @user-7, @user-8, @user-9, @user-10"
> >
<span <span
className="add-others-link" className="add-others-link"
@@ -803,7 +794,7 @@ exports[`components/channel_invite_modal/team_warning_banner should match snapsh
} }
/> />
</span> </span>
</SimpleTooltip>, </WithTooltip>,
" to this channel once they are members of the ", " to this channel once they are members of the ",
<strong> <strong>
Team Name Display Team Name Display
@@ -890,23 +881,17 @@ exports[`components/channel_invite_modal/team_warning_banner should match snapsh
/> />
</Connect(Component)> </Connect(Component)>
and and
<SimpleTooltip <WithTooltip
content="@user-1, @user-2, @user-3, @user-4, @user-5, @user-6, @user-7, @user-8, @user-9, @user-10"
id="usernames-overflow" id="usernames-overflow"
key=".3" key=".3"
placement="top"
title="@user-1, @user-2, @user-3, @user-4, @user-5, @user-6, @user-7, @user-8, @user-9, @user-10"
> >
<OverlayTrigger <OverlayTrigger
defaultOverlayShown={false} defaultOverlayShown={false}
delayShow={100} delay={400}
overlay={ disabled={false}
<Tooltip overlay={<Unknown />}
className="hidden-xs"
id="usernames-overflow"
placement="top"
>
@user-1, @user-2, @user-3, @user-4, @user-5, @user-6, @user-7, @user-8, @user-9, @user-10
</Tooltip>
}
placement="top" placement="top"
trigger={ trigger={
Array [ Array [
@@ -917,11 +902,9 @@ exports[`components/channel_invite_modal/team_warning_banner should match snapsh
> >
<OverlayTrigger <OverlayTrigger
defaultOverlayShown={false} defaultOverlayShown={false}
delayShow={100} delay={400}
overlay={ overlay={
<OverlayWrapper <OverlayWrapper
className="hidden-xs"
id="usernames-overflow"
intl={ intl={
Object { Object {
"$t": [Function], "$t": [Function],
@@ -961,10 +944,7 @@ exports[`components/channel_invite_modal/team_warning_banner should match snapsh
"wrapRichTextChunksInFragment": undefined, "wrapRichTextChunksInFragment": undefined,
} }
} }
placement="top" />
>
@user-1, @user-2, @user-3, @user-4, @user-5, @user-6, @user-7, @user-8, @user-9, @user-10
</OverlayWrapper>
} }
placement="top" placement="top"
trigger={ trigger={
@@ -998,7 +978,7 @@ exports[`components/channel_invite_modal/team_warning_banner should match snapsh
</span> </span>
</OverlayTrigger> </OverlayTrigger>
</OverlayTrigger> </OverlayTrigger>
</SimpleTooltip> </WithTooltip>
to this channel once they are members of the to this channel once they are members of the
<strong <strong
key=".5" key=".5"

20
webapp/channels/src/components/channel_invite_modal/team_warning_banner/team_warning_banner.tsx
Просмотреть файл

@@ -13,7 +13,7 @@ import {getTeam} from 'mattermost-redux/selectors/entities/teams';
import AlertBanner from 'components/alert_banner'; import AlertBanner from 'components/alert_banner';
import AtMention from 'components/at_mention'; import AtMention from 'components/at_mention';
import type {Value} from 'components/multiselect/multiselect'; import type {Value} from 'components/multiselect/multiselect';
import SimpleTooltip from 'components/widgets/simple_tooltip'; import WithTooltip from 'components/with_tooltip';
type UserProfileValue = Value & UserProfile; type UserProfileValue = Value & UserProfile;
@@ -62,9 +62,10 @@ const TeamWarningBanner = (props: Props) => {
/> />
), ),
others: ( others: (
<SimpleTooltip <WithTooltip
id={'usernames-overflow'} id='usernames-overflow'
content={commaSeparatedUsernames.replace(`@${firstName}, `, '')} title={commaSeparatedUsernames.replace(`@${firstName}, `, '')}
placement='top'
> >
<span <span
className='add-others-link' className='add-others-link'
@@ -77,7 +78,7 @@ const TeamWarningBanner = (props: Props) => {
}} }}
/> />
</span> </span>
</SimpleTooltip> </WithTooltip>
), ),
}, },
) )
@@ -132,9 +133,10 @@ const TeamWarningBanner = (props: Props) => {
/> />
), ),
others: ( others: (
<SimpleTooltip <WithTooltip
id={'usernames-overflow'} id='usernames-overflow'
content={commaSeparatedUsernames.replace(`@${firstName}, `, '')} title={commaSeparatedUsernames.replace(`@${firstName}, `, '')}
placement='top'
> >
<span <span
className='add-others-link' className='add-others-link'
@@ -147,7 +149,7 @@ const TeamWarningBanner = (props: Props) => {
}} }}
/> />
</span> </span>
</SimpleTooltip> </WithTooltip>
), ),
team: (<strong>{team?.display_name}</strong>), team: (<strong>{team?.display_name}</strong>),
}, },