Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 33 additions & 19 deletions package/src/components/Avatar/Avatar.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React from 'react';
import React, { useCallback, useMemo } from 'react';
import {
Image,
ImageProps,
Expand Down Expand Up @@ -83,6 +83,34 @@ export const Avatar = (props: AvatarProps) => {

const { isLoadingImageError, setLoadingImageError } = useLoadingImage();

const onError = useCallback(() => {
setLoadingImageError(true);
}, [setLoadingImageError]);

const uri = useMemo(() => {
let imageUrl;
if (
!imageProp ||
imageProp.includes(randomImageBaseUrl) ||
imageProp.includes(randomSvgBaseUrl)
) {
if (imageProp?.includes(streamCDN)) {
imageUrl = imageProp;
} else {
imageUrl = `${randomImageBaseUrl}${name ? `?name=${getInitials(name)}&size=${size}` : ''}`;
}
} else {
imageUrl = getResizedImageUrl({
height: size,
resizableCDNHosts,
url: imageProp,
width: size,
});
}

return imageUrl;
}, [imageProp, name, size, resizableCDNHosts]);

return (
<View>
<View
Expand All @@ -108,24 +136,10 @@ export const Avatar = (props: AvatarProps) => {
/>
) : (
<ImageComponent
accessibilityLabel={testID || 'Avatar Image'}
onError={() => setLoadingImageError(true)}
accessibilityLabel={testID ?? 'Avatar Image'}
onError={onError}
source={{
uri:
!imageProp ||
imageProp.includes(randomImageBaseUrl) ||
imageProp.includes(randomSvgBaseUrl)
? imageProp?.includes(streamCDN)
? imageProp
: `${randomImageBaseUrl}${
name ? `?name=${getInitials(name)}&size=${size}` : ''
}`
: getResizedImageUrl({
height: size,
resizableCDNHosts,
url: imageProp,
width: size,
}),
uri,
}}
style={[
image,
Expand All @@ -139,7 +153,7 @@ export const Avatar = (props: AvatarProps) => {
: {},
imageStyle,
]}
testID={testID || 'avatar-image'}
testID={testID ?? 'avatar-image'}
/>
)}
</View>
Expand Down