Fix tag bg color props

nordcloud · May 21, 2020 · 1b06746 · 1b06746
1 parent e263c76
commit 1b06746
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 11 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nordcloud/gnui",
-  "version": "0.2.4",
+  "version": "0.2.5",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "repository": "git://github.com/nordcloud/gnui.git",

diff --git a/src/components/tag/Tag.tsx b/src/components/tag/Tag.tsx
@@ -6,9 +6,7 @@ interface TagProps {
   color?: string;
   text?: string;
 }
-const changeTagColor = (color: string) => css`
-  background-color: ${theme.colors[color]};
-`;
+
 export const StyledTag = styled.div`
   display: inline-block;
   text-transform: capitalize;
@@ -20,13 +18,8 @@ export const StyledTag = styled.div`
   margin: ${theme.spacing.spacing01};
   border-radius: 1rem;
   color: ${theme.colors.lights[0]};
-  background-color: ${theme.colors.lights[3]};
-
-  ${({ color }) =>
-    color &&
-    css`
-      ${changeTagColor(color)}
-    `}
+  background-color: ${({ color }) =>
+    color ? theme.colors[color] || color : theme.colors.lights[3]};
 `;
 
 export const Tag: React.FC<TagProps> = ({ color, text }) => {

diff --git a/src/stories/Tag.stories.mdx b/src/stories/Tag.stories.mdx
@@ -27,6 +27,7 @@ import { Container } from "../components/container";
       <Tag color="danger" text="failed" />
       <Tag color="notification" text="starting" />
       <Tag color="primary" text="primary" />
+      <Tag color="#daffad" text="custom" />
       <Tag text="No data" />
     </Container>
   </Story>