PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Merge pull request #11634 from matrix-org/germain-gg/facepile-offset

Browse source 
Revert "Fix regression around FacePile with overflow (#11527)"

(cherry picked from commit 875fcb1a32)
This commit is contained in:
Andy Balaam 2023-09-26 09:49:37 +01:00
parent 45f491e829
commit 50110ba253
29 changed files with 101 additions and 100 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
res/css/views/elements/_FacePile.pcss
View file

@ -15,11 +15,13 @@ limitations under the License.
*/ */
.mx_FacePile_more { .mx_FacePile_more {
/* Needed to calculate the offset on the face pile */
--cpd-avatar-size: 28px;
position: relative; position: relative;
border-radius: 100%; border-radius: 100%;
width: 30px; width: 28px;
height: 30px; height: 28px;
background-color: $spacePanel-bg-color; background-color: $panels;
display: inline-block; display: inline-block;
&::before { &::before {

3
src/components/views/elements/FacePile.tsx
View file

@ -57,9 +57,8 @@ const FacePile: FC<IProps> = ({
const pileContents = ( const pileContents = (
<> <>
{/* XXX: The margin-left is a workaround for Compound's styling excluding this element and being overly specific */}
{overflow ? <span className="mx_FacePile_more" style={{ marginLeft: `calc(${size} * -0.2)` }} /> : null}
{faces} {faces}
{overflow ? <span className="mx_FacePile_more" /> : null}
</> </>
); );

2
test/components/structures/__snapshots__/MessagePanel-test.tsx.snap
View file

@ -95,7 +95,7 @@ exports[`MessagePanel should handle lots of membership events quickly 1`] = `
class="mx_GenericEventListSummary_avatars" class="mx_GenericEventListSummary_avatars"
> >
<span <span
class="_avatar_2lhia_17 mx_BaseAvatar _avatar-imageless_2lhia_56" class="_avatar_ylj7w_17 mx_BaseAvatar _avatar-imageless_ylj7w_56"
data-color="7" data-color="7"
data-testid="avatar-img" data-testid="avatar-img"
data-type="round" data-type="round"

14
test/components/structures/__snapshots__/RoomView-test.tsx.snap
View file

@ -18,7 +18,7 @@ exports[`RoomView for a local room in state CREATING should match the snapshot 1
class="mx_DecoratedRoomAvatar" class="mx_DecoratedRoomAvatar"
> >
<span <span
class="_avatar_2lhia_17 mx_BaseAvatar _avatar-imageless_2lhia_56" class="_avatar_ylj7w_17 mx_BaseAvatar _avatar-imageless_ylj7w_56"
data-color="3" data-color="3"
data-testid="avatar-img" data-testid="avatar-img"
data-type="round" data-type="round"
@ -100,7 +100,7 @@ exports[`RoomView for a local room in state ERROR should match the snapshot 1`]
class="mx_DecoratedRoomAvatar" class="mx_DecoratedRoomAvatar"
> >
<span <span
class="_avatar_2lhia_17 mx_BaseAvatar _avatar-imageless_2lhia_56" class="_avatar_ylj7w_17 mx_BaseAvatar _avatar-imageless_ylj7w_56"
data-color="3" data-color="3"
data-testid="avatar-img" data-testid="avatar-img"
data-type="round" data-type="round"
@ -179,7 +179,7 @@ exports[`RoomView for a local room in state ERROR should match the snapshot 1`]
<button <button
aria-label="Avatar" aria-label="Avatar"
aria-live="off" aria-live="off"
class="_avatar_2lhia_17 mx_BaseAvatar _avatar-imageless_2lhia_56" class="_avatar_ylj7w_17 mx_BaseAvatar _avatar-imageless_ylj7w_56"
data-color="3" data-color="3"
data-testid="avatar-img" data-testid="avatar-img"
data-type="round" data-type="round"
@ -267,7 +267,7 @@ exports[`RoomView for a local room in state NEW should match the snapshot 1`] =
class="mx_DecoratedRoomAvatar" class="mx_DecoratedRoomAvatar"
> >
<span <span
class="_avatar_2lhia_17 mx_BaseAvatar _avatar-imageless_2lhia_56" class="_avatar_ylj7w_17 mx_BaseAvatar _avatar-imageless_ylj7w_56"
data-color="3" data-color="3"
data-testid="avatar-img" data-testid="avatar-img"
data-type="round" data-type="round"
@ -346,7 +346,7 @@ exports[`RoomView for a local room in state NEW should match the snapshot 1`] =
<button <button
aria-label="Avatar" aria-label="Avatar"
aria-live="off" aria-live="off"
class="_avatar_2lhia_17 mx_BaseAvatar _avatar-imageless_2lhia_56" class="_avatar_ylj7w_17 mx_BaseAvatar _avatar-imageless_ylj7w_56"
data-color="3" data-color="3"
data-testid="avatar-img" data-testid="avatar-img"
data-type="round" data-type="round"
@ -509,7 +509,7 @@ exports[`RoomView for a local room in state NEW that is encrypted should match t
class="mx_DecoratedRoomAvatar" class="mx_DecoratedRoomAvatar"
> >
<span <span
class="_avatar_2lhia_17 mx_BaseAvatar _avatar-imageless_2lhia_56" class="_avatar_ylj7w_17 mx_BaseAvatar _avatar-imageless_ylj7w_56"
data-color="3" data-color="3"
data-testid="avatar-img" data-testid="avatar-img"
data-type="round" data-type="round"
@ -587,7 +587,7 @@ exports[`RoomView for a local room in state NEW that is encrypted should match t
<button <button
aria-label="Avatar" aria-label="Avatar"
aria-live="off" aria-live="off"
class="_avatar_2lhia_17 mx_BaseAvatar _avatar-imageless_2lhia_56" class="_avatar_ylj7w_17 mx_BaseAvatar _avatar-imageless_ylj7w_56"
data-color="3" data-color="3"
data-testid="avatar-img" data-testid="avatar-img"
data-type="round" data-type="round"

8
test/components/structures/__snapshots__/SpaceHierarchy-test.tsx.snap
View file

@ -71,7 +71,7 @@ exports[`SpaceHierarchy <SpaceHierarchy /> renders 1`] = `
class="mx_SpaceHierarchy_roomTile_avatar" class="mx_SpaceHierarchy_roomTile_avatar"
> >
<span <span
class="_avatar_2lhia_17 mx_BaseAvatar _avatar-imageless_2lhia_56" class="_avatar_ylj7w_17 mx_BaseAvatar _avatar-imageless_ylj7w_56"
data-color="7" data-color="7"
data-testid="avatar-img" data-testid="avatar-img"
data-type="round" data-type="round"
@ -141,7 +141,7 @@ exports[`SpaceHierarchy <SpaceHierarchy /> renders 1`] = `
class="mx_SpaceHierarchy_roomTile_avatar" class="mx_SpaceHierarchy_roomTile_avatar"
> >
<span <span
class="_avatar_2lhia_17 mx_BaseAvatar _avatar-imageless_2lhia_56" class="_avatar_ylj7w_17 mx_BaseAvatar _avatar-imageless_ylj7w_56"
data-color="8" data-color="8"
data-testid="avatar-img" data-testid="avatar-img"
data-type="round" data-type="round"
@ -212,7 +212,7 @@ exports[`SpaceHierarchy <SpaceHierarchy /> renders 1`] = `
class="mx_SpaceHierarchy_roomTile_avatar" class="mx_SpaceHierarchy_roomTile_avatar"
> >
<span <span
class="_avatar_2lhia_17 mx_BaseAvatar _avatar-imageless_2lhia_56" class="_avatar_ylj7w_17 mx_BaseAvatar _avatar-imageless_ylj7w_56"
data-color="8" data-color="8"
data-testid="avatar-img" data-testid="avatar-img"
data-type="round" data-type="round"
@ -289,7 +289,7 @@ exports[`SpaceHierarchy <SpaceHierarchy /> renders 1`] = `
class="mx_SpaceHierarchy_roomTile_avatar" class="mx_SpaceHierarchy_roomTile_avatar"
> >
<span <span
class="_avatar_2lhia_17 mx_BaseAvatar _avatar-imageless_2lhia_56" class="_avatar_ylj7w_17 mx_BaseAvatar _avatar-imageless_ylj7w_56"
data-color="2" data-color="2"
data-testid="avatar-img" data-testid="avatar-img"
data-type="round" data-type="round"

2
test/components/structures/__snapshots__/UserMenu-test.tsx.snap
View file

@ -18,7 +18,7 @@ exports[`<UserMenu> when rendered should render as expected 1`] = `
class="mx_UserMenu_userAvatar" class="mx_UserMenu_userAvatar"
> >
<span <span
class="_avatar_2lhia_17 mx_BaseAvatar mx_UserMenu_userAvatar_BaseAvatar _avatar-imageless_2lhia_56" class="_avatar_ylj7w_17 mx_BaseAvatar mx_UserMenu_userAvatar_BaseAvatar _avatar-imageless_ylj7w_56"
data-color="2" data-color="2"
data-testid="avatar-img" data-testid="avatar-img"
data-type="round" data-type="round"

6
test/components/views/avatars/__snapshots__/RoomAvatar-test.tsx.snap
View file

@ -3,7 +3,7 @@
exports[`RoomAvatar should render as expected for a DM room 1`] = ` exports[`RoomAvatar should render as expected for a DM room 1`] = `
<div> <div>
<span <span
class="_avatar_2lhia_17 mx_BaseAvatar _avatar-imageless_2lhia_56" class="_avatar_ylj7w_17 mx_BaseAvatar _avatar-imageless_ylj7w_56"
data-color="1" data-color="1"
data-testid="avatar-img" data-testid="avatar-img"
data-type="round" data-type="round"
@ -18,7 +18,7 @@ exports[`RoomAvatar should render as expected for a DM room 1`] = `
exports[`RoomAvatar should render as expected for a LocalRoom 1`] = ` exports[`RoomAvatar should render as expected for a LocalRoom 1`] = `
<div> <div>
<span <span
class="_avatar_2lhia_17 mx_BaseAvatar _avatar-imageless_2lhia_56" class="_avatar_ylj7w_17 mx_BaseAvatar _avatar-imageless_ylj7w_56"
data-color="7" data-color="7"
data-testid="avatar-img" data-testid="avatar-img"
data-type="round" data-type="round"
@ -33,7 +33,7 @@ exports[`RoomAvatar should render as expected for a LocalRoom 1`] = `
exports[`RoomAvatar should render as expected for a Room 1`] = ` exports[`RoomAvatar should render as expected for a Room 1`] = `
<div> <div>
<span <span
class="_avatar_2lhia_17 mx_BaseAvatar _avatar-imageless_2lhia_56" class="_avatar_ylj7w_17 mx_BaseAvatar _avatar-imageless_ylj7w_56"
data-color="2" data-color="2"
data-testid="avatar-img" data-testid="avatar-img"
data-type="round" data-type="round"

2
test/components/views/beacon/__snapshots__/BeaconMarker-test.tsx.snap
View file

@ -11,7 +11,7 @@ exports[`<BeaconMarker /> renders marker when beacon has location 1`] = `
class="mx_Marker_border" class="mx_Marker_border"
> >
<span <span
class="_avatar_2lhia_17 mx_BaseAvatar _avatar-imageless_2lhia_56" class="_avatar_ylj7w_17 mx_BaseAvatar _avatar-imageless_ylj7w_56"
data-color="8" data-color="8"
data-testid="avatar-img" data-testid="avatar-img"
data-type="round" data-type="round"

2
test/components/views/beacon/__snapshots__/BeaconViewDialog-test.tsx.snap
View file

@ -32,7 +32,7 @@ exports[`<BeaconViewDialog /> renders own beacon status when user is live sharin
class="mx_DialogOwnBeaconStatus" class="mx_DialogOwnBeaconStatus"
> >
<span <span
class="_avatar_2lhia_17 mx_BaseAvatar mx_DialogOwnBeaconStatus_avatar _avatar-imageless_2lhia_56" class="_avatar_ylj7w_17 mx_BaseAvatar mx_DialogOwnBeaconStatus_avatar _avatar-imageless_ylj7w_56"
data-color="8" data-color="8"
data-testid="avatar-img" data-testid="avatar-img"
data-type="round" data-type="round"

2
test/components/views/beacon/__snapshots__/DialogSidebar-test.tsx.snap
View file

@ -32,7 +32,7 @@ exports[`<DialogSidebar /> renders sidebar correctly with beacons 1`] = `
class="mx_BeaconListItem" class="mx_BeaconListItem"
> >
<span <span
class="_avatar_2lhia_17 mx_BaseAvatar mx_BeaconListItem_avatar _avatar-imageless_2lhia_56" class="_avatar_ylj7w_17 mx_BaseAvatar mx_BeaconListItem_avatar _avatar-imageless_ylj7w_56"
data-color="1" data-color="1"
data-testid="avatar-img" data-testid="avatar-img"
data-type="round" data-type="round"

2
test/components/views/dialogs/__snapshots__/ConfirmUserActionDialog-test.tsx.snap
View file

@ -41,7 +41,7 @@ exports[`ConfirmUserActionDialog renders 1`] = `
class="mx_ConfirmUserActionDialog_avatar" class="mx_ConfirmUserActionDialog_avatar"
> >
<span <span
class="_avatar_2lhia_17 mx_BaseAvatar _avatar-imageless_2lhia_56" class="_avatar_ylj7w_17 mx_BaseAvatar _avatar-imageless_ylj7w_56"
data-color="7" data-color="7"
data-testid="avatar-img" data-testid="avatar-img"
data-type="round" data-type="round"

2
test/components/views/dialogs/__snapshots__/ManageRestrictedJoinRuleDialog-test.tsx.snap
View file

@ -71,7 +71,7 @@ exports[`<ManageRestrictedJoinRuleDialog /> should list spaces which are not par
<div> <div>
<div> <div>
<span <span
class="_avatar_2lhia_17 mx_BaseAvatar _avatar-imageless_2lhia_56" class="_avatar_ylj7w_17 mx_BaseAvatar _avatar-imageless_ylj7w_56"
data-color="7" data-color="7"
data-testid="avatar-img" data-testid="avatar-img"
data-type="round" data-type="round"

14
test/components/views/elements/__snapshots__/AppTile-test.tsx.snap
View file

@ -104,7 +104,7 @@ exports[`AppTile for a pinned widget should render 1`] = `
<span> <span>
<span <span
aria-label="Avatar" aria-label="Avatar"
class="_avatar_2lhia_17 mx_BaseAvatar mx_WidgetAvatar" class="_avatar_ylj7w_17 mx_BaseAvatar mx_WidgetAvatar"
data-color="1" data-color="1"
data-testid="avatar-img" data-testid="avatar-img"
data-type="round" data-type="round"
@ -112,7 +112,7 @@ exports[`AppTile for a pinned widget should render 1`] = `
> >
<img <img
alt="" alt=""
class="_image_2lhia_45" class="_image_ylj7w_45"
crossorigin="anonymous" crossorigin="anonymous"
data-type="round" data-type="round"
height="20px" height="20px"
@ -191,7 +191,7 @@ exports[`AppTile for a pinned widget should render permission request 1`] = `
<span> <span>
<span <span
aria-label="Avatar" aria-label="Avatar"
class="_avatar_2lhia_17 mx_BaseAvatar mx_WidgetAvatar" class="_avatar_ylj7w_17 mx_BaseAvatar mx_WidgetAvatar"
data-color="1" data-color="1"
data-testid="avatar-img" data-testid="avatar-img"
data-type="round" data-type="round"
@ -199,7 +199,7 @@ exports[`AppTile for a pinned widget should render permission request 1`] = `
> >
<img <img
alt="" alt=""
class="_image_2lhia_45" class="_image_ylj7w_45"
crossorigin="anonymous" crossorigin="anonymous"
data-type="round" data-type="round"
height="20px" height="20px"
@ -269,7 +269,7 @@ exports[`AppTile for a pinned widget should render permission request 1`] = `
</div> </div>
<div> <div>
<span <span
class="_avatar_2lhia_17 mx_BaseAvatar _avatar-imageless_2lhia_56" class="_avatar_ylj7w_17 mx_BaseAvatar _avatar-imageless_ylj7w_56"
data-color="1" data-color="1"
data-testid="avatar-img" data-testid="avatar-img"
data-type="round" data-type="round"
@ -345,7 +345,7 @@ exports[`AppTile preserves non-persisted widget on container move 1`] = `
<span> <span>
<span <span
aria-label="Avatar" aria-label="Avatar"
class="_avatar_2lhia_17 mx_BaseAvatar mx_WidgetAvatar" class="_avatar_ylj7w_17 mx_BaseAvatar mx_WidgetAvatar"
data-color="1" data-color="1"
data-testid="avatar-img" data-testid="avatar-img"
data-type="round" data-type="round"
@ -353,7 +353,7 @@ exports[`AppTile preserves non-persisted widget on container move 1`] = `
> >
<img <img
alt="" alt=""
class="_image_2lhia_45" class="_image_ylj7w_45"
crossorigin="anonymous" crossorigin="anonymous"
data-type="round" data-type="round"
height="20px" height="20px"

4
test/components/views/elements/__snapshots__/FacePile-test.tsx.snap
View file

@ -7,10 +7,10 @@ exports[`<FacePile /> renders with a tooltip 1`] = `
data-state="closed" data-state="closed"
> >
<div <div
class="_stacked-avatars_2lhia_116" class="_stacked-avatars_ylj7w_116"
> >
<span <span
class="_avatar_2lhia_17 mx_BaseAvatar _avatar-imageless_2lhia_56" class="_avatar_ylj7w_17 mx_BaseAvatar _avatar-imageless_ylj7w_56"
data-color="8" data-color="8"
data-testid="avatar-img" data-testid="avatar-img"
data-type="round" data-type="round"

16
test/components/views/elements/__snapshots__/Pill-test.tsx.snap
View file

@ -35,7 +35,7 @@ exports[`<Pill> should render the expected pill for @room 1`] = `
> >
<span <span
aria-hidden="true" aria-hidden="true"
class="_avatar_2lhia_17 mx_BaseAvatar _avatar-imageless_2lhia_56" class="_avatar_ylj7w_17 mx_BaseAvatar _avatar-imageless_ylj7w_56"
data-color="3" data-color="3"
data-testid="avatar-img" data-testid="avatar-img"
data-type="round" data-type="round"
@ -66,7 +66,7 @@ exports[`<Pill> should render the expected pill for a known user not in the room
> >
<span <span
aria-hidden="true" aria-hidden="true"
class="_avatar_2lhia_17 mx_BaseAvatar _avatar-imageless_2lhia_56" class="_avatar_ylj7w_17 mx_BaseAvatar _avatar-imageless_ylj7w_56"
data-color="5" data-color="5"
data-testid="avatar-img" data-testid="avatar-img"
data-type="round" data-type="round"
@ -97,7 +97,7 @@ exports[`<Pill> should render the expected pill for a message in another room 1`
> >
<span <span
aria-hidden="true" aria-hidden="true"
class="_avatar_2lhia_17 mx_BaseAvatar _avatar-imageless_2lhia_56" class="_avatar_ylj7w_17 mx_BaseAvatar _avatar-imageless_ylj7w_56"
data-color="3" data-color="3"
data-testid="avatar-img" data-testid="avatar-img"
data-type="round" data-type="round"
@ -128,7 +128,7 @@ exports[`<Pill> should render the expected pill for a message in the same room 1
> >
<span <span
aria-hidden="true" aria-hidden="true"
class="_avatar_2lhia_17 mx_BaseAvatar _avatar-imageless_2lhia_56" class="_avatar_ylj7w_17 mx_BaseAvatar _avatar-imageless_ylj7w_56"
data-color="4" data-color="4"
data-testid="avatar-img" data-testid="avatar-img"
data-type="round" data-type="round"
@ -159,7 +159,7 @@ exports[`<Pill> should render the expected pill for a room alias 1`] = `
> >
<span <span
aria-hidden="true" aria-hidden="true"
class="_avatar_2lhia_17 mx_BaseAvatar _avatar-imageless_2lhia_56" class="_avatar_ylj7w_17 mx_BaseAvatar _avatar-imageless_ylj7w_56"
data-color="3" data-color="3"
data-testid="avatar-img" data-testid="avatar-img"
data-type="round" data-type="round"
@ -190,7 +190,7 @@ exports[`<Pill> should render the expected pill for a space 1`] = `
> >
<span <span
aria-hidden="true" aria-hidden="true"
class="_avatar_2lhia_17 mx_BaseAvatar _avatar-imageless_2lhia_56" class="_avatar_ylj7w_17 mx_BaseAvatar _avatar-imageless_ylj7w_56"
data-color="2" data-color="2"
data-testid="avatar-img" data-testid="avatar-img"
data-type="round" data-type="round"
@ -244,7 +244,7 @@ exports[`<Pill> when rendering a pill for a room should render the expected pill
> >
<span <span
aria-hidden="true" aria-hidden="true"
class="_avatar_2lhia_17 mx_BaseAvatar _avatar-imageless_2lhia_56" class="_avatar_ylj7w_17 mx_BaseAvatar _avatar-imageless_ylj7w_56"
data-color="3" data-color="3"
data-testid="avatar-img" data-testid="avatar-img"
data-type="round" data-type="round"
@ -275,7 +275,7 @@ exports[`<Pill> when rendering a pill for a user in the room should render as ex
> >
<span <span
aria-hidden="true" aria-hidden="true"
class="_avatar_2lhia_17 mx_BaseAvatar _avatar-imageless_2lhia_56" class="_avatar_ylj7w_17 mx_BaseAvatar _avatar-imageless_ylj7w_56"
data-color="4" data-color="4"
data-testid="avatar-img" data-testid="avatar-img"
data-type="round" data-type="round"

4
test/components/views/elements/__snapshots__/RoomFacePile-test.tsx.snap
View file

@ -7,10 +7,10 @@ exports[`<RoomFacePile /> renders 1`] = `
data-state="closed" data-state="closed"
> >
<div <div
class="_stacked-avatars_2lhia_116" class="_stacked-avatars_ylj7w_116"
> >
<span <span
class="_avatar_2lhia_17 mx_BaseAvatar _avatar-imageless_2lhia_56" class="_avatar_ylj7w_17 mx_BaseAvatar _avatar-imageless_ylj7w_56"
data-color="8" data-color="8"
data-testid="avatar-img" data-testid="avatar-img"
data-type="round" data-type="round"

2
test/components/views/messages/TextualBody-test.tsx
View file

@ -199,7 +199,7 @@ describe("<TextualBody />", () => {
const { container } = getComponent({ mxEvent: ev }); const { container } = getComponent({ mxEvent: ev });
const content = container.querySelector(".mx_EventTile_body"); const content = container.querySelector(".mx_EventTile_body");
expect(content.innerHTML).toMatchInlineSnapshot( expect(content.innerHTML).toMatchInlineSnapshot(
`"Chat with <span><bdi><a class="mx_Pill mx_UserPill mx_UserPill_me" href="https://matrix.to/#/@user:example.com" aria-describedby="mx_Pill_0.123456"><span aria-label="Profile picture" aria-hidden="true" data-testid="avatar-img" data-type="round" data-color="8" class="_avatar_2lhia_17 mx_BaseAvatar" style="--cpd-avatar-size: 16px;"><img loading="lazy" alt="" src="mxc://avatar.url/image.png" crossorigin="anonymous" referrerpolicy="no-referrer" class="_image_2lhia_45" data-type="round" width="16px" height="16px"></span><span class="mx_Pill_text">Member</span></a></bdi></span>"`, `"Chat with <span><bdi><a class="mx_Pill mx_UserPill mx_UserPill_me" href="https://matrix.to/#/@user:example.com" aria-describedby="mx_Pill_0.123456"><span aria-label="Profile picture" aria-hidden="true" data-testid="avatar-img" data-type="round" data-color="8" class="_avatar_ylj7w_17 mx_BaseAvatar" style="--cpd-avatar-size: 16px;"><img loading="lazy" alt="" src="mxc://avatar.url/image.png" crossorigin="anonymous" referrerpolicy="no-referrer" class="_image_ylj7w_45" data-type="round" width="16px" height="16px"></span><span class="mx_Pill_text">Member</span></a></bdi></span>"`,
); );
}); });

2
test/components/views/messages/__snapshots__/MLocationBody-test.tsx.snap
View file

@ -83,7 +83,7 @@ exports[`MLocationBody <MLocationBody> without error renders marker correctly fo
class="mx_Marker_border" class="mx_Marker_border"
> >
<span <span
class="_avatar_2lhia_17 mx_BaseAvatar _avatar-imageless_2lhia_56" class="_avatar_ylj7w_17 mx_BaseAvatar _avatar-imageless_ylj7w_56"
data-color="1" data-color="1"
data-testid="avatar-img" data-testid="avatar-img"
data-type="round" data-type="round"

24
test/components/views/messages/__snapshots__/TextualBody-test.tsx.snap
View file

@ -57,7 +57,7 @@ exports[`<TextualBody /> renders formatted m.text correctly pills appear for an
<span <span
aria-hidden="true" aria-hidden="true"
aria-label="Profile picture" aria-label="Profile picture"
class="_avatar_2lhia_17 mx_BaseAvatar" class="_avatar_ylj7w_17 mx_BaseAvatar"
data-color="8" data-color="8"
data-testid="avatar-img" data-testid="avatar-img"
data-type="round" data-type="round"
@ -65,7 +65,7 @@ exports[`<TextualBody /> renders formatted m.text correctly pills appear for an
> >
<img <img
alt="" alt=""
class="_image_2lhia_45" class="_image_ylj7w_45"
crossorigin="anonymous" crossorigin="anonymous"
data-type="round" data-type="round"
height="16px" height="16px"
@ -106,7 +106,7 @@ exports[`<TextualBody /> renders formatted m.text correctly pills appear for eve
<span <span
aria-hidden="true" aria-hidden="true"
aria-label="Avatar" aria-label="Avatar"
class="_avatar_2lhia_17 mx_BaseAvatar" class="_avatar_ylj7w_17 mx_BaseAvatar"
data-color="3" data-color="3"
data-testid="avatar-img" data-testid="avatar-img"
data-type="round" data-type="round"
@ -114,7 +114,7 @@ exports[`<TextualBody /> renders formatted m.text correctly pills appear for eve
> >
<img <img
alt="" alt=""
class="_image_2lhia_45" class="_image_ylj7w_45"
crossorigin="anonymous" crossorigin="anonymous"
data-type="round" data-type="round"
height="16px" height="16px"
@ -157,7 +157,7 @@ exports[`<TextualBody /> renders formatted m.text correctly pills appear for roo
<span <span
aria-hidden="true" aria-hidden="true"
aria-label="Avatar" aria-label="Avatar"
class="_avatar_2lhia_17 mx_BaseAvatar" class="_avatar_ylj7w_17 mx_BaseAvatar"
data-color="3" data-color="3"
data-testid="avatar-img" data-testid="avatar-img"
data-type="round" data-type="round"
@ -165,7 +165,7 @@ exports[`<TextualBody /> renders formatted m.text correctly pills appear for roo
> >
<img <img
alt="" alt=""
class="_image_2lhia_45" class="_image_ylj7w_45"
crossorigin="anonymous" crossorigin="anonymous"
data-type="round" data-type="round"
height="16px" height="16px"
@ -267,7 +267,7 @@ exports[`<TextualBody /> renders formatted m.text correctly pills get injected c
<span <span
aria-hidden="true" aria-hidden="true"
aria-label="Profile picture" aria-label="Profile picture"
class="_avatar_2lhia_17 mx_BaseAvatar" class="_avatar_ylj7w_17 mx_BaseAvatar"
data-color="8" data-color="8"
data-testid="avatar-img" data-testid="avatar-img"
data-type="round" data-type="round"
@ -275,7 +275,7 @@ exports[`<TextualBody /> renders formatted m.text correctly pills get injected c
> >
<img <img
alt="" alt=""
class="_image_2lhia_45" class="_image_ylj7w_45"
crossorigin="anonymous" crossorigin="anonymous"
data-type="round" data-type="round"
height="16px" height="16px"
@ -310,7 +310,7 @@ exports[`<TextualBody /> renders plain-text m.text correctly should pillify a pe
data-testid="avatar-img" data-testid="avatar-img"
data-type="round" data-type="round"
data-color="8" data-color="8"
class="_avatar_2lhia_17 mx_BaseAvatar" class="_avatar_ylj7w_17 mx_BaseAvatar"
style="--cpd-avatar-size: 16px" style="--cpd-avatar-size: 16px"
><img ><img
loading="lazy" loading="lazy"
@ -318,7 +318,7 @@ exports[`<TextualBody /> renders plain-text m.text correctly should pillify a pe
src="mxc://avatar.url/image.png" src="mxc://avatar.url/image.png"
crossorigin="anonymous" crossorigin="anonymous"
referrerpolicy="no-referrer" referrerpolicy="no-referrer"
class="_image_2lhia_45" class="_image_ylj7w_45"
data-type="round" data-type="round"
width="16px" width="16px"
height="16px" /></span height="16px" /></span
@ -343,7 +343,7 @@ exports[`<TextualBody /> renders plain-text m.text correctly should pillify a pe
data-testid="avatar-img" data-testid="avatar-img"
data-type="round" data-type="round"
data-color="4" data-color="4"
class="_avatar_2lhia_17 mx_BaseAvatar" class="_avatar_ylj7w_17 mx_BaseAvatar"
style="--cpd-avatar-size: 16px" style="--cpd-avatar-size: 16px"
><img ><img
loading="lazy" loading="lazy"
@ -351,7 +351,7 @@ exports[`<TextualBody /> renders plain-text m.text correctly should pillify a pe
src="mxc://avatar.url/room.png" src="mxc://avatar.url/room.png"
crossorigin="anonymous" crossorigin="anonymous"
referrerpolicy="no-referrer" referrerpolicy="no-referrer"
class="_image_2lhia_45" class="_image_ylj7w_45"
data-type="round" data-type="round"
width="16px" width="16px"
height="16px" /></span height="16px" /></span

2
test/components/views/right_panel/__snapshots__/RoomSummaryCard-test.tsx.snap
View file

@ -20,7 +20,7 @@ exports[`<RoomSummaryCard /> renders the room summary 1`] = `
role="presentation" role="presentation"
> >
<span <span
class="_avatar_2lhia_17 mx_BaseAvatar _avatar-imageless_2lhia_56" class="_avatar_ylj7w_17 mx_BaseAvatar _avatar-imageless_ylj7w_56"
data-color="7" data-color="7"
data-testid="avatar-img" data-testid="avatar-img"
data-type="round" data-type="round"

2
test/components/views/right_panel/__snapshots__/UserInfo-test.tsx.snap
View file

@ -96,7 +96,7 @@ exports[`<UserInfo /> with crypto enabled renders <BasicUserInfo /> 1`] = `
<button <button
aria-label="Profile picture" aria-label="Profile picture"
aria-live="off" aria-live="off"
class="_avatar_2lhia_17 mx_BaseAvatar _avatar-imageless_2lhia_56" class="_avatar_ylj7w_17 mx_BaseAvatar _avatar-imageless_ylj7w_56"
data-color="3" data-color="3"
data-testid="avatar-img" data-testid="avatar-img"
data-type="round" data-type="round"

2
test/components/views/rooms/__snapshots__/PinnedEventTile-test.tsx.snap
View file

@ -6,7 +6,7 @@ exports[`<PinnedEventTile /> should render pinned event 1`] = `
class="mx_PinnedEventTile" class="mx_PinnedEventTile"
> >
<span <span
class="_avatar_2lhia_17 mx_BaseAvatar mx_PinnedEventTile_senderAvatar _avatar-imageless_2lhia_56" class="_avatar_ylj7w_17 mx_BaseAvatar mx_PinnedEventTile_senderAvatar _avatar-imageless_ylj7w_56"
data-color="6" data-color="6"
data-testid="avatar-img" data-testid="avatar-img"
data-type="round" data-type="round"

8
test/components/views/rooms/__snapshots__/RoomHeader-test.tsx.snap
View file

@ -7,7 +7,7 @@ exports[`RoomHeader does not show the face pile for DMs 1`] = `
style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: start; --mx-flex-gap: var(--cpd-space-3x);" style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: start; --mx-flex-gap: var(--cpd-space-3x);"
> >
<span <span
class="_avatar_2lhia_17 mx_BaseAvatar _avatar-imageless_2lhia_56" class="_avatar_ylj7w_17 mx_BaseAvatar _avatar-imageless_ylj7w_56"
data-color="7" data-color="7"
data-testid="avatar-img" data-testid="avatar-img"
data-type="round" data-type="round"
@ -36,7 +36,7 @@ exports[`RoomHeader does not show the face pile for DMs 1`] = `
> >
<button <button
aria-label="There's no one here to call" aria-label="There's no one here to call"
class="_icon-button_1segd_17" class="_icon-button_9uxnz_17"
data-state="closed" data-state="closed"
disabled="" disabled=""
style="--cpd-icon-button-size: 32px;" style="--cpd-icon-button-size: 32px;"
@ -45,7 +45,7 @@ exports[`RoomHeader does not show the face pile for DMs 1`] = `
</button> </button>
<button <button
aria-label="There's no one here to call" aria-label="There's no one here to call"
class="_icon-button_1segd_17" class="_icon-button_9uxnz_17"
data-state="closed" data-state="closed"
disabled="" disabled=""
style="--cpd-icon-button-size: 32px;" style="--cpd-icon-button-size: 32px;"
@ -54,7 +54,7 @@ exports[`RoomHeader does not show the face pile for DMs 1`] = `
</button> </button>
<button <button
aria-label="Threads" aria-label="Threads"
class="_icon-button_1segd_17" class="_icon-button_9uxnz_17"
data-state="closed" data-state="closed"
style="--cpd-icon-button-size: 32px;" style="--cpd-icon-button-size: 32px;"
> >

10
test/components/views/rooms/__snapshots__/RoomPreviewBar-test.tsx.snap
View file

@ -23,7 +23,7 @@ exports[`<RoomPreviewBar /> message case AskToJoin renders the corresponding mes
</h3> </h3>
<p> <p>
<span <span
class="_avatar_2lhia_17 mx_BaseAvatar _avatar-imageless_2lhia_56" class="_avatar_ylj7w_17 mx_BaseAvatar _avatar-imageless_ylj7w_56"
data-color="4" data-color="4"
data-testid="avatar-img" data-testid="avatar-img"
data-type="round" data-type="round"
@ -48,7 +48,7 @@ exports[`<RoomPreviewBar /> message case AskToJoin renders the corresponding mes
</h3> </h3>
<p> <p>
<span <span
class="_avatar_2lhia_17 mx_BaseAvatar _avatar-imageless_2lhia_56" class="_avatar_ylj7w_17 mx_BaseAvatar _avatar-imageless_ylj7w_56"
data-color="1" data-color="1"
data-testid="avatar-img" data-testid="avatar-img"
data-type="round" data-type="round"
@ -227,7 +227,7 @@ exports[`<RoomPreviewBar /> with an invite with an invited email when client has
</h3> </h3>
<p> <p>
<span <span
class="_avatar_2lhia_17 mx_BaseAvatar _avatar-imageless_2lhia_56" class="_avatar_ylj7w_17 mx_BaseAvatar _avatar-imageless_ylj7w_56"
data-color="4" data-color="4"
data-testid="avatar-img" data-testid="avatar-img"
data-type="round" data-type="round"
@ -285,7 +285,7 @@ exports[`<RoomPreviewBar /> with an invite without an invited email for a dm roo
</h3> </h3>
<p> <p>
<span <span
class="_avatar_2lhia_17 mx_BaseAvatar _avatar-imageless_2lhia_56" class="_avatar_ylj7w_17 mx_BaseAvatar _avatar-imageless_ylj7w_56"
data-color="4" data-color="4"
data-testid="avatar-img" data-testid="avatar-img"
data-type="round" data-type="round"
@ -350,7 +350,7 @@ exports[`<RoomPreviewBar /> with an invite without an invited email for a non-dm
</h3> </h3>
<p> <p>
<span <span
class="_avatar_2lhia_17 mx_BaseAvatar _avatar-imageless_2lhia_56" class="_avatar_ylj7w_17 mx_BaseAvatar _avatar-imageless_ylj7w_56"
data-color="4" data-color="4"
data-testid="avatar-img" data-testid="avatar-img"
data-type="round" data-type="round"

8
test/components/views/rooms/__snapshots__/RoomTile-test.tsx.snap
View file

@ -14,7 +14,7 @@ exports[`RoomTile when message previews are enabled and there is a message in a
class="mx_DecoratedRoomAvatar" class="mx_DecoratedRoomAvatar"
> >
<span <span
class="_avatar_2lhia_17 mx_BaseAvatar _avatar-imageless_2lhia_56" class="_avatar_ylj7w_17 mx_BaseAvatar _avatar-imageless_ylj7w_56"
data-color="7" data-color="7"
data-testid="avatar-img" data-testid="avatar-img"
data-type="round" data-type="round"
@ -88,7 +88,7 @@ exports[`RoomTile when message previews are enabled and there is a message in th
class="mx_DecoratedRoomAvatar" class="mx_DecoratedRoomAvatar"
> >
<span <span
class="_avatar_2lhia_17 mx_BaseAvatar _avatar-imageless_2lhia_56" class="_avatar_ylj7w_17 mx_BaseAvatar _avatar-imageless_ylj7w_56"
data-color="7" data-color="7"
data-testid="avatar-img" data-testid="avatar-img"
data-type="round" data-type="round"
@ -162,7 +162,7 @@ exports[`RoomTile when message previews are enabled should render a room without
class="mx_DecoratedRoomAvatar" class="mx_DecoratedRoomAvatar"
> >
<span <span
class="_avatar_2lhia_17 mx_BaseAvatar _avatar-imageless_2lhia_56" class="_avatar_ylj7w_17 mx_BaseAvatar _avatar-imageless_ylj7w_56"
data-color="7" data-color="7"
data-testid="avatar-img" data-testid="avatar-img"
data-type="round" data-type="round"
@ -224,7 +224,7 @@ exports[`RoomTile when message previews are not enabled should render the room 1
class="mx_DecoratedRoomAvatar" class="mx_DecoratedRoomAvatar"
> >
<span <span
class="_avatar_2lhia_17 mx_BaseAvatar _avatar-imageless_2lhia_56" class="_avatar_ylj7w_17 mx_BaseAvatar _avatar-imageless_ylj7w_56"
data-color="7" data-color="7"
data-testid="avatar-img" data-testid="avatar-img"
data-type="round" data-type="round"

6
test/components/views/settings/tabs/room/__snapshots__/PeopleRoomSettingsTab-test.tsx.snap
View file

@ -17,7 +17,7 @@ exports[`PeopleRoomSettingsTab with requests to join renders requests fully 1`]
> >
<span <span
aria-label="Profile picture" aria-label="Profile picture"
class="_avatar_2lhia_17 mx_BaseAvatar mx_PeopleRoomSettingsTab_avatar" class="_avatar_ylj7w_17 mx_BaseAvatar mx_PeopleRoomSettingsTab_avatar"
data-color="4" data-color="4"
data-testid="avatar-img" data-testid="avatar-img"
data-type="round" data-type="round"
@ -26,7 +26,7 @@ exports[`PeopleRoomSettingsTab with requests to join renders requests fully 1`]
> >
<img <img
alt="" alt=""
class="_image_2lhia_45" class="_image_ylj7w_45"
crossorigin="anonymous" crossorigin="anonymous"
data-type="round" data-type="round"
height="42px" height="42px"
@ -110,7 +110,7 @@ exports[`PeopleRoomSettingsTab with requests to join renders requests reduced 1`
class="mx_PeopleRoomSettingsTab_knock" class="mx_PeopleRoomSettingsTab_knock"
> >
<span <span
class="_avatar_2lhia_17 mx_BaseAvatar mx_PeopleRoomSettingsTab_avatar _avatar-imageless_2lhia_56" class="_avatar_ylj7w_17 mx_BaseAvatar mx_PeopleRoomSettingsTab_avatar _avatar-imageless_ylj7w_56"
data-color="4" data-color="4"
data-testid="avatar-img" data-testid="avatar-img"
data-type="round" data-type="round"

4
test/components/views/spaces/__snapshots__/AddExistingToSpaceDialog-test.tsx.snap
View file

@ -26,7 +26,7 @@ exports[`<AddExistingToSpaceDialog /> looks as expected 1`] = `
> >
<span <span
aria-label="Avatar" aria-label="Avatar"
class="_avatar_2lhia_17 mx_BaseAvatar" class="_avatar_ylj7w_17 mx_BaseAvatar"
data-color="6" data-color="6"
data-testid="avatar-img" data-testid="avatar-img"
data-type="square" data-type="square"
@ -34,7 +34,7 @@ exports[`<AddExistingToSpaceDialog /> looks as expected 1`] = `
> >
<img <img
alt="" alt=""
class="_image_2lhia_45" class="_image_ylj7w_45"
crossorigin="anonymous" crossorigin="anonymous"
data-type="square" data-type="square"
height="40px" height="40px"

6
test/utils/exportUtils/__snapshots__/HTMLExport-test.ts.snap
View file

File diff suppressed because one or more lines are too long

34
yarn.lock
View file

@ -1474,20 +1474,20 @@
resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.48.0.tgz#642633964e217905436033a2bd08bf322849b7fb" resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.48.0.tgz#642633964e217905436033a2bd08bf322849b7fb"
integrity sha512-ZSjtmelB7IJfWD2Fvb7+Z+ChTIKWq6kjda95fLcQKNS5aheVHn4IkfgRQE3sIIzTcSLwLcLZUD9UBt+V7+h+Pw== integrity sha512-ZSjtmelB7IJfWD2Fvb7+Z+ChTIKWq6kjda95fLcQKNS5aheVHn4IkfgRQE3sIIzTcSLwLcLZUD9UBt+V7+h+Pw==
"@floating-ui/core@^1.4.1": "@floating-ui/core@^1.4.2":
version "1.4.1" version "1.5.0"
resolved "https://registry.yarnpkg.com/@floating-ui/core/-/core-1.4.1.tgz#0d633f4b76052668afb932492ac452f7ebe97f17" resolved "https://registry.yarnpkg.com/@floating-ui/core/-/core-1.5.0.tgz#5c05c60d5ae2d05101c3021c1a2a350ddc027f8c"
integrity sha512-jk3WqquEJRlcyu7997NtR5PibI+y5bi+LS3hPmguVClypenMsCY3CBa3LAQnozRCtCrYWSEtAdiskpamuJRFOQ== integrity sha512-kK1h4m36DQ0UHGj5Ah4db7R0rHemTqqO0QLvUqi1/mUUp3LuAWbWxdxSIf/XsnH9VS6rRVPLJCncjRzUvyCLXg==
dependencies: dependencies:
"@floating-ui/utils" "^0.1.1" "@floating-ui/utils" "^0.1.3"
"@floating-ui/dom@^1.5.1": "@floating-ui/dom@^1.5.1":
version "1.5.1" version "1.5.3"
resolved "https://registry.yarnpkg.com/@floating-ui/dom/-/dom-1.5.1.tgz#88b70defd002fe851f17b4a25efb2d3c04d7a8d7" resolved "https://registry.yarnpkg.com/@floating-ui/dom/-/dom-1.5.3.tgz#54e50efcb432c06c23cd33de2b575102005436fa"
integrity sha512-KwvVcPSXg6mQygvA1TjbN/gh///36kKtllIF8SUm0qpFj8+rvYrpvlYdL1JoA71SHpDqgSSdGOSoQ0Mp3uY5aw== integrity sha512-ClAbQnEqJAKCJOEbbLo5IUlZHkNszqhuxS4fHAVxRPXPya6Ysf2G8KypnYcOTpx6I8xcgF9bbHb6g/2KpbV8qA==
dependencies: dependencies:
"@floating-ui/core" "^1.4.1" "@floating-ui/core" "^1.4.2"
"@floating-ui/utils" "^0.1.1" "@floating-ui/utils" "^0.1.3"
"@floating-ui/react-dom@^2.0.0": "@floating-ui/react-dom@^2.0.0":
version "2.0.2" version "2.0.2"
@ -1496,10 +1496,10 @@
dependencies: dependencies:
"@floating-ui/dom" "^1.5.1" "@floating-ui/dom" "^1.5.1"
"@floating-ui/utils@^0.1.1": "@floating-ui/utils@^0.1.3":
version "0.1.1" version "0.1.4"
resolved "https://registry.yarnpkg.com/@floating-ui/utils/-/utils-0.1.1.tgz#1a5b1959a528e374e8037c4396c3e825d6cf4a83" resolved "https://registry.yarnpkg.com/@floating-ui/utils/-/utils-0.1.4.tgz#19654d1026cc410975d46445180e70a5089b3e7d"
integrity sha512-m0G6wlnhm/AX0H12IOWtK8gASEMffnX08RtKkCgTdHb9JpHKGloI7icFfLg9ZmQeavcvR0PKmzxClyuFPSjKWw== integrity sha512-qprfWkn82Iw821mcKofJ5Pk9wgioHicxcQMxx+5zt5GSKoqdWvgG5AxVmpmUUjzTLPVSH5auBrhI93Deayn/DA==
"@humanwhocodes/config-array@^0.11.10": "@humanwhocodes/config-array@^0.11.10":
version "0.11.10" version "0.11.10"
@ -3116,9 +3116,9 @@
svg2vectordrawable "^2.9.1" svg2vectordrawable "^2.9.1"
"@vector-im/compound-web@^0.4.0": "@vector-im/compound-web@^0.4.0":
version "0.4.0" version "0.4.3"
resolved "https://registry.yarnpkg.com/@vector-im/compound-web/-/compound-web-0.4.0.tgz#c4adf10785722c4b0fd5e20e72576ade2ef386d0" resolved "https://registry.yarnpkg.com/@vector-im/compound-web/-/compound-web-0.4.3.tgz#a6f692b8b1668212f06456ff46e1854cc382bfd2"
integrity sha512-45pshpwpVBwOwIevKZrnWX718Z+qPvxnrSUv3KY4x4ej+PDMt8Qorxv1n98bB7fgF7vwBHK5PQdjq2kTFit+wQ== integrity sha512-MFBAX92mh0xDtmL0UoZkZTvtSQXC9w5vpGVWOXoaFHdw8QKg8XbVE7zwCEcYkON7x1kT1kue32Vof7G3Wlufow==
dependencies: dependencies:
"@radix-ui/react-form" "^0.0.3" "@radix-ui/react-form" "^0.0.3"
"@radix-ui/react-tooltip" "^1.0.6" "@radix-ui/react-tooltip" "^1.0.6"