From 46b06853641918db372198900aef1a12e9407dc4 Mon Sep 17 00:00:00 2001
From: yiminghe <yiminghe@gmail.com>
Date: Wed, 8 Jul 2015 22:07:15 +0800
Subject: [PATCH] upgrade select

---
 components/select/demo/basic.md    | 8 ++++----
 components/select/demo/combobox.md | 2 +-
 components/select/demo/multiple.md | 2 +-
 components/select/demo/search.md   | 8 ++++----
 components/select/demo/tags.md     | 2 +-
 package.json                       | 2 +-
 style/components/select.less       | 9 +++++++--
 7 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/components/select/demo/basic.md b/components/select/demo/basic.md
index 3b8c8839f..fb224fb99 100644
--- a/components/select/demo/basic.md
+++ b/components/select/demo/basic.md
@@ -16,10 +16,10 @@ function handleChange(value) {
 
 React.render(
   <Select value="lucy" style={{width:200}} onChange={handleChange}>
-    <Option key="jack" value="jack">jack</Option>
-    <Option key="lucy" value="lucy">lucy</Option>
-    <Option key="disabled" value="disabled" disabled>disabled</Option>
-    <Option key="yiminghe" value="yiminghe">yiminghe</Option>
+    <Option value="jack">jack</Option>
+    <Option value="lucy">lucy</Option>
+    <Option value="disabled" disabled>disabled</Option>
+    <Option value="yiminghe">yiminghe</Option>
   </Select>
 , document.getElementById('components-select-demo-basic'));
 ````
diff --git a/components/select/demo/combobox.md b/components/select/demo/combobox.md
index aa3d6630f..f7b55c653 100644
--- a/components/select/demo/combobox.md
+++ b/components/select/demo/combobox.md
@@ -24,7 +24,7 @@ var Test = React.createClass({
     } else {
       options = ['gmail.com', '163.com', 'qq.com'].map(function(domain) {
         var email = value + '@' + domain;
-        return <Option key={email} value={email}>{email}</Option>;
+        return <Option key={email}>{email}</Option>;
       });
     }
     this.setState({
diff --git a/components/select/demo/multiple.md b/components/select/demo/multiple.md
index de1d2ab96..bb90b2c04 100644
--- a/components/select/demo/multiple.md
+++ b/components/select/demo/multiple.md
@@ -13,7 +13,7 @@ var Option = Select.Option;
 
 var children = [];
 for (var i = 10; i < 36; i++) {
-  children.push(<Option value={i.toString(36) + i} key={i.toString(36) + i}>{i.toString(36) + i}</Option>);
+  children.push(<Option key={i.toString(36) + i}>{i.toString(36) + i}</Option>);
 }
 
 function handleChange(value) {
diff --git a/components/select/demo/search.md b/components/select/demo/search.md
index 4ec942cd3..87a416168 100644
--- a/components/select/demo/search.md
+++ b/components/select/demo/search.md
@@ -16,10 +16,10 @@ function handleChange(value) {
 
 React.render(
   <Select value="lucy" showSearch={true} style={{width:200}} onChange={handleChange}>
-    <Option key="jack" value="jack">jack</Option>
-    <Option key="lucy" value="lucy">lucy</Option>
-    <Option key="disabled" value="disabled" disabled>disabled</Option>
-    <Option key="yiminghe" value="yiminghe">yiminghe</Option>
+    <Option value="jack">jack</Option>
+    <Option value="lucy">lucy</Option>
+    <Option value="disabled" disabled>disabled</Option>
+    <Option value="yiminghe">yiminghe</Option>
   </Select>
 , document.getElementById('components-select-demo-search'));
 ````
diff --git a/components/select/demo/tags.md b/components/select/demo/tags.md
index bb14c1c83..93ae1fbed 100644
--- a/components/select/demo/tags.md
+++ b/components/select/demo/tags.md
@@ -13,7 +13,7 @@ var Option = Select.Option;
 
 var children = [];
 for (var i = 10; i < 36; i++) {
-  children.push(<Option value={i.toString(36) + i} key={i.toString(36) + i}>{i.toString(36) + i}</Option>);
+  children.push(<Option key={i.toString(36) + i}>{i.toString(36) + i}</Option>);
 }
 
 function handleChange(value) {
diff --git a/package.json b/package.json
index e01391b9e..a1209db34 100644
--- a/package.json
+++ b/package.json
@@ -21,7 +21,7 @@
     "rc-input-number": "~2.0.0",
     "rc-menu": "~3.4.0",
     "rc-progress": "~1.0.0",
-    "rc-select": "~4.2.0",
+    "rc-select": "~4.2.1",
     "rc-steps": "~1.1.3",
     "rc-switch": "~1.1.0",
     "rc-tabs": "~5.2.0",
diff --git a/style/components/select.less b/style/components/select.less
index ebfd35253..7661a41ce 100644
--- a/style/components/select.less
+++ b/style/components/select.less
@@ -1,7 +1,8 @@
 @selectPrefixCls: ant-select;
 
+@import "../mixins/iconfont";
 //mixin
-.selection__clear(){
+.selection__clear() {
   cursor: pointer;
   float: right;
   font-weight: bold;
@@ -131,6 +132,7 @@
     }
 
     .@{selectPrefixCls}-selection__choice__remove {
+      .iconfont-mixin();
       color: #919191;
       cursor: pointer;
       display: inline-block;
@@ -139,6 +141,10 @@
       &:hover {
         color: #333;
       }
+
+      &:before {
+        content: "\e61e";
+      }
     }
   }
 
@@ -157,7 +163,6 @@
     }
   }
 
-
   &-dropdown {
     display: none;
     background-color: white;