Skip to content

fix: Reserve navigation space in app layout skeleton when trigger is hidden #5155

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
amanabiy merged 2 commits into from
Oct 23, 2026
Merged

fix: Reserve navigation space in app layout skeleton when trigger is hidden #5155

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
415d7e2
fix: Reserve navigation space in app layout skeleton when trigger is …
TrevorBurnham Oct 17, 2026
fef4039
Merge branch 'main' into skeleton-reserve-navigation
amanabiy Oct 19, 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
41 changes: 41 additions & 0 deletions src/app-layout/__tests__/skeleton.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import { render } from '@testing-library/react';

import AppLayout from '../../../lib/components/app-layout';
import { BeforeMainSlotSkeleton } from '../../../lib/components/app-layout/visual-refresh-toolbar/skeleton/skeleton-parts';
import AppLayoutToolbar from '../../../lib/components/app-layout-toolbar';
import BreadcrumbGroup from '../../../lib/components/breadcrumb-group';
import { getFunnelKeySelector } from '../../../lib/components/internal/analytics/selectors';
import { describeEachAppLayout, renderComponent } from './utils';
Expand Down Expand Up @@ -95,6 +96,46 @@ describeEachAppLayout({ themes: ['refresh-toolbar'] }, () => {
expect(wrapper.findByClassName(skeletonStyles['panel-hidden'])).toBeFalsy();
});

it('reserves space for the open navigation when the navigation trigger is hidden', () => {
const noop = () => {};
const { wrapper, rerender } = renderComponent(
<AppLayoutToolbar
navigation="test nav"
navigationTriggerHide={true}
navigationOpen={true}
onNavigationChange={noop}
breadcrumbs="dummy"
/>
);
expect(wrapper.findNavigationToggle()).toBeFalsy();
expect(wrapper.findByClassName(skeletonStyles.navigation)).toBeTruthy();
expect(wrapper.findByClassName(skeletonStyles['panel-hidden'])).toBeFalsy();
rerender(
<AppLayoutToolbar
navigation="test nav"
navigationTriggerHide={true}
navigationOpen={false}
onNavigationChange={noop}
breadcrumbs="dummy"
/>
);
expect(wrapper.findByClassName(skeletonStyles['panel-hidden'])).toBeTruthy();
});

it('reserves space for the open navigation in a secondary layout', () => {
const { wrapper } = renderComponent(
<AppLayout
{...{ __forceDeduplicationType: 'secondary' }}
navigation="test nav"
navigationOpen={true}
onNavigationChange={() => {}}
/>
);
expect(wrapper.findByClassName(skeletonStyles['toolbar-container'])).toBeFalsy();
expect(wrapper.findByClassName(skeletonStyles.navigation)).toBeTruthy();
expect(wrapper.findByClassName(skeletonStyles['panel-hidden'])).toBeFalsy();
});

it('toolbar can render conditionally', () => {
const { wrapper, rerender } = renderComponent(<AppLayout navigationHide={true} toolsHide={true} />);
// cannot use wrapper.findToolbar() because our public test utils resolve to nothing in skeleton state
Expand Down
16 changes: 8 additions & 8 deletions src/app-layout/visual-refresh-toolbar/skeleton/skeleton-parts.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,16 @@ import styles from './styles.css.js';

export const BeforeMainSlotSkeleton = React.forwardRef<HTMLElement, SkeletonPartProps>(
({ toolbarProps, appLayoutProps }, ref) => {
const hasNavigation = toolbarProps ? toolbarProps.hasNavigation : !!appLayoutProps.navigation;
const hasNavigation =
!!toolbarProps?.hasNavigation || (!!appLayoutProps.navigation && !appLayoutProps.navigationHide);
const navigationOpen = !!(toolbarProps?.navigationOpen ?? appLayoutProps.navigationOpen);
return (
<>
{!!toolbarProps && (
<ToolbarSkeletonStructure
ref={ref}
ariaLabels={toolbarProps.ariaLabels}
hasNavigation={hasNavigation}
hasNavigation={toolbarProps.hasNavigation}
navigationOpen={toolbarProps.navigationOpen}
ownBreadcrumbs={appLayoutProps.breadcrumbs}
/>
Expand All @@ -35,18 +37,16 @@ export const BeforeMainSlotSkeleton = React.forwardRef<HTMLElement, SkeletonPart
<div
className={clsx(
styles.navigation,
!toolbarProps?.navigationOpen && !toolbarProps?.navigationCollapsible && styles['panel-hidden'],
!toolbarProps?.navigationOpen && toolbarProps?.navigationCollapsible && styles['navigation-collapsed'],
!navigationOpen && !toolbarProps?.navigationCollapsible && styles['panel-hidden'],
!navigationOpen && toolbarProps?.navigationCollapsible && styles['navigation-collapsed'],
!!toolbarProps?.activeDrawerId && styles['unfocusable-mobile']
)}
>
<div
className={clsx(
navStyles['navigation-container'],
toolbarProps?.navigationOpen && navStyles['is-navigation-open'],
!toolbarProps?.navigationOpen &&
toolbarProps?.navigationCollapsible &&
navStyles['is-navigation-collapsed']
navigationOpen && navStyles['is-navigation-open'],
!navigationOpen && toolbarProps?.navigationCollapsible && navStyles['is-navigation-collapsed']
)}
>
<nav className={navStyles.navigation}>
Expand Down
Loading