From 28fd4909ce19d79c875dff2bc6680713744db9df Mon Sep 17 00:00:00 2001
From: zack <zack24q@gmail.com>
Date: Tue, 4 Sep 2018 21:15:13 +0800
Subject: [PATCH] fix: button with icon and inline (#2742)

---
 .../__tests__/__snapshots__/demo.test.js.snap | 38 +++++++++++++++++++
 components/button/demo/basic.md               |  3 ++
 components/button/style/index.less            |  3 ++
 3 files changed, 44 insertions(+)

diff --git a/components/button/__tests__/__snapshots__/demo.test.js.snap b/components/button/__tests__/__snapshots__/demo.test.js.snap
index 980273d7a4..26c9953500 100644
--- a/components/button/__tests__/__snapshots__/demo.test.js.snap
+++ b/components/button/__tests__/__snapshots__/demo.test.js.snap
@@ -133,6 +133,44 @@ exports[`renders ./components/button/demo/basic.md correctly 1`] = `
   <div
     class="am-whitespace am-whitespace-md"
   />
+  <a
+    aria-disabled="false"
+    class="am-button am-button-small am-button-inline am-button-icon"
+    role="button"
+    style="margin-right:4px"
+  >
+    <svg
+      aria-hidden="true"
+      class="am-button-icon am-icon am-icon-check-circle-o am-icon-xxs"
+    >
+      <use
+        href="#check-circle-o"
+      />
+    </svg>
+    <span>
+      with icon and inline
+    </span>
+  </a>
+  <a
+    aria-disabled="false"
+    class="am-button am-button-small am-button-inline am-button-icon"
+    role="button"
+  >
+    <svg
+      aria-hidden="true"
+      class="am-button-icon am-icon am-icon-check-circle-o am-icon-xxs"
+    >
+      <use
+        href="#check-circle-o"
+      />
+    </svg>
+    <span>
+      with icon and inline
+    </span>
+  </a>
+  <div
+    class="am-whitespace am-whitespace-md"
+  />
   <div
     class="am-whitespace am-whitespace-md"
   />
diff --git a/components/button/demo/basic.md b/components/button/demo/basic.md
index faa86b0b90..7e96413fd4 100644
--- a/components/button/demo/basic.md
+++ b/components/button/demo/basic.md
@@ -24,6 +24,9 @@ const ButtonExample = () => (
     <Button loading>loading button</Button><WhiteSpace />
     <Button icon="check-circle-o">with icon</Button><WhiteSpace />
     <Button icon={<img src="https://gw.alipayobjects.com/zos/rmsportal/jBfVSpDwPbitsABtDDlB.svg" alt="" />}>with custom icon</Button><WhiteSpace />
+    <Button icon="check-circle-o" inline size="small" style={{ marginRight: '4px' }}>with icon and inline</Button>
+    <Button icon="check-circle-o" inline size="small">with icon and inline</Button>
+    <WhiteSpace />
 
     {/* <Button activeStyle={false}>无点击反馈</Button><WhiteSpace /> */}
     {/* <Button activeStyle={{ backgroundColor: 'red' }}>custom feedback style</Button><WhiteSpace /> */}
diff --git a/components/button/style/index.less b/components/button/style/index.less
index c312fda000..61dc347d7c 100644
--- a/components/button/style/index.less
+++ b/components/button/style/index.less
@@ -89,6 +89,9 @@
   &-inline {
     display: inline-block;
     padding: 0 @h-spacing-lg;
+    &.@{buttonPrefixCls}-icon {
+      display: inline-flex;
+    }
   }
 
   &-small {