Skip to content

Fix SVG attachment sizing and preserve provided dimensions #6851

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
deepak0x wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

Fix SVG attachment sizing and preserve provided dimensions #6851

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5511a7e
Fix SVG attachment sizing and preserve provided dimensions
deepak0x Dec 15, 2025
41a0c0a
Handle SVG MIME types case-insensitively
deepak0x Dec 15, 2025
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
9 changes: 8 additions & 1 deletion app/containers/message/Components/Attachments/Image/Container.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,14 @@ const ImageContainer = ({
const image = (
<Button onPress={onPress}>
<WidthAwareView>
<MessageImage uri={url} status={status} encrypted={isEncrypted} imagePreview={imagePreview} imageType={imageType} />
<MessageImage
uri={url}
status={status}
encrypted={isEncrypted}
imagePreview={imagePreview}
imageType={imageType}
imageDimensions={file.image_dimensions}
/>
</WidthAwareView>
</Button>
);
Expand Down
56 changes: 42 additions & 14 deletions app/containers/message/Components/Attachments/Image/Image.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,40 +13,63 @@ import { AUTOPLAY_GIFS_PREFERENCES_KEY } from '../../../../../lib/constants/keys
import ImageBadge from './ImageBadge';
import log from '../../../../../lib/methods/helpers/log';

export const MessageImage = React.memo(({ uri, status, encrypted = false, imagePreview, imageType }: IMessageImage) => {
export const MessageImage = React.memo(
({ uri, status, encrypted = false, imagePreview, imageType, imageDimensions: providedDimensions }: IMessageImage) => {
'use memo';

const { colors } = useTheme();
const [imageDimensions, setImageDimensions] = useState({ width: 0, height: 0 });
const [imageDimensions, setImageDimensions] = useState({
width: providedDimensions?.width ?? 0,
height: providedDimensions?.height ?? 0
});
const [autoplayGifs] = useUserPreferences<boolean>(AUTOPLAY_GIFS_PREFERENCES_KEY, true);
const maxSize = useContext(WidthAwareContext);
const showImage = isValidUrl(uri) && imageDimensions.width && status === 'downloaded';
const isGif = imageType === 'image/gif';
const isSvg = imageType?.toLowerCase().includes('svg') ?? false;

useEffect(() => {
if (providedDimensions?.width && providedDimensions?.height) {
setImageDimensions({ width: providedDimensions.width, height: providedDimensions.height });
}
}, [providedDimensions?.width, providedDimensions?.height]);

useEffect(() => {
// Preserve SVG sizing: stick to provided/fallback dimensions and skip intrinsic load that shrinks the view.
if (isSvg) {
return;
}

if (status === 'downloaded') {
Image.loadAsync(uri, {
onError: e => {
log(e);
}
}).then(image => {
setImageDimensions({ width: image.width, height: image.height });
});
})
.then(image => {
setImageDimensions({ width: image.width, height: image.height });
})
.catch(e => {
log(e);
});
}
}, [uri, status]);
}, [uri, status, isSvg]);

const width = Math.min(imageDimensions.width, maxSize) || 0;
const height = Math.min((imageDimensions.height * ((width * 100) / imageDimensions.width)) / 100, maxSize) || 0;
const hasDimensions = imageDimensions.width > 0 && imageDimensions.height > 0;
const fallbackSize = Math.min(maxSize, 200);
const ratio = hasDimensions ? imageDimensions.height / imageDimensions.width : 1;
const displayWidth = hasDimensions ? Math.min(imageDimensions.width, maxSize) : fallbackSize;
const displayHeight = hasDimensions ? Math.min(displayWidth * ratio, maxSize) : fallbackSize;
const showImage = isValidUrl(uri) && status === 'downloaded' && displayWidth > 0 && displayHeight > 0;
const imageStyle = {
width,
height
width: displayWidth,
height: displayHeight
};

const containerStyle: ViewStyle = {
alignItems: 'center',
justifyContent: 'center',
...(imageDimensions.width <= 64 && { width: 64 }),
...(imageDimensions.height <= 64 && { height: 64 })
...(displayWidth <= 64 && { width: 64 }),
...(displayHeight <= 64 && { height: 64 })
};

const borderStyle: ViewStyle = {
Expand All @@ -69,7 +92,12 @@ export const MessageImage = React.memo(({ uri, status, encrypted = false, imageP
<>
{showImage ? (
<View style={[containerStyle, borderStyle]}>
<Image autoplay={autoplayGifs} style={imageStyle} source={{ uri: encodeURI(uri) }} contentFit='cover' />
<Image
autoplay={autoplayGifs}
style={imageStyle}
source={{ uri: encodeURI(uri) }}
contentFit={isSvg ? 'contain' : 'cover'}
/>
</View>
) : null}
{['loading', 'to-download'].includes(status) || (status === 'downloaded' && !showImage) ? (
Expand Down
4 changes: 4 additions & 0 deletions app/containers/message/Components/Attachments/Image/definitions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,8 @@ export interface IMessageImage {
encrypted: boolean;
imagePreview?: string;
imageType?: string;
imageDimensions?: {
width?: number;
height?: number;
};
}