OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #5037 from matrix-org/t3chguy/room-list/14705 

Fix BaseAvatar wrongly using Buttons when it needs not
pull/21833/head
Michael Telatynski 2020-07-23 09:27:20 +01:00 committed by GitHub
parent 7f4ae043bd 38e93469d3
commit ff8f1af01e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/components/views/avatars/BaseAvatar.tsx
View File

@ -134,7 +134,7 @@ const BaseAvatar = (props: IProps) => {
aria-hidden="true" />
);
if (onClick !== null) {
if (onClick) {
return (
<AccessibleButton
{...otherProps}
@ -162,7 +162,7 @@ const BaseAvatar = (props: IProps) => {
}
}
if (onClick !== null) {
if (onClick) {
return (
<AccessibleButton
className={classNames("mx_BaseAvatar mx_BaseAvatar_image", className)}
@ -196,4 +196,4 @@ const BaseAvatar = (props: IProps) => {
};
export default BaseAvatar;
export type BaseAvatarType = React.FC<IProps>;
export type BaseAvatarType = React.FC<IProps>;

5
test/components/views/messages/TextualBody-test.js
View File

@ -205,9 +205,8 @@ describe("<TextualBody />", () => {
expect(content.html()).toBe('<span class="mx_EventTile_body markdown-body" dir="auto">' +
'Hey <span>' +
'<a class="mx_Pill mx_UserPill" title="@user:server">' +
'<img src="mxc://avatar.url/image.png" style="width: 16px; height: 16px;" ' +
'title="@member:domain.bla" alt="" aria-hidden="true" role="button" tabindex="0" ' +
'class="mx_AccessibleButton mx_BaseAvatar mx_BaseAvatar_image">Member</a>' +
'<img class="mx_BaseAvatar mx_BaseAvatar_image" src="mxc://avatar.url/image.png" ' +
'style="width: 16px; height: 16px;" title="@member:domain.bla" alt="" aria-hidden="true">Member</a>' +
'</span></span>');
});
});