Skip to content

fix(NavList): merge sx and non-sx scenarios #6264

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
wants to merge 5 commits into
base: main
Choose a base branch
from
Open

fix(NavList): merge sx and non-sx scenarios #6264

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7a95a9a
fix(NavList): merge sx and non-sx scenarios
joshblack Jul 1, 2025
dabf609
chore: add changeset
joshblack Jul 1, 2025
864dc68
chore: remove BoxWithFallack usage
joshblack Jul 3, 2025
ae28ef3
Merge branch 'main' of github.com:primer/react into fix/update-navlis…
joshblack Jul 3, 2025
96f83aa
Merge branch 'main' into fix/update-navlist-group-divider
jonrohan Jul 3, 2025
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/kind-pants-march.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@primer/react': patch
---

Update NavList.Group to render divider when `sx` is provided
14 changes: 3 additions & 11 deletions packages/react/src/NavList/NavList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,20 +285,11 @@ export type NavListGroupProps = React.HTMLAttributes<HTMLLIElement> & {
title?: string
} & SxProp

const defaultSx = {}
const Group: React.FC<NavListGroupProps> = ({title, children, sx: sxProp = defaultSx, ...props}) => {
if (sxProp !== defaultSx) {
return (
<Box sx={sxProp} as="li" data-component="ActionList.Group">
{title ? <ActionList.GroupHeading>{title}</ActionList.GroupHeading> : null}
{children}
</Box>
)
}
function Group({title, children, sx, ...rest}: NavListGroupProps) {
return (
<>
<ActionList.Divider />
<ActionList.Group {...props}>
<ActionList.Group {...rest} sx={sx}>
{/* Setting up the default value for the heading level. TODO: API update to give flexibility to NavList.Group title's heading level */}
{title ? (
<ActionList.GroupHeading as="h3" data-component="ActionList.GroupHeading">
Expand All @@ -310,6 +301,7 @@ const Group: React.FC<NavListGroupProps> = ({title, children, sx: sxProp = defau
</>
)
}

// ----------------------------------------------------------------------------
// NavList.GroupExpand

Expand Down
Loading