ember/fluffychat
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore: Follow up linebreaks in html rendering

Browse source
This commit is contained in:
Krille 2025-02-10 09:57:00 +01:00
parent 04d4557853
commit 0b8d570c59
No known key found for this signature in database
GPG key ID: E067ECD60F1A0652
1 changed files with 31 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
lib/pages/chat/events/html_message.dart
View file

@ -83,21 +83,25 @@ class HtmlMessage extends StatelessWidget {
/// We add line breaks before these tags:
static const Set<String> blockHtmlTags = {
'p',
'ul',
'ol',
'pre',
'br',
'div',
'table',
'details',
'blockquote',
};
/// We add line breaks before these tags:
static const Set<String> fullLineHtmlTag = {
'h1',
'h2',
'h3',
'h4',
'h5',
'h6',
'ul',
'ol',
'li',
'pre',
'br',
'div',
'table',
'blockquote',
'details',
};
/// Adding line breaks before block elements.
@ -105,17 +109,24 @@ class HtmlMessage extends StatelessWidget {
dom.NodeList nodes,
BuildContext context, {
int depth = 1,
}) =>
[
for (var i = 0; i < nodes.length; i++) ...[
if (i > 0 &&
nodes[i] is dom.Element &&
blockHtmlTags.contains((nodes[i] as dom.Element).localName))
const TextSpan(text: '\n'), // Add linebreak
// Actually render the node child:
_renderHtml(nodes[i], context, depth: depth + 1),
}) {
final onlyElements = nodes.whereType<dom.Element>().toList();
return [
for (var i = 0; i < nodes.length; i++) ...[
// Actually render the node child:
_renderHtml(nodes[i], context, depth: depth + 1),
// Add linebreaks between blocks:
if (nodes[i] is dom.Element &&
onlyElements.indexOf(nodes[i] as dom.Element) <
onlyElements.length - 1) ...[
if (blockHtmlTags.contains((nodes[i] as dom.Element).localName))
const TextSpan(text: '\n\n'),
if (fullLineHtmlTag.contains((nodes[i] as dom.Element).localName))
const TextSpan(text: '\n'),
],
];
],
];
}
/// Transforms a Node to an InlineSpan.
InlineSpan _renderHtml(
@ -144,6 +155,8 @@ class HtmlMessage extends StatelessWidget {
if (!allowedHtmlTags.contains(node.localName)) return const TextSpan();
switch (node.localName) {
case 'br':
return const TextSpan(text: '\n');
case 'a':
final href = node.attributes['href'];
if (href == null) continue block;