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

Replace UserInfo avatar with <MemberAvatar/> for fallback logic

Browse source
This commit is contained in:
Michael Telatynski 2019-12-19 09:06:52 +00:00
parent f30e919f9e
commit 3196655524
2 changed files with 28 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
res/css/views/right_panel/_UserInfo.scss
View file

@ -63,7 +63,6 @@ limitations under the License.
.mx_UserInfo_avatar { .mx_UserInfo_avatar {
margin: 24px 32px 0 32px; margin: 24px 32px 0 32px;
cursor: pointer;
} }
.mx_UserInfo_avatar > div { .mx_UserInfo_avatar > div {
@ -71,18 +70,23 @@ limitations under the License.
margin: 0 auto; margin: 0 auto;
} }
.mx_UserInfo_avatar > div > div { .mx_UserInfo_avatar > div * {
/* use padding-top instead of height to make this element square, /* use padding-top instead of height to make this element square,
as the % in padding is a % of the width (including margin, as the % in padding is a % of the width (including margin,
that's why we had to put the margin to center on a parent div), that's why we had to put the margin to center on a parent div),
and not a % of the parent height. */ and not a % of the parent height. */
padding-top: 100%; width: 30vh;
height: 0; height: 30vh;
object-fit: cover;
border-radius: 100%; border-radius: 100%;
box-sizing: content-box; box-sizing: content-box;
background-repeat: no-repeat; }
background-size: cover;
background-position: center; // override the calculated sizes so that the letter isn't HUGE
.mx_UserInfo_avatar > div .mx_BaseAvatar_initial {
font-size: 26px !important;
width: 30vh !important;
line-height: 30vh !important;
} }
.mx_UserInfo_avatar .mx_BaseAvatar.mx_BaseAvatar_image { .mx_UserInfo_avatar .mx_BaseAvatar.mx_BaseAvatar_image {

40
src/components/views/right_panel/UserInfo.js
View file

@ -1051,16 +1051,9 @@ const UserInfo = withLegacyMatrixClient(({matrixClient: cli, user, groupId, room
} }
}, [cli, user.userId]); }, [cli, user.userId]);
const onMemberAvatarKey = e => {
if (e.key === "Enter") {
onMemberAvatarClick();
}
};
const onMemberAvatarClick = useCallback(() => { const onMemberAvatarClick = useCallback(() => {
const member = user; const member = user;
const avatarUrl = member.getMxcAvatarUrl(); const avatarUrl = member.getMxcAvatarUrl ? member.getMxcAvatarUrl() : member.avatarUrl;
if (!avatarUrl) return; if (!avatarUrl) return;
const httpUrl = cli.mxcUrlToHttp(avatarUrl); const httpUrl = cli.mxcUrlToHttp(avatarUrl);
@ -1158,21 +1151,22 @@ const UserInfo = withLegacyMatrixClient(({matrixClient: cli, user, groupId, room
statusLabel = <span className="mx_UserInfo_statusMessage">{ statusMessage }</span>; statusLabel = <span className="mx_UserInfo_statusMessage">{ statusMessage }</span>;
} }
const avatarUrl = user.getMxcAvatarUrl ? user.getMxcAvatarUrl() : user.avatarUrl; // const avatarUrl = user.getMxcAvatarUrl ? user.getMxcAvatarUrl() : user.avatarUrl;
let avatarElement; const MemberAvatar = sdk.getComponent('avatars.MemberAvatar');
if (avatarUrl) { const avatarElement = (
const httpUrl = cli.mxcUrlToHttp(avatarUrl, 800, 800); <div className="mx_UserInfo_avatar">
avatarElement = <div <div>
className="mx_UserInfo_avatar" <MemberAvatar
onClick={onMemberAvatarClick} member={user}
onKeyDown={onMemberAvatarKey} width={0.3 * window.outerHeight} // ~30vh
tabIndex="0" height={0.3 * window.outerHeight} // ~30vh
role="img" resizeMethod="scale"
aria-label={_t("Profile picture")} fallbackUserId={user.userId}
> onClick={onMemberAvatarClick}
<div><div style={{backgroundImage: `url(${httpUrl})`}} /></div> urls={user.avatarUrl ? [user.avatarUrl] : undefined} />
</div>; </div>
} </div>
);
let closeButton; let closeButton;
if (onClose) { if (onClose) {