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
Original file line number Diff line number Diff line change
Expand Up @@ -110,4 +110,50 @@ describe('<NavigationMenu.Trigger />', () => {
parseInt(getComputedStyle(positioner).getPropertyValue('--positioner-height'), 10),
).to.be.approximately(18, 1);
});

it.skipIf(isJSDOM)('handles positioner width correctly', async () => {
await render(
<NavigationMenu.Root>
<NavigationMenu.List>
<NavigationMenu.Item>
<NavigationMenu.Trigger>Overview</NavigationMenu.Trigger>
</NavigationMenu.Item>
<NavigationMenu.Item>
<NavigationMenu.Trigger>Handbook</NavigationMenu.Trigger>
<NavigationMenu.Content>
<NavigationMenu.Link href="#">Styling Base UI components</NavigationMenu.Link>
</NavigationMenu.Content>
</NavigationMenu.Item>
</NavigationMenu.List>
<NavigationMenu.Portal>
<NavigationMenu.Positioner data-testid="positioner">
<NavigationMenu.Popup>
<NavigationMenu.Viewport />
</NavigationMenu.Popup>
</NavigationMenu.Positioner>
</NavigationMenu.Portal>
</NavigationMenu.Root>,
);

const overviewButton = screen.getByRole('button', { name: 'Overview' });
const handbookButton = screen.getByRole('button', { name: 'Handbook' });

await userEvent.pointer([
{ target: overviewButton },
{ target: handbookButton, releasePrevious: true },
{ target: overviewButton, releasePrevious: true },
]);

await waitFor(() => {
const handbookLink = screen.getByRole('link', { name: 'Styling Base UI components' });

expect(handbookLink).toBeVisible();
});

const positioner = await screen.findByTestId('positioner');

expect(
parseInt(getComputedStyle(positioner).getPropertyValue('--positioner-width'), 10),
).to.be.approximately(183, 1);
});
});
Original file line number Diff line number Diff line change
Expand Up @@ -129,26 +129,28 @@ export const NavigationMenuTrigger = React.forwardRef(function NavigationMenuTri
positionerElement.style.removeProperty(NavigationMenuPositionerCssVars.positionerHeight);

const { width, height } = getCssDimensions(popupElement);
const measuredWidth = width || prevSizeRef.current.width;
const measuredHeight = height || prevSizeRef.current.height;

if (currentHeight === 0 || currentWidth === 0) {
currentWidth = width;
currentHeight = height;
currentWidth = measuredWidth;
currentHeight = measuredHeight;
}

popupElement.style.setProperty(NavigationMenuPopupCssVars.popupWidth, `${currentWidth}px`);
popupElement.style.setProperty(NavigationMenuPopupCssVars.popupHeight, `${currentHeight}px`);
positionerElement.style.setProperty(
NavigationMenuPositionerCssVars.positionerWidth,
`${width}px`,
`${measuredWidth}px`,
);
positionerElement.style.setProperty(
NavigationMenuPositionerCssVars.positionerHeight,
`${height}px`,
`${measuredHeight}px`,
);

sizeFrame1.request(() => {
popupElement.style.setProperty(NavigationMenuPopupCssVars.popupWidth, `${width}px`);
popupElement.style.setProperty(NavigationMenuPopupCssVars.popupHeight, `${height}px`);
popupElement.style.setProperty(NavigationMenuPopupCssVars.popupWidth, `${measuredWidth}px`);
popupElement.style.setProperty(NavigationMenuPopupCssVars.popupHeight, `${measuredHeight}px`);

sizeFrame2.request(() => {
animationAbortControllerRef.current = new AbortController();
Expand All @@ -158,13 +160,13 @@ export const NavigationMenuTrigger = React.forwardRef(function NavigationMenuTri
});

React.useEffect(() => {
if (!open) {
if (!mounted) {
stickIfOpenTimeout.clear();
sizeFrame1.cancel();
sizeFrame2.cancel();
prevSizeRef.current = DEFAULT_SIZE;
}
}, [stickIfOpenTimeout, open, sizeFrame1, sizeFrame2]);
}, [stickIfOpenTimeout, mounted, sizeFrame1, sizeFrame2]);

React.useEffect(() => {
if (!popupElement || typeof ResizeObserver !== 'function') {
Expand Down
Loading