From 2b4b08e4c25b38a9363da5745b2bf03bb80b9b23 Mon Sep 17 00:00:00 2001
From: jljsj33 <liangjun.jiang@alipay.com>
Date: Fri, 20 Apr 2018 13:57:52 +0800
Subject: [PATCH 01/16] inherit props

---
 src/MenuItem.jsx      | 19 ++++++++++++++++++-
 src/MenuItemGroup.jsx |  9 +++++++--
 src/SubMenu.jsx       | 28 +++++++++++++++++++++++++---
 src/SubPopupMenu.js   | 25 +++++++++++++++++++++++++
 4 files changed, 75 insertions(+), 6 deletions(-)

diff --git a/src/MenuItem.jsx b/src/MenuItem.jsx
index 3920b7b5..32823dfa 100644
--- a/src/MenuItem.jsx
+++ b/src/MenuItem.jsx
@@ -139,7 +139,7 @@ export class MenuItem extends React.Component {
   }
 
   render() {
-    const props = this.props;
+    const props = { ...this.props };
     const className = classNames(this.getPrefixCls(), props.className, {
       [this.getActiveClassName()]: !props.disabled && props.active,
       [this.getSelectedClassName()]: props.isSelected,
@@ -161,6 +161,22 @@ export class MenuItem extends React.Component {
         onMouseEnter: this.onMouseEnter,
       };
     }
+    [
+      'rootPrefixCls',
+      'eventKey',
+      'active',
+      'selectedKeys',
+      'disabled',
+      'title',
+      'onItemHover',
+      'onSelect',
+      'onClick',
+      'onDeselect',
+      'parentMenu',
+      'onDestroy',
+      'onMouseEnter',
+      'onMouseLeave',
+    ].forEach(key => delete props[key])
     const style = {
       ...props.style,
     };
@@ -169,6 +185,7 @@ export class MenuItem extends React.Component {
     }
     return (
       <li
+        {...props}
         {...attrs}
         {...mouseEvent}
         style={style}
diff --git a/src/MenuItemGroup.jsx b/src/MenuItemGroup.jsx
index 55ea7d19..b6380701 100644
--- a/src/MenuItemGroup.jsx
+++ b/src/MenuItemGroup.jsx
@@ -20,12 +20,17 @@ class MenuItemGroup extends React.Component {
   }
 
   render() {
-    const props = this.props;
+    const { ...props } = this.props;
     const { className = '', rootPrefixCls } = props;
     const titleClassName = `${rootPrefixCls}-item-group-title`;
     const listClassName = `${rootPrefixCls}-item-group-list`;
+    [
+      'renderMenuItem',
+      'index',
+      'rootPrefixCls',
+    ].forEach(key => delete props[key]);
     return (
-      <li className={`${className} ${rootPrefixCls}-item-group`}>
+      <li {...props} className={`${className} ${rootPrefixCls}-item-group`}>
         <div
           className={titleClassName}
           title={typeof props.title === 'string' ? props.title : undefined}
diff --git a/src/SubMenu.jsx b/src/SubMenu.jsx
index 9c9c6bae..a4f29b60 100644
--- a/src/SubMenu.jsx
+++ b/src/SubMenu.jsx
@@ -404,7 +404,7 @@ export class SubMenu extends React.Component {
   }
 
   render() {
-    const props = this.props;
+    const props = { ...this.props };
     const isOpen = props.isOpen;
     const prefixCls = this.getPrefixCls();
     const isInlineMode = props.mode === 'inline';
@@ -469,9 +469,31 @@ export class SubMenu extends React.Component {
       props.parentMenu.props.getPopupContainer : triggerNode => triggerNode.parentNode;
     const popupPlacement = popupPlacementMap[props.mode];
     const popupClassName = props.mode === 'inline' ? '' : props.popupClassName;
-
+    [
+      'parentMenu',
+      'title',
+      'selectedKeys',
+      'openKeys',
+      'onClick',
+      'onOpenChange',
+      'rootPrefixCls',
+      'eventKey',
+      'multiple',
+      'active',
+      'onItemHover',
+      'onSelect',
+      'triggerSubMenuAction',
+      'onDeselect',
+      'onDestroy',
+      'onMouseEnter',
+      'onMouseLeave',
+      'onTitleMouseEnter',
+      'onTitleMouseLeave',
+      'onTitleClick',
+      'isOpen',
+    ].forEach(key => delete props[key]);
     return (
-      <li {...mouseEvents} className={className} style={props.style}>
+      <li {...props} {...mouseEvents} className={className}>
         {isInlineMode && title}
         {isInlineMode && children}
         {!isInlineMode && (
diff --git a/src/SubPopupMenu.js b/src/SubPopupMenu.js
index 7bcecb5b..04d6f28b 100644
--- a/src/SubPopupMenu.js
+++ b/src/SubPopupMenu.js
@@ -6,6 +6,7 @@ import createChainedFunction from 'rc-util/lib/createChainedFunction';
 import classNames from 'classnames';
 import { getKeyFromChildrenIndex, loopMenuItem, noop } from './util';
 import DOMWrap from './DOMWrap';
+import { collapseTextChangeRangesAcrossMultipleVersions } from 'typescript';
 
 function allDisabled(arr) {
   if (!arr.length) {
@@ -311,7 +312,31 @@ export class SubPopupMenu extends React.Component {
       props.className,
       `${props.prefixCls}-${props.mode}`,
     );
+    [
+      'defaultSelectedKeys',
+      'selectedKeys',
+      'defaultOpenKeys',
+      'openKeys',
+      'mode',
+      'getPopupContainer',
+      'onClick',
+      'onSelect',
+      'onDeselect',
+      'onDestroy',
+      'openTransitionName',
+      'openAnimation',
+      'subMenuOpenDelay',
+      'subMenuCloseDelay',
+      'forceSubMenuRender',
+      'triggerSubMenuAction',
+      'level',
+      'selectable',
+      'multiple',
+      'onOpenChange',
+      'visible',
+    ].forEach(key => delete props[key]);
     const domProps = {
+      ...props,
       className,
       role: 'menu',
       'aria-activedescendant': '',

From 573c1d149665b988b627e5cad9211b81e3bbba53 Mon Sep 17 00:00:00 2001
From: jljsj33 <liangjun.jiang@alipay.com>
Date: Fri, 20 Apr 2018 13:59:36 +0800
Subject: [PATCH 02/16] update

---
 src/SubPopupMenu.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/SubPopupMenu.js b/src/SubPopupMenu.js
index 04d6f28b..b04cd166 100644
--- a/src/SubPopupMenu.js
+++ b/src/SubPopupMenu.js
@@ -6,7 +6,6 @@ import createChainedFunction from 'rc-util/lib/createChainedFunction';
 import classNames from 'classnames';
 import { getKeyFromChildrenIndex, loopMenuItem, noop } from './util';
 import DOMWrap from './DOMWrap';
-import { collapseTextChangeRangesAcrossMultipleVersions } from 'typescript';
 
 function allDisabled(arr) {
   if (!arr.length) {

From 47b0b64985ab63d9364a21eb7d9cdafaf0bcc8d6 Mon Sep 17 00:00:00 2001
From: jljsj33 <liangjun.jiang@alipay.com>
Date: Fri, 20 Apr 2018 14:05:29 +0800
Subject: [PATCH 03/16] update

---
 src/SubPopupMenu.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/SubPopupMenu.js b/src/SubPopupMenu.js
index b04cd166..11bd65f2 100644
--- a/src/SubPopupMenu.js
+++ b/src/SubPopupMenu.js
@@ -311,6 +311,7 @@ export class SubPopupMenu extends React.Component {
       props.className,
       `${props.prefixCls}-${props.mode}`,
     );
+    const focusable = props.focusable;
     [
       'defaultSelectedKeys',
       'selectedKeys',
@@ -333,6 +334,8 @@ export class SubPopupMenu extends React.Component {
       'multiple',
       'onOpenChange',
       'visible',
+      'focusable',
+      'defaultActiveFirst',
     ].forEach(key => delete props[key]);
     const domProps = {
       ...props,
@@ -343,7 +346,7 @@ export class SubPopupMenu extends React.Component {
     if (props.id) {
       domProps.id = props.id;
     }
-    if (props.focusable) {
+    if (focusable) {
       domProps.tabIndex = '0';
       domProps.onKeyDown = this.onKeyDown;
     }

From ae9fd6cf63a33974f4fddda76f4c784c31586626 Mon Sep 17 00:00:00 2001
From: jljsj33 <liangjun.jiang@alipay.com>
Date: Fri, 20 Apr 2018 14:11:38 +0800
Subject: [PATCH 04/16] update menu props mixin

---
 src/SubPopupMenu.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/SubPopupMenu.js b/src/SubPopupMenu.js
index 11bd65f2..cb9a3f09 100644
--- a/src/SubPopupMenu.js
+++ b/src/SubPopupMenu.js
@@ -336,6 +336,8 @@ export class SubPopupMenu extends React.Component {
       'visible',
       'focusable',
       'defaultActiveFirst',
+      'prefixCls',
+      'inlineIndent',
     ].forEach(key => delete props[key]);
     const domProps = {
       ...props,

From 3559f835bb9bfd250923a6f57f9e401baa75df38 Mon Sep 17 00:00:00 2001
From: jljsj33 <liangjun.jiang@alipay.com>
Date: Fri, 20 Apr 2018 14:14:44 +0800
Subject: [PATCH 05/16] update

---
 src/SubPopupMenu.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/SubPopupMenu.js b/src/SubPopupMenu.js
index cb9a3f09..2881c810 100644
--- a/src/SubPopupMenu.js
+++ b/src/SubPopupMenu.js
@@ -356,11 +356,11 @@ export class SubPopupMenu extends React.Component {
       // ESLint is not smart enough to know that the type of `children` was checked.
       /* eslint-disable */
       <DOMWrap
+        {...domProps}
         style={props.style}
         tag="ul"
         hiddenClassName={`${props.prefixCls}-hidden`}
         visible={props.visible}
-        {...domProps}
       >
         {React.Children.map(
           props.children,

From 23b4bc37034531d2d971d3f54bed4450b0ab2b52 Mon Sep 17 00:00:00 2001
From: jljsj33 <liangjun.jiang@alipay.com>
Date: Fri, 20 Apr 2018 14:16:04 +0800
Subject: [PATCH 06/16] update

---
 src/SubPopupMenu.js | 29 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/src/SubPopupMenu.js b/src/SubPopupMenu.js
index 2881c810..4bab00ca 100644
--- a/src/SubPopupMenu.js
+++ b/src/SubPopupMenu.js
@@ -311,7 +311,18 @@ export class SubPopupMenu extends React.Component {
       props.className,
       `${props.prefixCls}-${props.mode}`,
     );
-    const focusable = props.focusable;
+    const domProps = {
+      className,
+      role: 'menu',
+      'aria-activedescendant': '',
+    };
+    if (props.id) {
+      domProps.id = props.id;
+    }
+    if (props.focusable) {
+      domProps.tabIndex = '0';
+      domProps.onKeyDown = this.onKeyDown;
+    }
     [
       'defaultSelectedKeys',
       'selectedKeys',
@@ -339,28 +350,16 @@ export class SubPopupMenu extends React.Component {
       'prefixCls',
       'inlineIndent',
     ].forEach(key => delete props[key]);
-    const domProps = {
-      ...props,
-      className,
-      role: 'menu',
-      'aria-activedescendant': '',
-    };
-    if (props.id) {
-      domProps.id = props.id;
-    }
-    if (focusable) {
-      domProps.tabIndex = '0';
-      domProps.onKeyDown = this.onKeyDown;
-    }
     return (
       // ESLint is not smart enough to know that the type of `children` was checked.
       /* eslint-disable */
       <DOMWrap
-        {...domProps}
+        {...props}
         style={props.style}
         tag="ul"
         hiddenClassName={`${props.prefixCls}-hidden`}
         visible={props.visible}
+        {...domProps}
       >
         {React.Children.map(
           props.children,

From 7def68f794de4638ae5de4e13a5747902187df95 Mon Sep 17 00:00:00 2001
From: jljsj33 <liangjun.jiang@alipay.com>
Date: Fri, 20 Apr 2018 14:35:32 +0800
Subject: [PATCH 07/16] extract inherit props to util

---
 src/MenuItem.jsx      | 19 ++--------------
 src/MenuItemGroup.jsx |  7 ++----
 src/SubMenu.jsx       | 25 ++--------------------
 src/SubPopupMenu.js   | 30 ++------------------------
 src/util.js           | 50 +++++++++++++++++++++++++++++++++++++++++--
 5 files changed, 56 insertions(+), 75 deletions(-)

diff --git a/src/MenuItem.jsx b/src/MenuItem.jsx
index 32823dfa..5ad2da35 100644
--- a/src/MenuItem.jsx
+++ b/src/MenuItem.jsx
@@ -5,7 +5,7 @@ import KeyCode from 'rc-util/lib/KeyCode';
 import classNames from 'classnames';
 import scrollIntoView from 'dom-scroll-into-view';
 import { connect } from 'mini-store';
-import { noop } from './util';
+import { noop, menuInheritProps } from './util';
 
 /* eslint react/no-is-mounted:0 */
 
@@ -161,22 +161,7 @@ export class MenuItem extends React.Component {
         onMouseEnter: this.onMouseEnter,
       };
     }
-    [
-      'rootPrefixCls',
-      'eventKey',
-      'active',
-      'selectedKeys',
-      'disabled',
-      'title',
-      'onItemHover',
-      'onSelect',
-      'onClick',
-      'onDeselect',
-      'parentMenu',
-      'onDestroy',
-      'onMouseEnter',
-      'onMouseLeave',
-    ].forEach(key => delete props[key])
+    menuInheritProps.forEach(key => delete props[key])
     const style = {
       ...props.style,
     };
diff --git a/src/MenuItemGroup.jsx b/src/MenuItemGroup.jsx
index b6380701..0e30286e 100644
--- a/src/MenuItemGroup.jsx
+++ b/src/MenuItemGroup.jsx
@@ -1,5 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
+import { menuInheritProps } from './util';
 
 class MenuItemGroup extends React.Component {
   static propTypes = {
@@ -24,11 +25,7 @@ class MenuItemGroup extends React.Component {
     const { className = '', rootPrefixCls } = props;
     const titleClassName = `${rootPrefixCls}-item-group-title`;
     const listClassName = `${rootPrefixCls}-item-group-list`;
-    [
-      'renderMenuItem',
-      'index',
-      'rootPrefixCls',
-    ].forEach(key => delete props[key]);
+    menuInheritProps.forEach(key => delete props[key]);
     return (
       <li {...props} className={`${className} ${rootPrefixCls}-item-group`}>
         <div
diff --git a/src/SubMenu.jsx b/src/SubMenu.jsx
index a4f29b60..9c203c71 100644
--- a/src/SubMenu.jsx
+++ b/src/SubMenu.jsx
@@ -12,6 +12,7 @@ import {
   noop,
   loopMenuItemRecursively,
   getMenuIdFromSubMenuEventKey,
+  menuInheritProps,
 } from './util';
 
 let guid = 0;
@@ -469,29 +470,7 @@ export class SubMenu extends React.Component {
       props.parentMenu.props.getPopupContainer : triggerNode => triggerNode.parentNode;
     const popupPlacement = popupPlacementMap[props.mode];
     const popupClassName = props.mode === 'inline' ? '' : props.popupClassName;
-    [
-      'parentMenu',
-      'title',
-      'selectedKeys',
-      'openKeys',
-      'onClick',
-      'onOpenChange',
-      'rootPrefixCls',
-      'eventKey',
-      'multiple',
-      'active',
-      'onItemHover',
-      'onSelect',
-      'triggerSubMenuAction',
-      'onDeselect',
-      'onDestroy',
-      'onMouseEnter',
-      'onMouseLeave',
-      'onTitleMouseEnter',
-      'onTitleMouseLeave',
-      'onTitleClick',
-      'isOpen',
-    ].forEach(key => delete props[key]);
+    menuInheritProps.forEach(key => delete props[key]);
     return (
       <li {...props} {...mouseEvents} className={className}>
         {isInlineMode && title}
diff --git a/src/SubPopupMenu.js b/src/SubPopupMenu.js
index 4bab00ca..6457a6e6 100644
--- a/src/SubPopupMenu.js
+++ b/src/SubPopupMenu.js
@@ -4,7 +4,7 @@ import { connect } from 'mini-store';
 import KeyCode from 'rc-util/lib/KeyCode';
 import createChainedFunction from 'rc-util/lib/createChainedFunction';
 import classNames from 'classnames';
-import { getKeyFromChildrenIndex, loopMenuItem, noop } from './util';
+import { getKeyFromChildrenIndex, loopMenuItem, noop, menuInheritProps } from './util';
 import DOMWrap from './DOMWrap';
 
 function allDisabled(arr) {
@@ -323,33 +323,7 @@ export class SubPopupMenu extends React.Component {
       domProps.tabIndex = '0';
       domProps.onKeyDown = this.onKeyDown;
     }
-    [
-      'defaultSelectedKeys',
-      'selectedKeys',
-      'defaultOpenKeys',
-      'openKeys',
-      'mode',
-      'getPopupContainer',
-      'onClick',
-      'onSelect',
-      'onDeselect',
-      'onDestroy',
-      'openTransitionName',
-      'openAnimation',
-      'subMenuOpenDelay',
-      'subMenuCloseDelay',
-      'forceSubMenuRender',
-      'triggerSubMenuAction',
-      'level',
-      'selectable',
-      'multiple',
-      'onOpenChange',
-      'visible',
-      'focusable',
-      'defaultActiveFirst',
-      'prefixCls',
-      'inlineIndent',
-    ].forEach(key => delete props[key]);
+    menuInheritProps.forEach(key => delete props[key]);
     return (
       // ESLint is not smart enough to know that the type of `children` was checked.
       /* eslint-disable */
diff --git a/src/util.js b/src/util.js
index 82c07f4f..c0a49f79 100644
--- a/src/util.js
+++ b/src/util.js
@@ -36,8 +36,8 @@ export function loopMenuItemRecursively(children, keys, ret) {
     if (c) {
       const construct = c.type;
       if (!construct
-            ||
-          !(construct.isSubMenu || construct.isMenuItem || construct.isMenuItemGroup)
+        ||
+        !(construct.isSubMenu || construct.isMenuItem || construct.isMenuItemGroup)
       ) {
         return;
       }
@@ -49,3 +49,49 @@ export function loopMenuItemRecursively(children, keys, ret) {
     }
   });
 }
+
+export const menuInheritProps = [
+  'defaultSelectedKeys',
+  'selectedKeys',
+  'defaultOpenKeys',
+  'openKeys',
+  'mode',
+  'getPopupContainer',
+  'onClick',
+  'onSelect',
+  'onDeselect',
+  'onDestroy',
+  'openTransitionName',
+  'openAnimation',
+  'subMenuOpenDelay',
+  'subMenuCloseDelay',
+  'forceSubMenuRender',
+  'triggerSubMenuAction',
+  'level',
+  'selectable',
+  'multiple',
+  'onOpenChange',
+  'visible',
+  'focusable',
+  'defaultActiveFirst',
+  'prefixCls',
+  'inlineIndent',
+  'parentMenu',
+  'title',
+  'rootPrefixCls',
+  'eventKey',
+  'active',
+  'onItemHover',
+  'onMouseEnter',
+  'onMouseLeave',
+  'onTitleMouseEnter',
+  'onTitleMouseLeave',
+  'onTitleClick',
+  'isOpen',
+  'renderMenuItem',
+  'manualRef',
+  'subMenuKey',
+  'disabled',
+  'index',
+  'isSelected',
+]
\ No newline at end of file

From a925c9c9a41b4684c076fcb5eab98c4629a51e91 Mon Sep 17 00:00:00 2001
From: jljsj33 <liangjun.jiang@alipay.com>
Date: Fri, 20 Apr 2018 14:39:43 +0800
Subject: [PATCH 08/16] fix lint

---
 src/MenuItem.jsx | 2 +-
 src/util.js      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/MenuItem.jsx b/src/MenuItem.jsx
index 5ad2da35..4db82a98 100644
--- a/src/MenuItem.jsx
+++ b/src/MenuItem.jsx
@@ -161,7 +161,7 @@ export class MenuItem extends React.Component {
         onMouseEnter: this.onMouseEnter,
       };
     }
-    menuInheritProps.forEach(key => delete props[key])
+    menuInheritProps.forEach(key => delete props[key]);
     const style = {
       ...props.style,
     };
diff --git a/src/util.js b/src/util.js
index c0a49f79..973e25e8 100644
--- a/src/util.js
+++ b/src/util.js
@@ -94,4 +94,4 @@ export const menuInheritProps = [
   'disabled',
   'index',
   'isSelected',
-]
\ No newline at end of file
+];

From 5e68def722ebf736067543b19b52ea3d94a6fd69 Mon Sep 17 00:00:00 2001
From: jljsj33 <liangjun.jiang@alipay.com>
Date: Fri, 20 Apr 2018 14:54:42 +0800
Subject: [PATCH 09/16] item props store

---
 src/util.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/util.js b/src/util.js
index 973e25e8..8eb71157 100644
--- a/src/util.js
+++ b/src/util.js
@@ -94,4 +94,5 @@ export const menuInheritProps = [
   'disabled',
   'index',
   'isSelected',
+  'store',
 ];

From 28cb9c8fe489b436fa26cfb2e1890f40b2f79df1 Mon Sep 17 00:00:00 2001
From: jljsj33 <liangjun.jiang@alipay.com>
Date: Fri, 20 Apr 2018 16:29:13 +0800
Subject: [PATCH 10/16] item props activeKey

---
 src/util.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/util.js b/src/util.js
index 8eb71157..e1b23375 100644
--- a/src/util.js
+++ b/src/util.js
@@ -95,4 +95,5 @@ export const menuInheritProps = [
   'index',
   'isSelected',
   'store',
+  'activeKey',
 ];

From 2b5c70a186f426436369a2eed6708b135fd7adb8 Mon Sep 17 00:00:00 2001
From: jljsj33 <liangjun.jiang@alipay.com>
Date: Fri, 20 Apr 2018 17:59:48 +0800
Subject: [PATCH 11/16] fix

---
 src/MenuItem.jsx      |  2 +-
 src/MenuItemGroup.jsx |  5 +++--
 src/SubMenu.jsx       | 15 +++++++++++----
 src/SubPopupMenu.js   |  7 ++++---
 4 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/src/MenuItem.jsx b/src/MenuItem.jsx
index 4db82a98..68faf4f7 100644
--- a/src/MenuItem.jsx
+++ b/src/MenuItem.jsx
@@ -161,13 +161,13 @@ export class MenuItem extends React.Component {
         onMouseEnter: this.onMouseEnter,
       };
     }
-    menuInheritProps.forEach(key => delete props[key]);
     const style = {
       ...props.style,
     };
     if (props.mode === 'inline') {
       style.paddingLeft = props.inlineIndent * props.level;
     }
+    menuInheritProps.forEach(key => delete props[key]);
     return (
       <li
         {...props}
diff --git a/src/MenuItemGroup.jsx b/src/MenuItemGroup.jsx
index 0e30286e..f7c6b1e5 100644
--- a/src/MenuItemGroup.jsx
+++ b/src/MenuItemGroup.jsx
@@ -25,14 +25,15 @@ class MenuItemGroup extends React.Component {
     const { className = '', rootPrefixCls } = props;
     const titleClassName = `${rootPrefixCls}-item-group-title`;
     const listClassName = `${rootPrefixCls}-item-group-list`;
+    const { title } = props;
     menuInheritProps.forEach(key => delete props[key]);
     return (
       <li {...props} className={`${className} ${rootPrefixCls}-item-group`}>
         <div
           className={titleClassName}
-          title={typeof props.title === 'string' ? props.title : undefined}
+          title={typeof title === 'string' ? title : undefined}
         >
-          {props.title}
+          {title}
         </div>
         <ul className={listClassName}>
           {React.Children.map(props.children, this.renderInnerMenuItem)}
diff --git a/src/SubMenu.jsx b/src/SubMenu.jsx
index 9c203c71..cd76563e 100644
--- a/src/SubMenu.jsx
+++ b/src/SubMenu.jsx
@@ -470,6 +470,13 @@ export class SubMenu extends React.Component {
       props.parentMenu.props.getPopupContainer : triggerNode => triggerNode.parentNode;
     const popupPlacement = popupPlacementMap[props.mode];
     const popupClassName = props.mode === 'inline' ? '' : props.popupClassName;
+    const {
+      disabled,
+      triggerSubMenuAction,
+      subMenuOpenDelay,
+      forceSubMenuRender,
+      subMenuCloseDelay,
+    } = props;
     menuInheritProps.forEach(key => delete props[key]);
     return (
       <li {...props} {...mouseEvents} className={className}>
@@ -484,11 +491,11 @@ export class SubMenu extends React.Component {
             popupPlacement={popupPlacement}
             popupVisible={isOpen}
             popup={children}
-            action={props.disabled ? [] : [props.triggerSubMenuAction]}
-            mouseEnterDelay={props.subMenuOpenDelay}
-            mouseLeaveDelay={props.subMenuCloseDelay}
+            action={disabled ? [] : [triggerSubMenuAction]}
+            mouseEnterDelay={subMenuOpenDelay}
+            mouseLeaveDelay={subMenuCloseDelay}
             onPopupVisibleChange={this.onPopupVisibleChange}
-            forceRender={props.forceSubMenuRender}
+            forceRender={forceSubMenuRender}
           >
             {title}
           </Trigger>
diff --git a/src/SubPopupMenu.js b/src/SubPopupMenu.js
index 6457a6e6..a4073233 100644
--- a/src/SubPopupMenu.js
+++ b/src/SubPopupMenu.js
@@ -323,6 +323,7 @@ export class SubPopupMenu extends React.Component {
       domProps.tabIndex = '0';
       domProps.onKeyDown = this.onKeyDown;
     }
+    const { prefixCls, eventKey, visible } = props;
     menuInheritProps.forEach(key => delete props[key]);
     return (
       // ESLint is not smart enough to know that the type of `children` was checked.
@@ -331,13 +332,13 @@ export class SubPopupMenu extends React.Component {
         {...props}
         style={props.style}
         tag="ul"
-        hiddenClassName={`${props.prefixCls}-hidden`}
-        visible={props.visible}
+        hiddenClassName={`${prefixCls}-hidden`}
+        visible={visible}
         {...domProps}
       >
         {React.Children.map(
           props.children,
-          (c, i) => this.renderMenuItem(c, i, props.eventKey || '0-menu-'),
+          (c, i) => this.renderMenuItem(c, i, eventKey || '0-menu-'),
         )}
       </DOMWrap>
       /*eslint-enable */

From b746abc31a5960f8c26507127e610a4cd7fafc04 Mon Sep 17 00:00:00 2001
From: jljsj33 <liangjun.jiang@alipay.com>
Date: Mon, 23 Apr 2018 11:14:56 +0800
Subject: [PATCH 12/16] update menuInheritProps to menuAllProps

---
 src/MenuItem.jsx      | 4 ++--
 src/MenuItemGroup.jsx | 2 +-
 src/SubMenu.jsx       | 4 ++--
 src/SubPopupMenu.js   | 2 +-
 src/util.js           | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/MenuItem.jsx b/src/MenuItem.jsx
index 68faf4f7..19e483a6 100644
--- a/src/MenuItem.jsx
+++ b/src/MenuItem.jsx
@@ -5,7 +5,7 @@ import KeyCode from 'rc-util/lib/KeyCode';
 import classNames from 'classnames';
 import scrollIntoView from 'dom-scroll-into-view';
 import { connect } from 'mini-store';
-import { noop, menuInheritProps } from './util';
+import { noop, menuAllProps } from './util';
 
 /* eslint react/no-is-mounted:0 */
 
@@ -167,7 +167,7 @@ export class MenuItem extends React.Component {
     if (props.mode === 'inline') {
       style.paddingLeft = props.inlineIndent * props.level;
     }
-    menuInheritProps.forEach(key => delete props[key]);
+    menuAllProps.forEach(key => delete props[key]);
     return (
       <li
         {...props}
diff --git a/src/MenuItemGroup.jsx b/src/MenuItemGroup.jsx
index f7c6b1e5..938f8685 100644
--- a/src/MenuItemGroup.jsx
+++ b/src/MenuItemGroup.jsx
@@ -26,7 +26,7 @@ class MenuItemGroup extends React.Component {
     const titleClassName = `${rootPrefixCls}-item-group-title`;
     const listClassName = `${rootPrefixCls}-item-group-list`;
     const { title } = props;
-    menuInheritProps.forEach(key => delete props[key]);
+    menuAllProps.forEach(key => delete props[key]);
     return (
       <li {...props} className={`${className} ${rootPrefixCls}-item-group`}>
         <div
diff --git a/src/SubMenu.jsx b/src/SubMenu.jsx
index cd76563e..951fe578 100644
--- a/src/SubMenu.jsx
+++ b/src/SubMenu.jsx
@@ -12,7 +12,7 @@ import {
   noop,
   loopMenuItemRecursively,
   getMenuIdFromSubMenuEventKey,
-  menuInheritProps,
+  menuAllProps,
 } from './util';
 
 let guid = 0;
@@ -477,7 +477,7 @@ export class SubMenu extends React.Component {
       forceSubMenuRender,
       subMenuCloseDelay,
     } = props;
-    menuInheritProps.forEach(key => delete props[key]);
+    menuAllProps.forEach(key => delete props[key]);
     return (
       <li {...props} {...mouseEvents} className={className}>
         {isInlineMode && title}
diff --git a/src/SubPopupMenu.js b/src/SubPopupMenu.js
index a4073233..4048ff52 100644
--- a/src/SubPopupMenu.js
+++ b/src/SubPopupMenu.js
@@ -324,7 +324,7 @@ export class SubPopupMenu extends React.Component {
       domProps.onKeyDown = this.onKeyDown;
     }
     const { prefixCls, eventKey, visible } = props;
-    menuInheritProps.forEach(key => delete props[key]);
+    menuAllProps.forEach(key => delete props[key]);
     return (
       // ESLint is not smart enough to know that the type of `children` was checked.
       /* eslint-disable */
diff --git a/src/util.js b/src/util.js
index e1b23375..58850370 100644
--- a/src/util.js
+++ b/src/util.js
@@ -50,7 +50,7 @@ export function loopMenuItemRecursively(children, keys, ret) {
   });
 }
 
-export const menuInheritProps = [
+export const menuAllProps = [
   'defaultSelectedKeys',
   'selectedKeys',
   'defaultOpenKeys',

From dd8ae62dd79469a2decbf45a177135892f78b77d Mon Sep 17 00:00:00 2001
From: jljsj33 <liangjun.jiang@alipay.com>
Date: Mon, 23 Apr 2018 12:51:45 +0800
Subject: [PATCH 13/16] all props remove mouser event

---
 src/util.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/util.js b/src/util.js
index 58850370..d4556ed6 100644
--- a/src/util.js
+++ b/src/util.js
@@ -57,7 +57,6 @@ export const menuAllProps = [
   'openKeys',
   'mode',
   'getPopupContainer',
-  'onClick',
   'onSelect',
   'onDeselect',
   'onDestroy',
@@ -82,8 +81,6 @@ export const menuAllProps = [
   'eventKey',
   'active',
   'onItemHover',
-  'onMouseEnter',
-  'onMouseLeave',
   'onTitleMouseEnter',
   'onTitleMouseLeave',
   'onTitleClick',

From 95a42e1f474158c4aedd5c0886389def80b21b12 Mon Sep 17 00:00:00 2001
From: jljsj33 <liangjun.jiang@alipay.com>
Date: Tue, 24 Apr 2018 11:22:49 +0800
Subject: [PATCH 14/16] rebase master, fix inlineIndent propsTypes oneOfType is
 Array

---
 src/MenuItemGroup.jsx | 6 +++---
 src/SubPopupMenu.js   | 7 +++----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/MenuItemGroup.jsx b/src/MenuItemGroup.jsx
index 938f8685..6464b519 100644
--- a/src/MenuItemGroup.jsx
+++ b/src/MenuItemGroup.jsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { menuInheritProps } from './util';
+import { menuAllProps } from './util';
 
 class MenuItemGroup extends React.Component {
   static propTypes = {
@@ -25,7 +25,7 @@ class MenuItemGroup extends React.Component {
     const { className = '', rootPrefixCls } = props;
     const titleClassName = `${rootPrefixCls}-item-group-title`;
     const listClassName = `${rootPrefixCls}-item-group-list`;
-    const { title } = props;
+    const { title, children } = props;
     menuAllProps.forEach(key => delete props[key]);
     return (
       <li {...props} className={`${className} ${rootPrefixCls}-item-group`}>
@@ -36,7 +36,7 @@ class MenuItemGroup extends React.Component {
           {title}
         </div>
         <ul className={listClassName}>
-          {React.Children.map(props.children, this.renderInnerMenuItem)}
+          {React.Children.map(children, this.renderInnerMenuItem)}
         </ul>
       </li>
     );
diff --git a/src/SubPopupMenu.js b/src/SubPopupMenu.js
index 4048ff52..fb26e907 100644
--- a/src/SubPopupMenu.js
+++ b/src/SubPopupMenu.js
@@ -4,7 +4,7 @@ import { connect } from 'mini-store';
 import KeyCode from 'rc-util/lib/KeyCode';
 import createChainedFunction from 'rc-util/lib/createChainedFunction';
 import classNames from 'classnames';
-import { getKeyFromChildrenIndex, loopMenuItem, noop, menuInheritProps } from './util';
+import { getKeyFromChildrenIndex, loopMenuItem, noop, menuAllProps } from './util';
 import DOMWrap from './DOMWrap';
 
 function allDisabled(arr) {
@@ -87,7 +87,7 @@ export class SubPopupMenu extends React.Component {
     level: PropTypes.number,
     mode: PropTypes.oneOf(['horizontal', 'vertical', 'vertical-left', 'vertical-right', 'inline']),
     triggerSubMenuAction: PropTypes.oneOf(['click', 'hover']),
-    inlineIndent: PropTypes.oneOfType(PropTypes.number, PropTypes.string),
+    inlineIndent: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
     manualRef: PropTypes.func,
   };
 
@@ -304,7 +304,7 @@ export class SubPopupMenu extends React.Component {
   };
 
   render() {
-    const props = this.props;
+    const { ...props } = this.props;
     this.instanceArray = [];
     const className = classNames(
       props.prefixCls,
@@ -330,7 +330,6 @@ export class SubPopupMenu extends React.Component {
       /* eslint-disable */
       <DOMWrap
         {...props}
-        style={props.style}
         tag="ul"
         hiddenClassName={`${prefixCls}-hidden`}
         visible={visible}

From 537a9d6165685e1f430a095766b3d51ff11694a9 Mon Sep 17 00:00:00 2001
From: jljsj33 <liangjun.jiang@alipay.com>
Date: Tue, 24 Apr 2018 16:20:20 +0800
Subject: [PATCH 15/16] add item onClick, related
 https://github.com/ant-design/ant-design/issues/9004

---
 src/SubPopupMenu.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/SubPopupMenu.js b/src/SubPopupMenu.js
index fb26e907..cd3c71f1 100644
--- a/src/SubPopupMenu.js
+++ b/src/SubPopupMenu.js
@@ -270,7 +270,10 @@ export class SubPopupMenu extends React.Component {
       eventKey: key,
       active: !childProps.disabled && isActive,
       multiple: props.multiple,
-      onClick: this.onClick,
+      onClick: (e) => {
+        (childProps.onClick || noop)(e);
+        this.onClick(e);
+      },
       onItemHover: this.onItemHover,
       openTransitionName: this.getOpenTransitionName(),
       openAnimation: props.openAnimation,

From 0e2b18073f1ecec7565e03840fd352a2a989cdc2 Mon Sep 17 00:00:00 2001
From: afc163 <afc163@gmail.com>
Date: Thu, 26 Apr 2018 17:26:02 +0800
Subject: [PATCH 16/16] Add test case

---
 tests/MenuItem.spec.js                    | 33 ++++++++++-
 tests/__snapshots__/MenuItem.spec.js.snap | 67 +++++++++++++++++++++++
 2 files changed, 99 insertions(+), 1 deletion(-)
 create mode 100644 tests/__snapshots__/MenuItem.spec.js.snap

diff --git a/tests/MenuItem.spec.js b/tests/MenuItem.spec.js
index b87064c7..1e65bc5c 100644
--- a/tests/MenuItem.spec.js
+++ b/tests/MenuItem.spec.js
@@ -2,7 +2,7 @@
 import React from 'react';
 import { mount, shallow } from 'enzyme';
 import KeyCode from 'rc-util/lib/KeyCode';
-import Menu, { MenuItem } from '../src';
+import Menu, { MenuItem, MenuItemGroup, SubMenu } from '../src';
 
 import { MenuItem as NakedMenuItem } from '../src/MenuItem';
 
@@ -81,4 +81,35 @@ describe('MenuItem', () => {
       expect(onMouseLeave).toHaveBeenCalledWith({ key, domEvent });
     });
   });
+
+  describe('rest props', () => {
+    it('can render all props to sub component', () => {
+      const onClick = jest.fn();
+      const restProps = {
+        onClick,
+        'data-whatever': 'whatever',
+        title: 'title',
+        className: 'className',
+        style: { fontSize: 20 },
+      };
+      const wrapper = mount(
+        <Menu mode="inline" activeKey="1">
+          <MenuItem key="1" {...restProps}>1</MenuItem>
+          <SubMenu {...restProps}>
+            <MenuItem key="2" {...restProps}>3</MenuItem>
+          </SubMenu>
+          <MenuItemGroup {...restProps}>
+            <MenuItem key="3" {...restProps}>4</MenuItem>
+          </MenuItemGroup>
+        </Menu>
+      );
+      expect(wrapper.render()).toMatchSnapshot();
+      wrapper.find('MenuItem').at(0).simulate('click');
+      expect(onClick).toHaveBeenCalledTimes(1);
+      wrapper.find('SubMenu').at(0).simulate('click');
+      expect(onClick).toHaveBeenCalledTimes(2);
+      wrapper.find('MenuItemGroup').at(0).simulate('click');
+      expect(onClick).toHaveBeenCalledTimes(3);
+    });
+  });
 });
diff --git a/tests/__snapshots__/MenuItem.spec.js.snap b/tests/__snapshots__/MenuItem.spec.js.snap
new file mode 100644
index 00000000..3fb01614
--- /dev/null
+++ b/tests/__snapshots__/MenuItem.spec.js.snap
@@ -0,0 +1,67 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`MenuItem rest props can render all props to sub component 1`] = `
+<ul
+  aria-activedescendant=""
+  class="rc-menu  rc-menu-root rc-menu-inline"
+  role="menu"
+  tabindex="0"
+>
+  <li
+    aria-selected="false"
+    class="rc-menu-item className rc-menu-item-active"
+    data-whatever="whatever"
+    role="menuitem"
+    style="font-size: 20px; padding-left: 24px;"
+    title="title"
+  >
+    1
+  </li>
+  <li
+    class="rc-menu-submenu rc-menu-submenu-inline className"
+    data-whatever="whatever"
+    style="font-size: 20px;"
+  >
+    <div
+      aria-expanded="false"
+      aria-haspopup="true"
+      aria-owns="item_1$Menu"
+      class="rc-menu-submenu-title"
+      style="padding-left: 24px;"
+      title="title"
+    >
+      title
+      <i
+        class="rc-menu-submenu-arrow"
+      />
+    </div>
+    <div />
+  </li>
+  <li
+    class="className rc-menu-item-group"
+    data-whatever="whatever"
+    style="font-size: 20px;"
+  >
+    <div
+      class="rc-menu-item-group-title"
+      title="title"
+    >
+      title
+    </div>
+    <ul
+      class="rc-menu-item-group-list"
+    >
+      <li
+        aria-selected="false"
+        class="rc-menu-item className"
+        data-whatever="whatever"
+        role="menuitem"
+        style="font-size: 20px; padding-left: 24px;"
+        title="title"
+      >
+        4
+      </li>
+    </ul>
+  </li>
+</ul>
+`;