fix expressions like {{background-default}}

miguelcobain · Sep 26, 2018 · 0b57abf · 0b57abf
1 parent 9025dd0
commit 0b57abf
Showing 1 changed file with 11 additions and 15 deletions.
diff --git a/lib/angular-scss-filter.js b/lib/angular-scss-filter.js
@@ -60,13 +60,12 @@ module.exports = class AngularScssFilter extends Filter {
   }
 
   replaceExpression(match, colorType, hue, opacity, contrast) {
-    // `default` is also accepted as a hue-value, because the background palettes are
-    // using it as a name for the default hue.
-    if (hue.indexOf('hue') === 0 || hue === 'default') {
-      hue = LIGHT_DEFAULT_HUES[colorType][hue];
-    }
+    // normalize `color` as `default`
+    hue = hue === 'color' ? 'default' : hue;
 
-    if (hue === 'color') {
+    if (LIGHT_DEFAULT_HUES[colorType] && LIGHT_DEFAULT_HUES[colorType][hue]) {
+      hue = LIGHT_DEFAULT_HUES[colorType][hue];
+    } else if (hue === 'default') {
       hue = '500';
     }
 
@@ -85,17 +84,14 @@ module.exports = class AngularScssFilter extends Filter {
   }
 
   replaceExpressionCssVar(match, colorType, hue, opacity, contrast) {
-    // `default` is also accepted as a hue-value, because the background palettes are
-    // using it as a name for the default hue.
-    if (hue.indexOf('hue') === 0 || hue === 'default') {
-      hue = LIGHT_DEFAULT_HUES[colorType][hue];
-    }
+    // normalize `color` into `default`
+    hue = hue === 'color' ? 'default' : hue;
 
-    if (hue === 'contrast') {
-      contrast = true;
-    }
+    contrast = hue === 'contrast';
 
-    if (hue === 'color' || hue === 'contrast') {
+    if (LIGHT_DEFAULT_HUES[colorType] && LIGHT_DEFAULT_HUES[colorType][hue]) {
+      hue = LIGHT_DEFAULT_HUES[colorType][hue];
+    } else if (hue === 'default' || hue === 'contrast') {
       hue = '500';
     }