Beautiful pdf components, built on Takumi and Forme. 100% Free, Zero config, one command setup.
refactor: simplify sidebar and mobile navigation components by removing unused panels and consolidating imports
Aniket-508a18fd2f36c90
diff --git a/components/command-menu.tsx b/components/command-menu.tsxindex d258318..b5808d2 100644--- a/components/command-menu.tsx+++ b/components/command-menu.tsx@@ -83,7 +83,29 @@ const buildDocPageKeywords = (...searchKeywordsFromUrl(url),];+const THEME_PRIMARY_BY_SLUG: Record<string, string> = {+ blueprint: "#0f172a",+ corporate: "#0f4c81",+ elegant: "#78350f",+ executive: "#1e3a5f",+ forest: "#15803d",+ minimal: "#18181b",+ modern: "#334155",+ professional: "#18181b",+ vivid: "#6d28d9",+};+const DocPageLeadingIcon = ({ parsed }: { parsed: DocUrlKind }) => {+ if (parsed.kind === "theme") {+ const color = THEME_PRIMARY_BY_SLUG[parsed.slug];+ return (+ <span+ className="border-border/60 size-4 shrink-0 rounded-sm border"+ style={color ? { backgroundColor: color } : undefined}+ aria-hidden+ />+ );+ }if (parsed.kind === "component") {return <CircleDashedIcon />;}diff --git a/components/docs-sidebar.tsx b/components/docs-sidebar.tsxindex afb14d1..f7b04d3 100644--- a/components/docs-sidebar.tsx+++ b/components/docs-sidebar.tsx@@ -15,20 +15,8 @@ import {} from "@/components/ui/sidebar";import { TOP_LEVEL_SECTIONS } from "@/constants/nav";import { ROUTES } from "@/constants/routes";-import {- PAGES_NEW,- getDocsSidebarPanel,- isBlocksFolder,- isComponentsFolder,- isThemesFolder,-} from "@/lib/docs";-import {- findBaseFolder,- getAllPagesFromFolder,- getCurrentBase,- getTreeGroups,-} from "@/lib/page-tree";-import type { PageTreeFolder } from "@/lib/page-tree";+import { PAGES_NEW } from "@/lib/docs";+import { getCurrentBase, getTreeGroups } from "@/lib/page-tree";import type { source } from "@/lib/source";const MENU_BUTTON_CLS =@@ -91,101 +79,14 @@ const SidebarPageGroup = ({);};-interface SidebarPanelProps {- currentBase: string;- pathname: string;- tree: typeof source.pageTree;-}--const findTopLevelFolder = (- tree: typeof source.pageTree,- predicate: (folder: PageTreeFolder) => boolean-) =>- tree.children.find(- (item): item is PageTreeFolder => item.type === "folder" && predicate(item)- );--const ComponentsSidebarPanel = ({- currentBase,- pathname,- tree,-}: SidebarPanelProps) => {- const folder = findTopLevelFolder(tree, isComponentsFolder);- if (!folder) {- return null;- }-- // Get pages from the base folder- const baseFolder = findBaseFolder(folder, currentBase);- const pages = (- baseFolder- ? getAllPagesFromFolder(baseFolder)- : getAllPagesFromFolder(folder)- )- .filter(- (page) =>- !page.url.endsWith("/components") && !page.url.endsWith("/components/")- )- .map((page) => ({ name: page.name, url: page.url }));-- return (- <SidebarPageGroup label="Components" pages={pages} pathname={pathname} />- );-};--const BlocksSidebarPanel = ({ pathname, tree }: SidebarPanelProps) => {- const folder = findTopLevelFolder(tree, isBlocksFolder);- if (!folder) {- return null;- }-- const pages = getAllPagesFromFolder(folder)- .filter(- (page) => !page.url.endsWith("/blocks") && !page.url.endsWith("/blocks/")- )- .map((page) => ({ name: page.name, url: page.url }));-- return <SidebarPageGroup label="Blocks" pages={pages} pathname={pathname} />;-};--const ThemesSidebarPanel = ({ pathname, tree }: SidebarPanelProps) => {- const folder = findTopLevelFolder(tree, isThemesFolder);- if (!folder) {- return null;- }-- const pages = getAllPagesFromFolder(folder)- .filter(- (page) => !page.url.endsWith("/themes") && !page.url.endsWith("/themes/")- )- .map((page) => ({ name: page.name, url: page.url }));-- return <SidebarPageGroup label="Themes" pages={pages} pathname={pathname} />;-};-export const DocsSidebar = ({tree,...props}: React.ComponentProps<typeof Sidebar> & { tree: typeof source.pageTree }) => {const pathname = usePathname();const currentBase = getCurrentBase(pathname);- const panel = getDocsSidebarPanel(pathname);const treeGroups = getTreeGroups(tree, currentBase);- const renderCatalogPanel = () => {- const panelProps = { currentBase, pathname, tree };- if (panel === "components") {- return <ComponentsSidebarPanel {...panelProps} />;- }- if (panel === "blocks") {- return <BlocksSidebarPanel {...panelProps} />;- }- if (panel === "themes") {- return <ThemesSidebarPanel {...panelProps} />;- }- return null;- };-return (<SidebarclassName="text-sidebar-foreground sticky top-[calc(var(--header-height)+0.6rem)] z-30 hidden h-[calc(100svh-10rem)] flex-col overscroll-none bg-transparent [--sidebar-menu-width:--spacing(48)] lg:flex"@@ -218,16 +119,14 @@ export const DocsSidebar = ({</SidebarMenu></SidebarGroupContent></SidebarGroup>- {panel- ? renderCatalogPanel()- : treeGroups.map((group) => (- <SidebarPageGroup- key={group.label}- label={group.label}- pages={group.pages}- pathname={pathname}- />- ))}+ {treeGroups.map((group) => (+ <SidebarPageGroup+ key={group.label}+ label={group.label}+ pages={group.pages}+ pathname={pathname}+ />+ ))}<div className="from-background via-background/80 to-background/50 sticky -bottom-1 z-10 h-16 shrink-0 bg-linear-to-t blur-xs" /></SidebarContent></Sidebar>diff --git a/components/mobile-nav.tsx b/components/mobile-nav.tsxindex d2bdb63..8846e4e 100644--- a/components/mobile-nav.tsx+++ b/components/mobile-nav.tsx@@ -15,17 +15,7 @@ import {import { TOP_LEVEL_SECTIONS } from "@/constants/nav";import { ROUTES } from "@/constants/routes";import { useFeedback } from "@/hooks/use-feedback";-import {- getDocsSidebarPanel,- isBlocksFolder,- isComponentsFolder,-} from "@/lib/docs";-import {- getAllPagesFromFolder,- getCurrentBase,- getTreeGroups,-} from "@/lib/page-tree";-import type { PageTreeFolder } from "@/lib/page-tree";+import { getCurrentBase, getTreeGroups } from "@/lib/page-tree";import { cn } from "@/lib/utils";const MobileLink = ({@@ -86,46 +76,6 @@ const MobileNavGroup = ({);};-interface MobilePanelProps {- currentBase: string;- setOpen: (open: boolean) => void;- tree: PageTreeRoot;-}--const findTopLevelFolder = (- tree: PageTreeRoot,- predicate: (folder: PageTreeFolder) => boolean-) =>- tree.children.find(- (item): item is PageTreeFolder => item.type === "folder" && predicate(item)- );--const ComponentsMobilePanel = ({ setOpen, tree }: MobilePanelProps) => {- const folder = findTopLevelFolder(tree, isComponentsFolder);- if (!folder) {- return null;- }-- const pages = getAllPagesFromFolder(folder)- .filter((page) => page.url !== ROUTES.DOCS_COMPONENTS)- .map((page) => ({ name: page.name, url: page.url }));-- return <MobileNavGroup label="Components" pages={pages} setOpen={setOpen} />;-};--const BlocksMobilePanel = ({ setOpen, tree }: MobilePanelProps) => {- const folder = findTopLevelFolder(tree, isBlocksFolder);- if (!folder) {- return null;- }-- const pages = getAllPagesFromFolder(folder)- .filter((page) => page.url !== ROUTES.DOCS_BLOCKS)- .map((page) => ({ name: page.name, url: page.url }));-- return <MobileNavGroup label="Blocks" pages={pages} setOpen={setOpen} />;-};-export const MobileNav = ({items,tree,@@ -138,23 +88,11 @@ export const MobileNav = ({const [open, setOpen] = useState(false);const pathname = usePathname();const currentBase = getCurrentBase(pathname);- const panel = getDocsSidebarPanel(pathname);const treeGroups = useMemo(() => getTreeGroups(tree, currentBase),[tree, currentBase]);- const renderCatalogPanel = () => {- const panelProps = { currentBase, setOpen, tree };- if (panel === "components") {- return <ComponentsMobilePanel {...panelProps} />;- }- if (panel === "blocks") {- return <BlocksMobilePanel {...panelProps} />;- }- return null;- };-return (<Popover sounds open={open} onOpenChange={setOpen}><PopoverTrigger asChild>@@ -218,19 +156,17 @@ export const MobileNav = ({))}</div></div>- {panel- ? renderCatalogPanel()- : treeGroups.map((group) => (- <MobileNavGroup- key={group.label}- label={group.label}- pages={group.pages.map((p) => ({- name: p.name,- url: p.url,- }))}- setOpen={setOpen}- />- ))}+ {treeGroups.map((group) => (+ <MobileNavGroup+ key={group.label}+ label={group.label}+ pages={group.pages.map((p) => ({+ name: p.name,+ url: p.url,+ }))}+ setOpen={setOpen}+ />+ ))}</div></PopoverContent></Popover>diff --git a/components/theme-preview.tsx b/components/theme-preview.tsxindex 7ec4ebd..8519f06 100644--- a/components/theme-preview.tsx+++ b/components/theme-preview.tsx@@ -46,7 +46,7 @@ export const ThemePreview = ({const theme = THEMES.find((t) => t.name === selectedTheme)?.theme;return (- <div className={cn("not-prose", className)}>+ <div className={cn("not-prose mt-4", className)}><div className="flex items-center justify-between rounded-t-lg border border-b-0 bg-muted/50 px-4 py-2"><div className="flex gap-1.5" aria-hidden="true"><span className="size-2.5 rounded-full bg-red-400" />diff --git a/lib/page-tree.ts b/lib/page-tree.tsindex 1bf4154..73e57c9 100644--- a/lib/page-tree.ts+++ b/lib/page-tree.ts@@ -116,7 +116,18 @@ export const getTreeGroups = (continue;}- if (isComponentsFolder(item)) {+ if (isThemesFolder(item)) {+ const pages = getAllPagesFromFolder(item).filter(+ (page) =>+ !page.url.endsWith("/themes") && !page.url.endsWith("/themes/")+ );+ if (pages.length > 0) {+ groups.push({+ label: "Themes",+ pages,+ });+ }+ } else if (isComponentsFolder(item)) {// Check if there are base folders (takumi, forme)const baseFolder = findBaseFolder(item, currentBase);if (baseFolder) {@@ -156,17 +167,6 @@ export const getTreeGroups = (pages,});}- } else if (isThemesFolder(item)) {- const pages = getAllPagesFromFolder(item).filter(- (page) =>- !page.url.endsWith("/themes") && !page.url.endsWith("/themes/")- );- if (pages.length > 0) {- groups.push({- label: "Themes",- pages,- });- }} else if (item.$id === "theming" || item.name === "Theming") {// Theming pages are accessed via the Sections nav} else {