Skip to content

Fix NavList indentation #1411

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

Merged
danielguillan merged 11 commits into from
Jul 21, 2026
Merged

Fix NavList indentation #1411

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
bc7c73b
Fix NavList leaf item indentation in group lists
danielguillan Jul 20, 2026
39ee172
Add changeset
danielguillan Jul 20, 2026
7f7a549
Update snapshots
danielguillan Jul 20, 2026
51e5f11
Fix grouped NavList nesting
danielguillan Jul 20, 2026
152a538
Address a11y issue in new story
danielguillan Jul 20, 2026
25a414e
Use grouped NavList indentation variables
danielguillan Jul 20, 2026
7d3b7f9
Merge branch 'main' into danielguillan/fix-navlist-leaf-padding
danielguillan Jul 20, 2026
a661c55
Simplify CSS
danielguillan Jul 21, 2026
f4d1f94
Refactor nested indentation
danielguillan Jul 21, 2026
8ad1a68
Clean up
danielguillan Jul 21, 2026
0a0c699
Clean up 2
danielguillan Jul 21, 2026
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/neat-lists-align.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@primer/react-brand': patch
---

Fixed `NavList` indentation across grouped nested disclosure levels.
52 changes: 52 additions & 0 deletions packages/react/src/NavList/NavList.features.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,58 @@ export const NestedDisclosure: Story = {
},
}

export const GroupedNestedLevels: Story = {
render: () => (
<NavList aria-label="Grouped nested levels">
<NavList.Group title="Level 3 leaf">
<NavList.Item defaultExpanded>
Level 2 disclosure
<NavList.SubNav>
<NavList.Item href="#" aria-current="page">
Level 3 current leaf
</NavList.Item>
Comment thread
danielguillan marked this conversation as resolved.
Outdated
</NavList.SubNav>
</NavList.Item>
</NavList.Group>
<NavList.Group title="Level 4 leaf">
<NavList.Item defaultExpanded>
Level 2 disclosure
<NavList.SubNav>
<NavList.Item defaultExpanded>
Level 3 disclosure
<NavList.SubNav>
<NavList.Item href="#" aria-current="page">
Level 4 current leaf
</NavList.Item>
</NavList.SubNav>
</NavList.Item>
</NavList.SubNav>
</NavList.Item>
</NavList.Group>
<NavList.Group title="Level 5 leaf">
<NavList.Item defaultExpanded>
Level 2 disclosure
<NavList.SubNav>
<NavList.Item defaultExpanded>
Level 3 disclosure
<NavList.SubNav>
<NavList.Item defaultExpanded>
Level 4 disclosure
<NavList.SubNav>
<NavList.Item href="#" aria-current="page">
Level 5 current leaf
</NavList.Item>
</NavList.SubNav>
</NavList.Item>
</NavList.SubNav>
</NavList.Item>
</NavList.SubNav>
</NavList.Item>
</NavList.Group>
</NavList>
),
}

export const MultipleLevels: Story = {
render: function MultipleLevels() {
const {t} = useTranslation('NavList')
Expand Down
20 changes: 20 additions & 0 deletions packages/react/src/NavList/NavList.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,6 +359,14 @@
padding-inline-start: var(--base-size-40);
}

.NavList__groupList .NavList__item--level-3 > .NavList__itemContent {
padding-inline-start: calc(var(--base-size-16) + var(--base-size-2));
}
Comment thread
danielguillan marked this conversation as resolved.
Outdated

.NavList__groupList .NavList__item--leaf.NavList__item--level-3 > .NavList__itemContent {
padding-inline-start: var(--base-size-16);
}
Comment thread
danielguillan marked this conversation as resolved.
Outdated

.NavList__item--leaf.NavList__item--level-4 > .NavList__itemContent {
padding-inline-start: calc(var(--base-size-48) + var(--base-size-8));
}
Expand All @@ -367,6 +375,18 @@
padding-inline-start: calc(var(--base-size-64) + var(--base-size-8));
}

.NavList__groupList .NavList__item--level-4 > .NavList__itemContent {
padding-inline-start: calc(var(--base-size-32) + var(--base-size-2));
}

.NavList__groupList .NavList__item--leaf.NavList__item--level-4 > .NavList__itemContent {
padding-inline-start: var(--base-size-32);
}

.NavList__groupList .NavList__item--leaf.NavList__item--level-5 > .NavList__itemContent {
padding-inline-start: var(--base-size-48);
}

.NavList__item:is(.NavList__item--level-2, .NavList__item--level-3, .NavList__item--level-4)
> .NavList__itemContent
.NavList__toggleIcon {
Expand Down
11 changes: 11 additions & 0 deletions packages/react/src/NavList/NavList.visual.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,17 @@ test.describe('Visual Comparison: NavList', () => {
await expect(page).toHaveScreenshot({fullPage: true})
})

test('NavList / Grouped Nested Levels', async ({page}) => {
await page.goto(
'http://localhost:6006/iframe.html?args=&id=components-navlist-features--grouped-nested-levels&viewMode=story',
{waitUntil: 'networkidle'},
)
await page.locator('body.sb-show-main').waitFor({state: 'visible'})

await page.waitForTimeout(500)
await expect(page).toHaveScreenshot({fullPage: true})
})

test('NavList / Multiple Levels', async ({page}) => {
await page.goto(
'http://localhost:6006/iframe.html?args=&id=components-navlist-features--multiple-levels&viewMode=story',
Expand Down
Binary file added ...-snapshots/Visual-Comparison-NavList-NavList-Grouped-Nested-Levels-1-darwin.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ...c.ts-snapshots/Visual-Comparison-NavList-NavList-Nested-Disclosure-1-darwin.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading