@expcat/tigercat-react 0.3.0 → 0.3.69

package/dist/{chunk-GY6D4XS3.js → chunk-3GW3UAKB.js}

@@ -111,81 +111,39 @@ var Pagination = ({
     });
   }, [pageSizeOptions, labels.itemsPerPageText]);
   const containerClasses = tigercatCore.getPaginationContainerClasses(align, className);
+  const prevDisabled = validatedCurrentPage <= 1 || disabled;
+  const nextDisabled = validatedCurrentPage >= totalPages || disabled;
   const elements = [];
   if (showTotal) {
     const totalTextFn = totalText || tigercatCore.defaultTotalText;
-    const totalTextContent = totalTextFn(total, pageRange);
     elements.push(
-      /* @__PURE__ */ jsxRuntime.jsx("span", { className: tigercatCore.getTotalTextClasses(size), children: totalTextContent }, "total")
+      /* @__PURE__ */ jsxRuntime.jsx("span", { className: tigercatCore.getTotalTextClasses(size), children: totalTextFn(total, pageRange) }, "total")
     );
   }
+  elements.push(
+    /* @__PURE__ */ jsxRuntime.jsx(
+      "button",
+      {
+        type: "button",
+        className: tigercatCore.getPaginationButtonBaseClasses(size),
+        disabled: prevDisabled,
+        onClick: () => handlePageChange(validatedCurrentPage - 1),
+        "aria-label": labels.prevPageAriaLabel,
+        children: "\u2039"
+      },
+      "prev"
+    )
+  );
   if (simple) {
-    const prevDisabled = validatedCurrentPage <= 1 || disabled;
-    const nextDisabled = validatedCurrentPage >= totalPages || disabled;
-    elements.push(
-      /* @__PURE__ */ jsxRuntime.jsx(
-        "button",
-        {
-          type: "button",
-          className: tigercatCore.getPaginationButtonBaseClasses(size),
-          disabled: prevDisabled,
-          onClick: () => handlePageChange(validatedCurrentPage - 1),
-          "aria-label": labels.prevPageAriaLabel,
-          children: "\u2039"
-        },
-        "prev"
-      )
-    );
     elements.push(
-      /* @__PURE__ */ jsxRuntime.jsxs(
-        "span",
-        {
-          className: tigercatCore.classNames(
-            "mx-2",
-            size === "small" ? "text-sm" : size === "large" ? "text-lg" : "text-base"
-          ),
-          children: [
-            validatedCurrentPage,
-            " / ",
-            totalPages
-          ]
-        },
-        "current"
-      )
-    );
-    elements.push(
-      /* @__PURE__ */ jsxRuntime.jsx(
-        "button",
-        {
-          type: "button",
-          className: tigercatCore.getPaginationButtonBaseClasses(size),
-          disabled: nextDisabled,
-          onClick: () => handlePageChange(validatedCurrentPage + 1),
-          "aria-label": labels.nextPageAriaLabel,
-          children: "\u203A"
-        },
-        "next"
-      )
+      /* @__PURE__ */ jsxRuntime.jsxs("span", { className: tigercatCore.classNames("mx-2", tigercatCore.getSizeTextClasses(size)), children: [
+        validatedCurrentPage,
+        " / ",
+        totalPages
+      ] }, "current")
     );
   } else {
-    const prevDisabled = validatedCurrentPage <= 1 || disabled;
-    const nextDisabled = validatedCurrentPage >= totalPages || disabled;
-    elements.push(
-      /* @__PURE__ */ jsxRuntime.jsx(
-        "button",
-        {
-          type: "button",
-          className: tigercatCore.getPaginationButtonBaseClasses(size),
-          disabled: prevDisabled,
-          onClick: () => handlePageChange(validatedCurrentPage - 1),
-          "aria-label": labels.prevPageAriaLabel,
-          children: "\u2039"
-        },
-        "prev"
-      )
-    );
-    const pageNumbers = tigercatCore.getPageNumbers(validatedCurrentPage, totalPages, showLessItems);
-    pageNumbers.forEach((pageNum, index) => {
+    tigercatCore.getPageNumbers(validatedCurrentPage, totalPages, showLessItems).forEach((pageNum, index) => {
       if (pageNum === "...") {
         elements.push(
           /* @__PURE__ */ jsxRuntime.jsx(
@@ -220,21 +178,21 @@ var Pagination = ({
         );
       }
     });
-    elements.push(
-      /* @__PURE__ */ jsxRuntime.jsx(
-        "button",
-        {
-          type: "button",
-          className: tigercatCore.getPaginationButtonBaseClasses(size),
-          disabled: nextDisabled,
-          onClick: () => handlePageChange(validatedCurrentPage + 1),
-          "aria-label": labels.nextPageAriaLabel,
-          children: "\u203A"
-        },
-        "next"
-      )
-    );
   }
+  elements.push(
+    /* @__PURE__ */ jsxRuntime.jsx(
+      "button",
+      {
+        type: "button",
+        className: tigercatCore.getPaginationButtonBaseClasses(size),
+        disabled: nextDisabled,
+        onClick: () => handlePageChange(validatedCurrentPage + 1),
+        "aria-label": labels.nextPageAriaLabel,
+        children: "\u203A"
+      },
+      "next"
+    )
+  );
   if (showSizeChanger) {
     elements.push(
       /* @__PURE__ */ jsxRuntime.jsx(
@@ -252,18 +210,9 @@ var Pagination = ({
     );
   }
   if (showQuickJumper) {
+    const sizeText = tigercatCore.getSizeTextClasses(size);
     elements.push(
-      /* @__PURE__ */ jsxRuntime.jsx(
-        "span",
-        {
-          className: tigercatCore.classNames(
-            "ml-2",
-            size === "small" ? "text-sm" : size === "large" ? "text-lg" : "text-base"
-          ),
-          children: labels.jumpToText
-        },
-        "jumper-label-start"
-      )
+      /* @__PURE__ */ jsxRuntime.jsx("span", { className: tigercatCore.classNames("ml-2", sizeText), children: labels.jumpToText }, "jumper-label-start")
     );
     elements.push(
       /* @__PURE__ */ jsxRuntime.jsx(
@@ -283,14 +232,7 @@ var Pagination = ({
       )
     );
     elements.push(
-      /* @__PURE__ */ jsxRuntime.jsx(
-        "span",
-        {
-          className: size === "small" ? "text-sm" : size === "large" ? "text-lg" : "text-base",
-          children: labels.pageText
-        },
-        "jumper-label-end"
-      )
+      /* @__PURE__ */ jsxRuntime.jsx("span", { className: sizeText, children: labels.pageText }, "jumper-label-end")
     );
   }
   return /* @__PURE__ */ jsxRuntime.jsx(

package/dist/{chunk-VD3IK5XT.mjs → chunk-3M2IG6IN.mjs}

@@ -1,4 +1,4 @@
-import { cardSizeClasses, classNames, getCardClasses, cardBodyClasses, cardCoverWrapperClasses, cardCoverClasses, cardActionsClasses, cardFooterClasses, cardHeaderClasses } from '@expcat/tigercat-core';
+import { cardSizeClasses, classNames, getCardClasses, cardCoverWrapperClasses, cardCoverClasses, cardActionsClasses, cardFooterClasses, cardHeaderClasses } from '@expcat/tigercat-core';
 import { jsxs, jsx } from 'react/jsx-runtime';
 
 // src/components/Card.tsx
@@ -21,12 +21,11 @@ var Card = ({
     !cover && cardSizeClasses[size],
     className
   );
-  const bodyClasses = classNames(cardBodyClasses, sectionSizeClass);
   const getSectionClasses = (baseClasses) => classNames(baseClasses, sectionSizeClass);
   return /* @__PURE__ */ jsxs("div", { className: cardClasses, ...props, children: [
     cover && /* @__PURE__ */ jsx("div", { className: cardCoverWrapperClasses, children: /* @__PURE__ */ jsx("img", { src: cover, alt: coverAlt, className: cardCoverClasses }) }),
     header != null && /* @__PURE__ */ jsx("div", { className: getSectionClasses(cardHeaderClasses), children: header }),
-    children != null && /* @__PURE__ */ jsx("div", { className: bodyClasses, children }),
+    children != null && /* @__PURE__ */ jsx("div", { className: sectionSizeClass, children }),
     footer != null && /* @__PURE__ */ jsx("div", { className: getSectionClasses(cardFooterClasses), children: footer }),
     actions != null && /* @__PURE__ */ jsx("div", { className: getSectionClasses(classNames(cardActionsClasses, cardFooterClasses)), children: actions })
   ] });

package/dist/{chunk-T3GSXTDU.js → chunk-3NE6VZRY.js}

@@ -19,8 +19,8 @@ var BreadcrumbItem = ({
 }) => {
   const breadcrumbContext = chunkOWUGXP6K_js.useBreadcrumbContext();
   const itemClasses = react.useMemo(
-    () => tigercatCore.getBreadcrumbItemClasses(current, className),
-    [current, className]
+    () => tigercatCore.getBreadcrumbItemClasses(className),
+    [className]
   );
   const linkClasses = react.useMemo(() => tigercatCore.getBreadcrumbLinkClasses(current), [current]);
   const separatorClasses = react.useMemo(() => tigercatCore.getBreadcrumbSeparatorClasses(), []);
@@ -53,7 +53,6 @@ var BreadcrumbItem = ({
       href,
       target,
       rel: computedRel,
-      "aria-current": current ? "page" : void 0,
       onClick: handleClick,
       children: contentElements
     }

package/dist/chunk-3PV2MDST.mjs

@@ -0,0 +1,95 @@
+import { useFloating, useClickOutside, useEscapeKey } from './chunk-WLIFEALE.mjs';
+import { useState, useRef, useCallback, useMemo } from 'react';
+import { getTransformOrigin, buildTriggerHandlerMap } from '@expcat/tigercat-core';
+
+function usePopup(options) {
+  const {
+    visible,
+    defaultVisible = false,
+    disabled = false,
+    trigger = "click",
+    placement = "top",
+    offset = 8,
+    multiTrigger = true,
+    onVisibleChange
+  } = options;
+  const isControlled = visible !== void 0;
+  const [internalVisible, setInternalVisible] = useState(defaultVisible);
+  const currentVisible = isControlled ? visible : internalVisible;
+  const containerRef = useRef(null);
+  const triggerRef = useRef(null);
+  const floatingRef = useRef(null);
+  const {
+    x,
+    y,
+    placement: actualPlacement
+  } = useFloating({
+    referenceRef: triggerRef,
+    floatingRef,
+    enabled: currentVisible,
+    placement,
+    offset
+  });
+  const setVisible = useCallback(
+    (next) => {
+      if (disabled && next) return;
+      if (!isControlled) setInternalVisible(next);
+      onVisibleChange?.(next);
+    },
+    [disabled, isControlled, onVisibleChange]
+  );
+  const handleToggle = useCallback(() => {
+    if (!disabled) setVisible(!currentVisible);
+  }, [disabled, currentVisible, setVisible]);
+  const handleShow = useCallback(() => {
+    if (!disabled) setVisible(true);
+  }, [disabled, setVisible]);
+  const handleHide = useCallback(() => {
+    if (!disabled) setVisible(false);
+  }, [disabled, setVisible]);
+  const effectiveTrigger = multiTrigger ? trigger : "click";
+  useClickOutside({
+    enabled: currentVisible && effectiveTrigger === "click",
+    refs: [containerRef],
+    onOutsideClick: () => setVisible(false),
+    defer: true
+  });
+  useEscapeKey({
+    enabled: currentVisible && effectiveTrigger !== "manual",
+    onEscape: () => setVisible(false)
+  });
+  const floatingStyles = useMemo(
+    () => ({
+      position: "absolute",
+      left: x,
+      top: y,
+      transformOrigin: getTransformOrigin(actualPlacement),
+      zIndex: 1e3
+    }),
+    [x, y, actualPlacement]
+  );
+  const triggerHandlers = useMemo(() => {
+    if (!multiTrigger) {
+      return { onClick: handleToggle };
+    }
+    return buildTriggerHandlerMap(
+      effectiveTrigger,
+      { toggle: handleToggle, show: handleShow, hide: handleHide },
+      "react"
+    );
+  }, [multiTrigger, effectiveTrigger, handleToggle, handleShow, handleHide]);
+  return {
+    currentVisible,
+    setVisible,
+    containerRef,
+    triggerRef,
+    floatingRef,
+    x,
+    y,
+    actualPlacement,
+    floatingStyles,
+    triggerHandlers
+  };
+}
+
+export { usePopup };

package/dist/{chunk-36RRHNZD.js → chunk-3T7L3MHX.js}

@@ -1,6 +1,7 @@
 'use strict';
 
 var chunkZYPEO2KY_js = require('./chunk-ZYPEO2KY.js');
+var chunkF24IF2QL_js = require('./chunk-F24IF2QL.js');
 var React = require('react');
 var reactDom = require('react-dom');
 var tigercatCore = require('@expcat/tigercat-core');
@@ -27,8 +28,11 @@ var Modal = ({
   onVisibleChange,
   onClose,
   onCancel,
-  onOk: _onOk,
+  onOk,
   closeAriaLabel,
+  showDefaultFooter = false,
+  okText,
+  cancelText,
   locale,
   style,
   ...rest
@@ -50,6 +54,10 @@ var Modal = ({
     onCancel?.();
     onVisibleChange?.(false);
   }, [onCancel, onVisibleChange]);
+  const handleOk = React.useCallback(() => {
+    onOk?.();
+    onVisibleChange?.(false);
+  }, [onOk, onVisibleChange]);
   const handleMaskClick = React.useCallback(
     (event) => {
       if (maskClosable && event.target === event.currentTarget) {
@@ -66,6 +74,18 @@ var Modal = ({
     locale?.modal?.closeAriaLabel,
     locale?.common?.closeText
   );
+  const resolvedCancelText = tigercatCore.resolveLocaleText(
+    "\u53D6\u6D88",
+    cancelText,
+    locale?.modal?.cancelText,
+    locale?.common?.cancelText
+  );
+  const resolvedOkText = tigercatCore.resolveLocaleText(
+    "\u786E\u5B9A",
+    okText,
+    locale?.modal?.okText,
+    locale?.common?.okText
+  );
   const reactId = React.useId();
   const modalId = React.useMemo(() => `tiger-modal-${reactId}`, [reactId]);
   const titleId = `${modalId}-title`;
@@ -80,15 +100,13 @@ var Modal = ({
   const closeButtonRef = React.useRef(null);
   const previousActiveElementRef = React.useRef(null);
   React.useEffect(() => {
-    if (!visible) return;
-    previousActiveElementRef.current = tigercatCore.captureActiveElement();
-    const timer = setTimeout(() => {
-      tigercatCore.focusFirst([closeButtonRef.current, dialogRef.current]);
-    }, 0);
-    return () => clearTimeout(timer);
-  }, [visible]);
-  React.useEffect(() => {
-    if (visible) return;
+    if (visible) {
+      previousActiveElementRef.current = tigercatCore.captureActiveElement();
+      const timer = setTimeout(() => {
+        tigercatCore.focusFirst([closeButtonRef.current, dialogRef.current]);
+      }, 0);
+      return () => clearTimeout(timer);
+    }
     tigercatCore.restoreFocus(previousActiveElementRef.current);
   }, [visible]);
   chunkZYPEO2KY_js.useEscapeKey({ enabled: visible, onEscape: handleClose });
@@ -124,9 +142,6 @@ var Modal = ({
   if (!shouldRender) {
     return null;
   }
-  if (destroyOnClose && !visible) {
-    return null;
-  }
   const modalContent = /* @__PURE__ */ jsxRuntime.jsxs(
     "div",
     {
@@ -147,7 +162,7 @@ var Modal = ({
         /* @__PURE__ */ jsxRuntime.jsx("div", { className: containerClasses, onClick: handleMaskClick, children: /* @__PURE__ */ jsxRuntime.jsxs(
           "div",
           {
-            className: tigercatCore.classNames(contentClasses),
+            className: contentClasses,
             style,
             ...dialogDivProps,
             role: "dialog",
@@ -173,7 +188,10 @@ var Modal = ({
                 )
               ] }),
               children && /* @__PURE__ */ jsxRuntime.jsx("div", { className: tigercatCore.modalBodyClasses, children }),
-              footer && /* @__PURE__ */ jsxRuntime.jsx("div", { className: tigercatCore.modalFooterClasses, "data-tiger-modal-footer": "", children: footer })
+              footer ? /* @__PURE__ */ jsxRuntime.jsx("div", { className: tigercatCore.modalFooterClasses, "data-tiger-modal-footer": "", children: footer }) : showDefaultFooter ? /* @__PURE__ */ jsxRuntime.jsxs("div", { className: tigercatCore.modalFooterClasses, "data-tiger-modal-footer": "", children: [
+                /* @__PURE__ */ jsxRuntime.jsx(chunkF24IF2QL_js.Button, { variant: "secondary", onClick: handleClose, children: resolvedCancelText }),
+                /* @__PURE__ */ jsxRuntime.jsx(chunkF24IF2QL_js.Button, { onClick: handleOk, children: resolvedOkText })
+              ] }) : null
             ]
           }
         ) })

package/dist/{chunk-IY4LEJYF.js → chunk-4PPTEEDI.js}

@@ -4,25 +4,24 @@ var tigercatCore = require('@expcat/tigercat-core');
 var jsxRuntime = require('react/jsx-runtime');
 
 // src/components/Skeleton.tsx
-var Skeleton = (props) => {
-  const {
-    variant = "text",
-    animation = "pulse",
-    width,
-    height,
-    shape = "circle",
-    rows = 1,
-    paragraph = false,
-    className,
-    style,
-    ["aria-label"]: ariaLabelProp,
-    ["aria-labelledby"]: ariaLabelledByProp,
-    ["aria-hidden"]: ariaHiddenProp,
-    ...divProps
-  } = props;
-  const skeletonClasses = tigercatCore.classNames(tigercatCore.getSkeletonClasses(variant, animation, shape), className);
+var Skeleton = ({
+  variant = "text",
+  animation = "pulse",
+  width,
+  height,
+  shape = "circle",
+  rows = 1,
+  paragraph = false,
+  className,
+  style,
+  "aria-label": ariaLabel,
+  "aria-labelledby": ariaLabelledBy,
+  "aria-hidden": ariaHidden,
+  ...divProps
+}) => {
+  const visualClasses = tigercatCore.getSkeletonClasses(variant, animation, shape);
   const dimensions = tigercatCore.getSkeletonDimensions(variant, width, height);
-  const computedAriaHidden = ariaHiddenProp ?? (ariaLabelProp || ariaLabelledByProp ? void 0 : true);
+  const computedAriaHidden = ariaHidden ?? (ariaLabel || ariaLabelledBy ? void 0 : true);
   if (variant === "text" && rows > 1) {
     const rowElements = [];
     for (let i = 0; i < rows; i++) {
@@ -38,9 +37,8 @@ var Skeleton = (props) => {
         /* @__PURE__ */ jsxRuntime.jsx(
           "div",
           {
-            className: tigercatCore.classNames(skeletonClasses, i < rows - 1 && "mb-2"),
-            style: rowStyle,
-            "aria-hidden": computedAriaHidden
+            className: tigercatCore.classNames(visualClasses, i < rows - 1 && "mb-2"),
+            style: rowStyle
           },
           i
         )
@@ -52,24 +50,25 @@ var Skeleton = (props) => {
         ...divProps,
         className: tigercatCore.classNames("flex flex-col", className),
         style,
+        "aria-label": ariaLabel,
+        "aria-labelledby": ariaLabelledBy,
         "aria-hidden": computedAriaHidden,
         children: rowElements
       }
     );
   }
-  const skeletonStyle = {
-    ...style,
-    ...dimensions.width ? { width: dimensions.width } : null,
-    height: dimensions.height
-  };
   return /* @__PURE__ */ jsxRuntime.jsx(
     "div",
     {
       ...divProps,
-      className: skeletonClasses,
-      style: skeletonStyle,
-      "aria-label": ariaLabelProp,
-      "aria-labelledby": ariaLabelledByProp,
+      className: tigercatCore.classNames(visualClasses, className),
+      style: {
+        ...style,
+        ...dimensions.width ? { width: dimensions.width } : void 0,
+        height: dimensions.height
+      },
+      "aria-label": ariaLabel,
+      "aria-labelledby": ariaLabelledBy,
       "aria-hidden": computedAriaHidden
     }
   );

package/dist/{chunk-Z4Z3I74Q.mjs → chunk-4Y7YH32A.mjs}

@@ -1,4 +1,4 @@
-import { clampPercentage, getStatusVariant, formatProgressText, classNames, progressLineBaseClasses, progressTrackBgClasses, progressLineSizeClasses, progressLineInnerClasses, getProgressVariantClasses, progressStripedClasses, progressStripedAnimationClasses, progressTextBaseClasses, progressTextSizeClasses, getProgressTextColorClasses, getCircleSize, calculateCirclePath, progressCircleTrackStrokeClasses, progressCircleTextClasses, progressCircleBaseClasses } from '@expcat/tigercat-core';
+import { clampPercentage, getStatusVariant, formatProgressText, classNames, progressLineInnerClasses, getProgressVariantClasses, progressStripedClasses, progressStripedAnimationClasses, progressLineBaseClasses, progressTrackBgClasses, progressLineSizeClasses, progressTextBaseClasses, progressTextSizeClasses, getProgressTextColorClasses, getCircleSize, calculateCirclePath, progressCircleTrackStrokeClasses, progressCircleTextClasses, progressCircleBaseClasses } from '@expcat/tigercat-core';
 import { jsxs, jsx } from 'react/jsx-runtime';
 
 // src/components/Progress.tsx
@@ -28,69 +28,66 @@ var Progress = ({
   const shouldShowText = showText ?? type === "line";
   const displayText = shouldShowText ? formatProgressText(clampedPercentage, text, format) : "";
   const resolvedAriaLabel = ariaLabel ?? (ariaLabelledby ? void 0 : `Progress: ${clampedPercentage}%`);
-  const lineTrackClasses = classNames(
-    progressLineBaseClasses,
-    progressTrackBgClasses,
-    !height && progressLineSizeClasses[size]
-  );
-  const lineBarClasses = classNames(
-    progressLineInnerClasses,
-    getProgressVariantClasses(effectiveVariant),
-    striped && progressStripedClasses,
-    striped && stripedAnimation && progressStripedAnimationClasses
-  );
-  const textClasses = classNames(
-    progressTextBaseClasses,
-    progressTextSizeClasses[size],
-    getProgressTextColorClasses(effectiveVariant)
-  );
+  const ariaAttrs = {
+    role: "progressbar",
+    "aria-label": resolvedAriaLabel,
+    "aria-labelledby": ariaLabelledby,
+    "aria-describedby": ariaDescribedby,
+    "aria-valuenow": clampedPercentage,
+    "aria-valuemin": 0,
+    "aria-valuemax": 100
+  };
   const renderLineProgress = () => {
     const containerStyle = width !== "auto" ? { width: typeof width === "number" ? `${width}px` : width } : {};
-    const mergedStyle = {
-      ...style ?? {},
-      ...containerStyle
-    };
     return /* @__PURE__ */ jsxs(
       "div",
       {
         ...props,
         className: classNames("flex items-center w-full", className),
-        style: mergedStyle,
+        style: { ...style ?? {}, ...containerStyle },
         children: [
           /* @__PURE__ */ jsx(
             "div",
             {
-              className: lineTrackClasses,
+              className: classNames(
+                progressLineBaseClasses,
+                progressTrackBgClasses,
+                !height && progressLineSizeClasses[size]
+              ),
               style: { flex: 1, ...height ? { height: `${height}px` } : {} },
               children: /* @__PURE__ */ jsx(
                 "div",
                 {
-                  className: lineBarClasses,
+                  className: classNames(
+                    progressLineInnerClasses,
+                    getProgressVariantClasses(effectiveVariant),
+                    striped && progressStripedClasses,
+                    striped && stripedAnimation && progressStripedAnimationClasses
+                  ),
                   style: { width: `${clampedPercentage}%` },
-                  role: "progressbar",
-                  "aria-label": resolvedAriaLabel,
-                  "aria-labelledby": ariaLabelledby,
-                  "aria-describedby": ariaDescribedby,
-                  "aria-valuenow": clampedPercentage,
-                  "aria-valuemin": 0,
-                  "aria-valuemax": 100
+                  ...ariaAttrs
                 }
               )
             }
           ),
-          shouldShowText && /* @__PURE__ */ jsx("span", { className: textClasses, children: displayText })
+          shouldShowText && /* @__PURE__ */ jsx(
+            "span",
+            {
+              className: classNames(
+                progressTextBaseClasses,
+                progressTextSizeClasses[size],
+                getProgressTextColorClasses(effectiveVariant)
+              ),
+              children: displayText
+            }
+          )
         ]
       }
     );
   };
   const renderCircleProgress = () => {
     const { width: svgWidth, height: svgHeight, radius, cx, cy } = getCircleSize(size, strokeWidth);
-    const { strokeDasharray, strokeDashoffset } = calculateCirclePath(
-      radius,
-      strokeWidth,
-      clampedPercentage
-    );
-    const strokeColor = getProgressVariantClasses(effectiveVariant).replace("bg-", "text-");
+    const { strokeDasharray, strokeDashoffset } = calculateCirclePath(radius, clampedPercentage);
     return /* @__PURE__ */ jsxs(
       "div",
       {
@@ -123,7 +120,7 @@ var Progress = ({
                 r: radius,
                 fill: "none",
                 stroke: "currentColor",
-                className: strokeColor,
+                className: getProgressVariantClasses(effectiveVariant).replace("bg-", "text-"),
                 strokeWidth,
                 strokeLinecap: "round",
                 strokeDasharray,
@@ -133,13 +130,7 @@ var Progress = ({
                   transform: "rotate(-90deg)",
                   transformOrigin: "center"
                 },
-                role: "progressbar",
-                "aria-label": resolvedAriaLabel,
-                "aria-labelledby": ariaLabelledby,
-                "aria-describedby": ariaDescribedby,
-                "aria-valuenow": clampedPercentage,
-                "aria-valuemin": 0,
-                "aria-valuemax": 100
+                ...ariaAttrs
               }
             )
           ] }),