From 0655206f053452533cf629556b057ff30d29e980 Mon Sep 17 00:00:00 2001 From: kyy Date: Mon, 11 May 2026 13:50:14 +0900 Subject: [PATCH] =?UTF-8?q?common=20utils=20=EA=B2=BD=EB=A1=9C=EB=A1=9C=20?= =?UTF-8?q?cn=20helper=20=EA=B3=B5=EC=9A=A9=ED=99=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adminfront/src/lib/utils.ts | 4 +++- common/core/utils/index.ts | 6 ++++++ devfront/src/lib/utils.ts | 4 +++- orgfront/src/lib/utils.ts | 4 +++- 4 files changed, 15 insertions(+), 3 deletions(-) create mode 100644 common/core/utils/index.ts diff --git a/adminfront/src/lib/utils.ts b/adminfront/src/lib/utils.ts index 084e99ce..93c113b3 100644 --- a/adminfront/src/lib/utils.ts +++ b/adminfront/src/lib/utils.ts @@ -1,8 +1,10 @@ import { type ClassValue, clsx } from "clsx"; import { twMerge } from "tailwind-merge"; +import { mergeClassNames } from "../../../common/core/utils"; + export function cn(...inputs: ClassValue[]) { - return twMerge(clsx(inputs)); + return mergeClassNames(twMerge, [clsx(inputs)]); } export function generateSecurePassword(length = 16): string { diff --git a/common/core/utils/index.ts b/common/core/utils/index.ts new file mode 100644 index 00000000..010050f4 --- /dev/null +++ b/common/core/utils/index.ts @@ -0,0 +1,6 @@ +export function mergeClassNames( + mergeFn: (...classNames: string[]) => string, + classNames: string[], +) { + return mergeFn(...classNames); +} diff --git a/devfront/src/lib/utils.ts b/devfront/src/lib/utils.ts index 365058ce..8715786b 100644 --- a/devfront/src/lib/utils.ts +++ b/devfront/src/lib/utils.ts @@ -1,6 +1,8 @@ import { type ClassValue, clsx } from "clsx"; import { twMerge } from "tailwind-merge"; +import { mergeClassNames } from "../../../common/core/utils"; + export function cn(...inputs: ClassValue[]) { - return twMerge(clsx(inputs)); + return mergeClassNames(twMerge, [clsx(inputs)]); } diff --git a/orgfront/src/lib/utils.ts b/orgfront/src/lib/utils.ts index 365058ce..8715786b 100644 --- a/orgfront/src/lib/utils.ts +++ b/orgfront/src/lib/utils.ts @@ -1,6 +1,8 @@ import { type ClassValue, clsx } from "clsx"; import { twMerge } from "tailwind-merge"; +import { mergeClassNames } from "../../../common/core/utils"; + export function cn(...inputs: ClassValue[]) { - return twMerge(clsx(inputs)); + return mergeClassNames(twMerge, [clsx(inputs)]); }