feat(neon_framework): Render markdown in rich text

Signed-off-by: provokateurin <[email protected]>
nextcloud · Nov 11, 2024 · d7d7f8e · d7d7f8e
1 parent e850437
commit d7d7f8e
Show file tree

Hide file tree

Showing 9 changed files with 645 additions and 60 deletions.
diff --git a/packages/neon_framework/lib/src/widgets/rich_text/rich_text.dart b/packages/neon_framework/lib/src/widgets/rich_text/rich_text.dart
diff --git a/packages/neon_framework/packages/notifications_app/lib/src/widgets/notification.dart b/packages/neon_framework/packages/notifications_app/lib/src/widgets/notification.dart
@@ -25,10 +25,12 @@ class NotificationsNotification extends StatelessWidget {
     final subject = notification.subjectRichParameters!.isNotEmpty
         ? Text.rich(
             buildRichTextSpan(
+              account: NeonProvider.of<Account>(context),
               text: notification.subjectRich!,
+              isMarkdown: false,
               parameters: notification.subjectRichParameters!,
               references: BuiltList(),
-              style: Theme.of(context).textTheme.bodyLarge!,
+              textStyle: Theme.of(context).textTheme.bodyLarge!,
               onReferenceClicked: (_) {},
             ),
           )
@@ -37,10 +39,12 @@ class NotificationsNotification extends StatelessWidget {
     final message = notification.messageRichParameters!.isNotEmpty
         ? Text.rich(
             buildRichTextSpan(
+              account: NeonProvider.of<Account>(context),
               text: notification.messageRich!,
+              isMarkdown: false,
               parameters: notification.messageRichParameters!,
               references: BuiltList(),
-              style: Theme.of(context).textTheme.bodyMedium!,
+              textStyle: Theme.of(context).textTheme.bodyMedium!,
               onReferenceClicked: (_) {},
             ),
             overflow: TextOverflow.ellipsis,

diff --git a/packages/neon_framework/packages/talk_app/lib/src/widgets/message.dart b/packages/neon_framework/packages/talk_app/lib/src/widgets/message.dart
@@ -83,11 +83,13 @@ class TalkMessagePreview extends StatelessWidget {
               ),
             ),
           buildRichTextSpan(
+            account: NeonProvider.of<Account>(context),
             text: chatMessage.message,
+            isMarkdown: false,
             parameters: chatMessage.messageParameters,
             references: BuiltList(),
             isPreview: true,
-            style: Theme.of(context).textTheme.bodyMedium!,
+            textStyle: Theme.of(context).textTheme.bodyMedium!,
             onReferenceClicked: (url) async => launchUrl(NeonProvider.of<Account>(context), url),
           ),
         ],
@@ -174,10 +176,12 @@ class TalkSystemMessage extends StatelessWidget {
       child: Center(
         child: RichText(
           text: buildRichTextSpan(
+            account: NeonProvider.of<Account>(context),
             text: chatMessage.message,
+            isMarkdown: chatMessage.markdown,
             parameters: chatMessage.messageParameters,
             references: BuiltList(),
-            style: Theme.of(context).textTheme.labelSmall!,
+            textStyle: Theme.of(context).textTheme.labelSmall!,
             onReferenceClicked: (url) async => launchUrl(NeonProvider.of<Account>(context), url),
           ),
         ),
@@ -377,11 +381,13 @@ class _TalkCommentMessageState extends State<TalkCommentMessage> {
 
         Widget text = Text.rich(
           buildRichTextSpan(
+            account: NeonProvider.of<Account>(context),
             text: widget.chatMessage.message,
+            isMarkdown: widget.chatMessage.markdown && !widget.isParent,
             parameters: widget.chatMessage.messageParameters,
             isPreview: widget.isParent,
             references: references.keys.toBuiltList(),
-            style: textTheme.bodyLarge!.copyWith(
+            textStyle: textTheme.bodyLarge!.copyWith(
               color: widget.isParent || widget.chatMessage.messageType == spreed.MessageType.commentDeleted
                   ? labelColor
                   : null,

diff --git a/...mework/packages/talk_app/test/goldens/message_comment_message_with_markdown.png b/...mework/packages/talk_app/test/goldens/message_comment_message_with_markdown.png
diff --git a/packages/neon_framework/packages/talk_app/test/message_input_test.dart b/packages/neon_framework/packages/talk_app/test/message_input_test.dart
@@ -284,6 +284,7 @@ void main() {
     when(() => chatMessage.actorDisplayName).thenReturn('test');
     when(() => chatMessage.message).thenReturn('message');
     when(() => chatMessage.messageParameters).thenReturn(BuiltMap());
+    when(() => chatMessage.markdown).thenReturn(false);
 
     replyTo.add(chatMessage);
     await tester.pumpAndSettle();
@@ -320,6 +321,7 @@ void main() {
     when(() => chatMessage.actorDisplayName).thenReturn('test');
     when(() => chatMessage.message).thenReturn('message');
     when(() => chatMessage.messageParameters).thenReturn(BuiltMap());
+    when(() => chatMessage.markdown).thenReturn(false);
 
     editing.add(chatMessage);
     await tester.pumpAndSettle();