From 5f40fe874b559d2775c1ccb41bdd97017a8507be Mon Sep 17 00:00:00 2001 From: Wuxh Date: Thu, 29 Dec 2022 21:08:45 +0800 Subject: [PATCH] fix: dropdown menu style issue (#39904) * fix: dropdown menu item in danger Disable dropdown menu item when type is equal to danger increase disabled CSS specificity remove unnecessary changes fix: remove reordering functions Remove reordering functions by increasing `disable` class on line 350 CSS specificity Revert "fix: remove reordering functions " This reverts commit bd94daaddf973f5f8ef1641ea3081f5aab2fc3a2. * chore: update style * chore: update demo ref: https://github.com/ant-design/ant-design/issues/39322 * test: update snapshot Co-authored-by: samyar <75088294+samyarkd@users.noreply.github.com> --- .../__snapshots__/demo-extend.test.ts.snap | 456 +++++++++++++++++- components/dropdown/demo/dropdown-button.tsx | 8 + components/dropdown/style/status.ts | 2 +- 3 files changed, 459 insertions(+), 7 deletions(-) diff --git a/components/dropdown/__tests__/__snapshots__/demo-extend.test.ts.snap b/components/dropdown/__tests__/__snapshots__/demo-extend.test.ts.snap index 8ef969e6ac1f..716b4be6779f 100644 --- a/components/dropdown/__tests__/__snapshots__/demo-extend.test.ts.snap +++ b/components/dropdown/__tests__/__snapshots__/demo-extend.test.ts.snap @@ -3514,7 +3514,7 @@ exports[`renders ./components/dropdown/demo/dropdown-button.tsx extend context c +
+
+
+
+ +
+ +
+
+
+
+
+
+ +
+ +
+
@@ -3796,7 +3870,7 @@ exports[`renders ./components/dropdown/demo/dropdown-button.tsx extend context c +
+
+
+
+ +
+ +
+
+
+
+
+
+ +
+ +
+
@@ -4080,7 +4228,7 @@ exports[`renders ./components/dropdown/demo/dropdown-button.tsx extend context c +
+
+
+
+ +
+ +
+
+
+
+
+
+ +
+ +
+
@@ -4390,7 +4612,7 @@ exports[`renders ./components/dropdown/demo/dropdown-button.tsx extend context c +
+
+
+
+ +
+ +
+
+
+
+
+
+ +
+ +
+
@@ -4675,7 +4971,7 @@ exports[`renders ./components/dropdown/demo/dropdown-button.tsx extend context c +
+
+
+
+ +
+ +
+
+
+
+
+
+ +
+ +
+
@@ -4956,7 +5326,7 @@ exports[`renders ./components/dropdown/demo/dropdown-button.tsx extend context c +
+
+
+
+ +
+ +
+
+
+
+
+
+ +
+ +
+
diff --git a/components/dropdown/demo/dropdown-button.tsx b/components/dropdown/demo/dropdown-button.tsx index 7d0b51eea88b..d2897fed0728 100644 --- a/components/dropdown/demo/dropdown-button.tsx +++ b/components/dropdown/demo/dropdown-button.tsx @@ -28,6 +28,14 @@ const items: MenuProps['items'] = [ label: '3rd menu item', key: '3', icon: , + danger: true, + }, + { + label: '4rd menu item', + key: '4', + icon: , + danger: true, + disabled: true, }, ]; diff --git a/components/dropdown/style/status.ts b/components/dropdown/style/status.ts index 8e7f536dec95..1f6ddb0b21d8 100644 --- a/components/dropdown/style/status.ts +++ b/components/dropdown/style/status.ts @@ -9,7 +9,7 @@ const genStatusStyle: GenerateStyle = (token) => { return { [`${componentCls}, ${componentCls}-menu-submenu`]: { [`${menuCls} ${itemCls}`]: { - [`&${itemCls}-danger`]: { + [`&${itemCls}-danger:not(${itemCls}-disabled)`]: { color: colorError, '&:hover': {