| @@ -1,9 +1,12 @@ | ||
| 1 | 1 | import { clsx } from "clsx"; |
| 2 | 2 | import { extendTailwindMerge } from "tailwind-merge"; |
| 3 | 3 | |
| 4 | +// Tailwind v4 prefixes are variant-style (`disco:flex`), so the prefix is | |
| 5 | +// declared WITHOUT a trailing separator. Passing "disco-" here silently disables | |
| 6 | +// merging entirely — every conflicting class is kept. | |
| 4 | 7 | const twMerge = extendTailwindMerge({ |
| 5 | - prefix: "disco-", | |
| 8 | + prefix: "disco", | |
| 6 | 9 | }); |
| 7 | 10 | |
| 8 | 11 | const cn = (...inputs) => { |
| 9 | 12 | return twMerge(clsx(inputs)); |