mirror of
https://github.com/element-hq/element-web.git
synced 2024-12-14 18:21:32 +03:00
Fix alignment of image blurhashes and interplay with spinners
This commit is contained in:
parent
3a2e5389f6
commit
9c599b567d
1 changed files with 6 additions and 9 deletions
|
@ -372,10 +372,7 @@ export default class MImageBody extends React.Component {
|
|||
let placeholder = null;
|
||||
let gifLabel = null;
|
||||
|
||||
// e2e image hasn't been decrypted yet
|
||||
if (content.file !== undefined && this.state.decryptedUrl === null) {
|
||||
placeholder = <InlineSpinner w={32} h={32} />;
|
||||
} else if (!this.state.imgLoaded) {
|
||||
if (!this.state.imgLoaded) {
|
||||
placeholder = this.getPlaceholder(maxWidth, maxHeight);
|
||||
}
|
||||
|
||||
|
@ -414,10 +411,8 @@ export default class MImageBody extends React.Component {
|
|||
// Constrain width here so that spinner appears central to the loaded thumbnail
|
||||
maxWidth: infoWidth + "px",
|
||||
}}>
|
||||
<div className="mx_MImageBody_thumbnail_spinner">
|
||||
{ placeholder }
|
||||
</div>
|
||||
</div>
|
||||
}
|
||||
|
||||
<div style={{display: !showPlaceholder ? undefined : 'none'}}>
|
||||
|
@ -442,8 +437,10 @@ export default class MImageBody extends React.Component {
|
|||
// Overidden by MStickerBody
|
||||
getPlaceholder(width, height) {
|
||||
const blurhash = this.props.mxEvent.getContent().info[BLURHASH_FIELD];
|
||||
if (!blurhash) return null;
|
||||
return <BlurhashPlaceholder blurhash={blurhash} width={width} height={height} />;
|
||||
if (blurhash) return <BlurhashPlaceholder blurhash={blurhash} width={width} height={height} />;
|
||||
return <div className="mx_MImageBody_thumbnail_spinner">
|
||||
<InlineSpinner w={32} h={32} />
|
||||
</div>;
|
||||
}
|
||||
|
||||
// Overidden by MStickerBody
|
||||
|
|
Loading…
Reference in a new issue