Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 9 additions & 0 deletions src/app-layout/__tests__/app-layout-navigation.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,15 @@ describeEachAppLayout({ themes: ['refresh-toolbar'], sizes: ['desktop'] }, () =>
expect(wrapper.findOpenNavigationPanel()).toBeTruthy();
});

test('close button does not open navigation when already closed', () => {
const { wrapper } = renderComponent(<AppLayout navigation={<>Mock Navigation</>} />);
expect(wrapper.findOpenNavigationPanel()).toBeTruthy();
wrapper.findNavigationToggle().click();
expect(wrapper.findOpenNavigationPanel()).toBeFalsy();
wrapper.findNavigationClose().click();
expect(wrapper.findOpenNavigationPanel()).toBeFalsy();
});

test(`Sets aria-expanded=false on toggle when navigation is closed`, () => {
const { wrapper } = renderComponent(
<AppLayout navigation={<>Mock Navigation</>} navigationOpen={false} content={<>Content</>} />
Expand Down
11 changes: 11 additions & 0 deletions src/app-layout/__tests__/navigation-collapsed.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,17 @@ describeEachAppLayout({ themes: ['refresh-toolbar'], sizes: ['desktop'] }, () =>
const closeButton = wrapper.findNavigationClose().getElement();
expect(closeButton.querySelector(`.${iconStyles['name-angle-left']}`)).not.toBeNull();
});

test('close button toggles navigation open and closed when collapsible', () => {
const { wrapper } = renderComponent(
<AppLayout navigationCloseBehavior="collapse" navigation={<>Nav content</>} />
);
expect(wrapper.findOpenNavigationPanel()).toBeTruthy();
wrapper.findNavigationClose().click();
expect(wrapper.findOpenNavigationPanel()).toBeFalsy();
wrapper.findNavigationClose().click();
expect(wrapper.findOpenNavigationPanel()).toBeTruthy();
});
});

describe('aria-expanded', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ export function AppLayoutNavigationImplementation({
}
ariaExpanded={navigationCollapsible && !isMobile ? navigationOpen : undefined}
iconName={navigationCollapsed ? 'angle-right' : isMobile ? 'close' : 'angle-left'}
onClick={() => onNavigationToggle(!navigationOpen)}
onClick={() => onNavigationToggle(navigationCollapsible ? !navigationOpen : false)}
variant="icon"
Comment on lines 92 to 95

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

True, but this will not be called in a real environment when navigation is already closed

formAction="none"
className={testutilStyles['navigation-close']}
Expand Down
Loading