From 99df18139bbd04e985845f12d849062186f7fb17 Mon Sep 17 00:00:00 2001
From: afc163 <afc163@gmail.com>
Date: Sun, 4 Dec 2016 19:26:11 +0800
Subject: [PATCH] Improve Menu selected design

---
 components/menu/demo/theme.md              | 13 ++++++++++---
 components/menu/style/index.less           |  8 ++++++--
 tests/menu/__snapshots__/demo.test.js.snap | 13 +++++++------
 3 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/components/menu/demo/theme.md b/components/menu/demo/theme.md
index 15658b47d8..54dfb1877d 100755
--- a/components/menu/demo/theme.md
+++ b/components/menu/demo/theme.md
@@ -20,7 +20,8 @@ const SubMenu = Menu.SubMenu;
 const Sider = React.createClass({
   getInitialState() {
     return {
-      theme: 'light',
+      theme: 'dark',
+      current: '1',
     };
   },
   changeTheme(value) {
@@ -37,10 +38,16 @@ const Sider = React.createClass({
   render() {
     return (
       <div>
-        <Switch onChange={this.changeTheme} checkedChildren="Dark" unCheckedChildren="Light" />
+        <Switch
+          checked={this.state.theme === 'dark'}
+          onChange={this.changeTheme}
+          checkedChildren="Dark"
+          unCheckedChildren="Light"
+        />
         <br />
         <br />
-        <Menu theme={this.state.theme}
+        <Menu
+          theme={this.state.theme}
           onClick={this.handleClick}
           style={{ width: 240 }}
           defaultOpenKeys={['sub1']}
diff --git a/components/menu/style/index.less b/components/menu/style/index.less
index 7aee12dde4..0ca1ec6651 100644
--- a/components/menu/style/index.less
+++ b/components/menu/style/index.less
@@ -72,7 +72,7 @@
   &-item-active,
   &-submenu-active,
   &-submenu-title:hover {
-    background-color: tint(@primary-color, 90%);
+    color: @primary-color;
   }
 
   &-horizontal &-item,
@@ -96,6 +96,10 @@
     }
   }
 
+  &:not(&-horizontal) &-item-selected {
+    background-color: tint(@primary-color, 90%);
+  }
+
   &-horizontal,
   &-inline,
   &-vertical {
@@ -124,7 +128,7 @@
   &-inline {
     .@{menu-prefix-cls}-selected,
     .@{menu-prefix-cls}-item-selected {
-      border-right: 2px solid @primary-color;
+      border-right: 3px solid @primary-color;
       transform: translateZ(0);
     }
   }
diff --git a/tests/menu/__snapshots__/demo.test.js.snap b/tests/menu/__snapshots__/demo.test.js.snap
index 9f5ba51f40..20b1c20491 100644
--- a/tests/menu/__snapshots__/demo.test.js.snap
+++ b/tests/menu/__snapshots__/demo.test.js.snap
@@ -353,23 +353,24 @@ exports[`test renders ./components/menu/demo/switch-mode.md correctly 1`] = `
 exports[`test renders ./components/menu/demo/theme.md correctly 1`] = `
 <div>
   <span
-    class="ant-switch"
+    checked=""
+    class="ant-switch ant-switch-checked"
     tabindex="0">
     <span
       class="ant-switch-inner">
-      Light
+      Dark
     </span>
   </span>
   <br />
   <br />
   <ul
     aria-activedescendant=""
-    class="ant-menu ant-menu-inline  ant-menu-light ant-menu-root"
+    class="ant-menu ant-menu-inline  ant-menu-dark ant-menu-root"
     role="menu"
     style="width:240px;"
     tabindex="0">
     <li
-      class="ant-menu-submenu-inline ant-menu-submenu-open ant-menu-submenu">
+      class="ant-menu-submenu-inline ant-menu-submenu-open ant-menu-submenu-selected ant-menu-submenu">
       <div
         aria-expanded="true"
         aria-haspopup="true"
@@ -390,8 +391,8 @@ exports[`test renders ./components/menu/demo/theme.md correctly 1`] = `
         id="sub1$Menu"
         role="menu">
         <li
-          aria-selected="false"
-          class="ant-menu-item"
+          aria-selected="true"
+          class="ant-menu-item-selected ant-menu-item"
           role="menuitem"
           style="padding-left:48px;">
           Option 1