Skip to content
Merged
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 6 additions & 9 deletions packages/flutter_markdown/lib/src/builder.dart
Original file line number Diff line number Diff line change
Expand Up @@ -717,19 +717,17 @@ class MarkdownBuilder implements md.NodeVisitor {
) {
final List<Widget> mergedTexts = <Widget>[];
for (final Widget child in children) {
if (mergedTexts.isNotEmpty &&
mergedTexts.last is RichText &&
child is RichText) {
final RichText previous = mergedTexts.removeLast() as RichText;
final TextSpan previousTextSpan = previous.text as TextSpan;
if (mergedTexts.isNotEmpty && mergedTexts.last is Text && child is Text) {
final Text previous = mergedTexts.removeLast() as Text;
final TextSpan previousTextSpan = previous.textSpan! as TextSpan;
final List<TextSpan> children = previousTextSpan.children != null
? previousTextSpan.children!
.map((InlineSpan span) => span is! TextSpan
? TextSpan(children: <InlineSpan>[span])
: span)
.toList()
: <TextSpan>[previousTextSpan];
children.add(child.text as TextSpan);
children.add(child.textSpan! as TextSpan);
final TextSpan? mergedSpan = _mergeSimilarTextSpans(children);
mergedTexts.add(_buildRichText(
mergedSpan,
Expand Down Expand Up @@ -876,9 +874,8 @@ class MarkdownBuilder implements md.NodeVisitor {
key: k,
);
} else {
return RichText(
text: text!,
// ignore: deprecated_member_use
return Text.rich(
text!,
textScaleFactor: styleSheet.textScaleFactor!,
textAlign: textAlign ?? TextAlign.start,
key: k,
Expand Down