@kolkrabbi/kol-shell 0.12.0 → 0.13.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kolkrabbi/kol-shell",
-  "version": "0.12.0",
+  "version": "0.13.1",
   "private": false,
   "description": "KOL application shell — fixed 48px NavRail + AppShell layout root, PageShell/PageHeader scaffolds, ContentFilters catalog organism, GridCard, SettingsScaffold, WalkthroughPanel, ShortcutsOverlay. App chrome (kol-framework owns site chrome). Nav items, content, shortcuts and settings are consumer-injected. Sits above @kolkrabbi/kol-{theme,component,framework}.",
   "license": "MIT",
@@ -13,17 +13,17 @@
   },
   "peerDependencies": {
     "@kolkrabbi/kol-component": ">=0.108.0",
-    "@kolkrabbi/kol-framework": ">=0.20.0",
+    "@kolkrabbi/kol-framework": ">=0.33.0",
     "@kolkrabbi/kol-icons": ">=0.16.0",
-    "@kolkrabbi/kol-theme": ">=0.68.0",
+    "@kolkrabbi/kol-theme": ">=0.80.0",
     "react": "^18.3.0 || ^19.0.0",
     "react-dom": "^18.3.0 || ^19.0.0"
   },
   "devDependencies": {
-    "@kolkrabbi/kol-component": "^0.118.2",
-    "@kolkrabbi/kol-framework": "^0.30.0",
+    "@kolkrabbi/kol-framework": "^0.33.0",
     "@kolkrabbi/kol-icons": "^0.24.0",
-    "@kolkrabbi/kol-theme": "^0.78.1"
+    "@kolkrabbi/kol-component": "^0.118.3",
+    "@kolkrabbi/kol-theme": "^0.80.0"
   },
   "files": [
     "src",

package/src/AppShell.jsx

@@ -4,17 +4,25 @@ import { NavHiddenContext } from './navHidden.js'
 import TouchDeviceOverlay, { useTouchPrimary } from './TouchDeviceOverlay.jsx'
 
 /**
- * AppShell — layout root: fixed NavRail + content offset by the rail width.
- * No header, no footer. Router-agnostic: render your router's element (e.g.
- * `<Outlet/>`) as children and wire `currentPath`/`onNavigate` from your
- * router at the call site.
+ * AppShell — layout root: the rail + the content column. No header, no
+ * footer. Router-agnostic: render your router's element (e.g. `<Outlet/>`) as
+ * children and wire `currentPath`/`onNavigate` from your router at the call
+ * site.
  *
- * Rail width is `--kol-shell-rail-width` (kol-theme) — read by both the rail
- * and the offset so they can never disagree.
+ * THE RAIL IS A SIDENAV (RailSideNavPixelParity, kol-fxr 2026-08-28 — user:
+ * "same component both states super nice"): since 0.13.0 the root is the
+ * brand grid, `.kol-brand-layout` (kol-framework.css — `--kol-sidenav-w` ×
+ * `minmax(0, 1fr)`, the collapsed column on the `data-sidenav` stamp, the
+ * ≤1024 forced rail and the ≤767 drawer), and `NavRail` mounts kol-framework's
+ * `SideNav` collapsed in it. The grab edge opens it to the brand sidebar and
+ * the drag is the transition; the content column follows the grid, so the old
+ * fixed rail + `margin-left` offset is gone. `--kol-shell-rail-width`
+ * (kol-theme ≥0.80.0) is LIVE — the sidenav's width in its current state —
+ * for consumers that offset a fixed element by it; hidden rail = `0px`.
  *
  * @param {Array}  props.items         nav items `{ icon, path, label }`
  * @param {Array}  props.bottomItems   items pinned below the theme toggle
- * @param {Object} props.logomark      `{ svgUrl, title }` — top mark, navigates to '/'
+ * @param {Object} props.logomark      `{ svgUrl, title }` — the rail's header mark, at the top in both states, navigates to '/'
  * @param {string} props.currentPath   the router's current pathname
  * @param {Function} props.onNavigate  `(path) => void`
  * @param {ElementType} props.iconComponent  icon renderer seam (see Button)
@@ -101,8 +109,13 @@ export default function AppShell({
 
   return (
     <NavHiddenContext.Provider value={{ navHidden, setNavHidden }}>
-      {/* `kol-app-shell` = the app tier: neutral ::selection (kol-theme) */}
-      <div className="kol-app-shell contents">
+      {/* `kol-app-shell` = the app tier: neutral ::selection (kol-theme).
+        * `kol-brand-layout` = the sidenav grid; a hidden rail collapses the
+        * grid to the content column and zeroes the live width token. */}
+      <div
+        className="kol-app-shell kol-brand-layout min-h-dvh bg-surface-primary"
+        style={navHidden ? { gridTemplateColumns: 'minmax(0, 1fr)', '--kol-shell-rail-width': '0px' } : undefined}
+      >
       {touch === 'overlay' && <TouchDeviceOverlay appName={appName} />}
       {!navHidden && (
         <NavRail
@@ -117,7 +130,7 @@ export default function AppShell({
       )}
       {/* THE BACK OF THE BACK — surface-primary, always, in every app; the
         * page paints its wash over it (ShellPageWash). */}
-      <div className="bg-surface-primary" style={{ marginLeft: navHidden ? 0 : 'var(--kol-shell-rail-width)', '--kol-shell-page-wash': pageWash }}>
+      <div className="bg-surface-primary min-w-0" style={{ '--kol-shell-page-wash': pageWash }}>
         {children}
       </div>
       </div>

package/src/NavRail.jsx

@@ -1,35 +1,27 @@
-import { Button } from '@kolkrabbi/kol-component'
-import { ThemeToggle } from '@kolkrabbi/kol-framework'
+import { SideNav } from '@kolkrabbi/kol-framework'
 import Logomark from './Logomark.jsx'
 
 /**
- * NavRail — the fixed 48px icon rail. Geometry/stacking live in kol-theme's
- * `.kol-shell-rail`; surface/border ride the theme utility classes.
+ * NavRail — AppShell's rail, which IS kol-framework's `SideNav`
+ * (RailSideNavPixelParity, kol-fxr 2026-08-28 — user, on the brand sidebar's
+ * drag: "same component both states super nice"). Until 0.13.0 this was its
+ * own fixed 48px icon rail, and the first app to run it beside a collapsed
+ * SideNav on adjacent routes measured every icon moving on the route change
+ * (48 vs 56 wide, 20 vs 16px glyphs, 40 vs 38 pitch, first glyph at y 76 vs
+ * 26). There is no second component now: this file maps the shell's flat
+ * `{ icon, path, label }` items onto the sidenav's tree and mounts it
+ * collapsed — the pill-marked grab edge opens it to the brand sidebar, the
+ * drag is the transition, and it stays a rail while it navigates
+ * (`expandOnSelect={false}`).
  *
- * Items are flat `{ icon, path, label }` — deliberately NOT kol-framework
- * SideNav's two-level navTree; different component, not a variant.
- *
- * Active state (user ruling 2026-08-12, carried natively in kol-theme):
- * ink `--kol-oq-96` in every state, hover = the `--kol-oq-04` wash, active
- * route = that wash held on via `aria-current="page"` — never
- * `selected`/`pressed`; navigation is location, not a toggled tool.
+ * The bottom, specified once: theme slot → `bottomItems` (pinned rows) →
+ * no footer (an app rail never carried the site's wordmark link). The
+ * `logomark` is the sidenav's `header` — at the TOP, both states, where every
+ * rail in the estate has carried it (RailLogomarkAtTop, 2026-08-28 — user, on
+ * 0.13.0's footer placement: "why did you move the logo from top to bottom?
+ * … I've never seen that before so you are the first"). Its `title` is the
+ * label beside the mark in the open rail; collapsed, the mark alone.
  */
-
-function RailItem({ icon, path, label, active, onNavigate, iconComponent }) {
-  return (
-    <Button
-      iconOnly={icon}
-      iconSize={20}
-      variant="nav"
-      size="md"
-      aria-current={active ? 'page' : undefined}
-      onClick={() => onNavigate?.(path)}
-      title={label}
-      iconComponent={iconComponent}
-    />
-  )
-}
-
 export default function NavRail({
   items = [],
   bottomItems = [],
@@ -41,42 +33,36 @@ export default function NavRail({
   hidden = false,
 }) {
   if (hidden) return null
-  const isActive = (path) =>
-    path === '/' ? currentPath === '/' : currentPath.startsWith(path)
-
+  const node = (item) => ({ id: item.path, label: item.label, icon: item.icon, to: item.path })
+  /* the shell's route match: '/' exact, anything else by prefix */
+  const isActive = (to) => (to === '/' ? currentPath === '/' : currentPath.startsWith(to))
   return (
-    <div className="kol-shell-rail bg-surface-tertiary border-r border-fg-04">
-      {logomark && (
-        <div
+    <SideNav
+      navTree={items.map(node)}
+      bottomItems={bottomItems.map(node)}
+      currentPath={currentPath}
+      isActive={isActive}
+      onNavigate={(e, to) => onNavigate?.(to)}
+      iconComponent={iconComponent}
+      themeToggle={themeToggle}
+      expandOnSelect={false}
+      defaultCollapsed
+      hairline
+      footer={false}
+      header={logomark ? (
+        <button
+          type="button"
+          className="flex items-center gap-3 w-full bg-transparent border-0 p-0 cursor-pointer text-emphasis no-underline text-left"
           onClick={() => onNavigate?.('/')}
-          className="text-oq-96"
-          style={{ cursor: 'pointer', marginBottom: 16, paddingTop: 4 }}
           title={logomark.title}
+          aria-label={logomark.title}
         >
-          <Logomark svgUrl={logomark.svgUrl} size={20} />
-        </div>
-      )}
-      {items.map((item) => (
-        <RailItem
-          key={item.path}
-          {...item}
-          active={isActive(item.path)}
-          onNavigate={onNavigate}
-          iconComponent={iconComponent}
-        />
-      ))}
-      <div style={{ flex: 1 }} />
-      {themeToggle && <ThemeToggle label={false} style={{ color: 'var(--kol-oq-96)' }} />}
-      {bottomItems.map((item) => (
-        <RailItem
-          key={item.path}
-          {...item}
-          active={isActive(item.path)}
-          onNavigate={onNavigate}
-          iconComponent={iconComponent}
-        />
-      ))}
-      <div style={{ height: 8 }} />
-    </div>
+          <span className="kol-sidenav-hop-icon inline-flex items-center justify-center w-5 h-5 shrink-0" aria-hidden="true">
+            <Logomark svgUrl={logomark.svgUrl} size={20} />
+          </span>
+          {logomark.title && <span className="kol-sidenav-hop-label kol-helper-12 flex-1 min-w-0 truncate">{logomark.title}</span>}
+        </button>
+      ) : undefined}
+    />
   )
 }

package/src/index.js

@@ -4,7 +4,8 @@
  * Lifted 2026-08-14 from the hand-copied twins in kol-monitor ("Monitor") and
  * kol-mirror ("Hall of Mirrors") — AppShellSet lobby brief. App chrome, not
  * site chrome: kol-framework's SideNav/footer/heroes are the site register;
- * this is the fixed 48px rail + page scaffolds an application is built from.
+ * this is the rail (a collapsed kol-framework SideNav since 0.13.0 —
+ * RailSideNavPixelParity) + the page scaffolds an application is built from.
  *
  * Router-agnostic: no react-router dependency — pass `currentPath` +
  * `onNavigate` and render your router's element as children.