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: 6 additions & 3 deletions packages/ui/src/base/nav/nav.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -551,14 +551,17 @@ describe("GlCollapsibleNav", () => {
expect(markup).toContain("data-disabled=\"\"");
});

it("requires a direct leading and an accessible label for complex content", () => {
expect(() => renderToStaticMarkup(
it("allows text-only items and requires an accessible label for complex content", () => {
const textOnlyMarkup = renderToStaticMarkup(
<GlNavProvider>
<GlCollapsibleNav>
<GlNavItem><GlNavButton>Issues</GlNavButton></GlNavItem>
Comment thread
NriotHrreion marked this conversation as resolved.
</GlCollapsibleNav>
</GlNavProvider>,
)).toThrow("requires a direct leading GlIcon or GlAvatar");
);

expect(textOnlyMarkup).toContain("Issues");
expect(textOnlyMarkup).not.toContain("gl-nav-item-has-start-slot");
expect(() => renderToStaticMarkup(
<GlNavProvider>
<GlCollapsibleNav>
Expand Down
3 changes: 0 additions & 3 deletions packages/ui/src/base/nav/nav.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -349,9 +349,6 @@ export function useNavButtonInternal(
invariant(component, "isIconOnly requires a leading GlIcon or GlAvatar.");
}
if(isIconOnly && !ariaLabel) invariant(component, "isIconOnly requires aria-label.");
if(isCollapsibleTopLevel && !leading) {
invariant(component, "requires a direct leading GlIcon or GlAvatar in GlCollapsibleNav.");
}
if(isCollapsibleTopLevel && !ariaLabel && !derivedLabel) {
invariant(component, "requires aria-label when its label is not simple text.");
}
Expand Down