From b22bd70d54e68c3217ba42690210084749fee656 Mon Sep 17 00:00:00 2001
From: Benjamin Canac <canacb1@gmail.com>
Date: Sat, 16 Dec 2023 00:16:31 +0100
Subject: [PATCH] fix(config): prevent class merge of `avatar` size

---
 src/runtime/utils/index.ts | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/runtime/utils/index.ts b/src/runtime/utils/index.ts
index 4447dd7f..f9f4be1a 100644
--- a/src/runtime/utils/index.ts
+++ b/src/runtime/utils/index.ts
@@ -11,7 +11,13 @@ const customTwMerge = extendTailwindMerge<string, string>({
 })
 
 const defuTwMerge = createDefu((obj, key, value, namespace) => {
-  if (namespace !== 'default' && !namespace.startsWith('default.') && typeof obj[key] === 'string' && typeof value === 'string' && obj[key] && value) {
+  if (namespace === 'default' || namespace.startsWith('default.')) {
+    return false
+  }
+  if (namespace.endsWith('avatar') && key === 'size') {
+    return false
+  }
+  if (typeof obj[key] === 'string' && typeof value === 'string' && obj[key] && value) {
     // @ts-ignore
     obj[key] = customTwMerge(obj[key], value)
     return true