imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branches 'develop' and 't3chguy/leaks' of github.com:matrix-org/matrix-react-sdk into t3chguy/leaks

Browse source 
 Conflicts:
	src/components/views/avatars/BaseAvatar.js
This commit is contained in:
Michael Telatynski 2020-05-15 00:16:41 +01:00
commit 5844bee8f2
771 changed files with 25042 additions and 9044 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/components/views/avatars/BaseAvatar.js
View file

@ -24,6 +24,7 @@ import SettingsStore from "../../../settings/SettingsStore";
import AccessibleButton from '../elements/AccessibleButton';
import MatrixClientContext from "../../../contexts/MatrixClientContext";
import {useEventEmitter} from "../../../hooks/useEventEmitter";
import toRem from "../../../utils/rem";
const useImageUrl = ({url, urls, idName, name, defaultToInitialLetter}) => {
const [imageUrls, setUrls] = useState([]);
@ -104,9 +105,9 @@ const BaseAvatar = (props) => {
className="mx_BaseAvatar_initial"
aria-hidden="true"
style={{
fontSize: (width * 0.65) + "px",
width: width + "px",
lineHeight: height + "px",
fontSize: toRem(width * 0.65),
width: toRem(width),
lineHeight: toRem(height),
}}
>
{ initialLetter }
@ -119,8 +120,10 @@ const BaseAvatar = (props) => {
alt=""
title={title}
onError={onError}
width={width}
height={height}
style={{
width: toRem(width),
height: toRem(height),
}}
aria-hidden="true" />
);
@ -155,7 +158,10 @@ const BaseAvatar = (props) => {
src={imageUrl}
onClick={onClick}
onError={onError}
width={width} height={height}
style={{
width: toRem(width),
height: toRem(height),
}}
title={title} alt=""
inputRef={inputRef}
{...otherProps} />
@ -166,7 +172,10 @@ const BaseAvatar = (props) => {
className="mx_BaseAvatar mx_BaseAvatar_image"
src={imageUrl}
onError={onError}
width={width} height={height}
style={{
width: toRem(width),
height: toRem(height),
}}
title={title} alt=""
ref={inputRef}
{...otherProps} />