From bf60670c0b14fb9a212c78ca0e13f32e6185af69 Mon Sep 17 00:00:00 2001 From: Adithya Krishna Date: Fri, 27 Mar 2026 02:00:21 +0530 Subject: [PATCH] chore: fix cn with tw-merge (#3789) * chore: fix cn * chore: fix scale --- apps/sim/components/emcn/components/button/button.tsx | 2 +- apps/sim/lib/core/utils/cn.ts | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/apps/sim/components/emcn/components/button/button.tsx b/apps/sim/components/emcn/components/button/button.tsx index e8608bff86..26570f2854 100644 --- a/apps/sim/components/emcn/components/button/button.tsx +++ b/apps/sim/components/emcn/components/button/button.tsx @@ -3,7 +3,7 @@ import { cva, type VariantProps } from 'class-variance-authority' import { cn } from '@/lib/core/utils/cn' const buttonVariants = cva( - 'inline-flex items-center justify-center font-medium transition-colors active:scale-[0.97] disabled:pointer-events-none disabled:opacity-70 outline-none focus:outline-none focus-visible:outline-none rounded-[5px]', + 'inline-flex items-center justify-center font-medium transition-colors active:scale-[0.98] disabled:pointer-events-none disabled:opacity-70 outline-none focus:outline-none focus-visible:outline-none rounded-[5px]', { variants: { variant: { diff --git a/apps/sim/lib/core/utils/cn.ts b/apps/sim/lib/core/utils/cn.ts index 952d546a76..5102be6f19 100644 --- a/apps/sim/lib/core/utils/cn.ts +++ b/apps/sim/lib/core/utils/cn.ts @@ -1,5 +1,13 @@ import { type ClassValue, clsx } from 'clsx' -import { twMerge } from 'tailwind-merge' +import { extendTailwindMerge } from 'tailwind-merge' + +const twMerge = extendTailwindMerge({ + extend: { + classGroups: { + 'font-size': [{ text: ['micro', 'caption', 'small', 'md'] }], + }, + }, +}) /** * Combines class names using clsx and tailwind-merge