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

Revert "Fix regression around FacePile with overflow (#11527)"
This commit is contained in:
Andy Balaam 2023-09-26 09:49:37 +01:00 committed by GitHub
commit 875fcb1a32
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
29 changed files with 101 additions and 100 deletions

View file

@ -199,7 +199,7 @@ describe("<TextualBody />", () => {
const { container } = getComponent({ mxEvent: ev });
const content = container.querySelector(".mx_EventTile_body");
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>"`,
);
});

View file

@ -83,7 +83,7 @@ exports[`MLocationBody <MLocationBody> without error renders marker correctly fo
class="mx_Marker_border"
>
<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-testid="avatar-img"
data-type="round"

View file

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