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>
This commit is contained in:
CAEB Wallace 2024-04-21 12:46:38 +02:00 committed by GitHub
parent f00ab630bf
commit 6b96ea9c9c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 18 additions and 1 deletions

View File

@ -0,0 +1,5 @@
---
"@nextui-org/theme": patch
---
Fix custom slot styling with twMerge set to true (#2153)

View File

@ -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]",
},
},
};

View File

@ -133,7 +133,7 @@ const progress = tv(
],
},
{
twMerge: false,
twMerge: true,
},
);