Skip to content
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

Jump to bottom

fix: Prepare image placeholder for not loaded image and prevent jumping #16941

Merged
merged 5 commits into from
Feb 28, 2024
Merged

fix: Prepare image placeholder for not loaded image and prevent jumping #16941

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
19f3269
fix: Prepare image placeholder for not loaded image and prevent jumping
przemvs Feb 28, 2024
4727f52
fix displaying message warning
przemvs Feb 28, 2024
088a2cd
code improvements
przemvs Feb 28, 2024
cc03d8e
code cleanup
przemvs Feb 28, 2024
c2e33db
revert message-warning
przemvs Feb 28, 2024
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
25 changes: 15 additions & 10 deletions src/script/components/MessagesList/Message/ContentMessage/asset/ImageAsset/ImageAsset.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@ export interface ImageAssetProps {
isFocusable?: boolean;
}

const MAX_ASSET_WIDTH = 800;

export const ImageAsset = ({
asset,
message,
Expand Down Expand Up @@ -103,21 +105,24 @@ export const ImageAsset = ({
maxWidth: 'var(--conversation-message-asset-width)',
};

const isImageWidthLargerThanDefined = parseInt(asset.width, 10) >= MAX_ASSET_WIDTH;
const imageWidth = isImageWidthLargerThanDefined ? `${MAX_ASSET_WIDTH}px` : asset.width;

const imageAsset: CSSObject = {
aspectRatio: isFileSharingReceivingEnabled ? `${asset.ratio}` : undefined,
...(!imageUrl?.url
? {
maxWidth: asset.width,
maxHeight: asset.height,
}
: {
maxWidth: asset.width,
maxHeight: '80vh',
}),
maxHeight: '80vh',
maxWidth: !imageUrl?.url ? '100%' : imageWidth,

...(!imageUrl?.url &&
!isImageWidthLargerThanDefined && {
height: asset.height,
}),
};

const imageStyle: CSSObject = {
width: '100%',
width: imageWidth,
maxWidth: '100%',
height: 'auto',
};

return (
Expand Down
Loading