Skip to content

fix(navigation-menu): pass data-state to ViewportContentMounter #3923

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

Open
LongTangGithub wants to merge 1 commit into
base: main
Choose a base branch
from
+48 −1
Open

fix(navigation-menu): pass data-state to ViewportContentMounter #3923

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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/humble-jars-prove.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@radix-ui/react-navigation-menu": major
---

Fix missing data-state attribute on NavigationMenuContent when used with forceMount and NavigationMenuViewport
36 changes: 36 additions & 0 deletions apps/storybook/stories/navigation-menu.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,42 @@ import styles from './navigation-menu.stories.module.css';

export default { title: 'Components/NavigationMenu' };

export const ForceMountWithViewport = () => {
return (
<StoryFrame>
<NavigationMenu.Root>
<NavigationMenu.List className={styles.mainList}>
<NavigationMenu.Item>
<TriggerWithIndicator>Products</TriggerWithIndicator>
{/* forceMount keeps content mounted; Viewport routes it via ViewportContentMounter */}
<NavigationMenu.Content
forceMount
className={styles.viewportContent}
style={{ width: 400 }}
>
<LinkGroup items={['Item One', 'Item Two', 'Item Three']} />
</NavigationMenu.Content>
</NavigationMenu.Item>

<NavigationMenu.Item>
<TriggerWithIndicator>Company</TriggerWithIndicator>
<NavigationMenu.Content
forceMount
className={styles.viewportContent}
style={{ width: 300 }}
>
<LinkGroup items={['About', 'Careers']} />
</NavigationMenu.Content>
</NavigationMenu.Item>
</NavigationMenu.List>

{/* Viewport is the key — this triggers the ViewportContentMounter path */}
<NavigationMenu.Viewport />
</NavigationMenu.Root>
</StoryFrame>
);
};

export const Basic = () => {
return (
<StoryFrame>
Expand Down
8 changes: 7 additions & 1 deletion packages/react/navigation-menu/src/navigation-menu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -764,6 +764,7 @@ const NavigationMenuContent = React.forwardRef<
const itemContext = useNavigationMenuItemContext(CONTENT_NAME, props.__scopeNavigationMenu);
const composedRefs = useComposedRefs(itemContext.contentRef, forwardedRef);
const open = itemContext.value === context.value;
const openState = getOpenState(open);

const commonProps = {
value: itemContext.value,
Expand Down Expand Up @@ -794,7 +795,12 @@ const NavigationMenuContent = React.forwardRef<
/>
</Presence>
) : (
<ViewportContentMounter forceMount={forceMount} {...commonProps} ref={composedRefs} />
<ViewportContentMounter
data-state={openState}
forceMount={forceMount}
{...commonProps}
ref={composedRefs}
/>
);
});

Expand Down