@bug-on/m3-expressive 1.2.7 → 1.3.1

package/dist/navigation.mjs

@@ -1,11 +1,11 @@
 "use client";
-import * as React37 from 'react';
-import { useRef, useEffect, useState } from 'react';
+import { AnimatePresence, m, LazyMotion, domMax, useMotionValue, animate, useAnimationFrame, useReducedMotion, LayoutGroup, useScroll, useMotionValueEvent, useTransform } from 'motion/react';
 import { clsx } from 'clsx';
 import { twMerge } from 'tailwind-merge';
 import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
+import * as React37 from 'react';
+import { useRef, useEffect, useState } from 'react';
 import * as RxContextMenu from '@radix-ui/react-context-menu';
-import { AnimatePresence, m, LazyMotion, domMax, useAnimationFrame, useMotionValue, animate, useReducedMotion, LayoutGroup, useScroll, useMotionValueEvent, useTransform } from 'motion/react';
 import { cornerRadius } from '@bug-on/m3-tokens';
 import * as DropdownMenu from '@radix-ui/react-dropdown-menu';
 import { Slot } from '@radix-ui/react-slot';
@@ -43,6 +43,55 @@ var __objRest = (source, exclude) => {
     }
   return target;
 };
+function cn(...inputs) {
+  return twMerge(clsx(inputs));
+}
+function getMaskGradient(direction) {
+  switch (direction) {
+    case "bottom":
+      return "linear-gradient(to top, rgba(0, 0, 0, 1) 0%, rgba(0, 0, 0, 1) 45%, rgba(0, 0, 0, 0.7) 75%, rgba(0, 0, 0, 0) 100%)";
+    case "both":
+      return "linear-gradient(to bottom, rgba(0, 0, 0, 0) 0%, rgba(0, 0, 0, 0.7) 20%, rgba(0, 0, 0, 1) 40%, rgba(0, 0, 0, 1) 60%, rgba(0, 0, 0, 0.7) 80%, rgba(0, 0, 0, 0) 100%)";
+    default:
+      return "linear-gradient(to bottom, rgba(0, 0, 0, 1) 0%, rgba(0, 0, 0, 1) 45%, rgba(0, 0, 0, 0.7) 75%, rgba(0, 0, 0, 0) 100%)";
+  }
+}
+function FadingBlurMask({
+  direction = "top",
+  blurIntensity = 12,
+  blurHeight = "100%",
+  color = "var(--md-sys-color-surface)",
+  className,
+  style,
+  children
+}) {
+  const shouldReduceMotion = useReducedMotion();
+  const activeBlur = shouldReduceMotion ? 0 : blurIntensity;
+  const maskGradient = getMaskGradient(direction);
+  const maskStyle = __spreadValues({
+    position: "absolute",
+    inset: 0,
+    pointerEvents: "none",
+    height: typeof blurHeight === "number" ? `${blurHeight}px` : blurHeight,
+    backdropFilter: activeBlur > 0 ? `blur(${activeBlur}px)` : void 0,
+    WebkitBackdropFilter: activeBlur > 0 ? `blur(${activeBlur}px)` : void 0,
+    maskImage: maskGradient,
+    WebkitMaskImage: maskGradient,
+    backgroundColor: color
+  }, style);
+  return /* @__PURE__ */ jsx(
+    "div",
+    {
+      "aria-hidden": "true",
+      className: cn(
+        "absolute inset-0 pointer-events-none z-0 rounded-[inherit]",
+        className
+      ),
+      style: maskStyle,
+      children
+    }
+  );
+}
 
 // src/ui/shared/motion-tokens.ts
 var FAST_SPATIAL_SPRING = {
@@ -197,9 +246,6 @@ var APP_BAR_TITLE_FADE = {
   duration: 0.15,
   ease: "easeInOut"
 };
-function cn(...inputs) {
-  return twMerge(clsx(inputs));
-}
 function AppBarItemButton({ item }) {
   const isDisabled = item.enabled === false;
   if (item.type === "custom" && item.appBarContent) {
@@ -1726,7 +1772,10 @@ function BottomAppBar({
   floatingActionButton,
   scrollBehavior = "visible",
   scrollElement,
-  className
+  className,
+  enableFadingBlur,
+  blurIntensity,
+  blurHeight
 }) {
   const shouldReduceMotion = useReducedMotion();
   const { isHidden } = useAppBarScroll({
@@ -1741,9 +1790,9 @@ function BottomAppBar({
       role: "navigation",
       "aria-label": "Bottom app bar",
       className: cn(
-        "fixed bottom-0 inset-x-0 z-50",
+        "fixed bottom-0 inset-x-0 z-50 overflow-hidden rounded-[inherit]",
         "flex items-center",
-        "bg-m3-surface-container",
+        !enableFadingBlur && "bg-m3-surface-container",
         "px-2",
         // minimal horizontal padding, icon buttons provide spacing
         "elevation-2",
@@ -1756,8 +1805,19 @@ function BottomAppBar({
       animate: { y: translateY },
       transition: hideTransition,
       children: [
-        actions && /* @__PURE__ */ jsx("div", { className: "flex items-center flex-1", children: actions }),
-        floatingActionButton && /* @__PURE__ */ jsx("div", { className: "shrink-0 ml-auto mr-2", children: floatingActionButton })
+        enableFadingBlur && /* @__PURE__ */ jsx(
+          FadingBlurMask,
+          {
+            direction: "bottom",
+            blurIntensity,
+            blurHeight,
+            color: "var(--md-sys-color-surface-container)"
+          }
+        ),
+        /* @__PURE__ */ jsxs("div", { className: "relative z-10 flex items-center w-full h-full", children: [
+          actions && /* @__PURE__ */ jsx("div", { className: "flex items-center flex-1", children: actions }),
+          floatingActionButton && /* @__PURE__ */ jsx("div", { className: "shrink-0 ml-auto mr-2", children: floatingActionButton })
+        ] })
       ]
     }
   );
@@ -1865,7 +1925,10 @@ function LargeFlexibleAppBar({
   headerContent,
   collapsedHeight = AppBarTokens.heights.flexibleCollapsed,
   expandedHeight,
-  className
+  className,
+  enableFadingBlur,
+  blurIntensity,
+  blurHeight
 }) {
   var _a, _b, _c;
   const resolvedExpandedHeight = expandedHeight != null ? expandedHeight : subtitle ? AppBarTokens.heights.largeFlexWithSubtitleExpanded : AppBarTokens.heights.largeFlexExpanded;
@@ -1895,15 +1958,28 @@ function LargeFlexibleAppBar({
     {
       role: "banner",
       className: cn(
-        "fixed top-0 inset-x-0 z-50 flex flex-col overflow-hidden",
+        "fixed top-0 inset-x-0 z-50 flex flex-col overflow-hidden rounded-[inherit]",
         className
       ),
-      style: { height, backgroundColor: currentBg, transition: cssTransition },
+      style: {
+        height,
+        backgroundColor: enableFadingBlur ? "transparent" : currentBg,
+        transition: cssTransition
+      },
       children: [
+        enableFadingBlur && /* @__PURE__ */ jsx(
+          FadingBlurMask,
+          {
+            direction: "top",
+            blurIntensity,
+            blurHeight,
+            color: currentBg
+          }
+        ),
         /* @__PURE__ */ jsxs(
           "div",
           {
-            className: "flex items-center px-1 shrink-0",
+            className: "relative z-10 flex items-center px-1 shrink-0",
             style: { height: collapsedHeight },
             children: [
               navigationIcon && /* @__PURE__ */ jsx(
@@ -1945,7 +2021,7 @@ function LargeFlexibleAppBar({
           "div",
           {
             className: cn(
-              "flex flex-col flex-1 px-4 pb-4 justify-end",
+              "relative z-10 flex flex-col flex-1 px-4 pb-3 justify-end",
               isCentered ? "items-center" : "items-start"
             ),
             children: [
@@ -1998,7 +2074,10 @@ function MediumFlexibleAppBar({
   headerContent,
   collapsedHeight = AppBarTokens.heights.flexibleCollapsed,
   expandedHeight,
-  className
+  className,
+  enableFadingBlur,
+  blurIntensity,
+  blurHeight
 }) {
   var _a, _b, _c;
   const resolvedExpandedHeight = expandedHeight != null ? expandedHeight : subtitle ? AppBarTokens.heights.mediumFlexWithSubtitleExpanded : AppBarTokens.heights.mediumFlexExpanded;
@@ -2028,15 +2107,28 @@ function MediumFlexibleAppBar({
     {
       role: "banner",
       className: cn(
-        "fixed top-0 inset-x-0 z-50 flex flex-col overflow-hidden",
+        "fixed top-0 inset-x-0 z-50 flex flex-col overflow-hidden rounded-[inherit]",
         className
       ),
-      style: { height, backgroundColor: currentBg, transition: cssTransition },
+      style: {
+        height,
+        backgroundColor: enableFadingBlur ? "transparent" : currentBg,
+        transition: cssTransition
+      },
       children: [
+        enableFadingBlur && /* @__PURE__ */ jsx(
+          FadingBlurMask,
+          {
+            direction: "top",
+            blurIntensity,
+            blurHeight,
+            color: currentBg
+          }
+        ),
         /* @__PURE__ */ jsxs(
           "div",
           {
-            className: "flex items-center px-1 shrink-0",
+            className: "relative z-10 flex items-center px-1 shrink-0",
             style: { height: collapsedHeight },
             children: [
               navigationIcon && /* @__PURE__ */ jsx(
@@ -2078,7 +2170,7 @@ function MediumFlexibleAppBar({
           "div",
           {
             className: cn(
-              "flex flex-col flex-1 px-4 pb-3 justify-end",
+              "relative z-10 flex flex-col flex-1 px-4 pb-3 justify-end",
               isCentered ? "items-center" : "items-start"
             ),
             children: [
@@ -2125,7 +2217,7 @@ function SearchIcon({ className }) {
     "span",
     {
       className: cn(
-        "material-symbols-rounded text-[20px] leading-none select-none",
+        "material-symbols-rounded text-[20px] leading-none select-none flex items-center justify-center",
         className
       ),
       "aria-hidden": "true",
@@ -2145,7 +2237,12 @@ function SearchAppBar({
   scrollBehavior = "pinned",
   scrollElement,
   searchBarId = "search-bar",
-  className
+  searchBarVariant = "filled",
+  searchBarHeight = 56,
+  className,
+  enableFadingBlur,
+  blurIntensity,
+  blurHeight
 }) {
   var _a, _b;
   const shouldReduceMotion = useReducedMotion();
@@ -2168,65 +2265,92 @@ function SearchAppBar({
       handleSearchClick();
     }
   };
+  const searchBarBg = isScrolled ? "var(--md-sys-color-surface-container-highest)" : APP_BAR_COLORS.searchBarBg;
+  const isOutlined = searchBarVariant === "outlined";
   return /* @__PURE__ */ jsxs(
     m.header,
     {
       role: "banner",
       className: cn(
-        "fixed top-0 inset-x-0 z-50 flex items-center gap-2 px-4",
+        "fixed top-0 inset-x-0 z-50 flex items-center gap-2 px-4 overflow-hidden rounded-[inherit]",
         className
       ),
       style: {
         height: AppBarTokens.heights.small,
-        backgroundColor: currentBg,
+        backgroundColor: enableFadingBlur ? "transparent" : currentBg,
         transition: cssTransition
       },
       children: [
-        navigationIcon && /* @__PURE__ */ jsx(
-          "div",
+        enableFadingBlur && /* @__PURE__ */ jsx(
+          FadingBlurMask,
           {
-            className: "shrink-0 flex items-center justify-center",
-            style: {
-              width: AppBarTokens.iconButtonTouchTarget,
-              height: AppBarTokens.iconButtonTouchTarget
-            },
-            children: navigationIcon
+            direction: "top",
+            blurIntensity,
+            blurHeight,
+            color: currentBg
           }
         ),
-        /* @__PURE__ */ jsxs(
-          m.div,
-          {
-            layoutId: shouldReduceMotion ? void 0 : searchBarId,
-            role: "search",
-            "aria-label": searchPlaceholder,
-            "aria-expanded": isSearchOpen,
-            tabIndex: 0,
-            className: "relative flex flex-1 items-center gap-2 rounded-full cursor-text h-10 px-4 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-offset-2",
-            onClick: handleSearchClick,
-            onKeyDown: handleKeyDown,
-            children: [
-              /* @__PURE__ */ jsx("div", { className: "absolute inset-0 rounded-full bg-m3-surface-container-high -z-10" }),
-              /* @__PURE__ */ jsx(
-                "span",
-                {
-                  className: "shrink-0",
-                  style: { color: APP_BAR_COLORS.searchBarContent },
-                  children: leadingSearchIcon != null ? leadingSearchIcon : /* @__PURE__ */ jsx(SearchIcon, {})
-                }
-              ),
-              /* @__PURE__ */ jsx(
-                "span",
-                {
-                  className: "flex-1 text-[16px] leading-6 truncate select-none",
-                  style: { color: APP_BAR_COLORS.searchBarContent },
-                  children: searchValue != null ? searchValue : searchPlaceholder
-                }
+        /* @__PURE__ */ jsxs("div", { className: "relative z-10 flex items-center gap-2 w-full h-full", children: [
+          navigationIcon && /* @__PURE__ */ jsx(
+            "div",
+            {
+              className: "shrink-0 flex items-center justify-center",
+              style: {
+                width: AppBarTokens.iconButtonTouchTarget,
+                height: AppBarTokens.iconButtonTouchTarget
+              },
+              children: navigationIcon
+            }
+          ),
+          /* @__PURE__ */ jsxs(
+            m.div,
+            {
+              layoutId: shouldReduceMotion ? void 0 : searchBarId,
+              role: "search",
+              "aria-label": searchPlaceholder,
+              "aria-expanded": isSearchOpen,
+              tabIndex: 0,
+              className: cn(
+                "relative flex flex-1 items-center gap-2 rounded-full cursor-text px-4",
+                "focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-offset-2",
+                isOutlined && "border border-(--md-sys-color-outline)"
               ),
-              trailingSearchActions && /* @__PURE__ */ jsx("div", { className: "flex items-center shrink-0", children: trailingSearchActions })
-            ]
-          }
-        ),
-        externalActions && /* @__PURE__ */ jsx("div", { className: "flex items-center shrink-0", children: externalActions })
+              style: { height: searchBarHeight },
+              onClick: handleSearchClick,
+              onKeyDown: handleKeyDown,
+              children: [
+                !isOutlined && /* @__PURE__ */ jsx(
+                  "div",
+                  {
+                    className: "absolute inset-0 rounded-full -z-10 transition-colors",
+                    style: {
+                      backgroundColor: searchBarBg,
+                      transition: cssTransition
+                    }
+                  }
+                ),
+                /* @__PURE__ */ jsx(
+                  "span",
+                  {
+                    className: "shrink-0 flex items-center justify-center h-full",
+                    style: { color: APP_BAR_COLORS.searchBarContent },
+                    children: leadingSearchIcon != null ? leadingSearchIcon : /* @__PURE__ */ jsx(SearchIcon, {})
+                  }
+                ),
+                /* @__PURE__ */ jsx(
+                  "span",
+                  {
+                    className: "flex-1 text-[16px] leading-6 truncate select-none",
+                    style: { color: APP_BAR_COLORS.searchBarContent },
+                    children: searchValue != null ? searchValue : searchPlaceholder
+                  }
+                ),
+                trailingSearchActions && /* @__PURE__ */ jsx("div", { className: "flex items-center shrink-0", children: trailingSearchActions })
+              ]
+            }
+          ),
+          externalActions && /* @__PURE__ */ jsx("div", { className: "flex items-center shrink-0", children: externalActions })
+        ] })
       ]
     }
   );
@@ -2399,9 +2523,11 @@ function SmallAppBarInner({
   navigationIcon,
   actions,
   colors,
-  className,
   currentBg,
-  cssTransition
+  cssTransition,
+  enableFadingBlur,
+  blurIntensity,
+  blurHeight
 }) {
   var _a, _b;
   const isCentered = titleAlignment === "center";
@@ -2409,57 +2535,81 @@ function SmallAppBarInner({
     m.header,
     {
       role: "banner",
-      className: cn("flex items-center px-1 h-full w-full", className),
-      style: { backgroundColor: currentBg, transition: cssTransition },
+      className: "relative flex items-center px-1 h-full w-full overflow-hidden rounded-[inherit]",
+      style: {
+        backgroundColor: enableFadingBlur ? "transparent" : currentBg,
+        transition: cssTransition
+      },
       children: [
-        navigationIcon && /* @__PURE__ */ jsx(
-          "div",
+        enableFadingBlur && /* @__PURE__ */ jsx(
+          FadingBlurMask,
           {
-            className: "shrink-0 flex items-center justify-center",
-            style: {
-              width: AppBarTokens.iconButtonTouchTarget,
-              height: AppBarTokens.iconButtonTouchTarget
-            },
-            children: navigationIcon
+            direction: "top",
+            blurIntensity,
+            blurHeight,
+            color: currentBg
           }
         ),
-        /* @__PURE__ */ jsxs(
-          "div",
-          {
-            className: cn(
-              "flex-1 flex flex-col justify-center min-w-0",
-              isCentered ? "items-center" : "items-start",
-              !navigationIcon && "pl-4"
-            ),
-            children: [
-              /* @__PURE__ */ jsx(
-                "span",
-                {
-                  className: cn(
-                    appBarTypography.titleLarge,
-                    "truncate w-full",
-                    isCentered && "text-center"
-                  ),
-                  style: { color: (_a = colors == null ? void 0 : colors.titleColor) != null ? _a : APP_BAR_COLORS.title },
-                  children: title
-                }
+        /* @__PURE__ */ jsxs("div", { className: "relative z-10 flex items-center w-full h-full", children: [
+          navigationIcon && /* @__PURE__ */ jsx(
+            "div",
+            {
+              className: "shrink-0 flex items-center justify-center",
+              style: {
+                width: AppBarTokens.iconButtonTouchTarget,
+                height: AppBarTokens.iconButtonTouchTarget
+              },
+              children: navigationIcon
+            }
+          ),
+          /* @__PURE__ */ jsxs(
+            "div",
+            {
+              className: cn(
+                "flex-1 flex flex-col justify-center min-w-0",
+                isCentered ? "items-center" : "items-start",
+                !navigationIcon && !isCentered && "pl-4"
               ),
-              subtitle && /* @__PURE__ */ jsx(
-                "span",
-                {
-                  className: cn(
-                    appBarTypography.labelMedium,
-                    "truncate w-full",
-                    isCentered && "text-center"
-                  ),
-                  style: { color: (_b = colors == null ? void 0 : colors.subtitleColor) != null ? _b : APP_BAR_COLORS.subtitle },
-                  children: subtitle
-                }
-              )
-            ]
-          }
-        ),
-        actions && /* @__PURE__ */ jsx("div", { className: "flex items-center shrink-0", children: actions })
+              children: [
+                /* @__PURE__ */ jsx(
+                  "span",
+                  {
+                    className: cn(
+                      appBarTypography.titleLarge,
+                      "truncate w-full",
+                      isCentered && "text-center"
+                    ),
+                    style: { color: (_a = colors == null ? void 0 : colors.titleColor) != null ? _a : APP_BAR_COLORS.title },
+                    children: title
+                  }
+                ),
+                subtitle && /* @__PURE__ */ jsx(
+                  "span",
+                  {
+                    className: cn(
+                      appBarTypography.labelMedium,
+                      "truncate w-full",
+                      isCentered && "text-center"
+                    ),
+                    style: {
+                      color: (_b = colors == null ? void 0 : colors.subtitleColor) != null ? _b : APP_BAR_COLORS.subtitle
+                    },
+                    children: subtitle
+                  }
+                )
+              ]
+            }
+          ),
+          isCentered && !actions && navigationIcon && /* @__PURE__ */ jsx(
+            "div",
+            {
+              "aria-hidden": "true",
+              style: { width: AppBarTokens.iconButtonTouchTarget },
+              className: "shrink-0"
+            }
+          ),
+          actions && /* @__PURE__ */ jsx("div", { className: "flex items-center shrink-0", children: actions })
+        ] })
       ]
     }
   );
@@ -2473,7 +2623,10 @@ function SmallAppBar({
   colors,
   scrollBehavior = "pinned",
   scrollElement,
-  className
+  className,
+  enableFadingBlur,
+  blurIntensity,
+  blurHeight
 }) {
   var _a, _b;
   const shouldReduceMotion = useReducedMotion();
@@ -2493,14 +2646,17 @@ function SmallAppBar({
     actions,
     colors,
     currentBg,
-    cssTransition
+    cssTransition,
+    enableFadingBlur,
+    blurIntensity,
+    blurHeight
   };
   const barHeight = AppBarTokens.heights.small;
   if (scrollBehavior !== "enterAlways") {
     return /* @__PURE__ */ jsx(
       "div",
       {
-        className: cn("fixed top-0 inset-x-0 z-50", className),
+        className: cn("fixed top-0 inset-x-0 z-50 overflow-hidden", className),
         style: { height: barHeight },
         children: /* @__PURE__ */ jsx(SmallAppBarInner, __spreadValues({}, innerProps))
       }
@@ -2513,7 +2669,10 @@ function SmallAppBar({
       animate: { y: 0 },
       exit: { y: "-100%" },
       transition: shouldReduceMotion ? { duration: 0 } : APP_BAR_ENTER_ALWAYS_SPRING,
-      className: cn("fixed top-0 inset-x-0 z-50", className),
+      className: cn(
+        "fixed top-0 inset-x-0 z-50 overflow-hidden",
+        className
+      ),
       style: { height: barHeight },
       children: /* @__PURE__ */ jsx(SmallAppBarInner, __spreadValues({}, innerProps))
     },
@@ -6288,7 +6447,7 @@ LoadingIndicator.displayName = "LoadingIndicator";
 function easeInOutCubic(x) {
   return x < 0.5 ? 4 * x * x * x : 1 - (-2 * x + 2) ** 3 / 2;
 }
-function generateWavyCircularPath(center, radius, amplitude, wavelength) {
+function generateWavyCircularPath(center, radius, amplitude, wavelength, phase = 0) {
   const circumference = 2 * Math.PI * radius;
   const numWaves = Math.max(
     3,
@@ -6296,8 +6455,8 @@ function generateWavyCircularPath(center, radius, amplitude, wavelength) {
   );
   const steps = numWaves * 4;
   const dt = 2 * Math.PI / steps;
-  const rAt = (t) => radius + amplitude * Math.sin(numWaves * t);
-  const drAt = (t) => amplitude * numWaves * Math.cos(numWaves * t);
+  const rAt = (t) => radius + amplitude * Math.sin(numWaves * t + phase);
+  const drAt = (t) => amplitude * numWaves * Math.cos(numWaves * t + phase);
   const xAt = (t) => center + rAt(t) * Math.cos(t);
   const yAt = (t) => center + rAt(t) * Math.sin(t);
   const dxAt = (t) => drAt(t) * Math.cos(t) - rAt(t) * Math.sin(t);
@@ -6362,15 +6521,18 @@ var CircularProgress = React37.forwardRef(
       size = 48,
       trackHeight = 4,
       shape = "flat",
+      trackShape = "flat",
       amplitude,
       wavelength,
       gapSize = 4,
+      waveSpeed = 1,
       crawlerSpeed = 1,
       color,
       trackColor,
       showTrack = "auto",
       minProgress = DEFAULT_MIN_PROGRESS,
       maxProgress = DEFAULT_MAX_PROGRESS,
+      determinateAnimation = "md3",
       amplitudeRange,
       className,
       "aria-label": ariaLabel
@@ -6379,15 +6541,18 @@ var CircularProgress = React37.forwardRef(
       "size",
       "trackHeight",
       "shape",
+      "trackShape",
       "amplitude",
       "wavelength",
       "gapSize",
+      "waveSpeed",
       "crawlerSpeed",
       "color",
       "trackColor",
       "showTrack",
       "minProgress",
       "maxProgress",
+      "determinateAnimation",
       "amplitudeRange",
       "className",
       "aria-label"
@@ -6400,6 +6565,7 @@ var CircularProgress = React37.forwardRef(
     const bgTrackColor = trackColor || "var(--md-sys-color-indicator-track)";
     const isWavy = shape === "wavy";
     const shouldShowIndeterminateTrack = showTrack === "auto" ? isWavy : showTrack;
+    const shouldShowDeterminateTrack = showTrack === "auto" ? true : showTrack;
     const BASELINE_SIZE = 48;
     const scaleFactor = size / BASELINE_SIZE;
     const effectiveAmplitude = React37.useMemo(
@@ -6432,19 +6598,50 @@ var CircularProgress = React37.forwardRef(
     const trackOffset = isDeterminate ? activeAngularFraction + gapForTrack : 0;
     const trackLength = isDeterminate ? Math.max(1e-3, 1 - activeAngularFraction - 2 * gapForTrack) : 1;
     const ActiveCircleElem = m.circle;
-    const ActivePathElem = m.path;
     const indeterminateSvgRef = React37.useRef(null);
     const indeterminateTrackRef = React37.useRef(null);
     const indeterminateActiveRef = React37.useRef(null);
     const indeterminateWavyTrackPathRef = React37.useRef(null);
     const indeterminateWavyActivePathRef = React37.useRef(null);
+    const determinateWavyActivePathRef = React37.useRef(null);
+    const determinateWavyTrackPathRef = React37.useRef(null);
     const cachedPathLengthRef = React37.useRef(0);
+    const fractionMV = useMotionValue(isDeterminate ? clampedValue / 100 : 0);
+    const amplitudeMV = useMotionValue(isWavy ? effectiveAmplitude : 0);
+    React37.useEffect(() => {
+      if (isDeterminate) {
+        animate(fractionMV, clampedValue / 100, {
+          duration: 0.4,
+          ease: [0.2, 0, 0, 1]
+        });
+      }
+    }, [clampedValue, isDeterminate, fractionMV]);
+    React37.useEffect(() => {
+      if (!isDeterminate || !isWavy) return;
+      const fraction = clampedValue / 100;
+      let targetAmp = effectiveAmplitude;
+      if (determinateAnimation === "md3") {
+        targetAmp = fraction <= 0.1 || fraction >= 0.95 ? 0 : effectiveAmplitude;
+      }
+      animate(amplitudeMV, targetAmp, {
+        type: "spring",
+        bounce: 0,
+        duration: 0.5
+      });
+    }, [
+      clampedValue,
+      isDeterminate,
+      isWavy,
+      effectiveAmplitude,
+      amplitudeMV,
+      determinateAnimation
+    ]);
     React37.useLayoutEffect(() => {
       if (!isWavy || !wavyActivePath) {
         cachedPathLengthRef.current = circumference;
         return;
       }
-      const el = indeterminateActiveRef.current;
+      const el = indeterminateActiveRef.current || determinateWavyActivePathRef.current;
       if (el && "getTotalLength" in el) {
         try {
           const len = el.getTotalLength();
@@ -6458,7 +6655,65 @@ var CircularProgress = React37.forwardRef(
       cachedPathLengthRef.current = circumference;
     }, [isWavy, circumference, wavyActivePath]);
     useAnimationFrame((time) => {
-      if (isDeterminate) return;
+      const safeWaveSpeed = Math.max(0.1, waveSpeed);
+      const wavePhase = time / 1e3 * safeWaveSpeed * 2 * Math.PI;
+      if (isDeterminate) {
+        if (isWavy) {
+          const currentAmp = amplitudeMV.get();
+          const dynamicPath = generateWavyCircularPath(
+            center,
+            radius,
+            currentAmp,
+            effectiveWavelength,
+            wavePhase
+          );
+          if (determinateWavyActivePathRef.current) {
+            determinateWavyActivePathRef.current.setAttribute("d", dynamicPath);
+          }
+          if (trackShape === "wavy" && determinateWavyTrackPathRef.current) {
+            determinateWavyTrackPathRef.current.setAttribute("d", dynamicPath);
+          }
+          const pathEl = determinateWavyActivePathRef.current;
+          let totalLen = cachedPathLengthRef.current || circumference;
+          if (pathEl) {
+            try {
+              const len = pathEl.getTotalLength();
+              if (len > 0) totalLen = len;
+            } catch (e) {
+            }
+          }
+          const activeFrac = Math.max(0, Math.min(1, fractionMV.get()));
+          const activeLen = totalLen * activeFrac;
+          if (determinateWavyActivePathRef.current) {
+            determinateWavyActivePathRef.current.setAttribute(
+              "stroke-dasharray",
+              `${activeLen} ${totalLen}`
+            );
+            determinateWavyActivePathRef.current.setAttribute(
+              "stroke-dashoffset",
+              "0"
+            );
+          }
+          if (shouldShowDeterminateTrack && trackShape === "wavy" && determinateWavyTrackPathRef.current) {
+            const gapFrac = (gapSize + trackHeight) / totalLen;
+            const trackStartFrac = activeFrac + gapFrac;
+            const trackLen = Math.max(
+              1e-3,
+              totalLen * (1 - activeFrac - 2 * gapFrac)
+            );
+            const trackOff = -totalLen * trackStartFrac;
+            determinateWavyTrackPathRef.current.setAttribute(
+              "stroke-dasharray",
+              `${trackLen} ${totalLen}`
+            );
+            determinateWavyTrackPathRef.current.setAttribute(
+              "stroke-dashoffset",
+              `${trackOff}`
+            );
+          }
+        }
+        return;
+      }
       const safeCrawlerSpeed = Math.max(0.1, crawlerSpeed);
       const scaledTime = time * safeCrawlerSpeed;
       const globalCycle = scaledTime % GLOBAL_ROTATION_DURATION;
@@ -6493,7 +6748,8 @@ var CircularProgress = React37.forwardRef(
           center,
           radius,
           currentAmplitude,
-          effectiveWavelength
+          effectiveWavelength,
+          wavePhase
         );
         if (indeterminateWavyActivePathRef.current) {
           indeterminateWavyActivePathRef.current.setAttribute("d", dynamicPath);
@@ -6588,7 +6844,7 @@ var CircularProgress = React37.forwardRef(
         style: { width: size, height: size }
       }, restProps), {
         children: /* @__PURE__ */ jsxs(LazyMotion, { features: domMax, strict: true, children: [
-          /* @__PURE__ */ jsxs(
+          /* @__PURE__ */ jsx(
             "svg",
             {
               width: size,
@@ -6596,8 +6852,18 @@ var CircularProgress = React37.forwardRef(
               viewBox: `0 0 ${size} ${size}`,
               "aria-hidden": "true",
               style: { transform: "rotate(-90deg)", overflow: "visible" },
-              children: [
-                isDeterminate ? /* @__PURE__ */ jsx(
+              children: isDeterminate ? isWavy ? /* @__PURE__ */ jsxs(Fragment, { children: [
+                shouldShowDeterminateTrack && (trackShape === "wavy" ? /* @__PURE__ */ jsx(
+                  "path",
+                  {
+                    ref: determinateWavyTrackPathRef,
+                    d: wavyActivePath != null ? wavyActivePath : "",
+                    fill: "none",
+                    stroke: bgTrackColor,
+                    strokeWidth: trackHeight,
+                    strokeLinecap: "round"
+                  }
+                ) : /* @__PURE__ */ jsx(
                   m.circle,
                   {
                     cx: center,
@@ -6606,28 +6872,52 @@ var CircularProgress = React37.forwardRef(
                     fill: "none",
                     stroke: bgTrackColor,
                     strokeWidth: trackHeight,
-                    initial: { pathLength: trackLength, pathOffset: trackOffset },
-                    animate: { pathLength: trackLength, pathOffset: trackOffset },
+                    initial: {
+                      pathLength: trackLength,
+                      pathOffset: trackOffset
+                    },
+                    animate: {
+                      pathLength: trackLength,
+                      pathOffset: trackOffset
+                    },
                     transition: { duration: 0.4, ease: [0.2, 0, 0, 1] },
                     strokeLinecap: "round"
                   }
-                ) : null,
-                isDeterminate && (isWavy ? /* @__PURE__ */ jsx(
-                  ActivePathElem,
+                )),
+                /* @__PURE__ */ jsx(
+                  "path",
                   {
+                    ref: determinateWavyActivePathRef,
                     d: wavyActivePath != null ? wavyActivePath : "",
                     fill: "none",
                     stroke: activeColor,
                     strokeWidth: trackHeight,
-                    strokeLinecap: "round",
-                    initial: { pathLength: 0 },
-                    animate: { pathLength: clampedValue / 100 },
-                    transition: {
-                      duration: 0.4,
-                      ease: [0.2, 0, 0, 1]
-                    }
+                    strokeLinecap: "round"
                   }
-                ) : /* @__PURE__ */ jsx(
+                )
+              ] }) : /* @__PURE__ */ jsxs(Fragment, { children: [
+                /* @__PURE__ */ jsx(
+                  m.circle,
+                  {
+                    cx: center,
+                    cy: center,
+                    r: radius,
+                    fill: "none",
+                    stroke: bgTrackColor,
+                    strokeWidth: trackHeight,
+                    initial: {
+                      pathLength: trackLength,
+                      pathOffset: trackOffset
+                    },
+                    animate: {
+                      pathLength: trackLength,
+                      pathOffset: trackOffset
+                    },
+                    transition: { duration: 0.4, ease: [0.2, 0, 0, 1] },
+                    strokeLinecap: "round"
+                  }
+                ),
+                /* @__PURE__ */ jsx(
                   ActiveCircleElem,
                   {
                     cx: center,
@@ -6644,8 +6934,8 @@ var CircularProgress = React37.forwardRef(
                       ease: [0.2, 0, 0, 1]
                     }
                   }
-                ))
-              ]
+                )
+              ] }) : null
             }
           ),
           !isDeterminate && /* @__PURE__ */ jsx(
@@ -7328,7 +7618,7 @@ var IconButtonComponent = React37.forwardRef(
       variant = "default",
       colorStyle = "standard",
       size = "sm",
-      widthVariant = "default",
+      width = "default",
       shape = "round",
       selected,
       selectedIcon,
@@ -7346,7 +7636,7 @@ var IconButtonComponent = React37.forwardRef(
       "variant",
       "colorStyle",
       "size",
-      "widthVariant",
+      "width",
       "shape",
       "selected",
       "selectedIcon",
@@ -7391,7 +7681,7 @@ var IconButtonComponent = React37.forwardRef(
     const iconPx = iconSize != null ? iconSize : defaultIconPx;
     const isCustomSize = iconSize != null && iconSize !== "inherit";
     const heightClass = (_c = SIZE_HEIGHT_STYLES[size]) != null ? _c : SIZE_HEIGHT_STYLES.sm;
-    const widthClass = (_e = ((_d = WIDTH_SIZE_STYLES[size]) != null ? _d : WIDTH_SIZE_STYLES.sm)[widthVariant]) != null ? _e : WIDTH_SIZE_STYLES.sm.default;
+    const widthClass = (_e = ((_d = WIDTH_SIZE_STYLES[size]) != null ? _d : WIDTH_SIZE_STYLES.sm)[width]) != null ? _e : WIDTH_SIZE_STYLES.sm.default;
     const needsTouchTarget = size === "xs" || size === "sm";
     const { ripples, onPointerDown, removeRipple } = useRippleState({
       disabled: loading
@@ -8014,9 +8304,9 @@ function BadgedBox({
   badge,
   children,
   className,
-  badgeSize
+  size
 }) {
-  const isLarge = badgeSize ? badgeSize === "large" : detectBadgeHasContent(badge);
+  const isLarge = size ? size === "lg" : detectBadgeHasContent(badge);
   const badgePositionClass = isLarge ? "translate-x-[35%] -translate-y-[35%]" : "translate-x-[50%] -translate-y-[50%]";
   return /* @__PURE__ */ jsxs("span", { className: cn("relative inline-flex", className), children: [
     children,
@@ -9027,7 +9317,7 @@ var FloatingToolbarWithFabBase = React37.forwardRef(
       fabPosition = orientation === "horizontal" ? "end" : "bottom",
       animationDuration = 0.3,
       scrollBehavior,
-      fabSize = "default",
+      fabSize = "sm",
       className,
       style
     } = _b, props = __objRest(_b, [
@@ -9047,7 +9337,7 @@ var FloatingToolbarWithFabBase = React37.forwardRef(
     const isHorizontal = orientation === "horizontal";
     const effectiveExpanded = expanded && (!scrollBehavior || scrollBehavior.isExpanded);
     const isFabBefore = fabPosition === "start" || fabPosition === "top";
-    const resolvedFabSize = fabSize === "medium" ? FabBaselineTokens.MediumContainerHeight : FabBaselineTokens.ContainerHeight;
+    const resolvedFabSize = fabSize === "md" ? FabBaselineTokens.MediumContainerHeight : FabBaselineTokens.ContainerHeight;
     const transitionSpec = __spreadProps(__spreadValues({}, SPRING_TRANSITION), {
       duration: animationDuration
     });
@@ -9186,7 +9476,7 @@ var ToolbarIconButton = React37.forwardRef(
   (_a, ref) => {
     var _b = _a, {
       emphasis = "standard",
-      toolbarSize = "default",
+      width = "default",
       selected,
       asChild,
       className,
@@ -9194,7 +9484,7 @@ var ToolbarIconButton = React37.forwardRef(
       whileTap
     } = _b, props = __objRest(_b, [
       "emphasis",
-      "toolbarSize",
+      "width",
       "selected",
       "asChild",
       "className",
@@ -9202,7 +9492,7 @@ var ToolbarIconButton = React37.forwardRef(
       "whileTap"
     ]);
     const context = useToolbarContext();
-    const widthClass = TOOLBAR_ICON_BUTTON_WIDTH[toolbarSize];
+    const widthClass = TOOLBAR_ICON_BUTTON_WIDTH[width];
     const colorStyle = VARIANT_TO_COLOR_STYLE[emphasis];
     const iconButtonProps = selected !== void 0 ? {
       variant: "toggle",
@@ -9537,6 +9827,6 @@ var ToolbarToggleButton = React37.forwardRef(
 );
 ToolbarToggleButton.displayName = "ToolbarToggleButton";
 
-export { APP_BAR_BOTTOM_SPRING, APP_BAR_COLORS, APP_BAR_COLOR_TRANSITION, APP_BAR_ENTER_ALWAYS_SPRING, APP_BAR_TITLE_FADE, AppBarColumn, AppBarOverflowIndicator, AppBarRow, AppBarTokens, BottomAppBar, BottomDockedToolbar, CHECK_ICON_VARIANTS, ContextMenu, ContextMenuContent, ContextMenuTrigger, DIVIDER_COLOR, DIVIDER_PADDING, DockedToolbar, FAST_EFFECTS_TRANSITION, FAST_SPATIAL_SPRING, GROUP_SHAPES, HorizontalFloatingToolbar, HorizontalFloatingToolbarWithFab, ITEM_SHAPE_CLASSES, LargeFlexibleAppBar, MENU_CHECK_ICON_SIZE, MENU_CONTAINER_VARIANTS, MENU_GROUP_GAP, MENU_ICON_SIZE, MENU_ITEM_MIN_HEIGHT, MENU_MAX_WIDTH, MENU_MIN_WIDTH, MediumFlexibleAppBar, Menu, MenuContent, MenuDivider, MenuGroup, MenuItem, MenuProvider, MenuTrigger, NavigationBar, NavigationBarComponent, NavigationBarItem, NavigationRail, NavigationRailItem, SEARCH_BAR_EXIT_SPRING, SEARCH_BAR_EXPAND_SPRING, SEARCH_COLORS, SEARCH_DOCKED_REVEAL_SPRING, SEARCH_FULLSCREEN_SPRING, SEARCH_TYPOGRAPHY, SEARCH_VIEW_SPRING, STANDARD_COLORS, SUBMENU_CONTAINER_VARIANTS, Search, SearchAppBar, SearchBar, SearchTokens, SearchView, SearchViewContainer, SearchViewDocked, SearchViewFullScreen, SmallAppBar, SubMenu, Tab, Tabs, TabsColors, TabsContent, TabsList, TabsTokens, ToolbarDivider, ToolbarDividerTokens, ToolbarIconButton, ToolbarIconButtonTokens, ToolbarToggleButton, ToolbarToggleButtonTokens, VIBRANT_COLORS, VerticalFloatingToolbar, VerticalFloatingToolbarWithFab, VerticalMenu, VerticalMenuContent, VerticalMenuDivider, VerticalMenuGroup, appBarTypography, getNavigationShapeStyle, getToolbarColors, isSquareShape, standardFloatingToolbarColors, surfaceContainerHighFloatingToolbarColors, surfaceContainerHighestFloatingToolbarColors, tertiaryContainerFloatingToolbarColors, useAppBarScroll, useFloatingToolbarScrollBehavior, useMenuContext, useSearch, useSearchKeyboard, vibrantFloatingToolbarColors, xrFloatingToolbarColors };
+export { APP_BAR_BOTTOM_SPRING, APP_BAR_COLORS, APP_BAR_COLOR_TRANSITION, APP_BAR_ENTER_ALWAYS_SPRING, APP_BAR_TITLE_FADE, AppBarColumn, AppBarOverflowIndicator, AppBarRow, AppBarTokens, BottomAppBar, BottomDockedToolbar, CHECK_ICON_VARIANTS, ContextMenu, ContextMenuContent, ContextMenuTrigger, DIVIDER_COLOR, DIVIDER_PADDING, DockedToolbar, FAST_EFFECTS_TRANSITION, FAST_SPATIAL_SPRING, FadingBlurMask, GROUP_SHAPES, HorizontalFloatingToolbar, HorizontalFloatingToolbarWithFab, ITEM_SHAPE_CLASSES, LargeFlexibleAppBar, MENU_CHECK_ICON_SIZE, MENU_CONTAINER_VARIANTS, MENU_GROUP_GAP, MENU_ICON_SIZE, MENU_ITEM_MIN_HEIGHT, MENU_MAX_WIDTH, MENU_MIN_WIDTH, MediumFlexibleAppBar, Menu, MenuContent, MenuDivider, MenuGroup, MenuItem, MenuProvider, MenuTrigger, NavigationBar, NavigationBarComponent, NavigationBarItem, NavigationRail, NavigationRailItem, SEARCH_BAR_EXIT_SPRING, SEARCH_BAR_EXPAND_SPRING, SEARCH_COLORS, SEARCH_DOCKED_REVEAL_SPRING, SEARCH_FULLSCREEN_SPRING, SEARCH_TYPOGRAPHY, SEARCH_VIEW_SPRING, STANDARD_COLORS, SUBMENU_CONTAINER_VARIANTS, Search, SearchAppBar, SearchBar, SearchTokens, SearchView, SearchViewContainer, SearchViewDocked, SearchViewFullScreen, SmallAppBar, SubMenu, Tab, Tabs, TabsColors, TabsContent, TabsList, TabsTokens, ToolbarDivider, ToolbarDividerTokens, ToolbarIconButton, ToolbarIconButtonTokens, ToolbarToggleButton, ToolbarToggleButtonTokens, VIBRANT_COLORS, VerticalFloatingToolbar, VerticalFloatingToolbarWithFab, VerticalMenu, VerticalMenuContent, VerticalMenuDivider, VerticalMenuGroup, appBarTypography, getNavigationShapeStyle, getToolbarColors, isSquareShape, standardFloatingToolbarColors, surfaceContainerHighFloatingToolbarColors, surfaceContainerHighestFloatingToolbarColors, tertiaryContainerFloatingToolbarColors, useAppBarScroll, useFloatingToolbarScrollBehavior, useMenuContext, useSearch, useSearchKeyboard, vibrantFloatingToolbarColors, xrFloatingToolbarColors };
 //# sourceMappingURL=navigation.mjs.map
 //# sourceMappingURL=navigation.mjs.map