From bc5ee1c0391c98380fe7793df8b681a6c269648c Mon Sep 17 00:00:00 2001 From: nabeliwo Date: Mon, 2 Sep 2019 13:20:15 +0900 Subject: [PATCH] fix: Use fa-check instead of check --- src/components/Checkbox/Checkbox.tsx | 2 +- src/components/Icon/Icon.stories.tsx | 2 +- src/components/Icon/Icon.tsx | 4 ++-- src/components/Icon/svg/Check.tsx | 19 ------------------- 4 files changed, 4 insertions(+), 23 deletions(-) delete mode 100644 src/components/Icon/svg/Check.tsx diff --git a/src/components/Checkbox/Checkbox.tsx b/src/components/Checkbox/Checkbox.tsx index 5d89645a46..28b575721f 100644 --- a/src/components/Checkbox/Checkbox.tsx +++ b/src/components/Checkbox/Checkbox.tsx @@ -34,7 +34,7 @@ class CheckboxComponent extends React.PureComponent { {checked && ( diff --git a/src/components/Icon/Icon.stories.tsx b/src/components/Icon/Icon.stories.tsx index 3f5bb3de34..6480c50644 100644 --- a/src/components/Icon/Icon.stories.tsx +++ b/src/components/Icon/Icon.stories.tsx @@ -8,7 +8,6 @@ const Wrapper = ({ children }: any) => {children} const black = '#222' const white = '#eee' const icons: Array = [ - 'check', 'check-circle', 'cross', 'exclamation-triangle', @@ -26,6 +25,7 @@ const icons: Array = [ 'fa-chart-bar', 'fa-chart-line', 'fa-chart-pie', + 'fa-check', 'fa-cog', 'fa-databas', 'fa-ellipsis-h', diff --git a/src/components/Icon/Icon.tsx b/src/components/Icon/Icon.tsx index 6418ce6fec..07036b3274 100644 --- a/src/components/Icon/Icon.tsx +++ b/src/components/Icon/Icon.tsx @@ -14,6 +14,7 @@ import { FaChartBar, FaChartLine, FaChartPie, + FaCheck, FaCog, FaDatabase, FaEllipsisH, @@ -47,7 +48,6 @@ import { FaUserCircle, FaUsers, } from 'react-icons/fa' -import { Check } from './svg/Check' import { CheckCircle } from './svg/CheckCircle' import { Cross } from './svg/Cross' import { ExclamationTriangle } from './svg/ExclamationTriangle' @@ -62,7 +62,6 @@ export interface Props extends IconProps { } const iconMap = { - check: Check, 'check-circle': CheckCircle, cross: Cross, 'exclamation-triangle': ExclamationTriangle, @@ -80,6 +79,7 @@ const iconMap = { 'fa-chart-bar': FaChartBar, 'fa-chart-line': FaChartLine, 'fa-chart-pie': FaChartPie, + 'fa-check': FaCheck, 'fa-cog': FaCog, 'fa-databas': FaDatabase, 'fa-ellipsis-h': FaEllipsisH, diff --git a/src/components/Icon/svg/Check.tsx b/src/components/Icon/svg/Check.tsx deleted file mode 100644 index 7882f3543e..0000000000 --- a/src/components/Icon/svg/Check.tsx +++ /dev/null @@ -1,19 +0,0 @@ -import * as React from 'react' - -import { InjectedProps, withTheme } from '../../../hocs/withTheme' -import { IconProps } from '../Icon' - -const CheckIcon: React.FC = ({ size = 16, color, theme }) => ( - - check - - - - -) - -export const Check = withTheme(CheckIcon)