Skip to content

[Menu] Fix for keyboard focus is lost when hovering out of a menu #2727

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
chiuam merged 7 commits into from
Mar 24, 2023
Merged

[Menu] Fix for keyboard focus is lost when hovering out of a menu #2727

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
17d8eb5
keyboard navigation works
Mar 23, 2023
a107f54
Change files
Mar 23, 2023
7945de3
Opt out .blur logic on macOS
Mar 23, 2023
8553c96
Revert initial fix and set focus on MenuList instead
chiuam Mar 24, 2023
db1266c
Revert more code
chiuam Mar 24, 2023
3c78896
Address feedback
chiuam Mar 24, 2023
0eaaa7f
Remove change file
chiuam Mar 24, 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-native-menu-7499cad3-b53d-4e65-ac30-498b5e81638c.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "Fix for keyboard focus is lost when hovering out of a menu",
"packageName": "@fluentui-react-native/menu",
"email": "email not defined",
"dependentChangeType": "patch"
}
7 changes: 5 additions & 2 deletions packages/components/Menu/src/MenuList/MenuList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,12 @@ export const MenuList = compose<MenuListType>({
const Slots = useSlots(menuList.props, (layer) => menuListLookup(layer, menuList, userProps));

const focusZoneRef = React.useRef<View>();
const setFocusZoneFocus = () => {
focusZoneRef?.current?.focus();
};

React.useEffect(() => {
focusZoneRef?.current?.focus();
setFocusZoneFocus();
}, []);

return (_final: MenuListProps, children: React.ReactNode) => {
Expand Down Expand Up @@ -83,7 +86,7 @@ export const MenuList = compose<MenuListType>({

const content =
Platform.OS === 'macos' ? (
<Slots.root>
<Slots.root onMouseLeave={setFocusZoneFocus}>
<Slots.scrollView
accessibilityRole="menu"
showsVerticalScrollIndicator={menuContext.hasMaxHeight}
Expand Down