@godxjp/ui 33.3.0 → 33.4.0

package/README.md

@@ -18,7 +18,7 @@ npm i @godxjp/ui
 
 <!-- agent-catalog-counts:start -->
 
-The catalog — 166 components, 2230 tokens, 44 cardinal rules — is published in two forms from one
+The catalog — 166 components, 2232 tokens, 44 cardinal rules — is published in two forms from one
 source. **Entry point for either: [`AGENTS.md`](AGENTS.md).**
 <!-- agent-catalog-counts:end -->
 
@@ -56,7 +56,7 @@ static files straight from this public repo — no hosting, no deploy step:
 | [`agent/components-index.json`](https://raw.githubusercontent.com/godx-jp/godxjp-ui/main/agent/components-index.json) | 50 KB | all 166 as name + group + tagline — **fetch this first** |
 | [`agent/components/<Name>.json`](https://raw.githubusercontent.com/godx-jp/godxjp-ui/main/agent/components/Select.json) | 1 KB–37 KB | one file per component, each with its `importPath` — **this is the route to take** |
 | [`agent/components.json`](https://raw.githubusercontent.com/godx-jp/godxjp-ui/main/agent/components.json) | 1.3 MB | all 166 entries in one file — most URL fetchers truncate this silently; prefer the per-component files |
-| [`agent/tokens.json`](https://raw.githubusercontent.com/godx-jp/godxjp-ui/main/agent/tokens.json) | 857 KB | all 2230 design tokens, their values and why they exist |
+| [`agent/tokens.json`](https://raw.githubusercontent.com/godx-jp/godxjp-ui/main/agent/tokens.json) | 858 KB | all 2232 design tokens, their values and why they exist |
 | [`agent/vocabulary.json`](https://raw.githubusercontent.com/godx-jp/godxjp-ui/main/agent/vocabulary.json) | 7 KB | the controlled prop vocabulary |
 | [`agent/rules.json`](https://raw.githubusercontent.com/godx-jp/godxjp-ui/main/agent/rules.json) | 23 KB | the 44 cardinal rules |
 <!-- prettier-ignore-end -->

package/agent/START-HERE.md

@@ -3,7 +3,7 @@
 You are about to write code against a design system you did not author. This file is the whole
 contract. Read it before you write JSX.
 
-**This catalog describes `@godxjp/ui` 33.3.0.** If the project you are editing has a different
+**This catalog describes `@godxjp/ui` 33.4.0.** If the project you are editing has a different
 version in its `package.json`, read the pinned catalog for THAT version instead
 (`…/v<their-version>/agent/…`). A catalog newer than the installed package describes props that do
 not exist yet; older, and it hides props that do. Neither failure announces itself.
@@ -61,10 +61,10 @@ screen anatomy, the visual target the rules below do not give you. Then fetch in
    its `importPath`, and its examples. Fetch only the handful you picked in step 1.
 3. `rules.json` — 44 cardinal rules. The ones about raw HTML and hardcoded colour are not
    style advice.
-4. `tokens.json` — 2230 design tokens, each tagged with its `tier`. **If you were handed a
+4. `tokens.json` — 2232 design tokens, each tagged with its `tier`. **If you were handed a
    brand, read the 216 `foundation` entries first** — `--primary`, `--background`,
    `--radius`, `--font-size-base` are the handful everything else derives from. The
-   1901 `component` entries are per-part knobs; reach for one only when a role is
+   1903 `component` entries are per-part knobs; reach for one only when a role is
    right everywhere except one component.
 5. `anti-ai-tells.json` — 35 shapes that make generated UI look generated, each with the
    fix. Read before you reach for a gradient hero or a wall of coloured chips.
@@ -150,7 +150,7 @@ has stopped following the brand.
 |---|---|---|---|
 | `foundation` | 216 | the seeds — `--primary`, `--background`, `--foreground`, `--radius`, `--font-size-base`, `--shadow-color`. Everything below is derived from these | **yes — this is the main road.** The default `--primary` is a neutral placeholder: set it (`:root { --primary: <H> <S>% <L>%; }`, HSL components, no `hsl()` wrapper) or import a theme preset such as `@godxjp/ui/themes/godx.css` |
 | `semantic` | 113 | named roles that follow the seeds — `--ring`, `--text-link`, `--primary-hover`, `--overlay-background` | only when the seed is right and ONE role must differ. That role then stops following a later brand change |
-| `component` | 1901 | per-part knobs, `--{component}-{part}-{property}` | rarely. Most are declared `initial` with the real default at the call site — deliberate, so a scoped override re-resolves instead of freezing at `:root` |
+| `component` | 1903 | per-part knobs, `--{component}-{part}-{property}` | rarely. Most are declared `initial` with the real default at the call site — deliberate, so a scoped override re-resolves instead of freezing at `:root` |
 
 A token whose `value` is `initial` is not empty and not broken: `initial` is the guaranteed-invalid
 value, so the real default is computed where the element paints it. Set it and yours wins.

package/agent/components/TopbarItem.json

@@ -20,7 +20,7 @@
       "type": "BreakpointProp"
     },
     {
-      "description": "Overlaid count; does not change the bar cell width. Rendered under asChild too (gh#1171): the pill goes inside the child element after its children, so `<TopbarItem asChild badge={3}><a href=\"/notifications\">…</a></TopbarItem>` keeps its count.",
+      "description": "Overlaid count; does not change the bar cell width. Rendered under asChild too (gh#1171): the pill goes inside the child element after its children, so `<TopbarItem asChild badge={3}><a href=\"/notifications\">…</a></TopbarItem>` keeps its count. Nothing renders for `undefined`, `\"\"` or the number `0` (gh#1341) — pass the count as it is, never `count === 0 ? undefined : count`; pass the string `\"0\"` to show a zero on purpose.",
       "name": "badge",
       "type": "ReactNode"
     },

package/agent/components.json

@@ -1791,7 +1791,7 @@
         "type": "BreakpointProp"
       },
       {
-        "description": "Overlaid count; does not change the bar cell width. Rendered under asChild too (gh#1171): the pill goes inside the child element after its children, so `<TopbarItem asChild badge={3}><a href=\"/notifications\">…</a></TopbarItem>` keeps its count.",
+        "description": "Overlaid count; does not change the bar cell width. Rendered under asChild too (gh#1171): the pill goes inside the child element after its children, so `<TopbarItem asChild badge={3}><a href=\"/notifications\">…</a></TopbarItem>` keeps its count. Nothing renders for `undefined`, `\"\"` or the number `0` (gh#1341) — pass the count as it is, never `count === 0 ? undefined : count`; pass the string `\"0\"` to show a zero on purpose.",
         "name": "badge",
         "type": "ReactNode"
       },

package/agent/index.json

@@ -4,7 +4,7 @@
     "components": 166,
     "patterns": 28,
     "rules": 44,
-    "tokens": 2230,
+    "tokens": 2232,
     "vocabulary": 14
   },
   "design": "https://raw.githubusercontent.com/godx-jp/godxjp-ui/main/agent/DESIGN.md",
@@ -54,19 +54,19 @@
   "note": "Pin to the tag that matches the @godxjp/ui version you installed. A catalog newer than your package describes props you do not have; older, and it hides props you do.",
   "read": {
     "live": "https://raw.githubusercontent.com/godx-jp/godxjp-ui/main/agent/index.json",
-    "pinned": "https://raw.githubusercontent.com/godx-jp/godxjp-ui/v33.3.0/agent/index.json"
+    "pinned": "https://raw.githubusercontent.com/godx-jp/godxjp-ui/v33.4.0/agent/index.json"
   },
   "source": "mcp/src/data — the same data @godxjp/ui-mcp serves — plus the foundation and semantic token tiers, read from src/tokens/*.css",
   "start": "https://raw.githubusercontent.com/godx-jp/godxjp-ui/main/agent/START-HERE.md",
   "tokenTiers": {
     "component": "per-part knobs, --{component}-{part}-{property}; usually leave these alone",
     "counts": {
-      "component": 1901,
+      "component": 1903,
       "foundation": 216,
       "semantic": 113
     },
     "foundation": "the seeds a consumer is invited to set — --primary, --background, --radius",
     "semantic": "named roles that follow the seeds — --ring, --text-link, --overlay-background"
   },
-  "version": "33.3.0"
+  "version": "33.4.0"
 }

package/agent/llms.txt

@@ -1,10 +1,10 @@
 # @godxjp/ui
 
-> A Japanese-enterprise React design system: 166 components, 2230 design tokens,
-> 44 cardinal rules. This file is the entry point for AI agents. Catalog version 33.3.0.
+> A Japanese-enterprise React design system: 166 components, 2232 design tokens,
+> 44 cardinal rules. This file is the entry point for AI agents. Catalog version 33.4.0.
 
 If your client can run a process, do not read these files — run the MCP server instead
-(`npx @godxjp/ui-mcp@33.3.0`). It is searchable and version-locked. These files exist for agents
+(`npx @godxjp/ui-mcp@33.4.0`). It is searchable and version-locked. These files exist for agents
 that can only fetch URLs.
 
 ## Start
@@ -19,7 +19,7 @@ that can only fetch URLs.
 - [components-index.json](https://raw.githubusercontent.com/godx-jp/godxjp-ui/main/agent/components-index.json): 50 KB — all 166 components as name, group, tagline, plus `absorbed`: the names that do NOT exist and map to it (`Combobox` → `Select`).
 - [components/<Name>.json](https://raw.githubusercontent.com/godx-jp/godxjp-ui/main/agent/components/Select.json): one file per component (1 KB–37 KB, median 6 KB). Read the index, then fetch only the ones you chose — this is the selective route, and the reason you do not need the blob.
 - [components.json](https://raw.githubusercontent.com/godx-jp/godxjp-ui/main/agent/components.json): 1.3 MB — every entry in one file. Most URL fetchers truncate a response this size without saying so; prefer the per-component files.
-- [tokens.json](https://raw.githubusercontent.com/godx-jp/godxjp-ui/main/agent/tokens.json): every design token with its value, the reason it exists, and its `tier` — 216 `foundation` seeds (`--primary`, `--background`, `--radius`: set these when you are handed a brand), 113 `semantic` roles, 1901 `component` knobs.
+- [tokens.json](https://raw.githubusercontent.com/godx-jp/godxjp-ui/main/agent/tokens.json): every design token with its value, the reason it exists, and its `tier` — 216 `foundation` seeds (`--primary`, `--background`, `--radius`: set these when you are handed a brand), 113 `semantic` roles, 1903 `component` knobs.
 - [vocabulary.json](https://raw.githubusercontent.com/godx-jp/godxjp-ui/main/agent/vocabulary.json): the controlled prop vocabulary — which prop name means what, across every component.
 - [rules.json](https://raw.githubusercontent.com/godx-jp/godxjp-ui/main/agent/rules.json): 44 cardinal rules.
 - [anti-ai-tells.json](https://raw.githubusercontent.com/godx-jp/godxjp-ui/main/agent/anti-ai-tells.json): 35 shapes that make generated UI look generated, each with its fix.
@@ -27,7 +27,7 @@ that can only fetch URLs.
 ## Pinning
 
 Every URL above tracks `main`. To pin to the release a project actually installed, swap `main` for
-the tag: `.../godx-jp/godxjp-ui/v33.3.0/agent/...`. A catalog that does not match the installed
+the tag: `.../godx-jp/godxjp-ui/v33.4.0/agent/...`. A catalog that does not match the installed
 package describes props that are absent, or hides props that are present, and says nothing either way.
 
 Pinned catalogs only exist for releases whose tag actually contains `agent/`. If `…/v<version>/agent/index.json` returns 404, that release predates this catalog: read `…/main/…` instead and compare `index.json` → `version` against the package you have, so you at least know which way it drifted.

package/agent/tokens.json

@@ -10968,16 +10968,16 @@
     "value": "var(--secondary)"
   },
   {
-    "description": "COUNT PILL overlaid on the cell's glyph (gh#398) — the unread affordance the bell needs. The offsets are what a call site used to hand-write as `relative` + `absolute -end-0.5 -top-0.5`, i.e. a position the cell owns and no theme could retune; they are measured from the GLYPH box (the pill is centred on the cell, then pushed out by these), so a bar that retunes --topbar-icon-size keeps the pill on the glyph's corner. Colour mirrors `.sb-badge`: quiet by default, `badgeTone=\"destructive\"` for a count addressed to the user. The two role-mirror knobs stay `initial` so a scoped [data-tenant]/.dark override of --secondary/--destructive still reaches the pill (docs/TOKENS.md). Defaults = hsl(var(--secondary)) · hsl(var(--muted-foreground)) · hsl(var(--destructive)) · hsl(var(--destructive-foreground)).",
+    "description": "How far a one-digit pill's top edge (block) and end edge (inline) sit OUTSIDE the glyph's. Fractions of the pill, not a flat length (gh#1341 — Material 3 badges / Apple HIG): half a pill inline centres it on the glyph's corner, three quarters block leaves a quarter of it on the glyph, so at most a quarter of the glyph is covered; a longer count stays inside the cell and grows back across the glyph, still covering at most a quarter of it. They used to be a flat 4px, which left a 16px pill covering 56% of a 16px bell. Declared `initial` with the default resolved at the call site, so a scoped --topbar-item-badge-size still moves them (the freeze rule). The ring is the surface colour drawn round the pill so it reads cut out of the glyph; role-mirror knob, default = hsl(var(--card)) (the bar) at the call site, and the nav rail sets it to its own surface. default = calc(var(--topbar-item-badge-size) * 3 / 4)",
     "name": "--topbar-item-badge-offset-block",
     "tier": "component",
-    "value": "var(--space-1)"
+    "value": "initial"
   },
   {
-    "description": "Shell (sidebar / topbar / kbd) component tokens — small-by-design text knobs (rule #45/#46). A service re-tunes chrome text without moving the global scale.",
+    "description": "default = calc(var(--topbar-item-badge-size) / 2)",
     "name": "--topbar-item-badge-offset-inline",
     "tier": "component",
-    "value": "var(--space-1)"
+    "value": "initial"
   },
   {
     "description": "Shell (sidebar / topbar / kbd) component tokens — small-by-design text knobs (rule #45/#46). A service re-tunes chrome text without moving the global scale.",
@@ -10985,6 +10985,18 @@
     "tier": "component",
     "value": "1rem"
   },
+  {
+    "description": "Shell (sidebar / topbar / kbd) component tokens — small-by-design text knobs (rule #45/#46). A service re-tunes chrome text without moving the global scale.",
+    "name": "--topbar-item-badge-ring-width",
+    "tier": "component",
+    "value": "var(--stroke-md)"
+  },
+  {
+    "description": "Shell (sidebar / topbar / kbd) component tokens — small-by-design text knobs (rule #45/#46). A service re-tunes chrome text without moving the global scale.",
+    "name": "--topbar-item-badge-ring-color",
+    "tier": "component",
+    "value": "initial"
+  },
   {
     "description": "Shell (sidebar / topbar / kbd) component tokens — small-by-design text knobs (rule #45/#46). A service re-tunes chrome text without moving the global scale.",
     "name": "--topbar-item-badge-padding-inline",

package/dist/components/data-display/popover.js

@@ -5,6 +5,7 @@ import * as React from "react";
 import { chain, mergeRefs } from "@react-aria/utils";
 import { Popover as AriaPopover } from "react-aria-components";
 import { cn } from "../../lib/utils.js";
+import { getActiveElement } from "../../lib/active-element.js";
 import { Slot } from "../../lib/slot.js";
 import { useOverlayCloseFocus } from "../feedback/overlay-close-focus.js";
 function toPlacement(side, align) {
@@ -278,7 +279,7 @@ function ClickContent({
     if (!event.defaultPrevented) {
       const target = firstTabbable(node);
       target?.focus({ preventScroll: true });
-      if (!node.contains(document.activeElement)) {
+      if (!node.contains(getActiveElement(node))) {
         node.focus({ preventScroll: true });
       }
     }
@@ -287,11 +288,11 @@ function ClickContent({
   React.useEffect(() => {
     if (!open) return;
     const onPointerDown = (event) => {
-      const target = event.target;
-      if (!target) return;
-      if (contentRef.current?.contains(target)) return;
-      if (triggerRef.current?.contains(target)) return;
-      if (anchored && anchorRef.current?.contains(target)) return;
+      const path = event.composedPath();
+      const within = (node) => node !== null && path.includes(node);
+      if (within(contentRef.current)) return;
+      if (within(triggerRef.current)) return;
+      if (anchored && within(anchorRef.current)) return;
       setOpen(false);
     };
     document.addEventListener("pointerdown", onPointerDown);
@@ -305,6 +306,7 @@ function ClickContent({
       isOpen: root.open,
       onOpenChange: onAriaOpenChange,
       isNonModal: root.isNonModal,
+      shouldCloseOnInteractOutside: (element) => !triggerRef.current?.contains(element),
       triggerRef: root.anchored ? root.anchorRef : root.triggerRef,
       placement: toPlacement(side, align),
       offset: sideOffset,

package/dist/components/feedback/overlay-close-focus.js

@@ -1,5 +1,6 @@
 "use client";
 import * as React from "react";
+import { getActiveElement } from "../../lib/active-element.js";
 function useOverlayCloseFocus(isOpen, onCloseAutoFocus, contentRef) {
   const nodeToRestore = React.useRef(null);
   const renderedOpen = React.useRef(false);
@@ -7,7 +8,7 @@ function useOverlayCloseFocus(isOpen, onCloseAutoFocus, contentRef) {
   if (isOpen !== renderedOpen.current) {
     renderedOpen.current = isOpen;
     if (isOpen && typeof document !== "undefined") {
-      const active = document.activeElement;
+      const active = getActiveElement();
       nodeToRestore.current = active === document.body ? null : active;
     }
   }
@@ -17,7 +18,7 @@ function useOverlayCloseFocus(isOpen, onCloseAutoFocus, contentRef) {
       onCloseAutoFocus?.(event);
       const node = nodeToRestore.current;
       nodeToRestore.current = null;
-      const active = document.activeElement;
+      const active = getActiveElement();
       const focusMovedAway = contentRef != null && active != null && active !== document.body && active.isConnected && contentRef.current?.contains(active) !== true;
       if (!event.defaultPrevented && !focusMovedAway && node?.isConnected === true) {
         node.focus();

package/dist/components/feedback/tooltip.js

@@ -10,6 +10,7 @@ import {
   TooltipTriggerStateContext
 } from "react-aria-components";
 import { cn } from "../../lib/utils.js";
+import { getActiveElement } from "../../lib/active-element.js";
 import { Slot } from "../../lib/slot.js";
 const DEFAULT_DELAY_DURATION = 200;
 const TooltipAnchorContext = React.createContext(
@@ -166,7 +167,7 @@ function EllipsisTooltip({
       show(DEFAULT_DELAY_DURATION);
     };
     const onFocusIn = () => {
-      const active = document.activeElement;
+      const active = getActiveElement(node);
       if (active && (active === host || node.contains(active)) && isFocusVisible(active)) show(0);
     };
     node.addEventListener("pointerenter", onPointerEnter);

package/dist/components/layout/topbar-item.js

@@ -16,7 +16,7 @@ const TopbarItem = React.forwardRef(function TopbarItem2({
   ...props
 }, ref) {
   const Comp = asChild ? Slot : "button";
-  const showBadge = badge !== void 0 && badge !== "";
+  const showBadge = badge !== void 0 && badge !== "" && badge !== 0;
   const iconNode = icon !== void 0 && icon !== null && icon !== false ? /* @__PURE__ */ jsx(
     "span",
     {

package/dist/contracts/measurement.json

@@ -1,6 +1,6 @@
 {
   "$comment": "AUTO-GENERATED by scripts/gen-measurement-contract.mjs — do not edit. Read this instead of guessing: docs/MEASUREMENT-CONTRACT.md.",
-  "version": "33.3.0",
+  "version": "33.4.0",
   "targetSize": {
     "standard": "WCAG 2.2 SC 2.5.8 Target Size (Minimum), level AA — 24×24 CSS px",
     "min": 24,

package/dist/lab/mega-menu.js

@@ -3,6 +3,7 @@ import { Fragment, jsx, jsxs } from "react/jsx-runtime";
 import * as React from "react";
 import { ChevronDown } from "lucide-react";
 import { cn } from "../lib/utils.js";
+import { getActiveElement } from "../lib/active-element.js";
 import { useTranslation } from "../i18n/use-translation.js";
 const OPEN_DELAY_MS = 0;
 const CLOSE_DELAY_MS = 100;
@@ -216,7 +217,7 @@ const MegaMenu = React.forwardRef(function MegaMenu2({
     if (openKey === null) return;
     const onPointerDown = (event) => {
       const node = rootRef.current;
-      if (node && event.target instanceof Node && !node.contains(event.target)) close();
+      if (node && !event.composedPath().includes(node)) close();
     };
     document.addEventListener("pointerdown", onPointerDown);
     return () => document.removeEventListener("pointerdown", onPointerDown);
@@ -381,7 +382,7 @@ const MegaMenu = React.forwardRef(function MegaMenu2({
     closeTimer.current = setTimeout(() => {
       closeTimer.current = null;
       const node = rootRef.current;
-      if (node && node.contains(document.activeElement)) return;
+      if (node && node.contains(getActiveElement(node))) return;
       commitOpen(null);
     }, closeDelay);
   };

package/dist/lib/active-element.d.ts

@@ -0,0 +1,12 @@
+/**
+ * The element that REALLY has focus, through shadow roots (gh#1340).
+ *
+ * `document.activeElement` stops at the shadow HOST: with the app mounted in a shadow root (GoDX
+ * Dock, `OverlayPortalProvider`), every `node.contains(document.activeElement)` in this library
+ * read "focus is not in here" while focus sat on an input inside the panel.
+ *
+ * With `scope`, the walk starts at that node's own root (`getRootNode().activeElement`), which also
+ * sees into a CLOSED shadow root the node lives in; it returns `null` when focus is not inside that
+ * root at all. Without it, the walk starts at `document` and descends through open shadow roots.
+ */
+export declare function getActiveElement(scope?: Node | null): Element | null;

package/dist/lib/active-element.js

@@ -0,0 +1,10 @@
+function getActiveElement(scope) {
+  if (typeof document === "undefined") return null;
+  const root = scope?.getRootNode();
+  let active = root instanceof Document || root instanceof ShadowRoot ? root.activeElement : document.activeElement;
+  while (active?.shadowRoot?.activeElement) active = active.shadowRoot.activeElement;
+  return active;
+}
+export {
+  getActiveElement
+};

package/dist/lib/shortcut.js

@@ -53,9 +53,10 @@ function isEditableTarget(target) {
 }
 function shouldHandleShortcut(spec, event, owner) {
   if (isImeComposing(event) || !shortcutMatches(spec, event)) return false;
-  if (inForeignLayer(event.target, owner)) return false;
+  const target = event.composedPath()[0] ?? event.target;
+  if (inForeignLayer(target, owner)) return false;
   const commandModifier = spec.mod || spec.meta || spec.ctrl || spec.alt;
-  return commandModifier || !isEditableTarget(event.target);
+  return commandModifier || !isEditableTarget(target);
 }
 const SHORTCUT_LAYER = '[role="dialog"], [role="alertdialog"], [aria-modal="true"], [role="menu"], [role="listbox"]';
 function inForeignLayer(target, owner) {

package/dist/props/components/layout.prop.d.ts

@@ -1656,6 +1656,9 @@ export type TopbarItemProp = Omit<React.ButtonHTMLAttributes<HTMLButtonElement>,
      * Drawn under `asChild` too (gh#1171): the pill goes inside the child element, after its own
      * children, so a bell that is a link (`<TopbarItem asChild badge={3}><a …/></TopbarItem>`) keeps
      * its count.
+     *
+     * Nothing renders for `undefined`, `""` or the NUMBER `0` (gh#1341), so pass the count as it is.
+     * To show a zero deliberately, pass the string `"0"`.
      */
     badge?: ReactNode;
     /**

package/dist/styles/layers.json

@@ -1,5 +1,5 @@
 {
-  "version": "33.3.0",
+  "version": "33.4.0",
   "generatedBy": "scripts/gen-style-layers.mjs — do not edit by hand; run `pnpm gen:style-layers`",
   "base": "base.css",
   "fonts": "fonts.css",

package/dist/styles/shell-layout.css

@@ -203,6 +203,14 @@
     --control-height-sm: var(--app-shell-nav-rail-item-size);
   }
 
+  .app-nav-rail {
+    --topbar-item-badge-ring-color: var(--app-shell-nav-rail-background, hsl(var(--muted)));
+  }
+
+  .app-mobile-nav-rail {
+    --topbar-item-badge-ring-color: var(--sheet-surface-background, hsl(var(--background)));
+  }
+
   .app-nav-rail[data-edge="end"] {
     border-inline-start: var(--stroke-hairline) solid hsl(var(--border));
     border-inline-end: 0;
@@ -836,6 +844,8 @@
     flex-direction: column;
     border-inline-end: var(--stroke-hairline) solid hsl(var(--border));
     inline-size: var(--app-shell-nav-rail-width);
+
+    padding-block: var(--app-shell-nav-rail-inset);
     overflow-y: auto;
     overscroll-behavior: contain;
   }
@@ -2315,10 +2325,13 @@
     position: absolute;
 
     inset-block-start: calc(
-      50% - var(--topbar-icon-size) / 2 - var(--topbar-item-badge-offset-block)
+      50% - var(--topbar-icon-size) / 2 -
+        var(--topbar-item-badge-offset-block, var(--topbar-item-badge-size) * 3 / 4)
     );
-    inset-inline-end: calc(
-      50% - var(--topbar-icon-size) / 2 - var(--topbar-item-badge-offset-inline)
+    inset-inline-end: max(
+      var(--topbar-item-badge-ring-width),
+      50% - var(--topbar-icon-size) / 2 -
+        var(--topbar-item-badge-offset-inline, var(--topbar-item-badge-size) / 2)
     );
     display: inline-flex;
     min-inline-size: var(--topbar-item-badge-size);
@@ -2333,6 +2346,9 @@
     font-weight: var(--font-weight-medium);
     line-height: 1;
 
+    box-shadow: 0 0 0 var(--topbar-item-badge-ring-width)
+      var(--topbar-item-badge-ring-color, hsl(var(--card)));
+
     pointer-events: none;
   }