fix(Chip): change size regular to medium

treebohotels · Mar 8, 2018 · 0cb2b32 · 0cb2b32
1 parent bdb2d9e
commit 0cb2b32
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 19 deletions.
diff --git a/src/components/Chip/Chip.js b/src/components/Chip/Chip.js
@@ -8,14 +8,14 @@ const Chip = styled.div`
   border-radius: 100px;
   border: 1px solid ${(p) => p.theme.color[p.color]};
   ${(p) => ({
-    regular: `
-      font-size: ${p.theme.fontSize.xs};
-      padding: ${p.theme.px([1, 1.5])};
-    `,
     small: `
       font-size: ${p.theme.fontSize.xxs};
       padding: ${p.theme.px(0.5)};
     `,
+    medium: `
+      font-size: ${p.theme.fontSize.xs};
+      padding: ${p.theme.px([1, 1.5])};
+    `,
   }[p.size])}
   ${(p) => ({
     solid: `
@@ -31,13 +31,13 @@ const Chip = styled.div`
 
 Chip.propTypes = {
   color: PropTypes.string,
-  size: PropTypes.oneOf(['regular', 'small']),
+  size: PropTypes.oneOf(['small', 'medium']),
   kind: PropTypes.oneOf(['solid', 'outlined']),
 };
 
 Chip.defaultProps = {
   color: 'primary',
-  size: 'regular',
+  size: 'medium',
   kind: 'outlined',
 };
 

diff --git a/src/components/Chip/Chip.story.js b/src/components/Chip/Chip.story.js
@@ -9,7 +9,7 @@ storiesOf('Chip', module)
     <Chip
       color={select('color', Object.keys(theme.color), 'primary')}
       kind={select('kind', ['solid', 'outlined'], 'outlined')}
-      size={select('size', ['small', 'regular'], 'regular')}
+      size={select('size', ['small', 'medium'], 'medium')}
     >
       {text('children', 'Chip')}
     </Chip>
@@ -27,12 +27,12 @@ storiesOf('Chip', module)
   ))
   .add('size', () => (
     <div>
-      <Chip>
-        regular
-      </Chip>
-      <br /><br />
       <Chip size="small">
         small
       </Chip>
+      <br /><br />
+      <Chip>
+        medium
+      </Chip>
     </div>
   ));
diff --git a/src/components/Chip/native/Chip.js b/src/components/Chip/native/Chip.js
@@ -8,12 +8,12 @@ const ChipContainer = styled.View`
   align-items: center;
   justify-content: center;
   ${(p) => ({
-    regular: `
-      padding: ${p.theme.px([1, 1.5])};
-    `,
     small: `
       padding: ${p.theme.px(0.5)};
     `,
+    medium: `
+      padding: ${p.theme.px([1, 1.5])};
+    `,
   }[p.size])}
   ${(p) => ({
     solid: `
@@ -41,8 +41,8 @@ const Chip = ({ style, color, size, kind, children }) => (
         outlined: color,
       }[kind]}
       size={{
-        regular: 'xs',
         small: 'xxs',
+        medium: 'xs',
       }[size]}
     >
       {children}
@@ -56,14 +56,14 @@ Chip.propTypes = {
     PropTypes.object,
   ]),
   color: PropTypes.string,
-  size: PropTypes.oneOf(['regular', 'small']),
+  size: PropTypes.oneOf(['small', 'medium']),
   kind: PropTypes.oneOf(['solid', 'outlined']),
   children: PropTypes.string,
 };
 
 Chip.defaultProps = {
   color: 'primary',
-  size: 'regular',
+  size: 'medium',
   kind: 'outlined',
 };
 

diff --git a/storybook/native/stories.js b/storybook/native/stories.js
@@ -221,7 +221,7 @@ storiesOf('Chip', module)
       </Spacer>
       <Spacer margin={2}>
         <Chip color="yellow" kind="solid">
-          solid regular
+          solid medium
         </Chip>
       </Spacer>
       <Spacer margin={2}>
@@ -231,7 +231,7 @@ storiesOf('Chip', module)
       </Spacer>
       <Spacer margin={2}>
         <Chip color="lagoon">
-          outlined regular
+          outlined medium
         </Chip>
       </Spacer>
       <Spacer margin={2}>