diff --git a/.changeset/short-trainers-dance.md b/.changeset/short-trainers-dance.md new file mode 100644 index 000000000..d1615b109 --- /dev/null +++ b/.changeset/short-trainers-dance.md @@ -0,0 +1,5 @@ +--- +"@nextui-org/theme": patch +--- + +Fix custom slot styling with twMerge set to true (#2153) diff --git a/packages/components/progress/stories/progress.stories.tsx b/packages/components/progress/stories/progress.stories.tsx index bddefb8d5..789add8b7 100644 --- a/packages/components/progress/stories/progress.stories.tsx +++ b/packages/components/progress/stories/progress.stories.tsx @@ -122,3 +122,15 @@ export const Striped = { isStriped: true, }, }; + +export const CustomSlots = { + render: Template, + + args: { + ...defaultProps, + classNames: { + indicator: "bg-[#14708A] rounded-[4px]", + track: "bg-red-500 rounded-[4px]", + }, + }, +}; diff --git a/packages/core/theme/src/components/progress.ts b/packages/core/theme/src/components/progress.ts index e3e5e4eec..347d0cfad 100644 --- a/packages/core/theme/src/components/progress.ts +++ b/packages/core/theme/src/components/progress.ts @@ -133,7 +133,7 @@ const progress = tv( ], }, { - twMerge: false, + twMerge: true, }, );