From d62a553694145c06391017310e960829aa865b5b Mon Sep 17 00:00:00 2001
From: wo-o29 <woogur29@gmail.com>
Date: Mon, 15 Sep 2025 21:52:59 +0900
Subject: [PATCH 1/2] refactor: remove redundant undefined check and simplify
 mergeStyle in mergeProps

---
 src/utils/mergeProps/mergeProps.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/utils/mergeProps/mergeProps.ts b/src/utils/mergeProps/mergeProps.ts
index d43ca997..8a7843e6 100644
--- a/src/utils/mergeProps/mergeProps.ts
+++ b/src/utils/mergeProps/mergeProps.ts
@@ -47,9 +47,10 @@ function pushProp(prev: BaseProps, curr: BaseProps): BaseProps {
 
         if (mergedFunction) {
           prev[key] = mergedFunction;
-        } else if (curr[key] !== undefined) {
-          prev[key] = curr[key];
+          break;
         }
+
+        prev[key] = curr[key];
       }
     }
   }
@@ -57,7 +58,6 @@ function pushProp(prev: BaseProps, curr: BaseProps): BaseProps {
 }
 
 function mergeStyle(a?: CSSProperties, b?: CSSProperties): CSSProperties | undefined {
-  if (a == null) return b;
   return { ...a, ...b };
 }
 

From 2292cf3ce8a5c58bc50e49f91a2418c0f4c9d81b Mon Sep 17 00:00:00 2001
From: wo-o29 <woogur29@gmail.com>
Date: Sat, 21 Feb 2026 22:52:26 +0900
Subject: [PATCH 2/2] refactor: simplify function merging logic in pushProp

---
 src/utils/mergeProps/mergeProps.ts | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/src/utils/mergeProps/mergeProps.ts b/src/utils/mergeProps/mergeProps.ts
index 8a7843e6..896ad86d 100644
--- a/src/utils/mergeProps/mergeProps.ts
+++ b/src/utils/mergeProps/mergeProps.ts
@@ -43,14 +43,7 @@ function pushProp(prev: BaseProps, curr: BaseProps): BaseProps {
         break;
       }
       default: {
-        const mergedFunction = mergeFunction(prev[key], curr[key]);
-
-        if (mergedFunction) {
-          prev[key] = mergedFunction;
-          break;
-        }
-
-        prev[key] = curr[key];
+        prev[key] = mergeFunction(prev[key], curr[key]) ?? curr[key];
       }
     }
   }