Merge pull request Sub6Resources#574 from tneotia/bugfix/leading-trailing-whitespaces

erickok · web-flow · commit 1fa33d8a36c4 · 2021-03-16T23:39:19.000+01:00
Fix leading and trailing whitespaces issue
diff --git a/lib/html_parser.dart b/lib/html_parser.dart
@@ -172,7 +172,7 @@ class HtmlParser extends StatelessWidget {
         return EmptyContentElement();
       }
     } else if (node is dom.Text) {
-      return TextContentElement(text: node.text, style: Style());
+      return TextContentElement(text: node.text, style: Style(), element: node.parent, node: node);
     } else {
       return EmptyContentElement();
     }
@@ -464,14 +464,18 @@ class HtmlParser extends StatelessWidget {
     }
 
     if (tree is TextContentElement) {
-      if (wpc.data && tree.text!.startsWith(' ')) {
+      int index = -1;
+      if ((tree.element?.nodes.length ?? 0) > 1) {
+        index = tree.element?.nodes.indexWhere((element) => element == tree.node) ?? -1;
+      }
+      if (index < 1 && tree.text!.startsWith(' ')
+          && tree.element?.localName != "br") {
         tree.text = tree.text!.replaceFirst(' ', '');
       }
-
-      if (tree.text!.endsWith(' ') || tree.text!.endsWith('\n')) {
-        wpc.data = true;
-      } else {
-        wpc.data = false;
+      if (index == (tree.element?.nodes.length ?? 1) - 1
+          && (tree.text!.endsWith(' ') || tree.text!.endsWith('\n'))
+          && tree.element?.localName != "br") {
+        tree.text = tree.text!.trimRight();
       }
     }
 
diff --git a/lib/src/replaced_element.dart b/lib/src/replaced_element.dart
@@ -44,11 +44,14 @@ abstract class ReplacedElement extends StyledElement {
 /// [TextContentElement] is a [ContentElement] with plaintext as its content.
 class TextContentElement extends ReplacedElement {
   String? text;
+  dom.Node? node;
 
   TextContentElement({
     required Style style,
     required this.text,
-  }) : super(name: "[text]", style: style);
+    this.node,
+    dom.Element? element,
+  }) : super(name: "[text]", style: style, node: element);
 
   @override
   String toString() {
@@ -290,6 +293,8 @@ ReplacedElement parseReplacedElement(
       return TextContentElement(
         text: "\n",
         style: Style(whiteSpace: WhiteSpace.PRE),
+        element: element,
+        node: element
       );
     case "iframe":
       return IframeContentElement(

Original file line number	Diff line number	Diff line change
`@@ -172,7 +172,7 @@ class HtmlParser extends StatelessWidget {`
`172`	`172`	`return EmptyContentElement();`
`173`	`173`	`}`
`174`	`174`	`} else if (node is dom.Text) {`
`175`		`- return TextContentElement(text: node.text, style: Style());`
	`175`	`+ return TextContentElement(text: node.text, style: Style(), element: node.parent, node: node);`
`176`	`176`	`} else {`
`177`	`177`	`return EmptyContentElement();`
`178`	`178`	`}`
`@@ -464,14 +464,18 @@ class HtmlParser extends StatelessWidget {`
`464`	`464`	`}`
`465`	`465`
`466`	`466`	`if (tree is TextContentElement) {`
`467`		`- if (wpc.data && tree.text!.startsWith(' ')) {`
	`467`	`+ int index = -1;`
	`468`	`+ if ((tree.element?.nodes.length ?? 0) > 1) {`
	`469`	`+ index = tree.element?.nodes.indexWhere((element) => element == tree.node) ?? -1;`
	`470`	`+ }`
	`471`	`+ if (index < 1 && tree.text!.startsWith(' ')`
	`472`	`+ && tree.element?.localName != "br") {`
`468`	`473`	`tree.text = tree.text!.replaceFirst(' ', '');`
`469`	`474`	`}`
`470`		`-`
`471`		`- if (tree.text!.endsWith(' ') \|\| tree.text!.endsWith('\n')) {`
`472`		`- wpc.data = true;`
`473`		`- } else {`
`474`		`- wpc.data = false;`
	`475`	`+ if (index == (tree.element?.nodes.length ?? 1) - 1`
	`476`	`+ && (tree.text!.endsWith(' ') \|\| tree.text!.endsWith('\n'))`
	`477`	`+ && tree.element?.localName != "br") {`
	`478`	`+ tree.text = tree.text!.trimRight();`
`475`	`479`	`}`
`476`	`480`	`}`
`477`	`481`