Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions .changeset/witty-parts-take.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@radix-ui/react-menu': patch
---

Adds the align property to Menu.SubContent
79 changes: 79 additions & 0 deletions apps/storybook/stories/dropdown-menu.stories.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -366,6 +366,85 @@ export const Submenus = () => {
);
};

export const InvertedWithSubmenus = () => (
<div style={{ display: 'flex', alignItems: 'center', justifyContent: 'center', height: '100vh' }}>
<DropdownMenu.Root>
<DropdownMenu.Trigger className={styles.trigger}>Open</DropdownMenu.Trigger>
<DropdownMenu.Portal>
<DropdownMenu.Content className={styles.content} sideOffset={5} side="top">
<DropdownMenu.Item className={styles.item} onSelect={() => console.log('new-tab')}>
New Tab
</DropdownMenu.Item>
<DropdownMenu.Item className={styles.item} onSelect={() => console.log('new-window')}>
New Window
</DropdownMenu.Item>
<DropdownMenu.Separator className={styles.separator} />
<DropdownMenu.Sub>
<DropdownMenu.SubTrigger className={subTriggerClass}>
Bookmarks →
</DropdownMenu.SubTrigger>
<DropdownMenu.Portal>
<DropdownMenu.SubContent
className={styles.content}
sideOffset={12}
alignOffset={-6}
align="end"
>
<DropdownMenu.Item className={styles.item} onSelect={() => console.log('index')}>
Inbox
</DropdownMenu.Item>
<DropdownMenu.Item className={styles.item} onSelect={() => console.log('calendar')}>
Calendar
</DropdownMenu.Item>
<DropdownMenu.Separator className={styles.separator} />
<DropdownMenu.Sub>
<DropdownMenu.SubTrigger className={subTriggerClass}>
WorkOS →
</DropdownMenu.SubTrigger>
<DropdownMenu.Portal>
<DropdownMenu.SubContent
className={styles.content}
sideOffset={12}
alignOffset={-6}
align="end"
>
<DropdownMenu.Item
className={styles.item}
onSelect={() => console.log('stitches')}
>
Stitches
</DropdownMenu.Item>
<DropdownMenu.Item
className={styles.item}
onSelect={() => console.log('composer')}
>
Composer
</DropdownMenu.Item>
<DropdownMenu.Item
className={styles.item}
onSelect={() => console.log('radix')}
>
Radix
</DropdownMenu.Item>
<DropdownMenu.Arrow />
</DropdownMenu.SubContent>
</DropdownMenu.Portal>
</DropdownMenu.Sub>
<DropdownMenu.Separator className={styles.separator} />
<DropdownMenu.Item className={styles.item} onSelect={() => console.log('notion')}>
Notion
</DropdownMenu.Item>
<DropdownMenu.Arrow />
</DropdownMenu.SubContent>
</DropdownMenu.Portal>
</DropdownMenu.Sub>
<DropdownMenu.Arrow />
</DropdownMenu.Content>
</DropdownMenu.Portal>
</DropdownMenu.Root>
</div>
);

export const WithLabels = () => (
<div style={{ textAlign: 'center', padding: 50 }}>
<DropdownMenu.Root>
Expand Down
12 changes: 10 additions & 2 deletions packages/react/menu/src/menu.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -1147,6 +1147,8 @@ MenuSubTrigger.displayName = SUB_TRIGGER_NAME;

const SUB_CONTENT_NAME = 'MenuSubContent';

type AlignSubContent = Exclude<(typeof PopperPrimitive.ALIGN_OPTIONS)[number], 'center'>;

type MenuSubContentElement = MenuContentImplElement;
interface MenuSubContentProps
extends Omit<
Expand All @@ -1158,12 +1160,18 @@ interface MenuSubContentProps
* controlling animation with React animation libraries.
*/
forceMount?: true;

/**
* Controls the direction the subcontent appears from its anchor menu item
* Default: start
*/
align?: AlignSubContent;
}

const MenuSubContent = React.forwardRef<MenuSubContentElement, MenuSubContentProps>(
(props: ScopedProps<MenuSubContentProps>, forwardedRef) => {
const portalContext = usePortalContext(CONTENT_NAME, props.__scopeMenu);
const { forceMount = portalContext.forceMount, ...subContentProps } = props;
const { forceMount = portalContext.forceMount, align = 'start', ...subContentProps } = props;
const context = useMenuContext(CONTENT_NAME, props.__scopeMenu);
const rootContext = useMenuRootContext(CONTENT_NAME, props.__scopeMenu);
const subContext = useMenuSubContext(SUB_CONTENT_NAME, props.__scopeMenu);
Expand All @@ -1178,7 +1186,7 @@ const MenuSubContent = React.forwardRef<MenuSubContentElement, MenuSubContentPro
aria-labelledby={subContext.triggerId}
{...subContentProps}
ref={composedRefs}
align="start"
align={align}
side={rootContext.dir === 'rtl' ? 'left' : 'right'}
disableOutsidePointerEvents={false}
disableOutsideScroll={false}
Expand Down