Skip to content

RAC Submenu: remove SubmenuContext and pass portal container via PopoverContext #5803

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
reidbarber merged 6 commits into from
Feb 8, 2024
Merged

RAC Submenu: remove SubmenuContext and pass portal container via PopoverContext #5803

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
dc8228e
remove SubmenuContext and pass portal props via PopoverContext
reidbarber Feb 5, 2024
4e056c9
fix tests
reidbarber Feb 5, 2024
0d62bd4
Merge branch 'main' into rac-submenu-remove-context
reidbarber Feb 5, 2024
8bb8e7e
Merge remote-tracking branch 'origin/main' into rac-submenu-remove-co…
reidbarber Feb 8, 2024
1bbfd5e
send down to through PopoverContext
reidbarber Feb 8, 2024
adfdf68
fix test
reidbarber Feb 8, 2024
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
9 changes: 4 additions & 5 deletions packages/react-aria-components/src/Menu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
import {AriaMenuProps, FocusScope, mergeProps, useFocusRing, useMenu, useMenuItem, useMenuSection, useMenuTrigger} from 'react-aria';
import {BaseCollection, CollectionProps, ItemRenderProps, useCachedChildren, useCollection, useSSRCollectionNode} from './Collection';
import {MenuTriggerProps as BaseMenuTriggerProps, Node, TreeState, useMenuTriggerState, useTreeState} from 'react-stately';
import {ContextValue, forwardRefType, Provider, RenderProps, ScrollableProps, SlotProps, StyleProps, useContextProps, useRenderProps, useSlot} from './utils';
import {ContextValue, forwardRefType, Provider, RenderProps, ScrollableProps, SlotProps, StyleProps, useContextProps, useRenderProps, useSlot, useSlottedContext} from './utils';
import {filterDOMProps, mergeRefs, useObjectRef, useResizeObserver} from '@react-aria/utils';
import {Header} from './Header';
import {Key, LinkDOMProps} from '@react-types/shared';
Expand All @@ -31,7 +31,6 @@ import {UNSTABLE_useSubmenuTrigger} from '@react-aria/menu';
export const MenuContext = createContext<ContextValue<MenuProps<any>, HTMLDivElement>>(null);
export const MenuStateContext = createContext<TreeState<unknown> | null>(null);
export const RootMenuTriggerStateContext = createContext<RootMenuTriggerState | null>(null);
export const SubmenuContext = createContext<{popoverContainer: Element | null} | null>(null);

export interface MenuTriggerProps extends BaseMenuTriggerProps {
children?: ReactNode
Expand Down Expand Up @@ -181,7 +180,7 @@ function MenuInner<T extends object>({props, collection, menuRef: ref}: MenuInne
values={[
[MenuStateContext, state],
[SeparatorContext, {elementType: 'div'}],
[SubmenuContext, {popoverContainer}]
[PopoverContext, {UNSTABLE_portalContainer: popoverContainer || undefined}]
]}>
{children}
</Provider>
Expand Down Expand Up @@ -347,9 +346,9 @@ interface MenuItemTriggerInnerProps<T> {

function MenuItemTriggerInner<T>({item, popover, parentMenuRef, delay}: MenuItemTriggerInnerProps<T>) {
let state = useContext(MenuStateContext)!;
let popoverContext = useSlottedContext(PopoverContext)!;
let ref = useObjectRef<any>(item.props.ref);
let rootMenuTriggerState = useContext(RootMenuTriggerStateContext)!;
let submenuContext = useContext(SubmenuContext)!;
let submenuTriggerState = UNSTABLE_useSubmenuTriggerState({triggerKey: item.key}, rootMenuTriggerState);
let submenuRef = useRef<HTMLDivElement>(null);
let {submenuTriggerProps, submenuProps, popoverProps} = UNSTABLE_useSubmenuTrigger({
Expand Down Expand Up @@ -398,7 +397,7 @@ function MenuItemTriggerInner<T>({item, popover, parentMenuRef, delay}: MenuItem
trigger: 'SubmenuTrigger',
triggerRef: ref,
placement: 'end top',
UNSTABLE_portalContainer: submenuContext.popoverContainer || undefined,
UNSTABLE_portalContainer: popoverContext.UNSTABLE_portalContainer || undefined,
...popoverProps
}]
]}>
Expand Down
1 change: 1 addition & 0 deletions packages/react-aria-components/test/Menu.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -679,6 +679,7 @@ describe('Menu', () => {
expect(document.activeElement).toBe(button);
});
it('should restore focus to menu trigger if nested submenu is closed with Escape key', async () => {
document.elementFromPoint = jest.fn().mockImplementation(query => query);
let {getByRole, getAllByRole} = render(
<MenuTrigger>
<Button aria-label="Menu">☰</Button>
Expand Down