From 35891751cf06137ca716c687b79079803da45970 Mon Sep 17 00:00:00 2001
From: Tasso Evangelista <tasso.evangelista@rocket.chat>
Date: Wed, 3 Jun 2020 22:35:04 -0300
Subject: [PATCH] Expand color naming

---
 packages/fuselage/src/styles/colors.scss     | 53 +++++++++++++++-----
 packages/fuselage/src/styles/props/colors.js |  8 ++-
 2 files changed, 48 insertions(+), 13 deletions(-)

diff --git a/packages/fuselage/src/styles/colors.scss b/packages/fuselage/src/styles/colors.scss
index 725478e9..ae9911ca 100644
--- a/packages/fuselage/src/styles/colors.scss
+++ b/packages/fuselage/src/styles/colors.scss
@@ -10,6 +10,12 @@ $-map-type-to-prefix: (
   success: 'g',
   warning: 'y',
   danger: 'r',
+  red: 'r',
+  orange: 'o',
+  yellow: 'y',
+  green: 'g',
+  blue: 'b',
+  purple: 'p',
 );
 
 @function _get-palette-color($type, $grade, $alpha) {
@@ -42,34 +48,57 @@ $-map-type-to-prefix: (
   @return (--rcx-color-#{ $type }-#{ $grade }, $base-color);
 }
 
-@function neutral($grade, $alpha: null) {
-  $pair: _get-palette-color(neutral, $grade, $alpha);
+@function _refer-palette-color($type, $grade, $alpha: null) {
+  $pair: _get-palette-color($type, $grade, $alpha);
   @return var(list.nth($pair, 1), list.nth($pair, 2));
 }
 
+@function neutral($grade, $alpha: null) {
+  @return _refer-palette-color(neutral, $grade, $alpha);
+}
+
 @function primary($grade, $alpha: null) {
-  $pair: _get-palette-color(primary, $grade, $alpha);
-  @return var(list.nth($pair, 1), list.nth($pair, 2));
+  @return _refer-palette-color(primary, $grade, $alpha);
 }
 
 @function info($grade, $alpha: null) {
-  $pair: _get-palette-color(info, $grade, $alpha);
-  @return var(list.nth($pair, 1), list.nth($pair, 2));
+  @return _refer-palette-color(info, $grade, $alpha);
 }
 
 @function success($grade, $alpha: null) {
-  $pair: _get-palette-color(success, $grade, $alpha);
-  @return var(list.nth($pair, 1), list.nth($pair, 2));
+  @return _refer-palette-color(success, $grade, $alpha);
 }
 
 @function warning($grade, $alpha: null) {
-  $pair: _get-palette-color(warning, $grade, $alpha);
-  @return var(list.nth($pair, 1), list.nth($pair, 2));
+  @return _refer-palette-color(warning, $grade, $alpha);
 }
 
 @function danger($grade, $alpha: null) {
-  $pair: _get-palette-color(danger, $grade, $alpha);
-  @return var(list.nth($pair, 1), list.nth($pair, 2));
+  @return _refer-palette-color(danger, $grade, $alpha);
+}
+
+@function red($grade, $alpha: null) {
+  @return _refer-palette-color('red', $grade, $alpha);
+}
+
+@function orange($grade, $alpha: null) {
+  @return _refer-palette-color('orange', $grade, $alpha);
+}
+
+@function yellow($grade, $alpha: null) {
+  @return _refer-palette-color('yellow', $grade, $alpha);
+}
+
+@function green($grade, $alpha: null) {
+  @return _refer-palette-color('green', $grade, $alpha);
+}
+
+@function blue($grade, $alpha: null) {
+  @return _refer-palette-color('blue', $grade, $alpha);
+}
+
+@function purple($grade, $alpha: null) {
+  @return _refer-palette-color('purple', $grade, $alpha);
 }
 
 @function surface() {
diff --git a/packages/fuselage/src/styles/props/colors.js b/packages/fuselage/src/styles/props/colors.js
index 32da7fdf..2f64cef0 100644
--- a/packages/fuselage/src/styles/props/colors.js
+++ b/packages/fuselage/src/styles/props/colors.js
@@ -13,6 +13,12 @@ const mapTypeToPrefix = {
   success: 'g',
   warning: 'y',
   danger: 'r',
+  red: 'r',
+  orange: 'o',
+  yellow: 'y',
+  green: 'g',
+  blue: 'b',
+  purple: 'p',
 };
 
 const getPaletteColor = (type, grade, alpha) => {
@@ -63,7 +69,7 @@ const getForegroundColor = (type) => {
   return [`--rcx-color-foreground-${ type }`, color];
 };
 
-const paletteColorRegex = /^(neutral|primary|info|success|warning|danger)-(\d+)(-(\d+))?$/;
+const paletteColorRegex = /^([a-z]+)-(\d+)(-(\d+))?$/;
 
 export const getColorValue = memoize((propValue) => {
   if (propValue === undefined || propValue === null || typeof propValue !== 'string') {
-- 
GitLab