From 9b776c36961dcda0ab5846d24eaa88b6b51a315e Mon Sep 17 00:00:00 2001
From: Dave McCarthy <dave.mccarthy@mongodb.com>
Date: Fri, 28 Jun 2019 14:25:14 -0400
Subject: [PATCH 1/2] feat(badge): update badge variants to reflect new badge
 design / palette

---
 packages/badge/README.md           |  15 ++--
 packages/badge/package.json        |   2 +-
 packages/badge/src/Badge.story.tsx |   8 +-
 packages/badge/src/Badge.tsx       | 136 +++++++++++++++--------------
 4 files changed, 79 insertions(+), 82 deletions(-)

diff --git a/packages/badge/README.md b/packages/badge/README.md
index 780083b8da..1be7ac5f21 100644
--- a/packages/badge/README.md
+++ b/packages/badge/README.md
@@ -7,18 +7,15 @@
 ```Javascript
 import Badge from '@leafygreen-ui/badge';
 
-  <Badge
-    variant='lightBlue'
-    className='my-badge'
-  >
-    New
-  </Badge>
+<Badge variant='Blue' className='my-badge'>
+  New
+</Badge>
 ```
 
 **Output HTML**
 
 ```HTML
-  <span class="leafygreen-ui-rhgfxf my-badge">New</span>
+  <div class="leafygreen-ui-rhgfxf my-badge">New</div>
 ```
 
 ## Properties
@@ -27,9 +24,9 @@ import Badge from '@leafygreen-ui/badge';
 
 **Type:** `string`
 
-**Default:** `'default'`
+**Default:** `'LightGray'`
 
-Sets the style variant of the badge. Valid variants for badges are `'default'`, `'danger'`, `'warning'`, `'darkBlue'`, `'lightBlue'`, `'primary'`, `'outline'`, and `'dark'`.
+Sets the style variant of the badge. Valid variants for badges are `'LightGray'`, `'DarkGray'`, `'Red'`, `'Blue'`, `'Green'`, and `'Yellow'`
 
 ### className
 
diff --git a/packages/badge/package.json b/packages/badge/package.json
index d186b3d154..afaacd5f98 100644
--- a/packages/badge/package.json
+++ b/packages/badge/package.json
@@ -14,7 +14,7 @@
   },
   "dependencies": {
     "@leafygreen-ui/lib": "^3.0.1",
-    "@leafygreen-ui/theme": "^1.2.1"
+    "@leafygreen-ui/palette": "^1.0.1"
   },
   "gitHead": "5a89ae7074a6e9500cd123c88196f106163c67e6"
 }
diff --git a/packages/badge/src/Badge.story.tsx b/packages/badge/src/Badge.story.tsx
index 48105ff903..9ea0840252 100644
--- a/packages/badge/src/Badge.story.tsx
+++ b/packages/badge/src/Badge.story.tsx
@@ -5,13 +5,7 @@ import Badge from './Badge';
 import { Variant } from '.';
 
 storiesOf('Badge', module).add('Default', () => (
-  <Badge
-    variant={select(
-      'Variant',
-      Object.values(Variant) as Array<Variant>,
-      Variant.DarkBlue,
-    )}
-  >
+  <Badge variant={select('Variant', Object.values(Variant), Variant.LightGray)}>
     {text('Badge Text', 'Badge')}
   </Badge>
 ));
diff --git a/packages/badge/src/Badge.tsx b/packages/badge/src/Badge.tsx
index d0183761b8..9b63ada918 100644
--- a/packages/badge/src/Badge.tsx
+++ b/packages/badge/src/Badge.tsx
@@ -1,17 +1,15 @@
-import React, { PureComponent } from 'react';
+import React from 'react';
 import PropTypes from 'prop-types';
-import { colors } from '@leafygreen-ui/theme';
+import { uiColors } from '@leafygreen-ui/palette';
 import { css, cx } from '@leafygreen-ui/emotion';
 
 export const Variant = {
-  Default: 'default',
-  Dark: 'dark',
-  Danger: 'danger',
-  Warning: 'warning',
-  DarkBlue: 'darkBlue',
-  LightBlue: 'lightBlue',
-  Primary: 'primary',
-  Outline: 'outline',
+  DarkGray: 'darkgray',
+  LightGray: 'lightgray',
+  Red: 'red',
+  Yellow: 'yellow',
+  Blue: 'blue',
+  Green: 'green',
 } as const;
 
 export type Variant = typeof Variant[keyof typeof Variant];
@@ -27,77 +25,85 @@ export const baseStyle = css`
   padding-left: 9px;
   padding-right: 9px;
   text-transform: uppercase;
-  color: ${colors.mongodb.white};
+  border: 1px solid;
 `;
 
-export const badgeVariants: { readonly [K in Variant]: string } = {
-  default: css`
-    background-color: ${colors.gray[6]};
-    color: ${colors.gray[3]};
+export const badgeVariants: { [K in Variant]: string } = {
+  [Variant.LightGray]: css`
+    background-color: ${uiColors.gray.light3};
+    border-color: ${uiColors.gray.light2};
+    color: ${uiColors.gray.dark1};
   `,
 
-  dark: css`
-    background-color: ${colors.gray[2]};
+  [Variant.DarkGray]: css`
+    background-color: ${uiColors.gray.dark2};
+    border-color: ${uiColors.gray.dark3};
+    color: ${uiColors.white};
   `,
 
-  danger: css`
-    background-color: ${colors.mongodb.red};
+  [Variant.Red]: css`
+    background-color: ${uiColors.red.light3};
+    border-color: ${uiColors.red.light2};
+    color: ${uiColors.red.dark2};
   `,
 
-  warning: css`
-    background-color: ${colors.mongodb.yellow};
+  [Variant.Yellow]: css`
+    background-color: ${uiColors.yellow.light3};
+    border-color: ${uiColors.yellow.light2};
+    color: ${uiColors.yellow.dark2};
   `,
 
-  darkBlue: css`
-    background-color: ${colors.mongodb.navyBlue};
+  [Variant.Blue]: css`
+    background-color: ${uiColors.blue.light3};
+    border-color: ${uiColors.blue.light2};
+    color: ${uiColors.blue.dark2};
   `,
 
-  lightBlue: css`
-    background-color: ${colors.mongodb.blue};
+  [Variant.Green]: css`
+    background-color: ${uiColors.green.light3};
+    border-color: ${uiColors.green.light2};
+    color: ${uiColors.green.dark2};
   `,
-
-  primary: css`
-    background-color: ${colors.mongodb.green};
-  `,
-
-  outline: css`
-    border: 1px solid ${colors.gray[3]};
-    color: ${colors.gray[3]};
-  `,
-};
+} as const;
 
 interface BadgeProps {
-  className: string;
+  /**
+   * An additional className to add to the component's classList
+   */
+  className?: string;
+
+  /**
+   * The content to render within the badge
+   */
   children?: React.ReactNode;
-  variant: Variant;
+
+  /**
+   * The Badge's style variant
+   *
+   * Default: `'lightgray'`
+   */
+  variant?: Variant;
 }
 
-export default class Badge extends PureComponent<
-  BadgeProps & React.HTMLAttributes<HTMLDivElement>
-> {
-  static displayName = 'Badge';
-
-  static propTypes = {
-    className: PropTypes.string,
-    children: PropTypes.node,
-    variant: PropTypes.oneOf(Object.values(Variant)),
-  };
-
-  static defaultProps = {
-    className: '',
-    variant: Variant.Default,
-  };
-
-  render() {
-    const { children, variant, className, ...rest } = this.props;
-
-    return (
-      <div
-        {...rest}
-        className={cx(baseStyle, badgeVariants[variant], className)}
-      >
-        {children}
-      </div>
-    );
-  }
+function Badge({
+  children,
+  variant = Variant.LightGray,
+  className,
+  ...rest
+}: BadgeProps & React.HTMLAttributes<HTMLDivElement>) {
+  return (
+    <div {...rest} className={cx(baseStyle, badgeVariants[variant], className)}>
+      {children}
+    </div>
+  );
 }
+
+Badge.displayName = 'Badge';
+
+Badge.propTypes = {
+  className: PropTypes.string,
+  children: PropTypes.node,
+  variant: PropTypes.oneOf(Object.values(Variant)),
+};
+
+export default Badge;

From 8e21f7a1d794693042acbc262bb5ac8c48e46c31 Mon Sep 17 00:00:00 2001
From: Dave McCarthy <dave.mccarthy@mongodb.com>
Date: Tue, 2 Jul 2019 13:14:12 -0700
Subject: [PATCH 2/2] docs(badge): fix variant values in documentation

---
 packages/badge/README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/badge/README.md b/packages/badge/README.md
index 1be7ac5f21..de90baa40f 100644
--- a/packages/badge/README.md
+++ b/packages/badge/README.md
@@ -7,7 +7,7 @@
 ```Javascript
 import Badge from '@leafygreen-ui/badge';
 
-<Badge variant='Blue' className='my-badge'>
+<Badge variant='blue' className='my-badge'>
   New
 </Badge>
 ```
@@ -24,9 +24,9 @@ import Badge from '@leafygreen-ui/badge';
 
 **Type:** `string`
 
-**Default:** `'LightGray'`
+**Default:** `'lightgray'`
 
-Sets the style variant of the badge. Valid variants for badges are `'LightGray'`, `'DarkGray'`, `'Red'`, `'Blue'`, `'Green'`, and `'Yellow'`
+Sets the style variant of the badge. Valid variants for badges are `'lightgray'`, `'darkgray'`, `'red'`, `'blue'`, `'green'`, and `'yellow'`
 
 ### className