refactor: code prettier

openkraken · Dec 16, 2021 · e6c3356 · e6c3356
1 parent 2fe75c8
commit e6c3356
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 15 deletions.
diff --git a/kraken/lib/src/css/render_style.dart b/kraken/lib/src/css/render_style.dart
@@ -405,21 +405,11 @@ class CSSRenderStyle
   @override
   dynamic resolveValue(String propertyName, String propertyValue) {
     RenderStyle renderStyle = this;
-    dynamic value;
-
-    // font-size: var(--x);
-    // font-size: var(--x, 28px);
-    if (CSSFunction.isFunction(propertyValue, functionName: 'var')) {
-      List<CSSFunctionalNotation> fns = CSSFunction.parseFunction(propertyValue);
-      if (fns.first.args.isNotEmpty) {
-        if (fns.first.args.length > 1) {
-          // Has default value for CSS Variable.
-          return CSSVariable(fns.first.args.first, renderStyle,
-              defaultValue: resolveValue(propertyName, fns.first.args.last));
-        } else {
-          return CSSVariable(fns.first.args.first, renderStyle);
-        }
-      }
+
+    // Process CSSVariable.
+    dynamic value = CSSVariable.tryParse(renderStyle, propertyName, propertyValue);
+    if (value != null) {
+      return value;
     }
 
     switch (propertyName) {

diff --git a/kraken/lib/src/css/values/variable.dart b/kraken/lib/src/css/values/variable.dart
@@ -17,6 +17,24 @@ class CSSVariable {
     return value.length > 2 && value.codeUnitAt(0) == _HYPHEN_CODE && value.codeUnitAt(1) == _HYPHEN_CODE;
   }
 
+  // Try to parse CSSVariable.
+  static CSSVariable? tryParse(RenderStyle renderStyle, String propertyName, String propertyValue) {
+    // font-size: var(--x);
+    // font-size: var(--x, 28px);
+    if (CSSFunction.isFunction(propertyValue, functionName: VAR)) {
+      List<CSSFunctionalNotation> fns = CSSFunction.parseFunction(propertyValue);
+      if (fns.first.args.isNotEmpty) {
+        if (fns.first.args.length > 1) {
+          // Has default value for CSS Variable.
+          return CSSVariable(fns.first.args.first, renderStyle,
+              defaultValue: renderStyle.resolveValue(propertyName, fns.first.args.last));
+        } else {
+          return CSSVariable(fns.first.args.first, renderStyle);
+        }
+      }
+    }
+  }
+
   final String identifier;
   final dynamic defaultValue;
   final RenderStyle _renderStyle;