From dd8559a2aafef92289084be4769d0072e02fb80c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@youzan.com>
Date: Sun, 29 Dec 2019 08:29:59 +0800
Subject: [PATCH] chore(Icon): improve perf

---
 src/button/test/__snapshots__/demo.spec.js.snap |  6 ++----
 src/icon/index.less                             |  1 +
 src/icon/index.tsx                              | 10 +++++-----
 src/icon/test/__snapshots__/index.spec.js.snap  | 12 ++++--------
 4 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/src/button/test/__snapshots__/demo.spec.js.snap b/src/button/test/__snapshots__/demo.spec.js.snap
index 75ac8ffa7..035fca401 100644
--- a/src/button/test/__snapshots__/demo.spec.js.snap
+++ b/src/button/test/__snapshots__/demo.spec.js.snap
@@ -18,10 +18,8 @@ exports[`renders demo correctly 1`] = `
   <div><button class="van-button van-button--primary van-button--normal van-button--square"><span class="van-button__text">方形按钮</span></button> <button class="van-button van-button--info van-button--normal van-button--round"><span class="van-button__text">圆形按钮</span></button></div>
   <div><button class="van-button van-button--primary van-button--normal"><i class="van-icon van-icon-star-o van-button__icon">
         <!----></i></button> <button class="van-button van-button--primary van-button--normal"><i class="van-icon van-icon-star-o van-button__icon">
-        <!----></i><span class="van-button__text">按钮</span></button> <button class="van-button van-button--primary van-button--normal van-button--plain"><i class="van-icon van-button__icon">
-        <div class="van-image van-icon__image"><img src="https://img.yzcdn.cn/vant/logo.png" class="van-image__img" style="object-fit: contain;"></div>
-        <!---->
-      </i><span class="van-button__text">按钮</span></button></div>
+        <!----></i><span class="van-button__text">按钮</span></button> <button class="van-button van-button--primary van-button--normal van-button--plain"><i class="van-icon van-button__icon"><img src="https://img.yzcdn.cn/vant/logo.png" class="van-icon__image">
+        <!----></i><span class="van-button__text">按钮</span></button></div>
   <div><button class="van-button van-button--primary van-button--large"><span class="van-button__text">大号按钮</span></button> <button class="van-button van-button--primary van-button--normal"><span class="van-button__text">普通按钮</span></button> <button class="van-button van-button--primary van-button--small"><span class="van-button__text">小型按钮</span></button> <button class="van-button van-button--primary van-button--mini"><span class="van-button__text">迷你按钮</span></button></div>
   <div><button class="van-button van-button--primary van-button--normal"><span class="van-button__text">URL 跳转</span></button> <button class="van-button van-button--primary van-button--normal"><span class="van-button__text">路由跳转</span></button></div>
   <div><button class="van-button van-button--default van-button--normal" style="color: rgb(255, 255, 255); background: rgb(114, 50, 221); border-color: #7232dd;"><span class="van-button__text">单色按钮</span></button> <button class="van-button van-button--default van-button--normal van-button--plain" style="color: rgb(114, 50, 221); border-color: #7232dd;"><span class="van-button__text">单色按钮</span></button> <button class="van-button van-button--default van-button--normal" style="color: rgb(255, 255, 255); border: 0px;"><span class="van-button__text">渐变色按钮</span></button></div>
diff --git a/src/icon/index.less b/src/icon/index.less
index 71e752afa..f1b78f967 100644
--- a/src/icon/index.less
+++ b/src/icon/index.less
@@ -5,5 +5,6 @@
   &__image {
     width: 1em;
     height: 1em;
+    object-fit: contain;
   }
 }
diff --git a/src/icon/index.tsx b/src/icon/index.tsx
index 5baa1a4c4..833a20bf9 100644
--- a/src/icon/index.tsx
+++ b/src/icon/index.tsx
@@ -1,7 +1,6 @@
 import { createNamespace, addUnit } from '../utils';
 import { inherit } from '../utils/functional';
 import Info from '../info';
-import Image from '../image';
 
 // Types
 import { CreateElement, RenderContext } from 'vue/types';
@@ -43,7 +42,10 @@ function Icon(
 
   return (
     <props.tag
-      class={[props.classPrefix, imageIcon ? '' : `${props.classPrefix}-${name}`]}
+      class={[
+        props.classPrefix,
+        imageIcon ? '' : `${props.classPrefix}-${name}`
+      ]}
       style={{
         color: props.color,
         fontSize: addUnit(props.size)
@@ -51,9 +53,7 @@ function Icon(
       {...inherit(ctx, true)}
     >
       {slots.default && slots.default()}
-      {imageIcon && (
-        <Image class={bem('image')} fit="contain" src={name} showLoading={false} />
-      )}
+      {imageIcon && <img class={bem('image')} src={name} />}
       <Info dot={props.dot} info={props.info} />
     </props.tag>
   );
diff --git a/src/icon/test/__snapshots__/index.spec.js.snap b/src/icon/test/__snapshots__/index.spec.js.snap
index a3422ace5..54ddf2e50 100644
--- a/src/icon/test/__snapshots__/index.spec.js.snap
+++ b/src/icon/test/__snapshots__/index.spec.js.snap
@@ -17,17 +17,13 @@ exports[`render icon with builtin icon name 1`] = `
 `;
 
 exports[`render icon with local image 1`] = `
-<i class="van-icon">
-  <div class="van-image van-icon__image"><img src="/assets/icon.jpg" class="van-image__img" style="object-fit: contain;"></div>
-  <!---->
-</i>
+<i class="van-icon"><img src="/assets/icon.jpg" class="van-icon__image">
+  <!----></i>
 `;
 
 exports[`render icon with url name 1`] = `
-<i class="van-icon">
-  <div class="van-image van-icon__image"><img src="https://img.yzcdn.com/icon.jpg" class="van-image__img" style="object-fit: contain;"></div>
-  <!---->
-</i>
+<i class="van-icon"><img src="https://img.yzcdn.com/icon.jpg" class="van-icon__image">
+  <!----></i>
 `;
 
 exports[`size without unit 1`] = `