Skip to content

[flutter_markdown] Pass parent TextStyle down to MarkdownElementBuilder.visitElementAfter #3281

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
IchordeDionysos wants to merge 8 commits into from
Closed

[flutter_markdown] Pass parent TextStyle down to MarkdownElementBuilder.visitElementAfter #3281

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f2e66c3
Pass parent TextStyle down to MarkdownElementBuilder.visitElementAfter
IchordeDionysos Feb 23, 2023
8f6047d
Add BuildContext to the visitElementAfter method
IchordeDionysos Feb 24, 2023
f3770fc
Update builder.dart
IchordeDionysos Feb 24, 2023
de053eb
Make it a non-breaking change
IchordeDionysos Mar 7, 2023
22c6b16
Use underscore instead
IchordeDionysos Mar 7, 2023
1315839
Bump version & changelog
IchordeDionysos Mar 7, 2023
75adc21
Add test for visitElementAfterWithContext
IchordeDionysos Mar 7, 2023
f40060b
Merge branch 'main' into task/pass-parent-to-markdown-element-builder
IchordeDionysos Mar 7, 2023
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
Next Next commit
Pass parent TextStyle down to MarkdownElementBuilder.visitElementAfter
  • Loading branch information
@IchordeDionysos
IchordeDionysos committed Feb 23, 2023
commit f2e66c3ae0d51b401f1b4ca5419640b9b1fe408f
6 changes: 5 additions & 1 deletion packages/flutter_markdown/example/lib/demos/subscript_syntax_demo.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,11 @@ class SubscriptBuilder extends MarkdownElementBuilder {
];

@override
Widget visitElementAfter(md.Element element, TextStyle? preferredStyle) {
Widget visitElementAfter(
md.Element element,
TextStyle? preferredStyle,
TextStyle? parentStyle,
) {
// We don't currently have a way to control the vertical alignment of text spans.
// See https://github.com/flutter/flutter/issues/10906#issuecomment-385723664
final String textContent = element.textContent;
Expand Down
7 changes: 5 additions & 2 deletions packages/flutter_markdown/lib/src/builder.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -451,8 +451,11 @@ class MarkdownBuilder implements md.NodeVisitor {
}

if (builders.containsKey(tag)) {
final Widget? child =
builders[tag]!.visitElementAfter(element, styleSheet.styles[tag]);
final Widget? child = builders[tag]!.visitElementAfter(
element,
styleSheet.styles[tag],
parent.style,
);
if (child != null) {
current.children[0] = child;
}
Expand Down
9 changes: 8 additions & 1 deletion packages/flutter_markdown/lib/src/widget.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,15 @@ abstract class MarkdownElementBuilder {
/// If [MarkdownWidget.styleSheet] has a style of this tag, will passing
Copy link
Collaborator

@stuartmorgan-g stuartmorgan-g Apr 13, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This doesn't parse as a sentence. I'm assuming this should say something like "has a style for this tag, it will be passed as [preferredStyle]."?

/// to [preferredStyle].
///
/// If parent element has [TextStyle]'s set, it will be passed as
Copy link
Collaborator

@stuartmorgan-g stuartmorgan-g Apr 13, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"has a [TextStyle] set"

/// [parentStyle].
///
/// If you needn't build a widget, return null.
Widget? visitElementAfter(md.Element element, TextStyle? preferredStyle) =>
Widget? visitElementAfter(
md.Element element,
TextStyle? preferredStyle,
TextStyle? parentStyle,
) =>
null;
}

Expand Down
8 changes: 4 additions & 4 deletions packages/flutter_markdown/test/custom_syntax_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ class SubscriptBuilder extends MarkdownElementBuilder {
];

@override
Widget visitElementAfter(md.Element element, _) {
Widget visitElementAfter(md.Element element, _, __) {
// We don't currently have a way to control the vertical alignment of text spans.
// See https://github.com/flutter/flutter/issues/10906#issuecomment-385723664
final String textContent = element.textContent;
Expand Down Expand Up @@ -172,7 +172,7 @@ class WikilinkSyntax extends md.InlineSyntax {

class WikilinkBuilder extends MarkdownElementBuilder {
@override
Widget visitElementAfter(md.Element element, _) {
Widget visitElementAfter(md.Element element, _, __) {
return RichText(
text: TextSpan(
text: element.textContent,
Expand All @@ -197,7 +197,7 @@ class ContainerSyntax extends md.InlineSyntax {

class ContainerBuilder extends MarkdownElementBuilder {
@override
Widget? visitElementAfter(md.Element element, _) {
Widget? visitElementAfter(md.Element element, _, __) {
return RichText(
text: TextSpan(
children: <InlineSpan>[
Expand All @@ -212,7 +212,7 @@ class ContainerBuilder extends MarkdownElementBuilder {

class ContainerBuilder2 extends MarkdownElementBuilder {
@override
Widget? visitElementAfter(md.Element element, _) {
Widget? visitElementAfter(md.Element element, _, __) {
return RichText(
text: TextSpan(
children: <InlineSpan>[
Expand Down