From 95c72958ca902173415a9589ae9b0e80ea78dc18 Mon Sep 17 00:00:00 2001
From: afc163 <afc163@gmail.com>
Date: Sun, 8 Oct 2017 15:22:24 +0800
Subject: [PATCH] Fix AutoCompelete layout, close #7800

---
 .../__tests__/__snapshots__/demo.test.js.snap | 102 +++++++++---------
 .../auto-complete/demo/{antd.md => custom.md} |  10 +-
 components/auto-complete/style/index.less     |  10 ++
 components/select/style/index.less            |   1 +
 4 files changed, 66 insertions(+), 57 deletions(-)
 rename components/auto-complete/demo/{antd.md => custom.md} (81%)

diff --git a/components/auto-complete/__tests__/__snapshots__/demo.test.js.snap b/components/auto-complete/__tests__/__snapshots__/demo.test.js.snap
index 08ce3c4872da..b7f606b0930c 100644
--- a/components/auto-complete/__tests__/__snapshots__/demo.test.js.snap
+++ b/components/auto-complete/__tests__/__snapshots__/demo.test.js.snap
@@ -1,59 +1,5 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`renders ./components/auto-complete/demo/antd.md correctly 1`] = `
-<div
-  class="ant-select-show-search ant-select-auto-complete ant-select ant-select-combobox ant-select-enabled"
-  style="width:200px;height:50px;"
->
-  <div
-    aria-autocomplete="list"
-    aria-expanded="false"
-    aria-haspopup="true"
-    class="ant-select-selection
-              ant-select-selection--single"
-    role="combobox"
-  >
-    <div
-      class="ant-select-selection__rendered"
-    >
-      <div
-        class="ant-select-selection__placeholder"
-        style="display:block;user-select:none;-webkit-user-select:none;"
-        unselectable="unselectable"
-      >
-        input here
-      </div>
-      <ul>
-        <li
-          class="ant-select-search ant-select-search--inline"
-        >
-          <div
-            class="ant-select-search__field__wrap"
-          >
-            <textarea
-              class="ant-input custom ant-select-search__field"
-              style="height:50px;"
-            />
-            <span
-              class="ant-select-search__field__mirror"
-            >
-               
-            </span>
-          </div>
-        </li>
-      </ul>
-    </div>
-    <span
-      class="ant-select-arrow"
-      style="user-select:none;-webkit-user-select:none;"
-      unselectable="unselectable"
-    >
-      <b />
-    </span>
-  </div>
-</div>
-`;
-
 exports[`renders ./components/auto-complete/demo/basic.md correctly 1`] = `
 <div
   class="ant-select-show-search ant-select-auto-complete ant-select ant-select-combobox ant-select-enabled"
@@ -180,6 +126,54 @@ exports[`renders ./components/auto-complete/demo/certain-category.md correctly 1
 </div>
 `;
 
+exports[`renders ./components/auto-complete/demo/custom.md correctly 1`] = `
+<div
+  class="ant-select-show-search ant-select-auto-complete ant-select ant-select-combobox ant-select-enabled"
+  style="width:200px;"
+>
+  <div
+    aria-autocomplete="list"
+    aria-expanded="false"
+    aria-haspopup="true"
+    class="ant-select-selection
+              ant-select-selection--single"
+    role="combobox"
+  >
+    <div
+      class="ant-select-selection__rendered"
+    >
+      <ul>
+        <li
+          class="ant-select-search ant-select-search--inline"
+        >
+          <div
+            class="ant-select-search__field__wrap"
+          >
+            <textarea
+              class="ant-input custom ant-select-search__field"
+              placeholder="input here"
+              style="height:50px;"
+            />
+            <span
+              class="ant-select-search__field__mirror"
+            >
+               
+            </span>
+          </div>
+        </li>
+      </ul>
+    </div>
+    <span
+      class="ant-select-arrow"
+      style="user-select:none;-webkit-user-select:none;"
+      unselectable="unselectable"
+    >
+      <b />
+    </span>
+  </div>
+</div>
+`;
+
 exports[`renders ./components/auto-complete/demo/non-case-sensitive.md correctly 1`] = `
 <div
   class="ant-select-show-search ant-select-auto-complete ant-select ant-select-combobox ant-select-enabled"
diff --git a/components/auto-complete/demo/antd.md b/components/auto-complete/demo/custom.md
similarity index 81%
rename from components/auto-complete/demo/antd.md
rename to components/auto-complete/demo/custom.md
index f09c26ab971a..2cb0d917fb6f 100644
--- a/components/auto-complete/demo/antd.md
+++ b/components/auto-complete/demo/custom.md
@@ -45,12 +45,16 @@ class Complete extends React.Component {
     return (
       <AutoComplete
         dataSource={dataSource}
-        style={{ width: 200, height: 50 }}
+        style={{ width: 200 }}
         onSelect={onSelect}
         onSearch={this.handleSearch}
-        placeholder="input here"
       >
-        <TextArea className="custom" onKeyPress={this.handleKeyPress} style={{ height: 50 }} />
+        <TextArea
+          placeholder="input here"
+          className="custom"
+          style={{ height: 50 }}
+          onKeyPress={this.handleKeyPress}
+        />
       </AutoComplete>
     );
   }
diff --git a/components/auto-complete/style/index.less b/components/auto-complete/style/index.less
index 9d66304aa39a..511cb59d41a7 100644
--- a/components/auto-complete/style/index.less
+++ b/components/auto-complete/style/index.less
@@ -22,9 +22,19 @@
           margin-left: (@input-padding-horizontal + 1px);
           margin-right: (@input-padding-horizontal + 1px);
         }
+
+        &--single {
+          height: auto;
+        }
       }
     }
 
+    // Fix https://github.com/ant-design/ant-design/issues/7800
+    .@{select-prefix-cls}-search--inline {
+      position: static;
+      float: left;
+    }
+
     &-allow-clear {
       .@{select-prefix-cls}-selection:hover .@{select-prefix-cls}-selection__rendered {
         margin-right: 0 !important;
diff --git a/components/select/style/index.less b/components/select/style/index.less
index 936b31e5865c..6c99f868b530 100644
--- a/components/select/style/index.less
+++ b/components/select/style/index.less
@@ -465,6 +465,7 @@
       white-space: nowrap;
       cursor: pointer;
       overflow: hidden;
+      text-overflow: ellipsis;
       transition: background 0.3s ease;
 
       &:hover {