From 8f43538b84be4b0961947ec1b69d9e3ec607a019 Mon Sep 17 00:00:00 2001 From: Ita_simo <118686320+Itasimo@users.noreply.github.com> Date: Fri, 10 Apr 2026 19:01:11 +0200 Subject: [PATCH] Custom classes not being merged correctly in tailwind-merge Closes #28 --- src/lib/utils.ts | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/src/lib/utils.ts b/src/lib/utils.ts index b9cdb7c..1c2db1b 100644 --- a/src/lib/utils.ts +++ b/src/lib/utils.ts @@ -6,6 +6,50 @@ const twMerge = extendTailwindMerge({ theme: { radius: ["images", "rectangles", "buttonsM", "buttonsL"], // custom rounded classes from figma }, + classGroups: { + // custom typography classes from figma + "font-size": [ + { + typo: [ + "display-extralarge", + "display-large", + "display-medium", + "display-small", + "headline-large", + "headline-medium", + "headline-small", + "body-large", + "body-medium", + "body-small", + "label-extralarge", + "label-large", + "label-medium", + "label-small", + "title-large", + "title-medium", + "title-small", + ], + }, + ], + // custom background colors from figma + "bg-color": [ + { + bg: [ + "background", + "background-blur", + "red", + "green", + "blue-primary", + "blue-primary-blur", + "blue-secondary", + "blue-tertiary", + "blue-tertiary-blur", + ], + }, + ], + // custom text colors from figma + "text-color": [{ text: ["text-primary", "text-secondary", "text-accent-darkbg", "text-accent-lightbg"] }], + }, }, })