Open-source manufacturing ERP, MES and QMS. Quoting, MRP, inventory, shop floor, quality and lot/serial traceability on one Postgres schema, with a REST API and MCP server. Self-host or use Carbon Cloud.
TypeScript ai-agentsbill-of-materialserpinventory-managementleanmanufacturingmanufacturing-execution-systemmcp-servermesmrpopen-source-erppostgresqlproduction-planningqmsquality-management-systemreact-routerself-hostedsupabasetraceabilitytypescript
fix(nav): restore the MES logo and section labels, and steady the rail's hover
aashu5765802b6b0c
diff --git a/apps/mes/app/components/AppSidebar.tsx b/apps/mes/app/components/AppSidebar.tsxindex 4d6e86225d..86b9b1520f 100644--- a/apps/mes/app/components/AppSidebar.tsx+++ b/apps/mes/app/components/AppSidebar.tsx@@ -3,12 +3,15 @@import type { Company } from "@carbon/auth";import {NavRail,- NavRailDivider,+ NavRailBrand,+ NavRailGroup,NavRailLink,+ useMode,useShortcutKeyMap} from "@carbon/react";import { useLingui } from "@lingui/react/macro";import { Suspense, useMemo } from "react";+import { BsFillHexagonFill } from "react-icons/bs";import {LuActivity,LuCalendarDays,@@ -23,7 +26,7 @@ import { Await, useLocation, useNavigate } from "react-router";import type { Location } from "~/services/types";import { MES_NAV_SHORTCUTS } from "~/shortcuts";import type { PinnedInUser } from "~/types";-import { path } from "~/utils/path";+import { ERP_URL, path } from "~/utils/path";import { AdjustInventory } from "./AdjustInventory";import { EndShift } from "./EndShift";import Suggestion from "./Suggestion";@@ -57,8 +60,11 @@ export function AppSidebar({data: { id: string; clockIn: string; [key: string]: unknown } | null;}> | null;}) {+ const { t } = useLingui();+return (<NavRail+ header={<CompanyLink company={company} />}footer={<>{timeCardEnabled && (@@ -91,22 +97,47 @@ export function AppSidebar({</>}>- <QueueLinks- counts={{- active: activeEvents,- maintenance: activeMaintenanceCount- }}- />- <NavRailDivider />- <AdjustInventory add={true} />- <AdjustInventory add={false} />- <EndShift />- <Suggestion />- <DisplaysLink />+ <NavRailGroup label={t`Operations`}>+ <QueueLinks+ counts={{+ active: activeEvents,+ maintenance: activeMaintenanceCount+ }}+ />+ </NavRailGroup>+ <NavRailGroup label={t`Inventory Adjustments`}>+ <AdjustInventory add={true} />+ <AdjustInventory add={false} />+ </NavRailGroup>+ <NavRailGroup label={t`Tools`}>+ <EndShift />+ <Suggestion />+ <DisplaysLink />+ </NavRailGroup></NavRail>);}+/** Leads back to the ERP. */+function CompanyLink({ company }: { company: Company }) {+ const mode = useMode();+ const logo = mode === "dark" ? company.logoDarkIcon : company.logoLightIcon;++ return (+ <NavRailBrand+ href={ERP_URL}+ label={company.name ?? ""}+ logo={+ logo ? (+ <img src={logo} alt="" className="size-6 rounded object-contain" />+ ) : (+ <BsFillHexagonFill />+ )+ }+ />+ );+}+type QueueKey = keyof typeof MES_NAV_SHORTCUTS;/** The task queues, in rail order; each one's ⌥-digit comes from its key. */diff --git a/apps/mes/app/components/TimeCardButton.tsx b/apps/mes/app/components/TimeCardButton.tsxindex d073e6e6e8..5f472c2fc4 100644--- a/apps/mes/app/components/TimeCardButton.tsx+++ b/apps/mes/app/components/TimeCardButton.tsx@@ -65,7 +65,10 @@ export function TimeCardButton({ openClockEntry }: TimeCardButtonProps) {disabled={fetcher.state !== "idle"}trailing={openClockEntry && (- <Badge variant="red">+ <Badge+ variant="red"+ className="min-h-5 px-1 text-[10px] tabular-nums"+ >{formatElapsed(openClockEntry.clockIn)}</Badge>)diff --git a/packages/locale/locales/de/mes.po b/packages/locale/locales/de/mes.poindex 067e286f03..eae21ae801 100644--- a/packages/locale/locales/de/mes.po+++ b/packages/locale/locales/de/mes.po@@ -703,6 +703,9 @@ msgstr "Unzureichende Menge"msgid "Inventory adjustment completed"msgstr "Bestandskorrektur abgeschlossen"+msgid "Inventory Adjustments"+msgstr "Bestandskorrekturen"+msgid "is"msgstr "ist"@@ -1105,6 +1108,9 @@ msgstr "Öffnen Sie einen NCR für MRB-Verwendungsentscheid"msgid "Open Jobs"msgstr "Offene Fertigungsaufträge"+msgid "Operations"+msgstr "Arbeitsgänge"+msgid "Operations ended"msgstr "Arbeitsgänge beendet"@@ -1678,6 +1684,9 @@ msgstr "Heute"msgid "Toggle the sidebar"msgstr "Seitenleiste ein-/ausblenden"+msgid "Tools"+msgstr "Werkzeuge"+msgid "Total"msgstr "Gesamtbetrag"diff --git a/packages/locale/locales/en/mes.po b/packages/locale/locales/en/mes.poindex c9dc98e060..aa94a3742b 100644--- a/packages/locale/locales/en/mes.po+++ b/packages/locale/locales/en/mes.po@@ -703,6 +703,9 @@ msgstr "Insufficient quantity"msgid "Inventory adjustment completed"msgstr "Inventory adjustment completed"+msgid "Inventory Adjustments"+msgstr "Inventory Adjustments"+msgid "is"msgstr "is"@@ -1105,6 +1108,9 @@ msgstr "Open an NCR for MRB disposition"msgid "Open Jobs"msgstr "Open Jobs"+msgid "Operations"+msgstr "Operations"+msgid "Operations ended"msgstr "Operations ended"@@ -1678,6 +1684,9 @@ msgstr "Today"msgid "Toggle the sidebar"msgstr "Toggle the sidebar"+msgid "Tools"+msgstr "Tools"+msgid "Total"msgstr "Total"diff --git a/packages/locale/locales/es/mes.po b/packages/locale/locales/es/mes.poindex 845cc03967..be1e5804bf 100644--- a/packages/locale/locales/es/mes.po+++ b/packages/locale/locales/es/mes.po@@ -703,6 +703,9 @@ msgstr "Cantidad insuficiente"msgid "Inventory adjustment completed"msgstr "Ajuste de inventario completado"+msgid "Inventory Adjustments"+msgstr "Ajustes de inventario"+msgid "is"msgstr "es"@@ -1105,6 +1108,9 @@ msgstr "Abrir un NCR para la disposición de MRB"msgid "Open Jobs"msgstr "Órdenes de trabajo abiertas"+msgid "Operations"+msgstr "Operaciones"+msgid "Operations ended"msgstr "Operaciones finalizadas"@@ -1678,6 +1684,9 @@ msgstr "Hoy"msgid "Toggle the sidebar"msgstr "Alternar la barra lateral"+msgid "Tools"+msgstr "Herramientas"+msgid "Total"msgstr "Total"diff --git a/packages/locale/locales/fr/mes.po b/packages/locale/locales/fr/mes.poindex b125dc499d..4903a0cf27 100644--- a/packages/locale/locales/fr/mes.po+++ b/packages/locale/locales/fr/mes.po@@ -703,6 +703,9 @@ msgstr "Quantité insuffisante"msgid "Inventory adjustment completed"msgstr "Ajustement de stock terminé"+msgid "Inventory Adjustments"+msgstr "Ajustements de stock"+msgid "is"msgstr "est"@@ -1105,6 +1108,9 @@ msgstr "Ouvrir une NCR pour le traitement du MRB"msgid "Open Jobs"msgstr "Ordres de fabrication ouverts"+msgid "Operations"+msgstr "Opérations"+msgid "Operations ended"msgstr "Opérations terminées"@@ -1678,6 +1684,9 @@ msgstr "Aujourd'hui"msgid "Toggle the sidebar"msgstr "Afficher/masquer la barre latérale"+msgid "Tools"+msgstr "Outils"+msgid "Total"msgstr "Total"diff --git a/packages/locale/locales/hi/mes.po b/packages/locale/locales/hi/mes.poindex de15dbf5ca..ae230599db 100644--- a/packages/locale/locales/hi/mes.po+++ b/packages/locale/locales/hi/mes.po@@ -703,6 +703,9 @@ msgstr "अपर्याप्त मात्रा"msgid "Inventory adjustment completed"msgstr "इन्वेंटरी समायोजन पूर्ण हुआ"+msgid "Inventory Adjustments"+msgstr "इन्वेंटरी समायोजन"+msgid "is"msgstr "है"@@ -1105,6 +1108,9 @@ msgstr "MRB निपटान के लिए एक NCR खोलें"msgid "Open Jobs"msgstr "खुली जॉब्स"+msgid "Operations"+msgstr "ऑपरेशन"+msgid "Operations ended"msgstr "ऑपरेशन समाप्त"@@ -1678,6 +1684,9 @@ msgstr "आज"msgid "Toggle the sidebar"msgstr "साइडबार को टॉगल करें"+msgid "Tools"+msgstr "उपकरण"+msgid "Total"msgstr "कुल"diff --git a/packages/locale/locales/it/mes.po b/packages/locale/locales/it/mes.poindex a9584c800c..441b549872 100644--- a/packages/locale/locales/it/mes.po+++ b/packages/locale/locales/it/mes.po@@ -703,6 +703,9 @@ msgstr "Quantità insufficiente"msgid "Inventory adjustment completed"msgstr "Rettifica di magazzino completata"+msgid "Inventory Adjustments"+msgstr "Rettifiche di magazzino"+msgid "is"msgstr "è"@@ -1105,6 +1108,9 @@ msgstr "Apri un NCR per la disposizione MRB"msgid "Open Jobs"msgstr "Ordini di produzione aperti"+msgid "Operations"+msgstr "Operazioni"+msgid "Operations ended"msgstr "Operazioni terminate"@@ -1678,6 +1684,9 @@ msgstr "Oggi"msgid "Toggle the sidebar"msgstr "Attiva/disattiva la barra laterale"+msgid "Tools"+msgstr "Utensili"+msgid "Total"msgstr "Totale"diff --git a/packages/locale/locales/ja/mes.po b/packages/locale/locales/ja/mes.poindex 0ea8573413..3da41e6bf8 100644--- a/packages/locale/locales/ja/mes.po+++ b/packages/locale/locales/ja/mes.po@@ -703,6 +703,9 @@ msgstr "数量が不足しています"msgid "Inventory adjustment completed"msgstr "在庫調整が完了しました"+msgid "Inventory Adjustments"+msgstr "在庫調整"+msgid "is"msgstr "が次と等しい"@@ -1105,6 +1108,9 @@ msgstr "MRB処置のためにNCRを開く"msgid "Open Jobs"msgstr "オープンな製造指図"+msgid "Operations"+msgstr "工程"+msgid "Operations ended"msgstr "工程が終了しました"@@ -1678,6 +1684,9 @@ msgstr "今日"msgid "Toggle the sidebar"msgstr "サイドバーの表示/非表示を切り替える"+msgid "Tools"+msgstr "工具"+msgid "Total"msgstr "合計"diff --git a/packages/locale/locales/ko/mes.po b/packages/locale/locales/ko/mes.poindex c6156a594d..d61cf9571b 100644--- a/packages/locale/locales/ko/mes.po+++ b/packages/locale/locales/ko/mes.po@@ -703,6 +703,9 @@ msgstr "수량 부족"msgid "Inventory adjustment completed"msgstr "재고 조정이 완료되었습니다"+msgid "Inventory Adjustments"+msgstr "재고 조정"+msgid "is"msgstr "같음"@@ -1105,6 +1108,9 @@ msgstr "MRB 처분 결정을 위해 NCR을 여세요"msgid "Open Jobs"msgstr "작업 지시 열기"+msgid "Operations"+msgstr "공정작업"+msgid "Operations ended"msgstr "공정작업 종료됨"@@ -1678,6 +1684,9 @@ msgstr "오늘"msgid "Toggle the sidebar"msgstr "사이드바 전환"+msgid "Tools"+msgstr "공구"+msgid "Total"msgstr "총계"diff --git a/packages/locale/locales/pl/mes.po b/packages/locale/locales/pl/mes.poindex 242fb0f73d..40aabb7c99 100644--- a/packages/locale/locales/pl/mes.po+++ b/packages/locale/locales/pl/mes.po@@ -703,6 +703,9 @@ msgstr "Niewystarczająca ilość"msgid "Inventory adjustment completed"msgstr "Korekta zapasów zakończona"+msgid "Inventory Adjustments"+msgstr "Korekty zapasów"+msgid "is"msgstr "jest"@@ -1105,6 +1108,9 @@ msgstr "Otwórz NCR dla dyspozycji MRB"msgid "Open Jobs"msgstr "Otwarte zlecenia produkcyjne"+msgid "Operations"+msgstr "Operacje"+msgid "Operations ended"msgstr "Operacje zakończone"@@ -1678,6 +1684,9 @@ msgstr "Dzisiaj"msgid "Toggle the sidebar"msgstr "Przełącz pasek boczny"+msgid "Tools"+msgstr "Narzędzia"+msgid "Total"msgstr "Suma"diff --git a/packages/locale/locales/pt/mes.po b/packages/locale/locales/pt/mes.poindex 18a6aa82b4..a7c992543f 100644--- a/packages/locale/locales/pt/mes.po+++ b/packages/locale/locales/pt/mes.po@@ -703,6 +703,9 @@ msgstr "Quantidade insuficiente"msgid "Inventory adjustment completed"msgstr "Ajuste de estoque concluído"+msgid "Inventory Adjustments"+msgstr "Ajustes de Estoque"+msgid "is"msgstr "é"@@ -1105,6 +1108,9 @@ msgstr "Abrir um NCR para disposição MRB"msgid "Open Jobs"msgstr "Ordens de produção abertas"+msgid "Operations"+msgstr "Operações"+msgid "Operations ended"msgstr "Operações encerradas"@@ -1678,6 +1684,9 @@ msgstr "Hoje"msgid "Toggle the sidebar"msgstr "Alternar barra lateral"+msgid "Tools"+msgstr "Ferramentas"+msgid "Total"msgstr "Total"diff --git a/packages/locale/locales/ru/mes.po b/packages/locale/locales/ru/mes.poindex bfea764a71..aa7b6b669d 100644--- a/packages/locale/locales/ru/mes.po+++ b/packages/locale/locales/ru/mes.po@@ -703,6 +703,9 @@ msgstr "Недостаточное количество"msgid "Inventory adjustment completed"msgstr "Корректировка запасов выполнена"+msgid "Inventory Adjustments"+msgstr "Корректировка запасов"+msgid "is"msgstr "равно"@@ -1105,6 +1108,9 @@ msgstr "Открыть NCR для решения MRB"msgid "Open Jobs"msgstr "Открытые производственные заказы"+msgid "Operations"+msgstr "Операции"+msgid "Operations ended"msgstr "Операции завершены"@@ -1678,6 +1684,9 @@ msgstr "Сегодня"msgid "Toggle the sidebar"msgstr "Открыть/закрыть боковую панель"+msgid "Tools"+msgstr "Инструменты"+msgid "Total"msgstr "Итого"diff --git a/packages/locale/locales/tr/mes.po b/packages/locale/locales/tr/mes.poindex 4bd2f4415b..e2c4579872 100644--- a/packages/locale/locales/tr/mes.po+++ b/packages/locale/locales/tr/mes.po@@ -703,6 +703,9 @@ msgstr "Yetersiz miktar"msgid "Inventory adjustment completed"msgstr "Stok düzeltme tamamlandı"+msgid "Inventory Adjustments"+msgstr "Stok düzeltmeleri"+msgid "is"msgstr "eşittir"@@ -1105,6 +1108,9 @@ msgstr "MRB kararı için NCR aç"msgid "Open Jobs"msgstr "Açık İş emirleri"+msgid "Operations"+msgstr "Operasyonlar"+msgid "Operations ended"msgstr "Operasyonlar bitti"@@ -1678,6 +1684,9 @@ msgstr "Bugün"msgid "Toggle the sidebar"msgstr "Kenar çubuğunu aç/kapat"+msgid "Tools"+msgstr "Araçlar"+msgid "Total"msgstr "Toplam"diff --git a/packages/locale/locales/zh/mes.po b/packages/locale/locales/zh/mes.poindex 0383a977d2..2507ed7c75 100644--- a/packages/locale/locales/zh/mes.po+++ b/packages/locale/locales/zh/mes.po@@ -703,6 +703,9 @@ msgstr "数量不足"msgid "Inventory adjustment completed"msgstr "库存调整已完成"+msgid "Inventory Adjustments"+msgstr "库存调整"+msgid "is"msgstr "是"@@ -1105,6 +1108,9 @@ msgstr "为MRB处置打开NCR"msgid "Open Jobs"msgstr "未结工单"+msgid "Operations"+msgstr "工序"+msgid "Operations ended"msgstr "工序已结束"@@ -1678,6 +1684,9 @@ msgstr "今天"msgid "Toggle the sidebar"msgstr "切换侧栏"+msgid "Tools"+msgstr "工具"+msgid "Total"msgstr "总计"diff --git a/packages/react/AGENTS.md b/packages/react/AGENTS.mdindex 5b37816280..f7a613c2a5 100644--- a/packages/react/AGENTS.md+++ b/packages/react/AGENTS.md@@ -41,7 +41,7 @@ import { Button, Card, HStack, VStack, IconButton, cn } from "@carbon/react";- **Choice screens**: `ChoiceCardGroup` (card radios, `autoFocus` focuses the selected card) and `RadioGroupButton` (radio styled as a secondary Button) give one tab stop + arrow-key select; Enter stays free for the screen's continue action- **Layout**: `VStack` / `HStack` with numeric `spacing` prop (maps to `space-y-*`/`space-x-*`)- **Overlays**: `Drawer`, `Modal`, `ModalDrawer` (unified drawer/modal), `BottomSheet`, `Popover`-- **App nav**: `NavRail` is the primary left nav of both the ERP and MES shells (56px icon rail, expands on mouse hover or when pinned via `SidebarProvider`/⌘B, left drawer below md that closes itself on navigation). Entries are `NavRailItem` (a button, or `asChild` for a trigger/link) and `NavRailLink`; `label` is a string and doubles as the accessible name. Render inside `SidebarProvider`; the shadcn-style `Sidebar*` primitives remain for other layouts+- **App nav**: `NavRail` is the primary left nav of both the ERP and MES shells (56px icon rail, expands after a 150ms mouse hover or when pinned via `SidebarProvider`/⌘B, left drawer below md that closes itself on navigation). Optional `header` (use `NavRailBrand` for a logo + name) and `footer` slots; `NavRailGroup` adds a titled section that shows as a divider while collapsed. Entries are `NavRailItem` (a button, or `asChild` for a trigger/link) and `NavRailLink`; `label` is a string and doubles as the accessible name. A Radix menu/popover opened from a `NavRailItem` holds the rail expanded until it closes. Render inside `SidebarProvider`; the shadcn-style `Sidebar*` primitives remain for other layouts- **Data**: `Table` (TanStack), chart components via sub-exports (`@carbon/react/Chart`)- **Rich text**: `@carbon/react/Editor` and `@carbon/react/RichText` (wraps `@carbon/tiptap`)- **Error boundary**: `@carbon/react/ErrorBoundary` — `RootErrorBoundary` (drop-in root `ErrorBoundary` for RR v7 that maps 404 / other HTTP / thrown `Error` to a styled screen) plus its parts (`ErrorScreen`, `GlitchHeading`, `StatusReadout`, `MagneticLink`, `NoiseOverlay`). Wrap it in the app's `Document` and pass `env` so `window.env` is set (the client crashes hydration otherwise). Copy is intentionally hardcoded English, not i18n.diff --git a/packages/react/src/NavRail.tsx b/packages/react/src/NavRail.tsxindex 34c202763e..57d0f07970 100644--- a/packages/react/src/NavRail.tsx+++ b/packages/react/src/NavRail.tsx@@ -3,7 +3,15 @@import { Trans } from "@lingui/react/macro";import { Slot, Slottable } from "@radix-ui/react-slot";import type { ButtonHTMLAttributes, ReactNode } from "react";-import { forwardRef, useEffect, useState } from "react";+import {+ createContext,+ forwardRef,+ useCallback,+ useContext,+ useEffect,+ useRef,+ useState+} from "react";import type { LinkProps } from "react-router";import { Link, useLocation } from "react-router";import { Drawer, DrawerContent, DrawerTitle } from "./Drawer";@@ -12,6 +20,11 @@ import { useSidebar } from "./Sidebar";import { cn } from "./utils/cn";import { VStack } from "./VStack";+const focusRingClasses = [+ "focus:!outline-none focus:!ring-0 active:!outline-none active:!ring-0",+ "after:pointer-events-none after:absolute after:-inset-[3px] after:rounded-lg after:border after:border-blue-500 after:opacity-0 after:ring-2 after:ring-blue-500/20 after:transition-opacity focus-visible:after:opacity-100 active:after:opacity-0"+];+export const navRailItemClasses = ["relative text-foreground/70 hover:text-foreground","h-10 w-10 group-data-[state=expanded]:w-full",@@ -21,8 +34,7 @@ export const navRailItemClasses = ["font-medium shrink-0 inline-flex items-center justify-center select-none","disabled:opacity-50","transition-[background-color,color,width] duration-100 ease-out",- "focus:!outline-none focus:!ring-0 active:!outline-none active:!ring-0",- "after:pointer-events-none after:absolute after:-inset-[3px] after:rounded-lg after:border after:border-blue-500 after:opacity-0 after:ring-2 after:ring-blue-500/20 after:transition-opacity focus-visible:after:opacity-100 active:after:opacity-0",+ focusRingClasses,"group/item"];@@ -32,13 +44,21 @@ export const navRailItemClasses = [* open (⌘B / a `SidebarTrigger`), and a left drawer below `md`. Open state* comes from `SidebarProvider`, so it must be rendered inside one.*/+// A pointer only passing over the rail (on its way to the page) shouldn't open it.+const HOVER_OPEN_DELAY_MS = 150;++// Lets an item keep the rail open while a menu or popover it triggered is open.+const NavRailHoldContext = createContext<(() => () => void) | null>(null);+export function NavRail({children,+ header,footer,forceExpanded = false,disableHover = false}: {children: ReactNode;+ header?: ReactNode;footer?: ReactNode;/** Hold the rail open regardless of hover or pin (e.g. while rearranging). */forceExpanded?: boolean;@@ -48,6 +68,18 @@ export function NavRail({const { open, isMobile, openMobile, setOpenMobile } = useSidebar();const { pathname } = useLocation();const [hovered, setHovered] = useState(false);+ const navRef = useRef<HTMLElement>(null);+ const openTimer = useRef<ReturnType<typeof setTimeout>>();+ const cancelHoverOpen = useCallback(() => {+ clearTimeout(openTimer.current);+ openTimer.current = undefined;+ }, []);+ useEffect(() => cancelHoverOpen, [cancelHoverOpen]);+ const [holds, setHolds] = useState(0);+ const hold = useCallback(() => {+ setHolds((n) => n + 1);+ return () => setHolds((n) => n - 1);+ }, []);// Links, go-to shortcuts and redirects all land here: whatever navigated,// the phone drawer must not stay over the destination.@@ -56,21 +88,34 @@ export function NavRail({setOpenMobile(false);}, [pathname, setOpenMobile]);- // A Radix dialog toggles document.body pointer-events, and restoring them on- // close fires a phantom enter on the rail with no paired leave — leaving it- // stuck expanded. So hover is ignored while `disableHover` is set and cleared- // on the frame after it changes (after any phantom event has fired).- // biome-ignore lint/correctness/useExhaustiveDependencies: keyed on the toggle+ // A Radix dialog or menu sets pointer-events: none on document.body while+ // open, which fires a leave on the rail as it opens and a phantom enter as+ // it closes, so pointer events are ignored while blocked. A modal (search)+ // collapses the rail; a menu opened from the rail keeps it as it was. When+ // the block lifts, hover is re-read from where the pointer really is.+ const hoverBlocked = disableHover || holds > 0;useEffect(() => {- const raf = requestAnimationFrame(() => setHovered(false));- return () => cancelAnimationFrame(raf);+ if (disableHover) setHovered(false);}, [disableHover]);+ useEffect(() => {+ cancelHoverOpen();+ if (hoverBlocked) return;+ const raf = requestAnimationFrame(() =>+ setHovered(navRef.current?.matches(":hover") ?? false)+ );+ return () => cancelAnimationFrame(raf);+ }, [hoverBlocked, cancelHoverOpen]);const content = (- <VStack spacing={1} className="flex flex-col justify-between h-full px-2">- <VStack spacing={1}>{children}</VStack>- {footer ? <VStack spacing={1}>{footer}</VStack> : null}- </VStack>+ <NavRailHoldContext.Provider value={hold}>+ <VStack spacing={1} className="flex flex-col justify-between h-full px-2">+ <VStack spacing={1}>+ {header ? <div className="w-full pb-2">{header}</div> : null}+ {children}+ </VStack>+ {footer ? <VStack spacing={1}>{footer}</VStack> : null}+ </VStack>+ </NavRailHoldContext.Provider>);if (isMobile) {@@ -95,7 +140,8 @@ export function NavRail({);}- const state = forceExpanded || open || hovered ? "expanded" : "collapsed";+ const state =+ forceExpanded || open || hovered || holds > 0 ? "expanded" : "collapsed";return (// The wrapper (not just the inner nav) grows on expand, so the rail pushes@@ -110,18 +156,29 @@ export function NavRail({)}><nav+ ref={navRef}data-state={state}className={cn("bg-background py-2 group z-10 h-full w-full","flex flex-col justify-between","hide-scrollbar overflow-y-auto scrollbar-thin scrollbar-track-transparent scrollbar-thumb-accent")}- onPointerEnter={(event) => {- // Mouse only: a tap on a touch tablet must not expand the rail.- if (!disableHover && event.pointerType === "mouse") setHovered(true);+ // Mouse only: a tap on a touch tablet must not expand the rail.+ onPointerMove={(event) => {+ if (hoverBlocked || hovered || openTimer.current) return;+ if (event.pointerType !== "mouse") return;+ openTimer.current = setTimeout(() => {+ openTimer.current = undefined;+ setHovered(true);+ }, HOVER_OPEN_DELAY_MS);}}onPointerLeave={(event) => {- if (event.pointerType === "mouse") setHovered(false);+ if (hoverBlocked || event.pointerType !== "mouse") return;+ // The leave a Radix layer causes by disabling body pointer-events+ // can arrive before this render knows about the hold.+ if (document.body.style.pointerEvents === "none") return;+ cancelHoverOpen();+ setHovered(false);}}>{content}@@ -166,6 +223,14 @@ export const NavRailItem = forwardRef<HTMLButtonElement, NavRailItemProps>() => {const Comp = asChild ? Slot : "button";+ // Radix triggers (menus, popovers) pass their open state as `data-state`.+ const isTriggerOpen =+ (props as Record<string, unknown>)["data-state"] === "open";+ const hold = useContext(NavRailHoldContext);+ useEffect(() => {+ if (isTriggerOpen && hold) return hold();+ }, [isTriggerOpen, hold]);+return (<Compref={ref}@@ -190,26 +255,27 @@ export const NavRailItem = forwardRef<HTMLButtonElement, NavRailItemProps>({tag}</span>) : null}+ {/* Label and trailing share one row so a long label truncates+ before the trailing content instead of running under it. */}<span- aria-hiddenclassName={cn(- "min-w-[128px] text-sm text-left",- "absolute left-7 group-data-[state=expanded]:left-12",+ "absolute left-7 right-3 min-w-32 group-data-[state=expanded]:left-12",+ "flex items-center gap-2","opacity-0 group-data-[state=expanded]:opacity-100")}>- {label}- </span>- {trailing ? (<span- className={cn(- "pointer-events-none absolute right-3 top-1/2 -translate-y-1/2",- "opacity-0 transition-opacity duration-100 group-data-[state=expanded]:opacity-100"- )}+ aria-hidden+ className="min-w-0 flex-1 truncate text-sm text-left">- {trailing}+ {label}</span>- ) : null}+ {trailing ? (+ <span className="pointer-events-none flex shrink-0 items-center">+ {trailing}+ </span>+ ) : null}+ </span><Slottable>{children}</Slottable></Comp>);@@ -255,6 +321,64 @@ export function NavRailLink({);}+/** For `header`: the logo sits in the icon column, the name has equal margins. */+export function NavRailBrand({+ href,+ logo,+ label+}: {+ href: string;+ logo: ReactNode;+ label: string;+}) {+ return (+ <a+ href={href}+ aria-label={label}+ className={cn(+ "relative flex h-10 w-full items-center gap-2 rounded-md px-2",+ "text-sm font-medium text-foreground select-none",+ "transition-[background-color] duration-100 ease-out hover:bg-active/60",+ focusRingClasses+ )}+ >+ <span className="flex size-6 shrink-0 items-center justify-center [&>svg]:size-4">+ {logo}+ </span>+ <span+ aria-hidden+ className="min-w-0 flex-1 truncate opacity-0 transition-opacity duration-200 group-data-[state=expanded]:opacity-100"+ >+ {label}+ </span>+ </a>+ );+}++/** A titled section; collapsed, its title turns into a divider. */+export function NavRailGroup({+ label,+ children+}: {+ label: string;+ children: ReactNode;+}) {+ return (+ <VStack spacing={1}>+ <div className="relative h-7 w-full shrink-0">+ <span+ aria-hidden+ className="absolute inset-x-0 top-1/2 mx-auto h-px w-6 bg-border opacity-100 transition-opacity duration-200 group-data-[state=expanded]:opacity-0"+ />+ <span className="absolute inset-0 flex items-center px-2 text-[11px] font-medium uppercase tracking-wider text-foreground/50 whitespace-nowrap opacity-0 transition-opacity duration-200 group-data-[state=expanded]:opacity-100">+ {label}+ </span>+ </div>+ {children}+ </VStack>+ );+}+export function NavRailDivider() {return (<Separator className="my-1 mx-auto w-6 group-data-[state=expanded]:w-full transition-[width] duration-200" />diff --git a/packages/react/src/index.tsx b/packages/react/src/index.tsxindex 709d2da7dd..476be45151 100644--- a/packages/react/src/index.tsx+++ b/packages/react/src/index.tsx@@ -241,7 +241,9 @@ import type { MultiSelectProps } from "./MultiSelect";import { MultiSelect } from "./MultiSelect";import {NavRail,+ NavRailBrand,NavRailDivider,+ NavRailGroup,NavRailItem,NavRailLink,navRailItemClasses@@ -554,7 +556,9 @@ export {NumberField,NumberIncrementStepper,NavRail,+ NavRailBrand,NavRailDivider,+ NavRailGroup,NavRailItem,NavRailLink,navRailItemClasses,