Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: move circular-progress tv to progress #3321

Merged
merged 4 commits into from
Nov 17, 2024
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/angry-maps-serve.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@nextui-org/theme": minor
jrgarciadev marked this conversation as resolved.
Show resolved Hide resolved
---

move circular-progress tv to progress
109 changes: 0 additions & 109 deletions packages/core/theme/src/components/circular-progress.ts

This file was deleted.

1 change: 0 additions & 1 deletion packages/core/theme/src/components/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ export * from "./pagination";
export * from "./toggle";
export * from "./accordion";
export * from "./progress";
export * from "./circular-progress";
export * from "./input";
export * from "./dropdown";
export * from "./image";
Expand Down
105 changes: 104 additions & 1 deletion packages/core/theme/src/components/progress.ts
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,110 @@ const progress = tv(
},
);

/**
* CircularProgress **Tailwind Variants** component
*
* @example
* ```js
* const {base, svgWrapper, svg, indicator, value, label} = circularProgress({...})
*
* <div className={base()} aria-label="progress" role="progressbar" aria-valuenow={value} aria-valuemin={min} aria-valuemax={max}>
* <div className={svgWrapper()}>
* <svg className={svg()}>
* <circle className={track()} />
* <circle className={indicator()} />
* </svg>
* <span className={value()}>{value}</span>
* </div>
* <span className={label()}>{label}</span>
* </div>
* ```
*/
const circularProgress = tv({
slots: {
base: "flex flex-col justify-center gap-1 max-w-fit items-center",
label: "",
svgWrapper: "relative block",
svg: "z-0 relative overflow-hidden",
track: "h-full stroke-default-300/50",
indicator: "h-full stroke-current",
value: "absolute font-normal inset-0 flex items-center justify-center",
},
variants: {
color: {
default: {
svg: "text-default-400",
},
primary: {
svg: "text-primary",
},
secondary: {
svg: "text-secondary",
},
success: {
svg: "text-success",
},
warning: {
svg: "text-warning",
},
danger: {
svg: "text-danger",
},
},
size: {
sm: {
svg: "w-8 h-8",
label: "text-small",
value: "text-[0.5rem]",
},
md: {
svg: "w-10 h-10",
label: "text-small",
value: "text-[0.55rem]",
},
lg: {
svg: "w-12 h-12",
label: "text-medium",
value: "text-[0.6rem]",
},
},
isIndeterminate: {
true: {
svg: "animate-spinner-ease-spin",
},
},
isDisabled: {
true: {
base: "opacity-disabled cursor-not-allowed",
},
},
disableAnimation: {
true: {},
false: {
indicator: "transition-all !duration-500",
},
},
},
defaultVariants: {
color: "primary",
size: "md",
isDisabled: false,
},
compoundVariants: [
// disableAnimation && !isIndeterminate
{
disableAnimation: true,
isIndeterminate: false,
class: {
svg: "!transition-none motion-reduce:transition-none",
},
},
],
});

export type ProgressVariantProps = VariantProps<typeof progress>;
export type ProgressSlots = keyof ReturnType<typeof progress>;
export type CircularProgressVariantProps = VariantProps<typeof circularProgress>;
export type CircularProgressSlots = keyof ReturnType<typeof circularProgress>;

export {progress};
export {progress, circularProgress};