From 7503a0c82738366ecf177de1b217f135c32b4324 Mon Sep 17 00:00:00 2001
From: HeskeyBaozi <hezhiyu233@foxmail.com>
Date: Wed, 18 Jul 2018 10:07:10 +0800
Subject: [PATCH] use antd-icons

---
 components/icon/index.tsx           | 7 +++++--
 components/style/core/iconfont.less | 4 ++++
 package.json                        | 2 ++
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/components/icon/index.tsx b/components/icon/index.tsx
index 84b4e1dbad..bbe0a16e13 100755
--- a/components/icon/index.tsx
+++ b/components/icon/index.tsx
@@ -1,6 +1,10 @@
 import * as React from 'react';
 import classNames from 'classnames';
 import omit from 'omit.js';
+import { library, antDesignIcons } from 'antd-icons/esm';
+import AntdIcon from 'react-antd-icons/esm';
+
+library.add(...antDesignIcons);
 
 export interface IconProps {
   type: string;
@@ -16,9 +20,8 @@ const Icon = (props: IconProps) => {
   const classString = classNames({
     anticon: true,
     'anticon-spin': !!spin || type === 'loading',
-    [`anticon-${type}`]: true,
   }, className);
-  return <i {...omit(props, ['type', 'spin'])} className={classString} />;
+  return <AntdIcon {...omit(props, ['spin'])} className={classString} />;
 };
 
 export default Icon;
diff --git a/components/style/core/iconfont.less b/components/style/core/iconfont.less
index b2dde3b7d6..8a29239798 100644
--- a/components/style/core/iconfont.less
+++ b/components/style/core/iconfont.less
@@ -299,6 +299,10 @@
   display: inline-block;
   animation: loadingCircle 1s infinite linear;
 }
+.@{iconfont-css-prefix}-spin {
+  display: inline-block;
+  animation: loadingCircle 1s infinite linear;
+}
 
 .@{iconfont-css-prefix}-weibo-square:before { content: "\e6f5"; }
 .@{iconfont-css-prefix}-weibo-circle:before { content: "\e6f4"; }
diff --git a/package.json b/package.json
index 124af1f2e2..692964fde4 100644
--- a/package.json
+++ b/package.json
@@ -39,6 +39,7 @@
     "react-dom": ">=16.0.0"
   },
   "dependencies": {
+    "antd-icons": "^0.1.0-alpha.1",
     "array-tree-filter": "^2.0.0",
     "babel-runtime": "6.x",
     "classnames": "~2.2.0",
@@ -82,6 +83,7 @@
     "rc-trigger": "^2.5.4",
     "rc-upload": "~2.5.0",
     "rc-util": "^4.0.4",
+    "react-antd-icons": "^0.1.0-alpha.4",
     "react-lazy-load": "^3.0.12",
     "react-lifecycles-compat": "^3.0.4",
     "react-slick": "~0.23.1",