fix: Allow empty string props to Lable and LinkLabel (#319)

Allow empty string props to Lable and LinkLabel to modify the propTypes warning
sendbird · Sep 27, 2022 · 31ce483 · 31ce483
1 parent 71d3605
commit 31ce483
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 28 deletions.
diff --git a/src/ui/Label/index.jsx b/src/ui/Label/index.jsx
@@ -31,30 +31,8 @@ Label.propTypes = {
     PropTypes.string,
     PropTypes.arrayOf(PropTypes.string),
   ]),
-  type: PropTypes.oneOf([
-    'H_1',
-    'H_2',
-    'SUBTITLE_1',
-    'SUBTITLE_2',
-    'BODY_1',
-    'BODY_2',
-    'BUTTON_1',
-    'BUTTON_2',
-    'CAPTION_1',
-    'CAPTION_2',
-    'CAPTION_3',
-  ]),
-  color: PropTypes.oneOf([
-    'ONBACKGROUND_1',
-    'ONBACKGROUND_2',
-    'ONBACKGROUND_3',
-    'ONBACKGROUND_4',
-    'ONCONTENT_1',
-    'ONCONTENT_2',
-    'PRIMARY',
-    'ERROR',
-    'SECONDARY_3',
-  ]),
+  type: PropTypes.string,
+  color: PropTypes.string,
   children: PropTypes.oneOfType([
     PropTypes.string,
     PropTypes.number,

diff --git a/src/ui/Label/utils.js b/src/ui/Label/utils.js
@@ -13,7 +13,7 @@ export function changeTypographyToClassName(type) {
     case Typography.CAPTION_1: return 'sendbird-label--caption-1';
     case Typography.CAPTION_2: return 'sendbird-label--caption-2';
     case Typography.CAPTION_3: return 'sendbird-label--caption-3';
-    default: return null;
+    default: return '';
   }
 }
 
@@ -28,6 +28,6 @@ export function changeColorToClassName(color) {
     case Colors.PRIMARY: return 'sendbird-label--color-primary'; // should be Primary-3 fix me
     case Colors.ERROR: return 'sendbird-label--color-error';
     case Colors.SECONDARY_3: return 'sendbird-label--color-secondary-3';
-    default: return null;
+    default: return '';
   }
 }
diff --git a/src/ui/LinkLabel/index.jsx b/src/ui/LinkLabel/index.jsx
@@ -44,8 +44,8 @@ LinkLabel.propTypes = {
     PropTypes.arrayOf(PropTypes.string),
   ]),
   src: PropTypes.string.isRequired,
-  type: PropTypes.oneOf(Object.keys(LabelTypography)).isRequired,
-  color: PropTypes.oneOf(Object.keys(LabelColors)).isRequired,
+  type: PropTypes.string,
+  color: PropTypes.string,
   children: PropTypes.oneOfType([
     PropTypes.string,
     PropTypes.element,
@@ -56,6 +56,8 @@ LinkLabel.propTypes = {
 
 LinkLabel.defaultProps = {
   className: '',
+  type: '',
+  color: '',
 };
 
 export const LinkLabelTypography = LabelTypography;