@bug-on/m3-expressive 1.1.0 → 1.2.1

package/dist/index.js

@@ -2,8 +2,8 @@
 'use strict';
 
 var React59 = require('react');
-var jsxRuntime = require('react/jsx-runtime');
 var materialColorUtilities = require('@material/material-color-utilities');
+var jsxRuntime = require('react/jsx-runtime');
 var clsx = require('clsx');
 var tailwindMerge = require('tailwind-merge');
 var RxContextMenu = require('@radix-ui/react-context-menu');
@@ -143,6 +143,143 @@ function useRipple(options = {}) {
   );
   return { rippleRef: ref, onPointerDown };
 }
+function resolveMode(mode) {
+  if (mode !== "system") return mode;
+  if (typeof window === "undefined") return "light";
+  return window.matchMedia("(prefers-color-scheme: dark)").matches ? "dark" : "light";
+}
+function createDynamicScheme(sourceColorHex, isDark, variant = "expressive", contrastLevel = 0) {
+  const hct = materialColorUtilities.Hct.fromInt(argbFromHex(sourceColorHex));
+  const spec = "2025";
+  switch (variant) {
+    case "tonal_spot":
+      return new materialColorUtilities.SchemeTonalSpot(hct, isDark, contrastLevel, spec);
+    case "vibrant":
+      return new materialColorUtilities.SchemeVibrant(hct, isDark, contrastLevel, spec);
+    case "fidelity":
+      return new materialColorUtilities.SchemeFidelity(hct, isDark, contrastLevel, spec);
+    case "content":
+      return new materialColorUtilities.SchemeContent(hct, isDark, contrastLevel, spec);
+    case "monochrome":
+      return new materialColorUtilities.SchemeMonochrome(hct, isDark, contrastLevel, spec);
+    case "neutral":
+      return new materialColorUtilities.SchemeNeutral(hct, isDark, contrastLevel, spec);
+    default:
+      return new materialColorUtilities.SchemeExpressive(hct, isDark, contrastLevel, spec);
+  }
+}
+function argbFromHex(hex) {
+  const sanitized = hex.replace(/^#/, "");
+  const r = Number.parseInt(sanitized.substring(0, 2), 16);
+  const g = Number.parseInt(sanitized.substring(2, 4), 16);
+  const b = Number.parseInt(sanitized.substring(4, 6), 16);
+  return (4278190080 | r << 16 | g << 8 | b) >>> 0;
+}
+function generateM3Theme(sourceColorHex, mode = "light", options = {}) {
+  const { variant = "expressive", contrastLevel = 0 } = options;
+  const isDark = mode === "dark";
+  const scheme = createDynamicScheme(
+    sourceColorHex,
+    isDark,
+    variant,
+    contrastLevel
+  );
+  const hex = (argb) => materialColorUtilities.hexFromArgb(argb);
+  return {
+    // Primary
+    primary: hex(scheme.primary),
+    onPrimary: hex(scheme.onPrimary),
+    primaryContainer: hex(scheme.primaryContainer),
+    onPrimaryContainer: hex(scheme.onPrimaryContainer),
+    inversePrimary: hex(scheme.inversePrimary),
+    primaryFixed: hex(scheme.primaryFixed),
+    primaryFixedDim: hex(scheme.primaryFixedDim),
+    onPrimaryFixed: hex(scheme.onPrimaryFixed),
+    onPrimaryFixedVariant: hex(scheme.onPrimaryFixedVariant),
+    primaryDim: hex(scheme.primaryDim),
+    // Secondary
+    secondary: hex(scheme.secondary),
+    onSecondary: hex(scheme.onSecondary),
+    secondaryContainer: hex(scheme.secondaryContainer),
+    onSecondaryContainer: hex(scheme.onSecondaryContainer),
+    secondaryFixed: hex(scheme.secondaryFixed),
+    secondaryFixedDim: hex(scheme.secondaryFixedDim),
+    onSecondaryFixed: hex(scheme.onSecondaryFixed),
+    onSecondaryFixedVariant: hex(scheme.onSecondaryFixedVariant),
+    secondaryDim: hex(scheme.secondaryDim),
+    // Tertiary
+    tertiary: hex(scheme.tertiary),
+    onTertiary: hex(scheme.onTertiary),
+    tertiaryContainer: hex(scheme.tertiaryContainer),
+    onTertiaryContainer: hex(scheme.onTertiaryContainer),
+    tertiaryFixed: hex(scheme.tertiaryFixed),
+    tertiaryFixedDim: hex(scheme.tertiaryFixedDim),
+    onTertiaryFixed: hex(scheme.onTertiaryFixed),
+    onTertiaryFixedVariant: hex(scheme.onTertiaryFixedVariant),
+    tertiaryDim: hex(scheme.tertiaryDim),
+    // Error
+    error: hex(scheme.error),
+    onError: hex(scheme.onError),
+    errorContainer: hex(scheme.errorContainer),
+    onErrorContainer: hex(scheme.onErrorContainer),
+    // Surface
+    surface: hex(scheme.surface),
+    onSurface: hex(scheme.onSurface),
+    surfaceVariant: hex(scheme.surfaceVariant),
+    onSurfaceVariant: hex(scheme.onSurfaceVariant),
+    surfaceTint: hex(scheme.surfaceTint),
+    surfaceDim: hex(scheme.surfaceDim),
+    surfaceBright: hex(scheme.surfaceBright),
+    surfaceContainerLowest: hex(scheme.surfaceContainerLowest),
+    surfaceContainerLow: hex(scheme.surfaceContainerLow),
+    surfaceContainer: hex(scheme.surfaceContainer),
+    surfaceContainerHigh: hex(scheme.surfaceContainerHigh),
+    surfaceContainerHighest: hex(scheme.surfaceContainerHighest),
+    // Inverse
+    inverseSurface: hex(scheme.inverseSurface),
+    inverseOnSurface: hex(scheme.inverseOnSurface),
+    // Background
+    background: hex(scheme.background),
+    onBackground: hex(scheme.onBackground),
+    // Outline
+    outline: hex(scheme.outline),
+    outlineVariant: hex(scheme.outlineVariant),
+    // Utility
+    shadow: hex(scheme.shadow),
+    scrim: hex(scheme.scrim)
+  };
+}
+function applyTheme(sourceColorHex, mode = "light", root = document.documentElement, options = {}) {
+  const resolved = resolveMode(mode);
+  const colors = generateM3Theme(sourceColorHex, resolved, options);
+  for (const [key, value] of Object.entries(colors)) {
+    const kebabKey = key.replace(/[A-Z]/g, (m68) => `-${m68.toLowerCase()}`);
+    root.style.setProperty(`--md-sys-color-${kebabKey}`, value);
+    root.style.setProperty(`--color-m3-${kebabKey}`, value);
+  }
+  root.setAttribute("data-theme", resolved);
+}
+
+// src/lib/create-theme.ts
+function createMd3ExpressiveTheme(options) {
+  const { seedColor, isDark = false, variant, contrastLevel } = options;
+  const themeOptions = { variant, contrastLevel };
+  const colorScheme = generateM3Theme(
+    seedColor,
+    isDark ? "dark" : "light",
+    themeOptions
+  );
+  const cssVariables = schemeToCssVariables(colorScheme);
+  return { cssVariables, colorScheme };
+}
+function schemeToCssVariables(scheme) {
+  const result = {};
+  for (const [key, value] of Object.entries(scheme)) {
+    const kebabKey = key.replace(/[A-Z]/g, (m68) => `-${m68.toLowerCase()}`);
+    result[`--md-sys-color-${kebabKey}`] = value;
+  }
+  return result;
+}
 function MaterialSymbolsPreconnect({
   variants = ["outlined"]
 }) {
@@ -182,78 +319,6 @@ function MaterialSymbolsPreconnect({
     )
   ] });
 }
-function resolveMode(mode) {
-  if (mode !== "system") return mode;
-  if (typeof window === "undefined") return "light";
-  return window.matchMedia("(prefers-color-scheme: dark)").matches ? "dark" : "light";
-}
-function generateM3Theme(sourceColorHex, mode = "light") {
-  const sourceColor = materialColorUtilities.argbFromHex(sourceColorHex);
-  const theme = materialColorUtilities.themeFromSourceColor(sourceColor);
-  const scheme = mode === "light" ? theme.schemes.light : theme.schemes.dark;
-  const palettes = theme.palettes;
-  const tone = (palette, t) => materialColorUtilities.hexFromArgb(palette.tone(t));
-  return {
-    primary: materialColorUtilities.hexFromArgb(scheme.primary),
-    onPrimary: materialColorUtilities.hexFromArgb(scheme.onPrimary),
-    primaryContainer: materialColorUtilities.hexFromArgb(scheme.primaryContainer),
-    onPrimaryContainer: materialColorUtilities.hexFromArgb(scheme.onPrimaryContainer),
-    inversePrimary: materialColorUtilities.hexFromArgb(scheme.inversePrimary),
-    primaryFixed: tone(palettes.primary, 90),
-    primaryFixedDim: tone(palettes.primary, 80),
-    onPrimaryFixed: tone(palettes.primary, 10),
-    onPrimaryFixedVariant: tone(palettes.primary, 30),
-    secondary: materialColorUtilities.hexFromArgb(scheme.secondary),
-    onSecondary: materialColorUtilities.hexFromArgb(scheme.onSecondary),
-    secondaryContainer: materialColorUtilities.hexFromArgb(scheme.secondaryContainer),
-    onSecondaryContainer: materialColorUtilities.hexFromArgb(scheme.onSecondaryContainer),
-    secondaryFixed: tone(palettes.secondary, 90),
-    secondaryFixedDim: tone(palettes.secondary, 80),
-    onSecondaryFixed: tone(palettes.secondary, 10),
-    onSecondaryFixedVariant: tone(palettes.secondary, 30),
-    tertiary: materialColorUtilities.hexFromArgb(scheme.tertiary),
-    onTertiary: materialColorUtilities.hexFromArgb(scheme.onTertiary),
-    tertiaryContainer: materialColorUtilities.hexFromArgb(scheme.tertiaryContainer),
-    onTertiaryContainer: materialColorUtilities.hexFromArgb(scheme.onTertiaryContainer),
-    tertiaryFixed: tone(palettes.tertiary, 90),
-    tertiaryFixedDim: tone(palettes.tertiary, 80),
-    onTertiaryFixed: tone(palettes.tertiary, 10),
-    onTertiaryFixedVariant: tone(palettes.tertiary, 30),
-    error: materialColorUtilities.hexFromArgb(scheme.error),
-    onError: materialColorUtilities.hexFromArgb(scheme.onError),
-    errorContainer: materialColorUtilities.hexFromArgb(scheme.errorContainer),
-    onErrorContainer: materialColorUtilities.hexFromArgb(scheme.onErrorContainer),
-    surface: materialColorUtilities.hexFromArgb(scheme.surface),
-    onSurface: materialColorUtilities.hexFromArgb(scheme.onSurface),
-    surfaceVariant: materialColorUtilities.hexFromArgb(scheme.surfaceVariant),
-    onSurfaceVariant: materialColorUtilities.hexFromArgb(scheme.onSurfaceVariant),
-    surfaceTint: materialColorUtilities.hexFromArgb(scheme.primary),
-    // Surface container roles from neutral palette tones
-    surfaceContainerLowest: mode === "light" ? tone(palettes.neutral, 100) : tone(palettes.neutral, 4),
-    surfaceContainerLow: mode === "light" ? tone(palettes.neutral, 96) : tone(palettes.neutral, 10),
-    surfaceContainer: mode === "light" ? tone(palettes.neutral, 94) : tone(palettes.neutral, 12),
-    surfaceContainerHigh: mode === "light" ? tone(palettes.neutral, 92) : tone(palettes.neutral, 17),
-    surfaceContainerHighest: mode === "light" ? tone(palettes.neutral, 90) : tone(palettes.neutral, 22),
-    inverseSurface: materialColorUtilities.hexFromArgb(scheme.inverseSurface),
-    inverseOnSurface: materialColorUtilities.hexFromArgb(scheme.inverseOnSurface),
-    background: materialColorUtilities.hexFromArgb(scheme.background),
-    onBackground: materialColorUtilities.hexFromArgb(scheme.onBackground),
-    outline: materialColorUtilities.hexFromArgb(scheme.outline),
-    outlineVariant: materialColorUtilities.hexFromArgb(scheme.outlineVariant),
-    shadow: materialColorUtilities.hexFromArgb(scheme.shadow),
-    scrim: materialColorUtilities.hexFromArgb(scheme.scrim)
-  };
-}
-function applyTheme(sourceColorHex, mode = "light", root = document.documentElement) {
-  const resolved = resolveMode(mode);
-  const colors = generateM3Theme(sourceColorHex, resolved);
-  for (const [key, value] of Object.entries(colors)) {
-    const kebabKey = key.replace(/[A-Z]/g, (m67) => `-${m67.toLowerCase()}`);
-    root.style.setProperty(`--md-sys-color-${kebabKey}`, value);
-    root.style.setProperty(`--color-m3-${kebabKey}`, value);
-  }
-  root.setAttribute("data-theme", resolved);
-}
 function cn(...inputs) {
   return tailwindMerge.twMerge(clsx.clsx(inputs));
 }
@@ -1047,8 +1112,8 @@ var RoundedPolygon = class _RoundedPolygon {
       );
       const mid = c.pointOnCurve(0.5);
       const md = distanceSquared(mid.x - this.centerX, mid.y - this.centerY);
-      const m67 = Math.max(ad, md);
-      if (m67 > maxDistSq) maxDistSq = m67;
+      const m68 = Math.max(ad, md);
+      if (m68 > maxDistSq) maxDistSq = m68;
     }
     const d = Math.sqrt(maxDistSq);
     return [
@@ -6584,6 +6649,35 @@ var BUTTON_COLOR_TOKENS = {
     default: "bg-transparent text-m3-primary",
     selected: "bg-transparent text-m3-primary",
     unselected: "bg-transparent text-m3-primary"
+  },
+  // ── MD3 Expressive accent variants ──────────────────────────────────────
+  /**
+   * High-chroma tertiary tone. Use for hero CTAs and expressive moments where
+   * a distinct accent beyond primary is needed (e.g., hero chip, highlight fab).
+   */
+  tertiary: {
+    default: "bg-m3-tertiary text-m3-on-tertiary",
+    selected: "bg-m3-tertiary text-m3-on-tertiary",
+    unselected: "bg-m3-tertiary-container text-m3-on-tertiary-container"
+  },
+  /**
+   * Brand-stable primary fixed. Hue stays consistent across light and dark modes.
+   * Ideal for badges, pill chips, and elements that must carry the brand color
+   * regardless of the active theme.
+   */
+  "primary-fixed": {
+    default: "bg-m3-primary-fixed text-m3-on-primary-fixed",
+    selected: "bg-m3-primary-fixed text-m3-on-primary-fixed",
+    unselected: "bg-m3-primary-fixed text-m3-on-primary-fixed-variant"
+  },
+  /**
+   * Brand-stable tertiary fixed. Use for special-state indicators, achievement
+   * badges, or accent pills that need a fixed tertiary hue across themes.
+   */
+  "tertiary-fixed": {
+    default: "bg-m3-tertiary-fixed text-m3-on-tertiary-fixed",
+    selected: "bg-m3-tertiary-fixed text-m3-on-tertiary-fixed",
+    unselected: "bg-m3-tertiary-fixed text-m3-on-tertiary-fixed-variant"
   }
 };
 var MOTION_PROP_KEYS = [
@@ -6955,7 +7049,7 @@ var PILL_BORDER_RADIUS = 9999;
 var MIN_FLEX_GROW = 0.01;
 var PADDING_EXPAND_MULTIPLIER = 4;
 var CHECK_ICON_SIZE = 24;
-var CHECK_ICON = /* @__PURE__ */ jsxRuntime.jsx(Icon, { name: "check", size: CHECK_ICON_SIZE, weight: 700 });
+var CHECK_ICON = /* @__PURE__ */ jsxRuntime.jsx(Icon, { name: "check", variant: "rounded", size: CHECK_ICON_SIZE, weight: 700 });
 var CHECK_ICON_GAP_MAP = {
   xs: 6,
   sm: 8,
@@ -6975,12 +7069,6 @@ var WIDTH_MORPH_SPRING = {
   damping: 38,
   mass: 0.85
 };
-var NAVBAR_EXPRESSIVE_SPRING = {
-  type: "spring",
-  stiffness: 430,
-  damping: 38,
-  mass: 0.8
-};
 var AnimatedCheckLabel = React59__namespace.memo(function AnimatedCheckLabel2({
   selected,
   size,
@@ -7018,23 +7106,6 @@ var AnimatedCheckLabel = React59__namespace.memo(function AnimatedCheckLabel2({
     }
   );
 });
-var AnimatedNavbarLabel = React59__namespace.memo(function AnimatedNavbarLabel2({
-  show,
-  children
-}) {
-  return /* @__PURE__ */ jsxRuntime.jsx(react.AnimatePresence, { initial: false, mode: "popLayout", children: show && /* @__PURE__ */ jsxRuntime.jsx(
-    react.m.span,
-    {
-      initial: { width: 0, opacity: 0, scale: 0.8 },
-      animate: { width: "auto", opacity: 1, scale: 1 },
-      exit: { width: 0, opacity: 0, scale: 0.8 },
-      transition: NAVBAR_EXPRESSIVE_SPRING,
-      className: "overflow-hidden whitespace-nowrap text-sm font-semibold tracking-[0.01em] ml-1.5",
-      children
-    },
-    "navbar-label"
-  ) });
-});
 function resolveConnectedShapes(variant, orientation, isFirst, isLast, itemSize) {
   const defaults = ButtonGroupDefaults.connectedLeadingButtonShapes(itemSize);
   if (variant !== "connected") return defaults;
@@ -7055,7 +7126,7 @@ function resolveConnectedShapes(variant, orientation, isFirst, isLast, itemSize)
   }
   return defaults;
 }
-function resolveIconAndLabel(element, isSelected, itemSize, variant, showCheck, iconBehavior, labelBehavior) {
+function resolveIconAndLabel(element, isSelected, itemSize, showCheck, iconBehavior, labelBehavior) {
   let icon = element.props.icon;
   let label = element.props.children;
   const animateCheckInLabel = showCheck && iconBehavior !== "none" && iconBehavior !== "selected" && label !== void 0;
@@ -7071,9 +7142,6 @@ function resolveIconAndLabel(element, isSelected, itemSize, variant, showCheck,
   }
   if (animateCheckInLabel && label !== void 0) {
     label = /* @__PURE__ */ jsxRuntime.jsx(AnimatedCheckLabel, { selected: isSelected, size: itemSize, children: label });
-  } else if (variant === "navbar" && label !== void 0) {
-    const showLabel = !labelBehavior || labelBehavior === "all" || labelBehavior === "selected" && isSelected;
-    label = /* @__PURE__ */ jsxRuntime.jsx(AnimatedNavbarLabel, { show: showLabel, children: label });
   }
   return { icon, label };
 }
@@ -7108,13 +7176,11 @@ function resolveFlexTargets(variant, orientation, isSelected, isPressed, hasSele
 function buildMotionProps(variant, isSelected, isPressed, itemSize, shapes, flex, existingAnimate, existingWhileTap) {
   var _a, _b;
   const props = { animate: __spreadValues({}, existingAnimate) };
-  if (variant !== "navbar") {
-    if (flex.flexGrow !== void 0) {
-      props.animate.flexGrow = flex.flexGrow;
-    }
-    if (flex.paddingInline !== void 0) {
-      props.animate.paddingInline = flex.paddingInline;
-    }
+  if (flex.flexGrow !== void 0) {
+    props.animate.flexGrow = flex.flexGrow;
+  }
+  if (flex.paddingInline !== void 0) {
+    props.animate.paddingInline = flex.paddingInline;
   }
   if (variant === "standard") {
     const pressedRadius = (_a = PRESSED_RADIUS_MAP[itemSize]) != null ? _a : PRESSED_RADIUS_MAP.sm;
@@ -7165,13 +7231,6 @@ function buildMotionProps(variant, isSelected, isPressed, itemSize, shapes, flex
     });
     props.layout = true;
   }
-  if (variant === "navbar") {
-    props.layout = true;
-    props.transition = {
-      layout: WIDTH_MORPH_SPRING,
-      default: BUTTON_SHAPE_MORPH_SPRING
-    };
-  }
   return props;
 }
 var ButtonGroupComponent = React59__namespace.forwardRef(
@@ -7211,7 +7270,6 @@ var ButtonGroupComponent = React59__namespace.forwardRef(
     const [lockedGroupSize, setLockedGroupSize] = React59__namespace.useState(
       null
     );
-    const layoutIdGroup = React59__namespace.useId();
     const rootRef = React59__namespace.useRef(null);
     const setRootRef = React59__namespace.useCallback(
       (node) => {
@@ -7294,7 +7352,7 @@ var ButtonGroupComponent = React59__namespace.forwardRef(
         className: cn(
           "inline-flex p-0 m-0 border-none max-w-full [scrollbar-width:none] [&::-webkit-scrollbar]:hidden",
           orientation === "vertical" ? "flex-col items-stretch overflow-y-auto overflow-x-hidden" : "flex-row overflow-x-auto overflow-y-hidden",
-          variant === "standard" ? "gap-3" : variant === "navbar" ? "gap-1.5 h-full" : "gap-0.5",
+          variant === "standard" ? "gap-3" : "gap-0.5",
           fullWidth && "w-full",
           fullWidth && orientation === "vertical" && "h-full",
           className
@@ -7304,7 +7362,7 @@ var ButtonGroupComponent = React59__namespace.forwardRef(
         onPointerUp: handlePointerLeaveAndUp
       }, props), {
         children: childrenArray.map((child, index) => {
-          var _a2, _b2, _c;
+          var _a2, _b2;
           const element = child;
           const isSelected = element.props.selected === true;
           const isFirst = index === 0;
@@ -7316,7 +7374,6 @@ var ButtonGroupComponent = React59__namespace.forwardRef(
             element,
             isSelected,
             itemSize,
-            variant,
             showCheck,
             iconBehavior,
             labelBehavior
@@ -7342,7 +7399,7 @@ var ButtonGroupComponent = React59__namespace.forwardRef(
             basePx
           );
           const dynamicStyle = __spreadValues({}, element.props.style);
-          if (variant !== "navbar" && flex.flexGrow !== void 0 && fullWidth) {
+          if (flex.flexGrow !== void 0 && fullWidth) {
             dynamicStyle.flexBasis = 0;
             dynamicStyle.flexShrink = 1;
             dynamicStyle.minWidth = 0;
@@ -7360,13 +7417,7 @@ var ButtonGroupComponent = React59__namespace.forwardRef(
             existingWhileTap
           );
           const connectedClasses = variant === "connected" && isSelected ? "z-20" : "";
-          const navbarFlexStyle = flex.flexGrow !== void 0 ? {
-            flexBasis: fullWidth && labelBehavior !== "selected" ? 0 : "auto",
-            flexShrink: fullWidth ? 1 : 0,
-            flexGrow: flex.flexGrow,
-            minWidth: labelBehavior !== "selected" ? 0 : "fit-content"
-          } : {};
-          const clonedElement = React59__namespace.cloneElement(element, __spreadValues(__spreadProps(__spreadValues(__spreadValues(__spreadValues({
+          const clonedElement = React59__namespace.cloneElement(element, __spreadValues(__spreadProps(__spreadValues({
             key: (_b2 = element.key) != null ? _b2 : index,
             tabIndex: isFirst ? 0 : -1,
             size: size || element.props.size,
@@ -7375,71 +7426,20 @@ var ButtonGroupComponent = React59__namespace.forwardRef(
           }, variant === "connected" && {
             colorStyle: element.props.colorStyle || "tonal",
             selectedColorStyle: element.props.selectedColorStyle || "filled"
-          }), variant === "navbar" && {
-            colorStyle: "text",
-            selectedColorStyle: "text",
-            className: cn(
-              element.props.className,
-              "w-full! h-full! px-3! min-w-0! relative z-20 flex items-center justify-center",
-              isSelected ? "text-m3-on-secondary-container! hover:bg-transparent! active:bg-transparent!" : "text-m3-on-surface-variant! hover:bg-transparent! active:bg-transparent!",
-              itemClassName
-            )
-          }), variant !== "navbar" && {
+          }), {
             className: cn(
               element.props.className,
               connectedClasses,
               "focus-visible:z-10 hover:z-10 relative min-w-0",
               orientation === "vertical" && "w-full",
               itemClassName
-            )
-          }), {
-            style: variant === "navbar" ? __spreadProps(__spreadValues({}, dynamicStyle), { minWidth: 0 }) : dynamicStyle,
+            ),
+            style: dynamicStyle,
             onPointerDown: (e) => {
               setPressedIndex(index);
               if (element.props.onPointerDown) element.props.onPointerDown(e);
             }
           }), motionProps));
-          if (variant === "navbar") {
-            return /* @__PURE__ */ jsxRuntime.jsxs(
-              react.m.div,
-              {
-                layout: true,
-                whileTap: { scale: 0.96 },
-                transition: NAVBAR_EXPRESSIVE_SPRING,
-                className: "group relative h-full flex items-center justify-center min-w-0",
-                style: navbarFlexStyle,
-                children: [
-                  /* @__PURE__ */ jsxRuntime.jsxs(
-                    "div",
-                    {
-                      className: "absolute inset-x-1 inset-y-0 m-auto flex items-center justify-center pointer-events-none",
-                      style: { zIndex: 1 },
-                      children: [
-                        /* @__PURE__ */ jsxRuntime.jsx(
-                          "div",
-                          {
-                            className: "w-full h-[40px] bg-m3-on-surface-variant/8 opacity-0 group-hover:opacity-100 transition-opacity duration-200",
-                            style: { borderRadius: PILL_BORDER_RADIUS }
-                          }
-                        ),
-                        /* @__PURE__ */ jsxRuntime.jsx(react.AnimatePresence, { children: isSelected && /* @__PURE__ */ jsxRuntime.jsx(
-                          react.m.div,
-                          {
-                            layoutId: `navbar-active-indicator-${layoutIdGroup}`,
-                            className: "absolute inset-0 m-auto w-full h-[40px] bg-m3-secondary-container",
-                            style: { borderRadius: PILL_BORDER_RADIUS },
-                            transition: NAVBAR_EXPRESSIVE_SPRING
-                          }
-                        ) })
-                      ]
-                    }
-                  ),
-                  clonedElement
-                ]
-              },
-              (_c = element.key) != null ? _c : index
-            );
-          }
           return clonedElement;
         })
       })
@@ -7544,6 +7544,8 @@ var ExtendedFABComponent = React59__namespace.forwardRef(
       scrollThreshold = 50,
       collapsed,
       onCollapsedChange,
+      asChild = false,
+      children,
       onClick,
       onKeyDown,
       layoutId,
@@ -7563,6 +7565,8 @@ var ExtendedFABComponent = React59__namespace.forwardRef(
       "scrollThreshold",
       "collapsed",
       "onCollapsedChange",
+      "asChild",
+      "children",
       "onClick",
       "onKeyDown",
       "layoutId",
@@ -7614,7 +7618,109 @@ var ExtendedFABComponent = React59__namespace.forwardRef(
       },
       [loading, onClick, onKeyDown]
     );
-    return /* @__PURE__ */ jsxRuntime.jsx(react.LazyMotion, { features: react.domMax, strict: true, children: /* @__PURE__ */ jsxRuntime.jsx(react.AnimatePresence, { children: visible && !(isCollapsed && !hasIcon) && /* @__PURE__ */ jsxRuntime.jsxs(
+    const containerClassName = cn(
+      "relative shrink-0 inline-flex items-center select-none cursor-pointer overflow-hidden",
+      "transition-[box-shadow,filter] duration-200",
+      "focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-m3-primary focus-visible:ring-offset-2",
+      "disabled:pointer-events-none disabled:opacity-[0.38] disabled:shadow-none",
+      colors.bg,
+      colors.text,
+      lowered ? "shadow-sm" : "shadow-md",
+      (_d = SIZE_HEIGHT[size]) != null ? _d : "h-14",
+      SIZE_TEXT[size],
+      isCollapsed ? cn("px-0 justify-center", SIZE_WIDTH_COLLAPSED[size]) : cn(
+        hasIcon ? "justify-start" : "justify-center",
+        SIZE_PADDING[size],
+        hasIcon && SIZE_GAP[size]
+      ),
+      dir === "rtl" || restProps.dir === "rtl" ? "flex-row-reverse" : "flex-row",
+      loading && "pointer-events-none opacity-75 cursor-not-allowed",
+      className
+    );
+    const innerContent = /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [
+      /* @__PURE__ */ jsxRuntime.jsx(Ripple, { ripples, onRippleDone: removeRipple }),
+      hasIcon && /* @__PURE__ */ jsxRuntime.jsx(
+        react.m.span,
+        {
+          layout: "position",
+          className: cn(
+            "flex items-center justify-center shrink-0",
+            sizeIcon.cls
+          ),
+          children: /* @__PURE__ */ jsxRuntime.jsx(react.AnimatePresence, { mode: "wait", initial: false, children: loading ? /* @__PURE__ */ jsxRuntime.jsx(
+            react.m.span,
+            __spreadProps(__spreadValues({}, ICON_SPAN_VARIANTS), {
+              transition: SPRING_TRANSITION,
+              className: "flex items-center justify-center shrink-0 w-full h-full",
+              children: loadingVariant === "loading-indicator" ? /* @__PURE__ */ jsxRuntime.jsx(
+                LoadingIndicator,
+                {
+                  size: sizeIcon.px,
+                  color: "currentColor",
+                  "aria-label": "Loading"
+                }
+              ) : /* @__PURE__ */ jsxRuntime.jsx(
+                ProgressIndicator,
+                {
+                  variant: "circular",
+                  size: sizeIcon.px,
+                  color: "currentColor",
+                  trackColor: "transparent",
+                  "aria-label": "Loading"
+                }
+              )
+            }),
+            "loading"
+          ) : icon && /* @__PURE__ */ jsxRuntime.jsx(
+            react.m.span,
+            __spreadProps(__spreadValues({}, ICON_SPAN_VARIANTS), {
+              transition: SPRING_TRANSITION,
+              "aria-hidden": "true",
+              className: "flex items-center justify-center shrink-0 w-full h-full [&>svg]:w-full [&>svg]:h-full",
+              children: icon
+            }),
+            "icon"
+          ) })
+        }
+      ),
+      /* @__PURE__ */ jsxRuntime.jsx(react.AnimatePresence, { initial: false, children: !isCollapsed && /* @__PURE__ */ jsxRuntime.jsx(
+        react.m.span,
+        {
+          layout: "position",
+          initial: { opacity: 0, width: 0 },
+          animate: { opacity: 1, width: "auto" },
+          exit: { opacity: 0, width: 0 },
+          transition: {
+            opacity: { duration: 0.15, ease: "linear" },
+            width: SPRING_TRANSITION
+          },
+          className: "overflow-hidden whitespace-nowrap",
+          children: label
+        },
+        "label"
+      ) })
+    ] });
+    return /* @__PURE__ */ jsxRuntime.jsx(react.LazyMotion, { features: react.domMax, strict: true, children: /* @__PURE__ */ jsxRuntime.jsx(react.AnimatePresence, { children: visible && !(isCollapsed && !hasIcon) && (asChild ? /* @__PURE__ */ jsxRuntime.jsx(
+      reactSlot.Slot,
+      __spreadProps(__spreadValues({
+        ref: localRef,
+        "aria-label": ariaLabel || label,
+        "aria-busy": loading || void 0,
+        "aria-disabled": loading || restProps.disabled,
+        onClick: handleClick,
+        onPointerDown,
+        onKeyDown: handleKeyDown,
+        style: __spreadProps(__spreadValues({}, style), {
+          borderRadius: `${radiusConfig.default}px`
+        }),
+        className: containerClassName
+      }, restProps), {
+        children: React59__namespace.cloneElement(
+          React59__namespace.Children.only(children),
+          { children: innerContent }
+        )
+      })
+    ) : /* @__PURE__ */ jsxRuntime.jsx(
       react.m.button,
       __spreadProps(__spreadValues({
         ref: localRef,
@@ -7646,91 +7752,11 @@ var ExtendedFABComponent = React59__namespace.forwardRef(
           opacity: { duration: 0.2, ease: "linear" },
           layout: SPRING_TRANSITION
         },
-        className: cn(
-          "relative shrink-0 inline-flex items-center select-none cursor-pointer overflow-hidden",
-          "transition-[box-shadow,filter] duration-200",
-          "focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-m3-primary focus-visible:ring-offset-2",
-          "disabled:pointer-events-none disabled:opacity-[0.38] disabled:shadow-none",
-          colors.bg,
-          colors.text,
-          lowered ? "shadow-sm" : "shadow-md",
-          (_d = SIZE_HEIGHT[size]) != null ? _d : "h-14",
-          SIZE_TEXT[size],
-          isCollapsed ? cn("px-0 justify-center", SIZE_WIDTH_COLLAPSED[size]) : cn(
-            hasIcon ? "justify-start" : "justify-center",
-            SIZE_PADDING[size],
-            hasIcon && SIZE_GAP[size]
-          ),
-          dir === "rtl" || restProps.dir === "rtl" ? "flex-row-reverse" : "flex-row",
-          loading && "pointer-events-none opacity-75 cursor-not-allowed",
-          className
-        )
+        className: containerClassName
       }, restProps), {
-        children: [
-          /* @__PURE__ */ jsxRuntime.jsx(Ripple, { ripples, onRippleDone: removeRipple }),
-          hasIcon && /* @__PURE__ */ jsxRuntime.jsx(
-            react.m.span,
-            {
-              layout: "position",
-              className: cn(
-                "flex items-center justify-center shrink-0",
-                sizeIcon.cls
-              ),
-              children: /* @__PURE__ */ jsxRuntime.jsx(react.AnimatePresence, { mode: "wait", initial: false, children: loading ? /* @__PURE__ */ jsxRuntime.jsx(
-                react.m.span,
-                __spreadProps(__spreadValues({}, ICON_SPAN_VARIANTS), {
-                  transition: SPRING_TRANSITION,
-                  className: "flex items-center justify-center shrink-0 w-full h-full",
-                  children: loadingVariant === "loading-indicator" ? /* @__PURE__ */ jsxRuntime.jsx(
-                    LoadingIndicator,
-                    {
-                      size: sizeIcon.px,
-                      color: "currentColor",
-                      "aria-label": "Loading"
-                    }
-                  ) : /* @__PURE__ */ jsxRuntime.jsx(
-                    ProgressIndicator,
-                    {
-                      variant: "circular",
-                      size: sizeIcon.px,
-                      color: "currentColor",
-                      trackColor: "transparent",
-                      "aria-label": "Loading"
-                    }
-                  )
-                }),
-                "loading"
-              ) : icon && /* @__PURE__ */ jsxRuntime.jsx(
-                react.m.span,
-                __spreadProps(__spreadValues({}, ICON_SPAN_VARIANTS), {
-                  transition: SPRING_TRANSITION,
-                  "aria-hidden": "true",
-                  className: "flex items-center justify-center shrink-0 w-full h-full [&>svg]:w-full [&>svg]:h-full",
-                  children: icon
-                }),
-                "icon"
-              ) })
-            }
-          ),
-          /* @__PURE__ */ jsxRuntime.jsx(react.AnimatePresence, { initial: false, children: !isCollapsed && /* @__PURE__ */ jsxRuntime.jsx(
-            react.m.span,
-            {
-              layout: "position",
-              initial: { opacity: 0, width: 0 },
-              animate: { opacity: 1, width: "auto" },
-              exit: { opacity: 0, width: 0 },
-              transition: {
-                opacity: { duration: 0.15, ease: "linear" },
-                width: SPRING_TRANSITION
-              },
-              className: "overflow-hidden whitespace-nowrap",
-              children: label
-            },
-            "label"
-          ) })
-        ]
+        children: innerContent
       })
-    ) }) });
+    )) }) });
   }
 );
 ExtendedFABComponent.displayName = "ExtendedFAB";
@@ -7819,6 +7845,7 @@ var FABComponent = React59__namespace.forwardRef(
       loading = false,
       loadingVariant = "loading-indicator",
       visible = true,
+      asChild = false,
       onClick,
       onKeyDown,
       "aria-label": ariaLabel
@@ -7834,6 +7861,7 @@ var FABComponent = React59__namespace.forwardRef(
       "loading",
       "loadingVariant",
       "visible",
+      "asChild",
       "onClick",
       "onKeyDown",
       "aria-label"
@@ -7871,19 +7899,116 @@ var FABComponent = React59__namespace.forwardRef(
       },
       [loading, onClick, onKeyDown]
     );
-    return /* @__PURE__ */ jsxRuntime.jsx(react.LazyMotion, { features: react.domMax, strict: true, children: /* @__PURE__ */ jsxRuntime.jsx(react.AnimatePresence, { children: visible && /* @__PURE__ */ jsxRuntime.jsxs(
+    const labelContent = asChild ? React59__namespace.Children.only(children).props.children : children;
+    const innerContent = /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [
+      needsTouchTarget && /* @__PURE__ */ jsxRuntime.jsx(TouchTarget, {}),
+      /* @__PURE__ */ jsxRuntime.jsx(Ripple, { ripples, onRippleDone: removeRipple }),
+      /* @__PURE__ */ jsxRuntime.jsx(react.AnimatePresence, { mode: "wait", initial: false, children: loading ? /* @__PURE__ */ jsxRuntime.jsx(
+        react.m.span,
+        __spreadProps(__spreadValues({}, ICON_SPAN_VARIANTS), {
+          transition: SPRING_TRANSITION,
+          className: cn(
+            "flex items-center justify-center shrink-0",
+            iconClass
+          ),
+          children: loadingVariant === "loading-indicator" ? /* @__PURE__ */ jsxRuntime.jsx(
+            LoadingIndicator,
+            {
+              size: iconPx,
+              color: "currentColor",
+              "aria-label": "Loading"
+            }
+          ) : /* @__PURE__ */ jsxRuntime.jsx(
+            ProgressIndicator,
+            {
+              variant: "circular",
+              size: iconPx,
+              color: "currentColor",
+              trackColor: "transparent",
+              "aria-label": "Loading"
+            }
+          )
+        }),
+        "loading"
+      ) : /* @__PURE__ */ jsxRuntime.jsx(
+        react.m.span,
+        __spreadProps(__spreadValues({}, ICON_SPAN_VARIANTS), {
+          transition: SPRING_TRANSITION,
+          "aria-hidden": "true",
+          className: cn(
+            "flex items-center justify-center shrink-0 [&>svg]:w-full [&>svg]:h-full",
+            iconClass
+          ),
+          children: icon
+        }),
+        "icon"
+      ) }),
+      /* @__PURE__ */ jsxRuntime.jsx(react.AnimatePresence, { initial: false, children: extended && labelContent && /* @__PURE__ */ jsxRuntime.jsx(
+        react.m.span,
+        {
+          initial: { width: 0, opacity: 0 },
+          animate: { width: "auto", opacity: 1 },
+          exit: { width: 0, opacity: 0 },
+          transition: SPRING_TRANSITION,
+          className: "overflow-hidden whitespace-nowrap ml-3",
+          children: labelContent
+        },
+        "label"
+      ) })
+    ] });
+    const containerClassName = cn(
+      "relative shrink-0 inline-flex items-center justify-center",
+      "select-none cursor-pointer overflow-hidden",
+      "transition-[box-shadow,opacity,filter] duration-200",
+      "focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-m3-primary focus-visible:ring-offset-2",
+      "disabled:pointer-events-none disabled:opacity-[0.38] disabled:shadow-none",
+      colors.bg,
+      colors.text,
+      lowered ? "shadow-sm" : colors.shadow,
+      (_d = SIZE_STYLES[size]) != null ? _d : "h-14 w-14",
+      extended && "w-auto px-6",
+      SIZE_TEXT_CLASS[size],
+      loading && "pointer-events-none opacity-75 cursor-not-allowed",
+      className
+    );
+    const computedAriaLabel = ariaLabel || (typeof children === "string" ? children : void 0);
+    return /* @__PURE__ */ jsxRuntime.jsx(react.LazyMotion, { features: react.domMax, strict: true, children: /* @__PURE__ */ jsxRuntime.jsx(react.AnimatePresence, { children: visible && (asChild ? /* @__PURE__ */ jsxRuntime.jsx(
+      reactSlot.Slot,
+      __spreadProps(__spreadValues({
+        ref,
+        "aria-label": computedAriaLabel,
+        "aria-busy": loading || void 0,
+        "aria-disabled": loading || restProps.disabled,
+        onClick: handleClick,
+        onPointerDown,
+        onKeyDown: handleKeyDown,
+        style: __spreadProps(__spreadValues({}, style), {
+          borderRadius: `${animateRadius}px`
+        }),
+        className: containerClassName
+      }, restProps), {
+        children: React59__namespace.cloneElement(
+          React59__namespace.Children.only(children),
+          { children: innerContent }
+        )
+      })
+    ) : /* @__PURE__ */ jsxRuntime.jsx(
       react.m.button,
       __spreadProps(__spreadValues({
         ref,
         type: "button",
-        "aria-label": ariaLabel || (typeof children === "string" ? children : void 0),
+        "aria-label": computedAriaLabel,
         "aria-busy": loading || void 0,
         "aria-disabled": loading || restProps.disabled,
         onClick: handleClick,
         onPointerDown,
         onKeyDown: handleKeyDown,
         style,
-        initial: { scale: 0.5, opacity: 0, borderRadius: animateRadius },
+        initial: {
+          scale: 0.5,
+          opacity: 0,
+          borderRadius: animateRadius
+        },
         animate: { scale: 1, opacity: 1, borderRadius: animateRadius },
         exit: { scale: 0.5, opacity: 0 },
         whileTap: { borderRadius: pressedRadius },
@@ -7892,80 +8017,11 @@ var FABComponent = React59__namespace.forwardRef(
           scale: SPRING_TRANSITION,
           opacity: { duration: 0.25, ease: "easeOut" }
         },
-        className: cn(
-          "relative shrink-0 inline-flex items-center justify-center",
-          "select-none cursor-pointer overflow-hidden",
-          "transition-[box-shadow,opacity,filter] duration-200",
-          "focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-m3-primary focus-visible:ring-offset-2",
-          "disabled:pointer-events-none disabled:opacity-[0.38] disabled:shadow-none",
-          colors.bg,
-          colors.text,
-          lowered ? "shadow-sm" : colors.shadow,
-          (_d = SIZE_STYLES[size]) != null ? _d : "h-14 w-14",
-          extended && "w-auto px-6",
-          SIZE_TEXT_CLASS[size],
-          loading && "pointer-events-none opacity-75 cursor-not-allowed",
-          className
-        )
+        className: containerClassName
       }, restProps), {
-        children: [
-          needsTouchTarget && /* @__PURE__ */ jsxRuntime.jsx(TouchTarget, {}),
-          /* @__PURE__ */ jsxRuntime.jsx(Ripple, { ripples, onRippleDone: removeRipple }),
-          /* @__PURE__ */ jsxRuntime.jsx(react.AnimatePresence, { mode: "wait", initial: false, children: loading ? /* @__PURE__ */ jsxRuntime.jsx(
-            react.m.span,
-            __spreadProps(__spreadValues({}, ICON_SPAN_VARIANTS), {
-              transition: SPRING_TRANSITION,
-              className: cn(
-                "flex items-center justify-center shrink-0",
-                iconClass
-              ),
-              children: loadingVariant === "loading-indicator" ? /* @__PURE__ */ jsxRuntime.jsx(
-                LoadingIndicator,
-                {
-                  size: iconPx,
-                  color: "currentColor",
-                  "aria-label": "Loading"
-                }
-              ) : /* @__PURE__ */ jsxRuntime.jsx(
-                ProgressIndicator,
-                {
-                  variant: "circular",
-                  size: iconPx,
-                  color: "currentColor",
-                  trackColor: "transparent",
-                  "aria-label": "Loading"
-                }
-              )
-            }),
-            "loading"
-          ) : /* @__PURE__ */ jsxRuntime.jsx(
-            react.m.span,
-            __spreadProps(__spreadValues({}, ICON_SPAN_VARIANTS), {
-              transition: SPRING_TRANSITION,
-              "aria-hidden": "true",
-              className: cn(
-                "flex items-center justify-center shrink-0 [&>svg]:w-full [&>svg]:h-full",
-                iconClass
-              ),
-              children: icon
-            }),
-            "icon"
-          ) }),
-          /* @__PURE__ */ jsxRuntime.jsx(react.AnimatePresence, { initial: false, children: extended && children && /* @__PURE__ */ jsxRuntime.jsx(
-            react.m.span,
-            {
-              initial: { width: 0, opacity: 0 },
-              animate: { width: "auto", opacity: 1 },
-              exit: { width: 0, opacity: 0 },
-              transition: SPRING_TRANSITION,
-              className: "overflow-hidden whitespace-nowrap ml-3",
-              children
-            },
-            "label"
-          ) })
-        ]
+        children: innerContent
       })
-    ) }) });
+    )) }) });
   }
 );
 FABComponent.displayName = "FAB";
@@ -8165,7 +8221,9 @@ function FABMenuItem({
   disabled = false,
   colorVariant = "primary",
   className,
-  tabIndex = 0
+  tabIndex = 0,
+  asChild = false,
+  children
 }) {
   var _a;
   const colors = (_a = MENU_ITEM_COLORS[colorVariant]) != null ? _a : MENU_ITEM_COLORS.primary;
@@ -8190,7 +8248,55 @@ function FABMenuItem({
     },
     [disabled, onClick]
   );
-  return /* @__PURE__ */ jsxRuntime.jsxs(
+  const innerContent = /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [
+    /* @__PURE__ */ jsxRuntime.jsx(TouchTarget, {}),
+    /* @__PURE__ */ jsxRuntime.jsx(Ripple, { ripples, onRippleDone: removeRipple }),
+    /* @__PURE__ */ jsxRuntime.jsx(
+      "span",
+      {
+        "aria-hidden": "true",
+        className: "relative z-10 flex items-center justify-center size-6 shrink-0 [&>svg]:w-full [&>svg]:h-full pointer-events-none",
+        children: icon
+      }
+    ),
+    label && /* @__PURE__ */ jsxRuntime.jsx("span", { className: "relative z-10 text-base font-medium leading-none pointer-events-none", children: label })
+  ] });
+  const containerClassName = cn(
+    "relative inline-flex flex-row items-center",
+    "select-none cursor-pointer overflow-hidden",
+    "whitespace-nowrap",
+    "focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-m3-primary focus-visible:ring-offset-1",
+    MENU_ITEM_STYLES.size,
+    MENU_ITEM_STYLES.gap,
+    label ? MENU_ITEM_STYLES.padding : "px-4",
+    !label && "justify-center",
+    colors.bg,
+    colors.text,
+    disabled && "opacity-[0.38] pointer-events-none",
+    className
+  );
+  const containerStyle = {
+    transformOrigin: "right",
+    borderRadius: `${MENU_ITEM_STYLES.cornerRadius}px`
+  };
+  if (asChild) {
+    const child = React59__namespace.Children.only(children);
+    return /* @__PURE__ */ jsxRuntime.jsx(react.m.div, { variants: MENU_ITEM_VARIANTS, style: containerStyle, children: /* @__PURE__ */ jsxRuntime.jsx(
+      reactSlot.Slot,
+      {
+        role: "menuitem",
+        tabIndex,
+        "aria-disabled": disabled ? "true" : void 0,
+        "data-disabled": disabled ? "true" : void 0,
+        onClick: handleClick,
+        onPointerDown,
+        onKeyDown: handleKeyDown,
+        className: containerClassName,
+        children: React59__namespace.cloneElement(child, { children: innerContent })
+      }
+    ) });
+  }
+  return /* @__PURE__ */ jsxRuntime.jsx(
     react.m.div,
     {
       role: "menuitem",
@@ -8201,37 +8307,9 @@ function FABMenuItem({
       onPointerDown,
       onKeyDown: handleKeyDown,
       variants: MENU_ITEM_VARIANTS,
-      style: {
-        transformOrigin: "right",
-        borderRadius: `${MENU_ITEM_STYLES.cornerRadius}px`
-      },
-      className: cn(
-        "relative inline-flex flex-row items-center",
-        "select-none cursor-pointer overflow-hidden",
-        "whitespace-nowrap",
-        "focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-m3-primary focus-visible:ring-offset-1",
-        MENU_ITEM_STYLES.size,
-        MENU_ITEM_STYLES.gap,
-        label ? MENU_ITEM_STYLES.padding : "px-4",
-        !label && "justify-center",
-        colors.bg,
-        colors.text,
-        disabled && "opacity-[0.38] pointer-events-none",
-        className
-      ),
-      children: [
-        /* @__PURE__ */ jsxRuntime.jsx(TouchTarget, {}),
-        /* @__PURE__ */ jsxRuntime.jsx(Ripple, { ripples, onRippleDone: removeRipple }),
-        /* @__PURE__ */ jsxRuntime.jsx(
-          "span",
-          {
-            "aria-hidden": "true",
-            className: "relative z-10 flex items-center justify-center size-6 shrink-0 [&>svg]:w-full [&>svg]:h-full pointer-events-none",
-            children: icon
-          }
-        ),
-        label && /* @__PURE__ */ jsxRuntime.jsx("span", { className: "relative z-10 text-base font-medium leading-none pointer-events-none", children: label })
-      ]
+      style: containerStyle,
+      className: containerClassName,
+      children: innerContent
     }
   );
 }
@@ -8513,6 +8591,7 @@ var IconButtonComponent = React59__namespace.forwardRef(
       loading = false,
       loadingVariant = "loading-indicator",
       iconSize,
+      asChild = false,
       children,
       onClick,
       onKeyDown,
@@ -8528,6 +8607,7 @@ var IconButtonComponent = React59__namespace.forwardRef(
       "loading",
       "loadingVariant",
       "iconSize",
+      "asChild",
       "children",
       "onClick",
       "onKeyDown",
@@ -8589,7 +8669,87 @@ var IconButtonComponent = React59__namespace.forwardRef(
       },
       [loading, onClick, onKeyDown]
     );
-    return /* @__PURE__ */ jsxRuntime.jsx(react.LazyMotion, { features: react.domMax, strict: true, children: /* @__PURE__ */ jsxRuntime.jsxs(
+    const innerContent = /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [
+      needsTouchTarget && /* @__PURE__ */ jsxRuntime.jsx(TouchTarget, {}),
+      /* @__PURE__ */ jsxRuntime.jsx(Ripple, { ripples, onRippleDone: removeRipple }),
+      /* @__PURE__ */ jsxRuntime.jsx(react.AnimatePresence, { mode: "wait", initial: false, children: loading ? /* @__PURE__ */ jsxRuntime.jsx(
+        react.m.span,
+        __spreadProps(__spreadValues({}, ICON_SPAN_VARIANTS), {
+          transition: SPRING_TRANSITION,
+          className: cn(
+            "flex items-center justify-center shrink-0",
+            iconSize != null ? void 0 : iconClass
+          ),
+          style: isCustomSize ? { width: `${iconSize}px`, height: `${iconSize}px` } : void 0,
+          children: loadingVariant === "loading-indicator" ? /* @__PURE__ */ jsxRuntime.jsx(
+            LoadingIndicator,
+            {
+              size: typeof iconPx === "number" ? iconPx : defaultIconPx,
+              color: "currentColor",
+              "aria-label": "Loading"
+            }
+          ) : /* @__PURE__ */ jsxRuntime.jsx(
+            ProgressIndicator,
+            {
+              variant: "circular",
+              size: typeof iconPx === "number" ? iconPx : defaultIconPx,
+              color: "currentColor",
+              trackColor: "transparent",
+              "aria-label": "Loading"
+            }
+          )
+        }),
+        "loading"
+      ) : /* @__PURE__ */ jsxRuntime.jsx(
+        react.m.span,
+        __spreadProps(__spreadValues({}, ICON_SPAN_VARIANTS), {
+          transition: SPRING_TRANSITION,
+          "aria-hidden": "true",
+          className: cn(
+            "flex items-center justify-center shrink-0 [&_svg]:w-full [&_svg]:h-full [&_.md-icon]:text-[length:inherit]!",
+            iconSize != null ? void 0 : iconClass
+          ),
+          style: {
+            fontSize: typeof iconPx === "number" ? `${iconPx}px` : iconPx,
+            width: isCustomSize ? `${iconSize}px` : void 0,
+            height: isCustomSize ? `${iconSize}px` : void 0
+          },
+          children: asChild ? React59__namespace.Children.only(children).props.children : children
+        }),
+        "content"
+      ) })
+    ] });
+    const containerClassName = cn(
+      baseIconButtonClasses,
+      resolvedColorClass,
+      outlineWidthClass,
+      disabledBgClass,
+      "overflow-hidden",
+      SIZE_STYLES2[size],
+      loading && "pointer-events-none opacity-75 cursor-not-allowed",
+      className
+    );
+    if (asChild) {
+      const child = React59__namespace.Children.only(children);
+      return /* @__PURE__ */ jsxRuntime.jsx(react.LazyMotion, { features: react.domMax, strict: true, children: /* @__PURE__ */ jsxRuntime.jsx(
+        reactSlot.Slot,
+        __spreadProps(__spreadValues({
+          ref,
+          "aria-pressed": isToggle ? isSelected : void 0,
+          "aria-label": ariaLabel,
+          "aria-busy": loading || void 0,
+          "aria-disabled": loading || restProps.disabled,
+          onClick: handleClick,
+          onPointerDown,
+          onKeyDown: handleKeyDown,
+          style: __spreadProps(__spreadValues({}, style), { borderRadius: `${animateRadius}px` }),
+          className: containerClassName
+        }, restProps), {
+          children: React59__namespace.cloneElement(child, { children: innerContent })
+        })
+      ) });
+    }
+    return /* @__PURE__ */ jsxRuntime.jsx(react.LazyMotion, { features: react.domMax, strict: true, children: /* @__PURE__ */ jsxRuntime.jsx(
       react.m.button,
       __spreadProps(__spreadValues({
         ref,
@@ -8605,67 +8765,9 @@ var IconButtonComponent = React59__namespace.forwardRef(
         animate: { borderRadius: animateRadius },
         whileTap: { borderRadius: pressedRadius },
         transition: { borderRadius: SPRING_TRANSITION_FAST },
-        className: cn(
-          baseIconButtonClasses,
-          resolvedColorClass,
-          outlineWidthClass,
-          disabledBgClass,
-          "overflow-hidden",
-          SIZE_STYLES2[size],
-          loading && "pointer-events-none opacity-75 cursor-not-allowed",
-          className
-        )
+        className: containerClassName
       }, restProps), {
-        children: [
-          needsTouchTarget && /* @__PURE__ */ jsxRuntime.jsx(TouchTarget, {}),
-          /* @__PURE__ */ jsxRuntime.jsx(Ripple, { ripples, onRippleDone: removeRipple }),
-          /* @__PURE__ */ jsxRuntime.jsx(react.AnimatePresence, { mode: "wait", initial: false, children: loading ? /* @__PURE__ */ jsxRuntime.jsx(
-            react.m.span,
-            __spreadProps(__spreadValues({}, ICON_SPAN_VARIANTS), {
-              transition: SPRING_TRANSITION,
-              className: cn(
-                "flex items-center justify-center shrink-0",
-                iconSize != null ? void 0 : iconClass
-              ),
-              style: isCustomSize ? { width: `${iconSize}px`, height: `${iconSize}px` } : void 0,
-              children: loadingVariant === "loading-indicator" ? /* @__PURE__ */ jsxRuntime.jsx(
-                LoadingIndicator,
-                {
-                  size: typeof iconPx === "number" ? iconPx : defaultIconPx,
-                  color: "currentColor",
-                  "aria-label": "Loading"
-                }
-              ) : /* @__PURE__ */ jsxRuntime.jsx(
-                ProgressIndicator,
-                {
-                  variant: "circular",
-                  size: typeof iconPx === "number" ? iconPx : defaultIconPx,
-                  color: "currentColor",
-                  trackColor: "transparent",
-                  "aria-label": "Loading"
-                }
-              )
-            }),
-            "loading"
-          ) : /* @__PURE__ */ jsxRuntime.jsx(
-            react.m.span,
-            __spreadProps(__spreadValues({}, ICON_SPAN_VARIANTS), {
-              transition: SPRING_TRANSITION,
-              "aria-hidden": "true",
-              className: cn(
-                "flex items-center justify-center shrink-0 [&_svg]:w-full [&_svg]:h-full [&_.md-icon]:text-[length:inherit]!",
-                iconSize != null ? void 0 : iconClass
-              ),
-              style: {
-                fontSize: typeof iconPx === "number" ? `${iconPx}px` : iconPx,
-                width: isCustomSize ? `${iconSize}px` : void 0,
-                height: isCustomSize ? `${iconSize}px` : void 0
-              },
-              children
-            }),
-            "content"
-          ) })
-        ]
+        children: innerContent
       })
     ) });
   }
@@ -8985,6 +9087,7 @@ var SplitButtonLeadingComponent = React59__namespace.forwardRef(
       icon,
       children,
       disabled,
+      asChild = false,
       onClick,
       onPointerDown,
       onPointerUp,
@@ -9000,6 +9103,7 @@ var SplitButtonLeadingComponent = React59__namespace.forwardRef(
       "icon",
       "children",
       "disabled",
+      "asChild",
       "onClick",
       "onPointerDown",
       "onPointerUp",
@@ -9086,12 +9190,73 @@ var SplitButtonLeadingComponent = React59__namespace.forwardRef(
       [onBlur]
     );
     const leadingIconSize = LEADING_ICON_SIZE_FOR_SIZE[actualSize];
-    return /* @__PURE__ */ jsxRuntime.jsx(react.LazyMotion, { features: react.domMax, strict: true, children: /* @__PURE__ */ jsxRuntime.jsxs(
+    const labelContent = asChild ? React59__namespace.Children.only(children).props.children : children;
+    const innerContent = /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [
+      needsTouchTarget && /* @__PURE__ */ jsxRuntime.jsx(TouchTarget, {}),
+      /* @__PURE__ */ jsxRuntime.jsx(
+        StateLayer,
+        {
+          hovered: isHovered,
+          focused: isFocused,
+          pressed: isPressed
+        }
+      ),
+      /* @__PURE__ */ jsxRuntime.jsx(Ripple, { ripples, onRippleDone: removeRipple }),
+      icon && /* @__PURE__ */ jsxRuntime.jsx(
+        "span",
+        {
+          className: "flex items-center justify-center shrink-0 [&>svg]:w-full [&>svg]:h-full overflow-hidden [&_.md-icon]:text-[length:inherit]!",
+          style: {
+            fontSize: leadingIconSize,
+            width: leadingIconSize,
+            height: leadingIconSize
+          },
+          children: icon
+        }
+      ),
+      labelContent && /* @__PURE__ */ jsxRuntime.jsx("span", { className: "inline-flex items-center h-full gap-[inherit]", children: labelContent })
+    ] });
+    const containerClassName = cn(
+      splitButtonVariants({
+        variant: actualVariant,
+        size: actualSize,
+        disabled
+      }),
+      typographyClass,
+      className
+    );
+    const mergedStyle = __spreadValues({
+      paddingInlineStart: tokens.leadingPadding.start,
+      paddingInlineEnd: tokens.leadingPadding.end,
+      gap: "8px",
+      borderRadius
+    }, style);
+    return /* @__PURE__ */ jsxRuntime.jsx(react.LazyMotion, { features: react.domMax, strict: true, children: asChild ? /* @__PURE__ */ jsxRuntime.jsx(
+      reactSlot.Slot,
+      __spreadProps(__spreadValues({
+        ref,
+        "aria-disabled": disabled || void 0,
+        onClick: handleClick,
+        onPointerDown: handlePointerDown,
+        onPointerUp: handlePointerUp,
+        onPointerEnter: handlePointerEnter,
+        onPointerLeave: handlePointerLeave,
+        onPointerCancel: handlePointerCancel,
+        onFocus: handleFocus,
+        onBlur: handleBlur,
+        style: mergedStyle,
+        className: containerClassName
+      }, restProps), {
+        children: React59__namespace.cloneElement(
+          React59__namespace.Children.only(children),
+          { children: innerContent }
+        )
+      })
+    ) : /* @__PURE__ */ jsxRuntime.jsx(
       react.m.button,
       __spreadProps(__spreadValues({
         ref,
         type: "button",
-        "aria-disabled": disabled,
         disabled,
         onClick: handleClick,
         onPointerDown: handlePointerDown,
@@ -9108,41 +9273,9 @@ var SplitButtonLeadingComponent = React59__namespace.forwardRef(
           paddingInlineEnd: tokens.leadingPadding.end,
           gap: "8px"
         }, style),
-        className: cn(
-          splitButtonVariants({
-            variant: actualVariant,
-            size: actualSize,
-            disabled
-          }),
-          typographyClass,
-          className
-        )
+        className: containerClassName
       }, restProps), {
-        children: [
-          needsTouchTarget && /* @__PURE__ */ jsxRuntime.jsx(TouchTarget, {}),
-          /* @__PURE__ */ jsxRuntime.jsx(
-            StateLayer,
-            {
-              hovered: isHovered,
-              focused: isFocused,
-              pressed: isPressed
-            }
-          ),
-          /* @__PURE__ */ jsxRuntime.jsx(Ripple, { ripples, onRippleDone: removeRipple }),
-          icon && /* @__PURE__ */ jsxRuntime.jsx(
-            "span",
-            {
-              className: "flex items-center justify-center shrink-0 [&>svg]:w-full [&>svg]:h-full overflow-hidden [&_.md-icon]:text-[length:inherit]!",
-              style: {
-                fontSize: leadingIconSize,
-                width: leadingIconSize,
-                height: leadingIconSize
-              },
-              children: icon
-            }
-          ),
-          children && /* @__PURE__ */ jsxRuntime.jsx("span", { className: "inline-flex items-center h-full gap-[inherit]", children })
-        ]
+        children: innerContent
       })
     ) });
   }
@@ -9174,6 +9307,8 @@ var SplitButtonTrailingComponent = React59__namespace.forwardRef(
       onPointerCancel,
       onFocus,
       onBlur,
+      asChild = false,
+      children,
       "aria-label": ariaLabel
     } = _b, restProps = __objRest(_b, [
       "className",
@@ -9190,6 +9325,8 @@ var SplitButtonTrailingComponent = React59__namespace.forwardRef(
       "onPointerCancel",
       "onFocus",
       "onBlur",
+      "asChild",
+      "children",
       "aria-label"
     ]);
     var _a2, _b2;
@@ -9264,14 +9401,81 @@ var SplitButtonTrailingComponent = React59__namespace.forwardRef(
       },
       [onBlur]
     );
-    return /* @__PURE__ */ jsxRuntime.jsx(react.LazyMotion, { features: react.domMax, strict: true, children: /* @__PURE__ */ jsxRuntime.jsxs(
+    const innerContent = /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [
+      needsTouchTarget && /* @__PURE__ */ jsxRuntime.jsx(TouchTarget, {}),
+      /* @__PURE__ */ jsxRuntime.jsx(
+        StateLayer,
+        {
+          hovered: isHovered,
+          focused: isFocused,
+          pressed: isPressed
+        }
+      ),
+      /* @__PURE__ */ jsxRuntime.jsx(Ripple, { ripples, onRippleDone: removeRipple }),
+      /* @__PURE__ */ jsxRuntime.jsx(
+        react.m.div,
+        {
+          animate: {
+            rotate: checked ? 180 : 0,
+            x: checked ? 0 : tokens.opticalCenterOffset
+          },
+          transition: prefersReducedMotion2 ? { duration: 0 } : SPLIT_BUTTON_CHEVRON_SPRING,
+          className: "flex items-center justify-center shrink-0",
+          children: icon != null ? icon : /* @__PURE__ */ jsxRuntime.jsx(
+            Icon,
+            {
+              name: "arrow_drop_down",
+              size: tokens.trailingIconSize,
+              opticalSize: 24
+            }
+          )
+        }
+      )
+    ] });
+    const containerClassName = cn(
+      splitButtonVariants({
+        variant: actualVariant,
+        size: actualSize,
+        disabled
+      }),
+      className
+    );
+    const mergedStyle = __spreadValues({
+      paddingInlineStart: tokens.trailingPadding.start,
+      paddingInlineEnd: tokens.trailingPadding.end,
+      borderRadius
+    }, style);
+    return /* @__PURE__ */ jsxRuntime.jsx(react.LazyMotion, { features: react.domMax, strict: true, children: asChild ? /* @__PURE__ */ jsxRuntime.jsx(
+      reactSlot.Slot,
+      __spreadProps(__spreadValues({
+        ref,
+        "aria-label": ariaLabel,
+        "aria-expanded": checked,
+        "aria-disabled": disabled,
+        onClick: handleToggle,
+        onPointerDown: handlePointerDown,
+        onPointerUp: handlePointerUp,
+        onPointerEnter: handlePointerEnter,
+        onPointerLeave: handlePointerLeave,
+        onPointerCancel: handlePointerCancel,
+        onFocus: handleFocus,
+        onBlur: handleBlur,
+        style: mergedStyle,
+        className: containerClassName
+      }, restProps), {
+        children: React59__namespace.cloneElement(
+          React59__namespace.Children.only(children),
+          { children: innerContent }
+        )
+      })
+    ) : /* @__PURE__ */ jsxRuntime.jsx(
       react.m.button,
       __spreadProps(__spreadValues({
         ref,
         type: "button",
-        "aria-pressed": checked,
-        "aria-expanded": checked,
         "aria-label": ariaLabel,
+        "aria-expanded": checked,
+        "aria-disabled": disabled,
         disabled,
         onClick: handleToggle,
         onPointerDown: handlePointerDown,
@@ -9287,46 +9491,9 @@ var SplitButtonTrailingComponent = React59__namespace.forwardRef(
           paddingInlineStart: tokens.trailingPadding.start,
           paddingInlineEnd: tokens.trailingPadding.end
         }, style),
-        className: cn(
-          splitButtonVariants({
-            variant: actualVariant,
-            size: actualSize,
-            disabled
-          }),
-          className
-        )
+        className: containerClassName
       }, restProps), {
-        children: [
-          needsTouchTarget && /* @__PURE__ */ jsxRuntime.jsx(TouchTarget, {}),
-          /* @__PURE__ */ jsxRuntime.jsx(
-            StateLayer,
-            {
-              hovered: isHovered,
-              focused: isFocused,
-              pressed: isPressed
-            }
-          ),
-          /* @__PURE__ */ jsxRuntime.jsx(Ripple, { ripples, onRippleDone: removeRipple }),
-          /* @__PURE__ */ jsxRuntime.jsx(
-            react.m.div,
-            {
-              animate: {
-                rotate: checked ? 180 : 0,
-                x: checked ? 0 : tokens.opticalCenterOffset
-              },
-              transition: prefersReducedMotion2 ? { duration: 0 } : SPLIT_BUTTON_CHEVRON_SPRING,
-              className: "flex items-center justify-center shrink-0",
-              children: icon != null ? icon : /* @__PURE__ */ jsxRuntime.jsx(
-                Icon,
-                {
-                  name: "arrow_drop_down",
-                  size: tokens.trailingIconSize,
-                  opticalSize: 24
-                }
-              )
-            }
-          )
-        ]
+        children: innerContent
       })
     ) });
   }
@@ -9580,6 +9747,7 @@ var CardImpl = React59__namespace.forwardRef(
       target,
       rel: relProp,
       onClick,
+      asChild = false,
       children
     } = _b, props = __objRest(_b, [
       "className",
@@ -9590,10 +9758,11 @@ var CardImpl = React59__namespace.forwardRef(
       "target",
       "rel",
       "onClick",
+      "asChild",
       "children"
     ]);
     const safeVariant = variant;
-    const isInteractive = !!onClick || !!href || interactive;
+    const isInteractive = !!onClick || !!href || interactive || asChild;
     const elevationProps = useCardElevation(safeVariant, disabled);
     const { ripples, onPointerDown, removeRipple } = useRippleState();
     const baseClass = cn(
@@ -9614,6 +9783,26 @@ var CardImpl = React59__namespace.forwardRef(
       // Outlined interactive card: change border color to m3-outline on focus/press/hover
       variant === "outlined" && "hover:border-m3-outline focus-visible:border-m3-outline active:border-m3-outline"
     );
+    if (asChild) {
+      const child = React59__namespace.Children.only(children);
+      const innerContent = /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [
+        /* @__PURE__ */ jsxRuntime.jsx(Ripple, { ripples, onRippleDone: removeRipple }),
+        child.props.children
+      ] });
+      return /* @__PURE__ */ jsxRuntime.jsx(react.LazyMotion, { features: react.domMax, strict: true, children: /* @__PURE__ */ jsxRuntime.jsx(
+        reactSlot.Slot,
+        __spreadProps(__spreadValues({
+          ref,
+          className: cn(baseClass, interactiveClass),
+          "aria-disabled": disabled ? true : void 0,
+          tabIndex: disabled ? -1 : 0,
+          onPointerDown,
+          onClick
+        }, props), {
+          children: React59__namespace.cloneElement(child, { children: innerContent })
+        })
+      ) });
+    }
     if (!isInteractive) {
       return /* @__PURE__ */ jsxRuntime.jsx(
         "div",
@@ -10080,7 +10269,9 @@ var ChipImpl = React59__namespace.forwardRef(
       avatar,
       onRemove,
       className,
-      onClick
+      onClick,
+      asChild = false,
+      children
     } = _b, props = __objRest(_b, [
       "variant",
       "elevated",
@@ -10092,7 +10283,9 @@ var ChipImpl = React59__namespace.forwardRef(
       "avatar",
       "onRemove",
       "className",
-      "onClick"
+      "onClick",
+      "asChild",
+      "children"
     ]);
     const { ripples, onPointerDown, removeRipple } = useRippleState({
       disabled
@@ -10207,6 +10400,63 @@ var ChipImpl = React59__namespace.forwardRef(
       ) : null }),
       /* @__PURE__ */ jsxRuntime.jsx("span", { className: "whitespace-nowrap", children: label })
     ] });
+    if (asChild) {
+      const child = React59__namespace.Children.only(children);
+      const innerContent = /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [
+        /* @__PURE__ */ jsxRuntime.jsx(Ripple, { ripples, onRippleDone: removeRipple }),
+        mainContent,
+        hasTrailingContent && /* @__PURE__ */ jsxRuntime.jsx("span", { className: "flex items-center justify-center shrink-0", children: onRemove ? /* @__PURE__ */ jsxRuntime.jsx(
+          "button",
+          {
+            type: "button",
+            tabIndex: disabled ? -1 : 0,
+            "aria-label": typeof label === "string" ? `Remove ${label}` : "Remove",
+            onClick: (e) => {
+              e.stopPropagation();
+              onRemove(e);
+            },
+            onPointerDown: (e) => e.stopPropagation(),
+            className: cn(
+              "flex items-center justify-center w-8.5 h-full",
+              "cursor-pointer focus-visible:outline-none",
+              "transition-all duration-150",
+              "relative overflow-hidden rounded-r-[7px] rounded-l-none",
+              "before:absolute before:-inset-px before:pointer-events-none before:bg-current",
+              "before:transition-opacity before:duration-200 before:opacity-0 before:rounded-r-[7px]",
+              "hover:before:opacity-[0.08] active:before:opacity-[0.12]",
+              selected ? "text-m3-on-secondary-container" : "text-m3-on-surface-variant"
+            ),
+            children: /* @__PURE__ */ jsxRuntime.jsx(CloseIcon3, {})
+          }
+        ) : trailingIcon ? /* @__PURE__ */ jsxRuntime.jsx(
+          "span",
+          {
+            className: cn(
+              "flex items-center justify-center w-4.5 h-4.5 [&_.md-icon]:text-[length:inherit]!",
+              selected ? "text-m3-on-secondary-container" : "text-m3-on-surface-variant"
+            ),
+            style: { fontSize: 18 },
+            "aria-hidden": "true",
+            children: trailingIcon
+          }
+        ) : null })
+      ] });
+      const strippedProps = __spreadValues({}, props);
+      delete strippedProps.children;
+      return /* @__PURE__ */ jsxRuntime.jsx(react.LazyMotion, { features: react.domMax, strict: true, children: /* @__PURE__ */ jsxRuntime.jsx(
+        reactSlot.Slot,
+        __spreadProps(__spreadValues({
+          ref,
+          "aria-disabled": disabled || void 0,
+          tabIndex: disabled ? -1 : 0,
+          onClick,
+          onPointerDown,
+          className: containerClass
+        }, strippedProps), {
+          children: React59__namespace.cloneElement(child, { children: innerContent })
+        })
+      ) });
+    }
     return /* @__PURE__ */ jsxRuntime.jsx(react.LazyMotion, { features: react.domMax, strict: true, children: /* @__PURE__ */ jsxRuntime.jsxs(
       Root8,
       __spreadProps(__spreadValues(__spreadProps(__spreadValues({
@@ -13148,7 +13398,7 @@ var TimePickerDialog = ({
 TimePickerDialog.displayName = "TimePickerDialog";
 var clamp = (value, min, max) => Math.max(min, Math.min(max, value));
 var isValidHourInput = (h, is24hour) => is24hour ? h >= 0 && h <= 23 : h >= 1 && h <= 12;
-var isValidMinuteInput = (m67) => m67 >= 0 && m67 <= 59;
+var isValidMinuteInput = (m68) => m68 >= 0 && m68 <= 59;
 var to24Hour = (hour12, isPm) => {
   if (isPm) {
     return hour12 === 12 ? 12 : hour12 + 12;
@@ -13184,8 +13434,8 @@ var useTimePickerState = (options) => {
     },
     [is24hour]
   );
-  const setMinute = React59.useCallback((m67) => {
-    const clamped = clamp(m67, 0, 59);
+  const setMinute = React59.useCallback((m68) => {
+    const clamped = clamp(m68, 0, 59);
     setMinuteState(clamped);
     setMinuteInputState(clamped);
   }, []);
@@ -13199,10 +13449,10 @@ var useTimePickerState = (options) => {
     },
     [is24hour, isPm]
   );
-  const setMinuteInput = React59.useCallback((m67) => {
-    setMinuteInputState(m67);
-    if (isValidMinuteInput(m67)) {
-      setMinuteState(m67);
+  const setMinuteInput = React59.useCallback((m68) => {
+    setMinuteInputState(m68);
+    if (isValidMinuteInput(m68)) {
+      setMinuteState(m68);
     }
   }, []);
   const setSelection = React59.useCallback((mode) => {
@@ -15342,7 +15592,7 @@ var NavigationBarItemComponent = React59__namespace.forwardRef(
     className,
     "aria-label": ariaLabelProp
   }, ref) => {
-    const { variant, itemLayout } = React59__namespace.useContext(NavigationBarContext);
+    const { variant, itemLayout, itemClassName: contextItemClassName } = React59__namespace.useContext(NavigationBarContext);
     const isForcedHorizontal = itemLayout === "horizontal";
     const isResponsiveHorizontal = (variant === "flexible" || variant === "xr") && itemLayout === void 0;
     const { ripples, onPointerDown, removeRipple } = useRippleState({
@@ -15377,9 +15627,10 @@ var NavigationBarItemComponent = React59__namespace.forwardRef(
         onClick: handleClick,
         onPointerDown,
         className: cn(
-          "group relative flex flex-1 cursor-pointer transition-colors duration-200 outline-none select-none h-full",
-          variant === "xr" ? "items-center justify-center max-[599px]:min-w-28 max-[599px]:max-w-28 max-[599px]:items-start max-[599px]:pt-3 max-[599px]:pb-4" : "items-center justify-center",
+          "group relative flex cursor-pointer transition-colors duration-200 outline-none select-none h-full items-center justify-center min-w-0",
+          variant === "xr" ? isResponsiveHorizontal ? "flex-1 min-[600px]:flex-initial min-[600px]:w-auto" : isForcedHorizontal ? "flex-initial w-auto" : "flex-1" : isForcedHorizontal ? "flex-initial w-auto" : "flex-1",
           disabled && "pointer-events-none opacity-[0.38]",
+          contextItemClassName,
           className
         ),
         children: [
@@ -15387,9 +15638,9 @@ var NavigationBarItemComponent = React59__namespace.forwardRef(
             "div",
             {
               className: cn(
-                "relative flex items-center justify-center flex-col gap-y-1 w-full",
-                isResponsiveHorizontal && "min-[600px]:flex-row min-[600px]:gap-y-0 min-[600px]:gap-x-1 min-[600px]:h-10 min-[600px]:px-4 min-[600px]:rounded-full min-[600px]:w-auto min-[600px]:max-w-42",
-                isForcedHorizontal && "flex-row gap-y-0 gap-x-1 h-10 px-4 rounded-full w-auto max-w-42"
+                "relative flex items-center justify-center flex-col gap-y-1 w-full px-1 py-1.5",
+                isResponsiveHorizontal && "min-[600px]:flex-row min-[600px]:gap-y-0 min-[600px]:gap-x-1.5 min-[600px]:h-10 min-[600px]:px-4 min-[600px]:py-0 min-[600px]:rounded-full min-[600px]:w-auto",
+                isForcedHorizontal && "flex-row gap-y-0 gap-x-1.5 h-10 px-4 py-0 rounded-full w-auto"
               ),
               children: [
                 /* @__PURE__ */ jsxRuntime.jsxs(
@@ -15466,7 +15717,7 @@ var navContainerVariants = classVarianceAuthority.cva(
       variant: {
         flexible: "bottom-0 left-0 right-0 w-full h-16 pb-safe",
         baseline: "bottom-0 left-0 right-0 w-full h-20 pb-safe",
-        xr: "bottom-6 left-1/2 -translate-x-1/2 w-auto max-w-fit h-20 min-[600px]:h-16 rounded-[48px] px-2"
+        xr: "bottom-6 left-1/2 -translate-x-1/2 w-auto max-w-[calc(100%-2rem)] min-[600px]:max-w-fit h-20 min-[600px]:h-16 rounded-[48px] px-2"
       },
       position: {
         fixed: "fixed",
@@ -15494,6 +15745,7 @@ var NavigationBarComponent = React59__namespace.forwardRef(
     scrollContainerRef,
     activeIndicatorTransition,
     children,
+    itemClassName,
     className,
     style
   }, ref) => {
@@ -15544,7 +15796,7 @@ var NavigationBarComponent = React59__namespace.forwardRef(
     return /* @__PURE__ */ jsxRuntime.jsx(react.LazyMotion, { features: react.domMax, strict: true, children: /* @__PURE__ */ jsxRuntime.jsx(
       NavigationBarContext.Provider,
       {
-        value: { variant, itemLayout, activeIndicatorTransition },
+        value: { variant, itemLayout, activeIndicatorTransition, itemClassName },
         children: /* @__PURE__ */ jsxRuntime.jsx(
           react.m.nav,
           {
@@ -15565,7 +15817,7 @@ var NavigationBarComponent = React59__namespace.forwardRef(
                 "aria-orientation": "horizontal",
                 className: cn(
                   "flex w-full h-full mx-auto",
-                  variant === "xr" ? "gap-0 min-[600px]:gap-1.5" : "max-w-7xl gap-1.5"
+                  variant === "xr" ? "gap-0 min-[600px]:gap-1.5 items-center justify-center px-1" : "max-w-7xl gap-1.5"
                 ),
                 children
               }
@@ -20661,6 +20913,7 @@ var TabsList = React59__namespace.memo(TabsListComponent);
 var typographyVariants = classVarianceAuthority.cva("m-0 p-0 text-m3-on-surface", {
   variants: {
     variant: {
+      // Short hyphenated
       "display-lg": "text-[57px] leading-[64px] font-normal tracking-[-0.25px]",
       "display-md": "text-[45px] leading-[52px] font-normal tracking-[0px]",
       "display-sm": "text-[36px] leading-[44px] font-normal tracking-[0px]",
@@ -20675,7 +20928,39 @@ var typographyVariants = classVarianceAuthority.cva("m-0 p-0 text-m3-on-surface"
       "label-sm": "text-[11px] leading-[16px] font-medium tracking-[0.5px]",
       "body-lg": "text-[16px] leading-[24px] font-normal tracking-[0.5px]",
       "body-md": "text-[14px] leading-[20px] font-normal tracking-[0.25px]",
-      "body-sm": "text-[12px] leading-[16px] font-normal tracking-[0.4px]"
+      "body-sm": "text-[12px] leading-[16px] font-normal tracking-[0.4px]",
+      // Full hyphenated aliases
+      "display-large": "text-[57px] leading-[64px] font-normal tracking-[-0.25px]",
+      "display-medium": "text-[45px] leading-[52px] font-normal tracking-[0px]",
+      "display-small": "text-[36px] leading-[44px] font-normal tracking-[0px]",
+      "headline-large": "text-[32px] leading-[40px] font-normal tracking-[0px]",
+      "headline-medium": "text-[28px] leading-[36px] font-normal tracking-[0px]",
+      "headline-small": "text-[24px] leading-[32px] font-normal tracking-[0px]",
+      "title-large": "text-[22px] leading-[28px] font-normal tracking-[0px]",
+      "title-medium": "text-[16px] leading-[24px] font-medium tracking-[0.15px]",
+      "title-small": "text-[14px] leading-[20px] font-medium tracking-[0.1px]",
+      "label-large": "text-[14px] leading-[20px] font-medium tracking-[0.1px]",
+      "label-medium": "text-[12px] leading-[16px] font-medium tracking-[0.5px]",
+      "label-small": "text-[11px] leading-[16px] font-medium tracking-[0.5px]",
+      "body-large": "text-[16px] leading-[24px] font-normal tracking-[0.5px]",
+      "body-medium": "text-[14px] leading-[20px] font-normal tracking-[0.25px]",
+      "body-small": "text-[12px] leading-[16px] font-normal tracking-[0.4px]",
+      // CamelCase aliases
+      displayLarge: "text-[57px] leading-[64px] font-normal tracking-[-0.25px]",
+      displayMedium: "text-[45px] leading-[52px] font-normal tracking-[0px]",
+      displaySmall: "text-[36px] leading-[44px] font-normal tracking-[0px]",
+      headlineLarge: "text-[32px] leading-[40px] font-normal tracking-[0px]",
+      headlineMedium: "text-[28px] leading-[36px] font-normal tracking-[0px]",
+      headlineSmall: "text-[24px] leading-[32px] font-normal tracking-[0px]",
+      titleLarge: "text-[22px] leading-[28px] font-normal tracking-[0px]",
+      titleMedium: "text-[16px] leading-[24px] font-medium tracking-[0.15px]",
+      titleSmall: "text-[14px] leading-[20px] font-medium tracking-[0.1px]",
+      labelLarge: "text-[14px] leading-[20px] font-medium tracking-[0.1px]",
+      labelMedium: "text-[12px] leading-[16px] font-medium tracking-[0.5px]",
+      labelSmall: "text-[11px] leading-[16px] font-medium tracking-[0.5px]",
+      bodyLarge: "text-[16px] leading-[24px] font-normal tracking-[0.5px]",
+      bodyMedium: "text-[14px] leading-[20px] font-normal tracking-[0.25px]",
+      bodySmall: "text-[12px] leading-[16px] font-normal tracking-[0.4px]"
     }
   },
   defaultVariants: {
@@ -20684,19 +20969,21 @@ var typographyVariants = classVarianceAuthority.cva("m-0 p-0 text-m3-on-surface"
 });
 var Text = React59__namespace.forwardRef(
   (_a, ref) => {
-    var _b = _a, { className, variant, as: Component } = _b, props = __objRest(_b, ["className", "variant", "as"]);
+    var _b = _a, { className, variant, as: Component, color, weight, style } = _b, props = __objRest(_b, ["className", "variant", "as", "color", "weight", "style"]);
     const defaultComponent = React59__namespace.useMemo(() => {
-      if ((variant == null ? void 0 : variant.startsWith("display")) || (variant == null ? void 0 : variant.startsWith("headline")))
-        return "h1";
-      if (variant == null ? void 0 : variant.startsWith("title")) return "h2";
+      const v = variant ? String(variant).toLowerCase() : "";
+      if (v.startsWith("display") || v.startsWith("headline")) return "h1";
+      if (v.startsWith("title")) return "h2";
       return "p";
     }, [variant]);
     const Tag = Component || defaultComponent;
+    const customStyle = __spreadValues(__spreadValues(__spreadValues({}, style), color ? { color } : {}), weight ? { fontWeight: weight } : {});
     return /* @__PURE__ */ jsxRuntime.jsx(
       Tag,
       __spreadValues({
         ref,
-        className: cn(typographyVariants({ variant, className }))
+        className: cn(typographyVariants({ variant, className })),
+        style: customStyle
       }, props)
     );
   }
@@ -20821,7 +21108,6 @@ var FloatingLabel = React59__namespace.memo(function FloatingLabel2({
         "absolute pointer-events-none select-none origin-[left_center] leading-6 text-base whitespace-nowrap",
         "px-1 -mx-1",
         // Clear the notch gap and keep text aligned
-        variant === "outlined" && isFloated && "bg-m3-surface",
         "left-4",
         isDisabled && "opacity-[0.38]"
       ),
@@ -20897,7 +21183,8 @@ var OutlineContainer = React59__namespace.memo(function OutlineContainer2({
   );
   const borderWidth = isFocused || isError ? TF_SIZE.outlineThick : TF_SIZE.outlineThin;
   const leftSegmentWidth = TF_SIZE.paddingStart;
-  const notchWidth = isFloated ? labelWidth * TF_TYPOGRAPHY.labelScaleRatio + TF_SIZE.notchPadding * 2 : 0;
+  const isNotched = isFloated && labelWidth > 0;
+  const notchWidth = isNotched ? labelWidth * TF_TYPOGRAPHY.labelScaleRatio + TF_SIZE.notchPadding * 2 : 0;
   const borderTransition = { duration: colorDuration, ease };
   const notchTransition = { duration: notchDuration, ease };
   return /* @__PURE__ */ jsxRuntime.jsxs(
@@ -20935,7 +21222,7 @@ var OutlineContainer = React59__namespace.memo(function OutlineContainer2({
                   style: { height: borderWidth },
                   animate: {
                     borderTopColor: borderColor,
-                    opacity: isFloated ? 0 : 1,
+                    opacity: isNotched ? 0 : 1,
                     borderTopWidth: borderWidth,
                     borderTopStyle: "solid"
                   },
@@ -21387,7 +21674,7 @@ var TextFieldComponent = React59__namespace.forwardRef(
     const computedDescribedby = [hasSupporting ? supportingId : "", ariaDescribedby != null ? ariaDescribedby : ""].filter(Boolean).join(" ") || void 0;
     const inputClass = cn(
       "bg-transparent outline-none w-full",
-      isInToolbar ? "self-center" : "self-end",
+      !resolvedLabel || isInToolbar ? "self-center" : "self-end",
       "text-base leading-6 text-m3-on-surface",
       "caret-[var(--color-m3-primary)]",
       "placeholder:text-m3-on-surface-variant/60",
@@ -21398,7 +21685,7 @@ var TextFieldComponent = React59__namespace.forwardRef(
       id: inputId,
       name,
       value: currentValue,
-      placeholder: isFloated ? placeholder != null ? placeholder : "" : "",
+      placeholder: !resolvedLabel || isFloated ? placeholder != null ? placeholder : "" : "",
       disabled,
       readOnly,
       required,
@@ -21430,7 +21717,7 @@ var TextFieldComponent = React59__namespace.forwardRef(
       "relative flex flex-col flex-1 min-w-0 h-full",
       paddingStart,
       paddingEnd,
-      isInToolbar ? "justify-center" : variant === "filled" ? resolvedDense ? "pt-5 pb-2" : "pt-6 pb-2" : resolvedDense ? "py-3" : "py-4"
+      isInToolbar || !resolvedLabel ? "justify-center" : variant === "filled" ? resolvedDense ? "pt-5 pb-2" : "pt-6 pb-2" : resolvedDense ? "py-3" : "py-4"
     );
     const wrapperClass = cn(
       "group/tf inline-flex flex-col",
@@ -22339,6 +22626,8 @@ function MD3ThemeProvider({
   sourceColor: initialSourceColor = "#6750A4",
   defaultMode = "light",
   persistToLocalStorage = false,
+  variant = "expressive",
+  contrastLevel = 0,
   typography: typographyProp,
   fontFamily,
   fontVariationAxes,
@@ -22347,6 +22636,17 @@ function MD3ThemeProvider({
   const [sourceColor, setSourceColor] = React59.useState(initialSourceColor);
   const [mode, setMode] = React59.useState(defaultMode);
   const [isHydrated, setIsHydrated] = React59.useState(!persistToLocalStorage);
+  const [systemMode, setSystemMode] = React59.useState("light");
+  React59.useEffect(() => {
+    if (typeof window === "undefined") return;
+    const mediaQuery = window.matchMedia("(prefers-color-scheme: dark)");
+    const updateSystemMode = () => {
+      setSystemMode(mediaQuery.matches ? "dark" : "light");
+    };
+    updateSystemMode();
+    mediaQuery.addEventListener("change", updateSystemMode);
+    return () => mediaQuery.removeEventListener("change", updateSystemMode);
+  }, []);
   React59.useEffect(() => {
     if (!persistToLocalStorage) return;
     const savedColor = localStorage.getItem(STORAGE_KEY_COLOR);
@@ -22358,25 +22658,37 @@ function MD3ThemeProvider({
       setMode(savedMode);
     setIsHydrated(true);
   }, [persistToLocalStorage]);
+  const effectiveMode = mode === "system" ? systemMode : mode;
   React59.useEffect(() => {
     if (!isHydrated) return;
-    applyTheme(sourceColor, mode);
+    applyTheme(sourceColor, effectiveMode, document.documentElement, {
+      variant,
+      contrastLevel
+    });
     if (persistToLocalStorage) {
       localStorage.setItem(STORAGE_KEY_COLOR, sourceColor);
       localStorage.setItem(STORAGE_KEY_MODE, mode);
     }
-  }, [sourceColor, mode, persistToLocalStorage, isHydrated]);
-  React59.useEffect(() => {
-    if (mode !== "system" || typeof window === "undefined") return;
-    const mediaQuery = window.matchMedia("(prefers-color-scheme: dark)");
-    const handleChange = () => applyTheme(sourceColor, "system");
-    mediaQuery.addEventListener("change", handleChange);
-    return () => mediaQuery.removeEventListener("change", handleChange);
-  }, [mode, sourceColor]);
-  const effectiveMode = resolveMode(mode);
+  }, [
+    sourceColor,
+    mode,
+    effectiveMode,
+    persistToLocalStorage,
+    isHydrated,
+    variant,
+    contrastLevel
+  ]);
   const themeValue = React59.useMemo(
-    () => ({ sourceColor, setSourceColor, mode, setMode, effectiveMode }),
-    [sourceColor, mode, effectiveMode]
+    () => ({
+      sourceColor,
+      setSourceColor,
+      mode,
+      setMode,
+      effectiveMode,
+      variant,
+      contrastLevel
+    }),
+    [sourceColor, mode, effectiveMode, variant, contrastLevel]
   );
   const typographyValue = React59.useMemo(() => {
     if (typographyProp) return typographyProp;
@@ -22489,6 +22801,47 @@ var vibrantFloatingToolbarColors = {
   fabContainerColor: "var(--md-sys-color-tertiary-container)",
   fabContentColor: "var(--md-sys-color-on-tertiary-container)"
 };
+var surfaceContainerHighFloatingToolbarColors = {
+  toolbarContainerColor: "var(--md-sys-color-surface-container-high)",
+  toolbarContentColor: "var(--md-sys-color-on-surface)",
+  fabContainerColor: "var(--md-sys-color-secondary-container)",
+  fabContentColor: "var(--md-sys-color-on-secondary-container)"
+};
+var surfaceContainerHighestFloatingToolbarColors = {
+  toolbarContainerColor: "var(--md-sys-color-surface-container-highest)",
+  toolbarContentColor: "var(--md-sys-color-on-surface)",
+  fabContainerColor: "var(--md-sys-color-secondary-container)",
+  fabContentColor: "var(--md-sys-color-on-secondary-container)"
+};
+var tertiaryContainerFloatingToolbarColors = {
+  toolbarContainerColor: "var(--md-sys-color-tertiary-container)",
+  toolbarContentColor: "var(--md-sys-color-on-tertiary-container)",
+  fabContainerColor: "var(--md-sys-color-primary-container)",
+  fabContentColor: "var(--md-sys-color-on-primary-container)"
+};
+var xrFloatingToolbarColors = {
+  toolbarContainerColor: "color-mix(in srgb, var(--md-sys-color-surface-container-high) 80%, transparent)",
+  toolbarContentColor: "var(--md-sys-color-on-surface)",
+  fabContainerColor: "color-mix(in srgb, var(--md-sys-color-secondary-container) 85%, transparent)",
+  fabContentColor: "var(--md-sys-color-on-secondary-container)"
+};
+function getToolbarColors(variant = "standard", customColors) {
+  if (customColors) return customColors;
+  switch (variant) {
+    case "vibrant":
+      return vibrantFloatingToolbarColors;
+    case "surface-high":
+      return surfaceContainerHighFloatingToolbarColors;
+    case "surface-highest":
+      return surfaceContainerHighestFloatingToolbarColors;
+    case "tertiary":
+      return tertiaryContainerFloatingToolbarColors;
+    case "xr":
+      return xrFloatingToolbarColors;
+    default:
+      return standardFloatingToolbarColors;
+  }
+}
 var BottomDockedToolbar = React59__namespace.forwardRef(
   (_a, ref) => {
     var _b = _a, {
@@ -22518,7 +22871,7 @@ var BottomDockedToolbar = React59__namespace.forwardRef(
       "className",
       "aria-label"
     ]);
-    const colors = customColors || (variant === "vibrant" ? vibrantFloatingToolbarColors : standardFloatingToolbarColors);
+    const colors = getToolbarColors(variant, customColors);
     const { scrollY } = react.useScroll(
       scrollContainerRef ? { container: scrollContainerRef } : void 0
     );
@@ -22547,6 +22900,7 @@ var BottomDockedToolbar = React59__namespace.forwardRef(
       full: "rounded-full"
     };
     const justifyClass = justify === "center" ? "justify-center gap-4" : "justify-between";
+    const isXr = variant === "xr";
     return /* @__PURE__ */ jsxRuntime.jsx(ToolbarContext.Provider, { value: { orientation: "horizontal" }, children: /* @__PURE__ */ jsxRuntime.jsxs(
       react.m.div,
       __spreadProps(__spreadValues({
@@ -22567,11 +22921,12 @@ var BottomDockedToolbar = React59__namespace.forwardRef(
           paddingRight: paddingX
         }),
         className: cn(
-          "fixed bottom-0 left-0 right-0 w-full z-40",
+          "fixed bottom-0 left-0 right-0 w-full z-40 text-(--toolbar-color) [&_.text-m3-on-surface-variant]:text-current",
           "flex items-center h-16",
           justifyClass,
           SHAPE_CLASSES[shape],
-          "shadow-[0_-1px_3px_rgba(0,0,0,0.1)] pointer-events-auto",
+          isXr ? "backdrop-blur-md border-t border-white/10 shadow-lg" : "shadow-[0_-1px_3px_rgba(0,0,0,0.1)]",
+          "pointer-events-auto",
           className
         )
       }, props), {
@@ -22618,6 +22973,13 @@ var ToolbarIconButtonTokens = {
   /** Icon size in dp — larger than standard 24dp to fill the 48dp button properly */
   IconSize: 28
 };
+var ToolbarToggleButtonTokens = {
+  Height: 48,
+  MinWidth: 95,
+  IconSize: 24,
+  PaddingX: 16,
+  Gap: 8
+};
 var ALIGNMENT_CLASS = {
   start: "justify-start",
   center: "justify-center",
@@ -22676,7 +23038,8 @@ var FloatingToolbarBase = React59__namespace.forwardRef(
     var _b = _a, {
       expanded,
       orientation = "horizontal",
-      colors = standardFloatingToolbarColors,
+      variant = "standard",
+      colors: customColors,
       shape = "full",
       contentPadding,
       scrollBehavior,
@@ -22694,6 +23057,7 @@ var FloatingToolbarBase = React59__namespace.forwardRef(
     } = _b, props = __objRest(_b, [
       "expanded",
       "orientation",
+      "variant",
       "colors",
       "shape",
       "contentPadding",
@@ -22710,6 +23074,7 @@ var FloatingToolbarBase = React59__namespace.forwardRef(
       "style",
       "aria-label"
     ]);
+    const colors = getToolbarColors(variant, customColors);
     const isHorizontal = orientation === "horizontal";
     const isStringPadding = typeof contentPadding === "string";
     const cssVars = __spreadValues(__spreadValues({
@@ -22718,7 +23083,8 @@ var FloatingToolbarBase = React59__namespace.forwardRef(
       "--toolbar-size": `${FloatingToolbarTokens.ContainerHeight}px`
     }, isStringPadding ? {} : contentPadding), style);
     const isScrolledOff = scrollBehavior && scrollBehavior.offset < 0;
-    const shadowClass = expanded ? "shadow-md" : "shadow-sm";
+    const isXr = variant === "xr";
+    const shadowClass = isXr ? "shadow-lg border border-white/10 backdrop-blur-md" : expanded ? "shadow-md" : "shadow-sm";
     const containerShapeClass = shape === "full" ? "rounded-full" : "rounded-2xl";
     const leadingVariants = buildSlotVariants(
       isHorizontal ? "-100%" : 0,
@@ -22735,7 +23101,7 @@ var FloatingToolbarBase = React59__namespace.forwardRef(
       scrollBehavior,
       disableScrollTranslation
     );
-    return /* @__PURE__ */ jsxRuntime.jsx(ToolbarContext.Provider, { value: { orientation }, children: /* @__PURE__ */ jsxRuntime.jsx(
+    return /* @__PURE__ */ jsxRuntime.jsx(ToolbarContext.Provider, { value: { orientation, itemClassName }, children: /* @__PURE__ */ jsxRuntime.jsx(
       react.m.div,
       {
         ref,
@@ -22757,8 +23123,8 @@ var FloatingToolbarBase = React59__namespace.forwardRef(
               color: "var(--toolbar-color)"
             }),
             className: cn(
-              "flex pointer-events-auto relative",
-              isHorizontal ? "max-w-[90vw] h-(--toolbar-size)" : "max-h-[90vh] w-(--toolbar-size) h-fit",
+              "flex pointer-events-auto relative text-(--toolbar-color) [&_.text-m3-on-surface-variant]:text-current",
+              isHorizontal ? "max-w-[min(90vw,100%)] h-(--toolbar-size)" : "max-h-[min(90vh,100%)] w-(--toolbar-size) h-fit",
               containerShapeClass,
               shadowClass,
               className
@@ -22775,11 +23141,11 @@ var FloatingToolbarBase = React59__namespace.forwardRef(
                   "div",
                   {
                     className: cn(
-                      "flex items-center gap-1 min-w-0 min-h-0",
+                      "flex items-center min-w-0 min-h-0",
                       isHorizontal ? "flex-row h-full" : "flex-col w-full",
-                      isStringPadding ? contentPadding : isHorizontal ? "px-4" : "py-6"
+                      isStringPadding ? contentPadding : isHorizontal ? "px-2" : "py-2"
                     ),
-                    style: isStringPadding ? void 0 : contentPadding,
+                    style: __spreadValues({ gap: itemGap }, isStringPadding ? {} : contentPadding),
                     children: [
                       /* @__PURE__ */ jsxRuntime.jsx(react.AnimatePresence, { initial: false, children: expanded && startContent && /* @__PURE__ */ jsxRuntime.jsx(
                         react.m.div,
@@ -22789,9 +23155,10 @@ var FloatingToolbarBase = React59__namespace.forwardRef(
                           animate: "visible",
                           exit: "hidden",
                           className: cn(
-                            "flex shrink-0 overflow-hidden",
+                            "flex shrink-0 items-center overflow-hidden",
                             isHorizontal ? "flex-row" : "flex-col"
                           ),
+                          style: { gap: itemGap },
                           children: processNodes(startContent)
                         },
                         "start"
@@ -22816,9 +23183,10 @@ var FloatingToolbarBase = React59__namespace.forwardRef(
                           animate: "visible",
                           exit: "hidden",
                           className: cn(
-                            "flex shrink-0 overflow-hidden",
+                            "flex shrink-0 items-center overflow-hidden",
                             isHorizontal ? "flex-row" : "flex-col"
                           ),
+                          style: { gap: itemGap },
                           children: processNodes(endContent)
                         },
                         "end"
@@ -22844,7 +23212,8 @@ var FloatingToolbarWithFabBase = React59__namespace.forwardRef(
     var _b = _a, {
       expanded,
       orientation = "horizontal",
-      colors = standardFloatingToolbarColors,
+      variant = "standard",
+      colors: customColors,
       floatingActionButton,
       fabPosition = orientation === "horizontal" ? "end" : "bottom",
       animationDuration = 0.3,
@@ -22855,6 +23224,7 @@ var FloatingToolbarWithFabBase = React59__namespace.forwardRef(
     } = _b, props = __objRest(_b, [
       "expanded",
       "orientation",
+      "variant",
       "colors",
       "floatingActionButton",
       "fabPosition",
@@ -22864,6 +23234,7 @@ var FloatingToolbarWithFabBase = React59__namespace.forwardRef(
       "className",
       "style"
     ]);
+    const colors = getToolbarColors(variant, customColors);
     const isHorizontal = orientation === "horizontal";
     const effectiveExpanded = expanded && (!scrollBehavior || scrollBehavior.isExpanded);
     const isFabBefore = fabPosition === "start" || fabPosition === "top";
@@ -22941,7 +23312,8 @@ var FloatingToolbarWithFabBase = React59__namespace.forwardRef(
                   expanded,
                   colors,
                   disableScrollTranslation: true,
-                  disableLayoutAnimation: true
+                  disableLayoutAnimation: true,
+                  className: className ? cn("h-full", className) : void 0
                 }, props)
               ) : /* @__PURE__ */ jsxRuntime.jsx(
                 VerticalFloatingToolbar,
@@ -22949,7 +23321,8 @@ var FloatingToolbarWithFabBase = React59__namespace.forwardRef(
                   expanded,
                   colors,
                   disableScrollTranslation: true,
-                  disableLayoutAnimation: true
+                  disableLayoutAnimation: true,
+                  className: className ? cn("w-full", className) : void 0
                 }, props)
               )
             },
@@ -22979,7 +23352,7 @@ var ToolbarDivider = ({
       "aria-orientation": isHorizontalToolbar ? "vertical" : "horizontal",
       className: cn(
         "shrink-0 bg-current opacity-30 border-none",
-        isHorizontalToolbar ? "w-px h-8 self-center mx-2" : "h-px w-8 self-center my-2",
+        isHorizontalToolbar ? "w-px h-8 self-center mx-1" : "h-px w-8 self-center my-1",
         className
       ),
       style: {
@@ -23002,20 +23375,47 @@ var VARIANT_TO_COLOR_STYLE = {
 };
 var ToolbarIconButton = React59__namespace.forwardRef(
   (_a, ref) => {
-    var _b = _a, { emphasis = "standard", toolbarSize = "default", className } = _b, props = __objRest(_b, ["emphasis", "toolbarSize", "className"]);
+    var _b = _a, {
+      emphasis = "standard",
+      toolbarSize = "default",
+      selected,
+      asChild,
+      className
+    } = _b, props = __objRest(_b, [
+      "emphasis",
+      "toolbarSize",
+      "selected",
+      "asChild",
+      "className"
+    ]);
+    const context = useToolbarContext();
     const widthClass = TOOLBAR_ICON_BUTTON_WIDTH[toolbarSize];
     const colorStyle = VARIANT_TO_COLOR_STYLE[emphasis];
+    const iconButtonProps = selected !== void 0 ? {
+      variant: "toggle",
+      selected: Boolean(selected)
+    } : {
+      variant: "default"
+    };
     return /* @__PURE__ */ jsxRuntime.jsx(
       IconButton,
-      __spreadValues({
+      __spreadValues(__spreadProps(__spreadValues({
         ref,
-        variant: "default",
+        asChild,
         colorStyle,
         size: "md",
         shape: "round",
-        iconSize: ToolbarIconButtonTokens.IconSize,
-        className: cn("h-[48px]", widthClass, className)
-      }, props)
+        iconSize: ToolbarIconButtonTokens.IconSize
+      }, iconButtonProps), {
+        className: cn(
+          "h-[48px]",
+          widthClass,
+          emphasis === "standard" && !selected && "text-current hover:bg-current/8 active:bg-current/12",
+          emphasis === "standard" && selected && "bg-current/16 text-current hover:bg-current/20 active:bg-current/24",
+          context == null ? void 0 : context.itemClassName,
+          className
+        )
+      }), props)
     );
   }
 );
@@ -23086,6 +23486,195 @@ function useFloatingToolbarScrollBehavior(options = {}) {
     exitDirection
   };
 }
+var MOTION_PROP_KEYS2 = [
+  "animate",
+  "exit",
+  "initial",
+  "transition",
+  "variants",
+  "whileHover",
+  "whileTap",
+  "whileFocus",
+  "whileDrag",
+  "whileInView",
+  "onAnimationStart",
+  "onAnimationComplete",
+  "onUpdate",
+  "onDragStart",
+  "onDragEnd",
+  "onDrag",
+  "onDirectionLock",
+  "onDragTransitionEnd",
+  "layout",
+  "layoutId",
+  "onLayoutAnimationComplete"
+];
+var ToolbarToggleButton = React59__namespace.forwardRef(
+  (_a, ref) => {
+    var _b = _a, {
+      emphasis = "standard",
+      selected = false,
+      icon,
+      children,
+      pressScale = 0.95,
+      pressBounceOffset = 6,
+      ripple = true,
+      asChild = false,
+      className,
+      type = "button",
+      disabled,
+      onPointerDown: onPointerDownProp
+    } = _b, props = __objRest(_b, [
+      "emphasis",
+      "selected",
+      "icon",
+      "children",
+      "pressScale",
+      "pressBounceOffset",
+      "ripple",
+      "asChild",
+      "className",
+      "type",
+      "disabled",
+      "onPointerDown"
+    ]);
+    const context = useToolbarContext();
+    const {
+      ripples,
+      onPointerDown: handleRipplePointerDown,
+      removeRipple
+    } = useRippleState({
+      disabled: Boolean(disabled) || !ripple
+    });
+    const handlePointerDown = React59__namespace.useCallback(
+      (e) => {
+        if (!disabled && ripple) {
+          handleRipplePointerDown(e);
+        }
+        onPointerDownProp == null ? void 0 : onPointerDownProp(e);
+      },
+      [disabled, ripple, handleRipplePointerDown, onPointerDownProp]
+    );
+    const baseClasses = "relative overflow-hidden inline-flex items-center justify-center min-w-[95px] h-[48px] px-4 rounded-full text-sm font-medium transition-colors select-none focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-current/40 disabled:pointer-events-none disabled:opacity-38";
+    const variantClasses = {
+      standard: selected ? "bg-current/16 text-current hover:bg-current/20 active:bg-current/24" : "bg-transparent text-current hover:bg-current/8 active:bg-current/12",
+      tonal: selected ? "bg-m3-secondary-container text-m3-on-secondary-container hover:shadow-sm" : "bg-m3-surface-container-high text-m3-on-surface hover:bg-m3-surface-container-highest",
+      filled: selected ? "bg-m3-primary text-m3-on-primary hover:shadow-sm" : "bg-m3-surface-container-highest text-m3-on-surface hover:bg-m3-surface-container-high"
+    };
+    const combinedClassName = cn(
+      baseClasses,
+      variantClasses[emphasis],
+      context == null ? void 0 : context.itemClassName,
+      className
+    );
+    const whileTapConfig = React59__namespace.useMemo(
+      () => ({
+        scale: pressScale,
+        x: pressBounceOffset ? [
+          0,
+          -pressBounceOffset,
+          pressBounceOffset,
+          -pressBounceOffset / 2,
+          pressBounceOffset / 2,
+          0
+        ] : 0
+      }),
+      [pressScale, pressBounceOffset]
+    );
+    const transitionConfig = React59__namespace.useMemo(
+      () => ({
+        scale: FAST_SPATIAL_SPRING,
+        x: {
+          duration: 0.35,
+          ease: "easeInOut"
+        }
+      }),
+      []
+    );
+    const mainContent = /* @__PURE__ */ jsxRuntime.jsxs("span", { className: "inline-flex items-center justify-center h-full gap-2", children: [
+      icon && /* @__PURE__ */ jsxRuntime.jsx(
+        "span",
+        {
+          className: "shrink-0 inline-flex items-center justify-center",
+          style: {
+            width: ToolbarToggleButtonTokens.IconSize,
+            height: ToolbarToggleButtonTokens.IconSize
+          },
+          children: icon
+        }
+      ),
+      children && (typeof children === "string" || typeof children === "number" ? /* @__PURE__ */ jsxRuntime.jsx("span", { children }) : children)
+    ] });
+    if (asChild) {
+      const child = React59__namespace.Children.only(children);
+      const childContent = child.props.children;
+      const innerChildContent = /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [
+        ripple && /* @__PURE__ */ jsxRuntime.jsx(
+          Ripple,
+          {
+            ripples,
+            onRippleDone: removeRipple,
+            disabled
+          }
+        ),
+        /* @__PURE__ */ jsxRuntime.jsx("span", { className: "inline-flex items-center justify-center h-full gap-2", children: icon ? /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [
+          /* @__PURE__ */ jsxRuntime.jsx(
+            "span",
+            {
+              className: "shrink-0 inline-flex items-center justify-center",
+              style: {
+                width: ToolbarToggleButtonTokens.IconSize,
+                height: ToolbarToggleButtonTokens.IconSize
+              },
+              children: icon
+            }
+          ),
+          typeof childContent === "string" || typeof childContent === "number" ? /* @__PURE__ */ jsxRuntime.jsx("span", { children: childContent }) : childContent
+        ] }) : childContent })
+      ] });
+      const strippedProps = __spreadValues({}, props);
+      for (const key of MOTION_PROP_KEYS2) delete strippedProps[key];
+      delete strippedProps.children;
+      return /* @__PURE__ */ jsxRuntime.jsx(react.LazyMotion, { features: react.domMax, strict: true, children: /* @__PURE__ */ jsxRuntime.jsx(
+        reactSlot.Slot,
+        __spreadProps(__spreadValues({
+          ref,
+          "aria-pressed": selected,
+          className: combinedClassName,
+          onPointerDown: handlePointerDown
+        }, strippedProps), {
+          children: React59__namespace.cloneElement(child, { children: innerChildContent })
+        })
+      ) });
+    }
+    return /* @__PURE__ */ jsxRuntime.jsx(react.LazyMotion, { features: react.domMax, strict: true, children: /* @__PURE__ */ jsxRuntime.jsxs(
+      react.m.button,
+      __spreadProps(__spreadValues({
+        ref,
+        type,
+        "aria-pressed": selected,
+        disabled,
+        whileTap: whileTapConfig,
+        transition: transitionConfig,
+        onPointerDown: handlePointerDown,
+        className: combinedClassName
+      }, props), {
+        children: [
+          ripple && /* @__PURE__ */ jsxRuntime.jsx(
+            Ripple,
+            {
+              ripples,
+              onRippleDone: removeRipple,
+              disabled
+            }
+          ),
+          mainContent
+        ]
+      })
+    ) });
+  }
+);
+ToolbarToggleButton.displayName = "ToolbarToggleButton";
 
 // src/ui/tooltip/tooltip.tokens.ts
 var TooltipTokens = {
@@ -23883,6 +24472,8 @@ exports.ToolbarDivider = ToolbarDivider;
 exports.ToolbarDividerTokens = ToolbarDividerTokens;
 exports.ToolbarIconButton = ToolbarIconButton;
 exports.ToolbarIconButtonTokens = ToolbarIconButtonTokens;
+exports.ToolbarToggleButton = ToolbarToggleButton;
+exports.ToolbarToggleButtonTokens = ToolbarToggleButtonTokens;
 exports.TooltipBox = TooltipBox;
 exports.TooltipCaretShape = TooltipCaretShape;
 exports.TooltipTokens = TooltipTokens;
@@ -23912,6 +24503,7 @@ exports.convex = convex;
 exports.cornerFeature = cornerFeature;
 exports.cornerRounding = cornerRounding;
 exports.createDoubleMapper = createDoubleMapper;
+exports.createMd3ExpressiveTheme = createMd3ExpressiveTheme;
 exports.directionVector = directionVector;
 exports.distance = distance;
 exports.distanceSquared = distanceSquared;
@@ -23925,6 +24517,7 @@ exports.getDistance = getDistance;
 exports.getDistanceSquared = getDistanceSquared;
 exports.getExpressiveShape = getExpressiveShape;
 exports.getListItemHeight = getListItemHeight;
+exports.getToolbarColors = getToolbarColors;
 exports.interpolate = interpolate;
 exports.interpolatePath = interpolatePath;
 exports.lerpPoint = lerpPoint;
@@ -23942,6 +24535,9 @@ exports.square = square;
 exports.standardFloatingToolbarColors = standardFloatingToolbarColors;
 exports.star = star;
 exports.subtractPoints = subtractPoints;
+exports.surfaceContainerHighFloatingToolbarColors = surfaceContainerHighFloatingToolbarColors;
+exports.surfaceContainerHighestFloatingToolbarColors = surfaceContainerHighestFloatingToolbarColors;
+exports.tertiaryContainerFloatingToolbarColors = tertiaryContainerFloatingToolbarColors;
 exports.toClipPath = toClipPath;
 exports.toSvgPath = toSvgPath;
 exports.transformFeature = transformFeature;
@@ -23968,5 +24564,6 @@ exports.useTooltipPosition = useTooltipPosition;
 exports.useTooltipState = useTooltipState;
 exports.useTypography = useTypography;
 exports.vibrantFloatingToolbarColors = vibrantFloatingToolbarColors;
+exports.xrFloatingToolbarColors = xrFloatingToolbarColors;
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map