Skip to content

Fix issue #834 Inline style with "text-shadow" parse failed. #837

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 6 commits into from
Oct 1, 2021
Merged

Fix issue #834 Inline style with "text-shadow" parse failed. #837

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7f2c65b
Fix issue #834 Inline style with "text-shadow" parse failed.
addcn-ai-10733 Sep 10, 2021
7f4acaa
Add min width for 'table' tag.
addcn-ai-10733 Sep 10, 2021
511fa4b
Update layout_element.dart
windows7lake Sep 13, 2021
5a8e048
Update css_parser.dart
windows7lake Sep 13, 2021
1a1e0bd
Update css_parser.dart
windows7lake Sep 13, 2021
9d78902
Update layout_element.dart
windows7lake Sep 24, 2021
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
51 changes: 29 additions & 22 deletions lib/src/css_parser.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -809,33 +809,40 @@ class ExpressionMapping {
previousIndex = i + 1;
}
for (List<css.Expression> list in valueList) {
css.Expression exp = list[0];
css.Expression exp2 = list[1];
css.LiteralTerm? exp3 = list.length > 2 ? list[2] as css.LiteralTerm? : null;
css.LiteralTerm? exp4 = list.length > 3 ? list[3] as css.LiteralTerm? : null;
css.Expression? offsetX;
css.Expression? offsetY;
css.Expression? blurRadius;
css.HexColorTerm? color;
int expressionIndex = 0;
list.forEach((element) {
if (element is css.HexColorTerm) {
color = element;
} else if (expressionIndex == 0) {
offsetX = element;
expressionIndex++;
} else if (expressionIndex++ == 1) {
offsetY = element;
expressionIndex++;
} else {
blurRadius = element;
}
});
RegExp nonNumberRegex = RegExp(r'\s+(\d+\.\d+)\s+');
if (exp is css.LiteralTerm && exp2 is css.LiteralTerm) {
if (exp3 != null && ExpressionMapping.expressionToColor(exp3) != null) {
if (offsetX is css.LiteralTerm && offsetY is css.LiteralTerm) {
if (color != null && ExpressionMapping.expressionToColor(color) != null) {
shadow.add(Shadow(
color: expressionToColor(exp3)!,
offset: Offset(double.tryParse(exp.text.replaceAll(nonNumberRegex, ''))!, double.tryParse(exp2.text.replaceAll(nonNumberRegex, ''))!)
color: expressionToColor(color)!,
offset: Offset(
double.tryParse((offsetX as css.LiteralTerm).text.replaceAll(nonNumberRegex, ''))!,
double.tryParse((offsetY as css.LiteralTerm).text.replaceAll(nonNumberRegex, ''))!),
blurRadius: (blurRadius is css.LiteralTerm) ? double.tryParse((blurRadius as css.LiteralTerm).text.replaceAll(nonNumberRegex, ''))! : 0.0,
));
} else if (exp3 != null && exp3 is css.LiteralTerm) {
if (exp4 != null && ExpressionMapping.expressionToColor(exp4) != null) {
shadow.add(Shadow(
color: expressionToColor(exp4)!,
offset: Offset(double.tryParse(exp.text.replaceAll(nonNumberRegex, ''))!, double.tryParse(exp2.text.replaceAll(nonNumberRegex, ''))!),
blurRadius: double.tryParse(exp3.text.replaceAll(nonNumberRegex, ''))!
));
} else {
shadow.add(Shadow(
offset: Offset(double.tryParse(exp.text.replaceAll(nonNumberRegex, ''))!, double.tryParse(exp2.text.replaceAll(nonNumberRegex, ''))!),
blurRadius: double.tryParse(exp3.text.replaceAll(nonNumberRegex, ''))!
));
}
} else {
shadow.add(Shadow(
offset: Offset(double.tryParse(exp.text.replaceAll(nonNumberRegex, ''))!, double.tryParse(exp2.text.replaceAll(nonNumberRegex, ''))!)
offset: Offset(
double.tryParse((offsetX as css.LiteralTerm).text.replaceAll(nonNumberRegex, ''))!,
double.tryParse((offsetY as css.LiteralTerm).text.replaceAll(nonNumberRegex, ''))!),
blurRadius: (blurRadius is css.LiteralTerm) ? double.tryParse((blurRadius as css.LiteralTerm).text.replaceAll(nonNumberRegex, ''))! : 0.0,
));
}
}
Expand Down