From f83cff7095063f45655c70be49216efce14264a4 Mon Sep 17 00:00:00 2001
From: Benjamin Canac <canacb1@gmail.com>
Date: Wed, 21 Feb 2024 16:34:30 +0100
Subject: [PATCH] chore(utils): prevent default prop merge for `chip` and
 `badge`

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

diff --git a/src/runtime/utils/index.ts b/src/runtime/utils/index.ts
index 17db95b1..b9a7b8f5 100644
--- a/src/runtime/utils/index.ts
+++ b/src/runtime/utils/index.ts
@@ -17,6 +17,12 @@ const defuTwMerge = createDefu((obj, key, value, namespace) => {
   if (namespace.endsWith('avatar') && key === 'size') {
     return false
   }
+  if (namespace.endsWith('chip') && key === 'size') {
+    return false
+  }
+  if (namespace.endsWith('badge') && key === 'size' || key === 'color' || key === 'variant') {
+    return false
+  }
   if (typeof obj[key] === 'string' && typeof value === 'string' && obj[key] && value) {
     // @ts-ignore
     obj[key] = customTwMerge(obj[key], value)