@tinybigui/react 0.22.0 → 0.23.0

package/dist/index.js

@@ -467,6 +467,10 @@ var buttonVariants = cva(
        *   Filled/Tonal  hover→level-1, focus/pressed→level-0
        *   Elevated      base→level-1, hover→level-2, focus/pressed→level-1
        *   Outlined/Text no elevation
+       *
+       * Self-targeting `data-[x]:` is used for elevation because these classes
+       * sit on the root element (the group host) — group-data descendant
+       * selectors cannot match an element against itself.
        */
       variant: {
         /**
@@ -475,17 +479,17 @@ var buttonVariants = cva(
          * Elevation: 0 base → 1 hover → 0 focus → 0 pressed
          */
         filled: [
-          "bg-primary text-on-primary shadow-none",
+          "text-on-primary shadow-none",
           // Hover: gains level-1 elevation
-          "group-data-[hovered]/button:shadow-elevation-1",
+          "data-[hovered]:shadow-elevation-1",
           // Focus/pressed: shadow must explicitly return to level-0
           // (doubled attribute selector → higher specificity than hover)
-          "group-data-[focus-visible]/button:shadow-none",
-          "group-data-[pressed]/button:group-data-[pressed]/button:shadow-none",
-          // Disabled overrides
-          "group-data-[disabled]/button:bg-on-surface/12",
-          "group-data-[disabled]/button:text-on-surface/38",
-          "group-data-[disabled]/button:shadow-none"
+          "data-[focus-visible]:data-[focus-visible]:shadow-none",
+          "data-[pressed]:data-[pressed]:data-[pressed]:shadow-none",
+          // Disabled overrides — root owns text color + shadow only;
+          // disabled bg override lives on buttonContainerVariants (filled variant)
+          "data-[disabled]:text-on-surface/38",
+          "data-[disabled]:shadow-none"
         ],
         /**
          * Outlined — medium emphasis. Transparent with border.
@@ -493,10 +497,10 @@ var buttonVariants = cva(
          * Elevation: always 0
          */
         outlined: [
-          "bg-transparent border border-outline text-primary",
+          "border border-outline text-primary",
           // Disabled overrides
-          "group-data-[disabled]/button:border-on-surface/12",
-          "group-data-[disabled]/button:text-on-surface/38"
+          "data-[disabled]:border-on-surface/12",
+          "data-[disabled]:text-on-surface/38"
         ],
         /**
          * Tonal — secondary emphasis.
@@ -504,16 +508,15 @@ var buttonVariants = cva(
          * Elevation: 0 base → 1 hover → 0 focus → 0 pressed
          */
         tonal: [
-          "bg-secondary-container text-on-secondary-container shadow-none",
+          "text-on-secondary-container shadow-none",
           // Hover: gains level-1 elevation (same as filled)
-          "group-data-[hovered]/button:shadow-elevation-1",
+          "data-[hovered]:shadow-elevation-1",
           // Focus/pressed: return to level-0
-          "group-data-[focus-visible]/button:shadow-none",
-          "group-data-[pressed]/button:group-data-[pressed]/button:shadow-none",
+          "data-[focus-visible]:data-[focus-visible]:shadow-none",
+          "data-[pressed]:data-[pressed]:data-[pressed]:shadow-none",
           // Disabled overrides
-          "group-data-[disabled]/button:bg-on-surface/12",
-          "group-data-[disabled]/button:text-on-surface/38",
-          "group-data-[disabled]/button:shadow-none"
+          "data-[disabled]:text-on-surface/38",
+          "data-[disabled]:shadow-none"
         ],
         /**
          * Elevated — separation via shadow.
@@ -521,17 +524,16 @@ var buttonVariants = cva(
          * Elevation: 1 base → 2 hover → 1 focus → 1 pressed
          */
         elevated: [
-          "bg-surface-container-low text-primary shadow-elevation-1",
+          "text-primary shadow-elevation-1",
           // Hover: gains extra elevation
-          "group-data-[hovered]/button:shadow-elevation-2",
+          "data-[hovered]:shadow-elevation-2",
           // Focus/pressed: return to base level-1
           // (doubled selector wins over single hover selector at same cascade position)
-          "group-data-[focus-visible]/button:shadow-elevation-1",
-          "group-data-[pressed]/button:group-data-[pressed]/button:shadow-elevation-1",
+          "data-[focus-visible]:data-[focus-visible]:shadow-elevation-1",
+          "data-[pressed]:data-[pressed]:data-[pressed]:shadow-elevation-1",
           // Disabled overrides
-          "group-data-[disabled]/button:bg-on-surface/12",
-          "group-data-[disabled]/button:text-on-surface/38",
-          "group-data-[disabled]/button:shadow-none"
+          "data-[disabled]:text-on-surface/38",
+          "data-[disabled]:shadow-none"
         ],
         /**
          * Text — lowest emphasis.
@@ -539,9 +541,9 @@ var buttonVariants = cva(
          * Elevation: always 0
          */
         text: [
-          "bg-transparent text-primary",
+          "text-primary",
           // Disabled overrides
-          "group-data-[disabled]/button:text-on-surface/38"
+          "data-[disabled]:text-on-surface/38"
         ]
       },
       /**
@@ -579,6 +581,29 @@ var buttonVariants = cva(
     }
   }
 );
+var buttonContainerVariants = cva(
+  [
+    "absolute inset-0 rounded-[inherit] pointer-events-none",
+    // Effects transition for background-color — no overshoot
+    "transition-[background-color] duration-spring-standard-fast-effects ease-spring-standard-fast-effects"
+  ],
+  {
+    variants: {
+      variant: {
+        // MD3 disabled: filled containers replace bg with on-surface/12.
+        // group-data descendant selector targets this child span (not the root host).
+        filled: "bg-primary group-data-[disabled]/button:bg-on-surface/12",
+        // outlined/text: container stays transparent when disabled — only border + label fade.
+        outlined: "bg-transparent",
+        // MD3 disabled: tonal and elevated containers also replace bg with on-surface/12.
+        tonal: "bg-secondary-container group-data-[disabled]/button:bg-on-surface/12",
+        elevated: "bg-surface-container-low group-data-[disabled]/button:bg-on-surface/12",
+        text: "bg-transparent"
+      }
+    },
+    defaultVariants: { variant: "filled" }
+  }
+);
 var buttonStateLayerVariants = cva(
   [
     "absolute inset-0 rounded-[inherit] overflow-hidden pointer-events-none opacity-0",
@@ -881,6 +906,7 @@ var Button = forwardRef(
           className
         ),
         children: [
+          /* @__PURE__ */ jsx("span", { className: cn(buttonContainerVariants({ variant })), "aria-hidden": "true" }),
           ripples,
           /* @__PURE__ */ jsx("span", { className: cn(buttonStateLayerVariants({ variant })), "aria-hidden": "true" }),
           /* @__PURE__ */ jsx("span", { className: cn(buttonFocusRingVariants()), "aria-hidden": "true" }),
@@ -5947,6 +5973,416 @@ var CardActions = forwardRef(function CardActions2({ children, className }, ref)
   return /* @__PURE__ */ jsx("div", { ref, className: cn("flex items-center justify-end gap-2 p-4 pt-0", className), children });
 });
 CardActions.displayName = "CardActions";
+var menuContainerVariants = cva(
+  [
+    // Width constraints: 112dp min / 280dp max per MD3 spec
+    "min-w-28 max-w-70",
+    "flex flex-col",
+    // Scroll behaviour
+    "max-h-[calc(var(--visual-viewport-height,100vh)-2rem)]",
+    // Stacking
+    "z-50",
+    "gap-0.5",
+    // Focus outline delegated to React Aria
+    "outline-none"
+  ],
+  {
+    variants: {
+      /**
+       * Color scheme — drives item/segment background and content colors.
+       * standard: surface-container-low item background.
+       * vibrant:  tertiary-container item background.
+       */
+      colorScheme: {
+        standard: [],
+        vibrant: []
+      },
+      /**
+       * Visual style — drives corner radius and container background.
+       *
+       * baseline: solid surface-container, 4dp corners, 8dp vertical padding.
+       * vertical: transparent container, 16dp corners, no container padding —
+       *   items own their segment surface, gaps reveal the page background.
+       */
+      menuStyle: {
+        baseline: ["rounded-xs", "bg-surface-container", "py-2"],
+        vertical: ["bg-transparent"]
+      }
+    },
+    defaultVariants: {
+      colorScheme: "standard",
+      menuStyle: "baseline"
+    }
+  }
+);
+var menuPopoverVariants = cva([
+  "will-change-[transform,opacity]",
+  "data-[entering]:pointer-events-none data-[exiting]:pointer-events-none",
+  "data-[entering]:animate-md-scale-in",
+  "data-[exiting]:animate-md-scale-out",
+  "origin-top",
+  "data-[placement=top]:origin-bottom",
+  "data-[placement=left]:origin-right",
+  "data-[placement=right]:origin-left",
+  "motion-reduce:data-[entering]:animate-none motion-reduce:data-[exiting]:animate-none"
+]);
+var menuItemVariants = cva(
+  [
+    // Layout — height set by density context in MenuItem component
+    // gap is style-specific: baseline = 12dp (gap-3), vertical = 8dp (gap-2)
+    "relative flex w-full items-center",
+    // Typography: Label Large per MD3 menu spec
+    "text-label-large",
+    // Interaction
+    "cursor-pointer select-none outline-none",
+    // Color transition (effects — no overshoot)
+    "transition-colors duration-spring-standard-fast-effects ease-spring-standard-fast-effects",
+    // Disabled — self-targeting data-[x]: selectors (RAC emits data-disabled)
+    "data-[disabled]:pointer-events-none data-[disabled]:cursor-not-allowed"
+  ],
+  {
+    variants: {
+      /**
+       * Color scheme — drives item bg, default text/icon color, and selection colors.
+       *
+       * standard: surface-container-low bg, on-surface text, on-surface-variant icons.
+       *           Selected/open: tertiary-container bg highlight, on-tertiary-container content.
+       * vibrant:  tertiary-container bg, on-tertiary-container text AND icons.
+       *           Selected/open: tertiary bg highlight, on-tertiary content.
+       */
+      colorScheme: {
+        standard: ["text-on-surface"],
+        vibrant: ["text-on-tertiary-container"]
+      },
+      /**
+       * Visual style — drives padding, gap, segment surface, and corner rounding.
+       *
+       * baseline: 12dp h-padding, 12dp icon-to-label gap, no item background (container provides it).
+       * vertical: 12dp h-padding, 8dp icon-to-label gap, item owns segment surface, segmented rounding
+       *   via first/last + adjacent-sibling gap selectors.
+       */
+      menuStyle: {
+        baseline: ["px-3", "gap-3"],
+        vertical: [
+          "px-3",
+          "gap-2",
+          // Default: inner item (4dp all corners)
+          "rounded-md"
+          // Last item in the whole menu → 16dp bottom corners
+        ]
+      }
+    },
+    compoundVariants: [
+      // vertical + standard: selected/open text → on-tertiary-container
+      {
+        menuStyle: "vertical",
+        colorScheme: "standard",
+        class: [
+          "data-[selected]:text-on-tertiary-container",
+          "data-[open]:text-on-tertiary-container"
+        ]
+      },
+      // vertical + vibrant: selected/open text → on-tertiary
+      {
+        menuStyle: "vertical",
+        colorScheme: "vibrant",
+        class: ["data-[selected]:text-on-tertiary", "data-[open]:text-on-tertiary"]
+      }
+    ],
+    defaultVariants: {
+      colorScheme: "standard",
+      menuStyle: "baseline"
+    }
+  }
+);
+var menuItemHighlightVariants = cva(
+  [
+    "absolute inset-0 pointer-events-none",
+    // Inherit the item's own corner radius (inner 4dp or outer 16dp)
+    "rounded-[inherit]",
+    // Effects transition for background-color — no overshoot
+    "transition-colors duration-spring-standard-fast-effects ease-spring-standard-fast-effects",
+    // z-0: below state layer (z-[1]) and content (z-10)
+    "z-0"
+  ],
+  {
+    variants: {
+      menuStyle: {
+        baseline: [],
+        vertical: []
+      },
+      colorScheme: {
+        standard: [
+          // baseline selected bg
+          "group-data-[selected]/menuitem:bg-surface-container-highest"
+        ],
+        vibrant: [
+          // baseline + vibrant: use surface-container-highest as fallback
+          "group-data-[selected]/menuitem:bg-surface-container-highest"
+        ]
+      }
+    },
+    compoundVariants: [
+      // vertical + standard: selected/open highlight → tertiary-container
+      {
+        menuStyle: "vertical",
+        colorScheme: "standard",
+        class: [
+          "group-data-[selected]/menuitem:bg-tertiary-container",
+          "group-data-[open]/menuitem:bg-tertiary-container"
+        ]
+      },
+      // vertical + vibrant: selected/open highlight → tertiary
+      {
+        menuStyle: "vertical",
+        colorScheme: "vibrant",
+        class: [
+          "group-data-[selected]/menuitem:bg-tertiary",
+          "group-data-[open]/menuitem:bg-tertiary"
+        ]
+      }
+    ],
+    defaultVariants: {
+      menuStyle: "baseline",
+      colorScheme: "standard"
+    }
+  }
+);
+var menuItemStateLayerVariants = cva(
+  [
+    "absolute inset-0 rounded-[inherit] overflow-hidden pointer-events-none opacity-0",
+    // Effects transition — opacity must NOT overshoot
+    "transition-opacity duration-spring-standard-fast-effects ease-spring-standard-fast-effects",
+    // Hover: 8%
+    "group-data-[hovered]/menuitem:opacity-8",
+    // Pressed: 10%, doubled selector wins over hover at same cascade position
+    "group-data-[pressed]/menuitem:group-data-[pressed]/menuitem:opacity-10",
+    // No state layer when disabled
+    "group-data-[disabled]/menuitem:hidden",
+    // z-[1]: above highlight layer (z-0), below content (z-10)
+    "z-[1]"
+  ],
+  {
+    variants: {
+      colorScheme: {
+        standard: ["bg-on-surface"],
+        vibrant: ["bg-on-tertiary-container"]
+      },
+      menuStyle: {
+        baseline: [],
+        vertical: []
+      }
+    },
+    compoundVariants: [
+      // vertical + standard: selected/open state layer → on-tertiary-container
+      {
+        menuStyle: "vertical",
+        colorScheme: "standard",
+        class: [
+          "group-data-[selected]/menuitem:bg-on-tertiary-container",
+          "group-data-[open]/menuitem:bg-on-tertiary-container"
+        ]
+      },
+      // vertical + vibrant: selected/open state layer → on-tertiary
+      {
+        menuStyle: "vertical",
+        colorScheme: "vibrant",
+        class: [
+          "group-data-[selected]/menuitem:bg-on-tertiary",
+          "group-data-[open]/menuitem:bg-on-tertiary"
+        ]
+      }
+    ],
+    defaultVariants: {
+      colorScheme: "standard",
+      menuStyle: "baseline"
+    }
+  }
+);
+var menuItemFocusRingVariants = cva([
+  "pointer-events-none absolute inset-0 rounded-[inherit]",
+  "outline outline-2 -outline-offset-2 outline-secondary",
+  // Effects transition — opacity must not overshoot
+  "transition-opacity duration-spring-standard-fast-effects ease-spring-standard-fast-effects",
+  "opacity-0",
+  "group-data-[focus-visible]/menuitem:opacity-100",
+  // z-[2]: above state layer (z-[1]) and highlight (z-0), below content (z-10)
+  "z-[2]"
+]);
+var menuItemIconVariants = cva(
+  [
+    "relative z-10 shrink-0 flex items-center justify-center",
+    "transition-colors duration-spring-standard-fast-effects ease-spring-standard-fast-effects",
+    // Disabled: 38% opacity on icon color
+    "group-data-[disabled]/menuitem:text-on-surface/38"
+  ],
+  {
+    variants: {
+      colorScheme: {
+        standard: ["text-on-surface-variant"],
+        vibrant: ["text-on-tertiary-container"]
+      },
+      menuStyle: {
+        baseline: ["h-6 w-6"],
+        vertical: ["h-5 w-5"]
+      }
+    },
+    compoundVariants: [
+      // vertical + standard: selected/open icon → on-tertiary-container
+      {
+        menuStyle: "vertical",
+        colorScheme: "standard",
+        class: [
+          "group-data-[selected]/menuitem:text-on-tertiary-container",
+          "group-data-[open]/menuitem:text-on-tertiary-container"
+        ]
+      },
+      // vertical + vibrant: selected/open icon → on-tertiary
+      {
+        menuStyle: "vertical",
+        colorScheme: "vibrant",
+        class: [
+          "group-data-[selected]/menuitem:text-on-tertiary",
+          "group-data-[open]/menuitem:text-on-tertiary"
+        ]
+      }
+    ],
+    defaultVariants: {
+      colorScheme: "standard",
+      menuStyle: "baseline"
+    }
+  }
+);
+var menuSectionVariants = cva(["flex flex-col w-full"]);
+var menuSectionHeaderVariants = cva(
+  [
+    // 32dp tall region, content vertically centred, 12dp leading padding aligned with items
+    "px-3 h-8 flex items-center",
+    "text-title-small",
+    "select-none"
+  ],
+  {
+    variants: {
+      colorScheme: {
+        standard: ["text-on-surface-variant"],
+        vibrant: ["text-on-tertiary-container"]
+      }
+    },
+    defaultVariants: {
+      colorScheme: "standard"
+    }
+  }
+);
+var menuDividerVariants = cva(["border-t border-outline-variant", "my-0.5 mx-3"]);
+cva(["h-0.5 w-full"]);
+var menuItemTrailingTextVariants = cva(
+  [
+    "ml-auto shrink-0 text-label-large",
+    "select-none",
+    "group-data-[disabled]/menuitem:text-on-surface/38"
+  ],
+  {
+    variants: {
+      colorScheme: {
+        standard: ["text-on-surface-variant"],
+        vibrant: ["text-on-tertiary-container"]
+      },
+      menuStyle: {
+        baseline: [],
+        vertical: [
+          "group-data-[selected]/menuitem:text-on-tertiary-container",
+          "group-data-[open]/menuitem:text-on-tertiary-container"
+        ]
+      }
+    },
+    compoundVariants: [
+      // vertical + vibrant: selected/open trailing text → on-tertiary
+      {
+        menuStyle: "vertical",
+        colorScheme: "vibrant",
+        class: [
+          "group-data-[selected]/menuitem:text-on-tertiary",
+          "group-data-[open]/menuitem:text-on-tertiary"
+        ]
+      }
+    ],
+    defaultVariants: {
+      colorScheme: "standard",
+      menuStyle: "baseline"
+    }
+  }
+);
+var menuItemDescriptionVariants = cva(
+  ["text-body-medium", "select-none", "group-data-[disabled]/menuitem:text-on-surface/38"],
+  {
+    variants: {
+      colorScheme: {
+        standard: ["text-on-surface-variant"],
+        vibrant: ["text-on-tertiary-container"]
+      },
+      menuStyle: {
+        baseline: [],
+        vertical: [
+          "group-data-[selected]/menuitem:text-on-tertiary-container",
+          "group-data-[open]/menuitem:text-on-tertiary-container"
+        ]
+      }
+    },
+    compoundVariants: [
+      // vertical + vibrant: selected/open description → on-tertiary
+      {
+        menuStyle: "vertical",
+        colorScheme: "vibrant",
+        class: [
+          "group-data-[selected]/menuitem:text-on-tertiary",
+          "group-data-[open]/menuitem:text-on-tertiary"
+        ]
+      }
+    ],
+    defaultVariants: {
+      colorScheme: "standard",
+      menuStyle: "baseline"
+    }
+  }
+);
+cva(
+  [
+    "flex flex-col w-full",
+    "px-1 py-0.5 gap-0.5",
+    "rounded-lg first:rounded-b-sm last:rounded-t-sm",
+    "shadow-elevation-1"
+  ],
+  {
+    variants: {
+      menuStyle: {
+        vertical: ["bg-surface-container-low"],
+        baseline: []
+      },
+      colorScheme: {
+        standard: ["bg-surface-container-low"],
+        vibrant: ["bg-tertiary-container"]
+      }
+    },
+    compoundVariants: [
+      // vertical + standard: item background = surface-container-low
+      {
+        menuStyle: "vertical",
+        colorScheme: "standard",
+        class: ["bg-surface-container-low"]
+      },
+      // vertical + vibrant: item background = tertiary-container
+      {
+        menuStyle: "vertical",
+        colorScheme: "vibrant",
+        class: ["bg-tertiary-container"]
+      }
+    ],
+    defaultVariants: {
+      menuStyle: "vertical",
+      colorScheme: "standard"
+    }
+  }
+);
 var MenuContext = createContext(null);
 function useMenuContext() {
   return useContext(MenuContext);
@@ -5984,7 +6420,16 @@ function HeadlessMenuTrigger({
   const [triggerChild, menuChild] = childrenArray;
   return /* @__PURE__ */ jsxs(MenuTrigger$1, { ...rest, children: [
     /* @__PURE__ */ jsx(TriggerBridge, { children: triggerChild }),
-    /* @__PURE__ */ jsx(Popover, { placement, shouldFlip, offset: 4, children: menuChild })
+    /* @__PURE__ */ jsx(
+      Popover,
+      {
+        placement,
+        shouldFlip,
+        offset: 4,
+        className: menuPopoverVariants(),
+        children: menuChild
+      }
+    )
   ] });
 }
 function HeadlessMenu({
@@ -6036,192 +6481,6 @@ function HeadlessMenuDivider({
 }) {
   return /* @__PURE__ */ jsx(Separator, { ...props, className: className ?? "" });
 }
-var menuContainerVariants = cva(
-  [
-    // Elevation
-    "shadow-elevation-2",
-    // Width constraints per MD3 spec (112dp min / 280dp max)
-    "min-w-28 max-w-70",
-    // Layout
-    "py-2",
-    // Scroll: show scrollbar when content overflows; max height avoids clipping
-    "overflow-y-auto",
-    "max-h-[calc(var(--visual-viewport-height,100vh)-2rem)]",
-    // Stacking
-    "z-50",
-    // Focus outline handled by React Aria
-    "outline-none",
-    // GPU compositing — promotes menu to its own compositor layer so
-    // scale + opacity animations run without triggering layout reflow.
-    "will-change-[transform,opacity]",
-    // Pointer events blocked during animation to prevent accidental clicks
-    // on menu items while the panel is still animating in or out.
-    "data-[entering]:pointer-events-none data-[exiting]:pointer-events-none",
-    // ── Enter animation ────────────────────────────────────────────────────
-    // @keyframes menu-enter (defined in styles.css): scale(0.8)+opacity:0 →
-    // scale(1)+opacity:1 in 120ms with cubic-bezier(0,0,0.2,1) (standard
-    // decelerate — matches Angular Material's _mat-menu-enter keyframe).
-    "data-[entering]:animate-[menu-enter_120ms_cubic-bezier(0,0,0.2,1)_both]",
-    // ── Exit animation ─────────────────────────────────────────────────────
-    // @keyframes menu-exit (defined in styles.css): opacity:1 → opacity:0
-    // in 100ms after 25ms delay, linear — matches Angular Material's
-    // _mat-menu-exit keyframe (fade-only, no reverse scale).
-    "data-[exiting]:animate-[menu-exit_100ms_25ms_linear_both]",
-    // ── Transform origin (placement-aware) ────────────────────────────────
-    // RAC sets data-placement="bottom|top|left|right" on the Popover element.
-    // Default (bottom): origin at top edge (menu expands downward).
-    "origin-top",
-    // top: origin at bottom edge (menu expands upward)
-    "data-[placement=top]:origin-bottom",
-    // left: origin at right edge
-    "data-[placement=left]:origin-right",
-    // right: origin at left edge
-    "data-[placement=right]:origin-left",
-    // ── Reduced motion ────────────────────────────────────────────────────
-    // Skip both animations entirely for users who prefer reduced motion.
-    "motion-reduce:data-[entering]:animate-none motion-reduce:data-[exiting]:animate-none"
-  ],
-  {
-    variants: {
-      /**
-       * Color scheme — drives the container background.
-       * baseline+standard uses a separate compound variant.
-       */
-      colorScheme: {
-        standard: [],
-        vibrant: []
-      },
-      /**
-       * Visual style — drives corner radius and baseline vs vertical background.
-       */
-      menuStyle: {
-        baseline: ["rounded-xs", "bg-surface-container"],
-        vertical: ["rounded-lg", "bg-surface-container-low"]
-      }
-    },
-    compoundVariants: [
-      // Vertical + vibrant: tertiary container background
-      {
-        menuStyle: "vertical",
-        colorScheme: "vibrant",
-        class: ["bg-tertiary-container"]
-      }
-    ],
-    defaultVariants: {
-      colorScheme: "standard",
-      menuStyle: "baseline"
-    }
-  }
-);
-var menuItemVariants = cva(
-  [
-    // Layout — height set by density context in MenuItem component
-    "relative flex w-full items-center",
-    "px-3 gap-3",
-    // Typography: Body Large per MD3 baseline spec
-    "text-body-large",
-    // Interaction
-    "cursor-pointer select-none outline-none",
-    // State layer pseudo-element
-    "before:absolute before:inset-0 before:rounded-[inherit]",
-    "before:transition-opacity before:duration-short2 before:ease-standard",
-    "before:opacity-0",
-    // Hover state layer
-    "hover:before:opacity-8",
-    // Focus visible state layer
-    "focus-visible:before:opacity-12",
-    // Active pressed state layer
-    "active:before:opacity-12",
-    // Color transition for selection
-    "transition-colors duration-short2 ease-standard"
-  ],
-  {
-    variants: {
-      /**
-       * Disabled state: reduces opacity and blocks interaction.
-       */
-      isDisabled: {
-        true: ["opacity-38 cursor-not-allowed pointer-events-none"],
-        false: []
-      },
-      /**
-       * Selected state: background and text color driven by compound variants.
-       */
-      isSelected: {
-        true: [],
-        false: []
-      },
-      /**
-       * Color scheme: drives default text and state layer colors.
-       * - standard: on-surface text, on-surface state layer
-       * - vibrant (vertical only): on-tertiary-container text + state layer
-       */
-      colorScheme: {
-        standard: ["text-on-surface", "before:bg-on-surface"],
-        vibrant: ["text-on-tertiary-container", "before:bg-on-tertiary-container"]
-      },
-      /**
-       * Visual style: drives corner radius on items (vertical uses rounded-lg
-       * inherited from container, items stay flat inside).
-       */
-      menuStyle: {
-        baseline: [],
-        vertical: []
-      }
-    },
-    compoundVariants: [
-      // ── Baseline selection (both colorSchemes) ──────────────────────────
-      {
-        isSelected: true,
-        menuStyle: "baseline",
-        class: [
-          "bg-surface-container-highest"
-          // text-on-surface already applied by standard colorScheme variant
-        ]
-      },
-      // ── Vertical + Standard selection ───────────────────────────────────
-      {
-        isSelected: true,
-        menuStyle: "vertical",
-        colorScheme: "standard",
-        class: [
-          "bg-tertiary-container",
-          "text-on-tertiary-container",
-          "before:bg-on-tertiary-container"
-        ]
-      },
-      // ── Vertical + Vibrant selection ─────────────────────────────────────
-      {
-        isSelected: true,
-        menuStyle: "vertical",
-        colorScheme: "vibrant",
-        class: ["bg-tertiary", "text-on-tertiary", "before:bg-on-tertiary"]
-      }
-    ],
-    defaultVariants: {
-      isDisabled: false,
-      isSelected: false,
-      colorScheme: "standard",
-      menuStyle: "baseline"
-    }
-  }
-);
-var menuSectionVariants = cva(["flex flex-col w-full"]);
-var menuSectionHeaderVariants = cva([
-  "px-3 pt-2 pb-1",
-  "text-title-small text-on-surface-variant",
-  "select-none"
-]);
-var menuDividerVariants = cva(["border-t border-outline-variant", "my-2 mx-0"]);
-cva(["h-2 w-full"]);
-var menuItemTrailingTextVariants = cva([
-  "ml-auto shrink-0 text-label-large text-on-surface-variant",
-  "select-none"
-]);
-var menuItemDescriptionVariants = cva([
-  "text-body-medium text-on-surface-variant",
-  "select-none"
-]);
 var Menu = forwardRef(function Menu2({
   children,
   className,
@@ -6281,7 +6540,13 @@ function CheckIcon() {
     }
   );
 }
-var DENSITY_HEIGHT = {
+var BASELINE_DENSITY_HEIGHT = {
+  0: "h-12",
+  [-1]: "h-11",
+  [-2]: "h-10",
+  [-3]: "h-9"
+};
+var VERTICAL_DENSITY_HEIGHT = {
   0: "h-12",
   [-1]: "h-11",
   [-2]: "h-10",
@@ -6304,19 +6569,18 @@ var MenuItem = forwardRef(function MenuItem2({
   const menuStyle = ctx?.menuStyle ?? "baseline";
   const density = ctx?.density ?? 0;
   const selectionMode = ctx?.selectionMode;
-  const heightClass = DENSITY_HEIGHT[density];
+  const heightClass = menuStyle === "vertical" ? VERTICAL_DENSITY_HEIGHT[density] : BASELINE_DENSITY_HEIGHT[density];
   const isSelectionMenu = selectionMode != null;
   const { ripples, onMouseDown } = useRipple({ disabled: disableRipple });
-  const computeClassName = ({ isDisabled, isSelected }) => cn(
-    menuItemVariants({
-      isDisabled,
-      isSelected: isSelected ?? false,
-      colorScheme,
-      menuStyle
-    }),
+  const computeClassName = ({ isSelected }) => cn(
+    menuItemVariants({ colorScheme, menuStyle }),
+    // group/menuitem scope: all slot children read state via group-data-[x]/menuitem
+    "group/menuitem",
     // Height: auto when description is present (multi-line), otherwise density
     description ? "min-h-12 py-2 h-auto items-start" : heightClass,
-    className
+    className,
+    // Silence the isSelected lint — value consumed in render-prop below
+    isSelected ? "" : ""
   );
   return /* @__PURE__ */ jsx(
     HeadlessMenuItem,
@@ -6326,24 +6590,48 @@ var MenuItem = forwardRef(function MenuItem2({
       className: computeClassName,
       onMouseDown,
       children: ({ isSelected }) => /* @__PURE__ */ jsxs(Fragment, { children: [
-        !disableRipple && /* @__PURE__ */ jsx("span", { className: "pointer-events-none absolute inset-0 z-0 overflow-hidden rounded-[inherit]", children: ripples }),
-        (leadingIcon != null || isSelectionMenu) && /* @__PURE__ */ jsx(
+        /* @__PURE__ */ jsx(
+          "span",
+          {
+            "aria-hidden": "true",
+            "data-testid": "menuitem-highlight",
+            className: menuItemHighlightVariants({ colorScheme, menuStyle })
+          }
+        ),
+        /* @__PURE__ */ jsx(
+          "span",
+          {
+            "aria-hidden": "true",
+            className: menuItemStateLayerVariants({ colorScheme, menuStyle })
+          }
+        ),
+        /* @__PURE__ */ jsx(
           "span",
           {
-            className: "text-on-surface-variant relative z-10 flex h-6 w-6 shrink-0 items-center justify-center",
             "aria-hidden": "true",
-            children: isSelectionMenu && leadingIcon == null ? isSelected ? /* @__PURE__ */ jsx(CheckIcon, {}) : null : leadingIcon
+            "data-testid": "menuitem-focus-ring",
+            className: menuItemFocusRingVariants()
           }
         ),
+        !disableRipple && /* @__PURE__ */ jsx(
+          "span",
+          {
+            className: cn(
+              "pointer-events-none absolute inset-0 z-[3] overflow-hidden rounded-[inherit]"
+            ),
+            children: ripples
+          }
+        ),
+        (leadingIcon != null || isSelectionMenu) && /* @__PURE__ */ jsx("span", { className: menuItemIconVariants({ colorScheme, menuStyle }), "aria-hidden": "true", children: isSelectionMenu && leadingIcon == null ? isSelected ? /* @__PURE__ */ jsx(CheckIcon, {}) : null : leadingIcon }),
         description != null ? /* @__PURE__ */ jsxs("span", { className: "relative z-10 flex min-w-0 flex-1 flex-col", children: [
-          /* @__PURE__ */ jsx("span", { className: "text-body-large", children }),
-          /* @__PURE__ */ jsx("span", { className: menuItemDescriptionVariants(), children: description })
-        ] }) : /* @__PURE__ */ jsx("span", { className: "text-body-large relative z-10 min-w-0 flex-1", children }),
+          /* @__PURE__ */ jsx("span", { className: "text-label-large group-data-[disabled]/menuitem:text-on-surface/38", children }),
+          /* @__PURE__ */ jsx("span", { className: menuItemDescriptionVariants({ colorScheme, menuStyle }), children: description })
+        ] }) : /* @__PURE__ */ jsx("span", { className: "text-label-large group-data-[disabled]/menuitem:text-on-surface/38 relative z-10 min-w-0 flex-1", children }),
         badge != null && /* @__PURE__ */ jsx("span", { className: "relative z-10 shrink-0", children: badge }),
         trailingIcon != null && trailingText == null && /* @__PURE__ */ jsx(
           "span",
           {
-            className: "text-on-surface-variant relative z-10 ml-auto flex h-6 w-6 shrink-0 items-center justify-center",
+            className: cn(menuItemIconVariants({ colorScheme, menuStyle }), "ml-auto"),
             "aria-hidden": "true",
             children: trailingIcon
           }
@@ -6351,7 +6639,10 @@ var MenuItem = forwardRef(function MenuItem2({
         trailingText != null && trailingIcon == null && /* @__PURE__ */ jsx(
           "span",
           {
-            className: cn(menuItemTrailingTextVariants(), "relative z-10"),
+            className: cn(
+              menuItemTrailingTextVariants({ colorScheme, menuStyle }),
+              "relative z-10"
+            ),
             "aria-keyshortcuts": trailingText,
             children: trailingText
           }
@@ -6367,6 +6658,8 @@ function MenuSection({
   className,
   "aria-label": ariaLabel
 }) {
+  const ctx = useMenuContext();
+  const colorScheme = ctx?.colorScheme ?? "standard";
   const sectionAriaLabel = ariaLabel ?? header;
   return /* @__PURE__ */ jsxs(Fragment, { children: [
     showDivider && /* @__PURE__ */ jsx(HeadlessMenuDivider, { className: menuDividerVariants() }),
@@ -6376,7 +6669,7 @@ function MenuSection({
         "aria-label": sectionAriaLabel,
         className: cn(menuSectionVariants(), className),
         children: [
-          header && /* @__PURE__ */ jsx(Header, { className: menuSectionHeaderVariants(), "aria-hidden": "true", children: header }),
+          header && /* @__PURE__ */ jsx(Header, { className: menuSectionHeaderVariants({ colorScheme }), "aria-hidden": "true", children: header }),
           children
         ]
       }