Merge pull request Sub6Resources#653 from tneotia/bugfix/before-and-afters

erickok · web-flow · commit acc288cf4a12 · 2021-05-03T09:10:24.000+02:00
Fix Stack Overflow error when using before and afters
diff --git a/lib/html_parser.dart b/lib/html_parser.dart
@@ -577,14 +577,15 @@ class HtmlParser extends StatelessWidget {
   static StyledElement _processBeforesAndAfters(StyledElement tree) {
     if (tree.style.before != null) {
       tree.children.insert(
-          0, TextContentElement(text: tree.style.before, style: tree.style));
+          0, TextContentElement(text: tree.style.before, style: tree.style.copyWith(beforeAfterNull: true, display: Display.INLINE)));
     }
     if (tree.style.after != null) {
       tree.children
-          .add(TextContentElement(text: tree.style.after, style: tree.style));
-    } else {
-      tree.children.forEach(_processBeforesAndAfters);
+          .add(TextContentElement(text: tree.style.after, style: tree.style.copyWith(beforeAfterNull: true, display: Display.INLINE)));
     }
+
+    tree.children.forEach(_processBeforesAndAfters);
+
     return tree;
   }
 
diff --git a/lib/style.dart b/lib/style.dart
@@ -348,6 +348,7 @@ class Style {
     Border? border,
     Alignment? alignment,
     String? markerContent,
+    bool? beforeAfterNull,
   }) {
     return Style(
       backgroundColor: backgroundColor ?? this.backgroundColor,
@@ -377,8 +378,8 @@ class Style {
       whiteSpace: whiteSpace ?? this.whiteSpace,
       width: width ?? this.width,
       wordSpacing: wordSpacing ?? this.wordSpacing,
-      before: before ?? this.before,
-      after: after ?? this.after,
+      before: beforeAfterNull == true ? null : before ?? this.before,
+      after: beforeAfterNull == true ? null : after ?? this.after,
       border: border ?? this.border,
       alignment: alignment ?? this.alignment,
       markerContent: markerContent ?? this.markerContent,

Original file line number	Diff line number	Diff line change
`@@ -577,14 +577,15 @@ class HtmlParser extends StatelessWidget {`
`577`	`577`	`static StyledElement _processBeforesAndAfters(StyledElement tree) {`
`578`	`578`	`if (tree.style.before != null) {`
`579`	`579`	`tree.children.insert(`
`580`		`- 0, TextContentElement(text: tree.style.before, style: tree.style));`
	`580`	`+ 0, TextContentElement(text: tree.style.before, style: tree.style.copyWith(beforeAfterNull: true, display: Display.INLINE)));`
`581`	`581`	`}`
`582`	`582`	`if (tree.style.after != null) {`
`583`	`583`	`tree.children`
`584`		`- .add(TextContentElement(text: tree.style.after, style: tree.style));`
`585`		`- } else {`
`586`		`- tree.children.forEach(_processBeforesAndAfters);`
	`584`	`+ .add(TextContentElement(text: tree.style.after, style: tree.style.copyWith(beforeAfterNull: true, display: Display.INLINE)));`
`587`	`585`	`}`
	`586`	`+`
	`587`	`+ tree.children.forEach(_processBeforesAndAfters);`
	`588`	`+`
`588`	`589`	`return tree;`
`589`	`590`	`}`
`590`	`591`