livemark 0.13.1 → 0.14.0

package/build/components/SidebarArticles.js

@@ -26,21 +26,19 @@ function isActive(articlePathname, currentPath) {
     return articlePathname === normalized;
 }
 function NavNode(props) {
-    const { node, currentPath } = props;
+    const { node, currentPath, depth = 0 } = props;
     const Icon = resolveArticleIcon(node.icon);
     const active = isActive(node.path, currentPath);
+    const isSub = depth > 0;
+    const Item = isSub ? SidebarMenuSubItem : SidebarMenuItem;
+    const Button = isSub ? SidebarMenuSubButton : SidebarMenuButton;
+    const link = _jsx(Link, { to: "/$", params: splatFor(node.path) });
+    const label = _jsx("span", { children: node.label ?? node.title });
     if (node.children.length === 0) {
-        return (_jsx(SidebarMenuItem, { children: _jsxs(SidebarMenuButton, { isActive: active, className: active ? "" : "opacity-75", render: _jsx(Link, { to: "/$", params: splatFor(node.path) }), children: [
-                    _jsx(Icon, { className: "size-4" }), _jsx("span", { children: node.label ?? node.title })
-                ] }) }));
+        return (_jsx(Item, { children: _jsxs(Button, { isActive: active, className: active ? "" : "opacity-75", render: link, children: [!isSub && _jsx(Icon, { className: "size-4" }), label] }) }));
     }
-    return (_jsx(SidebarMenuItem, { children: _jsxs(Collapsible, { defaultOpen: true, className: "group/collapsible", children: [
-                _jsxs(SidebarMenuButton, { isActive: active, className: active ? "" : "opacity-75", render: _jsx(Link, { to: "/$", params: splatFor(node.path) }), children: [
-                        _jsx(Icon, { className: "size-4" }), _jsx("span", { children: node.label ?? node.title })
-                    ] }), _jsx(CollapsibleTrigger, { "aria-label": `Toggle ${node.label ?? node.title} submenu`, className: "absolute right-1 top-1.5 p-1 rounded-md hover:bg-sidebar-accent", children: _jsx(ChevronRight, { className: "size-3.5 transition-transform group-data-[open]/collapsible:rotate-90" }) }), _jsx(CollapsibleContent, { children: _jsx(SidebarMenuSub, { children: node.children.map(child => {
-                            const childIsActive = isActive(child.path, currentPath);
-                            return (_jsx(SidebarMenuSubItem, { children: _jsx(SidebarMenuSubButton, { isActive: childIsActive, className: childIsActive ? "" : "opacity-75", render: _jsx(Link, { to: "/$", params: splatFor(child.path) }), children: _jsx("span", { children: child.label ?? child.title }) }) }, child.path));
-                        }) }) })
+    return (_jsx(Item, { children: _jsxs(Collapsible, { defaultOpen: true, className: "group/collapsible", children: [
+                _jsxs(Button, { isActive: active, className: active ? "" : "opacity-75", render: link, children: [!isSub && _jsx(Icon, { className: "size-4" }), label] }), _jsx(CollapsibleTrigger, { "aria-label": `Toggle ${node.label ?? node.title} submenu`, className: "absolute right-1 top-1.5 p-1 rounded-md hover:bg-sidebar-accent", children: _jsx(ChevronRight, { className: "size-3.5 transition-transform group-data-[open]/collapsible:rotate-90" }) }), _jsx(CollapsibleContent, { children: _jsx(SidebarMenuSub, { children: node.children.map(child => (_jsx(NavNode, { node: child, currentPath: currentPath, depth: depth + 1 }, child.path))) }) })
             ] }) }));
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"SidebarArticles.js","sourceRoot":"","sources":["../../source/components/SidebarArticles.tsx"],"names":[],"mappings":"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","sourcesContent":["import { config } from \"livemark:virtual\"\nimport { Link, useLocation } from \"@tanstack/react-router\"\nimport { ChevronRight } from \"lucide-react\"\nimport {\n  articleGroups,\n  currentSection,\n  sectionArticleGroups,\n} from \"../content/article.ts\"\nimport {\n  Collapsible,\n  CollapsibleContent,\n  CollapsibleTrigger,\n} from \"../elements/collapsible.tsx\"\nimport {\n  SidebarGroup,\n  SidebarGroupContent,\n  SidebarGroupLabel,\n  SidebarMenu,\n  SidebarMenuButton,\n  SidebarMenuItem,\n  SidebarMenuSub,\n  SidebarMenuSubButton,\n  SidebarMenuSubItem,\n} from \"../elements/sidebar.tsx\"\nimport { resolveArticleIcon } from \"../helpers/article-icon.ts\"\nimport type { ArticleNode } from \"../models/article.ts\"\n\n/** Article-tree body slot for the Sidebar shell */\nexport function SidebarArticles() {\n  const pathname = useLocation({ select: l => l.pathname })\n\n  const configSections = config.sections\n  const section = currentSection(`/${pathname.replace(/^\\/|\\/$/g, \"\")}/`)\n  const groups = configSections?.length\n    ? (sectionArticleGroups.get(section?.prefix ?? \"__default__\") ??\n      articleGroups)\n    : articleGroups\n\n  return (\n    <>\n      {groups.map((group, index) => (\n        <SidebarGroup key={group.name ?? `__unnamed-${index}`}>\n          {group.name && (\n            <SidebarGroupLabel className=\"uppercase font-mono text-xs tracking-widest\">\n              {group.name}\n            </SidebarGroupLabel>\n          )}\n          <SidebarGroupContent>\n            <SidebarMenu>\n              {group.nodes.map(node => (\n                <NavNode key={node.path} node={node} currentPath={pathname} />\n              ))}\n            </SidebarMenu>\n          </SidebarGroupContent>\n        </SidebarGroup>\n      ))}\n    </>\n  )\n}\n\nfunction splatFor(pathname: string) {\n  return { _splat: pathname.replace(/^\\/|\\/$/g, \"\") }\n}\n\nfunction isActive(articlePathname: string, currentPath: string) {\n  const normalized = `/${currentPath.replace(/^\\/|\\/$/g, \"\")}/`\n  return articlePathname === normalized\n}\n\nfunction NavNode(props: { node: ArticleNode; currentPath: string }) {\n  const { node, currentPath } = props\n  const Icon = resolveArticleIcon(node.icon)\n  const active = isActive(node.path, currentPath)\n\n  if (node.children.length === 0) {\n    return (\n      <SidebarMenuItem>\n        <SidebarMenuButton\n          isActive={active}\n          className={active ? \"\" : \"opacity-75\"}\n          render={<Link to=\"/$\" params={splatFor(node.path)} />}\n        >\n          <Icon className=\"size-4\" />\n          <span>{node.label ?? node.title}</span>\n        </SidebarMenuButton>\n      </SidebarMenuItem>\n    )\n  }\n\n  return (\n    <SidebarMenuItem>\n      <Collapsible defaultOpen className=\"group/collapsible\">\n        <SidebarMenuButton\n          isActive={active}\n          className={active ? \"\" : \"opacity-75\"}\n          render={<Link to=\"/$\" params={splatFor(node.path)} />}\n        >\n          <Icon className=\"size-4\" />\n          <span>{node.label ?? node.title}</span>\n        </SidebarMenuButton>\n        <CollapsibleTrigger\n          aria-label={`Toggle ${node.label ?? node.title} submenu`}\n          className=\"absolute right-1 top-1.5 p-1 rounded-md hover:bg-sidebar-accent\"\n        >\n          <ChevronRight className=\"size-3.5 transition-transform group-data-[open]/collapsible:rotate-90\" />\n        </CollapsibleTrigger>\n        <CollapsibleContent>\n          <SidebarMenuSub>\n            {node.children.map(child => {\n              const childIsActive = isActive(child.path, currentPath)\n              return (\n                <SidebarMenuSubItem key={child.path}>\n                  <SidebarMenuSubButton\n                    isActive={childIsActive}\n                    className={childIsActive ? \"\" : \"opacity-75\"}\n                    render={<Link to=\"/$\" params={splatFor(child.path)} />}\n                  >\n                    <span>{child.label ?? child.title}</span>\n                  </SidebarMenuSubButton>\n                </SidebarMenuSubItem>\n              )\n            })}\n          </SidebarMenuSub>\n        </CollapsibleContent>\n      </Collapsible>\n    </SidebarMenuItem>\n  )\n}\n"]}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"SidebarArticles.js","sourceRoot":"","sources":["../../source/components/SidebarArticles.tsx"],"names":[],"mappings":"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","sourcesContent":["import { config } from \"livemark:virtual\"\nimport { Link, useLocation } from \"@tanstack/react-router\"\nimport { ChevronRight } from \"lucide-react\"\nimport {\n  articleGroups,\n  currentSection,\n  sectionArticleGroups,\n} from \"../content/article.ts\"\nimport {\n  Collapsible,\n  CollapsibleContent,\n  CollapsibleTrigger,\n} from \"../elements/collapsible.tsx\"\nimport {\n  SidebarGroup,\n  SidebarGroupContent,\n  SidebarGroupLabel,\n  SidebarMenu,\n  SidebarMenuButton,\n  SidebarMenuItem,\n  SidebarMenuSub,\n  SidebarMenuSubButton,\n  SidebarMenuSubItem,\n} from \"../elements/sidebar.tsx\"\nimport { resolveArticleIcon } from \"../helpers/article-icon.ts\"\nimport type { ArticleNode } from \"../models/article.ts\"\n\n/** Article-tree body slot for the Sidebar shell */\nexport function SidebarArticles() {\n  const pathname = useLocation({ select: l => l.pathname })\n\n  const configSections = config.sections\n  const section = currentSection(`/${pathname.replace(/^\\/|\\/$/g, \"\")}/`)\n  const groups = configSections?.length\n    ? (sectionArticleGroups.get(section?.prefix ?? \"__default__\") ??\n      articleGroups)\n    : articleGroups\n\n  return (\n    <>\n      {groups.map((group, index) => (\n        <SidebarGroup key={group.name ?? `__unnamed-${index}`}>\n          {group.name && (\n            <SidebarGroupLabel className=\"uppercase font-mono text-xs tracking-widest\">\n              {group.name}\n            </SidebarGroupLabel>\n          )}\n          <SidebarGroupContent>\n            <SidebarMenu>\n              {group.nodes.map(node => (\n                <NavNode key={node.path} node={node} currentPath={pathname} />\n              ))}\n            </SidebarMenu>\n          </SidebarGroupContent>\n        </SidebarGroup>\n      ))}\n    </>\n  )\n}\n\nfunction splatFor(pathname: string) {\n  return { _splat: pathname.replace(/^\\/|\\/$/g, \"\") }\n}\n\nfunction isActive(articlePathname: string, currentPath: string) {\n  const normalized = `/${currentPath.replace(/^\\/|\\/$/g, \"\")}/`\n  return articlePathname === normalized\n}\n\nfunction NavNode(props: {\n  node: ArticleNode\n  currentPath: string\n  depth?: number\n}) {\n  const { node, currentPath, depth = 0 } = props\n  const Icon = resolveArticleIcon(node.icon)\n  const active = isActive(node.path, currentPath)\n  const isSub = depth > 0\n  const Item = isSub ? SidebarMenuSubItem : SidebarMenuItem\n  const Button = isSub ? SidebarMenuSubButton : SidebarMenuButton\n\n  const link = <Link to=\"/$\" params={splatFor(node.path)} />\n  const label = <span>{node.label ?? node.title}</span>\n\n  if (node.children.length === 0) {\n    return (\n      <Item>\n        <Button\n          isActive={active}\n          className={active ? \"\" : \"opacity-75\"}\n          render={link}\n        >\n          {!isSub && <Icon className=\"size-4\" />}\n          {label}\n        </Button>\n      </Item>\n    )\n  }\n\n  return (\n    <Item>\n      <Collapsible defaultOpen className=\"group/collapsible\">\n        <Button\n          isActive={active}\n          className={active ? \"\" : \"opacity-75\"}\n          render={link}\n        >\n          {!isSub && <Icon className=\"size-4\" />}\n          {label}\n        </Button>\n        <CollapsibleTrigger\n          aria-label={`Toggle ${node.label ?? node.title} submenu`}\n          className=\"absolute right-1 top-1.5 p-1 rounded-md hover:bg-sidebar-accent\"\n        >\n          <ChevronRight className=\"size-3.5 transition-transform group-data-[open]/collapsible:rotate-90\" />\n        </CollapsibleTrigger>\n        <CollapsibleContent>\n          <SidebarMenuSub>\n            {node.children.map(child => (\n              <NavNode\n                key={child.path}\n                node={child}\n                currentPath={currentPath}\n                depth={depth + 1}\n              />\n            ))}\n          </SidebarMenuSub>\n        </CollapsibleContent>\n      </Collapsible>\n    </Item>\n  )\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "livemark",
-  "version": "0.13.1",
+  "version": "0.14.0",
   "description": "Livemark description",
   "license": "MIT",
   "author": "Evgeny Karev",

package/source/components/SidebarArticles.tsx

@@ -67,37 +67,47 @@ function isActive(articlePathname: string, currentPath: string) {
   return articlePathname === normalized
 }
 
-function NavNode(props: { node: ArticleNode; currentPath: string }) {
-  const { node, currentPath } = props
+function NavNode(props: {
+  node: ArticleNode
+  currentPath: string
+  depth?: number
+}) {
+  const { node, currentPath, depth = 0 } = props
   const Icon = resolveArticleIcon(node.icon)
   const active = isActive(node.path, currentPath)
+  const isSub = depth > 0
+  const Item = isSub ? SidebarMenuSubItem : SidebarMenuItem
+  const Button = isSub ? SidebarMenuSubButton : SidebarMenuButton
+
+  const link = <Link to="/$" params={splatFor(node.path)} />
+  const label = <span>{node.label ?? node.title}</span>
 
   if (node.children.length === 0) {
     return (
-      <SidebarMenuItem>
-        <SidebarMenuButton
+      <Item>
+        <Button
           isActive={active}
           className={active ? "" : "opacity-75"}
-          render={<Link to="/$" params={splatFor(node.path)} />}
+          render={link}
         >
-          <Icon className="size-4" />
-          <span>{node.label ?? node.title}</span>
-        </SidebarMenuButton>
-      </SidebarMenuItem>
+          {!isSub && <Icon className="size-4" />}
+          {label}
+        </Button>
+      </Item>
     )
   }
 
   return (
-    <SidebarMenuItem>
+    <Item>
       <Collapsible defaultOpen className="group/collapsible">
-        <SidebarMenuButton
+        <Button
           isActive={active}
           className={active ? "" : "opacity-75"}
-          render={<Link to="/$" params={splatFor(node.path)} />}
+          render={link}
         >
-          <Icon className="size-4" />
-          <span>{node.label ?? node.title}</span>
-        </SidebarMenuButton>
+          {!isSub && <Icon className="size-4" />}
+          {label}
+        </Button>
         <CollapsibleTrigger
           aria-label={`Toggle ${node.label ?? node.title} submenu`}
           className="absolute right-1 top-1.5 p-1 rounded-md hover:bg-sidebar-accent"
@@ -106,23 +116,17 @@ function NavNode(props: { node: ArticleNode; currentPath: string }) {
         </CollapsibleTrigger>
         <CollapsibleContent>
           <SidebarMenuSub>
-            {node.children.map(child => {
-              const childIsActive = isActive(child.path, currentPath)
-              return (
-                <SidebarMenuSubItem key={child.path}>
-                  <SidebarMenuSubButton
-                    isActive={childIsActive}
-                    className={childIsActive ? "" : "opacity-75"}
-                    render={<Link to="/$" params={splatFor(child.path)} />}
-                  >
-                    <span>{child.label ?? child.title}</span>
-                  </SidebarMenuSubButton>
-                </SidebarMenuSubItem>
-              )
-            })}
+            {node.children.map(child => (
+              <NavNode
+                key={child.path}
+                node={child}
+                currentPath={currentPath}
+                depth={depth + 1}
+              />
+            ))}
           </SidebarMenuSub>
         </CollapsibleContent>
       </Collapsible>
-    </SidebarMenuItem>
+    </Item>
   )
 }