Skip to content

Fix leading and trailing whitespaces issue #574

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

Merged
merged 1 commit into from
Mar 16, 2021
Merged

Fix leading and trailing whitespaces issue #574

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 11 additions & 7 deletions lib/html_parser.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,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();
}
Expand Down Expand Up @@ -465,14 +465,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();
}
}

Expand Down
7 changes: 6 additions & 1 deletion lib/src/replaced_element.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down Expand Up @@ -290,6 +293,8 @@ ReplacedElement parseReplacedElement(
return TextContentElement(
text: "\n",
style: Style(whiteSpace: WhiteSpace.PRE),
element: element,
node: element
);
case "iframe":
return IframeContentElement(
Expand Down