From b0779136973f48e5782c73e71deb7c09d5c53380 Mon Sep 17 00:00:00 2001
From: afc163 <afc163@gmail.com>
Date: Tue, 23 Feb 2021 16:48:10 +0800
Subject: [PATCH] fix: Dropdown menu item disable style with icon (#29433)

close #29430
---
 components/dropdown/demo/arrow.md     |  6 +++---
 components/dropdown/demo/basic.md     | 10 +++++-----
 components/dropdown/demo/item.md      |  4 ++--
 components/dropdown/demo/placement.md |  6 +++---
 components/dropdown/demo/trigger.md   |  4 ++--
 components/dropdown/style/index.less  |  1 +
 6 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/components/dropdown/demo/arrow.md b/components/dropdown/demo/arrow.md
index 616bc28584..7a6af177b3 100644
--- a/components/dropdown/demo/arrow.md
+++ b/components/dropdown/demo/arrow.md
@@ -19,17 +19,17 @@ import { Menu, Dropdown, Button } from 'antd';
 const menu = (
   <Menu>
     <Menu.Item>
-      <a target="_blank" rel="noopener noreferrer" href="http://www.alipay.com/">
+      <a target="_blank" rel="noopener noreferrer" href="https://www.antgroup.com">
         1st menu item
       </a>
     </Menu.Item>
     <Menu.Item>
-      <a target="_blank" rel="noopener noreferrer" href="http://www.taobao.com/">
+      <a target="_blank" rel="noopener noreferrer" href="https://www.aliyun.com">
         2nd menu item
       </a>
     </Menu.Item>
     <Menu.Item>
-      <a target="_blank" rel="noopener noreferrer" href="http://www.tmall.com/">
+      <a target="_blank" rel="noopener noreferrer" href="https://www.luohanacademy.com">
         3rd menu item
       </a>
     </Menu.Item>
diff --git a/components/dropdown/demo/basic.md b/components/dropdown/demo/basic.md
index 7286e9946e..bf92ce5bee 100644
--- a/components/dropdown/demo/basic.md
+++ b/components/dropdown/demo/basic.md
@@ -20,17 +20,17 @@ import { DownOutlined } from '@ant-design/icons';
 const menu = (
   <Menu>
     <Menu.Item>
-      <a target="_blank" rel="noopener noreferrer" href="http://www.alipay.com/">
+      <a target="_blank" rel="noopener noreferrer" href="https://www.antgroup.com">
         1st menu item
       </a>
     </Menu.Item>
-    <Menu.Item>
-      <a target="_blank" rel="noopener noreferrer" href="http://www.taobao.com/">
+    <Menu.Item icon={<DownOutlined />} disabled>
+      <a target="_blank" rel="noopener noreferrer" href="https://www.aliyun.com">
         2nd menu item
       </a>
     </Menu.Item>
-    <Menu.Item>
-      <a target="_blank" rel="noopener noreferrer" href="http://www.tmall.com/">
+    <Menu.Item disabled>
+      <a target="_blank" rel="noopener noreferrer" href="https://www.luohanacademy.com">
         3rd menu item
       </a>
     </Menu.Item>
diff --git a/components/dropdown/demo/item.md b/components/dropdown/demo/item.md
index 4f36b45841..78cee90186 100644
--- a/components/dropdown/demo/item.md
+++ b/components/dropdown/demo/item.md
@@ -20,12 +20,12 @@ import { DownOutlined } from '@ant-design/icons';
 const menu = (
   <Menu>
     <Menu.Item key="0">
-      <a target="_blank" rel="noopener noreferrer" href="http://www.alipay.com/">
+      <a target="_blank" rel="noopener noreferrer" href="https://www.antgroup.com">
         1st menu item
       </a>
     </Menu.Item>
     <Menu.Item key="1">
-      <a target="_blank" rel="noopener noreferrer" href="http://www.taobao.com/">
+      <a target="_blank" rel="noopener noreferrer" href="https://www.aliyun.com">
         2nd menu item
       </a>
     </Menu.Item>
diff --git a/components/dropdown/demo/placement.md b/components/dropdown/demo/placement.md
index 92dd0f7348..d46c3a564f 100644
--- a/components/dropdown/demo/placement.md
+++ b/components/dropdown/demo/placement.md
@@ -19,17 +19,17 @@ import { Menu, Dropdown, Button, Space } from 'antd';
 const menu = (
   <Menu>
     <Menu.Item>
-      <a target="_blank" rel="noopener noreferrer" href="http://www.alipay.com/">
+      <a target="_blank" rel="noopener noreferrer" href="https://www.antgroup.com">
         1st menu item
       </a>
     </Menu.Item>
     <Menu.Item>
-      <a target="_blank" rel="noopener noreferrer" href="http://www.taobao.com/">
+      <a target="_blank" rel="noopener noreferrer" href="https://www.aliyun.com">
         2nd menu item
       </a>
     </Menu.Item>
     <Menu.Item>
-      <a target="_blank" rel="noopener noreferrer" href="http://www.tmall.com/">
+      <a target="_blank" rel="noopener noreferrer" href="https://www.luohanacademy.com">
         3rd menu item
       </a>
     </Menu.Item>
diff --git a/components/dropdown/demo/trigger.md b/components/dropdown/demo/trigger.md
index e9a8721c0c..192f253aed 100644
--- a/components/dropdown/demo/trigger.md
+++ b/components/dropdown/demo/trigger.md
@@ -20,10 +20,10 @@ import { DownOutlined } from '@ant-design/icons';
 const menu = (
   <Menu>
     <Menu.Item key="0">
-      <a href="http://www.alipay.com/">1st menu item</a>
+      <a href="https://www.antgroup.com">1st menu item</a>
     </Menu.Item>
     <Menu.Item key="1">
-      <a href="http://www.taobao.com/">2nd menu item</a>
+      <a href="https://www.aliyun.com">2nd menu item</a>
     </Menu.Item>
     <Menu.Divider />
     <Menu.Item key="3">3rd menu item</Menu.Item>
diff --git a/components/dropdown/style/index.less b/components/dropdown/style/index.less
index 4a06dfbd9e..41a3b4e3a7 100644
--- a/components/dropdown/style/index.less
+++ b/components/dropdown/style/index.less
@@ -226,6 +226,7 @@
           cursor: not-allowed;
         }
 
+        > .@{iconfont-css-prefix} + span > a,
         > a {
           position: relative;
           color: @disabled-color;