Skip to content

fix(react-menu): use outline for menuItem focus ring #28685

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

Merged
YuanboXue-Amber merged 2 commits into from
Jul 31, 2023
Merged

fix(react-menu): use outline for menuItem focus ring #28685

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c3f0a63
use outline
YuanboXue-Amber Jul 31, 2023
e119251
chg
YuanboXue-Amber Jul 31, 2023
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-510dece4-88f8-4c7d-9e27-036a1e74d520.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "fix: use css outline for MenuItem focus ring instead of pseudo element",
"packageName": "@fluentui/react-menu",
"email": "yuanboxue@microsoft.com",
"dependentChangeType": "patch"
}
15 changes: 13 additions & 2 deletions packages/react-components/react-menu/src/components/MenuItem/useMenuItemStyles.styles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { mergeClasses, makeStyles, shorthands } from '@griffel/react';
import { iconFilledClassName, iconRegularClassName } from '@fluentui/react-icons';
import { createFocusOutlineStyle } from '@fluentui/react-tabster';
import { createCustomFocusIndicatorStyle } from '@fluentui/react-tabster';
import { tokens } from '@fluentui/react-theme';
import { useCheckmarkStyles_unstable } from '../../selectable/index';
import type { MenuItemCheckboxState } from '../MenuItemCheckbox/index';
Expand All @@ -17,7 +17,18 @@ export const menuItemClassNames: SlotClassNames<MenuItemSlots> = {
};

const useStyles = makeStyles({
focusIndicator: createFocusOutlineStyle(),
focusIndicator: {
':focus': {
outlineStyle: 'none',
},
':focus-visible': {
outlineStyle: 'none',
},
...createCustomFocusIndicatorStyle({
...shorthands.borderRadius(tokens.borderRadiusMedium),
...shorthands.outline(tokens.strokeWidthThick, 'solid', tokens.colorStrokeFocus2),
}),
},
// TODO: this should be extracted to another package
root: {
...shorthands.borderRadius(tokens.borderRadiusMedium),
Expand Down