Make image reply rendering even more compact
This commit is contained in:
parent
9b023fb37d
commit
25af26323c
4 changed files with 66 additions and 3 deletions
|
@ -130,6 +130,7 @@
|
||||||
@import "./views/messages/_MEmoteBody.scss";
|
@import "./views/messages/_MEmoteBody.scss";
|
||||||
@import "./views/messages/_MFileBody.scss";
|
@import "./views/messages/_MFileBody.scss";
|
||||||
@import "./views/messages/_MImageBody.scss";
|
@import "./views/messages/_MImageBody.scss";
|
||||||
|
@import "./views/messages/_MImageReplyBody.scss";
|
||||||
@import "./views/messages/_MNoticeBody.scss";
|
@import "./views/messages/_MNoticeBody.scss";
|
||||||
@import "./views/messages/_MStickerBody.scss";
|
@import "./views/messages/_MStickerBody.scss";
|
||||||
@import "./views/messages/_MTextBody.scss";
|
@import "./views/messages/_MTextBody.scss";
|
||||||
|
|
35
res/css/views/messages/_MImageReplyBody.scss
Normal file
35
res/css/views/messages/_MImageReplyBody.scss
Normal file
|
@ -0,0 +1,35 @@
|
||||||
|
/*
|
||||||
|
Copyright 2020 Tulir Asokan <tulir@maunium.net>
|
||||||
|
|
||||||
|
Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
you may not use this file except in compliance with the License.
|
||||||
|
You may obtain a copy of the License at
|
||||||
|
|
||||||
|
http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
|
||||||
|
Unless required by applicable law or agreed to in writing, software
|
||||||
|
distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
See the License for the specific language governing permissions and
|
||||||
|
limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
.mx_MImageReplyBody {
|
||||||
|
display: grid;
|
||||||
|
grid-template: "image sender" 20px
|
||||||
|
"image filename" 20px
|
||||||
|
/ 44px auto;
|
||||||
|
grid-gap: 4px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.mx_MImageReplyBody_thumbnail {
|
||||||
|
grid-area: image;
|
||||||
|
}
|
||||||
|
|
||||||
|
.mx_MImageReplyBody_sender {
|
||||||
|
grid-area: sender;
|
||||||
|
}
|
||||||
|
|
||||||
|
.mx_MImageReplyBody_filename {
|
||||||
|
grid-area: filename;
|
||||||
|
}
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
Copyright 2019 Tulir Asokan <tulir@maunium.net>
|
Copyright 2020 Tulir Asokan <tulir@maunium.net>
|
||||||
|
|
||||||
Licensed under the Apache License, Version 2.0 (the "License");
|
Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
you may not use this file except in compliance with the License.
|
you may not use this file except in compliance with the License.
|
||||||
|
@ -14,7 +14,11 @@ See the License for the specific language governing permissions and
|
||||||
limitations under the License.
|
limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
import React from "react";
|
||||||
|
import { _td } from "../../../languageHandler";
|
||||||
|
import * as sdk from "../../../index";
|
||||||
import MImageBody from './MImageBody';
|
import MImageBody from './MImageBody';
|
||||||
|
import MFileBody from "./MFileBody";
|
||||||
|
|
||||||
export default class MImageReplyBody extends MImageBody {
|
export default class MImageReplyBody extends MImageBody {
|
||||||
onClick(ev) {
|
onClick(ev) {
|
||||||
|
@ -27,6 +31,29 @@ export default class MImageReplyBody extends MImageBody {
|
||||||
|
|
||||||
// Don't show "Download this_file.png ..."
|
// Don't show "Download this_file.png ..."
|
||||||
getFileBody() {
|
getFileBody() {
|
||||||
return null;
|
return MFileBody.prototype.presentableTextForFile.call(this, this.props.mxEvent.getContent());
|
||||||
|
}
|
||||||
|
|
||||||
|
render() {
|
||||||
|
if (this.state.error !== null) {
|
||||||
|
return super.render();
|
||||||
|
}
|
||||||
|
|
||||||
|
const content = this.props.mxEvent.getContent();
|
||||||
|
|
||||||
|
const contentUrl = this._getContentUrl();
|
||||||
|
const thumbnail = this._messageContent(contentUrl, this._getThumbUrl(), content);
|
||||||
|
const fileBody = this.getFileBody();
|
||||||
|
const SenderProfile = sdk.getComponent('messages.SenderProfile');
|
||||||
|
const sender = <SenderProfile onClick={this.onSenderProfileClick}
|
||||||
|
mxEvent={this.props.mxEvent}
|
||||||
|
enableFlair={false}
|
||||||
|
text={_td('%(senderName)s sent an image')} />;
|
||||||
|
|
||||||
|
return <div className="mx_MImageReplyBody">
|
||||||
|
<div className="mx_MImageReplyBody_thumbnail">{ thumbnail }</div>
|
||||||
|
<div className="mx_MImageReplyBody_sender">{ sender }</div>
|
||||||
|
<div className="mx_MImageReplyBody_filename">{ fileBody }</div>
|
||||||
|
</div>;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -184,7 +184,7 @@ class ReplyTile extends React.Component {
|
||||||
}
|
}
|
||||||
|
|
||||||
let sender;
|
let sender;
|
||||||
const needsSenderProfile = tileHandler !== 'messages.RoomCreate' && !isInfoMessage;
|
const needsSenderProfile = msgtype !== 'm.image' && tileHandler !== 'messages.RoomCreate' && !isInfoMessage;
|
||||||
|
|
||||||
if (needsSenderProfile) {
|
if (needsSenderProfile) {
|
||||||
let text = null;
|
let text = null;
|
||||||
|
|
Loading…
Reference in a new issue