fix(progress): turn twMerge true to fix custom styling (#2668)

* fix(progress): turn twMerge true to fix custom styling * fix(changelog): move changes to patch * fix: remove stories from changeset * add Issue number in the changeset * chore(changeset): remove extra space * chore(changeset): changeset message --------- Co-authored-by: Guillaume DE LA RUE <guillaume.de-la-rue@consertotech.pro> Co-authored-by: աɨռɢӄաօռɢ <wingkwong.code@gmail.com>
nextui-org · Apr 21, 2024 · 6b96ea9 · 6b96ea9
1 parent f00ab63
commit 6b96ea9
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 1 deletion.
diff --git a/.changeset/short-trainers-dance.md 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
@@ -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
@@ -133,7 +133,7 @@ const progress = tv(
     ],
   },
   {
-    twMerge: false,
+    twMerge: true,
   },
 );