From 3c4cc688a1a92fbcc3cbd146864e0b4f4b33616b Mon Sep 17 00:00:00 2001
From: afc163 <afc163@gmail.com>
Date: Fri, 27 Oct 2017 10:02:08 +0800
Subject: [PATCH 1/4] Fix install warning, close #8030

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index fbc4e4a55a..1da2e4239a 100644
--- a/package.json
+++ b/package.json
@@ -76,8 +76,8 @@
     "rc-tree-select": "~1.10.2",
     "rc-upload": "~2.4.0",
     "rc-util": "^4.0.4",
-    "react-lazy-load": "^3.0.10",
-    "react-slick": "~0.15.0",
+    "react-lazy-load": "^3.0.12",
+    "react-slick": "~0.15.4",
     "shallowequal": "^1.0.1",
     "warning": "~3.0.0"
   },

From c664d843fb855d17d796fda6484f60068edab7a1 Mon Sep 17 00:00:00 2001
From: nikogu <644506165@qq.com>
Date: Fri, 27 Oct 2017 17:40:31 +0800
Subject: [PATCH 2/4] fixed:
 https://github.com/ant-design/ant-design/issues/8040

---
 components/menu/demo/switch-mode.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/menu/demo/switch-mode.md b/components/menu/demo/switch-mode.md
index 24ea7de1b3..c36872a503 100755
--- a/components/menu/demo/switch-mode.md
+++ b/components/menu/demo/switch-mode.md
@@ -58,7 +58,7 @@ class Sider extends React.Component {
           <SubMenu key="sub1" title={<span><Icon type="appstore" /><span>Navigation Three</span></span>}>
             <Menu.Item key="3">Option 3</Menu.Item>
             <Menu.Item key="4">Option 4</Menu.Item>
-            <SubMenu key="sub2" title="Submenu">
+            <SubMenu key="sub1-2" title="Submenu">
               <Menu.Item key="5">Option 5</Menu.Item>
               <Menu.Item key="6">Option 6</Menu.Item>
             </SubMenu>

From 9696739a36df528013179e38f4ca874faa82377b Mon Sep 17 00:00:00 2001
From: nikogu <644506165@qq.com>
Date: Fri, 27 Oct 2017 18:24:07 +0800
Subject: [PATCH 3/4] update Menu snapshots

---
 components/menu/__tests__/__snapshots__/demo.test.js.snap | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/menu/__tests__/__snapshots__/demo.test.js.snap b/components/menu/__tests__/__snapshots__/demo.test.js.snap
index d675e69404..9f17ec1c0a 100644
--- a/components/menu/__tests__/__snapshots__/demo.test.js.snap
+++ b/components/menu/__tests__/__snapshots__/demo.test.js.snap
@@ -552,7 +552,7 @@ exports[`renders ./components/menu/demo/switch-mode.md correctly 1`] = `
           <div
             aria-expanded="false"
             aria-haspopup="true"
-            aria-owns="sub2$Menu"
+            aria-owns="sub1-2$Menu"
             class="ant-menu-submenu-title"
             style="padding-left:48px;"
             title="Submenu"

From 8bde0c0feecaa7be01f0edbb9d4e2d3f994f8007 Mon Sep 17 00:00:00 2001
From: vgeyi <vgeyiz@126.com>
Date: Fri, 27 Oct 2017 20:21:34 +0800
Subject: [PATCH 4/4] Rewrite the MenuItem to handle ref for react 16 (#8037)

* ReWrite MenuItem to remove ref warning for react 16

* unified coding style

* add removing semicolon
---
 components/menu/MenuItem.tsx | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/components/menu/MenuItem.tsx b/components/menu/MenuItem.tsx
index 3ee55f1894..0bcb9f7c45 100644
--- a/components/menu/MenuItem.tsx
+++ b/components/menu/MenuItem.tsx
@@ -3,22 +3,22 @@ import { Item } from 'rc-menu';
 import PropTypes from 'prop-types';
 import Tooltip from '../tooltip';
 
-const MenuItem: any = (props, { inlineCollapsed }) => {
-  return (
-    <Tooltip
+class MenuItem extends React.Component<any, any> {
+  static contextTypes = {
+    inlineCollapsed: PropTypes.bool,
+  };
+  static isMenuItem = 1;
+  render() {
+    const { inlineCollapsed } = this.context;
+    const props = this.props;
+    return <Tooltip
       title={inlineCollapsed && props.level === 1 ? props.children : ''}
       placement="right"
       overlayClassName={`${props.rootPrefixCls}-inline-collapsed-tooltip`}
     >
       <Item {...props} />
-    </Tooltip>
-  );
-};
-
-MenuItem.contextTypes = {
-  inlineCollapsed: PropTypes.bool,
-};
-
-MenuItem.isMenuItem = 1;
+    </Tooltip>;
+  }
+}
 
 export default MenuItem;