Skip to content

An open source design system that's fully customizable and agent ready

TypeScript

fix(SideNav): render the footer row only when it holds the collapse button or footerIcons (#10721)

vittorio8abf7bdfdbe4
diff --git a/.changeset/sidenav-footer-without-empty-row.md b/.changeset/sidenav-footer-without-empty-row.md
new file mode 100644
index 0000000000..9bc02e1eda
--- /dev/null
+++ b/.changeset/sidenav-footer-without-empty-row.md
@@ -0,0 +1,7 @@
+---
+'@astryxdesign/core': patch
+---
+
+[fix] `SideNav` no longer adds space below a `footer` when it has no `footerIcons` and no built-in collapse button. The sidebar rendered an empty footer row there, and the gap of the sticky bottom area added space after the footer. The row now renders only when it holds the collapse button or `footerIcons`, as the drawer already does.
+
+@vittoriobusatta
diff --git a/packages/core/src/SideNav/SideNav.test.tsx b/packages/core/src/SideNav/SideNav.test.tsx
index 47e3694612..c1a4018316 100644
--- a/packages/core/src/SideNav/SideNav.test.tsx
+++ b/packages/core/src/SideNav/SideNav.test.tsx
@@ -200,6 +200,51 @@ describe('SideNav', () => {
expect(nav.children).toHaveLength(1);
});
+ it('does not render an empty footer row when only footer is set', () => {
+ render(
+ <SideNav footer={<span data-testid="footer">Footer</span>}>
+ Content
+ </SideNav>,
+ );
+
+ // The sticky bottom spaces its children with a gap, so an empty row adds
+ // space below the footer. The footer must be its only child.
+ const stickyBottom = screen.getByTestId('footer').parentElement;
+ expect(stickyBottom?.children).toHaveLength(1);
+ expect(document.querySelector('[class*="footerRow"]')).toBeNull();
+ });
+
+ it('keeps the footer row for footerIcons beside a footer', () => {
+ render(
+ <SideNav
+ footer={<span data-testid="footer">Footer</span>}
+ footerIcons={<span data-testid="icons">Icons</span>}>
+ Content
+ </SideNav>,
+ );
+
+ const footerRow = document.querySelector('[class*="footerRow"]');
+ expect(footerRow).toContainElement(screen.getByTestId('icons'));
+ expect(screen.getByTestId('footer').parentElement?.children).toHaveLength(
+ 2,
+ );
+ });
+
+ it('keeps the footer row for the built-in collapse button beside a footer', () => {
+ render(
+ <SideNav
+ collapsible={{}}
+ footer={<span data-testid="footer">Footer</span>}>
+ Content
+ </SideNav>,
+ );
+
+ const footerRow = document.querySelector('[class*="footerRow"]');
+ expect(footerRow).toContainElement(
+ screen.getByRole('button', {name: 'Collapse sidebar'}),
+ );
+ });
+
it('centers footer content when collapsed, matching children alignment', () => {
render(
<SideNav
diff --git a/packages/core/src/SideNav/SideNav.tsx b/packages/core/src/SideNav/SideNav.tsx
index 78f1483b02..173fdf660a 100644
--- a/packages/core/src/SideNav/SideNav.tsx
+++ b/packages/core/src/SideNav/SideNav.tsx
@@ -999,16 +999,18 @@ export function SideNav({
collapsed && styles.stickyBottomCollapsed,
)}>
{footer}
- <div
- {...stylex.props(
- styles.footerRow,
- collapsed && styles.footerRowCollapsed,
- )}>
- <SizeProvider value={FOOTER_ICON_SIZE}>
- {showCollapseButton && <SideNavCollapseButton />}
- {footerIcons}
- </SizeProvider>
- </div>
+ {(showCollapseButton || isRenderable(footerIcons)) && (
+ <div
+ {...stylex.props(
+ styles.footerRow,
+ collapsed && styles.footerRowCollapsed,
+ )}>
+ <SizeProvider value={FOOTER_ICON_SIZE}>
+ {showCollapseButton && <SideNavCollapseButton />}
+ {footerIcons}
+ </SizeProvider>
+ </div>
+ )}
</div>
)}
</nav>