blume 0.6.4 → 0.6.6

package/docs/content/navigation.mdx

@@ -60,7 +60,7 @@ navigation: {
 ```
 
 - **`flat`** (default) — a non-collapsible header with its pages listed beneath. Pages that aren't in any group always list first, above the group sections, so they can't be mistaken for a group's children.
-- **`group`** — a collapsible `<details>` disclosure per group. Pair it with `collapsed` in [folder meta](/docs/content/meta) to set the initial state; a group containing the current page always starts open.
+- **`group`** — a collapsible `<details>` disclosure per group. Groups start collapsed by default; a group containing the current page always starts open, so only the section you're in is expanded. Set `collapsed: false` in [folder meta](/docs/content/meta) to force a group open regardless.
 - **`page`** — each group is a single row that, when clicked, slides the sidebar into a sub-panel showing only that group's items, with a back arrow at the top. The panel is route-aware, so landing directly on a page inside the group opens straight to it.
 
 :::tip

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "blume",
-  "version": "0.6.4",
+  "version": "0.6.6",
   "description": "Documentation that's fast, AI-ready, and zero-config.",
   "keywords": [
     "astro",

package/src/components/content/Update.astro

@@ -70,7 +70,7 @@ const tagList = Array.isArray(tags) ? tags : tags ? [tags] : [];
       )
     }
   </header>
-  <div class="text-muted-foreground text-sm leading-6 [&_a]:font-medium [&_a]:text-foreground [&_a]:underline [&_code]:rounded [&_code]:bg-muted [&_code]:px-1 [&_h2]:mt-0! [&_h2]:border-t-0! [&_h2]:pt-0! [&_h2]:text-base [&_h2]:font-semibold [&_h2]:text-foreground [&_h3]:font-semibold [&_h3]:text-foreground [&_img]:rounded-blume [&_li]:my-1 [&_p:first-child]:mt-0! [&_p:last-child]:mb-0!">
+  <div class="text-muted-foreground text-sm leading-6 [&_a]:font-medium [&_a]:text-foreground [&_a]:underline [&_code]:rounded [&_code]:bg-muted [&_code]:px-1 [&_h2]:mt-6 [&_h2]:border-t-0! [&_h2]:pt-0! [&_h2]:text-base [&_h2]:font-semibold [&_h2]:text-foreground [&_h3]:mt-4 [&_h3]:font-semibold [&_h3]:text-foreground [&_img]:rounded-blume [&_li]:my-1 [&_p]:my-3 [&>:first-child]:mt-0! [&>:last-child]:mb-0!">
     <slot />
   </div>
 </article>

package/src/components/layout/NavTree.astro

@@ -218,7 +218,9 @@ const initialId =
         // `group`: a collapsible `<details>` disclosure.
         if (display === "group") {
           const active = hasActivePage(item);
-          const open = depth === 0 || active || item.collapsed === false;
+          // Default every group closed; open only those on the active path (so
+          // the current page's ancestors stay expanded) or forced open via meta.
+          const open = active || item.collapsed === false;
           return (
             <li class={spacing}>
               <details class="group" open={open}>

package/src/core/navigation.ts

@@ -184,16 +184,42 @@ const sortNodes = (nodes: MutableNode[]): void => {
 };
 
 /**
- * In flat display a group renders as a plain section header, so a loose page
- * sorted after a group would visually read as that group's last child. Hoist
- * pages above groups at every level (relative order otherwise preserved).
+ * Hoist loose pages above groups so root-level pages read as top-level entries
+ * rather than a group's trailing children (relative order otherwise preserved).
+ * All display modes hoist the root level. Flat additionally recurses into every
+ * group: there a group renders as a plain section header, so a loose page sorted
+ * after a group would visually read as that group's last child.
  */
-const hoistPages = (nodes: MutableNode[]): void => {
+const hoistPages = (nodes: MutableNode[], recurse: boolean): void => {
   const pages = nodes.filter((node) => node.kind === "page");
   const groups = nodes.filter((node) => node.kind === "group");
   nodes.splice(0, nodes.length, ...pages, ...groups);
-  for (const group of groups) {
-    hoistPages(group.children);
+  if (recurse) {
+    for (const group of groups) {
+      hoistPages(group.children, recurse);
+    }
+  }
+};
+
+/**
+ * With tabs configured, the sidebar shown under a tab is that tab-section
+ * group's *children*, not the tree root — so hoisting only the root leaves a
+ * tab section's loose pages interleaved with its groups. Hoist the top level of
+ * every group that owns a tab (matched on its URL path), mirroring the root.
+ */
+const hoistTabSections = (
+  nodes: MutableNode[],
+  tabPaths: Set<string>,
+  recurse: boolean
+): void => {
+  for (const node of nodes) {
+    if (node.kind !== "group") {
+      continue;
+    }
+    if (node.routePath !== undefined && tabPaths.has(node.routePath)) {
+      hoistPages(node.children, recurse);
+    }
+    hoistTabSections(node.children, tabPaths, recurse);
   }
 };
 
@@ -227,7 +253,8 @@ const buildFileSystemSidebar = (
   folderMeta: Map<string, FolderMeta>,
   sharedMeta: Map<string, FolderMeta>,
   metaPrefix: string,
-  display: SidebarDisplay
+  display: SidebarDisplay,
+  tabPaths: Set<string>
 ): NavNode[] => {
   const root = createGroup("", "", "", 0);
 
@@ -280,9 +307,8 @@ const buildFileSystemSidebar = (
 
   applyFolderMeta(root, folderMeta, sharedMeta, metaPrefix);
   sortNodes(root.children);
-  if (display === "flat") {
-    hoistPages(root.children);
-  }
+  hoistPages(root.children, display === "flat");
+  hoistTabSections(root.children, tabPaths, display === "flat");
   return root.children.map((child) => toNavNode(child, display));
 };
 
@@ -432,7 +458,8 @@ export const buildNavigation = (
       options.folderMeta,
       sharedFolderMeta,
       metaPrefix,
-      display
+      display,
+      new Set(tabs.map((tab) => tab.path).filter((path) => path !== "/"))
     ),
     tabs,
   };