Skip to content

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

TypeScript

feat(docsite): reorganize side-nav — Foundations before Components, Themes after (#2380)

Kenton Quatman9f12c4b1fc06
diff --git a/apps/docsite/src/components/DocsShell.tsx b/apps/docsite/src/components/DocsShell.tsx
index 5fe3111794..10afb2f18e 100644
--- a/apps/docsite/src/components/DocsShell.tsx
+++ b/apps/docsite/src/components/DocsShell.tsx
@@ -79,9 +79,7 @@ export function DocsShell({
const allComponentHrefs = componentItems.flatMap(item =>
item.type === 'entry' ? [item.href] : item.entries.map(e => e.href),
);
- const isInGuide =
- guideTopics.some(d => pathname === `/docs/${d.topic}`) ||
- foundationTopics.some(d => pathname === `/docs/${d.topic}`);
+ const isInGuide = guideTopics.some(d => pathname === `/docs/${d.topic}`);
const isInFoundations = foundationTopics.some(
d => pathname === `/docs/${d.topic}`,
);
@@ -133,48 +131,34 @@ export function DocsShell({
isSelected={pathname === `/docs/${d.topic}`}
/>
))}
- <XDSSideNavItem
- label="Foundations"
- collapsible={{defaultIsCollapsed: !isInFoundations}}>
- {foundationTopics.map(d => (
- <XDSSideNavItem
- key={d.topic}
- label={d.title}
- href={`/docs/${d.topic}`}
- isSelected={pathname === `/docs/${d.topic}`}
- />
- ))}
- </XDSSideNavItem>
</XDSSideNavItem>
</XDSSideNavSection>
- {/* Libraries */}
- <XDSSideNavSection title="Libraries" isHeaderHidden>
+ {/* Foundations */}
+ <XDSSideNavSection title="Foundations" isHeaderHidden>
<XDSSideNavItem
- label="Libraries"
- collapsible={{defaultIsCollapsed: !isInLibraries}}>
- {libraryPackages.map(p => (
+ label="Foundations"
+ collapsible={{defaultIsCollapsed: !isInFoundations}}>
+ {foundationTopics.map(d => (
<XDSSideNavItem
- key={p.name}
- label={p.name}
- href={`/packages/${p.name.replace('@xds/', '')}`}
- isSelected={
- pathname === `/packages/${p.name.replace('@xds/', '')}`
- }
+ key={d.topic}
+ label={d.title}
+ href={`/docs/${d.topic}`}
+ isSelected={pathname === `/docs/${d.topic}`}
/>
))}
</XDSSideNavItem>
</XDSSideNavSection>
- {/* Themes */}
- <XDSSideNavSection title="Themes" isHeaderHidden>
+ {/* Libraries */}
+ <XDSSideNavSection title="Libraries" isHeaderHidden>
<XDSSideNavItem
- label="Themes"
- collapsible={{defaultIsCollapsed: !isInThemes}}>
- {themePackages.map(p => (
+ label="Libraries"
+ collapsible={{defaultIsCollapsed: !isInLibraries}}>
+ {libraryPackages.map(p => (
<XDSSideNavItem
key={p.name}
- label={p.displayName}
+ label={p.name}
href={`/packages/${p.name.replace('@xds/', '')}`}
isSelected={
pathname === `/packages/${p.name.replace('@xds/', '')}`
@@ -237,6 +221,24 @@ export function DocsShell({
</XDSSideNavItem>
</XDSSideNavSection>
)}
+
+ {/* Themes */}
+ <XDSSideNavSection title="Themes" isHeaderHidden>
+ <XDSSideNavItem
+ label="Themes"
+ collapsible={{defaultIsCollapsed: !isInThemes}}>
+ {themePackages.map(p => (
+ <XDSSideNavItem
+ key={p.name}
+ label={p.displayName}
+ href={`/packages/${p.name.replace('@xds/', '')}`}
+ isSelected={
+ pathname === `/packages/${p.name.replace('@xds/', '')}`
+ }
+ />
+ ))}
+ </XDSSideNavItem>
+ </XDSSideNavSection>
</XDSSideNav>
}>
{children}