From cfff7967b3a7151715ef2f0f8d05c5ce38583534 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=81=8F=E5=8F=B3?= <afc163@gmail.com>
Date: Wed, 3 Jun 2020 13:33:37 +0800
Subject: [PATCH] fix: Dropdown menu item link color when has icon (#24702)

* :bug: fix Dropdown menu item link color when has icon

close #24700

* fix snapshot
---
 components/dropdown/style/index.less          |  8 ++++
 .../__tests__/__snapshots__/demo.test.js.snap | 44 +++++++++----------
 components/menu/demo/vertical.md              | 10 +----
 3 files changed, 30 insertions(+), 32 deletions(-)

diff --git a/components/dropdown/style/index.less b/components/dropdown/style/index.less
index 108935da87..6660a768cd 100644
--- a/components/dropdown/style/index.less
+++ b/components/dropdown/style/index.less
@@ -117,6 +117,14 @@
         }
       }
 
+      > .@{iconfont-css-prefix} + span > a {
+        color: @text-color;
+        transition: all 0.3s;
+        &:hover {
+          color: @text-color;
+        }
+      }
+
       &:first-child {
         & when (@dropdown-edge-child-vertical-padding = 0) {
           border-radius: @border-radius-base @border-radius-base 0 0;
diff --git a/components/menu/__tests__/__snapshots__/demo.test.js.snap b/components/menu/__tests__/__snapshots__/demo.test.js.snap
index 338b71fbef..493de25fac 100644
--- a/components/menu/__tests__/__snapshots__/demo.test.js.snap
+++ b/components/menu/__tests__/__snapshots__/demo.test.js.snap
@@ -1302,30 +1302,28 @@ exports[`renders ./components/menu/demo/vertical.md correctly 1`] = `
       class="ant-menu-submenu-title"
       role="button"
     >
-      <span>
-        <span
-          aria-label="appstore"
-          class="anticon anticon-appstore"
-          role="img"
+      <span
+        aria-label="appstore"
+        class="anticon anticon-appstore"
+        role="img"
+      >
+        <svg
+          aria-hidden="true"
+          class=""
+          data-icon="appstore"
+          fill="currentColor"
+          focusable="false"
+          height="1em"
+          viewBox="64 64 896 896"
+          width="1em"
         >
-          <svg
-            aria-hidden="true"
-            class=""
-            data-icon="appstore"
-            fill="currentColor"
-            focusable="false"
-            height="1em"
-            viewBox="64 64 896 896"
-            width="1em"
-          >
-            <path
-              d="M464 144H160c-8.8 0-16 7.2-16 16v304c0 8.8 7.2 16 16 16h304c8.8 0 16-7.2 16-16V160c0-8.8-7.2-16-16-16zm-52 268H212V212h200v200zm452-268H560c-8.8 0-16 7.2-16 16v304c0 8.8 7.2 16 16 16h304c8.8 0 16-7.2 16-16V160c0-8.8-7.2-16-16-16zm-52 268H612V212h200v200zM464 544H160c-8.8 0-16 7.2-16 16v304c0 8.8 7.2 16 16 16h304c8.8 0 16-7.2 16-16V560c0-8.8-7.2-16-16-16zm-52 268H212V612h200v200zm452-268H560c-8.8 0-16 7.2-16 16v304c0 8.8 7.2 16 16 16h304c8.8 0 16-7.2 16-16V560c0-8.8-7.2-16-16-16zm-52 268H612V612h200v200z"
-            />
-          </svg>
-        </span>
-        <span>
-          Navigation Two
-        </span>
+          <path
+            d="M464 144H160c-8.8 0-16 7.2-16 16v304c0 8.8 7.2 16 16 16h304c8.8 0 16-7.2 16-16V160c0-8.8-7.2-16-16-16zm-52 268H212V212h200v200zm452-268H560c-8.8 0-16 7.2-16 16v304c0 8.8 7.2 16 16 16h304c8.8 0 16-7.2 16-16V160c0-8.8-7.2-16-16-16zm-52 268H612V212h200v200zM464 544H160c-8.8 0-16 7.2-16 16v304c0 8.8 7.2 16 16 16h304c8.8 0 16-7.2 16-16V560c0-8.8-7.2-16-16-16zm-52 268H212V612h200v200zm452-268H560c-8.8 0-16 7.2-16 16v304c0 8.8 7.2 16 16 16h304c8.8 0 16-7.2 16-16V560c0-8.8-7.2-16-16-16zm-52 268H612V612h200v200z"
+          />
+        </svg>
+      </span>
+      <span>
+        Navigation Two
       </span>
       <i
         class="ant-menu-submenu-arrow"
diff --git a/components/menu/demo/vertical.md b/components/menu/demo/vertical.md
index 715f32ce20..0ef0bbcb83 100755
--- a/components/menu/demo/vertical.md
+++ b/components/menu/demo/vertical.md
@@ -35,15 +35,7 @@ ReactDOM.render(
         <Menu.Item key="4">Option 4</Menu.Item>
       </Menu.ItemGroup>
     </SubMenu>
-    <SubMenu
-      key="sub2"
-      title={
-        <span>
-          <AppstoreOutlined />
-          <span>Navigation Two</span>
-        </span>
-      }
-    >
+    <SubMenu key="sub2" icon={<AppstoreOutlined />} title="Navigation Two">
       <Menu.Item key="5">Option 5</Menu.Item>
       <Menu.Item key="6">Option 6</Menu.Item>
       <SubMenu key="sub3" title="Submenu">