Merge remote-tracking branch 'upstream/0.8.0'

components/menu/demo/inline.md

@@ -16,21 +16,21 @@ function handleClick(info) {
 }
 
 React.render(<Menu onClick={handleClick} style={{width:200}} mode="inline">
-  <SubMenu title={<span><i className="anticon anticon-apple"></i><span>导航一</span></span>}>
+  <SubMenu key="sub1" title={<span><i className="anticon anticon-apple"></i><span>导航一</span></span>}>
     <MenuItem key="1">选项1</MenuItem>
     <MenuItem key="2">选项2</MenuItem>
     <MenuItem key="3">选项3</MenuItem>
     <MenuItem key="4">选项4</MenuItem>
   </SubMenu>
-  <SubMenu title={<span><i className="anticon anticon-apple"></i><span>导航二</span></span>}>
+  <SubMenu key="sub2" title={<span><i className="anticon anticon-apple"></i><span>导航二</span></span>}>
     <MenuItem key="5">选项5</MenuItem>
     <MenuItem key="6">选项6</MenuItem>
-     <SubMenu title={<span><i className="anticon anticon-apple"></i><span>三级导航</span></span>}>
+     <SubMenu key="sub3" title={<span><i className="anticon anticon-apple"></i><span>三级导航</span></span>}>
         <MenuItem key="7">选项7</MenuItem>
         <MenuItem key="8">选项8</MenuItem>
       </SubMenu>
   </SubMenu>
-  <SubMenu title={<span><i className="anticon anticon-apple"></i><span>导航三</span></span>}>
+  <SubMenu key="sub4" title={<span><i className="anticon anticon-apple"></i><span>导航三</span></span>}>
     <MenuItem key="9">选项9</MenuItem>
     <MenuItem key="10">选项10</MenuItem>
     <MenuItem key="11">选项11</MenuItem>

components/menu/demo/nav.md

@@ -16,21 +16,21 @@ function handleClick(info) {
 }
 
 React.render(<Menu onClick={handleClick} mode="horizontal">
-  <SubMenu title={<span><i className="anticon anticon-apple"></i><span>导航一</span></span>}>
+  <SubMenu key="sub1" title={<span><i className="anticon anticon-apple"></i><span>导航一</span></span>}>
     <MenuItem key="1">选项1</MenuItem>
     <MenuItem key="2">选项2</MenuItem>
     <MenuItem key="3">选项3</MenuItem>
     <MenuItem key="4">选项4</MenuItem>
   </SubMenu>
-  <SubMenu title={<span><i className="anticon anticon-apple"></i><span>导航二</span></span>}>
+  <SubMenu key="sub2" title={<span><i className="anticon anticon-apple"></i><span>导航二</span></span>}>
     <MenuItem key="5">选项5</MenuItem>
     <MenuItem key="6">选项6</MenuItem>
-     <SubMenu title={<span><i className="anticon anticon-apple"></i><span>三级导航</span></span>}>
+     <SubMenu key="sub3" title={<span><i className="anticon anticon-apple"></i><span>三级导航</span></span>}>
         <MenuItem key="7">选项7</MenuItem>
         <MenuItem key="8">选项8</MenuItem>
       </SubMenu>
   </SubMenu>
-  <SubMenu title={<span><i className="anticon anticon-apple"></i><span>导航三</span></span>}>
+  <SubMenu key="sub4" title={<span><i className="anticon anticon-apple"></i><span>导航三</span></span>}>
     <MenuItem key="9">选项9</MenuItem>
     <MenuItem key="10">选项10</MenuItem>
     <MenuItem key="11">选项11</MenuItem>

components/menu/demo/side.md

@@ -16,21 +16,21 @@ function handleClick(info) {
 }
 
 React.render(<Menu onClick={handleClick} style={{width:200}} mode="vertical">
-  <SubMenu title={<span><i className="anticon anticon-apple"></i><span>导航一</span></span>}>
+  <SubMenu key="sub1" title={<span><i className="anticon anticon-apple"></i><span>导航一</span></span>}>
     <MenuItem key="1">选项1</MenuItem>
     <MenuItem key="2">选项2</MenuItem>
     <MenuItem key="3">选项3</MenuItem>
     <MenuItem key="4">选项4</MenuItem>
   </SubMenu>
-  <SubMenu title={<span><i className="anticon anticon-apple"></i><span>导航二</span></span>}>
+  <SubMenu key="sub2" title={<span><i className="anticon anticon-apple"></i><span>导航二</span></span>}>
     <MenuItem key="5">选项5</MenuItem>
     <MenuItem key="6">选项6</MenuItem>
-     <SubMenu title={<span><i className="anticon anticon-apple"></i><span>三级导航</span></span>}>
+     <SubMenu key="sub3" title={<span><i className="anticon anticon-apple"></i><span>三级导航</span></span>}>
         <MenuItem key="7">选项7</MenuItem>
         <MenuItem key="8">选项8</MenuItem>
       </SubMenu>
   </SubMenu>
-  <SubMenu title={<span><i className="anticon anticon-apple"></i><span>导航三</span></span>}>
+  <SubMenu key="sub4" title={<span><i className="anticon anticon-apple"></i><span>导航三</span></span>}>
     <MenuItem key="9">选项9</MenuItem>
     <MenuItem key="10">选项10</MenuItem>
     <MenuItem key="11">选项11</MenuItem>

components/menu/demo/system.md

@@ -15,22 +15,22 @@ function handleClick(info) {
   console.log('selected ',info);
 }
 
-React.render(<Menu onClick={handleClick} mode="horizontal" openSubMenuOnMouseEnter={false}>
-  <SubMenu title={<span><i className="anticon anticon-apple"></i><span>导航一</span></span>}>
+React.render(<Menu onClick={handleClick} mode="horizontal" openSubMenuOnMouseEnter={false} closeSubMenuOnMouseLeave={false}>
+  <SubMenu key="sub1" title={<span><i className="anticon anticon-apple"></i><span>导航一</span></span>}>
     <MenuItem key="1">选项1</MenuItem>
     <MenuItem key="2">选项2</MenuItem>
     <MenuItem key="3">选项3</MenuItem>
     <MenuItem key="4">选项4</MenuItem>
   </SubMenu>
-  <SubMenu title={<span><i className="anticon anticon-apple"></i><span>导航二</span></span>}>
+  <SubMenu key="sub2" title={<span><i className="anticon anticon-apple"></i><span>导航二</span></span>}>
     <MenuItem key="5">选项5</MenuItem>
     <MenuItem key="6">选项6</MenuItem>
-     <SubMenu title={<span><i className="anticon anticon-apple"></i><span>三级导航</span></span>}>
+     <SubMenu key="sub3" title={<span><i className="anticon anticon-apple"></i><span>三级导航</span></span>}>
         <MenuItem key="7">选项7</MenuItem>
         <MenuItem key="8">选项8</MenuItem>
       </SubMenu>
   </SubMenu>
-  <SubMenu title={<span><i className="anticon anticon-apple"></i><span>导航三</span></span>}>
+  <SubMenu key="sub4" title={<span><i className="anticon anticon-apple"></i><span>导航三</span></span>}>
     <MenuItem key="9">选项9</MenuItem>
     <MenuItem key="10">选项10</MenuItem>
     <MenuItem key="11">选项11</MenuItem>

components/validation/index.md

@@ -19,7 +19,7 @@
   <Validator>
     <CustomComponent>
       <input />
-    </CustomComponent
+    </CustomComponent>
   </Validator>
 </Validation>
 ```

package.json

@@ -45,12 +45,12 @@
     "rc-dropdown": "~1.2.0",
     "rc-form-validation": "~2.4.7",
     "rc-input-number": "~2.0.1",
-    "rc-menu": "~4.1.0",
+    "rc-menu": "~4.3.0",
     "rc-notification": "~1.1.0",
     "rc-pagination": "~1.1.0",
     "rc-progress": "~1.0.0",
     "rc-radio": "~2.0.0",
-    "rc-select": "~4.6.1",
+    "rc-select": "~4.6.3",
     "rc-slider": "~1.4.0",
     "rc-steps": "~1.1.4",
     "rc-switch": "~1.2.0",

style/components/dropdown.less

@@ -103,21 +103,6 @@
         background-color: #e5e5e5;
         line-height: 0;
       }
-
-      &-selected {
-        background-color: tint(@primary-color, 90%);
-        position: relative;
-        &:after {
-          content: '\e613';
-          font-family: 'anticon';
-          font-weight: bold;
-          position: absolute;
-          top: 6px;
-          right: 16px;
-          color: @primary-color;
-          background-color: tint(@primary-color, 90%);
-        }
-      }
     }
   }
 }

style/components/menu.less

@@ -91,10 +91,31 @@
       background-color: #fff;
     }
 
-    &-open {
+    &-inline > .@{menuPrefixCls}-submenu-title:after {
+      font-family: "anticon" !important;
+      font-style: normal;
+      vertical-align: baseline;
+      text-align: center;
+      text-transform: none;
+      text-rendering: auto;
+      position: absolute;
+      transition: transform .3s ease-in;
+      content: "\e600";
+      right: 8px;
+      transform: scale(0.7);
+      top: 11px;
+    }
+
+    &-opened {
       > .@{menuPrefixCls} {
         display: block;
       }
+
+      &.@{menuPrefixCls}-submenu-inline > .@{menuPrefixCls}-submenu-title:after {
+        content: "\e600";
+        .ie-rotate(2);
+        transform: rotate(180deg) scale(0.7);
+      }
     }
   }
 
@@ -148,6 +169,10 @@
     padding: 0;
   }
 
+  &-root&-inline {
+    border-radius: 0;
+  }
+
   &-sub&-inline {
     padding: 0;
     border: none;

style/components/select.less

@@ -254,7 +254,18 @@
 
   .@{selectPrefixCls}-selection--single + .@{selectPrefixCls}-dropdown {
     .@{selectPrefixCls}-dropdown-menu-item-selected {
-      background-color: tint(@primary-color, 90%) !important;
+      background-color: tint(@primary-color, 90%);
+      position: relative;
+      &:after {
+        content: '\e613';
+        font-family: 'anticon';
+        font-weight: bold;
+        position: absolute;
+        top: 6px;
+        right: 16px;
+        color: @primary-color;
+        background-color: tint(@primary-color, 90%);
+      }
     }
   }
   .@{selectPrefixCls}-selection--multiple + .@{selectPrefixCls}-dropdown {