basalt-ui 1.26.0 → 1.28.0

package/dist/shell/app-sidebar.js

@@ -1,6 +1,5 @@
 import { Fragment, jsx, jsxs } from "react/jsx-runtime";
 import {
-  ActionIcon,
   Box,
   Collapse,
   Group,
@@ -15,6 +14,8 @@ import {
 } from "@mantine/core";
 import { useDisclosure } from "@mantine/hooks";
 import { useEffect, useRef } from "react";
+import { cx } from "../common/props.js";
+import { assertRequiredProps } from "../common/validate.js";
 import { NavCountBadge } from "./nav-count-badge.js";
 import { SidebarAccount } from "./app-sidebar-account.js";
 import { SidebarSearch } from "./sidebar-search.js";
@@ -32,27 +33,6 @@ import {
 import { VX } from "../tokens/index.js";
 import { useBasaltSpacing } from "../theme/index.js";
 import classes from "./app-sidebar.module.css";
-function IconCollapse({ collapsed }) {
-  return /* @__PURE__ */ jsxs(
-    "svg",
-    {
-      width: 18,
-      height: 18,
-      viewBox: "0 0 24 24",
-      fill: "none",
-      stroke: "currentColor",
-      strokeWidth: 2,
-      strokeLinecap: "round",
-      strokeLinejoin: "round",
-      "aria-hidden": true,
-      children: [
-        /* @__PURE__ */ jsx("path", { d: "M4 4h16v16H4z" }),
-        /* @__PURE__ */ jsx("path", { d: "M9 4v16" }),
-        collapsed ? /* @__PURE__ */ jsx("path", { d: "M14 9l3 3l-3 3" }) : /* @__PURE__ */ jsx("path", { d: "M16 9l-3 3l3 3" })
-      ]
-    }
-  );
-}
 function IconGear() {
   return /* @__PURE__ */ jsxs(
     "svg",
@@ -76,30 +56,6 @@ function IconGear() {
 const HOVER_OPEN_DELAY = 150;
 const HOVER_CLOSE_DELAY = 200;
 const FLAT_SETTINGS_MAX = 3;
-function BrandName({
-  brand,
-  menuWidth
-}) {
-  const label = /* @__PURE__ */ jsx(Text, { className: classes.brandName, fz: VX.text.xl, fw: 550, children: brand.name });
-  const menu = brand.menu;
-  if (menu === void 0 || menu.length === 0) return label;
-  return /* @__PURE__ */ jsxs(Menu, { position: "bottom-start", withArrow: true, width: menuWidth, zIndex: 500, children: [
-    /* @__PURE__ */ jsx(Menu.Target, { children: /* @__PURE__ */ jsxs(UnstyledButton, { className: classes.brandButton, "aria-label": `${brand.name} workspace`, children: [
-      label,
-      /* @__PURE__ */ jsx(IconChevron, { open: true })
-    ] }) }),
-    /* @__PURE__ */ jsx(Menu.Dropdown, { children: menu.map((entry) => /* @__PURE__ */ jsx(
-      Menu.Item,
-      {
-        leftSection: entry.icon,
-        ...entry.danger === true && { color: "red" },
-        onClick: entry.onClick,
-        children: entry.label
-      },
-      entry.key
-    )) })
-  ] });
-}
 function hasActiveDescendant(item) {
   if (item.active) return true;
   return item.children?.some((c) => hasActiveDescendant(c)) ?? false;
@@ -263,17 +219,24 @@ function NavItemRow({ item, collapsed }) {
     item.key
   );
 }
-function AppSidebar({
-  brand,
-  sections,
-  collapsed,
-  onToggleCollapse,
-  settingsMenuItems,
-  settingsMenu = "auto",
-  account,
-  search,
-  blocks
-}) {
+function AppSidebar(props) {
+  assertRequiredProps("AppSidebar", props, ["brand"]);
+  const {
+    brand,
+    sections,
+    collapsed,
+    // `onToggleCollapse` is deliberately NOT read here any more — the toggle it drives moved into
+    // the header's leading zone with the brand (`app-brand.tsx`). The prop stays on
+    // `AppSidebarProps` because it is the shell's public seam for a consumer-owned collapse, and
+    // dropping it would break every call site for no gain.
+    settingsMenuItems,
+    settingsMenu = "auto",
+    account,
+    search,
+    blocks,
+    className,
+    style
+  } = props;
   const { step } = useBasaltSpacing();
   const navBlocks = (blocks ?? []).filter((block) => sidebarBlockPlacement(block) === "nav");
   const bottomBlocks = (blocks ?? []).filter((block) => sidebarBlockPlacement(block) === "bottom");
@@ -314,62 +277,45 @@ function AppSidebar({
       ] })
     ] })
   ] }) });
-  return /* @__PURE__ */ jsxs(Stack, { gap: 0, h: "100%", className: classes.root, "data-collapsed": collapsed || void 0, children: [
-    /* @__PURE__ */ jsxs(Group, { className: classes.brand, gap: "sm", wrap: "nowrap", children: [
-      /* @__PURE__ */ jsxs(Group, { className: classes.brandLead, gap: "sm", wrap: "nowrap", children: [
-        brand.logoSrc && /* @__PURE__ */ jsx(
-          "img",
+  return /* @__PURE__ */ jsxs(
+    Stack,
+    {
+      gap: 0,
+      h: "100%",
+      className: cx(classes.root, className),
+      "data-collapsed": collapsed || void 0,
+      ...style !== void 0 && { style },
+      children: [
+        search && /* @__PURE__ */ jsx("div", { className: classes.searchSlot, children: /* @__PURE__ */ jsx(SidebarSearch, { ...search, collapsed }) }),
+        /* @__PURE__ */ jsx(
+          ScrollArea,
           {
-            src: brand.logoSrc,
-            alt: brand.logoAlt ?? brand.name,
-            width: 26,
-            height: 26,
-            style: { display: "block" }
+            type: "hover",
+            scrollbars: "y",
+            scrollbarSize: 9,
+            className: classes.navScroll,
+            classNames: { viewport: classes.navViewport },
+            children: /* @__PURE__ */ jsxs(Stack, { gap: 0, className: classes.nav, children: [
+              sections.map((section) => /* @__PURE__ */ jsx(NavSection, { section, collapsed }, section.label)),
+              navBlocks.map((block) => /* @__PURE__ */ jsx(SidebarBlockView, { block }, block.key))
+            ] })
           }
         ),
-        /* @__PURE__ */ jsx(BrandName, { brand, menuWidth: step.sidebarAccountMenuWidth })
-      ] }),
-      /* @__PURE__ */ jsx(
-        ActionIcon,
-        {
-          variant: "subtle",
-          size: 28,
-          visibleFrom: "sm",
-          className: classes.ghostIcon,
-          onClick: onToggleCollapse,
-          "aria-label": collapsed ? "Expand sidebar" : "Collapse sidebar",
-          children: /* @__PURE__ */ jsx(IconCollapse, { collapsed })
-        }
-      )
-    ] }),
-    search && /* @__PURE__ */ jsx("div", { className: classes.searchSlot, children: /* @__PURE__ */ jsx(SidebarSearch, { ...search, collapsed }) }),
-    /* @__PURE__ */ jsx(
-      ScrollArea,
-      {
-        type: "hover",
-        scrollbars: "y",
-        scrollbarSize: 9,
-        className: classes.navScroll,
-        classNames: { viewport: classes.navViewport },
-        children: /* @__PURE__ */ jsxs(Stack, { gap: 0, className: classes.nav, children: [
-          sections.map((section) => /* @__PURE__ */ jsx(NavSection, { section, collapsed }, section.label)),
-          navBlocks.map((block) => /* @__PURE__ */ jsx(SidebarBlockView, { block }, block.key))
+        (bottomBlocks.length > 0 || settingsRow !== null || account !== void 0) && /* @__PURE__ */ jsxs(Stack, { gap: 0, className: classes.footer, children: [
+          bottomBlocks.map((block) => /* @__PURE__ */ jsx(SidebarBlockView, { block }, block.key)),
+          settingsRow,
+          account !== void 0 && /* @__PURE__ */ jsx(
+            SidebarAccount,
+            {
+              state: account.state,
+              ...account.actions !== void 0 && { actions: account.actions },
+              ...account.showEmail !== void 0 && { showEmail: account.showEmail }
+            }
+          )
         ] })
-      }
-    ),
-    (bottomBlocks.length > 0 || settingsRow !== null || account !== void 0) && /* @__PURE__ */ jsxs(Stack, { gap: 0, className: classes.footer, children: [
-      bottomBlocks.map((block) => /* @__PURE__ */ jsx(SidebarBlockView, { block }, block.key)),
-      settingsRow,
-      account !== void 0 && /* @__PURE__ */ jsx(
-        SidebarAccount,
-        {
-          state: account.state,
-          ...account.actions !== void 0 && { actions: account.actions },
-          ...account.showEmail !== void 0 && { showEmail: account.showEmail }
-        }
-      )
-    ] })
-  ] });
+      ]
+    }
+  );
 }
 export {
   AppSidebar

package/dist/shell/app-sidebar.module.css

@@ -4,7 +4,8 @@
  *
  * The mock sidebar has ZERO horizontal rules — separation comes from SPACING only. The one allowed
  * line is the child-list left guide (`--vx-divider`). Never reintroduce brand/section/footer
- * borders.
+ * borders. The column's trailing (right) edge is the `AppShell.Navbar` region seam
+ * (docs/DESIGN-SPEC.md §5) and is not this module's to draw.
  *
  * The active tint and icon-accent color live in the Mantine theme
  * (`NavLink.extend` + `theme/nav-link.module.css`) so they apply to EVERY render path, including a
@@ -39,28 +40,31 @@
 }
 
 /* Inactive rows: muted text + faint icon. Active rows keep the theme's ink text (via `--nl-color`)
- * untouched — this selector only ever matches when neither `data-active` nor `aria-current="page"`
- * is present. `[data-ancestor]` is excluded too: it gets its own ink/accent treatment below and
- * must not fall through to muted/faint here. */
-.link:not([data-active]):not([aria-current='page']):not([data-ancestor]) {
+ * untouched — this selector only ever matches when `data-active` is absent. `aria-current` is no
+ * longer part of the exclusion: `use-nav.ts` is the sole authority on active, stamping exactly one
+ * `data-active` winner, and keying this off `aria-current` too let the router's own looser match
+ * disagree with basalt's model. `[data-ancestor]` is excluded too: it gets its own ink/accent
+ * treatment below and must not fall through to muted/faint here. */
+.link:not([data-active]):not([data-ancestor]) {
   color: var(--vx-muted) !important;
 }
 
-.link:not([data-active]):not([aria-current='page']):not([data-ancestor])
+.link:not([data-active]):not([data-ancestor])
   :global(.mantine-NavLink-section[data-position='left']) {
   color: var(--vx-faint);
 }
 
-/* Hover — ink-6% tint + ink text, for inactive rows only (an active row already carries the
- * theme's stronger ink-9% tint and keeps its own hover via `--nl-hover`; an ancestor row gets its
- * own hover rule below so its accent icon survives the pointer). */
+/* Hover — ink-5% tint + ink text, for inactive rows only (an active row carries the theme's
+ * stronger 12% accent fill via `theme/nav-link.module.css` and keeps its own accent hover; an
+ * ancestor row gets its own hover rule below so its accent icon survives the pointer). Dropped from
+ * 6% alongside the theme-level hover so it reads clearly below the active row's accent fill. */
 @media (hover: hover) {
-  .link:not([data-active]):not([aria-current='page']):not([data-ancestor]):hover {
-    background-color: color-mix(in srgb, var(--vx-ink) 6%, transparent) !important;
+  .link:not([data-active]):not([data-ancestor]):hover {
+    background-color: color-mix(in srgb, var(--vx-ink) 5%, transparent) !important;
     color: var(--vx-ink) !important;
   }
 
-  .link:not([data-active]):not([aria-current='page']):not([data-ancestor]):hover
+  .link:not([data-active]):not([data-ancestor]):hover
     :global(.mantine-NavLink-section[data-position='left']) {
     color: var(--vx-ink);
   }
@@ -68,12 +72,12 @@
 
 /*
  * Ancestor row (`SidebarItem.ancestor` — a parent on the path to the active row, never active
- * itself, never `aria-current`): must read visibly WEAKER than active and visibly STRONGER than a
- * hovered inactive row, since all three now share the same 6%/9% ink-tint family. Active carries a
- * persistent `--nl-bg` ink-9% fill + weight 600 (theme `nav-link.module.css`); a hovered inactive
- * row carries a transient ink-6% fill. An ancestor therefore gets NO fill at rest (unlike active)
- * and NO weight change (still 400, unlike active's 600) — only the ink label + accent icon that an
- * active row also carries, so it reads as "on the path" without claiming to BE the destination.
+ * itself, never `data-active`): must read visibly WEAKER than active and visibly STRONGER than a
+ * hovered inactive row. Active carries a persistent accent-12% fill + weight 600 (theme
+ * `nav-link.module.css`); a hovered inactive row carries a transient ink-5% fill. An ancestor
+ * therefore gets NO fill at rest (unlike active) and NO weight change (still 400, unlike active's
+ * 600) — only the ink label + accent icon that an active row also carries, so it reads as "on the
+ * path" without claiming to BE the destination.
  */
 .link[data-ancestor] {
   color: var(--vx-ink) !important;
@@ -98,70 +102,18 @@
 }
 
 /*
- * Icon-only ghost buttons in shell chrome (collapse toggle, mobile close) — docs/DESIGN-SPEC.md
- * §5: transparent, faint icon, hover ink-6% + ink, radius 6. `!important` for the same reason as
- * the nav-row overrides above: these compete with Mantine's own compiled ActionIcon variant CSS.
- */
-.ghostIcon {
-  color: var(--vx-faint) !important;
-  border-radius: var(--vx-radius-ctrl) !important;
-}
-
-.ghostIcon:hover {
-  background-color: color-mix(in srgb, var(--vx-ink) 6%, transparent) !important;
-  color: var(--vx-ink) !important;
-}
-
-/*
- * Brand row — NO border (the mock's brand row has none; the header divider exists only over the
- * content column). Spacing alone (12px bottom padding) separates it from the nav.
- */
-.brand {
-  justify-content: space-between;
-  padding: var(--vx-space-sidebar-brand-inset-top) var(--vx-space-sidebar-brand-inset-x)
-    var(--vx-space-sidebar-region-gap);
-  flex-shrink: 0;
-}
-
-.brandLead {
-  min-width: 0;
-}
-
-/*
- * Search slot — fixed row between the brand and the nav scroll region. Horizontal padding aligns
- * the field with the brand lead / nav column; the bottom gap opens the nav region the same way the
- * brand row's own bottom padding does.
+ * Search slot — the sidebar's FIRST row now that the brand moved into the header
+ * (`app-brand.module.css`), optional (absent, the nav starts the column). `padding-block` is the
+ * only air above it, so the token that used to merely top up the brand band's centred `min-height`
+ * now owns the whole gap under the header seam.
  */
 /* No horizontal padding — the field spans the same width as the nav rows below it (both sit at the
  * `.root` 10px inset), so the search box edge-aligns with the nav column. */
 .searchSlot {
-  padding: 0 0 var(--vx-space-sidebar-region-gap);
+  padding-block: var(--vx-space-sidebar-region-gap);
   flex-shrink: 0;
 }
 
-/* Brand name — head font at stretch 88% (docs/DESIGN-SPEC.md §3); the 18px/550 land as `fz`/`fw`
- * props (inline, deterministic against Mantine's own Text base rule). */
-.brandName {
-  font-family: var(--basalt-font-head);
-  font-stretch: 88%;
-}
-
-/* Workspace switcher (`brand.menu`) — the brand name plus a chevron, as a row-shaped trigger. The
- * chevron is faint until hover so the brand still reads as the brand, not as a control. */
-.brandButton {
-  display: flex;
-  align-items: center;
-  gap: var(--vx-space-sidebar-section-label-gap);
-  min-width: 0;
-  padding: 0;
-  color: var(--vx-faint);
-  cursor: pointer;
-}
-
-.brandButton:hover {
-  color: var(--vx-ink);
-}
-
 /*
  * Nav scroll region — a Mantine ScrollArea, whose overlay scrollbar is absolutely positioned inside
  * the (position: relative; overflow: hidden) root, so it floats over the rows instead of reserving
@@ -186,7 +138,8 @@
 }
 
 /* Sections separate by SPACING only — 15px between sections, nothing above the first (the brand
- * row's own bottom padding already opens the region). */
+ * band's centred `min-height` already opens the region's air, and the optional search slot's own
+ * `padding-block` opens more when it renders). */
 .nav > div + div {
   margin-top: var(--vx-space-sidebar-section-gap);
 }
@@ -573,21 +526,32 @@
 }
 
 /*
- * Active child = accent text, weight 600, NO fill (docs/DESIGN-SPEC.md §5) — unlike a top-level
- * active row (ink-9% tint). Overrides the `--nl-*` custom properties the theme sets inline on the
- * SAME NavLink root, so `!important` is required.
+ * Active child = the SAME accent-tinted fill as a top-level active row (accent-12% resting,
+ * accent-16% hover), plus accent text, weight 600 (inherited from `.root[data-active]` in
+ * `theme/nav-link.module.css`, which every NavLink root carries regardless of nesting). Previously
+ * NO fill at rest — that read ambiguously once a hovered sibling landed in the same ink-tint family
+ * a stale ink-9% active fill also used; the shared accent family removes the ambiguity outright.
+ * `background-color` is set directly (not via `--nl-bg`): the theme's own active rule now paints
+ * `background-color` as a plain declaration rather than through that custom property, so overriding
+ * only the property would no longer reach the painted color. `[data-active]` alone is the hook —
+ * `use-nav.ts` is the sole authority on active, so `aria-current` is not matched here either.
  */
-.childList :global(.mantine-NavLink-root[data-active]),
-.childList :global(.mantine-NavLink-root[aria-current='page']) {
+.childList :global(.mantine-NavLink-root[data-active]) {
   --nl-color: var(--vx-accent) !important;
-  --nl-bg: transparent !important;
-  --nl-hover: color-mix(in srgb, var(--vx-ink) 5%, transparent) !important;
+  background-color: color-mix(in srgb, var(--vx-accent) 12%, transparent) !important;
 }
 
-/* Child hover (inactive) — ink-5% + ink, one step quieter than the parent rows' 6%. Outranks the
- * `.link` hover rule above on specificity. */
 @media (hover: hover) {
-  .childList :global(.mantine-NavLink-root:not([data-active]):not([aria-current='page'])):hover {
+  .childList :global(.mantine-NavLink-root[data-active]):hover {
+    background-color: color-mix(in srgb, var(--vx-accent) 16%, transparent) !important;
+  }
+}
+
+/* Child hover (inactive) — ink-5%, matching the top-level inactive hover now that both share the
+ * same percentage. `data-active` is excluded so an active child keeps its accent hover above.
+ * Outranks the `.link` hover rule above on specificity. */
+@media (hover: hover) {
+  .childList :global(.mantine-NavLink-root:not([data-active])):hover {
     background-color: color-mix(in srgb, var(--vx-ink) 5%, transparent) !important;
     color: var(--vx-ink) !important;
   }
@@ -609,19 +573,12 @@
 /*
  * Icon-rail (collapsed) — desktop only. Gated behind min-width: sm (48em) so the sidebar doesn't
  * exist at all below that breakpoint (see `MobileNav`) regardless of the persisted collapse flag.
- * Hide the brand text, section labels and nav labels; center the remaining icons.
+ * Hide the section labels and nav labels; center the remaining icons. The brand's own rail form
+ * lives in `app-brand.module.css` now, keyed off the same `data-collapsed` attribute.
  */
 @media (min-width: 48em) {
-  .root[data-collapsed] .brand {
-    justify-content: center;
-  }
-
-  .root[data-collapsed] .brandLead {
-    display: none;
-  }
-
   .root[data-collapsed] .searchSlot {
-    padding: 0 0 var(--vx-space-sidebar-region-gap);
+    padding-block: var(--vx-space-sidebar-region-gap);
     display: flex;
     justify-content: center;
   }

package/dist/shell/app-sidebar.module.css.d.ts

@@ -7,10 +7,6 @@ declare const classes: {
   readonly root: string
   readonly link: string
   readonly navItem: string
-  readonly brand: string
-  readonly brandLead: string
-  readonly brandName: string
-  readonly brandButton: string
   readonly searchSlot: string
   readonly navScroll: string
   readonly navViewport: string
@@ -28,7 +24,6 @@ declare const classes: {
   readonly sectionHeader: string
   readonly subnavDropdown: string
   readonly childList: string
-  readonly ghostIcon: string
   readonly block: string
   readonly blockHeader: string
   readonly blockHeaderButton: string

package/dist/shell/index.d.ts

@@ -1,17 +1,19 @@
 import type { MouseEvent, ReactNode } from 'react';
+import type { BasaltProps } from '../common/props.js';
 import type { GlobalAction } from '../controls/actions.js';
 import type { AccountMenuItem, BasaltAccountProps } from './account-types.js';
 import type { SidebarSearchActions, SidebarSearchConfig } from './sidebar-search.js';
 import type { MobileNavConfig, SidebarBlock, SidebarSection } from '../nav/types.js';
 export { AppSidebar, type AppSidebarProps } from './app-sidebar.js';
-export { NavCountBadge } from './nav-count-badge.js';
-export { SidebarSearch, type SidebarSearchConfig, type SidebarSearchActions, } from './sidebar-search.js';
+export { NavCountBadge, type NavCountBadgeProps } from './nav-count-badge.js';
+export { SidebarSearch, type SidebarSearchProps, type SidebarSearchConfig, type SidebarSearchActions, } from './sidebar-search.js';
 export { SidebarAccount } from './app-sidebar-account.js';
 export type { AccountBadgeTone, BasaltIdentity, BasaltRole, BasaltPlan, AccountMenuItem, BasaltAccountState, BasaltAccountActions, BasaltAccountProps, } from './account-types.js';
 export { MobileNav, type MobileNavProps } from './app-mobile-nav.js';
 export { projectMobileNav, type ProjectMobileNavOptions, MOBILE_MAX_TABS_DEFAULT, MOBILE_MENU_MAX_DEFAULT, MOBILE_MORE_KEY, } from './mobile-nav-model.js';
-export { AppBreadcrumbs } from './app-breadcrumbs.js';
-export { PageBar, type PageBarProps } from './page-bar.js';
+export { AppBreadcrumbs, type AppBreadcrumbsProps } from './app-breadcrumbs.js';
+export { PageBar, type PageBarProps, type PageBarSlot } from './page-bar.js';
+export { PageAside, type PageAsideProps, type PageAsideSlot } from './page-aside.js';
 /**
  * The shared nav vocabulary lives in `src/nav/types.ts` so the headless router bridge can `import
  * type` it without reaching into the Mantine layer. Re-exported here so `SidebarItem` /
@@ -36,7 +38,7 @@ export type SettingsMenuItem = {
     icon?: ReactNode;
     onClick?: (e: MouseEvent) => void;
 };
-export type BasaltShellProps = {
+export type BasaltShellProps = BasaltProps & {
     /**
      * Brand identity for the sidebar header. Supplying `menu` turns the brand row into a `Name ▾`
      * workspace switcher — the rows are `AccountMenuItem`s, the shape the account menu already uses.
@@ -126,5 +128,11 @@ export type BasaltShellProps = {
     /** Page content. */
     children?: ReactNode;
 };
-export declare function BasaltShell({ brand, sections, mobileNav, globalActions, sidebarBlocks, settingsMenuItems, settingsMenu, storageKey, collapsed: collapsedProp, onCollapsedChange, account, search, children, }: BasaltShellProps): import("react").JSX.Element;
+/**
+ * The shell's two page-level regions are providers, and both wrap the frame rather than living
+ * inside it: `PageBarProvider` owns the header portal and the single-kebab claim, `AsideProvider`
+ * owns the aside portal, the region CLAIM and the claiming page's fold state — which `ShellFrame`
+ * has to READ to size `AppShell.Aside`, so it cannot be the component that provides it.
+ */
+export declare function BasaltShell(props: BasaltShellProps): import("react").JSX.Element;
 //# sourceMappingURL=index.d.ts.map

package/dist/shell/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/shell/index.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/shell/index.tsx"],"names":[],"mappings":"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"}

package/dist/shell/index.js

@@ -1,16 +1,22 @@
 import { jsx, jsxs } from "react/jsx-runtime";
 import { AppShell, Box } from "@mantine/core";
 import { Fragment, useMemo } from "react";
+import { cx } from "../common/props.js";
+import { assertRequiredProps } from "../common/validate.js";
 import { AppSidebar } from "./app-sidebar.js";
+import { AppBrand } from "./app-brand.js";
 import { MobileNav, accountRowCount } from "./app-mobile-nav.js";
 import { blockRowCount, projectMobileNav } from "./mobile-nav-model.js";
 import { AppBreadcrumbs } from "./app-breadcrumbs.js";
-import { PageBarOutlet, PageBarProvider, usePageKebabClaimed } from "./page-bar.js";
+import { PageBarBandOutlet, PageBarOutlet, PageBarProvider, usePageKebabClaimed } from "./page-bar.js";
+import { AsideOutlet, AsideProvider, useAsideRegion } from "./page-aside.js";
 import { OverflowMenu, globalActionAsBarAction, globalActionMobile } from "../controls/actions.js";
 import { CtlSlot, useBasaltSpacing } from "../theme/index.js";
 import { createPersistedState } from "../state.js";
+import brandClasses from "./app-brand.module.css";
 import headerClasses from "./app-header.module.css";
-import mobileNavClasses from "./app-mobile-nav.module.css";
+import mainClasses from "./app-main.module.css";
+import asideClasses from "./page-aside.module.css";
 import { AppSidebar as AppSidebar2 } from "./app-sidebar.js";
 import { NavCountBadge } from "./nav-count-badge.js";
 import {
@@ -26,6 +32,7 @@ import {
 } from "./mobile-nav-model.js";
 import { AppBreadcrumbs as AppBreadcrumbs2 } from "./app-breadcrumbs.js";
 import { PageBar } from "./page-bar.js";
+import { PageAside } from "./page-aside.js";
 function findActiveCrumb(sections) {
   for (const section of sections) {
     const found = findActiveWithParent(section.items);
@@ -72,7 +79,12 @@ function collapseStore(key) {
   collapseStores.set(key, store);
   return store;
 }
-function BasaltShell({
+const SHELL_INSET = "sm";
+function BasaltShell(props) {
+  assertRequiredProps("BasaltShell", props, ["brand", "sections"]);
+  return /* @__PURE__ */ jsx(PageBarProvider, { globalActions: props.globalActions ?? [], children: /* @__PURE__ */ jsx(AsideProvider, { children: /* @__PURE__ */ jsx(ShellFrame, { ...props }) }) });
+}
+function ShellFrame({
   brand,
   sections,
   mobileNav,
@@ -85,9 +97,12 @@ function BasaltShell({
   onCollapsedChange,
   account,
   search,
-  children
+  children,
+  className,
+  style
 }) {
   const { step } = useBasaltSpacing();
+  const aside = useAsideRegion();
   const [storedCollapsed, setStoredCollapsed] = collapseStore(storageKey)();
   const isCollapseControlled = collapsedProp !== void 0;
   const collapsed = isCollapseControlled ? collapsedProp : storedCollapsed;
@@ -102,11 +117,10 @@ function BasaltShell({
     () => projectMobileNav(sections, { config: mobileNav, extraMoreRows }),
     [sections, mobileNav, extraMoreRows]
   );
-  return /* @__PURE__ */ jsx(PageBarProvider, { globalActions: globalActions ?? [], children: /* @__PURE__ */ jsxs(
+  return /* @__PURE__ */ jsxs(
     AppShell,
     {
       h: "100dvh",
-      layout: "alt",
       header: {
         // ONE height at every width (law C14): nothing reserves a second mobile row any more.
         height: step.appShellHeaderHeight
@@ -120,15 +134,25 @@ function BasaltShell({
         // No mobile sidebar drawer, ever — the bottom bar is the entire mobile nav.
         collapsed: { mobile: true }
       },
+      aside: {
+        width: aside.claimed ? aside.folded ? step.appShellAsideRailWidth : step.appShellAsideWidth : 0,
+        breakpoint: "sm",
+        // Below `sm` there is no region at all — `PageAside` renders its content in the page
+        // flow instead, one node, no responsive twin (law C9).
+        collapsed: { desktop: !aside.claimed, mobile: true }
+      },
       footer: { height: { base: step.mobileNavBarHeight, sm: 0 } },
-      padding: "sm",
+      padding: SHELL_INSET,
+      className: cx(mainClasses.shell, className),
+      ...style !== void 0 && { style },
       children: [
-        /* @__PURE__ */ jsx(AppShell.Header, { px: "md", withBorder: false, children: /* @__PURE__ */ jsxs("div", { className: headerClasses.bar, children: [
+        /* @__PURE__ */ jsx(AppShell.Header, { px: SHELL_INSET, children: /* @__PURE__ */ jsxs("div", { className: headerClasses.bar, children: [
+          /* @__PURE__ */ jsx("div", { className: brandClasses.zone, "data-collapsed": collapsed || void 0, children: /* @__PURE__ */ jsx(AppBrand, { brand, collapsed, onToggleCollapse: toggleCollapse }) }),
           /* @__PURE__ */ jsx("div", { className: headerClasses.lead, children: /* @__PURE__ */ jsx(AppBreadcrumbs, { ...activeCrumb }) }),
           /* @__PURE__ */ jsx(PageBarOutlet, { className: headerClasses.pageBar }),
           /* @__PURE__ */ jsx(HeaderGlobalActions, { actions: globalActions ?? [] })
         ] }) }),
-        /* @__PURE__ */ jsx(AppShell.Navbar, { p: 0, withBorder: false, children: /* @__PURE__ */ jsx(
+        /* @__PURE__ */ jsx(AppShell.Navbar, { p: 0, children: /* @__PURE__ */ jsx(
           AppSidebar,
           {
             brand,
@@ -142,8 +166,18 @@ function BasaltShell({
             ...search !== void 0 && { search }
           }
         ) }),
-        /* @__PURE__ */ jsx(AppShell.Main, { className: mobileNavClasses.mainSafeArea, children }),
-        /* @__PURE__ */ jsx(AppShell.Footer, { hiddenFrom: "sm", p: 0, withBorder: false, children: /* @__PURE__ */ jsx(
+        /* @__PURE__ */ jsx(PageBarBandOutlet, { className: mainClasses.band }),
+        /* @__PURE__ */ jsx(
+          AppShell.Main,
+          {
+            className: mainClasses.main,
+            "data-basalt-scrollport": true,
+            "data-scroll-restoration-id": "basalt-main",
+            children
+          }
+        ),
+        /* @__PURE__ */ jsx(AppShell.Aside, { p: 0, withBorder: aside.claimed, children: /* @__PURE__ */ jsx(AsideOutlet, { className: asideClasses.outlet }) }),
+        /* @__PURE__ */ jsx(AppShell.Footer, { hiddenFrom: "sm", p: 0, children: /* @__PURE__ */ jsx(
           MobileNav,
           {
             model,
@@ -155,7 +189,7 @@ function BasaltShell({
         ) })
       ]
     }
-  ) });
+  );
 }
 function HeaderGlobalActions({ actions }) {
   const kebabClaimed = usePageKebabClaimed();
@@ -183,6 +217,7 @@ export {
   MOBILE_MORE_KEY,
   MobileNav2 as MobileNav,
   NavCountBadge,
+  PageAside,
   PageBar,
   SidebarAccount,
   SidebarSearch,