Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Hide image banner on stickers, they have a tooltip already #8641

Merged
merged 1 commit into from
May 18, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 0 additions & 4 deletions res/css/views/messages/_MImageReplyBody.scss
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,6 @@ limitations under the License.
.mx_MImageBody_thumbnail_container {
flex: 1;
margin-right: 4px;

.mx_MImageBody_banner {
display: none;
}
}

.mx_MImageReplyBody_info {
Expand Down
30 changes: 18 additions & 12 deletions src/components/views/messages/MImageBody.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -355,6 +355,22 @@ export default class MImageBody extends React.Component<IBodyProps, IState> {
}
}

protected getBanner(content: IMediaEventContent): JSX.Element {
// Hide it for the threads list & the file panel where we show it as text anyway.
if ([
TimelineRenderingType.ThreadsList,
TimelineRenderingType.File,
].includes(this.context.timelineRenderingType)) {
return null;
}

return (
<span className="mx_MImageBody_banner">
{ presentableTextForFile(content, _t("Image"), true, true) }
</span>
);
}

protected messageContent(
contentUrl: string,
thumbUrl: string,
Expand Down Expand Up @@ -448,18 +464,8 @@ export default class MImageBody extends React.Component<IBodyProps, IState> {
}

let banner: JSX.Element;
const isTimeline = [
TimelineRenderingType.Room,
TimelineRenderingType.Search,
TimelineRenderingType.Thread,
TimelineRenderingType.Notification,
].includes(this.context.timelineRenderingType);
if (this.state.showImage && this.state.hover && isTimeline) {
banner = (
<span className="mx_MImageBody_banner">
{ presentableTextForFile(content, _t("Image"), true, true) }
</span>
);
if (this.state.showImage && this.state.hover) {
banner = this.getBanner(content);
}

const classes = classNames({
Expand Down
4 changes: 4 additions & 0 deletions src/components/views/messages/MImageReplyBody.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,10 @@ export default class MImageReplyBody extends MImageBody {
return presentableTextForFile(this.props.mxEvent.getContent(), sticker ? _t("Sticker") : _t("Image"), !sticker);
}

protected getBanner(content: IMediaEventContent): JSX.Element {
return null; // we don't need a banner, nor have space for one
}

render() {
if (this.state.error) {
return super.render();
Expand Down
5 changes: 5 additions & 0 deletions src/components/views/messages/MStickerBody.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import React from 'react';
import MImageBody from './MImageBody';
import { BLURHASH_FIELD } from "../../../utils/image-media";
import Tooltip from "../elements/Tooltip";
import { IMediaEventContent } from "../../../customisations/models/IMediaEventContent";

export default class MStickerBody extends MImageBody {
// Mostly empty to prevent default behaviour of MImageBody
Expand Down Expand Up @@ -69,4 +70,8 @@ export default class MStickerBody extends MImageBody {
protected getFileBody() {
return null;
}

protected getBanner(content: IMediaEventContent): JSX.Element {
return null; // we don't need a banner, we have a tooltip
}
}