Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: dropdown menu item #39368

Closed
wants to merge 6 commits into from
Closed

fix: dropdown menu item #39368

Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
08cc6c9
fix: dropdown menu item in danger
samyarkd Dec 7, 2022
30cdf7c
Merge branch 'ant-design:master' into bugfix
samyarkd Dec 9, 2022
a9e77a6
increase disabled CSS specificity
samyarkd Dec 9, 2022
6c14940
remove unnecessary changes
samyarkd Dec 9, 2022
b3655b1
Merge branch 'ant-design:master' into bugfix
samyarkd Dec 15, 2022
b9e5c30
fix: remove reordering functions
samyarkd Dec 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions components/dropdown/style/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,7 +347,7 @@ const genBaseStyle: GenerateStyle<DropdownToken> = (token) => {
},
},

'&-disabled': {
[`&${menuCls}-item-disabled`]: {
color: colorTextDisabled,
cursor: 'not-allowed',

Expand Down Expand Up @@ -456,9 +456,9 @@ export default genComponentStyleHook(
dropdownEdgeChildPadding: paddingXXS,
});
return [
genStatusStyle(dropdownToken),
Copy link
Member

@MadCcc MadCcc Dec 9, 2022 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I prefer to remain the order because genBaseStyle should be at first.
Maybe problem is solved without changing order since the priority has been raised?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I prefer to remain the order because genBaseStyle should be at first. Maybe problem is solved without changing order since the priority has been raised?

I've also tested this and it still doesn't fix the problem without reordering

Copy link
Member

@MadCcc MadCcc Dec 12, 2022 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should provide higher priority instead of reordering, since it may cause other issue related with order.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I made some changes without reordering the functions

genBaseStyle(dropdownToken),
genButtonStyle(dropdownToken),
genStatusStyle(dropdownToken),
];
},
(token) => ({
Expand Down