From c1ac5be64eda44005dcafe37da0488ac5ba6990b Mon Sep 17 00:00:00 2001 From: Dawid Wenderski Date: Mon, 2 Oct 2023 14:01:56 +0200 Subject: [PATCH 1/7] [flutter_markdown] Replace DecoratedBox by Container for pre tag --- packages/flutter_markdown/lib/src/builder.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/flutter_markdown/lib/src/builder.dart b/packages/flutter_markdown/lib/src/builder.dart index fbdcb31c3a6..7d471d2558d 100644 --- a/packages/flutter_markdown/lib/src/builder.dart +++ b/packages/flutter_markdown/lib/src/builder.dart @@ -442,7 +442,7 @@ class MarkdownBuilder implements md.NodeVisitor { ), ); } else if (tag == 'pre') { - child = DecoratedBox( + child = Container( decoration: styleSheet.codeblockDecoration!, child: child, ); From adb547f1150fa9b07be53160b8b5cb982fff8856 Mon Sep 17 00:00:00 2001 From: Dawid Wenderski Date: Mon, 2 Oct 2023 14:04:02 +0200 Subject: [PATCH 2/7] [flutter_markdown] Clip code block content for set border radius --- packages/flutter_markdown/lib/src/builder.dart | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/packages/flutter_markdown/lib/src/builder.dart b/packages/flutter_markdown/lib/src/builder.dart index 7d471d2558d..3e115d06b43 100644 --- a/packages/flutter_markdown/lib/src/builder.dart +++ b/packages/flutter_markdown/lib/src/builder.dart @@ -446,6 +446,15 @@ class MarkdownBuilder implements md.NodeVisitor { decoration: styleSheet.codeblockDecoration!, child: child, ); + if (styleSheet.codeblockDecoration is BoxDecoration) { + BoxDecoration b = styleSheet.codeblockDecoration as BoxDecoration; + if (b.borderRadius != null) { + child = ClipRRect( + borderRadius: b.borderRadius!, + child: child, + ); + } + } } else if (tag == 'hr') { child = Container(decoration: styleSheet.horizontalRuleDecoration); } From 5443c46a3709bbf0003be4c1353e68f782a8de20 Mon Sep 17 00:00:00 2001 From: Dawid Wenderski Date: Mon, 2 Oct 2023 15:36:28 +0200 Subject: [PATCH 3/7] [flutter_markdown] Replace ClipRRect by clipBehavior --- packages/flutter_markdown/lib/src/builder.dart | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/packages/flutter_markdown/lib/src/builder.dart b/packages/flutter_markdown/lib/src/builder.dart index 3e115d06b43..4a770fffffc 100644 --- a/packages/flutter_markdown/lib/src/builder.dart +++ b/packages/flutter_markdown/lib/src/builder.dart @@ -443,18 +443,10 @@ class MarkdownBuilder implements md.NodeVisitor { ); } else if (tag == 'pre') { child = Container( + clipBehavior: Clip.hardEdge, decoration: styleSheet.codeblockDecoration!, child: child, ); - if (styleSheet.codeblockDecoration is BoxDecoration) { - BoxDecoration b = styleSheet.codeblockDecoration as BoxDecoration; - if (b.borderRadius != null) { - child = ClipRRect( - borderRadius: b.borderRadius!, - child: child, - ); - } - } } else if (tag == 'hr') { child = Container(decoration: styleSheet.horizontalRuleDecoration); } From 0a88873d58fb634e9985166b794cdd0cbf144f77 Mon Sep 17 00:00:00 2001 From: Dawid Wenderski Date: Mon, 2 Oct 2023 16:41:15 +0200 Subject: [PATCH 4/7] [flutter_markdown] Add changelog and bump version --- packages/flutter_markdown/CHANGELOG.md | 4 ++++ packages/flutter_markdown/pubspec.yaml | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/flutter_markdown/CHANGELOG.md b/packages/flutter_markdown/CHANGELOG.md index 8c77da80747..065331466a4 100644 --- a/packages/flutter_markdown/CHANGELOG.md +++ b/packages/flutter_markdown/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.6.17+4 + +* Fixes an incorrect behavior of code block decoration. + ## 0.6.17+3 * Fixes an incorrect note about SDK versions in the 0.6.17+2 CHANGELOG.md entry. diff --git a/packages/flutter_markdown/pubspec.yaml b/packages/flutter_markdown/pubspec.yaml index 683f1889e24..37a2d48eb97 100644 --- a/packages/flutter_markdown/pubspec.yaml +++ b/packages/flutter_markdown/pubspec.yaml @@ -4,7 +4,7 @@ description: A Markdown renderer for Flutter. Create rich text output, formatted with simple Markdown tags. repository: https://github.com/flutter/packages/tree/main/packages/flutter_markdown issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+flutter_markdown%22 -version: 0.6.17+3 +version: 0.6.17+4 environment: sdk: ">=3.0.0 <4.0.0" From 222f2f5071e0dc03839d17d8fdc32b20e0781147 Mon Sep 17 00:00:00 2001 From: Dawid Wenderski Date: Mon, 2 Oct 2023 17:34:38 +0200 Subject: [PATCH 5/7] [flutter_markdown] Fix unnecessary use of a null check --- packages/flutter_markdown/lib/src/builder.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/flutter_markdown/lib/src/builder.dart b/packages/flutter_markdown/lib/src/builder.dart index 4a770fffffc..846c7cda509 100644 --- a/packages/flutter_markdown/lib/src/builder.dart +++ b/packages/flutter_markdown/lib/src/builder.dart @@ -444,7 +444,7 @@ class MarkdownBuilder implements md.NodeVisitor { } else if (tag == 'pre') { child = Container( clipBehavior: Clip.hardEdge, - decoration: styleSheet.codeblockDecoration!, + decoration: styleSheet.codeblockDecoration, child: child, ); } else if (tag == 'hr') { From ca3cc74f689c6f379d41947a06aede9b2e46a1c1 Mon Sep 17 00:00:00 2001 From: Dawid Wenderski Date: Mon, 2 Oct 2023 20:49:09 +0200 Subject: [PATCH 6/7] [flutter_markdown] Make changelog more specific --- packages/flutter_markdown/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/flutter_markdown/CHANGELOG.md b/packages/flutter_markdown/CHANGELOG.md index 065331466a4..b97b9f73e9d 100644 --- a/packages/flutter_markdown/CHANGELOG.md +++ b/packages/flutter_markdown/CHANGELOG.md @@ -1,6 +1,6 @@ ## 0.6.17+4 -* Fixes an incorrect behavior of code block decoration. +* Fixes an overlapping content of a code block for its decoration. ## 0.6.17+3 From 9904ba4796b6560f0a1daadddabd5c07dac9c7d6 Mon Sep 17 00:00:00 2001 From: Dawid Wenderski Date: Mon, 2 Oct 2023 21:14:37 +0200 Subject: [PATCH 7/7] [flutter_markdown] Make changelog more specific --- packages/flutter_markdown/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/flutter_markdown/CHANGELOG.md b/packages/flutter_markdown/CHANGELOG.md index b97b9f73e9d..004b4ce991a 100644 --- a/packages/flutter_markdown/CHANGELOG.md +++ b/packages/flutter_markdown/CHANGELOG.md @@ -1,6 +1,6 @@ ## 0.6.17+4 -* Fixes an overlapping content of a code block for its decoration. +* Fixes an issue where a code block would overlap its container decoration. ## 0.6.17+3