michael/cinny
1
0
Fork 0
Code Issues 8 Pull requests Projects Releases Packages Wiki Activity

Fix sticker jump bug

Browse source
This commit is contained in:
Ajay Bura 2022-08-04 19:37:25 +05:30
parent a33cefea76
commit c80310603c
2 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/app/molecules/media/Media.jsx
View file

@ -69,9 +69,8 @@ async function getUrl(link, type, decryptData) {
}
}
function getNativeHeight(width, height) {
const MEDIA_MAX_WIDTH = 296;
const scale = MEDIA_MAX_WIDTH / width;
function getNativeHeight(width, height, maxWidth = 296) {
const scale = maxWidth / width;
return scale * height;
}
@ -197,7 +196,7 @@ Image.propTypes = {
};
function Sticker({
name, link, file, type,
name, height, width, link, file, type,
}) {
const [url, setUrl] = useState(null);
@ -215,8 +214,8 @@ function Sticker({
}, []);
return (
<div className="sticker-container">
{ url !== null && <img src={url || link} alt={name} />}
<div className="sticker-container" style={{ height: width !== null ? getNativeHeight(width, height, 128) : 'unset' }}>
{ url !== null && <img src={url || link} title={name} alt={name} />}
</div>
);
}
@ -226,6 +225,10 @@ Sticker.defaultProps = {
};
Sticker.propTypes = {
name: PropTypes.string.isRequired,
width: null,
height: null,
width: PropTypes.number,
height: PropTypes.number,
link: PropTypes.string.isRequired,
file: PropTypes.shape({}),
type: PropTypes.string,

2
src/app/molecules/message/Message.jsx
View file

@ -635,6 +635,8 @@ function genMediaContent(mE) {
return (
<Media.Sticker
name={mContent.body}
width={typeof mContent.info?.w === 'number' ? mContent.info?.w : null}
height={typeof mContent.info?.h === 'number' ? mContent.info?.h : null}
link={mx.mxcUrlToHttp(mediaMXC)}
file={isEncryptedFile ? mContent.file : null}
type={mContent.info?.mimetype}