Merge pull request Sub6Resources#837 from windows7lake/master

erickok · web-flow · commit 24d529c02606 · 2021-10-01T09:35:13.000+02:00
Fix issue Sub6Resources#834 Inline style with "text-shadow" parse failed.
diff --git a/lib/src/css_parser.dart b/lib/src/css_parser.dart
@@ -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,
           ));
         }
       }
