verdnatura-mirror
/
verdnatura-chat
forked from verdnatura-mirror/Rocket.Chat.ReactNative
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge urlimage inside url

This commit is contained in:
Reinaldo Neto 2023-03-07 11:26:21 -03:00
parent 251223a0c9
commit 87f88c5b52
1 changed files with 16 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
app/containers/message/Urls.tsx
View File

@ -58,38 +58,6 @@ const styles = StyleSheet.create({
} }
}); });
const UrlImage = ({
image,
setImageLoadedState,
hasContent,
imageLoadedState
}: {
image: string;
setImageLoadedState(value: TImageLoadedState): void;
hasContent: boolean;
imageLoadedState: TImageLoadedState;
}) => {
const { baseUrl, user } = useContext(MessageContext);
if (!image) {
return null;
}
image = image.includes('http') ? image : `${baseUrl}/${image}?rc_uid=${user.id}&rc_token=${user.token}`;
return (
<>
<FastImage
source={{ uri: image }}
style={[styles.image, !hasContent && styles.imageWithoutContent, imageLoadedState === 'loading' && styles.loading]}
resizeMode={FastImage.resizeMode.cover}
onError={() => setImageLoadedState('error')}
onLoad={() => setImageLoadedState('done')}
/>
</>
);
};
const UrlContent = React.memo( const UrlContent = React.memo(
({ title, description, theme }: { title: string; description: string; theme: TSupportedThemes }) => ( ({ title, description, theme }: { title: string; description: string; theme: TSupportedThemes }) => (
<View style={styles.textContainer}> <View style={styles.textContainer}>
@ -124,6 +92,8 @@ type TImageLoadedState = 'loading' | 'done' | 'error';
const Url = React.memo( const Url = React.memo(
({ url, index, theme }: { url: IUrl; index: number; theme: TSupportedThemes }) => { ({ url, index, theme }: { url: IUrl; index: number; theme: TSupportedThemes }) => {
const [imageLoadedState, setImageLoadedState] = useState<TImageLoadedState>('loading'); const [imageLoadedState, setImageLoadedState] = useState<TImageLoadedState>('loading');
const { baseUrl, user } = useContext(MessageContext);
if (!url || url?.ignoreParse || imageLoadedState === 'error') { if (!url || url?.ignoreParse || imageLoadedState === 'error') {
return null; return null;
} }
@ -137,6 +107,11 @@ const Url = React.memo(
const hasContent = url.title || url.description; const hasContent = url.title || url.description;
let image = url.image || url.url;
if (image) {
image = image.includes('http') ? image : `${baseUrl}/${image}?rc_uid=${user.id}&rc_token=${user.token}`;
}
return ( return (
<Touchable <Touchable
onPress={onPress} onPress={onPress}
@ -154,12 +129,15 @@ const Url = React.memo(
background={Touchable.Ripple(themes[theme].bannerBackground)} background={Touchable.Ripple(themes[theme].bannerBackground)}
> >
<> <>
<UrlImage {image ? (
setImageLoadedState={setImageLoadedState} <FastImage
image={url.image || url.url} source={{ uri: image }}
hasContent={!!hasContent} style={[styles.image, !hasContent && styles.imageWithoutContent, imageLoadedState === 'loading' && styles.loading]}
imageLoadedState={imageLoadedState} resizeMode={FastImage.resizeMode.cover}
/> onError={() => setImageLoadedState('error')}
onLoad={() => setImageLoadedState('done')}
/>
) : null}
{hasContent ? <UrlContent title={url.title} description={url.description} theme={theme} /> : null} {hasContent ? <UrlContent title={url.title} description={url.description} theme={theme} /> : null}
</> </>
</Touchable> </Touchable>
@ -182,7 +160,6 @@ const Urls = React.memo(
(oldProps, newProps) => dequal(oldProps.urls, newProps.urls) (oldProps, newProps) => dequal(oldProps.urls, newProps.urls)
); );
UrlImage.displayName = 'MessageUrlImage';
UrlContent.displayName = 'MessageUrlContent'; UrlContent.displayName = 'MessageUrlContent';
Url.displayName = 'MessageUrl'; Url.displayName = 'MessageUrl';
Urls.displayName = 'MessageUrls'; Urls.displayName = 'MessageUrls';