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

Merge pull request #4957 from matrix-org/joriks/room-list-avatar-aspect-ratio 

Stop classname from overwritting baseavatar's
pull/21833/head
Jorik Schellekens 2020-07-13 16:02:06 +01:00 committed by GitHub
parent 1ce3ae0cf2 3e2280a6f4
commit 71e97177b0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -99,6 +99,7 @@ const BaseAvatar = (props: IProps) => {
defaultToInitialLetter = true, defaultToInitialLetter = true,
onClick, onClick,
inputRef, inputRef,
className,
...otherProps ...otherProps
} = props; } = props;
@ -138,7 +139,7 @@ const BaseAvatar = (props: IProps) => {
<AccessibleButton <AccessibleButton
{...otherProps} {...otherProps}
element="span" element="span"
className="mx_BaseAvatar" className={classNames("mx_BaseAvatar", className)}
onClick={onClick} onClick={onClick}
inputRef={inputRef} inputRef={inputRef}
> >
@ -149,7 +150,7 @@ const BaseAvatar = (props: IProps) => {
} else { } else {
return ( return (
<span <span
className="mx_BaseAvatar" className={classNames("mx_BaseAvatar", className)}
ref={inputRef} ref={inputRef}
{...otherProps} {...otherProps}
role="presentation" role="presentation"
@ -164,7 +165,7 @@ const BaseAvatar = (props: IProps) => {
if (onClick !== null) { if (onClick !== null) {
return ( return (
<AccessibleButton <AccessibleButton
className="mx_BaseAvatar mx_BaseAvatar_image" className={classNames("mx_BaseAvatar mx_BaseAvatar_image", className)}
element='img' element='img'
src={imageUrl} src={imageUrl}
onClick={onClick} onClick={onClick}
@ -180,7 +181,7 @@ const BaseAvatar = (props: IProps) => {
} else { } else {
return ( return (
<img <img
className="mx_BaseAvatar mx_BaseAvatar_image" className={classNames("mx_BaseAvatar mx_BaseAvatar_image", className)}
src={imageUrl} src={imageUrl}
onError={onError} onError={onError}
style={{ style={{