From dee22f712072e683362d3ed272dcfea9ae3d80ff Mon Sep 17 00:00:00 2001 From: RMidhunSuresh Date: Mon, 20 Dec 2021 17:21:59 +0530 Subject: [PATCH] Implement render flags --- src/platform/web/ui/session/room/MessageComposer.js | 2 +- .../web/ui/session/room/timeline/BaseMessageView.js | 7 ++++--- .../web/ui/session/room/timeline/ReplyPreviewView.js | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/platform/web/ui/session/room/MessageComposer.js b/src/platform/web/ui/session/room/MessageComposer.js index cfd389f3..bb175b7d 100644 --- a/src/platform/web/ui/session/room/MessageComposer.js +++ b/src/platform/web/ui/session/room/MessageComposer.js @@ -56,7 +56,7 @@ export class MessageComposer extends TemplateView { className: "cancel", onClick: () => this._clearReplyingTo() }, "Close"), - t.view(new View(rvm, false, "div")) + t.view(new View(rvm, { interactive: false }, "div")) ]) }); const input = t.div({className: "MessageComposer_input"}, [ diff --git a/src/platform/web/ui/session/room/timeline/BaseMessageView.js b/src/platform/web/ui/session/room/timeline/BaseMessageView.js index ca155785..f3f6e661 100644 --- a/src/platform/web/ui/session/room/timeline/BaseMessageView.js +++ b/src/platform/web/ui/session/room/timeline/BaseMessageView.js @@ -24,12 +24,13 @@ import {Menu} from "../../../general/Menu.js"; import {ReactionsView} from "./ReactionsView.js"; export class BaseMessageView extends TemplateView { - constructor(value, interactive = true, tagName = "li") { + constructor(value, renderFlags, tagName = "li") { super(value); this._menuPopup = null; this._tagName = tagName; // TODO An enum could be nice to make code easier to read at call sites. - this._interactive = interactive; + this._interactive = renderFlags?.interactive ?? true; + this._isReplyPreview = renderFlags?.reply; } render(t, vm) { @@ -54,7 +55,7 @@ export class BaseMessageView extends TemplateView { if (isContinuation && wasContinuation === false) { li.removeChild(li.querySelector(".Timeline_messageAvatar")); li.removeChild(li.querySelector(".Timeline_messageSender")); - } else if (!isContinuation && this._interactive) { + } else if (!isContinuation && !this._isReplyPreview) { const avatar = tag.a({href: vm.memberPanelLink, className: "Timeline_messageAvatar"}, [renderStaticAvatar(vm, 30)]); const sender = tag.div({className: `Timeline_messageSender usercolor${vm.avatarColorNumber}`}, vm.displayName); li.insertBefore(avatar, li.firstChild); diff --git a/src/platform/web/ui/session/room/timeline/ReplyPreviewView.js b/src/platform/web/ui/session/room/timeline/ReplyPreviewView.js index 5342f24a..8430986b 100644 --- a/src/platform/web/ui/session/room/timeline/ReplyPreviewView.js +++ b/src/platform/web/ui/session/room/timeline/ReplyPreviewView.js @@ -26,7 +26,7 @@ export class ReplyPreviewView extends TemplateView { _renderReplyPreview(t, vm) { // todo: this should probably be called viewClassForTile instead const viewClass = viewClassForEntry(vm); - const view = new viewClass(vm, false) + const view = new viewClass(vm, { reply: true, interactive: false }); const rendered = view.render(t, vm); return this._renderReplyHeader(t, vm, [rendered]); }