Simplify merge conditional

styled-system · May 8, 2019 · cc67fbb · cc67fbb
1 parent bc70315
commit cc67fbb
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/src/index.js b/src/index.js
@@ -42,12 +42,10 @@ export const merge = (a, b) => {
     result[key] = a[key]
   }
   for (const key in b) {
-    if (!a[key]) {
+    if (!a[key] || typeof a[key] !== 'object') {
       result[key] = b[key]
-    } else if (typeof a[key] === 'object') {
-      result[key] = merge(a[key], b[key])
     } else {
-      result[key] = b[key]
+      result[key] = merge(a[key], b[key])
     }
   }
   return result