From ebc7dd2c2ec35735ec3b472956ef8865281ce5cc Mon Sep 17 00:00:00 2001 From: ggurdin <46800240+ggurdin@users.noreply.github.com> Date: Tue, 10 Feb 2026 14:43:25 -0500 Subject: [PATCH] fix: account for nontokens in ordered list rendering (#5645) * fix: account for nontokens in ordered list rendering * remove pangea comments --- lib/pages/chat/events/html_message.dart | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/pages/chat/events/html_message.dart b/lib/pages/chat/events/html_message.dart index 67dc32f1c..0f54e6285 100644 --- a/lib/pages/chat/events/html_message.dart +++ b/lib/pages/chat/events/html_message.dart @@ -352,10 +352,8 @@ class HtmlMessage extends StatelessWidget { if (nodes[i] is dom.Element && onlyElements.indexOf(nodes[i] as dom.Element) < onlyElements.length - 1) ...[ - // #Pangea - // if (blockHtmlTags.contains((nodes[i] as dom.Element).localName)) - // const TextSpan(text: '\n\n'), - // Pangea# + 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'), ], @@ -695,9 +693,11 @@ class HtmlMessage extends StatelessWidget { // Pangea# if (node.parent?.localName == 'ol') TextSpan( - text: - '${(node.parent?.nodes.whereType().toList().indexOf(node) ?? 0) + (int.tryParse(node.parent?.attributes['start'] ?? '1') ?? 1)}. ', // #Pangea + // text: + // '${(node.parent?.nodes.whereType().toList().indexOf(node) ?? 0) + (int.tryParse(node.parent?.attributes['start'] ?? '1') ?? 1)}. ', + text: + '${(node.parent?.nodes.whereType().where((e) => e.localName != 'nontoken').toList().indexOf(node) ?? 0) + (int.tryParse(node.parent?.attributes['start'] ?? '1') ?? 1)}. ', style: existingStyle, // Pangea# ),