From a0a83aa81c73f827ff76d042b1eeba980baab4bf Mon Sep 17 00:00:00 2001
From: guifu <pikaleize@gmail.com>
Date: Sat, 28 Apr 2018 22:59:32 +0800
Subject: [PATCH 1/2] fix: menu regression

---
 package.json                                  |  2 +-
 src/Select.jsx                                |  3 ++
 tests/__snapshots__/DropdownMenu.spec.js.snap |  5 +--
 tests/__snapshots__/Select.spec.js.snap       | 23 +++++-----
 tests/__snapshots__/Select.tags.spec.js.snap  | 44 ++++++-------------
 5 files changed, 29 insertions(+), 48 deletions(-)

diff --git a/package.json b/package.json
index 77a0c1020..e3a2d7b97 100644
--- a/package.json
+++ b/package.json
@@ -74,7 +74,7 @@
     "dom-scroll-into-view": "1.x",
     "prop-types": "^15.5.8",
     "rc-animate": "2.x",
-    "rc-menu": "^7.0.1",
+    "rc-menu": "^7.0.2",
     "rc-trigger": "^2.2.0",
     "rc-util": "^4.0.4",
     "warning": "^3.0.0"
diff --git a/src/Select.jsx b/src/Select.jsx
index f78fb27f2..6cf529754 100644
--- a/src/Select.jsx
+++ b/src/Select.jsx
@@ -258,6 +258,9 @@ export default class Select extends React.Component {
   };
 
   onMenuSelect = ({ item }) => {
+    if (!item) {
+      return;
+    }
     let value = this.state.value;
     const props = this.props;
     const selectedValue = getValuePropValue(item);
diff --git a/tests/__snapshots__/DropdownMenu.spec.js.snap b/tests/__snapshots__/DropdownMenu.spec.js.snap
index 1e1e6f3b5..9e56f316d 100644
--- a/tests/__snapshots__/DropdownMenu.spec.js.snap
+++ b/tests/__snapshots__/DropdownMenu.spec.js.snap
@@ -5,9 +5,8 @@ exports[`DropdownMenu renders correctly 1`] = `
   style="overflow:auto"
 >
   <ul
-    aria-activedescendant=""
     class="undefined-menu  undefined-menu-root undefined-menu-vertical"
-    role="menu"
+    role="listbox"
     tabindex="0"
   >
     <li
@@ -20,7 +19,6 @@ exports[`DropdownMenu renders correctly 1`] = `
         class="undefined-menu-item-group-list"
       >
         <li
-          aria-selected="true"
           class="undefined-menu-item undefined-menu-item-selected"
           role="menuitem"
         >
@@ -38,7 +36,6 @@ exports[`DropdownMenu renders correctly 1`] = `
         class="undefined-menu-item-group-list"
       >
         <li
-          aria-selected="false"
           class="undefined-menu-item"
           role="menuitem"
         >
diff --git a/tests/__snapshots__/Select.spec.js.snap b/tests/__snapshots__/Select.spec.js.snap
index 7fc4a9391..8463c1083 100644
--- a/tests/__snapshots__/Select.spec.js.snap
+++ b/tests/__snapshots__/Select.spec.js.snap
@@ -54,15 +54,14 @@ Array [
         style="overflow:auto"
       >
         <ul
-          aria-activedescendant=""
           class="rc-select-dropdown-menu  rc-select-dropdown-menu-root rc-select-dropdown-menu-vertical"
-          role="menu"
+          role="listbox"
           tabindex="0"
         >
           <li
             aria-selected="false"
             class="rc-select-dropdown-menu-item rc-select-dropdown-menu-item-active"
-            role="menuitem"
+            role="option"
             style="user-select:none;-webkit-user-select:none"
             unselectable="on"
           >
@@ -71,7 +70,7 @@ Array [
           <li
             aria-selected="false"
             class="rc-select-dropdown-menu-item"
-            role="menuitem"
+            role="option"
             style="user-select:none;-webkit-user-select:none"
             unselectable="on"
           >
@@ -138,15 +137,14 @@ Array [
         style="overflow:auto"
       >
         <ul
-          aria-activedescendant=""
           class="rc-select-dropdown-menu  rc-select-dropdown-menu-root rc-select-dropdown-menu-vertical"
-          role="menu"
+          role="listbox"
           tabindex="0"
         >
           <li
             aria-selected="false"
             class="rc-select-dropdown-menu-item rc-select-dropdown-menu-item-active"
-            role="menuitem"
+            role="option"
             style="user-select:none;-webkit-user-select:none"
             unselectable="on"
           >
@@ -155,7 +153,7 @@ Array [
           <li
             aria-selected="false"
             class="rc-select-dropdown-menu-item"
-            role="menuitem"
+            role="option"
             style="user-select:none;-webkit-user-select:none"
             unselectable="on"
           >
@@ -409,9 +407,8 @@ Array [
         style="overflow:auto"
       >
         <ul
-          aria-activedescendant=""
           class="antd-dropdown-menu  antd-dropdown-menu-root antd-dropdown-menu-vertical"
-          role="menu"
+          role="listbox"
           tabindex="0"
         >
           <li
@@ -429,7 +426,7 @@ Array [
               <li
                 aria-selected="false"
                 class="antd-dropdown-menu-item option-test antd-dropdown-menu-item-active"
-                role="menuitem"
+                role="option"
                 style="user-select:none;-webkit-user-select:none"
                 unselectable="on"
               >
@@ -442,7 +439,7 @@ Array [
               <li
                 aria-selected="false"
                 class="antd-dropdown-menu-item"
-                role="menuitem"
+                role="option"
                 style="user-select:none;-webkit-user-select:none"
                 unselectable="on"
               >
@@ -465,7 +462,7 @@ Array [
               <li
                 aria-selected="false"
                 class="antd-dropdown-menu-item"
-                role="menuitem"
+                role="option"
                 style="user-select:none;-webkit-user-select:none"
                 unselectable="on"
               >
diff --git a/tests/__snapshots__/Select.tags.spec.js.snap b/tests/__snapshots__/Select.tags.spec.js.snap
index 6d4d7c36e..98ab7e618 100644
--- a/tests/__snapshots__/Select.tags.spec.js.snap
+++ b/tests/__snapshots__/Select.tags.spec.js.snap
@@ -77,9 +77,8 @@ exports[`Select.tags OptGroup renders correctly 1`] = `
         style="overflow: auto;"
       >
         <ul
-          aria-activedescendant=""
           class="rc-select-dropdown-menu  rc-select-dropdown-menu-root rc-select-dropdown-menu-vertical"
-          role="menu"
+          role="listbox"
           tabindex="0"
         >
           <li
@@ -97,7 +96,7 @@ exports[`Select.tags OptGroup renders correctly 1`] = `
               <li
                 aria-selected="true"
                 class="rc-select-dropdown-menu-item rc-select-dropdown-menu-item-active rc-select-dropdown-menu-item-selected"
-                role="menuitem"
+                role="option"
                 style=""
                 unselectable="on"
               >
@@ -120,7 +119,7 @@ exports[`Select.tags OptGroup renders correctly 1`] = `
               <li
                 aria-selected="false"
                 class="rc-select-dropdown-menu-item"
-                role="menuitem"
+                role="option"
                 unselectable="on"
               >
                 yiminghe
@@ -128,9 +127,7 @@ exports[`Select.tags OptGroup renders correctly 1`] = `
             </ul>
           </li>
           <li
-            aria-selected="true"
             class="rc-select-dropdown-menu-item rc-select-dropdown-menu-item-selected"
-            role="menuitem"
             unselectable="on"
           >
             foo
@@ -192,15 +189,12 @@ exports[`Select.tags OptGroup renders inputValue correctly 1`] = `
         style="overflow: auto;"
       >
         <ul
-          aria-activedescendant=""
           class="rc-select-dropdown-menu  rc-select-dropdown-menu-root rc-select-dropdown-menu-vertical"
-          role="menu"
+          role="listbox"
           tabindex="0"
         >
           <li
-            aria-selected="false"
             class="rc-select-dropdown-menu-item rc-select-dropdown-menu-item-active"
-            role="menuitem"
             style=""
             unselectable="on"
           >
@@ -277,9 +271,8 @@ exports[`Select.tags OptGroup renders inputValue correctly 2`] = `
         style="overflow: auto;"
       >
         <ul
-          aria-activedescendant=""
           class="rc-select-dropdown-menu  rc-select-dropdown-menu-root rc-select-dropdown-menu-vertical"
-          role="menu"
+          role="listbox"
           tabindex="0"
         >
           <li
@@ -297,7 +290,7 @@ exports[`Select.tags OptGroup renders inputValue correctly 2`] = `
               <li
                 aria-selected="false"
                 class="rc-select-dropdown-menu-item rc-select-dropdown-menu-item-active"
-                role="menuitem"
+                role="option"
                 style=""
                 unselectable="on"
               >
@@ -320,7 +313,7 @@ exports[`Select.tags OptGroup renders inputValue correctly 2`] = `
               <li
                 aria-selected="false"
                 class="rc-select-dropdown-menu-item"
-                role="menuitem"
+                role="option"
                 unselectable="on"
               >
                 yiminghe
@@ -328,9 +321,7 @@ exports[`Select.tags OptGroup renders inputValue correctly 2`] = `
             </ul>
           </li>
           <li
-            aria-selected="true"
             class="rc-select-dropdown-menu-item rc-select-dropdown-menu-item-selected"
-            role="menuitem"
             style=""
             unselectable="on"
           >
@@ -898,24 +889,21 @@ Array [
         style="overflow:auto"
       >
         <ul
-          aria-activedescendant=""
           class="rc-select-dropdown-menu  rc-select-dropdown-menu-root rc-select-dropdown-menu-vertical"
-          role="menu"
+          role="listbox"
           tabindex="0"
         >
           <li
             aria-selected="false"
             class="rc-select-dropdown-menu-item"
-            role="menuitem"
+            role="option"
             style="user-select:none;-webkit-user-select:none"
             unselectable="on"
           >
             1
           </li>
           <li
-            aria-selected="true"
             class="rc-select-dropdown-menu-item rc-select-dropdown-menu-item-active rc-select-dropdown-menu-item-selected"
-            role="menuitem"
             style="user-select:none;-webkit-user-select:none"
             unselectable="on"
           >
@@ -990,15 +978,14 @@ Array [
         style="overflow:auto"
       >
         <ul
-          aria-activedescendant=""
           class="rc-select-dropdown-menu  rc-select-dropdown-menu-root rc-select-dropdown-menu-vertical"
-          role="menu"
+          role="listbox"
           tabindex="0"
         >
           <li
             aria-selected="false"
             class="rc-select-dropdown-menu-item"
-            role="menuitem"
+            role="option"
             style="user-select:none;-webkit-user-select:none"
             unselectable="on"
           >
@@ -1007,16 +994,14 @@ Array [
           <li
             aria-selected="false"
             class="rc-select-dropdown-menu-item"
-            role="menuitem"
+            role="option"
             style="user-select:none;-webkit-user-select:none"
             unselectable="on"
           >
             2
           </li>
           <li
-            aria-selected="true"
             class="rc-select-dropdown-menu-item rc-select-dropdown-menu-item-active rc-select-dropdown-menu-item-selected"
-            role="menuitem"
             style="user-select:none;-webkit-user-select:none"
             unselectable="on"
           >
@@ -1076,15 +1061,14 @@ Array [
         style="overflow:auto"
       >
         <ul
-          aria-activedescendant=""
           class="rc-select-dropdown-menu  rc-select-dropdown-menu-root rc-select-dropdown-menu-vertical"
-          role="menu"
+          role="listbox"
           tabindex="0"
         >
           <li
             aria-selected="false"
             class="rc-select-dropdown-menu-item rc-select-dropdown-menu-item-active"
-            role="menuitem"
+            role="option"
             style="user-select:none;-webkit-user-select:none"
             unselectable="on"
           >

From 967eb4167f30e09c66a60ef794538ed5a83fee00 Mon Sep 17 00:00:00 2001
From: guifu <pikaleize@gmail.com>
Date: Sun, 29 Apr 2018 00:20:04 +0800
Subject: [PATCH 2/2] fix: add option for all menuItem

---
 src/Select.jsx                               |  4 ++--
 tests/__snapshots__/Select.tags.spec.js.snap | 10 ++++++++++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/Select.jsx b/src/Select.jsx
index ab45d674b..0d61930f1 100644
--- a/src/Select.jsx
+++ b/src/Select.jsx
@@ -924,7 +924,7 @@ export default class Select extends React.Component {
         const menuItem = (
           <MenuItem
             style={UNSELECTABLE_STYLE}
-            role={null}
+            role="option"
             attribute={UNSELECTABLE_ATTRIBUTE}
             value={key}
             key={key}
@@ -956,7 +956,7 @@ export default class Select extends React.Component {
           options.unshift(
             <MenuItem
               style={UNSELECTABLE_STYLE}
-              role={null}
+              role="option"
               attribute={UNSELECTABLE_ATTRIBUTE}
               value={inputValue}
               key={inputValue}
diff --git a/tests/__snapshots__/Select.tags.spec.js.snap b/tests/__snapshots__/Select.tags.spec.js.snap
index 98ab7e618..7f63a38d5 100644
--- a/tests/__snapshots__/Select.tags.spec.js.snap
+++ b/tests/__snapshots__/Select.tags.spec.js.snap
@@ -127,7 +127,9 @@ exports[`Select.tags OptGroup renders correctly 1`] = `
             </ul>
           </li>
           <li
+            aria-selected="true"
             class="rc-select-dropdown-menu-item rc-select-dropdown-menu-item-selected"
+            role="option"
             unselectable="on"
           >
             foo
@@ -194,7 +196,9 @@ exports[`Select.tags OptGroup renders inputValue correctly 1`] = `
           tabindex="0"
         >
           <li
+            aria-selected="false"
             class="rc-select-dropdown-menu-item rc-select-dropdown-menu-item-active"
+            role="option"
             style=""
             unselectable="on"
           >
@@ -321,7 +325,9 @@ exports[`Select.tags OptGroup renders inputValue correctly 2`] = `
             </ul>
           </li>
           <li
+            aria-selected="true"
             class="rc-select-dropdown-menu-item rc-select-dropdown-menu-item-selected"
+            role="option"
             style=""
             unselectable="on"
           >
@@ -903,7 +909,9 @@ Array [
             1
           </li>
           <li
+            aria-selected="true"
             class="rc-select-dropdown-menu-item rc-select-dropdown-menu-item-active rc-select-dropdown-menu-item-selected"
+            role="option"
             style="user-select:none;-webkit-user-select:none"
             unselectable="on"
           >
@@ -1001,7 +1009,9 @@ Array [
             2
           </li>
           <li
+            aria-selected="true"
             class="rc-select-dropdown-menu-item rc-select-dropdown-menu-item-active rc-select-dropdown-menu-item-selected"
+            role="option"
             style="user-select:none;-webkit-user-select:none"
             unselectable="on"
           >