Skip to content

fix: use Highlight/HighlightText for MenuItem hover #36974

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

Open
Victor Genaev (mainframev) wants to merge 1 commit into
base: master
Choose a base branch
from
+25 −6
Open

fix: use Highlight/HighlightText for MenuItem hover #36974

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions change/@fluentui-react-menu-hc-hover-18832.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
Comment thread
mainframev marked this conversation as resolved.
"type": "patch",
"comment": "fix: use Highlight/HighlightText for MenuItem hover and open-submenu states in forced colors mode",
"packageName": "@fluentui/react-menu",
"email": "vgenaev@gmail.com",
"dependentChangeType": "patch"
}
24 changes: 18 additions & 6 deletions ...s/react-components/react-menu/library/src/components/MenuItem/useMenuItemStyles.styles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ export const menuItemClassNames: SlotClassNames<MenuItemSlots> = {
subText: 'fui-MenuItem__subText',
};

const slotsSelector = `& .${menuItemClassNames.icon}, & .${menuItemClassNames.checkmark}, & .${menuItemClassNames.subText}, & .${menuItemClassNames.secondaryContent}`;

const useRootBaseStyles = makeResetStyles({
borderRadius: tokens.borderRadiusMedium,
position: 'relative',
Expand Down Expand Up @@ -69,9 +71,13 @@ const useRootBaseStyles = makeResetStyles({
// High contrast styles
'@media (forced-colors: active)': {
':hover': {
backgroundColor: 'Canvas',
borderColor: 'Highlight',
color: 'Highlight',
forcedColorAdjust: 'none',
backgroundColor: 'Highlight',
color: 'HighlightText',

[slotsSelector]: {
color: 'HighlightText',
},
},
...createFocusOutlineStyle({ style: { outlineColor: 'Highlight' } }),
},
Expand Down Expand Up @@ -166,8 +172,13 @@ const useStyles = makeStyles({
},

'@media (forced-colors: active)': {
backgroundColor: 'Canvas',
color: 'Highlight',
forcedColorAdjust: 'none',
backgroundColor: 'Highlight',
color: 'HighlightText',

[slotsSelector]: {
color: 'HighlightText',
},
},
},
disabled: {
Expand Down Expand Up @@ -206,13 +217,14 @@ const useStyles = makeStyles({
'@media (forced-colors: active)': {
color: 'GrayText',
':hover': {
forcedColorAdjust: 'auto',
color: 'GrayText',
backgroundColor: 'Canvas',
[`& .${menuItemClassNames.icon}`]: {
color: 'GrayText',
backgroundColor: 'Canvas',
},
[`& .${menuItemClassNames.subText}`]: {
[slotsSelector]: {
color: 'GrayText',
},
},
Expand Down
Loading