@bug-on/m3-expressive 1.3.0 → 1.3.1

package/dist/buttons.mjs

@@ -1,6 +1,6 @@
 "use client";
 import { Slot } from '@radix-ui/react-slot';
-import { m, useAnimationFrame, LazyMotion, domMax, useMotionValue, animate, AnimatePresence, useReducedMotion, useSpring, useTransform } from 'motion/react';
+import { m, useMotionValue, animate, useAnimationFrame, LazyMotion, domMax, AnimatePresence, useReducedMotion, useSpring, useTransform } from 'motion/react';
 import * as React16 from 'react';
 import { clsx } from 'clsx';
 import { twMerge } from 'tailwind-merge';
@@ -229,7 +229,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,
@@ -237,8 +237,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);
@@ -303,15 +303,18 @@ var CircularProgress = React16.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
@@ -320,15 +323,18 @@ var CircularProgress = React16.forwardRef(
       "size",
       "trackHeight",
       "shape",
+      "trackShape",
       "amplitude",
       "wavelength",
       "gapSize",
+      "waveSpeed",
       "crawlerSpeed",
       "color",
       "trackColor",
       "showTrack",
       "minProgress",
       "maxProgress",
+      "determinateAnimation",
       "amplitudeRange",
       "className",
       "aria-label"
@@ -341,6 +347,7 @@ var CircularProgress = React16.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 = React16.useMemo(
@@ -373,19 +380,50 @@ var CircularProgress = React16.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 = React16.useRef(null);
     const indeterminateTrackRef = React16.useRef(null);
     const indeterminateActiveRef = React16.useRef(null);
     const indeterminateWavyTrackPathRef = React16.useRef(null);
     const indeterminateWavyActivePathRef = React16.useRef(null);
+    const determinateWavyActivePathRef = React16.useRef(null);
+    const determinateWavyTrackPathRef = React16.useRef(null);
     const cachedPathLengthRef = React16.useRef(0);
+    const fractionMV = useMotionValue(isDeterminate ? clampedValue / 100 : 0);
+    const amplitudeMV = useMotionValue(isWavy ? effectiveAmplitude : 0);
+    React16.useEffect(() => {
+      if (isDeterminate) {
+        animate(fractionMV, clampedValue / 100, {
+          duration: 0.4,
+          ease: [0.2, 0, 0, 1]
+        });
+      }
+    }, [clampedValue, isDeterminate, fractionMV]);
+    React16.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
+    ]);
     React16.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();
@@ -399,7 +437,65 @@ var CircularProgress = React16.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;
@@ -434,7 +530,8 @@ var CircularProgress = React16.forwardRef(
           center,
           radius,
           currentAmplitude,
-          effectiveWavelength
+          effectiveWavelength,
+          wavePhase
         );
         if (indeterminateWavyActivePathRef.current) {
           indeterminateWavyActivePathRef.current.setAttribute("d", dynamicPath);
@@ -529,7 +626,7 @@ var CircularProgress = React16.forwardRef(
         style: { width: size, height: size }
       }, restProps), {
         children: /* @__PURE__ */ jsxs(LazyMotion, { features: domMax, strict: true, children: [
-          /* @__PURE__ */ jsxs(
+          /* @__PURE__ */ jsx(
             "svg",
             {
               width: size,
@@ -537,8 +634,18 @@ var CircularProgress = React16.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,
@@ -547,28 +654,52 @@ var CircularProgress = React16.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,
@@ -585,8 +716,8 @@ var CircularProgress = React16.forwardRef(
                       ease: [0.2, 0, 0, 1]
                     }
                   }
-                ))
-              ]
+                )
+              ] }) : null
             }
           ),
           !isDeterminate && /* @__PURE__ */ jsx(
@@ -3863,11 +3994,12 @@ var SplitButtonLayoutComponent = React16.forwardRef(
       "div",
       __spreadProps(__spreadValues({
         ref,
+        role: "group",
         className: cn(
           "inline-flex flex-row items-stretch justify-center w-fit shrink-0 relative",
           className
         ),
-        style: { gap: `${spacing}px` }
+        style: __spreadValues({ gap: `${spacing}px` }, restProps.style)
       }, restProps), {
         children: [
           leadingButton,
@@ -4080,11 +4212,11 @@ var LEADING_ICON_SIZE_FOR_SIZE = {
   xl: 40
 };
 var splitButtonSizeVariants = {
-  xs: "min-h-[32px]",
-  sm: "min-h-[40px]",
-  md: "min-h-[56px]",
-  lg: "min-h-[96px]",
-  xl: "min-h-[136px]"
+  xs: "h-[32px] min-h-[32px]",
+  sm: "h-[40px] min-h-[40px]",
+  md: "h-[56px] min-h-[56px]",
+  lg: "h-[96px] min-h-[96px]",
+  xl: "h-[136px] min-h-[136px]"
 };
 var splitButtonVariants = cva(
   "group relative w-fit shrink-0 inline-flex flex-row items-center justify-center whitespace-nowrap select-none cursor-pointer transition-[background-color,color,border-color,box-shadow,opacity,filter] duration-200 focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-m3-primary z-10 overflow-hidden",
@@ -4268,7 +4400,7 @@ var SplitButtonLeadingComponent = React16.forwardRef(
           children: icon
         }
       ),
-      labelContent && /* @__PURE__ */ jsx("span", { className: "inline-flex items-center h-full gap-[inherit]", children: labelContent })
+      labelContent && /* @__PURE__ */ jsx("span", { className: "inline-flex items-center justify-center gap-[inherit]", children: labelContent })
     ] });
     const containerClassName = cn(
       splitButtonVariants({
@@ -4276,19 +4408,20 @@ var SplitButtonLeadingComponent = React16.forwardRef(
         size: actualSize,
         disabled
       }),
+      "gap-2",
       typographyClass,
       className
     );
     const mergedStyle = __spreadValues({
       paddingInlineStart: tokens.leadingPadding.start,
       paddingInlineEnd: tokens.leadingPadding.end,
-      gap: "8px",
       borderRadius
     }, style);
     return /* @__PURE__ */ jsx(LazyMotion, { features: domMax, strict: true, children: asChild ? /* @__PURE__ */ jsx(
       Slot,
       __spreadProps(__spreadValues({
         ref,
+        "data-split-button-part": "leading",
         "aria-disabled": disabled || void 0,
         onClick: handleClick,
         onPointerDown: handlePointerDown,
@@ -4311,6 +4444,7 @@ var SplitButtonLeadingComponent = React16.forwardRef(
       __spreadProps(__spreadValues({
         ref,
         type: "button",
+        "data-split-button-part": "leading",
         disabled,
         onClick: handleClick,
         onPointerDown: handlePointerDown,
@@ -4324,8 +4458,7 @@ var SplitButtonLeadingComponent = React16.forwardRef(
         transition: SPLIT_BUTTON_RADIUS_SPRING,
         style: __spreadValues({
           paddingInlineStart: tokens.leadingPadding.start,
-          paddingInlineEnd: tokens.leadingPadding.end,
-          gap: "8px"
+          paddingInlineEnd: tokens.leadingPadding.end
         }, style),
         className: containerClassName
       }, restProps), {
@@ -4363,7 +4496,8 @@ var SplitButtonTrailingComponent = React16.forwardRef(
       onBlur,
       asChild = false,
       children,
-      "aria-label": ariaLabel
+      "aria-label": ariaLabel,
+      "aria-haspopup": ariaHaspopup = "menu"
     } = _b, restProps = __objRest(_b, [
       "className",
       "style",
@@ -4381,7 +4515,8 @@ var SplitButtonTrailingComponent = React16.forwardRef(
       "onBlur",
       "asChild",
       "children",
-      "aria-label"
+      "aria-label",
+      "aria-haspopup"
     ]);
     var _a2, _b2;
     const context = useSplitButtonContext();
@@ -4474,7 +4609,11 @@ var SplitButtonTrailingComponent = React16.forwardRef(
             x: checked ? 0 : tokens.opticalCenterOffset
           },
           transition: prefersReducedMotion ? { duration: 0 } : SPLIT_BUTTON_CHEVRON_SPRING,
-          className: "flex items-center justify-center shrink-0",
+          className: "flex items-center justify-center shrink-0 [&>svg]:w-full [&>svg]:h-full",
+          style: {
+            width: tokens.trailingIconSize,
+            height: tokens.trailingIconSize
+          },
           children: icon != null ? icon : /* @__PURE__ */ jsx(
             Icon,
             {
@@ -4503,8 +4642,10 @@ var SplitButtonTrailingComponent = React16.forwardRef(
       Slot,
       __spreadProps(__spreadValues({
         ref,
+        "data-split-button-part": "trailing",
         "aria-label": ariaLabel,
         "aria-expanded": checked,
+        "aria-haspopup": ariaHaspopup,
         "aria-disabled": disabled,
         onClick: handleToggle,
         onPointerDown: handlePointerDown,
@@ -4527,8 +4668,10 @@ var SplitButtonTrailingComponent = React16.forwardRef(
       __spreadProps(__spreadValues({
         ref,
         type: "button",
+        "data-split-button-part": "trailing",
         "aria-label": ariaLabel,
         "aria-expanded": checked,
+        "aria-haspopup": ariaHaspopup,
         "aria-disabled": disabled,
         disabled,
         onClick: handleToggle,
@@ -4603,6 +4746,7 @@ var SplitButtonTrailingUncheckableComponent = React16.forwardRef(
     const [isFocused, setIsFocused] = React16.useState(false);
     const [isPressed, setIsPressed] = React16.useState(false);
     const tokens = SPLIT_BUTTON_TOKENS[actualSize];
+    const prefersReducedMotion = useReducedMotion();
     const needsTouchTarget = actualSize === "xs" || actualSize === "sm";
     const {
       ripples,
@@ -4666,6 +4810,7 @@ var SplitButtonTrailingUncheckableComponent = React16.forwardRef(
       __spreadProps(__spreadValues({
         ref,
         type: "button",
+        "data-split-button-part": "trailing",
         "aria-label": ariaLabel,
         disabled,
         onClick,
@@ -4677,7 +4822,7 @@ var SplitButtonTrailingUncheckableComponent = React16.forwardRef(
         onFocus: handleFocus,
         onBlur: handleBlur,
         animate: { borderRadius },
-        transition: SPLIT_BUTTON_RADIUS_SPRING,
+        transition: prefersReducedMotion ? { duration: 0 } : SPLIT_BUTTON_RADIUS_SPRING,
         style: __spreadValues({
           paddingInlineStart: tokens.trailingPadding.start,
           paddingInlineEnd: tokens.trailingPadding.end
@@ -4706,7 +4851,7 @@ var SplitButtonTrailingUncheckableComponent = React16.forwardRef(
             m.div,
             {
               animate: { x: tokens.opticalCenterOffset },
-              transition: SPLIT_BUTTON_RADIUS_SPRING,
+              transition: prefersReducedMotion ? { duration: 0 } : SPLIT_BUTTON_RADIUS_SPRING,
               className: "flex items-center justify-center shrink-0 [&>svg]:w-full [&>svg]:h-full",
               style: {
                 width: tokens.trailingIconSize,