Skip to content
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

Feat menu popover positioning #1295

Merged
merged 3 commits into from
Nov 29, 2023
Merged

Feat menu popover positioning #1295

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c10e64c
fix(menu): popover misaligning inside stacks
anitavincent Nov 23, 2023
a15e8b9
feat(menu): change popover position as designed
anitavincent Nov 23, 2023
eb9a97b
test(menu): fix test not passing after change to portal
anitavincent Nov 28, 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
10 changes: 8 additions & 2 deletions packages/components/src/menu/menu-provider.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
import { MenuProvider } from '@ariakit/react'
import type { MenuProviderProps } from '@ariakit/react'
import { MenuProvider as Provider } from '@ariakit/react'
import React from 'react'

export { MenuProvider }
export function MenuProvider(props: MenuProviderProps) {
const { placement = 'bottom-end', ...otherProps } = props

return <Provider placement={placement} {...otherProps} />
}
1 change: 1 addition & 0 deletions packages/components/src/menu/menu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ export const Menu = forwardRef<HTMLDivElement, MenuProps>(function Menu(
ref={ref}
render={asChild && (children as any)}
gutter={4}
portal
{...otherProps}
>
{children}
Expand Down
69 changes: 37 additions & 32 deletions packages/components/src/menu/stories/menu.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import './style.css'
import React from 'react'
import {
IconCaretDown,
Expand All @@ -24,46 +25,50 @@ export default {

export function Default() {
return (
<MenuProvider>
<MenuTrigger>Open</MenuTrigger>
<Menu>
<MenuItem>New Tab</MenuItem>
<MenuItem>New Item</MenuItem>
<MenuSeparator />
<MenuItem>Downloads</MenuItem>
</Menu>
</MenuProvider>
<div className="base-story">
<MenuProvider>
<MenuTrigger>Open</MenuTrigger>
<Menu>
<MenuItem>New Tab</MenuItem>
<MenuItem>New Item</MenuItem>
<MenuSeparator />
<MenuItem>Downloads</MenuItem>
</Menu>
</MenuProvider>
</div>
)
}

export function Composition() {
return (
<MenuProvider>
<MenuTrigger asChild>
<Button>
Open <IconCaretDown />
</Button>
</MenuTrigger>
<Menu asChild>
<div style={{ border: '5px solid red' }}>
<MenuItem>New Tab</MenuItem>
<MenuItem>New Item</MenuItem>
<MenuSeparator />
<MenuItem asChild>
<a href="htpps://vtex.com" target="_blank" rel="noreferrer">
Downloads
</a>
</MenuItem>
</div>
</Menu>
</MenuProvider>
<div className="base-story">
<MenuProvider placement="bottom-end">
<MenuTrigger asChild>
<Button>
Open <IconCaretDown />
</Button>
</MenuTrigger>
<Menu asChild>
<div style={{ border: '5px solid red' }}>
<MenuItem>New Tab</MenuItem>
<MenuItem>New Item</MenuItem>
<MenuSeparator />
<MenuItem asChild>
<a href="htpps://vtex.com" target="_blank" rel="noreferrer">
Downloads
</a>
</MenuItem>
</div>
</Menu>
</MenuProvider>
</div>
)
}

export function MoreActions() {
return (
<Stack>
<Stack direction="row">
<Stack className="base-story">
<Stack direction="row" space="5rem">
<MenuProvider>
<MenuTrigger asChild>
<Button variant="primary">
Expand Down Expand Up @@ -204,7 +209,7 @@ export function MoreActions() {

export function CustomLabel() {
return (
<Stack>
<Stack className="base-story">
<MenuProvider>
<MenuTrigger asChild>
<Button variant="primary">
Expand Down Expand Up @@ -237,7 +242,7 @@ export function CustomLabel() {

export function ItemVariants() {
return (
<Stack>
<Stack className="base-story">
<MenuProvider>
<MenuTrigger asChild>
<Button variant="primary">
Expand Down
3 changes: 3 additions & 0 deletions packages/components/src/menu/stories/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
.base-story {
padding: 2rem;
}
6 changes: 4 additions & 2 deletions packages/components/src/menu/tests/menu.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { MenuSeparator } from '../menu-separator'

describe('menu', () => {
it('renders', () => {
const { container } = render(
const { container, unmount } = render(
<MenuProvider>
<MenuTrigger asChild>
<button>Open</button>
Expand All @@ -20,7 +20,7 @@ describe('menu', () => {
<MenuSeparator />
<MenuItem>Item 3</MenuItem>
</Menu>
</MenuProvider>
</MenuProvider>, {container: document.body}
)

expect(container.querySelector('[data-sl-menu]')).toBeInTheDocument()
Expand All @@ -31,5 +31,7 @@ describe('menu', () => {
expect(
container.querySelector('[data-sl-menu-separator]')
).toBeInTheDocument()

unmount()
})
})