Merge branch 'improve/support-no-container' of github.com:dab246/flutter_matrix_html

Sorunome · Sorunome · commit d3dae72f59c9 · 2023-06-14T08:17:43.000+02:00
diff --git a/lib/flutter_html.dart b/lib/flutter_html.dart
@@ -31,6 +31,7 @@ class Html extends StatelessWidget {
     this.emoteSize,
     this.getCodeLanguage,
     this.setCodeLanguage,
+    this.inlineSpanEnd,
   }) : super(key: key);
 
   final String data;
@@ -57,6 +58,8 @@ class Html extends StatelessWidget {
   final SetCodeLanguage? setCodeLanguage;
   final GetCodeLanguage? getCodeLanguage;
 
+  final InlineSpan? inlineSpanEnd;
+
   @override
   Widget build(BuildContext context) {
     final width = shrinkToFit ? null : MediaQuery.of(context).size.width;
@@ -85,6 +88,7 @@ class Html extends StatelessWidget {
           defaultTextStyle: defaultTextStyle,
           setCodeLanguage: setCodeLanguage,
           getCodeLanguage: getCodeLanguage,
+          inlineSpanEnd: inlineSpanEnd,
         ),
       ),
     );
diff --git a/lib/text_parser.dart b/lib/text_parser.dart
@@ -104,6 +104,7 @@ class TextParser extends StatelessWidget {
     this.emoteSize,
     this.setCodeLanguage,
     this.getCodeLanguage,
+    this.inlineSpanEnd,
   });
 
   final double indentSize = 10.0;
@@ -125,6 +126,7 @@ class TextParser extends StatelessWidget {
   final double? emoteSize;
   final SetCodeLanguage? setCodeLanguage;
   final GetCodeLanguage? getCodeLanguage;
+  final InlineSpan? inlineSpanEnd;
 
   TextSpan _parseTextNode(
       BuildContext context, ParseContext parseContext, dom.Text node) {
@@ -960,8 +962,11 @@ class TextParser extends StatelessWidget {
       textStyle: defaultTextStyle,
       linkStyle: linkStyle,
     );
-    final widget =
-        _parseNode(context, parseContext, parser.parseFragment(data));
+    final nodeParsed = _parseNode(context, parseContext, parser.parseFragment(data));
+    final widget = inlineSpanEnd != null
+      ? _addInlineSpanToNode(inlineSpan: _optimizeTextspan(inlineSpanEnd!), nodeParsed: nodeParsed)
+      : nodeParsed;
+
     if (shrinkToFit) {
       return widget;
     }
@@ -970,6 +975,92 @@ class TextParser extends StatelessWidget {
       child: widget,
     );
   }
+
+  Widget _addInlineSpanToNode({required InlineSpan inlineSpan, required Widget nodeParsed}) {
+    if (nodeParsed is CleanRichText) {
+      return _addInlineSpanToCleanRichText(inlineSpan: inlineSpan, richText: nodeParsed);
+    } else if (nodeParsed is Column && nodeParsed.children.isNotEmpty) {
+      return _addInlineSpanToColumn(inlineSpan: inlineSpan, column: nodeParsed);
+    } else {
+      return CleanRichText(
+        TextSpan(
+          children: [
+            WidgetSpan(child: nodeParsed),
+            inlineSpan
+          ]
+        ),
+        maxLines: maxLines
+      );
+    }
+  }
+
+  Widget _addInlineSpanToCleanRichText({required InlineSpan inlineSpan, required CleanRichText richText}) {
+    final childRichText = richText.child;
+    if (childRichText is TextSpan) {
+      return CleanRichText(
+        TextSpan(
+          text: childRichText.text,
+          style: childRichText.style,
+          recognizer: childRichText.recognizer,
+          mouseCursor: childRichText.mouseCursor,
+          onEnter: childRichText.onEnter,
+          onExit: childRichText.onExit,
+          semanticsLabel: childRichText.semanticsLabel,
+          locale: childRichText.locale,
+          spellOut: childRichText.spellOut,
+          children: [
+            if (childRichText.children != null)
+              ...childRichText.children!,
+            inlineSpan
+          ]
+        ),
+        maxLines: richText.maxLines,
+        textAlign: richText.textAlign,
+      );
+    } else {
+      return CleanRichText(
+        TextSpan(
+          children: [
+            childRichText,
+            inlineSpan
+          ]
+        ),
+        maxLines: richText.maxLines,
+        textAlign: richText.textAlign,
+      );
+    }
+  }
+
+  Widget _addInlineSpanToColumn({required InlineSpan inlineSpan, required Column column}) {
+    final columnChildren = column.children;
+    final lastChild = columnChildren.removeLast();
+    Widget newLastChild;
+    if (lastChild is CleanRichText) {
+      newLastChild = _addInlineSpanToCleanRichText(inlineSpan: inlineSpan, richText: lastChild);
+    } else {
+      newLastChild = CleanRichText(
+        TextSpan(
+          children: [
+            WidgetSpan(child: lastChild),
+            inlineSpan
+          ]
+        ),
+        maxLines: maxLines
+      );
+    }
+    return Column(
+      crossAxisAlignment: column.crossAxisAlignment,
+      mainAxisAlignment: column.mainAxisAlignment,
+      mainAxisSize: column.mainAxisSize,
+      textDirection: column.textDirection,
+      textBaseline: column.textBaseline,
+      verticalDirection: column.verticalDirection,
+      children: [
+        ...columnChildren,
+        newLastChild
+      ]
+    );
+  }
 }
 
 class ParseContext {
