From 90910dae1512733c8c38936fab3c7576de2e3ce5 Mon Sep 17 00:00:00 2001 From: Bruno Windels Date: Mon, 19 Oct 2020 10:00:32 +0200 Subject: [PATCH] render multiline messages with br's --- .../session/room/timeline/TextMessageView.js | 23 ++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/src/ui/web/session/room/timeline/TextMessageView.js b/src/ui/web/session/room/timeline/TextMessageView.js index 886eae5d..5562f97d 100644 --- a/src/ui/web/session/room/timeline/TextMessageView.js +++ b/src/ui/web/session/room/timeline/TextMessageView.js @@ -15,12 +15,33 @@ limitations under the License. */ import {TemplateView} from "../../../general/TemplateView.js"; +import {StaticView} from "../../../general/StaticView.js"; import {renderMessage} from "./common.js"; export class TextMessageView extends TemplateView { render(t, vm) { + const bodyView = t.mapView(vm => vm.text, text => new BodyView(text)); return renderMessage(t, vm, - [t.p([vm => vm.text, t.time({className: {hidden: !vm.date}}, vm.date + " " + vm.time)])] + [t.p([bodyView, t.time({className: {hidden: !vm.date}}, vm.date + " " + vm.time)])] ); } } + +class BodyView extends StaticView { + render(t, value) { + const lines = value.split("\n"); + if (lines.length === 1) { + return lines[0]; + } + const elements = []; + for (const line of lines) { + if (elements.length) { + elements.push(t.br()); + } + if (line.length) { + elements.push(t.span(line)); + } + } + return t.span(elements); + } +}