From 82b14d2069e045ae1866623af63c080b054f1801 Mon Sep 17 00:00:00 2001 From: andrechalella Date: Fri, 11 Oct 2024 00:39:10 -0300 Subject: [PATCH 1/4] Soft wrapping in blockquotes --- 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 0ec8833c42c0..3a0f4b15e993 100644 --- a/packages/flutter_markdown/lib/src/builder.dart +++ b/packages/flutter_markdown/lib/src/builder.dart @@ -362,7 +362,7 @@ class MarkdownBuilder implements md.NodeVisitor { style: _isInBlockquote ? styleSheet.blockquote!.merge(_inlines.last.style) : _inlines.last.style, - text: _isInBlockquote ? text.text : trimText(text.text), + text: trimText(text.text), recognizer: _linkHandlers.isNotEmpty ? _linkHandlers.last : null, ), textAlign: _textAlignForBlockTag(_currentBlockTag), From 0f972c45f62ea8f03bd95f90c989e404f2f92f39 Mon Sep 17 00:00:00 2001 From: andrechalella Date: Fri, 11 Oct 2024 01:47:30 -0300 Subject: [PATCH 2/4] Versioning --- 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 b6df88cad18e..caa5bca079d4 100644 --- a/packages/flutter_markdown/CHANGELOG.md +++ b/packages/flutter_markdown/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.7.3+3 + +* Makes paragraphs in blockquotes soft-wrap like a normal `
` instead of hard-wrapping like a `
` block.
+
 ## 0.7.3+2
 
 * Resolves an issue where code blocks in markdown were not highlighted during selection.
diff --git a/packages/flutter_markdown/pubspec.yaml b/packages/flutter_markdown/pubspec.yaml
index c6008933453c..4a781e283b03 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.7.3+2
+version: 0.7.3+3
 
 environment:
   sdk: ^3.3.0

From 807d400b86d68ab1872c4aed59c950bc6b4e1216 Mon Sep 17 00:00:00 2001
From: andrechalella 
Date: Fri, 11 Oct 2024 02:01:48 -0300
Subject: [PATCH 3/4] Blockquote soft wrap test

---
 .../flutter_markdown/test/blockquote_test.dart     | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/packages/flutter_markdown/test/blockquote_test.dart b/packages/flutter_markdown/test/blockquote_test.dart
index 2d1fa3e30a4c..ee01f688a4da 100644
--- a/packages/flutter_markdown/test/blockquote_test.dart
+++ b/packages/flutter_markdown/test/blockquote_test.dart
@@ -24,6 +24,20 @@ void defineTests() {
         expectTextStrings(widgets, ['quote']);
       },
     );
+    
+    testWidgets(
+      'soft wrapping in blockquote',
+      (WidgetTester tester) async {
+        await tester.pumpWidget(
+          boilerplate(
+            const MarkdownBody(data: '> soft\n> wrap'),
+          ),
+        );
+
+        final Iterable widgets = tester.allWidgets;
+        expectTextStrings(widgets, ['soft wrap']);
+      },
+    );
 
     testWidgets(
       'should work with styling',

From 43019cbd8a7be7494dbe37c2692b318a6cf5e2c5 Mon Sep 17 00:00:00 2001
From: andrechalella 
Date: Sat, 12 Oct 2024 16:31:27 -0300
Subject: [PATCH 4/4] Fixes for tests

---
 packages/flutter_markdown/CHANGELOG.md              | 2 +-
 packages/flutter_markdown/pubspec.yaml              | 2 +-
 packages/flutter_markdown/test/blockquote_test.dart | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/flutter_markdown/CHANGELOG.md b/packages/flutter_markdown/CHANGELOG.md
index caa5bca079d4..dba9cb958789 100644
--- a/packages/flutter_markdown/CHANGELOG.md
+++ b/packages/flutter_markdown/CHANGELOG.md
@@ -1,4 +1,4 @@
-## 0.7.3+3
+## 0.7.4
 
 * Makes paragraphs in blockquotes soft-wrap like a normal `
` instead of hard-wrapping like a `
` block.
 
diff --git a/packages/flutter_markdown/pubspec.yaml b/packages/flutter_markdown/pubspec.yaml
index 4a781e283b03..f0ac1fd83533 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.7.3+3
+version: 0.7.4
 
 environment:
   sdk: ^3.3.0
diff --git a/packages/flutter_markdown/test/blockquote_test.dart b/packages/flutter_markdown/test/blockquote_test.dart
index ee01f688a4da..07e88f4c9e09 100644
--- a/packages/flutter_markdown/test/blockquote_test.dart
+++ b/packages/flutter_markdown/test/blockquote_test.dart
@@ -24,7 +24,7 @@ void defineTests() {
         expectTextStrings(widgets, ['quote']);
       },
     );
-    
+
     testWidgets(
       'soft wrapping in blockquote',
       (WidgetTester tester) async {