@vvedantb/ui 0.7.0 → 0.7.1

package/README.md

@@ -299,7 +299,7 @@ import {
 - `SidebarPanel`: legacy (still supported) `headerTrailing`, `onClose`, `closeLabel` and `closeButtonClassName`; compose `Sidebar.Panel` parts instead. `title`, `headerTrailing`, `onClose` (adds the close button; pass it on the mobile drawer only), `closeLabel`, `closeButtonClassName`, `collapsed` (`md:hidden`), `className`, `children`.
 - `SidebarAccountMenu`: legacy (still supported) `badge`, `triggerProps`, `contentProps` and `stackedLabel`; compose `Sidebar.Account*` parts instead. `name`, `email` (two-line label when set), `stackedLabel` (two-line layout even without `email`, default `false`), `imageUrl` (initials without it), `align` (`"center"`), `side` (`"right"`), `sideOffset` (8), `collisionPadding`, `contentClassName`, `children` (menu items). 0.5.2 adds `badge` (unread dot beside the trigger, in a `relative` wrapper around the menu, so the trigger's dimming and press scale skip it: `true` shows it, `false` fades it out, omitted renders no wrapper and no dot), `triggerProps` (spread onto the trigger `Button` after the defaults; `className` merges last) and `contentProps` (spread onto `DropdownMenuContent`, for example `fitViewport` or `aria-label`; no `className`, use `contentClassName`). `SidebarAccountMenuPlaceholder` is the tile-sized loading box.
 - `SignOutDialog`: legacy (still supported) `question` and `title`; compose `ConfirmDialog` parts with `alert={false}` for other copy. `open`, `onOpenChange` (not called with `false` while `pending`), `pending`, `onConfirm`, `description`, `contentClassName`, `title` (`"Sign out"`), `question` (`"Sign out of your account?"`).
-- Class helpers: `railTileClass`, `railTileStateClass(active)`, `railBadgeClass`, `sidebarNavRowClass(isIconOnly)`, `sidebarNavLinkTextClass(isActive)`, `sidebarSectionLabelClass`.
+- Class helpers: `railTileClass`, `railTileStateClass(active)`, `railBadgeClass`, `sidebarNavRowClass(isIconOnly)`, `sidebarNavLinkTextClass(isActive)`, `sidebarNavItemClass({ active, iconOnly })`, `sidebarNavIconClass(active)`, `sidebarSectionLabelClass`. See [Menu item corners and sidebar nav rows (0.7.1)](#menu-item-corners-and-sidebar-nav-rows-071).
 
 ### Header actions and account badge (0.5.2)
 
@@ -434,6 +434,7 @@ Convention: compound parts are static members of a namespace object, `<Namespace
 | `PanelHeader` | Padded header row for `PanelTitle` and `PanelActions`. |
 | `PanelTitle` / `PanelActions` | The `<h2>` and the trailing actions. |
 | `PanelClose` | Ghost close button. `label` (`"Close navigation"`). Without `onClick` it closes the drawer. |
+| `NavItem` | Panel nav row (`sidebarNavItemClass`). `active` (fill, `font-medium`, `aria-current="page"`), `iconOnly`, `icon` (element; gets `sidebarNavIconClass`), `asChild` for a router link. A `<button type="button">` without `asChild`. |
 | `AccountMenu` | Dropdown root. `badge` adds the unread dot (`AccountBadge`) in a `relative` wrapper. |
 | `AccountTrigger` | Rail-tile-sized avatar button. `userName` (default `title` and `aria-label`, and the initials), `imageUrl`, plus `Button` props; native `name` goes to the button. |
 | `AccountAvatar` | Avatar image or initials. `userName`, `imageUrl`. |
@@ -618,6 +619,86 @@ import {
 - `Badge` `variant="destructive-soft"`: neutral border with a faint danger tint (`border-border bg-danger/10 text-danger`). Resolves to the same classes as a default badge with `className="bg-danger/10 text-danger"`. `variant="success"` already resolves to the same classes as a default badge with `className="border-success/25 bg-success/12 text-success"`.
 - `Kbd` `variant="subtle"`: a plain filled key for inline hints, `rounded bg-surface-secondary px-1.5 py-0.5 text-foreground`. No fixed height, font or size, so it follows the surrounding text.
 
+## Menu item corners and sidebar nav rows (0.7.1)
+
+Visual change. Values in brackets are at the default `--radius: 1rem` and `--spacing: 0.25rem`.
+
+The radius utilities now come with `tokens.css` (and `compat-shadcn-rgb.css`), so an app that imports `@vvedantb/ui/tokens` has them without another import:
+
+| Utility | Value | Used by |
+| --- | --- | --- |
+| `rounded-surface` | `clamp(0.75rem, var(--radius), 1rem)` (16px) | Opt-in surfaces (Toaster `toastRadius="surface"`, `SessionsHoverCard`). Was in `utilities.css`. |
+| `rounded-menu-item` | `min(var(--radius), 0.5rem)` (8px) | Menu items and sidebar nav rows. |
+| `rounded-control` | `min(var(--radius), 0.625rem)` (10px) | Apps. |
+
+The root `cn` knows these are radius classes, so `cn("rounded-lg", "rounded-menu-item")` keeps only the last one.
+
+### Menu items
+
+| Piece | Before | From 0.7.1 |
+| --- | --- | --- |
+| `DropdownMenu` and `ContextMenu` item, sub-trigger, checkbox item and radio item | `rounded-md`, `calc(var(--radius) - 2px)` (14px) | `rounded-menu-item` (8px) |
+| Menu surface | `rounded-lg` (16px) | unchanged |
+
+### Sidebar panel nav rows
+
+Rows in the panel beside the rail. Rail tiles are unchanged.
+
+| Piece | Before | From 0.7.1 |
+| --- | --- | --- |
+| Radius | none in the helper (apps added `rounded-lg`, 16px) | `rounded-menu-item` (8px) |
+| Padding | `px-3 py-1.5` (12px / 6px) | `px-4 py-1.5` (16px / 6px) |
+| Icon gap | `gap-3` (12px) | `gap-2` (8px) |
+| Text | none in the helper (apps added `text-sm`, 14px / 20px) | `text-[0.8125rem] leading-[18px] tracking-[0.005em]` (13px / 18px) |
+| Row height | 32px with `text-sm` | 30px |
+| Width | none in the helper | `flex w-full items-center` |
+| Idle text | `text-muted`, `hover:text-foreground` | `font-normal text-foreground/80`, `hover:text-foreground` |
+| Active text | `text-foreground` | `font-medium text-foreground` |
+| Hover and active fill | none in the helper | `hover:bg-surface-tertiary` (idle rows), `bg-surface-tertiary` (active row), same radius |
+| Press | none | `active:scale-[0.99]`, `transition-[scale,background-color,color] duration-150 ease-smooth` |
+| Focus ring | none | `focus-visible:ring-2 focus-visible:ring-foreground/35`, no outline |
+| Icon-only row | `justify-center px-0 py-1.5` | same, plus the radius, text, fill and focus classes above |
+| Icon (`sidebarNavIconClass`) | none (apps used 18px in a 20px box) | `size-[19px] shrink-0`; `text-muted-foreground` idle, `text-foreground` active |
+| Section label | `px-3 py-1 text-[11px]` | `px-4 py-1 text-[11px] leading-4` (16px line). Colour still comes from the app's `.sidebar-section-label` rule. |
+
+The hover fill is static: it does not slide between rows. While another row is hovered, the active row keeps its fill.
+
+One call per row:
+
+```tsx
+<nav className="px-2">
+  <p className={sidebarSectionLabelClass}>Library</p>
+  <div className="space-y-1">
+    <Link to="/home" aria-current={active ? "page" : undefined} className={sidebarNavItemClass({ active, iconOnly })}>
+      <IconHome size={19} className={sidebarNavIconClass(active)} />
+      {iconOnly ? null : <span className="truncate">Home</span>}
+    </Link>
+  </div>
+</nav>
+```
+
+Or the part, with the router link as the child:
+
+```tsx
+<Sidebar.NavItem asChild active={active} iconOnly={iconOnly} icon={<IconHome />}>
+  <Link to="/home">{iconOnly ? null : <span className="truncate">Home</span>}</Link>
+</Sidebar.NavItem>
+```
+
+- `px-2` on the list is the panel inset: rows are full width inside it. `space-y-1` (4px) separates rows.
+- `sidebarNavRowClass(isIconOnly)` and `sidebarNavLinkTextClass(isActive)` now return the classes above, so existing calls change look. `sidebarNavItemClass` is the two merged.
+- Classes an app added beside the helpers, such as `rounded-lg text-sm font-medium tracking-normal transition-colors duration-200`, are now redundant. Through the root `cn` they lose to the helper when passed before it. Passed after it, or joined without `cn`, they override the new radius, size and weight. Remove them, and remove app-side active fills such as `bg-surface-tertiary`.
+
+Colour mapping. The package has no sidebar colour tokens, so the rows use the nearest general token:
+
+| Role | Reference look (light / dark, sRGB) | Package token (light / dark, sRGB) |
+| --- | --- | --- |
+| Hover and active fill | 233 234 236 / 28 28 28 | `surface-tertiary`: 234 234 234 / about 39 39 39. Light matches; dark is a step lighter. It is the rail tile's active fill too, so a rail tile and a nav row stay the same. |
+| Active text and icon | 9 9 11 / 250 250 250 | `foreground`: 24 24 24 / 252 252 252 |
+| Idle text (80%) | 24 24 25 / 251 252 253 | `foreground` at 80% |
+| Idle icon | 100 101 103 / 159 160 162 | `muted-foreground` (`--muted`): 114 114 114 / 160 160 160 |
+| Focus ring (35%) | 9 9 11 / 250 250 250 | `foreground` at 35% |
+
 ## Toaster
 
 ```tsx
@@ -643,7 +724,7 @@ Opt-in props (all default to the current look):
 
 | Prop | Values | Effect |
 | --- | --- | --- |
-| `toastRadius` | `"lg"` (default), `"surface"`, `"control"` | `rounded-lg`, `rounded-surface` (from `tokens/css/utilities.css`) or `rounded-field` (the input radius). |
+| `toastRadius` | `"lg"` (default), `"surface"`, `"control"` | `rounded-lg`, `rounded-surface` (from `tokens.css`, or the compat file) or `rounded-field` (the input radius). |
 | `density` | `"default"`, `"compact"` | Current padding and text, or `gap-2 px-3 py-2 text-xs` with `text-xs` descriptions. |
 | `toastIcons` | `"default"`, `"filled24"` | Sonner icons or 24px filled success, info, warning and error icons, a matching loader and a 14px close cross. |
 | `closeButtonStyle` | `"default"`, `"hoverChip"` | Text-style close button or a round chip at the top-right, shown on hover and always on small screens. It turns on `closeButton` unless you set it. |

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vvedantb/ui",
-  "version": "0.7.0",
+  "version": "0.7.1",
   "license": "MIT",
   "description": "Shared React 19 UI for web apps: one JavaScript entry (primitives, shell pieces, app helpers, native tokens), design-token CSS, shared Tailwind v4 CSS and a Tailwind preset.",
   "type": "module",

package/shell/src/Sidebar.tsx

@@ -9,7 +9,7 @@ import {
   AccountSeparator,
   AccountTrigger,
 } from "./SidebarAccountMenu";
-import { Panel, PanelActions, PanelClose, PanelHeader, PanelTitle } from "./SidebarPanel";
+import { NavItem, Panel, PanelActions, PanelClose, PanelHeader, PanelTitle } from "./SidebarPanel";
 import { Rail, RailBody, RailFooter, RailHeader, RailItem, RailSeparator } from "./SidebarRail";
 
 export type {
@@ -36,6 +36,7 @@ export type {
   SidebarPanelHeaderProps,
   SidebarPanelRootProps,
   SidebarPanelTitleProps,
+  SidebarNavItemProps,
 } from "./SidebarPanel";
 export type {
   SidebarAccountAvatarProps,
@@ -68,6 +69,7 @@ export const Sidebar = {
   PanelTitle,
   PanelActions,
   PanelClose,
+  NavItem,
   AccountMenu,
   AccountTrigger,
   AccountAvatar,

package/shell/src/SidebarPanel.tsx

@@ -1,8 +1,9 @@
-import type { ComponentPropsWithoutRef, ReactNode } from "react";
+import type { ComponentPropsWithoutRef, ReactElement, ReactNode } from "react";
+import { Slot, Slottable } from "@radix-ui/react-slot";
 import { IconX } from "@tabler/icons-react";
 import { Button, type ButtonProps } from "../../src/ui/button";
 import { cn } from "../../src/utils/cn";
-import { panelCloseButtonClass, sidebarHeaderRowClass } from "./app-shell-classes";
+import { panelCloseButtonClass, sidebarHeaderRowClass, sidebarNavIconClass, sidebarNavItemClass } from "./app-shell-classes";
 import { useOptionalSidebar } from "./SidebarChrome";
 
 export type SidebarPanelProps = {
@@ -131,3 +132,38 @@ export function PanelClose({ label = "Close navigation", onClick, className, chi
     </Button>
   );
 }
+
+export type SidebarNavItemProps = ComponentPropsWithoutRef<"button"> & {
+  /** Current route: static fill, `font-medium`, `aria-current="page"`. */
+  active?: boolean;
+  /** Collapsed panel: centred icon, no horizontal padding. */
+  iconOnly?: boolean;
+  /** Leading icon element; gets `sidebarNavIconClass(active)` merged onto it. */
+  icon?: ReactElement;
+  /** Render the single child element (for example a router link) as the row. */
+  asChild?: boolean;
+};
+
+/** Panel nav row (`sidebarNavItemClass`). Renders a native `<button>`, or its child with `asChild`. */
+export function NavItem({
+  active = false,
+  iconOnly = false,
+  icon,
+  asChild = false,
+  className,
+  children,
+  ...props
+}: SidebarNavItemProps) {
+  const Row = asChild ? Slot : "button";
+  return (
+    <Row
+      type={asChild ? undefined : "button"}
+      {...props}
+      aria-current={active ? "page" : undefined}
+      className={cn(sidebarNavItemClass({ active, iconOnly }), className)}
+    >
+      {icon ? <Slot className={sidebarNavIconClass(active)}>{icon}</Slot> : null}
+      <Slottable>{children}</Slottable>
+    </Row>
+  );
+}

package/shell/src/app-shell-classes.ts

@@ -19,18 +19,50 @@ export function railTileStateClass(active: boolean): string {
 /** Count badge pinned to the bottom-right of a rail tile. */
 export const railBadgeClass = "absolute -bottom-0.5 -right-0.5 flex h-4 min-w-4 items-center justify-center rounded-full bg-accent px-1 text-[10px] font-semibold leading-none text-accent-foreground"; // check-tokens-allow: accent
 
-/** Static section label, sentence case, padded to match nav rows. */
+/**
+ * Static section label above a group of panel nav rows. `px-4` lines the text
+ * up with the nav row icons; the colour comes from the app's
+ * `.sidebar-section-label` rule.
+ */
 export const sidebarSectionLabelClass =
-  "sidebar-section-label px-3 py-1 text-[11px] font-medium tracking-[-0.01em]";
+  "sidebar-section-label px-4 py-1 text-[11px] leading-4 font-medium tracking-[-0.01em]";
 
-/** Nav link text: muted until active. */
+/**
+ * Nav row state: idle rows are `foreground/80` and get the fill on hover;
+ * the active row is `font-medium text-foreground` on a static fill.
+ */
 export function sidebarNavLinkTextClass(isActive: boolean): string {
-  return cn(isActive ? "text-foreground" : "text-muted hover:text-foreground"); // check-tokens-allow: text-muted
+  return isActive
+    ? "bg-surface-tertiary font-medium text-foreground"
+    : "font-normal text-foreground/80 hover:bg-surface-tertiary hover:text-foreground";
 }
 
-/** Padding for main sidebar nav rows. */
+/**
+ * Panel nav row layout: full width, `rounded-menu-item` (8px), 13px / 18px
+ * text, focus ring and press scale. Icon-only rows centre the icon.
+ */
 export function sidebarNavRowClass(isIconOnly: boolean): string {
-  return cn(isIconOnly ? "justify-center px-0 py-1.5" : "gap-3 px-3 py-1.5");
+  return cn(
+    "group flex w-full items-center rounded-menu-item py-1.5 text-[0.8125rem] leading-[18px] tracking-[0.005em] transition-[scale,background-color,color] duration-150 ease-smooth active:scale-[0.99] focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-foreground/35",
+    isIconOnly ? "justify-center px-0" : "gap-2 px-4",
+  );
+}
+
+export type SidebarNavItemClassOptions = {
+  /** Current route. */
+  active?: boolean;
+  /** Collapsed panel: centred icon, no horizontal padding. */
+  iconOnly?: boolean;
+};
+
+/** Whole panel nav row: `sidebarNavRowClass` plus `sidebarNavLinkTextClass`. */
+export function sidebarNavItemClass({ active = false, iconOnly = false }: SidebarNavItemClassOptions = {}): string {
+  return cn(sidebarNavRowClass(iconOnly), sidebarNavLinkTextClass(active));
+}
+
+/** Nav row icon (put it on the `<svg>`): 19px, muted until active. */
+export function sidebarNavIconClass(active: boolean): string {
+  return cn("size-[19px] shrink-0", active ? "text-foreground" : "text-muted-foreground");
 }
 
 /** Sidebar header row: the panel title and its trailing actions. */

package/shell/src/index.ts

@@ -45,7 +45,10 @@ export {
   railBadgeClass,
   railTileClass,
   railTileStateClass,
+  sidebarNavIconClass,
+  sidebarNavItemClass,
   sidebarNavLinkTextClass,
   sidebarNavRowClass,
   sidebarSectionLabelClass,
 } from "./app-shell-classes.js";
+export type { SidebarNavItemClassOptions } from "./app-shell-classes.js";

package/src/index.ts

@@ -158,10 +158,13 @@ export {
   railBadgeClass,
   railTileClass,
   railTileStateClass,
+  sidebarNavIconClass,
+  sidebarNavItemClass,
   sidebarNavLinkTextClass,
   sidebarNavRowClass,
   sidebarSectionLabelClass,
 } from "../shell/src/app-shell-classes";
+export type { SidebarNavItemClassOptions } from "../shell/src/app-shell-classes";
 
 // App helpers: confirm skip, update watcher, settings chrome, stable auth.
 export * from "../app/src/index";

package/src/ui/_menu-classes.alt.ts

@@ -17,13 +17,13 @@ export const menuContentClass = [
 ].join(" ");
 
 export const menuSubTriggerClass =
-  "flex cursor-pointer select-none items-center gap-2 rounded-md px-2.5 py-2 text-sm text-foreground outline-hidden transition-[background-color,color,transform] duration-150 ease-out active:scale-[0.99] focus:bg-default focus:text-foreground data-highlighted:bg-default data-highlighted:text-foreground data-[state=open]:bg-default data-disabled:cursor-not-allowed [&_svg]:pointer-events-none [&_svg]:size-4 [&_svg]:shrink-0";
+  "flex cursor-pointer select-none items-center gap-2 rounded-menu-item px-2.5 py-2 text-sm text-foreground outline-hidden transition-[background-color,color,transform] duration-150 ease-out active:scale-[0.99] focus:bg-default focus:text-foreground data-highlighted:bg-default data-highlighted:text-foreground data-[state=open]:bg-default data-disabled:cursor-not-allowed [&_svg]:pointer-events-none [&_svg]:size-4 [&_svg]:shrink-0";
 
 export const menuItemClass =
-  "relative flex cursor-pointer select-none items-center gap-2 rounded-md px-2.5 py-2 text-sm outline-hidden transition-[background-color,color,transform] duration-150 ease-out active:scale-[0.99] focus:bg-default focus:text-foreground data-highlighted:bg-default data-highlighted:text-foreground data-disabled:pointer-events-none data-disabled:cursor-not-allowed data-disabled:opacity-50 [&>svg]:size-4 [&>svg]:shrink-0 [&_svg]:pointer-events-none";
+  "relative flex cursor-pointer select-none items-center gap-2 rounded-menu-item px-2.5 py-2 text-sm outline-hidden transition-[background-color,color,transform] duration-150 ease-out active:scale-[0.99] focus:bg-default focus:text-foreground data-highlighted:bg-default data-highlighted:text-foreground data-disabled:pointer-events-none data-disabled:cursor-not-allowed data-disabled:opacity-50 [&>svg]:size-4 [&>svg]:shrink-0 [&_svg]:pointer-events-none";
 
 export const menuCheckboxRadioItemClass =
-  "relative flex cursor-pointer select-none items-center rounded-md py-2 pl-8 pr-2.5 text-sm outline-hidden transition-[background-color,color,transform] duration-150 ease-out active:scale-[0.99] focus:bg-default focus:text-foreground data-highlighted:bg-default data-highlighted:text-foreground data-disabled:pointer-events-none data-disabled:cursor-not-allowed data-disabled:opacity-50";
+  "relative flex cursor-pointer select-none items-center rounded-menu-item py-2 pl-8 pr-2.5 text-sm outline-hidden transition-[background-color,color,transform] duration-150 ease-out active:scale-[0.99] focus:bg-default focus:text-foreground data-highlighted:bg-default data-highlighted:text-foreground data-disabled:pointer-events-none data-disabled:cursor-not-allowed data-disabled:opacity-50";
 
 export const menuLabelClass =
   "px-2.5 py-1.5 text-xs font-semibold uppercase tracking-widest text-muted-foreground";

package/src/ui/_menu-classes.ts

@@ -14,13 +14,13 @@ export const menuContentClass = [
 ].join(" ");
 
 export const menuSubTriggerClass =
-  "flex cursor-pointer select-none items-center gap-2 rounded-md px-2.5 py-2 max-sm:min-h-10 text-sm text-foreground outline-none transition-[background-color,color] focus:bg-default focus:text-foreground data-[highlighted]:bg-default data-[highlighted]:text-foreground data-[state=open]:bg-default data-[disabled]:cursor-not-allowed [&_svg]:pointer-events-none [&_svg]:size-4 [&_svg]:shrink-0";
+  "flex cursor-pointer select-none items-center gap-2 rounded-menu-item px-2.5 py-2 max-sm:min-h-10 text-sm text-foreground outline-none transition-[background-color,color] focus:bg-default focus:text-foreground data-[highlighted]:bg-default data-[highlighted]:text-foreground data-[state=open]:bg-default data-[disabled]:cursor-not-allowed [&_svg]:pointer-events-none [&_svg]:size-4 [&_svg]:shrink-0";
 
 export const menuItemClass =
-  "relative flex cursor-pointer select-none items-center gap-2 rounded-md px-2.5 py-2 max-sm:min-h-10 text-sm outline-none transition-[background-color,color] focus:bg-default focus:text-foreground data-[highlighted]:bg-default data-[highlighted]:text-foreground data-[disabled]:pointer-events-none data-[disabled]:cursor-not-allowed data-[disabled]:opacity-50 [&>svg]:size-4 [&>svg]:shrink-0 [&_svg]:pointer-events-none";
+  "relative flex cursor-pointer select-none items-center gap-2 rounded-menu-item px-2.5 py-2 max-sm:min-h-10 text-sm outline-none transition-[background-color,color] focus:bg-default focus:text-foreground data-[highlighted]:bg-default data-[highlighted]:text-foreground data-[disabled]:pointer-events-none data-[disabled]:cursor-not-allowed data-[disabled]:opacity-50 [&>svg]:size-4 [&>svg]:shrink-0 [&_svg]:pointer-events-none";
 
 export const menuCheckboxRadioItemClass =
-  "relative flex cursor-pointer select-none items-center rounded-md py-2 max-sm:min-h-10 pl-8 pr-2.5 text-sm outline-none transition-[background-color,color] focus:bg-default focus:text-foreground data-[highlighted]:bg-default data-[highlighted]:text-foreground data-[disabled]:pointer-events-none data-[disabled]:cursor-not-allowed data-[disabled]:opacity-50";
+  "relative flex cursor-pointer select-none items-center rounded-menu-item py-2 max-sm:min-h-10 pl-8 pr-2.5 text-sm outline-none transition-[background-color,color] focus:bg-default focus:text-foreground data-[highlighted]:bg-default data-[highlighted]:text-foreground data-[disabled]:pointer-events-none data-[disabled]:cursor-not-allowed data-[disabled]:opacity-50";
 
 export const menuLabelClass =
   "px-2.5 py-1.5 text-xs font-semibold uppercase tracking-widest text-muted-foreground";

package/src/utils/cn.ts

@@ -1,12 +1,14 @@
 import { type ClassValue, clsx } from "clsx";
 import { extendTailwindMerge } from "tailwind-merge";
 
-// `rounded-field` is a custom radius token — teach twMerge it conflicts with
-// `rounded-none` / `rounded-md` / etc. so Input overrides actually win.
+// `rounded-field` and the tokens.css radii (`rounded-surface`,
+// `rounded-menu-item`, `rounded-control`) are custom radius tokens — teach
+// twMerge they conflict with `rounded-none` / `rounded-md` / etc. so the last
+// radius class wins.
 const twMerge = extendTailwindMerge({
   extend: {
     theme: {
-      borderRadius: ["field"],
+      borderRadius: ["field", "surface", "menu-item", "control"],
     },
   },
 });

package/tokens/README.md

@@ -6,17 +6,17 @@ Design tokens and shared Tailwind v4 CSS for the vvedantb web apps. The CSS and
 
 | Export | File | What it is |
 | --- | --- | --- |
-| `@vvedantb/ui/tokens`, `@vvedantb/ui/tokens/tokens.css` | `src/tokens.css` | Colour, radius, shadow, ease and font tokens (`@theme`), light/dark variables, `dark` variant, `*` border and `body` defaults. In 0.2.1 it also defines shadcn-style aliases (`primary`, `muted-foreground`, `secondary`, `destructive`, `card`, `popover`, `input`, `ring`) that point at the same tokens. |
+| `@vvedantb/ui/tokens`, `@vvedantb/ui/tokens/tokens.css` | `src/tokens.css` | Colour, radius, shadow, ease and font tokens (`@theme`), light/dark variables, `dark` variant, the radius utilities `rounded-surface` (`clamp(0.75rem, var(--radius), 1rem)`), `rounded-menu-item` (`min(var(--radius), 0.5rem)`) and `rounded-control` (`min(var(--radius), 0.625rem)`) (0.7.1; `rounded-surface` was in `utilities.css` before), `*` border and `body` defaults. In 0.2.1 it also defines shadcn-style aliases (`primary`, `muted-foreground`, `secondary`, `destructive`, `card`, `popover`, `input`, `ring`) that point at the same tokens. |
 | `tokens` and `Tokens` from `@vvedantb/ui` | `src/native.ts` | JS colours, radii and spacing for React Native. `@vvedantb/native-ui` keeps its own copy in `src/tokens.ts`; a test keeps the two equal. |
 | `@vvedantb/ui/tokens/css/base.css` | `src/css/base.css` | `html` touch/accent, `::selection`, control transitions, pointer cursor, range accent (`@layer base`). |
 | `@vvedantb/ui/tokens/css/dialog.css` | `src/css/dialog.css` | Unlayered `max-width: none` for `@vvedantb/ui` compact (bottom-sheet) dialogs. |
 | `@vvedantb/ui/tokens/css/modal.css` | `src/css/modal.css` | `.t-modal`, `.is-open`, `.is-closing` and `t-modal-presence-wait` (`@layer components`). |
 | `@vvedantb/ui/tokens/css/tabs.css` | `src/css/tabs.css` | `.t-tab`, active colour, `.t-tabs-pill`, small-screen `.t-tabs` scrolling. |
 | `@vvedantb/ui/tokens/css/tabs-pills.css` | `src/css/tabs-pills.css` | `--tabs-*` colour variables, `.t-tabs--segmented`, `.t-tabs--pills` and pill hover / active fills. |
-| `@vvedantb/ui/tokens/css/utilities.css` | `src/css/utilities.css` | `@utility hit-target`, `@utility reveal-on-hover` and `@utility rounded-surface` (`clamp(0.75rem, var(--radius), 1rem)`). |
+| `@vvedantb/ui/tokens/css/utilities.css` | `src/css/utilities.css` | `@utility hit-target` and `@utility reveal-on-hover`. `rounded-surface` moved to `tokens.css` in 0.7.1. |
 | `@vvedantb/ui/tokens/css/scrollbar-thin.css` | `src/css/scrollbar-thin.css` | `.scrollbar-thin` (`@layer utilities`, always emitted). |
 | `@vvedantb/ui/tokens/css/animations.css` | `src/css/animations.css` | `animate-aurora`, `animate-fade-in-up`, `animate-indeterminate` as `@theme` (CSS-first apps). |
-| `@vvedantb/ui/tokens/css/compat-shadcn-rgb.css`, `@vvedantb/ui/tokens/compat/shadcn-rgb.css` | `src/css/compat-shadcn-rgb.css` | Replaces `tokens.css` for apps with shadcn-style `R G B` channel variables. Defines only the UI-only `--color-*` names as `rgb(var(--x) / alpha)` references, `--radius-field`, `--scrollbar`, `--field-radius` and a `glass-panel-strong` fallback. Import it **or** `tokens.css`, never both. |
+| `@vvedantb/ui/tokens/css/compat-shadcn-rgb.css`, `@vvedantb/ui/tokens/compat/shadcn-rgb.css` | `src/css/compat-shadcn-rgb.css` | Replaces `tokens.css` for apps with shadcn-style `R G B` channel variables. Defines only the UI-only `--color-*` names as `rgb(var(--x) / alpha)` references, `--radius-field`, `--scrollbar`, `--field-radius`, the same three radius utilities as `tokens.css` and a `glass-panel-strong` fallback. Import it **or** `tokens.css`, never both. |
 | `@vvedantb/ui/tokens/css/index.css` | `src/css/index.css` | base + dialog + utilities + scrollbar-thin + animations, for new CSS-first apps. |
 | `@vvedantb/ui/tokens/tailwind-preset` | `src/tailwind-preset.mjs` (+ `.d.mts`) | Tailwind preset for apps that load a JS config with `@config`. |
 

package/tokens/src/css/compat-shadcn-rgb.css

@@ -65,6 +65,20 @@
   --radius-field: min(calc(var(--radius) + 0.25rem), 1.25rem);
 }
 
+/* The radius utilities from tokens.css, which this file replaces. They read
+   the app's `--radius`. */
+@utility rounded-surface {
+  border-radius: clamp(0.75rem, var(--radius), 1rem);
+}
+
+@utility rounded-menu-item {
+  border-radius: min(var(--radius), 0.5rem);
+}
+
+@utility rounded-control {
+  border-radius: min(var(--radius), 0.625rem);
+}
+
 :root {
   --scrollbar: rgb(var(--muted-foreground) / 0.35);
   --field-radius: min(calc(var(--radius) + 0.25rem), 1.25rem);

package/tokens/src/css/utilities.css

@@ -32,8 +32,3 @@
     }
   }
 }
-
-/* Surface radius: follows the theme `--radius`, kept between 0.75rem and 1rem. */
-@utility rounded-surface {
-  border-radius: clamp(0.75rem, var(--radius), 1rem);
-}

package/tokens/src/tokens.css

@@ -94,6 +94,22 @@
   --font-instrumentSans: "Instrument Sans", system-ui, sans-serif;
 }
 
+/* Radius utilities that follow the theme `--radius` (values at the default
+   1rem in brackets). Surfaces: kept between 0.75rem and 1rem (16px). Menu
+   items and sidebar nav rows: capped at 0.5rem (8px) so they sit inside the
+   surface corner. Controls: capped at 0.625rem (10px). */
+@utility rounded-surface {
+  border-radius: clamp(0.75rem, var(--radius), 1rem);
+}
+
+@utility rounded-menu-item {
+  border-radius: min(var(--radius), 0.5rem);
+}
+
+@utility rounded-control {
+  border-radius: min(var(--radius), 0.625rem);
+}
+
 @layer base {
   :root,
   .light,