@bug-on/m3-expressive 1.2.6 → 1.3.0

package/dist/layout.d.mts

@@ -379,7 +379,7 @@ declare function shouldTopAlign(height: number): boolean;
 declare function getExpressiveShape(state: "resting" | "hovered" | "focused" | "pressed" | "selected" | "dragged" | "disabled"): number;
 
 declare const typographyVariants: (props?: ({
-    variant?: "display-lg" | "display-md" | "display-sm" | "headline-lg" | "headline-md" | "headline-sm" | "title-lg" | "title-md" | "title-sm" | "label-lg" | "label-md" | "label-sm" | "body-lg" | "body-md" | "body-sm" | "display-large" | "display-medium" | "display-small" | "headline-large" | "headline-medium" | "headline-small" | "title-large" | "title-medium" | "title-small" | "label-large" | "label-medium" | "label-small" | "body-large" | "body-medium" | "body-small" | "displayLarge" | "displayMedium" | "displaySmall" | "headlineLarge" | "headlineMedium" | "headlineSmall" | "titleLarge" | "titleMedium" | "titleSmall" | "labelLarge" | "labelMedium" | "labelSmall" | "bodyLarge" | "bodyMedium" | "bodySmall" | null | undefined;
+    variant?: "display-lg" | "display-md" | "display-sm" | "headline-lg" | "headline-md" | "headline-sm" | "title-lg" | "title-md" | "title-sm" | "label-lg" | "label-md" | "label-sm" | "body-lg" | "body-md" | "body-sm" | null | undefined;
 } & class_variance_authority_types.ClassProp) | undefined) => string;
 interface TextProps extends React.HTMLAttributes<HTMLElement>, VariantProps<typeof typographyVariants> {
     /**

package/dist/layout.d.ts

@@ -379,7 +379,7 @@ declare function shouldTopAlign(height: number): boolean;
 declare function getExpressiveShape(state: "resting" | "hovered" | "focused" | "pressed" | "selected" | "dragged" | "disabled"): number;
 
 declare const typographyVariants: (props?: ({
-    variant?: "display-lg" | "display-md" | "display-sm" | "headline-lg" | "headline-md" | "headline-sm" | "title-lg" | "title-md" | "title-sm" | "label-lg" | "label-md" | "label-sm" | "body-lg" | "body-md" | "body-sm" | "display-large" | "display-medium" | "display-small" | "headline-large" | "headline-medium" | "headline-small" | "title-large" | "title-medium" | "title-small" | "label-large" | "label-medium" | "label-small" | "body-large" | "body-medium" | "body-small" | "displayLarge" | "displayMedium" | "displaySmall" | "headlineLarge" | "headlineMedium" | "headlineSmall" | "titleLarge" | "titleMedium" | "titleSmall" | "labelLarge" | "labelMedium" | "labelSmall" | "bodyLarge" | "bodyMedium" | "bodySmall" | null | undefined;
+    variant?: "display-lg" | "display-md" | "display-sm" | "headline-lg" | "headline-md" | "headline-sm" | "title-lg" | "title-md" | "title-sm" | "label-lg" | "label-md" | "label-sm" | "body-lg" | "body-md" | "body-sm" | null | undefined;
 } & class_variance_authority_types.ClassProp) | undefined) => string;
 interface TextProps extends React.HTMLAttributes<HTMLElement>, VariantProps<typeof typographyVariants> {
     /**

package/dist/layout.js

@@ -537,7 +537,7 @@ function generateWavyCircularPath(center, radius, amplitude, wavelength) {
     if (i === 0) d += `M ${xAt(t0).toFixed(2)} ${yAt(t0).toFixed(2)}`;
     d += ` C ${cp1x.toFixed(2)} ${cp1y.toFixed(2)}, ${cp2x.toFixed(2)} ${cp2y.toFixed(2)}, ${xAt(t1).toFixed(2)} ${yAt(t1).toFixed(2)}`;
   }
-  return d;
+  return `${d} Z`;
 }
 function getSinePath(startX, endX, phase, wl, amp) {
   if (startX >= endX) return "";
@@ -569,6 +569,14 @@ function getSinePath(startX, endX, phase, wl, amp) {
   }
   return d;
 }
+var GLOBAL_ROTATION_DURATION = 6e3;
+var GLOBAL_ROTATION_TARGET = 1080;
+var ADDITIONAL_ROTATION_CYCLE = 1500;
+var ADDITIONAL_ROTATION_STEP = 90;
+var ADDITIONAL_ROTATION_EASE_DURATION = 500;
+var DEFAULT_MIN_PROGRESS = 0.1;
+var DEFAULT_MAX_PROGRESS = 0.8;
+var PROGRESS_CYCLE_DURATION = 1500;
 var CircularProgress = React18__namespace.forwardRef(
   (_a, ref) => {
     var _b = _a, {
@@ -582,6 +590,10 @@ var CircularProgress = React18__namespace.forwardRef(
       crawlerSpeed = 1,
       color,
       trackColor,
+      showTrack = "auto",
+      minProgress = DEFAULT_MIN_PROGRESS,
+      maxProgress = DEFAULT_MAX_PROGRESS,
+      amplitudeRange,
       className,
       "aria-label": ariaLabel
     } = _b, restProps = __objRest(_b, [
@@ -595,6 +607,10 @@ var CircularProgress = React18__namespace.forwardRef(
       "crawlerSpeed",
       "color",
       "trackColor",
+      "showTrack",
+      "minProgress",
+      "maxProgress",
+      "amplitudeRange",
       "className",
       "aria-label"
     ]);
@@ -605,6 +621,7 @@ var CircularProgress = React18__namespace.forwardRef(
     const activeColor = color || "var(--md-sys-color-indicator-active)";
     const bgTrackColor = trackColor || "var(--md-sys-color-indicator-track)";
     const isWavy = shape === "wavy";
+    const shouldShowIndeterminateTrack = showTrack === "auto" ? isWavy : showTrack;
     const BASELINE_SIZE = 48;
     const scaleFactor = size / BASELINE_SIZE;
     const effectiveAmplitude = React18__namespace.useMemo(
@@ -615,6 +632,10 @@ var CircularProgress = React18__namespace.forwardRef(
       () => wavelength != null ? wavelength : 15 * scaleFactor,
       [wavelength, scaleFactor]
     );
+    const resolvedAmplitudeRange = React18__namespace.useMemo(
+      () => amplitudeRange != null ? amplitudeRange : [0, effectiveAmplitude],
+      [amplitudeRange, effectiveAmplitude]
+    );
     const wavyActivePath = React18__namespace.useMemo(
       () => isWavy ? generateWavyCircularPath(
         center,
@@ -634,6 +655,145 @@ var CircularProgress = React18__namespace.forwardRef(
     const trackLength = isDeterminate ? Math.max(1e-3, 1 - activeAngularFraction - 2 * gapForTrack) : 1;
     const ActiveCircleElem = react.m.circle;
     const ActivePathElem = react.m.path;
+    const indeterminateSvgRef = React18__namespace.useRef(null);
+    const indeterminateTrackRef = React18__namespace.useRef(null);
+    const indeterminateActiveRef = React18__namespace.useRef(null);
+    const indeterminateWavyTrackPathRef = React18__namespace.useRef(null);
+    const indeterminateWavyActivePathRef = React18__namespace.useRef(null);
+    const cachedPathLengthRef = React18__namespace.useRef(0);
+    React18__namespace.useLayoutEffect(() => {
+      if (!isWavy || !wavyActivePath) {
+        cachedPathLengthRef.current = circumference;
+        return;
+      }
+      const el = indeterminateActiveRef.current;
+      if (el && "getTotalLength" in el) {
+        try {
+          const len = el.getTotalLength();
+          if (len > 0) {
+            cachedPathLengthRef.current = len;
+            return;
+          }
+        } catch (e) {
+        }
+      }
+      cachedPathLengthRef.current = circumference;
+    }, [isWavy, circumference, wavyActivePath]);
+    react.useAnimationFrame((time) => {
+      if (isDeterminate) return;
+      const safeCrawlerSpeed = Math.max(0.1, crawlerSpeed);
+      const scaledTime = time * safeCrawlerSpeed;
+      const globalCycle = scaledTime % GLOBAL_ROTATION_DURATION;
+      const globalAngle = globalCycle / GLOBAL_ROTATION_DURATION * GLOBAL_ROTATION_TARGET;
+      const additionalFullCycles = Math.floor(
+        scaledTime / ADDITIONAL_ROTATION_CYCLE
+      );
+      const additionalCycleTime = scaledTime % ADDITIONAL_ROTATION_CYCLE;
+      const additionalEaseT = Math.min(
+        1,
+        additionalCycleTime / ADDITIONAL_ROTATION_EASE_DURATION
+      );
+      const additionalAngle = (additionalFullCycles + easeInOutCubic(additionalEaseT)) * ADDITIONAL_ROTATION_STEP;
+      const totalRotation = globalAngle + additionalAngle;
+      if (indeterminateSvgRef.current) {
+        indeterminateSvgRef.current.style.transform = `rotate(${totalRotation - 90}deg)`;
+      }
+      const progressFullCycle = PROGRESS_CYCLE_DURATION * 2;
+      const progressCycleTime = scaledTime % progressFullCycle;
+      let progress;
+      if (progressCycleTime < PROGRESS_CYCLE_DURATION) {
+        const t = progressCycleTime / PROGRESS_CYCLE_DURATION;
+        progress = minProgress + (maxProgress - minProgress) * easeInOutCubic(t);
+      } else {
+        const t = (progressCycleTime - PROGRESS_CYCLE_DURATION) / PROGRESS_CYCLE_DURATION;
+        progress = maxProgress - (maxProgress - minProgress) * easeInOutCubic(t);
+      }
+      if (isWavy) {
+        const amplitudeT = (progress - minProgress) / (maxProgress - minProgress);
+        const currentAmplitude = resolvedAmplitudeRange[0] + (resolvedAmplitudeRange[1] - resolvedAmplitudeRange[0]) * amplitudeT;
+        const dynamicPath = generateWavyCircularPath(
+          center,
+          radius,
+          currentAmplitude,
+          effectiveWavelength
+        );
+        if (indeterminateWavyActivePathRef.current) {
+          indeterminateWavyActivePathRef.current.setAttribute("d", dynamicPath);
+        }
+        if (indeterminateWavyTrackPathRef.current) {
+          indeterminateWavyTrackPathRef.current.setAttribute("d", dynamicPath);
+        }
+        const pathEl = indeterminateWavyActivePathRef.current;
+        let totalLen = cachedPathLengthRef.current || circumference;
+        if (pathEl) {
+          try {
+            const len = pathEl.getTotalLength();
+            if (len > 0) totalLen = len;
+          } catch (e) {
+          }
+        }
+        const gapFrac = (gapSize + trackHeight) / totalLen;
+        const activeLen = totalLen * progress;
+        const activeOff = 0;
+        if (indeterminateWavyActivePathRef.current) {
+          indeterminateWavyActivePathRef.current.setAttribute(
+            "stroke-dasharray",
+            `${activeLen} ${totalLen}`
+          );
+          indeterminateWavyActivePathRef.current.setAttribute(
+            "stroke-dashoffset",
+            `${activeOff}`
+          );
+        }
+        if (shouldShowIndeterminateTrack && indeterminateWavyTrackPathRef.current) {
+          const trackStartFrac = progress + gapFrac;
+          const trackLen = Math.max(
+            1e-3,
+            totalLen * (1 - progress - 2 * gapFrac)
+          );
+          const trackOff = -totalLen * trackStartFrac;
+          indeterminateWavyTrackPathRef.current.setAttribute(
+            "stroke-dasharray",
+            `${trackLen} ${totalLen}`
+          );
+          indeterminateWavyTrackPathRef.current.setAttribute(
+            "stroke-dashoffset",
+            `${trackOff}`
+          );
+        }
+      } else {
+        const totalLen = circumference;
+        const activeLen = totalLen * progress;
+        const activeOff = 0;
+        if (indeterminateActiveRef.current) {
+          indeterminateActiveRef.current.setAttribute(
+            "stroke-dasharray",
+            `${activeLen} ${totalLen}`
+          );
+          indeterminateActiveRef.current.setAttribute(
+            "stroke-dashoffset",
+            `${activeOff}`
+          );
+        }
+        if (shouldShowIndeterminateTrack && indeterminateTrackRef.current) {
+          const gapFrac = (gapSize + trackHeight) / totalLen;
+          const trackStartFrac = progress + gapFrac;
+          const trackLen = Math.max(
+            1e-3,
+            totalLen * (1 - progress - 2 * gapFrac)
+          );
+          const trackOff = -totalLen * trackStartFrac;
+          indeterminateTrackRef.current.setAttribute(
+            "stroke-dasharray",
+            `${trackLen} ${totalLen}`
+          );
+          indeterminateTrackRef.current.setAttribute(
+            "stroke-dashoffset",
+            `${trackOff}`
+          );
+        }
+      }
+    });
     return /* @__PURE__ */ jsxRuntime.jsx(
       "div",
       __spreadProps(__spreadValues({
@@ -710,9 +870,10 @@ var CircularProgress = React18__namespace.forwardRef(
               ]
             }
           ),
-          !isDeterminate && /* @__PURE__ */ jsxRuntime.jsxs(
-            react.m.svg,
+          !isDeterminate && /* @__PURE__ */ jsxRuntime.jsx(
+            "svg",
             {
+              ref: indeterminateSvgRef,
               width: size,
               height: size,
               viewBox: `0 0 ${size} ${size}`,
@@ -721,84 +882,60 @@ var CircularProgress = React18__namespace.forwardRef(
                 position: "absolute",
                 inset: 0,
                 overflow: "visible",
-                transformOrigin: "center"
-              },
-              animate: { rotate: [0, 360] },
-              transition: {
-                duration: 2 / Math.max(0.1, crawlerSpeed),
-                repeat: Number.POSITIVE_INFINITY,
-                ease: "linear"
+                transformOrigin: "center",
+                transform: "rotate(-90deg)"
               },
-              children: [
-                /* @__PURE__ */ jsxRuntime.jsx(
-                  react.m.circle,
+              children: isWavy ? /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [
+                shouldShowIndeterminateTrack && /* @__PURE__ */ jsxRuntime.jsx(
+                  "path",
                   {
-                    cx: center,
-                    cy: center,
-                    r: radius,
+                    ref: indeterminateWavyTrackPathRef,
+                    d: wavyActivePath != null ? wavyActivePath : "",
                     fill: "none",
                     stroke: bgTrackColor,
                     strokeWidth: trackHeight,
-                    strokeLinecap: "round",
-                    animate: {
-                      pathLength: [
-                        Math.max(1e-3, 0.9 - 2 * gapForTrack),
-                        Math.max(1e-3, 0.25 - 2 * gapForTrack),
-                        Math.max(1e-3, 0.9 - 2 * gapForTrack)
-                      ],
-                      pathOffset: [
-                        0.1 + gapForTrack,
-                        0.75 + gapForTrack,
-                        0.1 + gapForTrack
-                      ]
-                    },
-                    transition: {
-                      duration: 2 / Math.max(0.1, crawlerSpeed),
-                      repeat: Number.POSITIVE_INFINITY,
-                      ease: [0.4, 0, 0.2, 1]
-                    }
+                    strokeLinecap: "round"
                   }
                 ),
-                isWavy ? /* @__PURE__ */ jsxRuntime.jsx(
-                  ActivePathElem,
+                /* @__PURE__ */ jsxRuntime.jsx(
+                  "path",
                   {
+                    ref: indeterminateWavyActivePathRef,
                     d: wavyActivePath != null ? wavyActivePath : "",
                     fill: "none",
                     stroke: activeColor,
                     strokeWidth: trackHeight,
-                    strokeLinecap: "round",
-                    animate: {
-                      pathLength: [0.1, 0.75, 0.1],
-                      pathOffset: [0, 0.65, 1]
-                    },
-                    transition: {
-                      duration: 2 / Math.max(0.1, crawlerSpeed),
-                      repeat: Number.POSITIVE_INFINITY,
-                      ease: [0.4, 0, 0.2, 1]
-                    }
+                    strokeLinecap: "round"
                   }
-                ) : /* @__PURE__ */ jsxRuntime.jsx(
-                  ActiveCircleElem,
+                )
+              ] }) : /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [
+                shouldShowIndeterminateTrack && /* @__PURE__ */ jsxRuntime.jsx(
+                  "circle",
+                  {
+                    ref: indeterminateTrackRef,
+                    cx: center,
+                    cy: center,
+                    r: radius,
+                    fill: "none",
+                    stroke: bgTrackColor,
+                    strokeWidth: trackHeight,
+                    strokeLinecap: "round"
+                  }
+                ),
+                /* @__PURE__ */ jsxRuntime.jsx(
+                  "circle",
                   {
+                    ref: indeterminateActiveRef,
                     cx: center,
                     cy: center,
                     r: radius,
                     fill: "none",
                     stroke: activeColor,
                     strokeWidth: trackHeight,
-                    strokeLinecap: "round",
-                    animate: {
-                      pathLength: [0.1, 0.75, 0.1],
-                      pathOffset: [0, 0.65, 1]
-                    },
-                    transition: {
-                      duration: 2 / Math.max(0.1, crawlerSpeed),
-                      repeat: Number.POSITIVE_INFINITY,
-                      ease: [0.4, 0, 0.2, 1]
-                    }
+                    strokeLinecap: "round"
                   }
                 )
-              ]
+              ] })
             }
           )
         ] })
@@ -1004,7 +1141,7 @@ var WavyLinearTrack = React18__namespace.memo(function WavyLinearTrack2({
           currentAmp
         );
       } else if (fraction === 0) {
-        activePathD = `M ${capWidth} 0 L ${capWidth + 0.01} 0`;
+        activePathD = "";
       }
       const trackStart = adjHead + totalGap;
       if (trackStart < width - capWidth) {
@@ -1036,20 +1173,20 @@ var WavyLinearTrack = React18__namespace.memo(function WavyLinearTrack2({
         activeLines.push({ tail: l1T, head: l1H });
         activeLines.push({ tail: l2T, head: l2H });
       }
-      const segments = activeLines.map((line) => {
-        const barTail = line.tail * width;
-        const barHead = line.head * width;
+      const activeSegments = activeLines.map((line) => {
+        const rawTail = line.tail * width;
+        const rawHead = line.head * width;
         const adjTail = Math.max(
           capWidth,
-          Math.min(width - capWidth, barTail)
+          Math.min(width - capWidth, rawTail)
         );
         const adjHead = Math.max(
           capWidth,
-          Math.min(width - capWidth, barHead)
+          Math.min(width - capWidth, rawHead)
         );
         return { adjTail, adjHead };
       }).filter((seg) => seg.adjHead - seg.adjTail > 0.1);
-      activePathD = segments.map(
+      activePathD = activeSegments.map(
         (seg) => getSinePath(
           seg.adjTail,
           seg.adjHead,
@@ -1058,13 +1195,24 @@ var WavyLinearTrack = React18__namespace.memo(function WavyLinearTrack2({
           currentAmp
         )
       ).join(" ");
+      const validActiveLines = activeLines.filter(
+        (line) => line.head > line.tail && line.head * width > 0 && line.tail * width < width
+      ).sort((a, b) => a.tail - b.tail);
       let currentTrackX = capWidth;
-      for (const seg of segments) {
-        const trackEnd = seg.adjTail - totalGap;
+      for (const line of validActiveLines) {
+        const blockStart = line.tail * width - totalGap;
+        const blockEnd = line.head * width + totalGap;
+        const trackEnd = Math.min(width - capWidth, blockStart);
         if (trackEnd > currentTrackX) {
-          trackD += `${getSinePath(currentTrackX, trackEnd, phase, activeWavelength, trackAmp)} `;
+          trackD += `${getSinePath(
+            currentTrackX,
+            trackEnd,
+            phase,
+            activeWavelength,
+            trackAmp
+          )} `;
         }
-        currentTrackX = Math.max(currentTrackX, seg.adjHead + totalGap);
+        currentTrackX = Math.max(currentTrackX, blockEnd);
       }
       if (currentTrackX < width - capWidth) {
         trackD += getSinePath(
@@ -1077,9 +1225,9 @@ var WavyLinearTrack = React18__namespace.memo(function WavyLinearTrack2({
       }
     }
     if (activePathRef.current)
-      activePathRef.current.setAttribute("d", activePathD);
+      activePathRef.current.setAttribute("d", activePathD || "");
     if (trackPathRef.current)
-      trackPathRef.current.setAttribute("d", trackD.trim());
+      trackPathRef.current.setAttribute("d", trackD.trim() || "");
   });
   return /* @__PURE__ */ jsxRuntime.jsx(
     "div",
@@ -4309,39 +4457,7 @@ 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]",
-      // 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]"
+      "body-sm": "text-[12px] leading-[16px] font-normal tracking-[0.4px]"
     }
   },
   defaultVariants: {